window.open页面更新

src/App.js

@@ -15,9 +15,7 @@ const Signin = loadable(()=> import('./view/Signin'));
 const Home = loadable(()=> import('./view/Home'));
 const Manage = loadable(()=> import('./view/Manage'));
 const Model = loadable(()=> import('./view/Manage/Model'));
-const ManualDataModel = loadable(()=> import('./view/Manage/Manual'));
 const ModelConfig = loadable(()=> import('./view/Manage/ModelConfig'));
-const ManualModelConfig = loadable(()=> import('./view/Manage/ManualModelConfig'));
 const ModelCompare = loadable(()=> import('./view/Manage/ModelCompare'));
 const DataTypeConfig = loadable(()=> import('./view/Manage/DataTypeConfig'));
 const AssetResourceManage = loadable(()=> import('./view/Manage/AssetResourceManage'));
@@ -42,6 +40,14 @@ const ModelCompareList = loadable(()=> import('./view/Manage/ModelCompareList'))
 const MetadataUpdateDatasource = loadable(()=> import('./view/Feign/metadata-update-datasource'));
 const EtlConfig = loadable(()=> import('./view/Feign/etl-config'));
 const ApiConfig = loadable(()=> import('./view/Feign/api-config'));
+// 手工数据
+const ManualDataModel = loadable(()=> import('./view/Manage/Manual'));
+const ManualModelConfig = loadable(()=> import('./view/Manage/ManualModelConfig'));
+const ManualImportAction = loadable(()=> import('./view/Manage/Manual/Component/ImportAction'));
+const ManualEditModel = loadable(()=> import('./view/Manage/Manual/Component/EditModel'));
+const ManualEditTemplate = loadable(()=> import('./view/Manage/ManualModelConfig/Component/EditTemplate'));
+
+
 
 export class App extends React.Component {
   constructor() {
@@ -206,8 +212,7 @@ export class App extends React.Component {
             <Route path={'/center-home/view/model-config'} component={ModelConfig} exact />
             <Route path={'/center-home/view/data-model-bj'} component={Model} exact />
             <Route path={'/center-home/view/model-config-bj'} component={ModelConfig} exact />
-            <Route path={'/center-home/view/manual-data-model-bj'} component={ManualDataModel} exact />
-            <Route path={'/center-home/view/manual-model-config-bj'} component={ManualModelConfig} exact />
+            
             <Route path={'/center-home/view/asset-manage'} component={AssetManage} exact />
             <Route path={'/center-home/view/asset-resource-browse'} component={AssetResourceBrowse} exact />
             <Route path={'/center-home/view/asset-browse'} component={AssetBrowse} exact />
@@ -218,8 +223,6 @@ export class App extends React.Component {
             <Route path={'/center-home/menu/model-config'} component={ModelConfig} exact />
             <Route path={'/center-home/menu/data-model-bj'} component={Model} exact />
             <Route path={'/center-home/menu/model-config-bj'} component={ModelConfig} exact />
-            <Route path={'/center-home/menu/manual-data-model-bj'} component={ManualDataModel} exact />
-            <Route path={'/center-home/menu/manual-model-config-bj'} component={ManualModelConfig} exact />
             <Route path={'/center-home/menu/model-compare'} component={ModelCompare} exact />
             <Route path={'/center-home/menu/data-type-config'} component={DataTypeConfig} exact />
             <Route path={'/center-home/menu/asset-resource-manage'} component={AssetResourceManage} exact />
@@ -241,6 +244,15 @@ export class App extends React.Component {
             <Route path={'/data-model-product/physics-model-branch'} component={Model} exact />
             <Route path={'/data-model-product/admin/model-specification'} component={ModelConfig} exact />
 
+            {/* 手工数据 */}
+            <Route path={'/center-home/view/manual-data-model-bj'} component={ManualDataModel} exact />
+            <Route path={'/center-home/view/manual-model-config-bj'} component={ManualModelConfig} exact />
+            <Route path={'/center-home/menu/manual-data-model-bj'} component={ManualDataModel} exact />
+            <Route path={'/center-home/menu/manual-model-config-bj'} component={ManualModelConfig} exact />
+            <Route path={`${ContextPath}/manual-data-model-action`} component={ManualEditModel} exact />  
+            <Route path={'/center-home/manual-data-model-action'} component={ManualEditModel} exact />
+            <Route path={`${ContextPath}/manual-model-template-action`} component={ManualEditTemplate} exact />    
+
           </Switch>
         </Router>
       </AppContext.Provider>

src/view/Manage/Manual/Component/EditModel.jsx

@@ -390,7 +390,7 @@ const EditModel = (props) => {
   }
 
   const onCopy = () => {
-    window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId??''}&${ModelerId}=${modelerId}`)
+    window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${privilege?.catalogId??''}&${ModelerId}=${modelerId}`)
   }
 
   const onMetadataCompare = () => {

src/view/Manage/Manual/Component/ModelTable.jsx

@@ -659,9 +659,9 @@ const ModelTable = (props) => {
       historyItem(currentItem);
     } else if (key === 'copy') {
       if (view !== 'branch') {
-        window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${currentItem.id}`);
+        window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${(view==='dir')?(catalogId||''):''}&${ModelerId}=${currentItem.id}`);
       } else {
-        window.open(`/data-govern-bj/data-model-action?${Action}=add&${BranchId}=${catalogId??''}&${ModelerId}=${currentItem.id}`);
+        window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${BranchId}=${catalogId??''}&${ModelerId}=${currentItem.id}`);
       }
     } else if (key === 'createTable') {
       deployAction(currentItem);

src/view/Manage/Manual/index.jsx

@@ -377,7 +377,7 @@ class Model extends React.Component {
         currentBranchId = catalogId
       }
 
-      window.open(`/data-govern-bj/data-model-action?${Action}=${importModalAction}&${CatalogId}=${currentCatalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=${readOnly}&${BranchId}=${currentBranchId}`);
+      window.open(`/data-govern-bj/manual-data-model-action?${Action}=${importModalAction}&${CatalogId}=${currentCatalogId}&${ModelerId}=${modelerId}&${PermitCheckOut}=${record.permitCheckOut||false}&${Editable}=${record.editable||false}&${StateId}=${record.state?.id||''}&${ReadOnly}=${readOnly}&${BranchId}=${currentBranchId}`);
     });
   }
 
@@ -444,7 +444,7 @@ class Model extends React.Component {
   onImportUnconditionBtnClick = () => {
     const { catalogId, currentView } = this.state;
 
-    window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${(currentView==='dir')?(catalogId||''):''}`);
+    window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${(currentView==='dir')?(catalogId||''):''}`);
   }
 
   onExportDDLBtnClick = () => {
@@ -536,11 +536,11 @@ class Model extends React.Component {
 
         if ((hints||[]).length > 0) {
           setTimeout(() => {
-            window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${Hints}=${encodeURIComponent((hints||[]).join(','))}&${BranchId}=${branchId}`);
+            window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${Hints}=${encodeURIComponent((hints||[]).join(','))}&${BranchId}=${branchId}`);
           }, 1000);
         } else {
           setTimeout(() => {
-            window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}`);
+            window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}`);
           }, 1000);
         }
       }
@@ -572,7 +572,8 @@ class Model extends React.Component {
           }
           
           wordData.content.slice(0, 5).forEach(data => {
-            window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${ModelerData}=${encodeURIComponent(JSON.stringify(data))}`, '_blank');
+            alert('hjj2')
+            window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${ModelerData}=${encodeURIComponent(JSON.stringify(data))}`, '_blank');
           })
   
         }, 2000);
@@ -596,8 +597,8 @@ class Model extends React.Component {
             currentCatalogId = branchAddModelCatalog
             branchId = catalogId
           }
-
-          window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank');
+          alert('hjj3')
+          window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank');
         }, 1000);
   
       }

src/view/Manage/ManualModelConfig/Component/TemplateCURD.jsx

@@ -158,11 +158,11 @@ const TemplateCURD = (props) => {
   }
 
   const editItem = (record) => {
-    window.open(`/data-govern-bj/model-template-action?${Action}=edit&${TemplateId}=${record.id}`);
+    window.open(`/data-govern-bj/manual-model-template-action?${Action}=edit&${TemplateId}=${record.id}`);
   }
 
   const detailItem = (record) => {
-    window.open(`/data-govern-bj/model-template-action?${Action}=detail&${TemplateId}=${record.id}`);
+    window.open(`/data-govern-bj/manual-model-template-action?${Action}=detail&${TemplateId}=${record.id}`);
   }
 
   const deleteItem = (record) => {
@@ -187,7 +187,7 @@ const TemplateCURD = (props) => {
   }
 
   const onAddClick = () => {
-    window.open(`/data-govern-bj/model-template-action?${Action}=add`);
+    window.open(`/data-govern-bj/manual-model-template-action?${Action}=add`);
   }
 
   return (