lab_xuhui 发布系统代码 [ibz-dst，应用]

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

@@ -166,7 +166,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -198,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +166,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -198,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +166,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -198,14 +202,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +124,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -156,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +124,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -156,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +124,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -156,14 +160,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +40,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -72,14 +76,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +40,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -72,14 +76,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +40,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -72,14 +76,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +155,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -186,14 +191,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +155,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -186,14 +191,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +155,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -186,14 +191,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +140,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -172,14 +176,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +140,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -172,14 +176,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +140,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -172,14 +176,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +144,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -176,14 +180,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +144,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -176,14 +180,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +144,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -176,14 +180,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +136,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -168,14 +172,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +127,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -159,14 +163,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +127,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -159,14 +163,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +127,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -159,14 +163,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +137,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -169,14 +173,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +137,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -169,14 +173,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +137,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -169,14 +173,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +157,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -189,14 +193,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +157,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -189,14 +193,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +157,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -189,14 +193,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +143,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -175,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +143,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -175,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +143,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -175,14 +179,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +162,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -194,14 +198,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +162,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -194,14 +198,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +162,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -194,14 +198,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +258,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -290,14 +294,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +258,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -290,14 +294,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +258,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -290,14 +294,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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

@@ -178,7 +178,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -210,14 +214,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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

@@ -178,7 +178,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -210,14 +214,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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

@@ -178,7 +178,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -210,14 +214,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +131,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -163,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +131,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -163,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +131,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -163,14 +167,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +188,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -220,14 +224,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +188,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -220,14 +224,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +188,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -220,14 +224,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +180,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -212,14 +216,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +180,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -212,14 +216,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +180,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -212,14 +216,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save",null),
 				tip: commonLogic.appcommonhandle("Save",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("Save And New",null),
 				tip: commonLogic.appcommonhandle("Save And New",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("Save And Close",null),
-				tip: commonLogic.appcommonhandle("Save And Close Window",null),
-			},
 			tbitem23: {
 				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,7 +160,11 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存",null),
 				tip: commonLogic.appcommonhandle("保存",null),
 			},
-			tbitem6: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem8: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
@@ -192,14 +196,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("保存并新建",null),
 				tip: commonLogic.appcommonhandle("保存并新建",null),
 			},
-			tbitem5: {
-				caption: commonLogic.appcommonhandle("保存并关闭",null),
-				tip: commonLogic.appcommonhandle("保存并关闭",null),
-			},
 			tbitem23: {
 				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-base.vue

@@ -22,6 +22,18 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('da_metricid')">
+                <el-table-column show-overflow-tooltip :prop="'da_metricid'" :label="$t('entities.dametric.main_grid.columns.da_metricid')" :width="300"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.dametric.main_grid.columns.da_metricid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.da_metricid}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('da_metricname')">
                 <el-table-column show-overflow-tooltip :prop="'da_metricname'" :label="$t('entities.dametric.main_grid.columns.da_metricname')" :width="300"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">
@@ -671,6 +683,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public allColumns: any[] = [
+        {
+            name: 'da_metricid',
+            label: '指标标识',
+            langtag: 'entities.dametric.main_grid.columns.da_metricid',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
         {
             name: 'da_metricname',
             label: '指标名称',
@@ -1465,7 +1486,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['da_metricname','metrictype','extop','refmetric','updatedate','createdate','buildname'];
+        let allColumns:Array<any> = ['da_metricid','da_metricname','metrictype','extop','refmetric','updatedate','createdate','buildname'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1545,6 +1566,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((i+1)*100),
                 group: group.label,
+                da_metricid:'',
                 da_metricname:'',
                 metrictype:'',
                 extop:'',
@@ -1578,6 +1600,7 @@ export default class MainBase extends Vue implements ControlInterface {
         const Tree: any = {
             groupById: Number((allGroup.length+1)*100),
             group: this.$t('app.gridpage.other'),
+            da_metricid:'',
             da_metricname:'',
             metrictype:'',
             extop:'',
@@ -1631,6 +1654,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const tree: any ={
                 groupById: Number((groupIndex+1)*100),
                 group: group,
+                da_metricid:'',
                 da_metricname:'',
                 metrictype:'',
                 extop:'',
@@ -2124,10 +2148,16 @@ export default class MainBase extends Vue implements ControlInterface {
                             });
                         }
                     } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
-                        this.$Notice.error({
-                            title: (this.$t('app.commonWords.saveFailed') as string),
-                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
-                        });
+                        let name: string = this.service.getNameByProp("da_metricid");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        }
                     }else {
                         this.$Notice.error({
                             title: (this.$t('app.commonWords.saveFailed') as string),
@@ -2236,6 +2266,7 @@ export default class MainBase extends Vue implements ControlInterface {
             return;
         }
         let tempContext: any = this.$util.deepCopy(this.context);
+        Object.is(tempContext, { dametric: data.da_metricid });
         const arg: any = JSON.parse(JSON.stringify(data));
         Object.assign(arg,{viewparams:this.viewparams});
         const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);

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/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 } ;

app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue

@@ -838,7 +838,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: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -874,7 +874,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: 'RuleItemPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

ibzdst-core/src/main/resources/liquibase/h2_table.xml

@@ -54,7 +54,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="root" id="tab-da_metric-24-3">
+    <changeSet author="root" id="tab-da_metric-25-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -587,7 +587,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="root" id="fk-da_metric-24-20">
+    <changeSet author="root" id="fk-da_metric-25-20">
        <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
     </changeSet>
         <!--输出实体[DA_REPORT]外键关系 -->