去掉展开功能

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

@@ -215,7 +215,6 @@ const ModelTable = (props) => {
   };
 
   const [ pagination, setPagination ] = useState( { pageNum: 1, pageSize: 20 } );
-  const [ currentItem, setCurrentItem ] = useState(null);
   const { pageNum, pageSize } = pagination;
   
   const [modal, contextHolder] = Modal.useModal();
@@ -478,101 +477,91 @@ const ModelTable = (props) => {
     }
   } 
 
-  const displayMenu = (e) => {
-    show(e);
-  }
-
-  const handleItemClick = ({ event, props, data, triggerEvent }) => {
-    const key = event.currentTarget.id;
+  const handleItemClick = (e, data) => {
+    const { key, item } = data;
 
     if (key === 'edit') {
-      editItem(currentItem);
+      editItem(item);
     } else if (key === 'delete') {
-      deleteItem(currentItem);
+      deleteItem(item);
     } else if (key === 'history') {
-      historyItem(currentItem);
+      historyItem(item);
     } else if (key === 'copy') {
-      window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${currentItem.id}`);
+      window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${item.id}`);
     } else if (key === 'createTable') {
-      deployAction(currentItem);
+      deployAction(item);
     } else if (key.indexOf('action') !== -1) {
       const index = (key.split('-'))[1];
-      const action = currentItem?.state?.supportedActions[index];
-      stateAction(currentItem, action);
+      const action = item?.state?.supportedActions[index];
+      stateAction(item, action);
     }
   } 
 
   const onMenuRender = (row) => {
-    if (row) {
-      setCurrentItem(row);
+    let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑';
 
-      let disableEdit = false, disableDelete = false, editTip = '', deleteTip = '', editMenuTitle = '编辑';
+    if (!row?.editable && row?.state?.id!=='4') {
+      disableEdit = true;
 
-      if (!row?.editable && row?.state?.id!=='4') {
-        disableEdit = true;
-
-        if (row?.state?.id === '2') {
-          editTip = '待发布的模型不允许编辑';
-        }
+      if (row?.state?.id === '2') {
+        editTip = '待发布的模型不允许编辑';
       }
+    }
 
-      if (!row?.permitCheckOut && row?.state?.id==='4') {
-        disableEdit = true;
-        editTip = `${row.holder||''}正在编辑中, 不允许再编辑`;
-        editMenuTitle = `编辑(${row.holder||''}正在编辑中)`;
-      }
+    if (!row?.permitCheckOut && row?.state?.id==='4') {
+      disableEdit = true;
+      editTip = `${row.holder||''}正在编辑中, 不允许再编辑`;
+      editMenuTitle = `编辑(${row.holder||''}正在编辑中)`;
+    }
 
-      if (!row?.deletable) {
-        disableDelete = true;
+    if (!row?.deletable) {
+      disableDelete = true;
 
-        if (row?.state?.id === '2') {
-          deleteTip = '待发布的模型不允许删除';
-        } else if (row?.state?.id === '4') {
-          deleteTip = '已发布的模型不允许删除';
-        }
+      if (row?.state?.id === '2') {
+        deleteTip = '待发布的模型不允许删除';
+      } else if (row?.state?.id === '4') {
+        deleteTip = '已发布的模型不允许删除';
       }
-
-      return <React.Fragment>
-        {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem id="edit" disabled={disableEdit} onClick={handleItemClick}>
-            <Tooltip title={editTip}>
-            { editMenuTitle }
-            </Tooltip>
-          </MenuItem>
-        }
-        {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem id="delete" disabled={disableDelete} onClick={handleItemClick}>
-            <Tooltip title={deleteTip}>
-              删除
-            </Tooltip>
-          </MenuItem>
-        }
-        <MenuItem id="history" onClick={handleItemClick}>
-          历史版本
-        </MenuItem>
-        {
-          (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem id="copy" onClick={handleItemClick}>
-            复制模型
-          </MenuItem>
-        }
-        {
-          getDataModelerRole(user)!==DataModelerRoleReader && (row?.state?.supportedActions||[]).length>0 && row?.state?.supportedActions.map((item, index) => {
-            return (
-              <MenuItem id={`action-${index}`} onClick={handleItemClick}>
-              {item.cnName||''}
-              </MenuItem>
-            );
-          }) 
-        }
-        {
-          getDataModelerRole(user)!==DataModelerRoleReader &&currentItem?.deployable && <MenuItem id='createTable' onClick={handleItemClick}>
-          建表
-          </MenuItem>
-        }
-      </React.Fragment>
     }
 
-    return <React.Fragment></React.Fragment>;
+    return <React.Fragment>
+      {
+        (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem key='edit' data={{ key: 'edit', item: row }} disabled={disableEdit} onClick={handleItemClick}>
+          <Tooltip title={editTip}>
+          { editMenuTitle }
+          </Tooltip>
+        </MenuItem>
+      }
+      {
+        (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem data={{ key: 'delete', item: row }} disabled={disableDelete} onClick={handleItemClick}>
+          <Tooltip title={deleteTip}>
+            删除
+          </Tooltip>
+        </MenuItem>
+      }
+      <MenuItem data={{ key: 'history', item: row }} onClick={handleItemClick}>
+        历史版本
+      </MenuItem>
+      {
+        (getDataModelerRole(user)!==DataModelerRoleReader) && <MenuItem data={{ key: 'copy', item: row }} onClick={handleItemClick}>
+          复制模型
+        </MenuItem>
+      }
+      {
+        getDataModelerRole(user)!==DataModelerRoleReader && (row?.state?.supportedActions||[]).length>0 && row?.state?.supportedActions.map((item, index) => {
+          return (
+            <MenuItem key={index} data={{ key: `action-${index}`, item: row }} onClick={handleItemClick}>
+            {item.cnName||''}
+            </MenuItem>
+          );
+        }) 
+      }
+      {
+        getDataModelerRole(user)!==DataModelerRoleReader &&row?.deployable && <MenuItem data={{ key: "createTable", item: row }} onClick={handleItemClick}>
+        建表
+        </MenuItem>
+      }
+    </React.Fragment>
   }
 
   return (
@@ -588,7 +577,7 @@ const ModelTable = (props) => {
         contextMenu={{
           menu: onMenuRender
         }}
-        expandRow={expandRow}
+        // expandRow={expandRow}
         selectedRows={modelId?subSelectedRowKeys:selectedRowKeys}
         onSelectedRowsChange={onSelectChange}
         getComparator={getComparator}