资产管理目录增加栏目

package.json

@@ -73,7 +73,7 @@
       "last 1 safari version"
     ]
   },
-  "proxy": "http://139.198.127.28:18762",
+  "proxy": "http://139.198.127.28:18189",
   "homepage": "http://myhost/data-govern",
   "devDependencies": {
     "autoprefixer": "^9.8.6",

src/App.js

@@ -26,7 +26,7 @@ const AssetDetail = loadable(()=> import('./view/Manage/AssetManage/Component/As
 const ImportAction = loadable(()=> import('./view/Manage/Model/Component/ImportAction'));
 const EditModel = loadable(()=> import('./view/Manage/Model/Component/EditModel'));
 const EditTemplate = loadable(()=> import('./view/Manage/ModelConfig/Component/EditTemplate'));
-const AssetTree = loadable(()=> import('./view/Manage/AssetManage/Component/AssetTree'));
+const AssetTree = loadable(()=> import('./view/Manage/AssetManage/Component/AssetManageTree'));
 
 export class App extends React.Component {
 

src/model/assetmanage.js

@@ -117,6 +117,10 @@ export function* listDirectoryByName(payload) {
   return yield call(service.listDirectoryByName, payload);
 }
 
+export function* getDirectoryChild(payload) {
+  return yield call(service.getDirectoryChild, payload);
+}
+
 export function* loadDataAssets(payload) {
   return yield call(service.loadDataAssets, payload);
 }

src/service/dataassetmanager.js

@@ -144,6 +144,10 @@ export function listDirectoryByName(payload) {
   return GetJSON("/dataassetmanager/directoryApi/listDirectoryByName", payload);
 }
 
+export function getDirectoryChild(payload) {
+  return GetJSON("/dataassetmanager/directoryApi/getChildByParentId", payload);
+}
+
 export function getMetadataModelTree() {
   return GetJSON("/metadatarepo/rest/model/tree");
 }

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

@@ -8,6 +8,7 @@ const resourceTypes = [
   { key: 'innerSource', name: '内部资源' },
   { key: 'outerSource', name: '外部资源' },
   { key: 'dataAsset', name: '资产' },
+  { key: 'custom', name: '自定义' },
 ]
 
 const UpdateDirectoryModal = (props) => {
@@ -169,18 +170,18 @@ const UpdateDirectoryModal = (props) => {
             rules={[{ required: true, message: '必填项' }]}
           >
             <Radio.Group>
-              <Radio value='theme'>主题</Radio>
+              <Radio value='theme'>栏目</Radio>
               <Radio value='directory' disabled={ dirId===null }>目录</Radio>
             </Radio.Group>
           </Form.Item>
         }
         {
-          ((action==='add'&&isThemeAdd) || (action!=='add'&&dir?.resourceType)) && <Form.Item 
+          ((action==='add'&&isThemeAdd) || action!=='add') && <Form.Item 
             label="资产类型"
             name="resourceType"
-            rules={[{ required: true, message: '必填项' }]}
+            rules={[{ required: false }]}
           >
-            <Select>
+            <Select allowClear>
             {
               resourceTypes.map((item,index) => {
                 return <Select.Option key={item.key}>{item.name}</Select.Option>

src/view/Manage/AssetManage/index.jsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import { Form } from 'antd';
 import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
 
-import AssetTree from './Component/AssetTree';
+import AssetTree from './Component/AssetManageTree';
 import AssetDirectory from './Component/AssetDirectory';
 import AssetTable from './Component/AssetTable';
 import AssetAction from './Component/AssetAction';

src/view/Manage/AssetRecycle/Component/AssetMount.jsx

@@ -2,7 +2,7 @@ import React, { useState } from "react";
 import { Modal } from "antd";
 
 import { dispatch } from '../../../../model';
-import AssetTree from '../../AssetManage/Component/AssetTree';
+import AssetTree from '../../AssetManage/Component/AssetManageTree';
 import { showMessage } from '../../../../util';
 
 import { AssetManageReference, AssetRecycleReference, AssetMountReference } from "../../../../util/constant";