Commit dc86e5e1 by zhaochengxiang

资产目录分栏可以被选中

parent e9029248
......@@ -188,7 +188,7 @@ const AssetManageTree = (props) => {
if ((defaultSelectedId||'') === '') {
_dataList.forEach(item => {
if (item.level!==1 && (defaultSelectedId||'')==='') {
if ((defaultSelectedId||'')==='') {
defaultSelectedId = item.key;
}
})
......@@ -289,9 +289,7 @@ const AssetManageTree = (props) => {
const currentPath = path ? `${path}/${text}` : text;
if (node.level !== 1) {
list.push({ key: nodeId , title: text, value: currentPath, level: node.level });
}
list.push({ key: nodeId , title: text, value: currentPath, level: node.level });
if (node.children) {
generateList(node.children, list, currentPath);
......@@ -650,7 +648,8 @@ const AssetManageTree = (props) => {
>
{item.text}
{
(reference===AssetManageReference && item.level!==1 ) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
//自定义类型栏目不统计资产数
(reference===AssetManageReference) && (item.level===1) && item.resourceType!=='custom' && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
}
</span>
);
......
......@@ -101,8 +101,7 @@ const UpdateDirectoryModal = (props) => {
payload: payload,
callback: data => {
setConfirmLoading(false);
//栏目不允许被选中
onCancel && onCancel(true, (row.type==='theme')?'':(data?.id||''));
onCancel && onCancel(true, data?.id||'');
},
error: () => {
setConfirmLoading(false);
......
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