模型右键权限

src/util/Component/PermissionButton.jsx

@@ -2,7 +2,7 @@ import React, { useMemo } from 'react';
 import { Button, Tooltip } from 'antd';
 
 const FC = (props) => {
-  const { permissionKey, permissions, ...restProps } = props;
+  const { permissionKey, permissions, tip, ...restProps } = props;
 
   const havePermission = useMemo(() => {
     let _havePermission = true;
@@ -18,7 +18,7 @@ const FC = (props) => {
   }, [permissionKey, permissions])
 
   return (
-    <Tooltip title={havePermission?'':'暂无权限'}>
+    <Tooltip title={havePermission?tip:'暂无权限'}>
       <Button {...restProps} disabled={!havePermission} />
     </Tooltip>
   )

src/util/Component/PermissionRcItem.jsx

+import React, { useMemo } from 'react';
+import { Tooltip } from 'antd';
+import { Item as RcItem } from "react-contexify";
+
+const FC = (props) => {
+  const { permissionKey, permissions, tip, children, ...restProps } = props;
+
+  const havePermission = useMemo(() => {
+    let _havePermission = true;
+
+    if (permissionKey) {
+      const index = (permissions||[]).findIndex(item => item.name === permissionKey);
+      if (index !== -1) {
+        _havePermission = permissions[index].enabled ?? true;
+      }
+    }
+    
+    return _havePermission;
+  }, [permissionKey, permissions])
+
+  return (
+    <RcItem {...restProps}>
+      <Tooltip title={havePermission?tip:'暂无权限'}>
+      {children}
+      </Tooltip>
+    </RcItem>
+  )
+}
+
+export default FC;
\ No newline at end of file

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

@@ -12,6 +12,7 @@ import HistoryAndVersionDrawer from './HistoryAndVersionDrawer';
 import { EditModelContext } from './ContextManage';
 import EditInherited from './EditInherited';
 import { ImportActionHeaderSubject } from './ImportActionHeader';
+import PermissionButton from '../../../../util/Component/PermissionButton';
 
 import './EditModel.less';
 
@@ -313,28 +314,48 @@ const EditModel = (props) => {
 
     actionsBtn = (
       <Space>
-        <Button type='primary' onClick={onHistory} danger >版本历史</Button>
+        <PermissionButton 
+          type='primary' 
+          onClick={onHistory} 
+          danger 
+          permissionKey='历史版本'
+          permissions={modelerData?.optionList} 
+        >
+          版本历史
+        </PermissionButton>
         {
           readOnly!=='true' && <Space>
               {
-                !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
-                  if (importActionRef.current && importActionRef.current.isLoading()) {
-                    showMessage("warn", '正在加载中,请稍后!');
-                    return;
-                  }
-
-                  setActionData({ ...actionData, action: 'edit-inherited' });
-                  actionRef.current = 'edit-inherited';
-                  setEditInheritedParms({visible: true, modelerData});
-                }} danger >
+                !modelerData?.inheritedFromEasyDataModelerDataModel && <PermissionButton 
+                  type='primary' 
+                  onClick={() => {
+                    if (importActionRef.current && importActionRef.current.isLoading()) {
+                      showMessage("warn", '正在加载中,请稍后!');
+                      return;
+                    }
+
+                    setActionData({ ...actionData, action: 'edit-inherited' });
+                    actionRef.current = 'edit-inherited';
+                    setEditInheritedParms({visible: true, modelerData});
+                  }} 
+                  danger
+                  permissionKey='编辑'
+                  permissions={modelerData?.optionList} 
+                >
                 编辑历史存储形式
-              </Button>
+              </PermissionButton>
               }
-              <Tooltip title={editTip}>
-                <Button type='primary' onClick={edit} disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)} danger >
-                  编辑
-                </Button>
-              </Tooltip>
+              <PermissionButton 
+                type='primary' 
+                onClick={edit} 
+                disabled={ modelerData?.inheritedFromEasyDataModelerDataModel?true:((stateId==='4')?!permitCheckOut:!editable)} 
+                danger 
+                tip={editTip}
+                permissionKey='编辑'
+                permissions={modelerData?.optionList}
+              >
+                编辑
+              </PermissionButton>
             </Space>
         }
       </Space>
