地图

src/service/map.js

@@ -5,5 +5,5 @@ export function getAllTopics() {
 }
 
 export function getTableModelByDirId(payload) {
-  return GetJSON("/dataassetmanager/countApi/getTableModelInfoByDirId", payload);
+  return GetJSON("/dataassetmanager/countApi/getTableModelInfoByDirIdAnotherType", payload);
 }

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

@@ -283,10 +283,10 @@ const AssetTable = (props) =>{
                                     <Row>
                                         {item.elements&&item.elements.map(element=>{
                                             return(
-                                            <Col md={6} key={element.id||''}>
-                                                <Text>{element.name}：</Text>
-                                                {element.value}
-                                            </Col>
+                                                 <Col md={6} key={element.id||''}>
+                                                    <Text>{element.name}：</Text>
+                                                    <Text>{element.value}</Text> 
+                                                </Col>
                                             )
                                         })
                                        }

src/view/Manage/Map/Component/SquareItem.jsx

@@ -20,6 +20,19 @@ class SquareItem extends React.Component {
 
   render() {
     const { item } = this.props;
+
+    let assetName = '', assetCnName = '';
+    if (item && item.dbType === 'Table') {
+      (item.elements||[]).forEach((element) => {
+        if (element.name === '中文名称') {
+          assetCnName = element.value;
+        } 
+        if (element.name === '英文名称') {
+          assetName = element.value;
+        }
+      })
+    }
+
     return (
       <div className='map-square-item'>
       {
@@ -35,11 +48,11 @@ class SquareItem extends React.Component {
           </Card> : <Card title={
             <div className='d-flex pointer' style={{ alignItems: 'center' }} onClick={this.onItemClick}>
               <FileOutlined className='mr-1' />
-              <span>{item.name||''}</span>
+              <span>{assetName||''}</span>
             </div>
           }>
-            <p>{`所属系统: ${item.system||''}`}</p>
-            <p>{`描述: ${item.remarks||''}`}</p>
+            <p>{`中文名称: ${assetCnName||''}`}</p>
+            <p>{`英文名称: ${assetName||''}`}</p>
           </Card>
         )
       }

src/view/Manage/Map/MapContent.jsx

@@ -61,14 +61,30 @@ class MapContent extends React.Component {
     })
   }
 
+  componentDidUpdate(prevProps, prevState){
+    const { type } = this.props;
+
+    if (type !== prevProps.type) {
+      this.setState({ parentNodeId: '' });
+    }
+  }
+
   convertRemoteData = (data) => {
     data.forEach((item, index) => {
       if (item.dbType==='Dir') {
         item.text = item.dirName||'';
         item.id = `d${item.dirId||''}`
       } else {
-        item.text = item.name||'';
-        item.id = `t${item.tableModelId||''}`;
+        let assetCnName = '';
+
+        (item.elements||[]).forEach(element => {
+          if (element.name === '中文名称') {
+            assetCnName = element.value;
+          }
+        })
+
+        item.text = assetCnName||'';
+        item.id = `t${item.id||''}`;
       }
     })
   }
@@ -99,6 +115,7 @@ class MapContent extends React.Component {
         type: 'map.getTableModelByDirIid',
         payload: { dirId: item.dirId },
         callback: data => {
+
           this.convertRemoteData(data||[]);
           item.children = (data||[]);
           this.setSquareGraphState(item);
@@ -120,12 +137,10 @@ class MapContent extends React.Component {
   }
 
   loadMoreData = (dirId, nodeId) => {
-
     dispatchLatest({
       type: 'map.getTableModelByDirIid',
       payload: { dirId },
       callback: data => {
-
         this.convertRemoteData(data||[]);
         this.setState({ 
           parentNodeId: nodeId,