lab_gzf 部署微服务应用

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_en_US.ts

@@ -62,69 +62,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem10: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem12: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem11: {
+		tbitem2: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem18: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem9: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem19: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem5: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem1: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem22: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem2: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem7: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem6: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem4: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem25: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem3: {
-			caption: "Help",
-			tip: "Help",
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {
@@ -132,10 +76,18 @@ export default {
 			caption: "New",
 			tip: "New",
 		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
 		tbitem2: {
 			caption: "Edit",
 			tip: "Edit {0}",
 		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
 		tbitem1: {
 			caption: "Copy",
 			tip: "Copy {0}",
@@ -160,29 +112,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem20: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem24: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem25: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem10: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem4: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_zh_CN.ts

@@ -61,69 +61,13 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem10: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem12: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem11: {
+		tbitem2: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem18: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem9: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem19: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem5: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem1: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem22: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem2: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem7: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem6: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem4: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem25: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem3: {
-			caption: "帮助",
-			tip: "帮助",
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {
@@ -131,10 +75,18 @@ export default {
 			caption: "新建",
 			tip: "新建",
 		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
 		tbitem2: {
 			caption: "编辑",
 			tip: "编辑",
 		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
 		tbitem1: {
 			caption: "拷贝",
 			tip: "拷贝",
@@ -159,29 +111,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem20: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem24: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem25: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem10: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem4: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 };
\ No newline at end of file

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_en_US.ts

@@ -66,15 +66,11 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem11: {
+		tbitem2: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem18: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem9: {
+		tbitem1: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN.ts

@@ -65,15 +65,11 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem11: {
+		tbitem2: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem18: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem9: {
+		tbitem1: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view-base.tsx

@@ -99,10 +99,9 @@ export class EAMLocationStateEditViewBase extends EditViewBase {
      * @memberof EAMLocationStateEditView
      */
     public toolBarModels: any = {
-        tbitem11: { name: 'tbitem11', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+        tbitem2: { name: 'tbitem2', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
 
-        tbitem18: {  name: 'tbitem18', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem9: { name: 'tbitem9', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
 
     };
 
@@ -152,11 +151,11 @@ export class EAMLocationStateEditViewBase extends EditViewBase {
      * @memberof EAMLocationStateEditViewBase
      */
     public toolbar_click($event: any, $event2?: any): void {
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem2')) {
+            this.toolbar_tbitem2_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem9')) {
-            this.toolbar_tbitem9_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem1')) {
+            this.toolbar_tbitem1_click(null, '', $event2);
         }
     }
 
@@ -201,7 +200,7 @@ export class EAMLocationStateEditViewBase extends EditViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -229,7 +228,7 @@ export class EAMLocationStateEditViewBase extends EditViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];