Merge remote-tracking branch 'origin/master'

app_web/src/locale/lanres/entities/dabuild/dabuild_BO_CN_base.ts

@@ -166,13 +166,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -194,14 +190,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -210,6 +206,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dabuild/dabuild_en_US_base.ts

@@ -166,13 +166,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -194,14 +190,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -210,6 +206,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN_base.ts

@@ -166,13 +166,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -194,14 +190,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -210,6 +206,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dachart/dachart_BO_CN_base.ts

@@ -124,13 +124,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -152,14 +148,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -168,6 +164,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dachart/dachart_en_US_base.ts

@@ -124,13 +124,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -152,14 +148,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -168,6 +164,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dachart/dachart_zh_CN_base.ts

@@ -124,13 +124,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -152,14 +148,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -168,6 +164,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dadimension/dadimension_BO_CN_base.ts

@@ -40,13 +40,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -68,14 +64,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -84,6 +80,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dadimension/dadimension_en_US_base.ts

@@ -40,13 +40,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -68,14 +64,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -84,6 +80,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN_base.ts

@@ -40,13 +40,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -68,14 +64,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -84,6 +80,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dametric/dametric_BO_CN_base.ts

@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				da_metricid: commonLogic.appcommonhandle("指标标识",null),
 				da_metricname: commonLogic.appcommonhandle("指标名称",null),
 				metrictype: commonLogic.appcommonhandle("类型",null),
 				extop: commonLogic.appcommonhandle("附加设置",null),
@@ -154,13 +155,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -182,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -198,6 +195,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dametric/dametric_en_US_base.ts

@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				da_metricid: commonLogic.appcommonhandle("指标标识",null),
 				da_metricname: commonLogic.appcommonhandle("指标名称",null),
 				metrictype: commonLogic.appcommonhandle("类型",null),
 				extop: commonLogic.appcommonhandle("附加设置",null),
@@ -154,13 +155,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -182,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -198,6 +195,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dametric/dametric_zh_CN_base.ts

@@ -62,6 +62,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				da_metricid: commonLogic.appcommonhandle("指标标识",null),
 				da_metricname: commonLogic.appcommonhandle("指标名称",null),
 				metrictype: commonLogic.appcommonhandle("类型",null),
 				extop: commonLogic.appcommonhandle("附加设置",null),
@@ -154,13 +155,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -182,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -198,6 +195,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dareport/dareport_BO_CN_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dareport/dareport_en_US_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dareport/dareport_zh_CN_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_BO_CN_base.ts

@@ -140,13 +140,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -168,14 +164,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -184,6 +180,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US_base.ts

@@ -140,13 +140,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -168,14 +164,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -184,6 +180,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN_base.ts

@@ -140,13 +140,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -168,14 +164,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -184,6 +180,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-app/dst-app_BO_CN_base.ts

@@ -144,13 +144,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -172,14 +168,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -188,6 +184,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-app/dst-app_en_US_base.ts

@@ -144,13 +144,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -172,14 +168,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -188,6 +184,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN_base.ts

@@ -144,13 +144,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -172,14 +168,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -188,6 +184,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_BO_CN_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN_base.ts

@@ -136,13 +136,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -164,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -180,6 +176,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-system/dst-system_BO_CN_base.ts

@@ -127,13 +127,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -155,14 +151,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -171,6 +167,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-system/dst-system_en_US_base.ts

@@ -127,13 +127,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -155,14 +151,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -171,6 +167,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN_base.ts

@@ -127,13 +127,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -155,14 +151,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -171,6 +167,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-log/exec-log_BO_CN_base.ts

@@ -137,13 +137,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -165,14 +161,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -181,6 +177,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-log/exec-log_en_US_base.ts

@@ -137,13 +137,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -165,14 +161,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -181,6 +177,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN_base.ts

@@ -137,13 +137,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -165,14 +161,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -181,6 +177,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-result/exec-result_BO_CN_base.ts

@@ -157,13 +157,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -185,14 +181,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -201,6 +197,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-result/exec-result_en_US_base.ts

@@ -157,13 +157,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -185,14 +181,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -201,6 +197,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN_base.ts

@@ -157,13 +157,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -185,14 +181,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -201,6 +197,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_BO_CN_base.ts

@@ -143,13 +143,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -171,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -187,6 +183,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_en_US_base.ts

@@ -143,13 +143,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -171,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -187,6 +183,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_zh_CN_base.ts

@@ -143,13 +143,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -171,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -187,6 +183,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-entity/meta-entity_BO_CN_base.ts

@@ -162,13 +162,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -190,14 +186,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -206,6 +202,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US_base.ts

@@ -162,13 +162,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -190,14 +186,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -206,6 +202,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN_base.ts

@@ -162,13 +162,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -190,14 +186,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -206,6 +202,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-field/meta-field_BO_CN_base.ts

@@ -258,13 +258,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -286,14 +282,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -302,6 +298,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-field/meta-field_en_US_base.ts

@@ -258,13 +258,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -286,14 +282,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -302,6 +298,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN_base.ts

