调整资产列表样式

src/App.js

@@ -15,7 +15,7 @@ import AssetBrowse from './view/Manage/AssetBrowse';
 import AssetRecycle from './view/Manage/AssetRecycle';
 import DatasourceManage from './view/Manage/DatasourceManage';
 import AssetDetail from './view/Manage/AssetManage/Component/AssetDetail';
-import ImportModal from './view/Manage/Model/Component/ImportModal';
+import ImportAction from './view/Manage/Model/Component/ImportAction';
 
 export default class App extends React.Component {
   render() {
@@ -31,12 +31,10 @@ export default class App extends React.Component {
 
     if (message === 'showDataModelDetail') {
       return (
-        <ImportModal
+        <ImportAction
           modelerId={id} 
-          reference='search'
           action='detail'
           terms={terms}
-          visible={true}
         />
       );
     }

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

 import React from 'react';
-import { Avatar, Row, Col, Typography, Divider } from 'antd';
+import { Row, Col, Typography, Divider } from 'antd';
 
 import './AssetItem.less';
 
@@ -26,8 +26,9 @@ const AssetItem = (props) => {
         const _type = elementGroup.type||'';
 
         return (
-          <div key={index} className='d-flex' style={{ alignItems: 'center' }}>
-            <Avatar 
+          <div>
+            <Divider orientation='left'>{_type||''}</Divider>
+            {/* <Avatar 
               className='mr-3' 
               title={_type}
               style={{ 
@@ -35,8 +36,8 @@ const AssetItem = (props) => {
               }}
             >
             { _type==='' ? '无' : _type.slice(0, 2) }
-            </Avatar>
-            <div className='textOverflow' style={{ flex: 1 }}>
+            </Avatar> */}
+            <div>
               <Row className='mb-3'>
               {
                 elementGroup && elementGroup.elements && elementGroup.elements.map((element, _index) => {
@@ -50,7 +51,6 @@ const AssetItem = (props) => {
                 })
               }
               </Row>
-              { index !== ((data.elementsGroup||[]).length-1) && <Divider /> }
             </div>
           </div>
         )

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

 .asset-item {
+
+  margin: 10px 0px 10px 30px;
+
   .yy-divider-horizontal {
     margin: 0 !important;
   }

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

@@ -11,12 +11,13 @@ import { dispatchLatest } from '../../../../model';
 import { showMessage } from '../../../../util';
 
 const ImportModal = (props) => {
-  const { catalogId, visible, onCancel, action, addMode, modelerId, reference=null, terms } = props;
+  const { catalogId, visible, onCancel, action, addMode, modelerId } = props;
   const [ step, setStep ] = useState(0);
   const [ excelFiles, setExcelFiles ] = useState([]);
   const [ hints, setHints ] = useState([]);
   const [ modelerData, setModelerData ] = useState({});
   const [ confirmLoading, setConfirmLoading ] = useState(false);
+  const [ terms, setTerms ] = useState([]);
 
   const [form] = Form.useForm();
 
@@ -108,8 +109,9 @@ const ImportModal = (props) => {
             }
           })
         },
-        error: () => {
+        error: (err) => {
           setConfirmLoading(false);
+          setTerms([err.ApiError?.message||'']);
         }
       })
 
@@ -217,9 +219,7 @@ const ImportModal = (props) => {
   }
 
   return (
-    <>
-    {
-      !reference && <Modal 
+    <Modal 
       forceRender
       visible={visible}
       title={title}
@@ -253,15 +253,10 @@ const ImportModal = (props) => {
         step===0 && addMode==='metadata' && <ImportMetadata />
       }
       {
-          step===1 && <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} form={form} />
+        step===1 && <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} form={form} terms={terms} />
       }
       </>
     </Modal>
-    }
-    {
-      reference==='search' && <ImportAction hints={hints} onChange={onActionChange} action={action} modelerId={modelerId} form={form} terms={terms} />
-    }
-    </>
   )
 }