模型权限

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

@@ -6,7 +6,6 @@ import ResizeObserver from 'rc-resize-observer';
 
 import { dispatch } from '../../../../model'; 
 import { isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
-import { DataModelerRoleReader } from '../../../../util/constant';
 
 // import Tag from "../../Tag";
 
@@ -288,7 +287,7 @@ const ExpandedModelTable = (props) => {
   }
 
   const detailItem = (record) => {
-    onItemAction && onItemAction(record, 'detail', getDataModelerRole(user)===DataModelerRoleReader);
+    onItemAction && onItemAction(record, 'detail');
   }
   const onExpandedSelectChange = keys => {
     setSelectedRowKeys(keys);

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

@@ -5,7 +5,7 @@ import LocalStorage from 'local-storage';
 import DataGrid, { defaultPageSize } from '../../VirtualTable';
 import { dispatch } from '../../../../model'; 
 import { showMessage, getQueryParam, isSzseEnv, formatDate, getDataModelerRole } from '../../../../util';
-import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId, DataModelerRoleReader } from '../../../../util/constant';
+import { AnchorId, AnchorTimestamp, Action, CatalogId, ModelerId } from '../../../../util/constant';
 import ExpandedModelTable from "./ExpandedModelTable";
 // import Tag from "../../Tag";
 import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
@@ -305,7 +305,7 @@ const ModelTable = (props) => {
   }
 
   const detailItem = (record) => {
-    onItemAction && onItemAction(record, 'detail', getDataModelerRole(user)===DataModelerRoleReader);
+    onItemAction && onItemAction(record, 'detail');
   }
 
   const deployAction = (record) => {
@@ -532,30 +532,26 @@ const ModelTable = (props) => {
         getComparator={getComparator}
       />
       <RcMenu id={MENU_ID}>
-      {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <PermissionRcItem 
-            id="edit" 
-            disabled={disableEdit} 
-            onClick={handleItemClick}
-            tip={editTip}
-            permissionKey='编辑'
-            permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
-          >
-            { editMenuTitle }
-          </PermissionRcItem>
-        }
-        {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <PermissionRcItem 
-            id="delete" 
-            disabled={disableDelete} 
-            onClick={handleItemClick}
-            tip={deleteTip}
-            permissionKey='删除'
-            permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
-          >
-            删除
-          </PermissionRcItem>
-        }
+        <PermissionRcItem 
+          id="edit" 
+          disabled={disableEdit} 
+          onClick={handleItemClick}
+          tip={editTip}
+          permissionKey='编辑'
+          permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
+        >
+          { editMenuTitle }
+        </PermissionRcItem>
+        <PermissionRcItem 
+          id="delete" 
+          disabled={disableDelete} 
+          onClick={handleItemClick}
+          tip={deleteTip}
+          permissionKey='删除'
+          permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
+        >
+          删除
+        </PermissionRcItem>
         <PermissionRcItem 
           id="history" 
           onClick={handleItemClick}
@@ -564,18 +560,16 @@ const ModelTable = (props) => {
         >
           历史版本
         </PermissionRcItem>
+        <PermissionRcItem 
+          id="copy" 
+          onClick={handleItemClick}
+          permissionKey='新增'
+          permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
+        >
+          复制模型
+        </PermissionRcItem>
         {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <PermissionRcItem 
-            id="copy" 
-            onClick={handleItemClick}
-            permissionKey='新增'
-            permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
-          >
-            复制模型
-          </PermissionRcItem>
-        }
-        {
-          getDataModelerRole(user)!==DataModelerRoleReader && (currentItem?.state?.supportedActions||[]).length>0 && currentItem?.state?.supportedActions.map((item, index) => {
+          (currentItem?.state?.supportedActions||[]).length>0 && currentItem?.state?.supportedActions.map((item, index) => {
             return (
               <PermissionRcItem 
                 id={`action-${index}`} 
@@ -589,7 +583,12 @@ const ModelTable = (props) => {
           }) 
         }
         {
-          getDataModelerRole(user)!==DataModelerRoleReader &&currentItem?.deployable && <PermissionRcItem id='createTable' onClick={handleItemClick}>
+          currentItem?.deployable && <PermissionRcItem 
+          id='createTable' 
+          onClick={handleItemClick}
+          permissionKey='建表'
+          permissions={currentItem?.optionList?.filter(item => item.enabled).map(item => item.name)}
+          >
           建表
           </PermissionRcItem>
         }

src/view/Manage/Model/index.jsx

@@ -16,7 +16,7 @@ import HistoryAndVersionDrawer from './Component/HistoryAndVersionDrawer';
 import StartFlowModal from './Component/StartFlowModal';
 import { showMessage, showNotifaction, inputWidth, DeleteTipModal, getDataModelerRole } from '../../../util';
 import { dispatch, dispatchLatestHomepage } from '../../../model'; 
-import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder, DDL, DataModelerRoleReader, ReadOnly } from '../../../util/constant';
+import { Action, CatalogId, ModelerId, Hints, ModelerData, PermitCheckOut, Editable, StateId, Holder, DDL, ReadOnly } from '../../../util/constant';
 import { AppContext } from '../../../App';
 import DebounceInput from './Component/DebounceInput';
 import ColSettingModal from './Component/ColSettingModal';
@@ -569,67 +569,63 @@ class Model extends React.Component {
             }}
           > 
             <Space>
-            {
-              (getDataModelerRole(value?.user)!==DataModelerRoleReader) && <React.Fragment>
-                <Space>
-                  <PermissionButton 
-                    defaultPermission={canAdd} 
-                    onClick={() => { this.setState({ importModalVisible: true }); }}
-                  >
-                    新建
-                  </PermissionButton>
-                </Space>
+              <Space>
+                <PermissionButton 
+                  defaultPermission={canAdd} 
+                  onClick={() => { this.setState({ importModalVisible: true }); }}
+                >
+                  新建
+                </PermissionButton>
+              </Space>
 
-                <Space>
-                  <PermissionButton 
-                    defaultPermission={canExport} 
-                    tip={(selectModelerIds||[]).length===0?'请先选择模型':''}
-                    onClick={this.onExportOtherBtnClick} 
-                    disabled={(selectModelerIds||[]).length===0}
-                  >
-                    导出
-                  </PermissionButton>
-                </Space>
+              <Space>
+                <PermissionButton 
+                  defaultPermission={canExport} 
+                  tip={(selectModelerIds||[]).length===0?'请先选择模型':''}
+                  onClick={this.onExportOtherBtnClick} 
+                  disabled={(selectModelerIds||[]).length===0}
+                >
+                  导出
+                </PermissionButton>
+              </Space>
 
-                <Space>
-                  <PermissionButton 
-                    defaultPermission={canStartFlow} 
-                    tip={startFlowTip}
-                    onClick={this.startFlow} 
-                    disabled={disableStartFlow}
-                  >
-                    送审
-                  </PermissionButton>
-                </Space>
+              <Space>
+                <PermissionButton 
+                  defaultPermission={canStartFlow} 
+                  tip={startFlowTip}
+                  onClick={this.startFlow} 
+                  disabled={disableStartFlow}
+                >
+                  送审
+                </PermissionButton>
+              </Space>
 
-                <Space>
+              <Space>
+                <PermissionButton 
+                  defaultPermission={canChangeCatalog} 
+                  tip={(selectModelerIds||[]).length===0?'请先选择模型':''}
+                  onClick={this.onRecatalogBtnClick} 
+                  disabled={(selectModelerIds||[]).length===0}
+                >
+                  变更目录
+                </PermissionButton>
+              </Space>
+            
+              <Space>
+                <Tooltip title={canDelete?((selectModelerIds||[]).length===0?'请先选择模型':''):'暂无权限'}>
                   <PermissionButton 
-                    defaultPermission={canChangeCatalog} 
+                    defaultPermission={canDelete} 
                     tip={(selectModelerIds||[]).length===0?'请先选择模型':''}
-                    onClick={this.onRecatalogBtnClick} 
+                    onClick={this.onBatchDeleteBtnClick} 
                     disabled={(selectModelerIds||[]).length===0}
                   >
-                    变更目录
+                    删除
                   </PermissionButton>
-                </Space>
-              
-                <Space>
-                  <Tooltip title={canDelete?((selectModelerIds||[]).length===0?'请先选择模型':''):'暂无权限'}>
-                    <PermissionButton 
-                      defaultPermission={canDelete} 
-                      tip={(selectModelerIds||[]).length===0?'请先选择模型':''}
-                      onClick={this.onBatchDeleteBtnClick} 
-                      disabled={(selectModelerIds||[]).length===0}
-                    >
-                      删除
-                    </PermissionButton>
-                  </Tooltip>
-                </Space>
-                <Space>
-                  <Button onClick={this.onVisibleColSettingClick}>可见列设置</Button>
-                </Space>
-                </React.Fragment>
-            }
+                </Tooltip>
+              </Space>
+              <Space>
+                <Button onClick={this.onVisibleColSettingClick}>可见列设置</Button>
+              </Space>
             </Space>
 
             <Space>