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/pages/analysis/dabuild-edit-view/dabuild-edit-view-base.vue

@@ -28,6 +28,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dabuild.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -75,22 +82,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dabuild.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -399,7 +406,9 @@ export default class DABuildEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -411,10 +420,10 @@ export default class DABuildEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -765,6 +774,9 @@ export default class DABuildEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -786,12 +798,12 @@ export default class DABuildEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -930,6 +942,34 @@ export default class DABuildEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1134,7 +1174,7 @@ export default class DABuildEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1151,7 +1191,7 @@ export default class DABuildEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
     }
 
     /**
@@ -1162,7 +1202,7 @@ export default class DABuildEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1179,7 +1219,7 @@ export default class DABuildEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DABuild");
     }
 
     /**
@@ -1320,6 +1360,39 @@ export default class DABuildEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DABuildEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1605,39 +1678,6 @@ export default class DABuildEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DABuildEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/analysis/dachart-edit-view/dachart-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dachart.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dachart.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class DAChartEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class DAChartEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class DAChartEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class DAChartEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class DAChartEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class DAChartEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class DAChartEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class DAChartEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class DAChartEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAChart");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class DAChartEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DAChartEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class DAChartEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DAChartEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/analysis/dametric-edit-view/dametric-edit-view-base.vue

@@ -21,6 +21,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dametric.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -68,22 +75,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dametric.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -390,7 +397,9 @@ export default class DAMetricEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -402,10 +411,10 @@ export default class DAMetricEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -753,6 +762,9 @@ export default class DAMetricEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -774,12 +786,12 @@ export default class DAMetricEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -889,6 +901,34 @@ export default class DAMetricEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1093,7 +1133,7 @@ export default class DAMetricEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1110,7 +1150,7 @@ export default class DAMetricEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
     }
 
     /**
@@ -1121,7 +1161,7 @@ export default class DAMetricEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1138,7 +1178,7 @@ export default class DAMetricEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAMetric");
     }
 
     /**
@@ -1279,6 +1319,39 @@ export default class DAMetricEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DAMetricEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1564,39 +1637,6 @@ export default class DAMetricEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DAMetricEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/analysis/dareport-edit-view/dareport-edit-view-base.vue

@@ -21,6 +21,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dareport.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -68,22 +75,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dareport.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -390,7 +397,9 @@ export default class DAReportEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -402,10 +411,10 @@ export default class DAReportEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -753,6 +762,9 @@ export default class DAReportEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -774,12 +786,12 @@ export default class DAReportEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -889,6 +901,34 @@ export default class DAReportEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1093,7 +1133,7 @@ export default class DAReportEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1110,7 +1150,7 @@ export default class DAReportEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
     }
 
     /**
@@ -1121,7 +1161,7 @@ export default class DAReportEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1138,7 +1178,7 @@ export default class DAReportEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DAReport");
     }
 
     /**
@@ -1279,6 +1319,39 @@ export default class DAReportEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DAReportEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1564,39 +1637,6 @@ export default class DAReportEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DAReportEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/dict/dict-catalog-edit-view/dict-catalog-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dictcatalog.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class DictCatalogEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class DictCatalogEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class DictCatalogEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class DictCatalogEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class DictCatalogEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class DictCatalogEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class DictCatalogEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class DictCatalogEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class DictCatalogEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DictCatalog");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class DictCatalogEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DictCatalogEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class DictCatalogEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DictCatalogEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/dst-data-source-edit-view/dst-data-source-edit-view-base.vue

@@ -21,6 +21,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -68,22 +75,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dstdatasource.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -390,7 +397,9 @@ export default class DstDataSourceEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -402,10 +411,10 @@ export default class DstDataSourceEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -753,6 +762,9 @@ export default class DstDataSourceEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -774,12 +786,12 @@ export default class DstDataSourceEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -889,6 +901,34 @@ export default class DstDataSourceEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1093,7 +1133,7 @@ export default class DstDataSourceEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1110,7 +1150,7 @@ export default class DstDataSourceEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
     }
 
     /**
@@ -1121,7 +1161,7 @@ export default class DstDataSourceEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1138,7 +1178,7 @@ export default class DstDataSourceEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstDataSource");
     }
 
     /**
@@ -1279,6 +1319,39 @@ export default class DstDataSourceEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DstDataSourceEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1564,39 +1637,6 @@ export default class DstDataSourceEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DstDataSourceEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/dst-system-edit-view/dst-system-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.dstsystem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class DstSystemEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class DstSystemEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class DstSystemEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class DstSystemEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class DstSystemEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class DstSystemEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class DstSystemEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class DstSystemEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class DstSystemEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"DstSystem");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class DstSystemEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof DstSystemEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class DstSystemEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof DstSystemEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/meta-data-set-edit-view/meta-data-set-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.metadataset.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class MetaDataSetEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class MetaDataSetEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class MetaDataSetEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class MetaDataSetEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class MetaDataSetEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class MetaDataSetEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class MetaDataSetEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class MetaDataSetEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class MetaDataSetEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaDataSet");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class MetaDataSetEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof MetaDataSetEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class MetaDataSetEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof MetaDataSetEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/meta-entity-edit-view/meta-entity-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.metaentity.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class MetaEntityEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class MetaEntityEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class MetaEntityEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class MetaEntityEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class MetaEntityEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class MetaEntityEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class MetaEntityEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class MetaEntityEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class MetaEntityEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaEntity");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class MetaEntityEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof MetaEntityEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class MetaEntityEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof MetaEntityEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/meta-field-edit-view/meta-field-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.metafield.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class MetaFieldEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class MetaFieldEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class MetaFieldEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class MetaFieldEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class MetaFieldEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class MetaFieldEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class MetaFieldEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class MetaFieldEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class MetaFieldEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaField");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class MetaFieldEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof MetaFieldEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class MetaFieldEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof MetaFieldEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/meta-model-edit-view/meta-model-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.metamodel.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class MetaModelEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class MetaModelEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class MetaModelEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class MetaModelEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class MetaModelEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class MetaModelEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class MetaModelEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class MetaModelEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class MetaModelEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class MetaModelEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof MetaModelEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class MetaModelEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof MetaModelEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/meta-relationship-edit-view/meta-relationship-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.metarelationship.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class MetaRelationshipEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class MetaRelationshipEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class MetaRelationshipEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class MetaRelationshipEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class MetaRelationshipEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class MetaRelationshipEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"MetaRelationship");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class MetaRelationshipEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof MetaRelationshipEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class MetaRelationshipEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof MetaRelationshipEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/lite/table-sync-edit-view/table-sync-edit-view-base.vue

@@ -21,6 +21,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.tablesync.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -68,22 +75,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.tablesync.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -390,7 +397,9 @@ export default class TableSyncEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -402,10 +411,10 @@ export default class TableSyncEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -753,6 +762,9 @@ export default class TableSyncEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -774,12 +786,12 @@ export default class TableSyncEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -889,6 +901,34 @@ export default class TableSyncEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1093,7 +1133,7 @@ export default class TableSyncEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1110,7 +1150,7 @@ export default class TableSyncEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
     }
 
     /**
@@ -1121,7 +1161,7 @@ export default class TableSyncEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1138,7 +1178,7 @@ export default class TableSyncEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"TableSync");
     }
 
     /**
@@ -1279,6 +1319,39 @@ export default class TableSyncEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof TableSyncEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1564,39 +1637,6 @@ export default class TableSyncEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof TableSyncEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/rule/exec-log-edit-view/exec-log-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.execlog.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.execlog.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class ExecLogEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class ExecLogEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class ExecLogEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class ExecLogEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class ExecLogEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class ExecLogEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class ExecLogEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class ExecLogEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class ExecLogEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecLog");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class ExecLogEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ExecLogEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class ExecLogEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof ExecLogEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/rule/exec-result-edit-view/exec-result-edit-view-base.vue

@@ -13,6 +13,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.execresult.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -60,22 +67,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.execresult.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -379,7 +386,9 @@ export default class ExecResultEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -391,10 +400,10 @@ export default class ExecResultEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -739,6 +748,9 @@ export default class ExecResultEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -760,12 +772,12 @@ export default class ExecResultEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -846,6 +858,34 @@ export default class ExecResultEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1050,7 +1090,7 @@ export default class ExecResultEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1067,7 +1107,7 @@ export default class ExecResultEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
     }
 
     /**
@@ -1078,7 +1118,7 @@ export default class ExecResultEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1095,7 +1135,7 @@ export default class ExecResultEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"ExecResult");
     }
 
     /**
@@ -1236,6 +1276,39 @@ export default class ExecResultEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof ExecResultEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1521,39 +1594,6 @@ export default class ExecResultEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof ExecResultEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/rule/rule-engine-edit-view/rule-engine-edit-view-base.vue

@@ -35,6 +35,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -82,22 +89,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.ruleengine.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -408,7 +415,9 @@ export default class RuleEngineEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -420,10 +429,10 @@ export default class RuleEngineEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -777,6 +786,9 @@ export default class RuleEngineEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -798,12 +810,12 @@ export default class RuleEngineEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -971,6 +983,34 @@ export default class RuleEngineEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1175,7 +1215,7 @@ export default class RuleEngineEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1192,7 +1232,7 @@ export default class RuleEngineEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
     }
 
     /**
@@ -1203,7 +1243,7 @@ export default class RuleEngineEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1220,7 +1260,7 @@ export default class RuleEngineEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleEngine");
     }
 
     /**
@@ -1361,6 +1401,39 @@ export default class RuleEngineEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof RuleEngineEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1646,39 +1719,6 @@ export default class RuleEngineEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof RuleEngineEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

app_web/src/pages/rule/rule-item-edit-view/rule-item-edit-view-base.vue

@@ -21,6 +21,13 @@
                 </i-button>
             <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
         </tooltip>
+        <tooltip :transfer="true" :max-width="600">
+                <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
+                </i-button>
+            <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
+        </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem12' }, $event)">
@@ -68,22 +75,22 @@
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                    <i class='sx-tb-saveandclose'></i>
-                    <span class='caption'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
+                    <i class='fa fa-fast-backward'></i>
+                    
                 </i-button>
-            <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+            <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
         </tooltip>
         
         
                 </dropdown-item>
                 <dropdown-item>
                     <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem23.visabled" :disabled="toolBarModels.tbitem23.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem23' }, $event)">
-                    <i class='fa fa-fast-backward'></i>
-                    
+                <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem5' }, $event)">
+                    <i class='sx-tb-saveandclose'></i>
+                    <span class='caption'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem23.tip')}}</div>
+            <div slot='content'>{{$t('entities.ruleitem.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
         </tooltip>
         
         
@@ -390,7 +397,9 @@ export default class RuleItemEditViewBase extends Vue {
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
+        tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
         tbitem13: {  name: 'tbitem13', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
@@ -402,10 +411,10 @@ export default class RuleItemEditViewBase extends Vue {
         tbitem18: { name: 'tbitem18', caption: '其它', disabled: false, type: 'ITEMS', visabled: true, dataaccaction: '', uiaction: { } }, 
  tbitem4: { name: 'tbitem4', actiontarget: 'NONE', caption: '保存并新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndNew', target: '' } },
 
- tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
  tbitem23: { name: 'tbitem23', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'FirstRecord', target: 'SINGLEKEY' } },
 
+ tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
  tbitem24: { name: 'tbitem24', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'PrevRecord', target: 'SINGLEKEY' } },
 
  tbitem25: { name: 'tbitem25', actiontarget: 'NONE', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'NextRecord', target: 'SINGLEKEY' } },
@@ -753,6 +762,9 @@ export default class RuleItemEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -774,12 +786,12 @@ export default class RuleItemEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem4')) {
             this.toolbar_tbitem4_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem23')) {
             this.toolbar_tbitem23_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem24')) {
             this.toolbar_tbitem24_click(null, '', $event2);
         }
@@ -889,6 +901,34 @@ export default class RuleItemEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
+    }
+
     /**
      * 逻辑事件
      *
@@ -1093,7 +1133,7 @@ export default class RuleItemEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1110,7 +1150,7 @@ export default class RuleItemEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
+        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
     }
 
     /**
@@ -1121,7 +1161,7 @@ export default class RuleItemEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem23_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -1138,7 +1178,7 @@ export default class RuleItemEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.FirstRecord(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
+        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"RuleItem");
     }
 
     /**
@@ -1279,6 +1319,39 @@ export default class RuleItemEditViewBase extends Vue {
         }
     }
 
+    /**
+     * 保存并关闭
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof RuleItemEditViewBase
+     */
+    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const _this: any = this;
+        if (xData && xData.saveAndExit instanceof Function) {
+            xData.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
+            _this.saveAndExit().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                if(window.parent){
+                    window.parent.postMessage([{ ...response.data }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *
@@ -1564,39 +1637,6 @@ export default class RuleItemEditViewBase extends Vue {
             }
         });
     }
-    /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof RuleItemEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
     /**
      * 第一个记录
      *

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/meta-entity/main-grid/main-grid-base.vue

@@ -342,20 +342,6 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public newdata: any;
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof MainBase
-     */
-    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -887,7 +873,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -982,7 +968,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1088,7 +1074,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1884,7 +1870,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -1951,7 +1937,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitygridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_metaentitypickupgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -2022,7 +2008,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2030,7 +2016,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.metaentity){
@@ -2097,7 +2083,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'MetaEntityPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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

app_web/src/widgets/rule-item/main-grid/main-grid-base.vue

@@ -392,6 +392,20 @@ export default class MainBase extends Vue implements ControlInterface {
         return this.selections[0];
     }
 
+    /**
+     * 打开新建数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public newdata: any;
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof MainBase
+     */
+    @Prop() public opendata: any;
     
     /**
     * 是否嵌入关系界面
@@ -959,7 +973,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}, pageReset: boolean = false): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(pageReset){
@@ -1054,7 +1068,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1160,7 +1174,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public addBatch(arg: any = {}): void {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.fetchAction') as string) });
             return;
         }
         if(!arg){
@@ -1976,7 +1990,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public setColState() {
         this.resetColModel = Util.deepCopy(this.allColumns);
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main'});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main'});
         const post = this.service.loadModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if(response.status == 200 && response.data) {
@@ -2043,7 +2057,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public saveDynaConfig() {
         const viewParams: any = Util.deepCopy(this.viewparams);
-        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitempickupgridview_grid_main', model: this.allColumns});
+        Object.assign(viewParams,{utilServiceName: 'grid_dynaconfig', modelid: 'ibzdst_web_ruleitemgridview_grid_main', model: this.allColumns});
         const post = this.service.saveModel('grid_dynaconfig', this.context, viewParams);
         post.then((response: any) => {
             if (response.status == 200) {
@@ -2114,7 +2128,7 @@ export default class MainBase extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -2122,7 +2136,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ruleitem){
@@ -2195,7 +2209,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemPickupGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'RuleItemGridView'+(this.$t('app.gridpage.notConfig.loaddraftAction') as string) });
             return;
         }
         let _this = this;

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]外键关系 -->