标准修改

src/view/Manage/AssetManage/Component/SelectStandard.jsx

@@ -12,7 +12,11 @@ const FC = (props) => {
   const [total, setTotal] = useState(0);
   const [ pagination, setPagination ] = useState( { pageNum: 1, pageSize: 20 } );
   const [confirmLoading, setConfirmLoading] = useState(false);
-  const [currentTreeId, setCurrentTreeId] = useState(undefined);
+  const [currentTreeParams, setCurrentTreeParams] = useState({
+    treeId: undefined,
+    dataType: undefined,
+  });
+
   const { pageNum, pageSize } = pagination;
 
   const columns = [
@@ -58,10 +62,10 @@ const FC = (props) => {
   }, [visible])
 
   useEffect(() => {
-    if (currentTreeId) {
+    if (currentTreeParams.treeId) {
       getTableData();
     }
-  }, [pagination, currentTreeId])
+  }, [pagination, currentTreeParams])
 
   const getTreeData = () => {
     dispatch({
@@ -75,8 +79,15 @@ const FC = (props) => {
         const filterData = data?.filter(item => item.name !== '草稿');
 
         if (filterData && filterData.length > 0) {
-          setCurrentTreeId(filterData[0]._id);
+          if (filterData[0].cnName === '指标标准') {
+            setCurrentTreeParams({ treeId: filterData[0]._id, dataType: 'IndicatorStandard' });
+          } else if (filterData[0].cnName === '维度标准') {
+            setCurrentTreeParams({ treeId: filterData[0]._id, dataType: 'DimensionStandard' });
+          } else {
+            setCurrentTreeParams({ treeId: filterData[0]._id, dataType: filterData[0].type });
+          }
         } 
+
         setTreeData(filterData);
       }
     });
@@ -89,12 +100,16 @@ const FC = (props) => {
         params: {
           page: pageNum,
           size: pageSize,
-          parentId: currentTreeId,
-          keyword: ''
+          parentId: currentTreeParams.treeId,
+          keyword: '',
+          queryProperty: 'name',
         },
-        data: ["Catalog,StandardCatalog,IndicatorStandard"]
+        data: [`Catalog,StandardCatalog,${currentTreeParams.dataType}`]
       },
       callback: data => {
+        data.content?.forEach(item => {
+          item.children = null;
+        });
         setTableData(data.content);
         setTotal(data.totalElements);
       }
@@ -117,9 +132,16 @@ const FC = (props) => {
     });
   }
 
-  const onTreeSelect = (keys, _) => {
+  const onTreeSelect = (keys, {node}) => {
     if (keys.length > 0) {
-      setCurrentTreeId(keys[0]);
+      let paths = node.namePath.split(',');
+      if(paths[1]==='指标标准'){
+        setCurrentTreeParams({ treeId: keys[0], dataType: 'IndicatorStandard' });
+      }else if(paths[1]==='维度标准'){
+        setCurrentTreeParams({ treeId: keys[0], dataType: 'DimensionStandard' });
+      }else{
+        setCurrentTreeParams({ treeId: keys[0], dataType: node.type });
+      }
     }
   }
 
@@ -157,7 +179,7 @@ const FC = (props) => {
             showIcon={false}
             treeData={loop(treeData)}
             onSelect={onTreeSelect} 
-            selectedKeys={currentTreeId ? [currentTreeId]: undefined}
+            selectedKeys={currentTreeParams.treeId ? [currentTreeParams.treeId]: undefined}
           />
         </Col>
         <Col span={1}>

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

@@ -173,21 +173,6 @@ const ModelTable = (props) => {
       }
     },
     {
-      title: '中文名称',
-      dataIndex: 'cnName',
-      width: isSzseEnv?420:160,
-      ellipsis: true,
-      sorter: true,
-      sortDirections: ['ascend', 'descend'],
-      render: (text, _, __) => {
-        return (
-          <Tooltip title={text||''}>
-            <Text ellipsis={true}>{text||''}</Text>
-          </Tooltip>
-        )
-      }
-    },
-    {
       title: 'URI',
       dataIndex: 'odata',
       ellipsis: true,
@@ -210,6 +195,21 @@ const ModelTable = (props) => {
       }
     },
     {
+      title: '中文名称',
+      dataIndex: 'cnName',
+      width: isSzseEnv?420:160,
+      ellipsis: true,
+      sorter: true,
+      sortDirections: ['ascend', 'descend'],
+      render: (text, _, __) => {
+        return (
+          <Tooltip title={text||''}>
+            <Text ellipsis={true}>{text||''}</Text>
+          </Tooltip>
+        )
+      }
+    },
+    {
       title: '路径',
       dataIndex: 'path',
       width: 120,