修改bug

src/view/Manage/AssetBrowse/index.jsx

@@ -87,12 +87,12 @@ const AssetBrowse = (props) => {
         <Separate height={15} />
         <div className='flex' style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
           {
-            expandRelation && <React.Fragment>
-              <div style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
-                <RelationContainer reference={reference} nodeParams={nodeParams} onChange={onRelationChange} resize={resizeRelation} />
-              </div>
-              <Separate width={15} />
-            </React.Fragment>
+            // expandRelation && <React.Fragment>
+            //   <div style={{ flex: 1, height: '100%', overflow: 'hidden' }}>
+            //     <RelationContainer reference={reference} nodeParams={nodeParams} onChange={onRelationChange} resize={resizeRelation} />
+            //   </div>
+            //   <Separate width={15} />
+            // </React.Fragment>
           }
           <div style={{ flex: 1, overflow: 'hidden' }}>
             <AssetTable nodeId={nodeId} nodeType={nodeParams.nodeType} reference={reference} onCountChange={onAssetCountChange} onFullScreenChange={onFullScreenChange} {...props} />
@@ -101,9 +101,9 @@ const AssetBrowse = (props) => {
         <div className='tree-toggle' onClick={treeToggleClick}>
         { expandTree ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
         </div>
-        <div className='relation-toggle' onClick={relationToggleClick}>
+        {/* <div className='relation-toggle' onClick={relationToggleClick}>
           { expandRelation ? <CaretLeftOutlined /> : <CaretRightOutlined /> }
-        </div>
+        </div> */}
       </div>
     </div>
   )

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

@@ -46,6 +46,7 @@ const AssetAction = (props) => {
   const [ treeData, setTreeData ] = useState([]);
   const [ treeDataMap, setTreeDataMap ] = useState(undefined);
   const [currentDomainGroup, setCurrentDomainGroup] = useState(undefined);
+  const [currentBussinessDomain, setCurrentBussinessDomain] = useState(undefined);
   const [canEdit, setEdit] = useState(false);
   const [metadata, setMetadata] = useState(undefined);
   const [loadingMetadataColumnList, setLoadingMetadataColumnList] = useState(false);
@@ -206,6 +207,19 @@ const AssetAction = (props) => {
     return [];
   }, [currentDomainGroup, treeDataMap])
 
+  const businessData = useMemo(() => {
+    if (currentDomainGroup && currentBussinessDomain && treeDataMap) {
+      const currentLevel2Data = treeDataMap[currentDomainGroup];
+
+      const index = (currentLevel2Data||[]).findIndex(item => item.text === currentBussinessDomain);
+      if (index !== -1) {
+        return currentLevel2Data[index].children;
+      }
+    }
+
+    return [];
+  }, [currentDomainGroup, currentBussinessDomain, treeDataMap])
+
   const tableData = useMemo(() => { 
     if (metadataColumnList && standardList) {
       const newMetadataColumnList = [];
@@ -226,52 +240,6 @@ const AssetAction = (props) => {
     return [];
   }, [metadataColumnList, standardList])
 
-  const businessData = useMemo(() => {
-    if (assetPaths?.length >0 && treeData?.length > 0) {
-      let newBusinessData = [];
-        treeData?.forEach(level1Item => {
-          const businessItem = {
-            label: level1Item.text,
-            value: level1Item.text,
-            children: []
-          }; 
-
-          let flag = false;
-
-          level1Item.children?.forEach(level2Item => {
-            const tempLevel2Item = {
-              label: level2Item.text,
-              value: level2Item.text,
-              children: []
-            };
-
-            level2Item.children?.forEach(level3Item => {
-              tempLevel2Item.children.push({
-                label: level3Item.text,
-                value: level3Item.text,
-              });
-
-              if (level3Item.nodeId === assetPaths[0].dirId) {
-                flag = true;
-              }
-            });
-
-            if (flag && tempLevel2Item.children.length !== 0) {
-              businessItem.children.push(tempLevel2Item);
-            }
-          });
-          
-          if (flag && businessItem.children.length !== 0) {
-            newBusinessData.push(businessItem);
-          }
-        });
-
-        return newBusinessData;
-    }
-
-    return [];
-  }, [assetPaths, treeData])
-
   const getAssetPaths = () => {
     dispatch({
       type: 'assetmanage.getAssetPaths',
@@ -461,6 +429,8 @@ const AssetAction = (props) => {
           _fieldsValue[element.name] = element.value||'';
           if (element.name === '主题域分组') {
             setCurrentDomainGroup(element.value);
+          } else if (element.name === '主题域') {
+            setCurrentBussinessDomain(element.value);
           }
         })
 
@@ -765,11 +735,18 @@ const AssetAction = (props) => {
 
     if (element.name === '业务对象') {
       return (
-        <CascaderItem 
+        <Select 
+          allowClear
           disabled={element.manualMaintain==='否'}
-          data={businessData}
-          placeholder='请选择业务对象'
-        />
+        >
+        {
+          businessData?.map((item, index) => {
+            return <Select.Option key={index} value={item.text}>
+            {item.text}
+            </Select.Option>
+          })
+        }
+        </Select>
       )
     }
 
@@ -838,7 +815,10 @@ const AssetAction = (props) => {
   const onValuesChange = (changedValues, allValues) => {
     if (changedValues.hasOwnProperty('主题域分组')) {
       setCurrentDomainGroup(changedValues['主题域分组']);
-      form.setFieldsValue({'主题域': ''});
+      form.setFieldsValue({'主题域': '', '业务对象': ''});
+    } else if (changedValues.hasOwnProperty('主题域')) {
+      setCurrentBussinessDomain(changedValues['主题域']);
+      form.setFieldsValue({'业务对象': ''});
     }
   }
 

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

@@ -688,20 +688,20 @@ const AssetManageTree = (props) => {
           {item.text}
           {
             //自定义类型栏目不统计资产数
-            (reference===AssetManageReference) && (item.level!==1||(item.level===1&&item.resourceType!=='custom')) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
+            (item.level!==1||(item.level===1&&item.resourceType!=='custom')) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
           }
         </span>
       );
 
       if (item.children && item.children.length>0) {
-        return { ...item, ...{title, key: item.nodeId, children: loop(item.children, rootResourceType), className: (item.level===1)?'root':''} };
+        return { ...item, ...{title, key: item.nodeId, disableCheckbox: (item.level!==3), children: loop(item.children, rootResourceType), className: (item.level===1)?'root':''} };
       }
 
       if (rootResourceType !== 'custom') {
-        return { ...item, ...{ title, key: item.nodeId, isLeaf: true, className: (item.level===1)?'root':'' }};
+        return { ...item, ...{ title, key: item.nodeId, disableCheckbox: (item.level!==3), isLeaf: true, className: (item.level===1)?'root':'' }};
       }
 
-      return { ...item, ...{ title, key: item.nodeId, children: null, className: (item.level===1)?'root':''}};
+      return { ...item, ...{ title, key: item.nodeId, disableCheckbox: (item.level!==3), children: null, className: (item.level===1)?'root':''}};
     });
 
   const classes = classNames('asset-manage-tree', className, {