资产项

src/view/Manage/AssetBrowse/Component/Relation.jsx

@@ -55,7 +55,7 @@ export default Relation;
 const init = (ctx) => function (container, data, onCenterClick, onExpandClick) {
   const width = container.scrollWidth;
   const height = container.scrollHeight;
-  const totalLevel = data?.totalLevel;
+  // const totalLevel = data?.totalLevel;
 
   const tooltip = new G6.Tooltip({
     offsetX: 10,

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

@@ -22,6 +22,65 @@ const { Text } = Typography;
 
 const InputDebounce = DebounceInput(300)(Input);
 
+//资产项
+const AssetItem = (props) => {
+  const { metadata } = props;
+
+  let content = '';
+  if (typeof metadata==='string') {
+    content = metadata;
+  } else {
+    (metadata?.columnItems||[]).forEach((item, index) => {
+      content += ((index===0)?'':',') + (((item.metadataColumnCnName||'')!=='')?(item.metadataColumnCnName||''):(item.metadataColumnName||''));
+    })
+  }
+
+  const cols = [
+    {
+      title: '序号',
+      dataIndex: 'key',
+      render: (text, record, index) => {
+        return (index+1).toString();
+      },
+      width: 60,
+      ellipsis: true,
+    },
+    {
+      title: '字段中文名称',
+      width: 160,
+      dataIndex: 'metadataColumnCnName',
+      editable: true,
+      ellipsis: true,
+    },
+    {
+      title: '字段英文名称',
+      width: 160,
+      dataIndex: 'metadataColumnName',
+      editable: true,
+      ellipsis: true,
+    },
+  ];
+
+  return (
+    <Tooltip 
+      overlayClassName='tooltip-common'
+      title={(typeof metadata==='string') ? (content||'') : <div style={{ width: 500, maxHeight: 300, overflow: 'auto' }}>
+        <Table 
+          dataSource={metadata.columnItems||[]}
+          columns={cols}
+          loading={false}
+          pagination={false}
+          size='small'
+        />
+      </div>}
+    >
+      <Text ellipsis={true}>
+      {content||''}
+      </Text>
+    </Tooltip>
+  );
+}
+
 const ResizeableHeaderCell = props => {
   const { onResize, width, onClick, ...restProps } = props;
 
@@ -206,23 +265,8 @@ const AssetTable = (props) => {
               params.fixed = 'right';
 
               params.render = (metadata, _) => {
-
-                let _content = '';
-
-                if (typeof metadata==='string') {
-                  _content = metadata;
-                } else {
-                  (metadata?.columnItems||[]).forEach((item, index) => {
-                    _content += ((index===0)?'':',') + item.metadataColumnName||'';
-                  })
-                }
-
                 return (
-                  <Tooltip title={_content}>
-                    <Text ellipsis={true}>
-                    {_content}
-                    </Text>
-                  </Tooltip>
+                  <AssetItem metadata={metadata} />
                 );
               }
 

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

@@ -28,7 +28,15 @@ const MetadataInfo = ({ value = '', config = true }) => {
             </a>
             {
               (metadata?.columnItems||[]).map((item, index) => {
-                return <span key={index}>{item.metadataColumnName||''}</span>
+
+                let _content = '';
+                if ((item.metadataColumnCnName||'')!=='') {
+                  _content = item.metadataColumnCnName + '/';
+                }
+
+                _content += item.metadataColumnName||'';
+
+                return <span key={index}>{_content}</span>
               })
             }
           </div>

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

@@ -9,13 +9,12 @@ import { useContextMenu, Menu as RcMenu, Item as RcItem } from "react-contexify"
 import ResizeObserver from 'rc-resize-observer';
 import { Resizable } from 'react-resizable';
 
-import { generateUUID, highlightSearchContentByTerms, showMessage, inputWidth, paginate, getQueryParam } from '../../../../util';
+import { generateUUID, highlightSearchContentByTerms, showMessage, inputWidth, paginate } from '../../../../util';
 import { dispatch, dispatchLatest } from '../../../../model'; 
 import { addEventListenerForSidebar, removeEventListenerForSidebar } from './Help';
 import { AppContext } from '../../../../App';
 import DebounceInput from './DebounceInput';
 import SuggestTable from './SuggestTable';
-import { Action } from '../../../../util/constant';
 
 import './ImportActionTable.less';
 

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

@@ -477,8 +477,8 @@ const ModelTree = (props) => {
         {
           (viewSelectedKey==='dir') && !isSetRootId && (
             <Dropdown overlay={syncMenu} placement="bottomLeft"> 
-              <Tooltip title="同步目录" className='ml-2'>
-                <SyncOutlined className='default' className='ml-2' style={{ fontSize:16,cursor:'pointer' }} />
+              <Tooltip title="同步目录">
+                <SyncOutlined className='default ml-2' style={{ fontSize:16,cursor:'pointer' }} />
               </Tooltip>
             </Dropdown>
           )