jackwang 部署微服务应用

app_PIM/public/assets/json/view-config.json

@@ -120,7 +120,7 @@
         "memo": ""
     },
     "hrlegalv_001": {
-        "title": "法人选项操作视图",
+        "title": "法人快速新建",
         "caption": "快速新建",
         "viewtype": "DEOPTVIEW",
         "viewmodule": "Base",
@@ -160,7 +160,7 @@
         "memo": "系统自动添加"
     },
     "hrlegaltabexpview": {
-        "title": "法人分页导航视图",
+        "title": "法人信息",
         "caption": "法人信息",
         "viewtype": "DETABEXPVIEW",
         "viewmodule": "Base",

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_en_US.ts

@@ -33,7 +33,7 @@ export default {
 		},
 		v_001: {
 			caption: "快速新建",
-      		title: "法人选项操作视图",
+      		title: "法人快速新建",
 		},
 		editview: {
 			caption: "法人",
@@ -41,7 +41,7 @@ export default {
 		},
 		tabexpview: {
 			caption: "法人信息",
-      		title: "法人分页导航视图",
+      		title: "法人信息",
 		},
 	},
 	main_form: {
@@ -137,49 +137,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	tabexpviewtoolbar_toolbar: {

app_PIM/src/locale/lanres/entities/hrlegal/hrlegal_zh_CN.ts

@@ -32,7 +32,7 @@ export default {
 		},
 		v_001: {
 			caption: "快速新建",
-      		title: "法人选项操作视图",
+      		title: "法人快速新建",
 		},
 		editview: {
 			caption: "法人",
@@ -40,7 +40,7 @@ export default {
 		},
 		tabexpview: {
 			caption: "法人信息",
-      		title: "法人分页导航视图",
+      		title: "法人信息",
 		},
 	},
 	main_form: {
@@ -136,49 +136,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
+		tbitem1: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
+		tbitem2: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	tabexpviewtoolbar_toolbar: {

app_PIM/src/mock/viewconfig/viewconfig.ts

@@ -104,7 +104,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9559258a9c3ac118e15ead941b780682"
         },
         "hrlegalv_001": {
-            "title": "法人选项操作视图",
+            "title": "法人快速新建",
             "caption": "快速新建",
             "viewtype": "DEOPTVIEW",
             "viewmodule": "Base",
@@ -136,7 +136,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "e50ad3e1883bafa2d6f264d44ca8ff89"
         },
         "hrlegaltabexpview": {
-            "title": "法人分页导航视图",
+            "title": "法人信息",
             "caption": "法人信息",
             "viewtype": "DETABEXPVIEW",
             "viewmodule": "Base",

app_PIM/src/pages/base/hrlegal-dashboard-view/hrlegal-dashboard-view.html

 <studio-view-style2 viewName="hrlegaldashboardview" viewTitle="法人数据看板视图" class='deportalview hrlegal-dashboard-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_dashboard 
                     :viewState="viewState"  
                     :viewparams="viewparams" 

app_PIM/src/pages/base/hrlegal-grid-view/hrlegal-grid-view-base.tsx

@@ -103,7 +103,7 @@ export class HRLegalGridViewBase extends GridViewBase {
      * @memberof HRLegalGridView
      */
     public toolBarModels: any = {
-        tbitem1_ff_002: { name: 'tbitem1_ff_002', caption: '新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '新建', iconcls: 'fa fa-user-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_002', target: 'SINGLEKEY', class: '' } },
+        tbitem1_ff_002: { name: 'tbitem1_ff_002', caption: '新建', 'isShowCaption': true, 'isShowIcon': true, tooltip: '新建', iconcls: 'fa fa-user-plus', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FF_002', target: 'NONE', class: '' } },
 
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem4: { name: 'tbitem4', caption: '编辑', 'isShowCaption': true, 'isShowIcon': true, tooltip: '编辑', iconcls: 'fa fa-edit', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY', class: '' } },
@@ -523,7 +523,7 @@ export class HRLegalGridViewBase extends GridViewBase {
         const view: any = {
             viewname: 'hrlegal-v-001', 
             height: 0, 
-            width: 800,  
+            width: 600,  
             title: this.$t('entities.hrlegal.views.v_001.title'),
             placement: 'DRAWER_RIGHT',
         };

app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view-base.tsx

@@ -6,7 +6,7 @@ import TabExpViewEngine from '@engine/view/tab-exp-view-engine';
 import HRLegalUIService from '@/uiservice/hrlegal/hrlegal-ui-service';
 
 /**
- * 法人分页导航视图视图基类
+ * 法人信息视图基类
  *
  * @export
  * @class HRLegalTabExpViewBase

app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.html

-<studio-view-style2 viewName="hrlegaltabexpview" viewTitle="法人分页导航视图" class='detabexpview hrlegal-tab-exp-view'>
+<studio-view-style2 viewName="hrlegaltabexpview" viewTitle="法人信息" class='detabexpview hrlegal-tab-exp-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_PIM/src/pages/base/hrlegal-tab-exp-view/hrlegal-tab-exp-view.vue

@@ -6,7 +6,7 @@ import { HRLegalTabExpViewBase } from './hrlegal-tab-exp-view-base';
 import view_tabexppanel from '@widgets/hrlegal/tab-exp-viewtabexppanel-tabexppanel/tab-exp-viewtabexppanel-tabexppanel.vue';
 
 /**
- * 法人分页导航视图视图
+ * 法人信息视图
  *
  * @export
  * @class HRLegalTabExpView

app_PIM/src/pages/base/hrlegal-v-001/hrlegal-v-001-base.tsx

@@ -6,7 +6,7 @@ import OptionViewEngine from '@engine/view/option-view-engine';
 import HRLegalUIService from '@/uiservice/hrlegal/hrlegal-ui-service';
 
 /**
- * 法人选项操作视图视图基类
+ * 法人快速新建视图基类
  *
  * @export
  * @class HRLegalV_001Base

app_PIM/src/pages/base/hrlegal-v-001/hrlegal-v-001.html

-<studio-view-style2 viewName="hrlegalv_001" viewTitle="法人选项操作视图" class='deoptview hrlegal-v-001'>
+<studio-view-style2 viewName="hrlegalv_001" viewTitle="法人快速新建" class='deoptview hrlegal-v-001'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_PIM/src/pages/base/hrlegal-v-001/hrlegal-v-001.vue

@@ -6,7 +6,7 @@ import { HRLegalV_001Base } from './hrlegal-v-001-base';
 import view_form from '@widgets/hrlegal/ef-001-form/ef-001-form.vue';
 
 /**
- * 法人选项操作视图视图
+ * 法人快速新建视图
  *
  * @export
  * @class HRLegalV_001

app_PIM/src/pages/base/hrlegal-v-002/hrlegal-v-002.html

 <studio-view-style2 viewName="hrlegalv_002" viewTitle="法人编辑视图" class='deeditview hrlegal-v-002'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <view_form 
                 :viewState="viewState"  
                 :viewparams="viewparams" 

app_PIM/src/uiservice/hrlegal/hrlegal-ui-service-base.ts

@@ -248,10 +248,7 @@ export default class HRLegalUIServiceBase extends UIService {
         let parentViewParam:any = {};
         const _this: any = actionContext;
         const _args: any[] = Util.deepCopy(args);
-        const actionTarget: string | null = 'SINGLEKEY';
-        Object.assign(context, { hrlegal: '%hrlegal%' });
-        Object.assign(params, { legalid: '%hrlegal%' });
-        Object.assign(params, { legalname: '%legalname%' });
+        const actionTarget: string | null = 'NONE';
         if(_this.context){
             parentContext = _this.context;
         }
@@ -287,7 +284,7 @@ export default class HRLegalUIServiceBase extends UIService {
             const view: any = {
                 viewname: 'hrlegal-v-001', 
                 height: 0, 
-                width: 800,  
+                width: 600,  
                 placement: 'DRAWER_RIGHT',
             };
             openDrawer(view, data);
@@ -333,7 +330,6 @@ export default class HRLegalUIServiceBase extends UIService {
             { pathName: 'hrlegals', parameterName: 'hrlegal' },
             { pathName: 'editview', parameterName: 'editview' },
         ];
-            actionContext.closeView(null);
         const openIndexViewTab = (data: any) => {
             const routePath = actionContext.$viewTool.buildUpRoutePath(actionContext.$route, context, deResParameters, parameters, _args, data);
             actionContext.$router.push(routePath);