@@ -258,13 +258,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -286,14 +282,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -302,6 +298,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_import: {
-				caption: commonLogic.appcommonhandle("模型导入",null),
-				tip: commonLogic.appcommonhandle("模型导入",null),
-			},
 			tbitem1_export: {
 				caption: commonLogic.appcommonhandle("模型导出",null),
 				tip: commonLogic.appcommonhandle("模型导出",null),
 			},
+			tbitem1_import: {
+				caption: commonLogic.appcommonhandle("模型导入",null),
+				tip: commonLogic.appcommonhandle("模型导入",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
@@ -178,13 +178,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -206,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -222,6 +218,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_import: {
-				caption: commonLogic.appcommonhandle("模型导入",null),
-				tip: commonLogic.appcommonhandle("模型导入",null),
-			},
 			tbitem1_export: {
 				caption: commonLogic.appcommonhandle("模型导出",null),
 				tip: commonLogic.appcommonhandle("模型导出",null),
 			},
+			tbitem1_import: {
+				caption: commonLogic.appcommonhandle("模型导入",null),
+				tip: commonLogic.appcommonhandle("模型导入",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
@@ -178,13 +178,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -206,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -222,6 +218,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_import: {
-				caption: commonLogic.appcommonhandle("模型导入",null),
-				tip: commonLogic.appcommonhandle("模型导入",null),
-			},
 			tbitem1_export: {
 				caption: commonLogic.appcommonhandle("模型导出",null),
 				tip: commonLogic.appcommonhandle("模型导出",null),
 			},
+			tbitem1_import: {
+				caption: commonLogic.appcommonhandle("模型导入",null),
+				tip: commonLogic.appcommonhandle("模型导入",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
@@ -178,13 +178,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -206,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -222,6 +218,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-module/meta-module_BO_CN_base.ts

@@ -131,13 +131,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -159,14 +155,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -175,6 +171,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-module/meta-module_en_US_base.ts

@@ -131,13 +131,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -159,14 +155,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -175,6 +171,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN_base.ts

@@ -131,13 +131,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -159,14 +155,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -175,6 +171,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_BO_CN_base.ts

@@ -188,13 +188,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -216,14 +212,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -232,6 +228,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US_base.ts

@@ -188,13 +188,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -216,14 +212,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -232,6 +228,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN_base.ts

@@ -188,13 +188,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -216,14 +212,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -232,6 +228,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-engine/rule-engine_BO_CN_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-item/rule-item_BO_CN_base.ts

@@ -180,13 +180,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -208,14 +204,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -224,6 +220,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-item/rule-item_en_US_base.ts

@@ -180,13 +180,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -208,14 +204,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -224,6 +220,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN_base.ts

@@ -180,13 +180,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -208,14 +204,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -224,6 +220,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/table-sync/table-sync_BO_CN_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/table-sync/table-sync_en_US_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("Remove And Close",null),
-				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/locale/lanres/entities/table-sync/table-sync_zh_CN_base.ts

@@ -160,13 +160,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
-				caption: commonLogic.appcommonhandle("-",null),
-				tip: commonLogic.appcommonhandle("",null),
-			},
-			tbitem7: {
-				caption: commonLogic.appcommonhandle("删除并关闭",null),
-				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
 			},
 			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
@@ -188,14 +184,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
 			tbitem18: {
 				caption: commonLogic.appcommonhandle("其它",null),
 				tip: commonLogic.appcommonhandle("其它",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem4: {
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
@@ -204,6 +200,10 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("第一个记录",null),
 				tip: commonLogic.appcommonhandle("第一个记录",null),
 			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
 			tbitem24: {
 				caption: commonLogic.appcommonhandle("上一个记录",null),
 				tip: commonLogic.appcommonhandle("上一个记录",null),

app_web/src/widgets/dametric/main-grid/main-grid-model.ts

@@ -26,6 +26,11 @@ export default class MainModel {
       ]
     }else{
 		  return [
+        {
+          name: 'da_metricid',
+          prop: 'metric_id',
+          dataType: 'GUID',
+        },
         {
           name: 'da_metricname',
           prop: 'metric_name',

app_web/src/widgets/dict-catalog/default-searchform/default-searchform-base.vue

@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'DictCatalogPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_web/src/widgets/meta-entity/default-searchform/default-searchform-base.vue

@@ -795,7 +795,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -831,7 +831,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

ibzdst-core/src/main/java/cn/ibizlab/core/aspect/TopicListenerApsect.java

@@ -17,9 +17,9 @@ import org.springframework.util.ObjectUtils;
  * @author 无名小卒
  * @data 2022/8/22
  */
-@Aspect
-@Component
-@ConditionalOnExpression("${rocketmq.consumer.enabled:false}")
+//@Aspect
+//@Component
+//@ConditionalOnExpression("${rocketmq.consumer.enabled:false}")
 public class TopicListenerApsect {
   @Autowired
   private TopicListenter topicListenter;

ibzdst-core/src/main/java/cn/ibizlab/core/lite/extensions/service/CommonEntityService.java

@@ -27,6 +27,7 @@ public interface CommonEntityService {
 
 
     void processList(DataModel dataModel, Timestamp lastModify, LiteDataCallback callback);
+    void processList(DataModel dataModel, String extCond, Timestamp lastModify, LiteDataCallback callback);
 
 
 }