Skip to content

S
szse
Commit a734d6bb by 和金晶
Options

window.open页面更新

parent 75842ccd
Showing with 33 additions and 20 deletions
src/App.js
...@@ -15,9 +15,7 @@ const Signin = loadable(()=> import('./view/Signin')); ...@@ -15,9 +15,7 @@ const Signin = loadable(()=> import('./view/Signin'));
const Home = loadable(()=> import('./view/Home')); const Home = loadable(()=> import('./view/Home'));
const Manage = loadable(()=> import('./view/Manage')); const Manage = loadable(()=> import('./view/Manage'));
const Model = loadable(()=> import('./view/Manage/Model')); const Model = loadable(()=> import('./view/Manage/Model'));
const ManualDataModel = loadable(()=> import('./view/Manage/Manual'));
const ModelConfig = loadable(()=> import('./view/Manage/ModelConfig')); const ModelConfig = loadable(()=> import('./view/Manage/ModelConfig'));
const ManualModelConfig = loadable(()=> import('./view/Manage/ManualModelConfig'));
const ModelCompare = loadable(()=> import('./view/Manage/ModelCompare')); const ModelCompare = loadable(()=> import('./view/Manage/ModelCompare'));
const DataTypeConfig = loadable(()=> import('./view/Manage/DataTypeConfig')); const DataTypeConfig = loadable(()=> import('./view/Manage/DataTypeConfig'));
const AssetResourceManage = loadable(()=> import('./view/Manage/AssetResourceManage')); const AssetResourceManage = loadable(()=> import('./view/Manage/AssetResourceManage'));
...@@ -42,6 +40,14 @@ const ModelCompareList = loadable(()=> import('./view/Manage/ModelCompareList')) ...@@ -42,6 +40,14 @@ const ModelCompareList = loadable(()=> import('./view/Manage/ModelCompareList'))
const MetadataUpdateDatasource = loadable(()=> import('./view/Feign/metadata-update-datasource')); const MetadataUpdateDatasource = loadable(()=> import('./view/Feign/metadata-update-datasource'));
const EtlConfig = loadable(()=> import('./view/Feign/etl-config')); const EtlConfig = loadable(()=> import('./view/Feign/etl-config'));
const ApiConfig = loadable(()=> import('./view/Feign/api-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 { export class App extends React.Component {
constructor() { constructor() {
...@@ -200,14 +206,13 @@ export class App extends React.Component { ...@@ -200,14 +206,13 @@ export class App extends React.Component {
<Route path={`${ContextPath}/asset-detail`} component={AssetDetailPage} exact /> <Route path={`${ContextPath}/asset-detail`} component={AssetDetailPage} exact />
<Route path={`${ContextPath}/edit-assets`} component={EditAssets} exact /> <Route path={`${ContextPath}/edit-assets`} component={EditAssets} exact />
<Route path={`${ContextPath}/model-review-detail`} component={ModelReviewDetail} /> <Route path={`${ContextPath}/model-review-detail`} component={ModelReviewDetail} />
<Route path={'/center-home/view/datasource-manage'} component={DatasourceManage} exact /> <Route path={'/center-home/view/datasource-manage'} component={DatasourceManage} exact />
<Route path={'/center-home/view/data-model'} component={Model} exact /> <Route path={'/center-home/view/data-model'} component={Model} exact />
<Route path={'/center-home/view/model-config'} component={ModelConfig} exact /> <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/data-model-bj'} component={Model} exact />
<Route path={'/center-home/view/model-config-bj'} component={ModelConfig} 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-manage'} component={AssetManage} exact />
<Route path={'/center-home/view/asset-resource-browse'} component={AssetResourceBrowse} exact /> <Route path={'/center-home/view/asset-resource-browse'} component={AssetResourceBrowse} exact />
<Route path={'/center-home/view/asset-browse'} component={AssetBrowse} exact /> <Route path={'/center-home/view/asset-browse'} component={AssetBrowse} exact />
...@@ -218,8 +223,6 @@ export class App extends React.Component { ...@@ -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/model-config'} component={ModelConfig} exact />
<Route path={'/center-home/menu/data-model-bj'} component={Model} 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/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/model-compare'} component={ModelCompare} exact />
<Route path={'/center-home/menu/data-type-config'} component={DataTypeConfig} exact /> <Route path={'/center-home/menu/data-type-config'} component={DataTypeConfig} exact />
<Route path={'/center-home/menu/asset-resource-manage'} component={AssetResourceManage} exact /> <Route path={'/center-home/menu/asset-resource-manage'} component={AssetResourceManage} exact />
...@@ -241,6 +244,15 @@ export class App extends React.Component { ...@@ -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/physics-model-branch'} component={Model} exact />
<Route path={'/data-model-product/admin/model-specification'} component={ModelConfig} 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> </Switch>
</Router> </Router>
</AppContext.Provider> </AppContext.Provider>
......
src/view/Manage/Manual/Component/EditModel.jsx
...@@ -390,7 +390,7 @@ const EditModel = (props) => { ...@@ -390,7 +390,7 @@ const EditModel = (props) => {
} }
const onCopy = () => { 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 = () => { const onMetadataCompare = () => {
......
src/view/Manage/Manual/Component/ModelTable.jsx
...@@ -659,9 +659,9 @@ const ModelTable = (props) => { ...@@ -659,9 +659,9 @@ const ModelTable = (props) => {
historyItem(currentItem); historyItem(currentItem);
} else if (key === 'copy') { } else if (key === 'copy') {
if (view !== 'branch') { 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 { } 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') { } else if (key === 'createTable') {
deployAction(currentItem); deployAction(currentItem);
......
src/view/Manage/Manual/index.jsx
...@@ -377,7 +377,7 @@ class Model extends React.Component { ...@@ -377,7 +377,7 @@ class Model extends React.Component {
currentBranchId = catalogId 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 { ...@@ -444,7 +444,7 @@ class Model extends React.Component {
onImportUnconditionBtnClick = () => { onImportUnconditionBtnClick = () => {
const { catalogId, currentView } = this.state; 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 = () => { onExportDDLBtnClick = () => {
...@@ -536,11 +536,11 @@ class Model extends React.Component { ...@@ -536,11 +536,11 @@ class Model extends React.Component {
if ((hints||[]).length > 0) { if ((hints||[]).length > 0) {
setTimeout(() => { 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); }, 1000);
} else { } else {
setTimeout(() => { 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); }, 1000);
} }
} }
...@@ -572,7 +572,8 @@ class Model extends React.Component { ...@@ -572,7 +572,8 @@ class Model extends React.Component {
} }
wordData.content.slice(0, 5).forEach(data => { 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); }, 2000);
...@@ -596,8 +597,8 @@ class Model extends React.Component { ...@@ -596,8 +597,8 @@ class Model extends React.Component {
currentCatalogId = branchAddModelCatalog currentCatalogId = branchAddModelCatalog
branchId = catalogId branchId = catalogId
} }
alert('hjj3')
window.open(`/data-govern-bj/data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank'); window.open(`/data-govern-bj/manual-data-model-action?${Action}=add&${CatalogId}=${currentCatalogId}&${BranchId}=${branchId}&${DDL}=${encodeURIComponent(ddl)}`, '_blank');
}, 1000); }, 1000);
} }
......
src/view/Manage/ManualModelConfig/Component/TemplateCURD.jsx
...@@ -158,11 +158,11 @@ const TemplateCURD = (props) => { ...@@ -158,11 +158,11 @@ const TemplateCURD = (props) => {
} }
const editItem = (record) => { 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) => { 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) => { const deleteItem = (record) => {
...@@ -187,7 +187,7 @@ const TemplateCURD = (props) => { ...@@ -187,7 +187,7 @@ const TemplateCURD = (props) => {
} }
const onAddClick = () => { const onAddClick = () => {
window.open(`/data-govern-bj/model-template-action?${Action}=add`); window.open(`/data-govern-bj/manual-model-template-action?${Action}=add`);
} }
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment