模型管理员权限

src/model/datamodel.js

@@ -332,4 +332,8 @@ export function* getConfigPrivilege() {
 
 export function* getDesignPrivilege() {
   return yield call(datamodelerService.getDesignPrivilege);
+}
+
+export function* getPrivilegeAdmin() {
+  return yield call(datamodelerService.getPrivilegeAdmin);
 }
\ No newline at end of file

src/service/datamodeler.js

@@ -283,4 +283,8 @@ export function getConfigPrivilege() {
 
 export function getDesignPrivilege() {
   return GetJSON("/datamodeler/easyDataModelerPrivilegeProvider/getDesignPrivilege");
+}
+
+export function getPrivilegeAdmin() {
+  return Get("/datamodeler/easyDataModelerPrivilegeProvider/getAdmin");
 }
\ No newline at end of file

src/view/Manage/Model/Component/ExpandedModelTable.jsx

@@ -5,7 +5,7 @@ import { Resizable } from 'react-resizable';
 import ResizeObserver from 'rc-resize-observer';
 
 import { dispatch } from '../../../../model'; 
-import { isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
+import { isSzseEnv, formatDate } from '../../../../util';
 
 // import Tag from "../../Tag";
 

src/view/Manage/Model/Component/ModelTable.jsx

@@ -4,7 +4,7 @@ import LocalStorage from 'local-storage';
 
 import DataGrid, { defaultPageSize } from '../../VirtualTable';
 import { dispatch } from '../../../../model'; 
-import { showMessage, getQueryParam, isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
+import { showMessage, getQueryParam, isSzseEnv, formatDate } from '../../../../util';
 import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId } from '../../../../util/constant';
 import ExpandedModelTable from "./ExpandedModelTable";
 // import Tag from "../../Tag";

src/view/Manage/Model/Component/ModelTree.jsx

@@ -6,7 +6,7 @@ import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify"
 
 import UpdateTreeItemModal from './UpdateTreeItemModal';
 import { dispatch } from '../../../../model'; 
-import { showMessage, getQueryParam, highlightSearchContentByTerms, getDataModelerRole } from '../../../../util';
+import { showMessage, getQueryParam, highlightSearchContentByTerms } from '../../../../util';
 import { AnchorDirId, AnchorId, AnchorTimestamp, DataModelerRoleAdmin } from '../../../../util/constant';
 import { AppContext } from "../../../../App";
 
@@ -55,6 +55,7 @@ const ModelTree = (props) => {
   const [ searchKeyword, setSearchKeyword ] = useState('');
   const [ dataList, setDataList ] = useState([]);
   const [options, setOptions] = useState([]);
+  const [ isAdmin, setAdmin ] = useState(false);
 
   const [modal, contextHolder] = Modal.useModal();
 
@@ -64,6 +65,7 @@ const ModelTree = (props) => {
 
   useEffect(() => {
     getShowSyncAndDomains();
+    getPrivilegeAdmin();
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [])
 
@@ -124,6 +126,15 @@ const ModelTree = (props) => {
     });
   }
 
+  const getPrivilegeAdmin = () => {
+    dispatch({
+      type: 'datamodel.getPrivilegeAdmin',
+      callback: data => {
+        setAdmin(data);
+      }
+    });
+  }
+
   const getDataModelLocationThenGetDirTreeData = () => {
     setLoading(true);
     dispatch({
@@ -503,7 +514,7 @@ const ModelTree = (props) => {
           borderBottom: "1px solid #EFEFEF",
           height: 57,
           alignItems: 'center',
-          justifyContent: (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin)?'space-between':'',
+          justifyContent: (viewSelectedKey==='dir' && isAdmin)?'space-between':'',
         }}
       >
         <Dropdown overlay={exportMenu} placement="bottomLeft">
@@ -513,14 +524,14 @@ const ModelTree = (props) => {
         </Dropdown>
 
         {
-          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && ( 
+          (viewSelectedKey==='dir' && isAdmin) && ( 
             <Tooltip title="新增目录" className='ml-2'>
               <PlusOutlined className='default' onClick={add} style={{ fontSize:16,cursor:'pointer' }} />
             </Tooltip>
           )
         }     
         {
-          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && ( 
+          (viewSelectedKey==='dir' && isAdmin) && ( 
             <Tooltip title="存量模型导入" className='ml-2'>
               <ImportOutlined className='default' onClick={() => { importStockModel && importStockModel() }} style={{ fontSize:16,cursor:'pointer' }} />
             </Tooltip>
@@ -532,7 +543,7 @@ const ModelTree = (props) => {
         </Tooltip>
 
         {
-          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && !isSetRootId && (
+          (viewSelectedKey==='dir' && isAdmin) && !isSetRootId && (
             <Dropdown overlay={syncMenu} placement="bottomLeft"> 
               <Tooltip title="同步目录">
                 <SyncOutlined className='default ml-2' style={{ fontSize:16,cursor:'pointer' }} />
@@ -542,7 +553,7 @@ const ModelTree = (props) => {
         } 
 
         {
-          (viewSelectedKey==='dir' && getDataModelerRole(user)===DataModelerRoleAdmin) && isSetRootId && (
+          (viewSelectedKey==='dir' && isAdmin) && isSetRootId && (
               <Tooltip title="同步目录" className='ml-2'>
                 <Button type='text' icon={<SyncOutlined className='default' />} size='small' onClick={sync} />
               </Tooltip>
@@ -588,7 +599,7 @@ const ModelTree = (props) => {
               return <span title={nodeData?.remark||''}>{nodeData?.name||''}</span>;
             }}
             onRightClick={({event, node}) => {
-              if (viewSelectedKey==='dir'&& getDataModelerRole(user)===DataModelerRoleAdmin) {
+              if (viewSelectedKey==='dir'&& isAdmin) {
                 setCurrentRightClickDir(node);
                 displayMenu(event);
               }

src/view/Manage/Model/index.jsx

@@ -14,7 +14,7 @@ import ExportOtherModal from './Component/ExportOtherModal';
 import RecatalogModal from './Component/RecatalogModal';
 import HistoryAndVersionDrawer from './Component/HistoryAndVersionDrawer';
 import StartFlowModal from './Component/StartFlowModal';
-import { showMessage, showNotifaction, inputWidth, DeleteTipModal, getDataModelerRole } from '../../../util';
+import { showMessage, showNotifaction, inputWidth, DeleteTipModal } from '../../../util';
 import { dispatch, dispatchLatestHomepage } from '../../../model'; 
 import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder, DDL, ReadOnly } from '../../../util/constant';
 import { AppContext } from '../../../App';