bug fix

src/App.js

@@ -4,12 +4,14 @@ import {
   Route, Switch
 } from 'react-router-dom';
 
-import { $hostParams, ContextPath } from './util';
+import { $hostParams, ContextPath, generateUUID } from './util';
 import loadable from "./util/loadable";
+import localStorage from 'local-storage';
 
 import { AssetBrowseReference, AssetMountReference } from './util/constant';
 
 export const AppContext = React.createContext();
+export const appId = generateUUID();
 
 const Signin = loadable(()=> import('./view/Signin'));
 const Home = loadable(()=> import('./view/Home'));

src/util/axios.js

@@ -3,7 +3,8 @@ import axios from 'axios';
 import qs from 'qs';
 import LocalStorage from 'local-storage';
 
-import { IsArr, showMessage, isSzseEnv } from './index';
+import { IsArr, showMessage, isSzseEnv, generateUUID } from './index';
+import { appId } from '../App';
 
 const CancelToken = axios.CancelToken;
 const baseURL = '/api/';
@@ -114,9 +115,13 @@ const callback = resp => {
   return resp.data || resp;
 }
 
+function getTemplateType() {
+  return LocalStorage.get(`templateType-${appId}`)
+}
+
 export function Get(url, params) {
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return textplain.get(url, {
     params: {...params, templateType}, cancelToken
@@ -127,7 +132,7 @@ export function Get(url, params) {
 
 export function GetJSON(url, params) {
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return instance.get(url, {
     params: {...params, templateType}, cancelToken,
@@ -139,7 +144,7 @@ export function GetJSON(url, params) {
 
 export const GetJSONRaw = (url, params) => {
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return instanceRow.get(url, {
     params: {...params, templateType}, cancelToken,
@@ -151,7 +156,7 @@ export const GetJSONRaw = (url, params) => {
 
 export function Delete(url, params) {
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return instance.delete(url, {
     params: {...params, templateType}, cancelToken,
@@ -163,7 +168,7 @@ export function Delete(url, params) {
 export function PostJSON(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return IsArr(data) ? instance.post(url, data, {
     params: {...params, templateType}, cancelToken
@@ -179,7 +184,7 @@ export function PostJSON(url, payload) {
 export function Post(url, payload) {
   const { params = null, data = null } = payload||{};
   const cancelToken = __source ? __source.token : null;
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   return textplain.post(url, null, {
     params: {...params, templateType}, data, cancelToken
@@ -190,7 +195,7 @@ export function Post(url, payload) {
 
 export function PostFile(url, payload) {
   const { fileList = null, params = null } = payload||{};
-  const templateType = LocalStorage.get('templateType');
+  const templateType = getTemplateType();
 
   let formData = new FormData();
   (fileList||[]).forEach(file=> {
@@ -212,7 +217,8 @@ let config = {
 
 export const callFetchRaw = (method, url, options) => {
   const { params, ...reqConfig } = options;
-  const templateType = LocalStorage.get('templateType');
+
+  const templateType = getTemplateType();
 
   var bodyFormData = new FormData();
   Object.keys(params||[]).forEach(key => {

src/view/Manage/AssetManage/Component/AssetAction.jsx

@@ -6,7 +6,7 @@ import LocalStorage from 'local-storage';
 import MetadataInfo from './MetadataInfo';
 import { dispatch } from '../../../../model';
 import { highlightSearchContentByTerms, showMessage, paginate } from '../../../../util';
-import { AppContext } from '../../../../App';
+import { AppContext, appId } from '../../../../App';
 import Tag from '../../Tag';  
 import Separate from './Separate';
 import AssetTagModal from './AssetTagModal';
@@ -584,7 +584,7 @@ const AssetAction = (props) => {
     if (item.resourceType==='innerSource'||item.resourceType==='outerSource') {
       window.open(`/center-home/menu/asset-resource-browse?${AnchorId}=${item?.dataAssetId}&${AnchorDirId}=${item?.dirId}&timestamp=${timestamp}`);
     } else if (item.resourceType==='dataAsset') {
-      window.open(`/center-home/menu/asset-browse?${AnchorId}=${item?.dataAssetId}&${AnchorDirId}=${item?.dirId}&templateType=${LocalStorage.get('templateType')}&timestamp=${timestamp}`);
+      window.open(`/center-home/menu/asset-browse?${AnchorId}=${item?.dataAssetId}&${AnchorDirId}=${item?.dirId}&templateType=${LocalStorage.get(`templateType-${appId}`)}&timestamp=${timestamp}`);
     } else {
       showMessage('warn', '资产目录类型不是资源也不是资产!');
     }

src/view/Manage/AssetManage/Component/AssetDirectory.jsx

@@ -262,7 +262,7 @@ const AssetDirectory = (props) => {
           </div>
         </div>
         
-        {
+        {/* {
           (reference===AssetManageReference) && <Dropdown overlay={elementManageMenu} placement="bottomCenter">
             <div
               className='flex more-container'
@@ -277,7 +277,7 @@ const AssetDirectory = (props) => {
               <span style={{ fontSize: 10 }}>更多</span>
             </div>
           </Dropdown>
-        }
+        } */}
       
       </div>
       

src/view/Manage/AssetManage/Component/AssetManageTree.jsx

@@ -15,6 +15,7 @@ import { highlightSearchContentByTerms } from '../../../../util';
 
 import './AssetManageTree.less';
 import 'react-contexify/dist/ReactContexify.css';
+import { appId } from '../../../../App';
 
 const { Option } = AutoComplete;
 
@@ -131,7 +132,7 @@ const AssetManageTree = (props) => {
         setTemplates(data)
         if ((data??[]).length > 0) {
           setTemplateType(data[0].type)
-          LocalStorage.set('templateType', data[0].type)
+          LocalStorage.set(`templateType-${appId}`, data[0].type)
           onSelect?.('', '')
           getAllDirectoryAsTree(false)
         }
@@ -753,7 +754,7 @@ const AssetManageTree = (props) => {
             value={currentTemplateType}
             onChange={(val) => {
               setTemplateType(val)
-              LocalStorage.set('templateType', val);
+              LocalStorage.set(`templateType-${appId}`, val);
               setCurrentDirId();
               onSelect?.('', '');
               getAllDirectoryAsTree(false)

src/view/Manage/AssetManage/Component/AssetTree.jsx

@@ -12,6 +12,7 @@ import { highlightSearchContentByTerms } from '../../../../util';
 
 import './AssetTree.less';
 import 'react-contexify/dist/ReactContexify.css';
+import { appId } from '../../../../App';
 
 const { Option } = AutoComplete;
 
@@ -125,9 +126,9 @@ const AssetTree = (props) => {
           const _dirId = getQueryParam(AnchorDirId, props?.location?.search)
 
           if (_templateType) {
-            LocalStorage.set('templateType', _templateType)
+            LocalStorage.set(`templateType-${appId}`, _templateType)
           } else {
-            LocalStorage.set('templateType', data[0].type)
+            LocalStorage.set(`templateType-${appId}`, data[0].type)
           }
 
           if (_dirId) {
@@ -577,7 +578,7 @@ const AssetTree = (props) => {
             value={currentTemplateType}
             onChange={(val) => {
               setTemplateType(val)
-              LocalStorage.set('templateType', val);
+              LocalStorage.set(`templateType-${appId}`, val);
               setCurrentDirId();
               onSelect?.('', '');
               getAllDirectoryAsTree(false)