资产浏览自定义

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

@@ -21,7 +21,7 @@ import { getTemplateType } from '../../../../util/axios';
 
 const { Option } = AutoComplete;
 
-const viewModes = [
+export const viewModes = [
   {
     key: 'dir',
     name: '目录视角'
@@ -512,7 +512,8 @@ const AssetManageTree = (props) => {
     }
   }
 
-  const deleteDir = () => {    
+  const deleteDir = () => {  
+    console.log('currentRightClickDir', currentRightClickDir)  
     if (currentRightClickDir.nodeId) {
       modal.confirm({
         title: '您确定要删除该目录吗?',
@@ -521,7 +522,8 @@ const AssetManageTree = (props) => {
             type: 'assetmanage.checkDirectoryDeleteAble',
             payload: {
               params: {
-                dirId: currentRightClickDir.nodeId
+                dirId: currentRightClickDir.nodeId,
+                currentDirIsCustom: currentRightClickDir.type==='custom'
               }
             },
             callback: able => {

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

@@ -570,20 +570,20 @@ const AssetTable = (props) => {
     }
 
     let url = 'assetmanage.listDataAssetsByPage';
-    if (reference===AssetRecycleReference) {
-      url = 'assetmanage.listRecycleBinDataAssetsByPage';
-    } else if ((reference===AssetBrowseReference|| reference===ResourceBrowseReference)) {
-      params.checkPermission = true;
-
-      if (nodeType === 'custom') {
-        url = 'assetmanage.listDataAssetsByPersonalCustomType';
-        if (reference === AssetBrowseReference) {
-          params.resourceType = 'dataAsset';
-        } else if (reference === ResourceBrowseReference) {
-          params.resourceType = 'innerSource,outerSource';
-        }
-      }
-    }
+    // if (reference===AssetRecycleReference) {
+    //   url = 'assetmanage.listRecycleBinDataAssetsByPage';
+    // } else if ((reference===AssetBrowseReference|| reference===ResourceBrowseReference)) {
+    //   params.checkPermission = true;
+
+    //   if (nodeType === 'custom') {
+    //     url = 'assetmanage.listDataAssetsByPersonalCustomType';
+    //     if (reference === AssetBrowseReference) {
+    //       params.resourceType = 'dataAsset';
+    //     } else if (reference === ResourceBrowseReference) {
+    //       params.resourceType = 'innerSource,outerSource';
+    //     }
+    //   }
+    // }
 
     dispatchLatestHomepage({
       type: url,

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

 import React, { useEffect, useState, useRef } from 'react';
-import {Card, Spin, Tooltip, Tree, Modal, AutoComplete, Select,Button} from 'antd';
-import { ReloadOutlined, SettingOutlined } from '@ant-design/icons';
+import {Card, Spin, Tooltip, Tree, Modal, AutoComplete, Select,Button, Menu, Dropdown} from 'antd';
+import { ReloadOutlined, SettingOutlined, UnorderedListOutlined } from '@ant-design/icons';
 import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify";
 import LocalStorage from 'local-storage';
 
@@ -15,6 +15,7 @@ import './AssetTree.less';
 import 'react-contexify/dist/ReactContexify.css';
 import { appId } from '../../../../App';
 import { listSubject } from './AssetTable';
+import { viewModes } from './AssetManageTree';
 
 const { Option } = AutoComplete;
 
@@ -61,6 +62,7 @@ const AssetTree = (props) => {
   const [currentTemplateType, setTemplateType] = useState()
   const [ updateDirectoryAction, setUpdateDirectoryAction ] = useState('');
   const [ updateDirectoryModalVisible, setUpdateDirectoryModalVisible ] = useState(false);
+  const [ viewSelectedKey, setViewSelectedKey ] = useState(viewModes[0].key);
 
   const [modal, contextHolder] = Modal.useModal();
   
@@ -70,6 +72,7 @@ const AssetTree = (props) => {
 
   const treeDataRef = useRef([]);
   const dataListRef = useRef([]);
+  const viewSelectedKeyRef = useRef(viewModes[0].key)
 
   useEffect(() => {
     getTemplates()
@@ -194,11 +197,9 @@ const AssetTree = (props) => {
     //   onSelect && onSelect('', '');
     // }
 
-    let url = '';
-    if (reference === AssetBrowseReference) {
-      url = 'assetmanage.queryAssetDirectoryAsTree';
-    } else if (reference === ResourceBrowseReference) {
-      url = 'assetmanage.queryResourceDirectoryAsTree';
+    let url = 'assetmanage.queryAllDirectoryAsTree';
+    if (viewSelectedKeyRef.current === 'custom') {
+      url = 'assetmanage.queryCustomTypeRootDirectory';
     }
     
     dispatch({
@@ -207,7 +208,14 @@ const AssetTree = (props) => {
         setLoading(false);
         refresh && showMessage('success', '操作成功');
 
-        let newData = [...data];
+        let newData = [];
+        if (viewSelectedKeyRef.current==='dir') {
+          newData = [...data];
+        } else {
+          newData = (data||[]).map((item) => {
+            return {...item, text: item.name, nodeId: item.id, type: item.resourceType}
+          });
+        }
 
         setLoadedKeys([]);
         setTreeData(newData);
@@ -222,14 +230,6 @@ const AssetTree = (props) => {
 
         let defaultItem = null;
 
-        if ((defaultSelectedId||'') === '') {
-          _dataList.forEach(item => {
-            if ((defaultSelectedId||'')==='') {
-              defaultSelectedId = item.key;
-            }
-          })
-        }
-
         function recursion(subCatalogs) {
 
           if ((subCatalogs||[]).length===0) return;
@@ -249,7 +249,6 @@ const AssetTree = (props) => {
         }
 
         if (resetCurrentDirId) {
-
           if (defaultItem) {  
             const expandedKeys = _dataList
               .map(item => {
@@ -259,15 +258,18 @@ const AssetTree = (props) => {
                 return null;
               })
               .filter((item, i, self) => item && self.indexOf(item) === i);
-            
-            setExpandedKeys([...expandedKeys, defaultSelectedId]);
+  
+            setExpandedKeys(expandedKeys);
             setAutoExpandParent(true);
   
             setCurrentDirId(defaultItem.nodeId);
-            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.allowdLoadDataAsset);
+            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level, defaultItem.allowdLoadDataAsset);
           
-          } 
-       
+          } else if ((newData??[]).length > 0) {
+            defaultItem = newData[0]
+            setCurrentDirId(defaultItem.nodeId);
+            onSelect && onSelect(defaultItem.nodeId, defaultItem.type||'', defaultItem.level, defaultItem.allowdLoadDataAsset);
+          }
         }
       },
       error: () => {
@@ -403,7 +405,8 @@ const AssetTree = (props) => {
             type: 'assetmanage.checkDirectoryDeleteAble',
             payload: {
               params: {
-                dirId: currentRightClickDir.nodeId
+                dirId: currentRightClickDir.nodeId,
+                currentDirIsCustom: currentRightClickDir.type==='custom'
               }
             },
             callback: able => {
@@ -514,6 +517,32 @@ const AssetTree = (props) => {
     treeDirectoryChanged(option.key);
   };
 
+  const onViewClick = ({ key }) => {
+    if (viewSelectedKey &&  viewSelectedKey===key ) return;
+
+    viewSelectedKeyRef.current = key;
+    setViewSelectedKey(key);
+    setExpandedKeys([]);
+    
+    getAllDirectoryAsTree();
+  }  
+
+  const viewMenus = (
+    <Menu selectedKeys={[viewSelectedKey]} onClick={onViewClick}>
+    {
+      viewModes && viewModes.map(item => {
+        return (
+          <Menu.Item key={item.key} value={item.key} >
+            <div style={{ textAlign: 'center' }}>
+            {item.name}
+            </div>
+          </Menu.Item>
+        )
+      })
+    }
+    </Menu>
+  );
+
   const onLoadData = ({ key, children }) => 
     new Promise((resolve) => {
 
@@ -557,7 +586,7 @@ const AssetTree = (props) => {
         >
           {item.text}
           {
-            (item.level!==1||(item.level===1&&item.resourceType!=='custom')) && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
+            viewSelectedKeyRef.current === 'dir' && <span>{` (${item.dataAssetAndSubDirCount})`}</span>
           }
         </span>
       );
@@ -607,12 +636,16 @@ const AssetTree = (props) => {
             (templates??[]).map((item, index) => <Select.Option key={index} value={item.type}>{item.name}</Select.Option>)
           }
           </Select>
+          <Dropdown overlay={viewMenus} placement="bottomLeft">
+            <Tooltip title="视角">
+              <UnorderedListOutlined className='default' style={{ fontSize:16,cursor:'pointer' }} />
+            </Tooltip>
+          </Dropdown>
           <Tooltip title="刷新目录">
             <ReloadOutlined className='default' onClick={refreshTree} style={{ fontSize:16,cursor:'pointer',flex:1}} />
           </Tooltip>
           <div style={{ flex: 1, width: 32 }}></div>
           <div style={{ flex: 1, width: 32 }}></div>
-          <div style={{ flex: 1, width: 32 }}></div>
         </div>
       }
       bordered={false}