资产调整

src/model/assetmanage.js

@@ -13,6 +13,10 @@ export function* listElements() {
   return yield call(service.listElements);
 }
 
+export function* listElementsAndFillValue(payload) {
+  return yield call(service.listElementsAndFillValue, payload)
+}
+
 export function* listUserElements() {
   return yield call(service.listUserElements);
 }

src/service/dataassetmanager.js

@@ -12,6 +12,10 @@ export function listElements() {
   return PostJSON("/dataassetmanager/elementApi/listElements");
 }
 
+export function listElementsAndFillValue(payload) {
+  return PostJSON("/dataassetmanager/elementApi/listElementAndFillValueByDirId", payload)
+}
+
 export function listUserElements() {
   return PostJSON("/dataassetmanager/elementApi/listSelectedRangeElements");
 }

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

@@ -80,7 +80,12 @@ const AssetAction = (props) => {
   const getElements = ( cb = null ) => {
     setLoading(true);
     dispatch({
-      type: 'assetmanage.listElements',
+      type: (currentAction==='add')?'assetmanage.listElementsAndFillValue':'assetmanage.listElements',
+      payload: (currentAction==='add')?{
+        params: {
+          dirId
+        }
+      }:undefined,
       callback: data => {
         setLoading(false);
         setElements(data||[]);

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

@@ -546,27 +546,27 @@ const AssetManageTree = (props) => {
       return;
     }
 
-    const _checkedKeysValue = [...(values.checked||[])];
+    // const _checkedKeysValue = [...(values.checked||[])];
 
     if (e.checked) {
-      const _currentNodeId = e.node?.key;
-      let _groupItem = [];
-
-      groupIds.forEach(groupItem => {
-        groupItem.forEach(id => {
-          if (id === _currentNodeId) {
-            _groupItem = groupItem;
-          }
-        })
-      })
-
-      const _filterKeys = (_checkedKeysValue.filter(item => item===_currentNodeId || !(_groupItem.includes(item))));
+      // const _currentNodeId = e.node?.key;
+      // let _groupItem = [];
+
+      // groupIds.forEach(groupItem => {
+      //   groupItem.forEach(id => {
+      //     if (id === _currentNodeId) {
+      //       _groupItem = groupItem;
+      //     }
+      //   })
+      // })
+
+      // const _filterKeys = (_checkedKeysValue.filter(item => item===_currentNodeId || !(_groupItem.includes(item))));
       
-      setCheckedKeys(_filterKeys);
-      onCheck && onCheck(_filterKeys);
+      setCheckedKeys([e.node?.key]);
+      onCheck && onCheck([e.node?.key]);
     } else {  
-      setCheckedKeys(_checkedKeysValue);
-      onCheck && onCheck(_checkedKeysValue);
+      setCheckedKeys([]);
+      onCheck && onCheck([]);
     }
 
   }