资产挂载目录问题

src/App.js

@@ -23,6 +23,8 @@ import EditModel from './view/Manage/Model/Component/EditModel';
 import EditTemplate from './view/Manage/ModelConfig/Component/EditTemplate';
 import AssetTree from './view/Manage/AssetManage/Component/AssetTree';
 
+import { AssetMountReference } from './util/constant';
+
 export const AppContext = React.createContext();
 
 export class App extends React.Component {
@@ -70,9 +72,7 @@ export class App extends React.Component {
     if (message === 'showAssetTree') {
       return (
         <AssetTree 
-          reference='metadata'
-          readOnly={true} 
-          showCustom={false}
+          reference={AssetMountReference}
           checkable={true}
           onCheck={(values) => { 
             callback&&callback(values); 

src/util/constant.js

@@ -19,4 +19,5 @@ export const Holder = 'holder';
 export const AssetManageReference = 'asset-manage';
 export const AssetBrowseReference = 'asset-browse';
 export const ResourceBrowseReference = 'resource-browse';
-export const AssetRecycleReference = 'asset-recycle';
\ No newline at end of file
+export const AssetRecycleReference = 'asset-recycle';
+export const AssetMountReference = 'asset-mount'
\ No newline at end of file

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

@@ -8,12 +8,12 @@ import ImportDirectory from './ImportDirectory';
 import UpdateDirectoryModal from './UpdateDirectoryModal';
 import CustomDirectoryModal from './CustomDirectoryModal';
 import { showMessage, getQueryParam } from '../../../../util';
-import { AnchorTimestamp, AnchorId, AssetManageReference, AssetBrowseReference, ResourceBrowseReference } from '../../../../util/constant';
+import { AnchorTimestamp, AnchorId, AssetManageReference, AssetBrowseReference, ResourceBrowseReference, AssetMountReference } from '../../../../util/constant';
 import './AssetTree.less';
 
 const AssetTree = (props) => {
 
-  const { checkable = false, onSelect, className, onCheck, tableId, reference=AssetManageReference, showCustom=true, onDirectoryChange, centerId } = props; 
+  const { checkable = false, onSelect, className, onCheck, tableId, reference=AssetManageReference, onDirectoryChange, centerId } = props; 
   const [ keyword, setKeyword ] = useState('');
   const [ loading, setLoading ] = useState(false);
   const [ treeData, setTreeData ] = useState([]);
@@ -32,8 +32,8 @@ const AssetTree = (props) => {
 
   const [modal, contextHolder] = Modal.useModal();
   
-  const timestamp = getQueryParam(AnchorTimestamp, props.location?.search);
-  const id = getQueryParam(AnchorId, props.location?.search);
+  const timestamp = getQueryParam(AnchorTimestamp, props?.location?.search);
+  const id = getQueryParam(AnchorId, props?.location?.search);
 
   useEffect(() => {
     if ((id||'') !== '') {
@@ -96,7 +96,7 @@ const AssetTree = (props) => {
     }
 
     let url = '';
-    if (reference === AssetManageReference) {
+    if (reference === AssetManageReference || reference === AssetMountReference) {
       url = 'assetmanage.queryAllDirectoryAsTree';
     } else if (reference === AssetBrowseReference) {
       url = 'assetmanage.queryAssetDirectoryAsTree';
@@ -110,9 +110,6 @@ const AssetTree = (props) => {
         setLoading(false);
 
         let newData = [...data];
-        if (!showCustom) {
-          newData = (newData||[]).filter(item => item.type!=='custom');
-        }
 
         setTreeData(newData);
 
@@ -506,14 +503,13 @@ const AssetTree = (props) => {
 
   const classes = classNames('asset-tree', className, {
     'asset-tree-read-only': (reference===AssetBrowseReference||reference===ResourceBrowseReference),
-    'asset-tree-metadata-reference': reference==='metadata',
-    'asset-tree-asset-mount-reference': reference==='mount',
+    'asset-tree-asset-mount-reference': reference===AssetMountReference,
   });  
 
   return (
     <Card
       className={classes}
-      title={ (reference===AssetBrowseReference||reference===ResourceBrowseReference) ? null : (
+      title={ (reference===AssetBrowseReference||reference===ResourceBrowseReference || reference===AssetMountReference) ? null : (
         <div
           className='p-3'
           style={{

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

@@ -23,7 +23,7 @@
   }
 }
 
-.asset-tree-metadata-reference, .asset-tree-asset-mount-reference {
+.asset-tree-asset-mount-reference {
   .yy-tree {
     height: 400px !important;
     overflow: auto !important;

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

@@ -5,7 +5,7 @@ import { dispatch } from '../../../../model';
 import AssetTree from '../../AssetManage/Component/AssetTree';
 import { showMessage } from '../../../../util';
 
-import { AssetManageReference, AssetRecycleReference } from "../../../../util/constant";
+import { AssetManageReference, AssetRecycleReference, AssetMountReference } from "../../../../util/constant";
 
 const AssetMount = (props) => {
   
@@ -61,13 +61,10 @@ const AssetMount = (props) => {
       onOk={ onOk }
     >
       <AssetTree 
-        readOnly={true} 
         checkable={true}
-        showCustom={false}
         onCheck={onCheck}
         tableId={(reference===AssetManageReference&&(ids||[].length>0))?ids[0]:''}
-        reference='mount'
-        {...props} 
+        reference={AssetMountReference}
       /> 
     </Modal>
   )

src/view/Manage/Model/Component/ImportActionHeader.jsx

@@ -534,7 +534,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="中文名称"
                 name="cnName"
-                labelAlign="left"
                 rules={[{ required: true, message: '请输入中文名称!' }]}
               >
                 <InputDebounce />
@@ -544,7 +543,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="英文名称"
                 name="name"
-                labelAlign="left"
                 rules={[{ required: true, message: '请输入英文名称!' }]}
               >
                 <AutoComplete options={options} onSearch={onSearch} />
@@ -554,7 +552,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="规范"
                 name="easyDataModelerModelingConstraint"
-                labelAlign="left"
                 rules={[{ required: true, message: '请选择规范!' }]}
               >
                 <ConstraintSelect 
@@ -567,7 +564,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="数据内容"
                 name="remark"
-                labelAlign="left"
                 rules={[{ required: true, message: '请输入数据内容!' }]}
                 style={{ marginBottom: 15 }}
               >
@@ -584,7 +580,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="生成表类型"
                 name="easyDataModelerModelingTemplate"
-                labelAlign="left"
                 rules={[{ required: false, message: '请选择生成表类型!' }]}
               >
                 <TemplateSelect 
@@ -597,7 +592,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="数据表类型"
                 name="tableType"
-                labelAlign="left"
               >
                 <Input />
               </Form.Item>
@@ -606,7 +600,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="数据平台"
                 name="dataResidence"
-                labelAlign="left"
               >
                 <Input disabled={true} />
               </Form.Item>
@@ -615,7 +608,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="数据情况"
                 name="dataCircumstances"
-                labelAlign="left"
               >
                 <Input />
               </Form.Item>
@@ -624,7 +616,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="分布键"
                 name="easyDataModelerDistributionKey"
-                labelAlign="left"
               >
                 <AttributesSelect modelerData={modelerData} />
               </Form.Item>
@@ -633,7 +624,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="分区键"
                 name="partition"
-                labelAlign="left"
               >
                 <PartitionSelect modelerData={modelerData} partitionTypes={supportedPartitionTypes} />
               </Form.Item>
@@ -642,7 +632,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="主键"
                 name="easyDataModelerPrimaryKey"
-                labelAlign="left"
               >
                 <AttributesSelect modelerData={modelerData} />
               </Form.Item>
@@ -651,7 +640,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="类主键"
                 name="easyDataModelerSemiPrimaryKey"
-                labelAlign="left"
               >
                 <AttributesSelect modelerData={modelerData} mode='tags' />
               </Form.Item>
@@ -660,7 +648,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="加载方式"
                 name="dataLoadingStrategy"
-                labelAlign="left"
               >
                 <LoadSelect />
               </Form.Item>
@@ -669,7 +656,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="更新时间"
                 name="dataUpdatingTiming"
-                labelAlign="left"
               >
                 <UpdateSelect />
               </Form.Item>
@@ -678,7 +664,6 @@ const ImportActionHeader = (props) => {
               <Form.Item
                 label="维护历史"
                 name="maintenanceRecords"
-                labelAlign="left"
               >
                 <Input disabled={true} />
               </Form.Item>
@@ -687,28 +672,33 @@ const ImportActionHeader = (props) => {
           }  
         </Form> 
       ) : (
-        <Descriptions column={3}>
-          <Descriptions.Item label="中文名称">{highlightSearchContentByTerms(modelerData.cnName||'', terms)}</Descriptions.Item>
-          <Descriptions.Item label="英文名称">
+        <React.Fragment>
+          <Descriptions column={3}>
+            <Descriptions.Item label="中文名称">{highlightSearchContentByTerms(modelerData.cnName||'', terms)}</Descriptions.Item>
+            <Descriptions.Item label="英文名称">
+            {
+              <div>
+                <div>{highlightSearchContentByTerms(modelerData.name||'', terms)}</div>
+                {
+                  (causes||[]).map((cause, index) => {
+                    return (
+                      <div key={index} style={{ color: '#ff4d4f' }}>
+                      {cause||''}
+                      </div>
+                    )
+                  })
+                }
+              </div>
+            }
+            </Descriptions.Item>
+            <Descriptions.Item label="规范">{modelerData.easyDataModelerModelingConstraint?(modelerData.easyDataModelerModelingConstraint.cnName||''):''}</Descriptions.Item>
+            <Descriptions.Item label="数据内容">{highlightSearchContentByTerms(modelerData.remark||'', terms)}</Descriptions.Item>
+          </Descriptions>  
           {
-            <div>
-              <div>{highlightSearchContentByTerms(modelerData.name||'', terms)}</div>
-              {
-                (causes||[]).map((cause, index) => {
-                  return (
-                    <div key={index} style={{ color: '#ff4d4f' }}>
-                    {cause||''}
-                    </div>
-                  )
-                })
-              }
-            </div>
+            !onlyShowRequireChange && <Divider style={{ margin: '0 0 15px' }} />
           }
-          </Descriptions.Item>
-          <Descriptions.Item label="规范">{modelerData.easyDataModelerModelingConstraint?(modelerData.easyDataModelerModelingConstraint.cnName||''):''}</Descriptions.Item>
-          <Descriptions.Item label="数据内容">{highlightSearchContentByTerms(modelerData.remark||'', terms)}</Descriptions.Item>
           {
-            !onlyShowRequireChange && <React.Fragment>
+            !onlyShowRequireChange && <Descriptions column={3}>
               <Descriptions.Item label="生成表类型">{modelerData.easyDataModelerModelingTemplate?(modelerData.easyDataModelerModelingTemplate.cnName||''):''}</Descriptions.Item>
               <Descriptions.Item label="数据表类型">{highlightSearchContentByTerms(modelerData.tableType||'', terms)}</Descriptions.Item>
               <Descriptions.Item label="数据平台">{highlightSearchContentByTerms(modelerData.dataResidence||'', terms)}</Descriptions.Item>   
@@ -728,9 +718,9 @@ const ImportActionHeader = (props) => {
                 }
                 </div>
               </Descriptions.Item> 
-            </React.Fragment>
+            </Descriptions>
           }         
-        </Descriptions>
+        </React.Fragment>
       ) 
     }
     </div>