模型增加路径

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

@@ -156,6 +156,19 @@ const ExpandedModelTable = (props) => {
       }
     },
     {
+      title: '路径',
+      dataIndex: 'path',
+      width: 120,
+      ellipsis: true,
+      render: (text, _, __) => {
+        return (
+          <Tooltip title={text||''}>
+            <Text ellipsis={true}>{text||''}</Text>
+          </Tooltip>
+        )
+      }
+    },
+    {
       title: '状态',
       dataIndex: 'state',
       width: 100,
@@ -226,20 +239,6 @@ const ExpandedModelTable = (props) => {
     },
   ];
 
-  const pathColumn = {
-    title: '路径',
-    dataIndex: 'path',
-    width: 120,
-    ellipsis: true,
-    render: (text, _, __) => {
-      return (
-        <Tooltip title={text||''}>
-          <Text ellipsis={true}>{text||''}</Text>
-        </Tooltip>
-      )
-    }
-  };
-
   useEffect(() => {
     setSelectedRowKeys(checked?[id]:[]);
     if (dataMap.has(id)) {
@@ -253,9 +252,6 @@ const ExpandedModelTable = (props) => {
   useEffect(() => {
     if (tableWidth>0 && columns.length===0) {
       let newColumns = [...cols];
-      if (view==='state' || (keyword||'')!=='') {
-        newColumns.splice(3, 0, pathColumn);
-      }
 
       newColumns.forEach((column, index) => {
         if (!column.width) {

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

@@ -147,6 +147,20 @@ const ModelTable = (props) => {
       }
     },
     {
+      name: '路径',
+      key: 'path',
+      width: 120,
+      sortable: true, 
+      resizable: true,
+      formatter(props) {
+        return (
+          <Tooltip title={props.row.path||''}>
+            <Text ellipsis={true}>{props.row.path||''}</Text>
+          </Tooltip>
+        )
+      }
+    },
+    {
       name: '状态',
       key: 'state',
       width: 100,
@@ -202,30 +216,6 @@ const ModelTable = (props) => {
     },
   ];
 
-  const pathColumn = {
-    name: '路径',
-    key: 'path',
-    width: 120,
-    sortable: true, 
-    resizable: true,
-    formatter(props) {
-      return (
-        <Tooltip title={props.row.path||''}>
-          <Text ellipsis={true}>{props.row.path||''}</Text>
-        </Tooltip>
-      )
-    }
-  };
-
-  const columns = useMemo(() => {
-    const newColumns = [...cols];
-    if (view==='state' || (keyword||'')!=='') {
-      newColumns.splice(3, 0, pathColumn);
-    }
-    return newColumns;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [view, keyword]);
-
   const summarySelectedCount = useMemo(() => {
     let newSelectedRowKeys = Array.from(new Set([...selectedRowKeys, ...expandedSelectedRowKeys]));
 
@@ -491,7 +481,7 @@ const ModelTable = (props) => {
         gridRef={gridRef}
         style={{ blockSize: 'calc(100vh - 94px - 37px - 57px - 24px - 32px)' }}
         checkable
-        columns={columns}
+        columns={cols}
         rows={data||[]}
         rowHeight={51}
         rowClassName={(row) => {