lab_gzf 部署微服务应用

app_AssetManagement/src/pages/asset/eamasset-child-grid-view/eamasset-child-grid-view-base.tsx

@@ -511,27 +511,16 @@ export class EAMAssetChildGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'eamassets', parameterName: 'eamasset' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openPopupModal = (view: any, data: any) => {
-            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
-            container.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
+        const openIndexViewTab = (data: any) => {
+            const _data: any = { w: (new Date().getTime()) };
+            Object.assign(_data, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
+            this.$router.push(routePath);
         }
-                xData.refresh(result.datas);
-            });
-        }
-        const view: any = {
-            viewname: 'eamasset-edit-view', 
-            height: 0, 
-            width: 0,  
-            title: this.$t('entities.eamasset.views.editview.title'),
-        };
-        openPopupModal(view, data);
+        openIndexViewTab(data);
     }
 
 
@@ -561,27 +550,14 @@ export class EAMAssetChildGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'eamassets', parameterName: 'eamasset' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openPopupModal = (view: any, data: any) => {
-            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
-            container.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
+        const openIndexViewTab = (data: any) => {
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
+            this.$router.push(routePath);
         }
-                xData.refresh(result.datas);
-            });
-        }
-        const view: any = {
-            viewname: 'eamasset-edit-view', 
-            height: 0, 
-            width: 0,  
-            title: this.$t('entities.eamasset.views.editview.title'),
-        };
-        openPopupModal(view, data);
+        openIndexViewTab(data);
     }
 
 

app_AssetManagement/src/pages/asset/eamasset-location-asset-grid-view/eamasset-location-asset-grid-view-base.tsx

@@ -511,27 +511,16 @@ export class EAMAssetLocationAssetGridViewBase extends GridViewBase {
         }
         const parameters: any[] = [
             { pathName: 'eamassets', parameterName: 'eamasset' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openPopupModal = (view: any, data: any) => {
-            let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
-            container.subscribe((result: any) => {
-                if (!result || !Object.is(result.ret, 'OK')) {
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
-                }
-                xData.refresh(result.datas);
-            });
+        const openIndexViewTab = (data: any) => {
+            const _data: any = { w: (new Date().getTime()) };
+            Object.assign(_data, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
+            this.$router.push(routePath);
         }
-        const view: any = {
-            viewname: 'eamasset-edit-view', 
-            height: 0, 
-            width: 0,  
-            title: this.$t('entities.eamasset.views.editview.title'),
-        };
-        openPopupModal(view, data);
+        openIndexViewTab(data);
     }
 
 

app_AssetManagement/src/uiservice/eamasset/eamasset-ui-service-base.ts

@@ -161,28 +161,18 @@ export default class EAMAssetUIServiceBase extends UIService {
         }
         const parameters: any[] = [
             { pathName: 'eamassets', parameterName: 'eamasset' },
+            { pathName: 'editview', parameterName: 'editview' },
         ];
             actionContext.closeView(null);
-            const openPopupModal = (view: any, data: any) => {
-                let container: Subject<any> = actionContext.$appmodal.openModal(view, context, data);
-                container.subscribe((result: any) => {
-                    if (!result || !Object.is(result.ret, 'OK')) {
-                        return;
-                    }
-                    const _this: any = actionContext;
+        const openIndexViewTab = (data: any) => {
+            const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
+            actionContext.$router.push(routePath);
             if (xData && xData.refresh && xData.refresh instanceof Function) {
                 xData.refresh(args);
             }
-                    return result.datas;
-                });
+            return null;
         }
-            const view: any = {
-                viewname: 'eamasset-edit-view', 
-                height: 0, 
-                width: 0,  
-                title: actionContext.$t('entities.eamasset.views.editview.title'),
-            };
-            openPopupModal(view, data);
+        openIndexViewTab(data);
     }
 
     /**