@@ -345,9 +366,15 @@ const EditModel = (props) => {
         <Button onClick={cancelEdit} >
         取消
         </Button>
-        <Button type='primary' onClick={onHistory} danger >
+        <PermissionButton 
+          type='primary' 
+          onClick={onHistory} 
+          danger 
+          permissionKey='历史版本'
+          permissions={modelerData?.optionList}
+        >
           版本历史
-        </Button>
+        </PermissionButton>
         <Button 
           type='primary' 
           onClick={save}
@@ -361,27 +388,45 @@ const EditModel = (props) => {
   } else if (action === 'flow') {
     actionsBtn = (
       <Space>
-        <Button type='primary' onClick={onHistory} danger>
+        <PermissionButton 
+          type='primary' 
+          onClick={onHistory} 
+          danger
+          permissionKey='历史版本'
+          permissions={modelerData?.optionList}
+        >
         版本历史
-        </Button>
+        </PermissionButton>
         {
-          !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
-              if (importActionRef.current && importActionRef.current.isLoading()) {
-                showMessage("warn", '正在加载中,请稍后!');
-                return;
-              }
+          !modelerData?.inheritedFromEasyDataModelerDataModel && <PermissionButton 
+              type='primary' 
+              onClick={() => {
+                if (importActionRef.current && importActionRef.current.isLoading()) {
+                  showMessage("warn", '正在加载中,请稍后!');
+                  return;
+                }
 
-              setActionData({ ...actionData, action: 'edit-inherited' });
-              actionRef.current = 'edit-inherited';
-              setEditInheritedParms({visible: true, modelerData});
-            }} danger >
+                setActionData({ ...actionData, action: 'edit-inherited' });
+                actionRef.current = 'edit-inherited';
+                setEditInheritedParms({visible: true, modelerData});
+              }} 
+              danger 
+              permissionKey='编辑'
+              permissions={modelerData?.optionList}
+            >
             编辑历史存储形式
-          </Button>
+          </PermissionButton>
         }
         {
-          !modelerData?.inheritedFromEasyDataModelerDataModel && editable && <Button type='primary' onClick={edit} danger >
+          !modelerData?.inheritedFromEasyDataModelerDataModel && editable && <PermissionButton 
+            type='primary' 
+            onClick={edit} 
+            danger 
+            permissionKey='编辑'
+            permissions={modelerData?.optionList}
+          >
           编辑
-          </Button>
+          </PermissionButton>
         }
       </Space>
     );

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

@@ -9,6 +9,7 @@ import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId, DataModelerRol
 import ExpandedModelTable from "./ExpandedModelTable";
 // import Tag from "../../Tag";
 import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
+import PermissionRcItem from '../../../../util/Component/PermissionRcItem';
 
 import './ModelTable.less';
 import 'react-contexify/dist/ReactContexify.css';
@@ -532,20 +533,35 @@ const ModelTable = (props) => {
       />
       <RcMenu id={MENU_ID}>
       {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <RcItem id="edit" disabled={disableEdit} onClick={handleItemClick}>
-            <Tooltip title={editTip}>
+          (getDataModelerRole(user)!==DataModelerRoleReader) && <PermissionRcItem 
+            id="edit" 
+            disabled={disableEdit} 
+            onClick={handleItemClick}
+            tip={editTip}
+            permissionKey='编辑'
+            permissions={currentItem?.optionList}
+          >
             { editMenuTitle }
-            </Tooltip>
-          </RcItem>
+          </PermissionRcItem>
         }
         {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <RcItem id="delete" disabled={disableDelete} onClick={handleItemClick}>
-            <Tooltip title={deleteTip}>
-              删除
-            </Tooltip>
-          </RcItem>
+          (getDataModelerRole(user)!==DataModelerRoleReader) && <PermissionRcItem 
+            id="delete" 
+            disabled={disableDelete} 
+            onClick={handleItemClick}
+            tip={deleteTip}
+            permissionKey='删除'
+            permissions={currentItem?.optionList}
+          >
+            删除
+          </PermissionRcItem>
         }
-        <RcItem id="history" onClick={handleItemClick}>
+        <RcItem 
+          id="history" 
+          onClick={handleItemClick}
+          permissionKey='历史版本'
+          permissions={currentItem?.optionList}
+        >
           历史版本
         </RcItem>
         {