个人自定义目录

src/model/assetmanage.js

@@ -64,6 +64,11 @@ export function* getDataAssetDetail(payload) {
 export function* listDataAssetsByPage(payload) {
   return yield call(service.listDataAssetsByPage, payload);
 }
+
+export function* listDataAssetsByPersonalCustomType(payload) {
+  return yield call(service.listDataAssetsByPersonalCustomType, payload);
+}
+
 export function* listRecycleBinDataAssetsByPage(payload) {
   return yield call(service.listRecycleBinDataAssetsByPage, payload);
 }
@@ -97,10 +102,18 @@ export function* previewTreeByCustomElements(payload) {
   return yield call(service.previewTreeByCustomElements, payload);
 }
 
+export function* previewTreeByCustomElementsAndResourceType(payload) {
+  return yield call(service.previewTreeByCustomElementsAndResourceType, payload);
+}
+
 export function* saveTreeByCustomElements(payload) {
   return yield call(service.saveTreeByCustomElements, payload);
 }
 
+export function* saveTreeByCustomElementsAndResourceType(payload) {
+  return yield call(service.saveTreeByCustomElementsAndResourceType, payload);
+}
+
 export function* assetImport(payload) {
   return yield call(service.assetImport, payload);
 }
@@ -121,6 +134,10 @@ export function* getDirectoryChild(payload) {
   return yield call(service.getDirectoryChild, payload);
 }
 
+export function* getPersonalCustomDirecotryChild(payload) {
+  return yield call(service.getPersonalCustomDirecotryChild, payload);
+}
+
 export function* loadDataAssets(payload) {
   return yield call(service.loadDataAssets, payload);
 }

src/service/dataassetmanager.js

@@ -64,6 +64,10 @@ export function listDataAssetsByPage(payload) {
   return GetJSON("/dataassetmanager/dataAssetApi/listDataAssetsByPage", payload);
 }
 
+export function listDataAssetsByPersonalCustomType(payload) {
+  return GetJSON("/dataassetmanager/dataAssetApi/listDataAssetsByPersonalCustomType", payload);
+}
+
 export function listRecycleBinDataAssetsByPage(payload) {
   return GetJSON("/dataassetmanager/dataAssetApi/listRecycleBinDataAssetsByPage", payload);
 }
@@ -132,10 +136,18 @@ export function previewTreeByCustomElements(payload) {
   return PostJSON("/dataassetmanager/directoryApi/previewAsTreeByCustomElements", payload);
 }
 
+export function previewTreeByCustomElementsAndResourceType(payload) {
+  return PostJSON("/dataassetmanager/directoryApi/previewAsTreeByCustomElementsAndResourceType", payload); 
+}
+
 export function saveTreeByCustomElements(payload) {
   return PostJSON("/dataassetmanager/directoryApi/saveCustomElementTree", payload);
 }
 
+export function saveTreeByCustomElementsAndResourceType(payload) {
+  return PostJSON("/dataassetmanager/directoryApi/savePersonalCustomElementTreeByResourceType", payload);
+}
+
 export function assetImport(payload) {
   return PostFile("/dataassetmanager/dataAssetApi/import", payload);
 }
@@ -156,6 +168,10 @@ export function getDirectoryChild(payload) {
   return GetJSON("/dataassetmanager/directoryApi/getChildByParentId", payload);
 }
 
+export function getPersonalCustomDirecotryChild(payload) {
+  return GetJSON("/dataassetmanager/directoryApi/getPersonalCustomChildByParentId", payload);
+}
+
 export function getMetadataModelTree() {
   return GetJSON("/metadatarepo/rest/model/tree");
 }

src/view/Manage/AssetBrowse/index.jsx

@@ -16,7 +16,7 @@ const AssetBrowse = (props) => {
 
   const { reference = AssetBrowseReference } = props;
 
-  const [ nodeParams, setNodeParams ] = useState({ centerId: '', expandId: '' });
+  const [ nodeParams, setNodeParams ] = useState({ centerId: '', expandId: '', nodeType: '' });
   const [ expandTree, setExpandTree ] = useState(true);
   const [ expandRelation, setExpandRelation ] = useState(true);
   const [ assetCount, setAssetCount ] = useState(0);
@@ -25,7 +25,7 @@ const AssetBrowse = (props) => {
   const { centerId, expandId } = nodeParams;
 
   const onTreeSelect = (value, type) => {
-    setNodeParams({ centerId: value||'', expandId: '' });
+    setNodeParams({ centerId: value||'', expandId: '', nodeType: type });
   }
 
   const treeToggleClick = () => {
@@ -79,7 +79,7 @@ const AssetBrowse = (props) => {
             </React.Fragment>
           }
           <div style={{ flex: 1, overflow: 'hidden' }}>
-            <AssetTable nodeId={nodeId} reference={reference} onCountChange={onAssetCountChange} {...props} />
+            <AssetTable nodeId={nodeId} nodeType={nodeParams.nodeType} reference={reference} onCountChange={onAssetCountChange} {...props} />
           </div>          
         </div>
       </div>

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

@@ -651,7 +651,7 @@ const AssetManageTree = (props) => {
       );
 
       if (item.children && item.children.length>0) {
-        return { ...item, ...{title, key: item.nodeId, children: loop(item.children, rootResourceType, false), className: (item.level===1)?'root':''} };
+        return { ...item, ...{title, key: item.nodeId, children: loop(item.children, rootResourceType), className: (item.level===1)?'root':''} };
       }
 
       if (rootResourceType !== 'custom') {

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

@@ -386,8 +386,15 @@ const AssetTable = (props) => {
       }
     }
 
+    let url = 'assetmanage.listDataAssetsByPage';
+    if (reference===AssetRecycleReference) {
+      url = 'assetmanage.listRecycleBinDataAssetsByPage';
+    } else if ((reference===AssetBrowseReference|| reference===ResourceBrowseReference) && nodeType==='custom' ) {
+      url = 'assetmanage.listDataAssetsByPersonalCustomType';
+    }
+
     dispatchLatestHomepage({
-      type: (reference===AssetRecycleReference)?'assetmanage.listRecycleBinDataAssetsByPage':'assetmanage.listDataAssetsByPage',
+      type: url,
       payload: params,
       callback: data => {
         const _assets = [];

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

@@ -7,11 +7,12 @@ import update from 'immutability-helper';
 import DragTag from './DragTag';
 import PreviewTree from './PreviewTree';
 import { dispatch, dispatchLatest } from '../../../../model';
+import { AssetManageReference, AssetBrowseReference, ResourceBrowseReference } from '../../../../util/constant';
 
 import { showMessage } from '../../../../util';
 
 const CustomDirectoryModal = (props) => {
-  const { visible, onCancel, action, dirId } = props;
+  const { visible, onCancel, action, dirId, reference = AssetManageReference } = props;
 
   const [ keyword, setKeyword ] = useState('');
   const [ data, setData ] = useState([]);
@@ -67,11 +68,24 @@ const CustomDirectoryModal = (props) => {
   }
 
   const getPreviewTreeData = () => {
+
+    let url = 'assetmanage.previewTreeByCustomElements';
+
+    let payload = {
+      data: checkedValues
+    } 
+
+    if (reference===AssetBrowseReference || reference===ResourceBrowseReference) {
+      url = 'assetmanage.previewTreeByCustomElementsAndResourceType';
+
+      payload.params = {
+        resourceType: (reference===ResourceBrowseReference)?'resource':'dataAsset',
+      }
+    }
+
     dispatchLatest({
-      type: 'assetmanage.previewTreeByCustomElements',
-      payload: {
-        data: checkedValues
-      },
+      type: url,
+      payload,
       callback: data => {
         setPreviewTreeData((data||[]).length>0?data[0]:{});
       }
@@ -127,8 +141,15 @@ const CustomDirectoryModal = (props) => {
         payload.params = {...payload.params, dirId};
       }
 
+      let url = 'assetmanage.saveTreeByCustomElements';
+      if (reference===AssetBrowseReference || reference===ResourceBrowseReference) {
+        url = 'assetmanage.saveTreeByCustomElementsAndResourceType';
+
+        payload.params = { ...payload.params, resourceType: (reference===ResourceBrowseReference)?'resource':'dataAsset' };
+      }
+
       dispatch({
-        type: 'assetmanage.saveTreeByCustomElements',
+        type: url,
         payload,
         callback: data => {
           setConfirmLoading(false);