Commit 304bfc55 by zhaochengxiang

资产调整

parent e4f92b09
...@@ -13,6 +13,10 @@ export function* listElements() { ...@@ -13,6 +13,10 @@ export function* listElements() {
return yield call(service.listElements); return yield call(service.listElements);
} }
export function* listElementsAndFillValue(payload) {
return yield call(service.listElementsAndFillValue, payload)
}
export function* listUserElements() { export function* listUserElements() {
return yield call(service.listUserElements); return yield call(service.listUserElements);
} }
......
...@@ -12,6 +12,10 @@ export function listElements() { ...@@ -12,6 +12,10 @@ export function listElements() {
return PostJSON("/dataassetmanager/elementApi/listElements"); return PostJSON("/dataassetmanager/elementApi/listElements");
} }
export function listElementsAndFillValue(payload) {
return PostJSON("/dataassetmanager/elementApi/listElementAndFillValueByDirId", payload)
}
export function listUserElements() { export function listUserElements() {
return PostJSON("/dataassetmanager/elementApi/listSelectedRangeElements"); return PostJSON("/dataassetmanager/elementApi/listSelectedRangeElements");
} }
......
...@@ -80,7 +80,12 @@ const AssetAction = (props) => { ...@@ -80,7 +80,12 @@ const AssetAction = (props) => {
const getElements = ( cb = null ) => { const getElements = ( cb = null ) => {
setLoading(true); setLoading(true);
dispatch({ dispatch({
type: 'assetmanage.listElements', type: (currentAction==='add')?'assetmanage.listElementsAndFillValue':'assetmanage.listElements',
payload: (currentAction==='add')?{
params: {
dirId
}
}:undefined,
callback: data => { callback: data => {
setLoading(false); setLoading(false);
setElements(data||[]); setElements(data||[]);
......
...@@ -546,27 +546,27 @@ const AssetManageTree = (props) => { ...@@ -546,27 +546,27 @@ const AssetManageTree = (props) => {
return; return;
} }
const _checkedKeysValue = [...(values.checked||[])]; // const _checkedKeysValue = [...(values.checked||[])];
if (e.checked) { if (e.checked) {
const _currentNodeId = e.node?.key; // const _currentNodeId = e.node?.key;
let _groupItem = []; // let _groupItem = [];
groupIds.forEach(groupItem => { // groupIds.forEach(groupItem => {
groupItem.forEach(id => { // groupItem.forEach(id => {
if (id === _currentNodeId) { // if (id === _currentNodeId) {
_groupItem = groupItem; // _groupItem = groupItem;
} // }
}) // })
}) // })
const _filterKeys = (_checkedKeysValue.filter(item => item===_currentNodeId || !(_groupItem.includes(item)))); // const _filterKeys = (_checkedKeysValue.filter(item => item===_currentNodeId || !(_groupItem.includes(item))));
setCheckedKeys(_filterKeys); setCheckedKeys([e.node?.key]);
onCheck && onCheck(_filterKeys); onCheck && onCheck([e.node?.key]);
} else { } else {
setCheckedKeys(_checkedKeysValue); setCheckedKeys([]);
onCheck && onCheck(_checkedKeysValue); onCheck && onCheck([]);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment