资产自定义

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

@@ -591,7 +591,7 @@ const AssetTree = (props) => {
           </RcItem> 
         }
         {
-          currentRightClickDir && currentRightClickDir.level===2 && currentRightClickDir.type==='custom' && <RcItem id="up" onClick={deleteDir}>
+          currentRightClickDir && currentRightClickDir.level===2 && currentRightClickDir.type==='custom' && !currentRightClickDir.adminCreate && <RcItem id="up" onClick={deleteDir}>
           删除目录
           </RcItem> 
         }

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

 import React, { useEffect, useState, useCallback } from 'react';
-import { Modal, Checkbox, Row, Col, Form, Input, Empty } from 'antd';
+import { Modal, Checkbox, Row, Col, Form, Input, Empty, Select } from 'antd';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import update from 'immutability-helper';
@@ -11,6 +11,12 @@ import { AssetManageReference, AssetBrowseReference, ResourceBrowseReference } f
 
 import { showMessage } from '../../../../util';
 
+const resourceTypes = [
+  { key: 'innerSource', name: '内部资源' },
+  { key: 'outerSource', name: '外部资源' },
+  { key: 'dataAsset', name: '资产' },
+]
+
 const CustomDirectoryModal = (props) => {
   const { visible, onCancel, action, dirId, reference = AssetManageReference } = props;
 
@@ -75,6 +81,12 @@ const CustomDirectoryModal = (props) => {
       data: checkedValues
     } 
 
+    if (reference===AssetManageReference) {
+      payload.params = {
+        resourceTypes: (form.getFieldValue('resourceTypes')||[]).join(',')
+      };
+    }
+
     if (reference===AssetBrowseReference || reference===ResourceBrowseReference) {
       url = 'assetmanage.previewTreeByCustomElementsAndResourceType';
 
@@ -112,6 +124,12 @@ const CustomDirectoryModal = (props) => {
     setCheckedData(_checkedData);
   }
 
+  const onValuesChange = (changedValues, allValues) => {
+    if (changedValues.hasOwnProperty('resourceTypes')) {
+      getPreviewTreeData();  
+    }
+  }
+
   const reset = () => {
     setConfirmLoading(false);
     setKeyword('');
@@ -142,6 +160,14 @@ const CustomDirectoryModal = (props) => {
       }
 
       let url = 'assetmanage.saveTreeByCustomElements';
+
+      if (reference===AssetManageReference) {
+        payload.params = {
+          ...payload.params,
+          resourceTypes: (row.resourceTypes||[]).join(',')
+        }
+      }
+
       if (reference===AssetBrowseReference || reference===ResourceBrowseReference) {
         url = 'assetmanage.saveTreeByCustomElementsAndResourceType';
 
@@ -265,7 +291,7 @@ const CustomDirectoryModal = (props) => {
               </div>
             </>
           }
-          <Form className='mt-5' {...formItemLayout} form={form}>
+          <Form className='mt-5' {...formItemLayout} form={form} onValuesChange={onValuesChange}>
             <Form.Item 
               label='命名'
               name='name'
@@ -273,6 +299,20 @@ const CustomDirectoryModal = (props) => {
             >
               <Input />
             </Form.Item>
+            {
+              reference===AssetManageReference && <Form.Item
+                label='数据范围'
+                name='resourceTypes'
+              >
+                <Select mode="multiple" allowClear>
+                {
+                  resourceTypes.map((item,index) => {
+                    return <Select.Option key={item.key}>{item.name}</Select.Option>
+                  })
+                }
+                </Select>
+              </Form.Item>
+            }
             <Form.Item 
               label='描述或原因'
               name='desc'