路径

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

@@ -179,6 +179,21 @@ const ModelTable = (props) => {
       }
     },
     {
+      title: '路径',
+      dataIndex: 'path',
+      width: 120,
+      ellipsis: true,
+      sorter: true,
+      sortDirections: ['ascend', 'descend'],
+      render: (text, _, __) => {
+        return (
+          <Tooltip title={text||''}>
+            <Text ellipsis={true}>{text||''}</Text>
+          </Tooltip>
+        )
+      }
+    },
+    {
       title: '状态',
       dataIndex: 'state',
       width: 100,
@@ -257,24 +272,8 @@ const ModelTable = (props) => {
     },
   ];
 
-  const pathColumn = {
-    title: '路径',
-    dataIndex: 'path',
-    width: 120,
-    ellipsis: true,
-    sorter: true,
-    sortDirections: ['ascend', 'descend'],
-    render: (text, _, __) => {
-      return (
-        <Tooltip title={text||''}>
-          <Text ellipsis={true}>{text||''}</Text>
-        </Tooltip>
-      )
-    }
-  };
-
   const [ columns, setColumns ] = useState([]);
-  const [ includePathColumns, setIncludePathColumns ] = useState([]);
+  // const [ includePathColumns, setIncludePathColumns ] = useState([]);
   const [ pagination, setPagination ] = useState( { pageNum: 1, pageSize: 20 } );
   const [ currentItem, setCurrentItem ] = useState(null);
   const { pageNum, pageSize } = pagination;
@@ -388,17 +387,17 @@ const ModelTable = (props) => {
 
   useEffect(() => {
     if (tableWidth>0 && columns.length===0) {
-      let newColumns = [], newIncludePathColumns = [];
+      let newColumns = [];
 
-      let excludePathCols = [...cols];
+      let newCols = [...cols];
       if ((modelId||'') !== '') {
-        excludePathCols = cols.filter(item => item.dataIndex!=='key');
+        newCols = cols.filter(item => item.dataIndex!=='key');
       }
 
-      excludePathCols.forEach((column, index) => {
+      newCols.forEach((column, index) => {
         const newColumn = {...column}; 
         if (!newColumn.width) {
-          const rowWidth = (excludePathCols.reduce((preVal, col) => (col.width?col.width:0) + preVal, 0)) + 97; //展开50 勾选32 滚动条15
+          const rowWidth = (newCols.reduce((preVal, col) => (col.width?col.width:0) + preVal, 0)) + 97; //展开50 勾选32 滚动条15
           
           if (tableWidth - rowWidth > 200) {
             newColumn.width = tableWidth - rowWidth;        
@@ -410,26 +409,26 @@ const ModelTable = (props) => {
         newColumns.push(newColumn);
       });
 
-      const includePathCols = [...cols];
-      includePathCols.splice(3, 0, pathColumn);
+      // const includePathCols = [...cols];
+      // includePathCols.splice(3, 0, pathColumn);
 
-      includePathCols.forEach((column, index) => {
-        const newColumn = {...column}; 
-        if (!newColumn.width) {
-          const rowWidth = (includePathCols.reduce((preVal, col) => (col.width?col.width:0) + preVal, 0)) + 97;
+      // includePathCols.forEach((column, index) => {
+      //   const newColumn = {...column}; 
+      //   if (!newColumn.width) {
+      //     const rowWidth = (includePathCols.reduce((preVal, col) => (col.width?col.width:0) + preVal, 0)) + 97;
           
-          if (tableWidth - rowWidth > 200) {
-            newColumn.width = tableWidth-rowWidth;        
-          } else {
-            newColumn.width = 200;
-          }
-        }
+      //     if (tableWidth - rowWidth > 200) {
+      //       newColumn.width = tableWidth-rowWidth;        
+      //     } else {
+      //       newColumn.width = 200;
+      //     }
+      //   }
 
-        newIncludePathColumns.push(newColumn);
-      });
+      //   newIncludePathColumns.push(newColumn);
+      // });
 
       setColumns([ ...newColumns, <Column key='auto' />]);
-      setIncludePathColumns([ ...newIncludePathColumns, <Column key='auto' />]);
+      // setIncludePathColumns([ ...newIncludePathColumns, <Column key='auto' />]);
     }
     //eslint-disable-next-line react-hooks/exhaustive-deps
   }, [ tableWidth ])
@@ -583,20 +582,16 @@ const ModelTable = (props) => {
   const handleResize = index => (e, { size }) => {
     let nextColumns = [...columns];
 
-    if ((modelId||'')==='' && (view==='state'||(keyword||'')!=='')) {
-      nextColumns = [...includePathColumns];
-    }
+    // if ((modelId||'')==='' && (view==='state'||(keyword||'')!=='')) {
+    //   nextColumns = [...includePathColumns];
+    // }
     
     nextColumns[index] = {
       ...nextColumns[index],
       width: size.width,
     };
 
-    if ((modelId||'')==='' && (view==='state'||(keyword||'')!=='')) {
-      setIncludePathColumns(nextColumns);
-    } else {
-      setColumns(nextColumns);
-    }
+    setColumns(nextColumns);
   };
 
   const onTableChange = (pagination, filters, sorter, extra) => {
@@ -680,9 +675,9 @@ const ModelTable = (props) => {
 
   const mergedColumns = () => {
     let newColumns = [...columns];
-    if ((modelId||'')==='' && (view==='state'||(keyword||'')!=='')) {
-      newColumns = [...includePathColumns];
-    }
+    // if ((modelId||'')==='' && (view==='state'||(keyword||'')!=='')) {
+    //   newColumns = [...includePathColumns];
+    // }
 
     return (
       newColumns.map((col, index) => ({