自定义目录下的资产不允许删除

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

@@ -113,7 +113,7 @@ const ResizeableHeaderCell = props => {
 
 const AssetTable = (props) => {
 
-  const { className, nodeId, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference } = props;
+  const { className, nodeId, nodeType, elementsChanged, assetActionChanged, onSelect, onCountChange, reference = AssetManageReference } = props;
   const [ loading, setLoading ] = useState(false);
   const [ columns, setColumns ] = useState([]);
   const [ assets, setAssets ] = useState([]);
@@ -528,11 +528,14 @@ const AssetTable = (props) => {
             {(reference===AssetRecycleReference)?'挂载':'变更目录'}
             </div>
           </Menu.Item>
-          <Menu.Item disabled={(checkedKeys||[]).length===0}>
-            <div className='text-center' onClick={deleteAssets}>
-              删除
-            </div>
-          </Menu.Item>
+          {
+            //自定义目录下的资产不允许删除
+            (nodeType!=='custom') && <Menu.Item disabled={(checkedKeys||[]).length===0}>
+              <div className='text-center' onClick={deleteAssets}>
+                删除
+              </div>
+            </Menu.Item>
+          }
         </React.Fragment>
       }
       
@@ -594,9 +597,12 @@ const AssetTable = (props) => {
                   <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产':''}>
                     <Button onClick={onBatchCatalogChangeBtnClick} disabled={(checkedKeys||[]).length===0} >{(reference===AssetRecycleReference)?'挂载':'变更目录'}</Button>
                   </Tooltip>
-                  <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产':''}>
-                    <Button onClick={deleteAssets} disabled={(checkedKeys||[]).length===0} >删除</Button>
-                  </Tooltip>
+                  {
+                    //自定义目录下的资产不允许删除
+                    nodeType!=='custom' && <Tooltip title={(checkedKeys||[]).length===0?'请先选择资产':''}>
+                      <Button onClick={deleteAssets} disabled={(checkedKeys||[]).length===0} >删除</Button>
+                    </Tooltip>
+                  }
                 </React.Fragment> 
               }
               <Button onClick={onFilterElementClick}>要素设置</Button>

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

@@ -124,7 +124,7 @@ const AssetTree = (props) => {
 
     setLoading(true);
     if (resetCurrentDirId) {
-      onSelect && onSelect('');
+      onSelect && onSelect('', '');
     }
 
     let url = '';
@@ -191,7 +191,7 @@ const AssetTree = (props) => {
   
             setCurrentDirId(defaultItem.nodeId);
             setCurrentDirType(defaultItem.type||'');
-            onSelect && onSelect(defaultItem.nodeId);
+            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
           
           } else {
 
@@ -200,7 +200,7 @@ const AssetTree = (props) => {
   
             setCurrentDirId(_currentDirId);
             setCurrentDirType(_type);
-            onSelect && onSelect(_currentDirId);
+            onSelect && onSelect(_currentDirId, _type);
 
           }
        
@@ -249,7 +249,7 @@ const AssetTree = (props) => {
 
       setCurrentDirId(defaultItem.nodeId);
       setCurrentDirType(defaultItem.type||'');
-      onSelect && onSelect(defaultItem.nodeId);
+      onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'');
     } 
   }
 

src/view/Manage/AssetManage/index.jsx

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