资产栏目允许选中

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

@@ -229,7 +229,7 @@ const AssetManageTree = (props) => {
   
             setCurrentDirId(defaultItem.nodeId);
             setCurrentDirType(defaultItem.type||'');
-            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
+            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level);
           } 
         }
       },
@@ -276,7 +276,7 @@ const AssetManageTree = (props) => {
 
       setCurrentDirId(defaultItem.nodeId);
       setCurrentDirType(defaultItem.type||'');
-      onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
+      onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level);
     } 
   }
 
@@ -490,16 +490,12 @@ const AssetManageTree = (props) => {
       return;
     }
 
-    if (node.level === 1) {
-      return;
-    }
-
     setCurrentDirId(keys[0]);
 
     const _currentDirType = getCurrentType(keys[0], treeData);
 
     setCurrentDirType(_currentDirType);
-    onSelect && onSelect(keys[0], _currentDirType);
+    onSelect && onSelect(keys[0], _currentDirType, node.level);
   }
   
   const onTreeCheck = (values, e) => {
@@ -649,7 +645,7 @@ const AssetManageTree = (props) => {
           {item.text}
           {
             //自定义类型栏目不统计资产数
-            (reference===AssetManageReference) && (item.level===1) && item.resourceType!=='custom' && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
+            (reference===AssetManageReference) && (item.level!==1||(item.level===1&&item.resourceType!=='custom')) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
           }
         </span>
       );

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

@@ -116,7 +116,7 @@ const ResizeableHeaderCell = props => {
 
 const AssetTable = (props) => {
 
-  const { className, nodeId, nodeType, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference } = props;
+  const { className, nodeId, nodeType, nodeLevel, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference } = props;
 
   const MENU_ID = 'asset-table';
 
@@ -778,7 +778,8 @@ const AssetTable = (props) => {
       > 
         <Space size={15}>
           { 
-            (reference===AssetManageReference && nodeType!=='custom') && <Button onClick={addAsset}>新增</Button>
+            //栏目和自定义目录 不允许新增资产
+            (reference===AssetManageReference && nodeLevel!==1 && nodeType!=='custom') && <Button onClick={addAsset}>新增</Button>
           }
           {
             (compact && reference===AssetManageReference) ? <Dropdown overlay={moreMenu} placement="bottomCenter"> 

src/view/Manage/AssetManage/index.jsx

@@ -17,6 +17,7 @@ const AssetManage = (props) => {
 
   const [ nodeId, setNodeId ] = useState('');
   const [ nodeType, setNodeType ] = useState('');
+  const [ nodeLevel, setNodeLevel ] = useState(null);
   const [ assetParams, setAssetParams ] = useState({ assetId: '', assetDirId: '' })
   const [ expandTree, setExpandTree ] = useState(true);
 
@@ -28,9 +29,11 @@ const AssetManage = (props) => {
 
   const { assetId, assetDirId } = assetParams;
 
-  const onTreeSelect = (value, type) => {
+  const onTreeSelect = (value, type, level) => {
     setNodeId(value||'');
     setNodeType(type);
+
+    setNodeLevel(level);
   }
 
   const onTableSelect = (id, did) => {
@@ -72,7 +75,7 @@ const AssetManage = (props) => {
       <div className='middle'>
         <AssetDirectory id={nodeId} assetCount={assetCount} directoryChanged={directoryChanged} onElementsChange={onElementsChange} />
         <Separate height={15} />
-        <AssetTable nodeId={nodeId} nodeType={nodeType} reference={AssetManageReference} elementsChanged={elementsChanged} assetActionChanged={assetActionChanged} onSelect={onTableSelect} onCountChange={onAssetCountChange} {...props} />
+        <AssetTable nodeId={nodeId} nodeType={nodeType} nodeLevel={nodeLevel} reference={AssetManageReference} elementsChanged={elementsChanged} assetActionChanged={assetActionChanged} onSelect={onTableSelect} onCountChange={onAssetCountChange} {...props} />
       </div>
       <Separate width='15px' />
       <div className='right'>