推荐跳转bug修复

src/model/datamodel.js

@@ -222,6 +222,10 @@ export function* getSchemasByDatasourceId(payload) {
   return yield call(datamodelerService.getSchemasByDatasourceId, payload);
 }
 
+export function* getParent(payload) {
+  return yield call(datamodelerService.getParent, payload);
+}
+
 export function* autoCreateTable(payload) {
   return yield call(datamodelerService.autoCreateTable, payload);
 }

src/service/datamodeler.js

@@ -201,6 +201,10 @@ export function getSchemasByDatasourceId(payload) {
   return GetJSON("/metadatarepo/rest/query/getChild", payload);
 }
 
+export function getParent(payload) {
+  return GetJSON("/metadatarepo/rest/query/getParent", payload);
+}
+
 export function autoCreateTable(payload) {
   return PostJSON("/metadataharvester/datasource/createTableByDDLList", payload);
 }

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

@@ -6,7 +6,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import update from 'immutability-helper';
 
 import { generateUUID, highlightSearchContentByTerms, showMessage } from '../../../../util';
-import { dispatchLatest } from '../../../../model'; 
+import { dispatch, dispatchLatest } from '../../../../model'; 
 import Helper from './Help';
 import { AppContext } from '../../../../App';
 
@@ -893,7 +893,16 @@ const ImportActionTable = (props) => {
     const timestamp = new Date().getTime();
 
     if (id.split('=').length>=3) {
-      window.open(`/center-home/menu/metasearch?id=${id}&timestamp=${timestamp}`);
+
+      dispatch({
+        type: 'datamodel.getParent',
+        payload: {
+          id
+        },
+        callback: data => {
+          window.open(`/center-home/menu/metasearch?id=${data._id}&timestamp=${timestamp}`);
+        }
+      })
     } else {
       window.open(`/center-home/menu/datastandard?id=${id}&timestamp=${timestamp}`);
     }

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

@@ -41,7 +41,6 @@ const ImportWordModal = (props) => {
       payload: { 
         params: {
           catalogId,
-          stateId: '1'
         },
         fileList 
       },
@@ -49,7 +48,7 @@ const ImportWordModal = (props) => {
         setConfirmLoading(false);
         reset();
         if (onCancel) {
-          onCancel(false, data||[]);
+          onCancel(true, data||[]);
         }
       },
       error: () => {

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

@@ -47,9 +47,18 @@ const VersionHistory = (props) => {
       <Timeline style={{ padding: 24 }}>
       {
         (versions||[]).map((version, index) => {
+          let name = version.name||'';
+          name = name + '_' + formatVersionDate(version.ts);
+          if (index === 0 && version.id !== '-1') {
+            name = name+'(当前版本)';
+          }
+          if (index === 1 && versions[0].id === '-1') {
+            name = name+'(当前版本)';
+          }
+
           return <Timeline.Item key={index} >
             <a onClick={()=>{ onVersionItemClick(version); }}>
-            {formatVersionDate(version.ts)}
+            {name}
             </a>
           </Timeline.Item>
         })

src/view/Manage/Model/index.jsx

@@ -373,25 +373,29 @@ class Model extends React.Component {
     });
   }
 
-  onImportWordModalCancel = (refresh = false, datas = []) => {
+  onImportWordModalCancel = (refresh = false, data = {}) => {
     
     const { catalogId } = this.state;
     this.setState({ importWordModalVisible: false });
 
     refresh && this.onTableChange();
 
-    if ((datas||[]).length > 0) {
-      if ((datas||[]).length > 5) {
+    if (data && (data.msg||''!=='')) {
+      showNotifaction('提示', data.msg, 5);
+    }
+
+    if (data && (data.content||[]).length > 0) {
+      if ((data.content||[]).length > 5) {
         showMessage('info', '最多只能同时编辑5条信息');
       }
 
       setTimeout(() => {
 
-        datas.slice(0, 5).forEach(data => {
+        data.content.slice(0, 5).forEach(data => {
           window.open(`/data-govern/data-model-action?${Action}=add&${CatalogId}=${catalogId}&${ModelerData}=${encodeURIComponent(JSON.stringify(data))}`, '_blank');
         })
 
-      }, 1000);
+      }, 2000);
 
     }
   }