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

0833c6a7 · ibizdev · 21ab1409 · 0833c6a7 · 0833c6a7 · 0833c6a7
--- a/app_web/src/locale/index.ts
+++ b/app_web/src/locale/index.ts
@@ -10,7 +10,7 @@ import iviewZhCnLocale from 'view-design/dist/locale/zh-CN';
 import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN';

 const messages = {
-    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn),
+    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn()),
 };



--- a/app_web/src/locale/lang/en-US-base.ts
+++ b/app_web/src/locale/lang/en-US-base.ts
--- a/app_web/src/locale/lang/en-US.ts
+++ b/app_web/src/locale/lang/en-US.ts
--- a/app_web/src/locale/lang/zh-CN-base.ts
+++ b/app_web/src/locale/lang/zh-CN-base.ts
--- a/app_web/src/locale/lang/zh-CN.ts
+++ b/app_web/src/locale/lang/zh-CN.ts
--- a/app_web/src/locale/lanres/codelist/codelist_en_US.ts
+++ b/app_web/src/locale/lanres/codelist/codelist_en_US.ts
-export default {
-    CLModel: {
-        "empty": "",
-    },
-    OPCond: {
-        "EQ": "等于",
-        "NOTEQ": "不等于",
-        "GTANDEQ": ">=",
-        "GT": ">",
-        "LTANDEQ": "<=",
-        "LT": "<",
-        "ISNULL": "为空",
-        "ISNOTNULL": "不为空",
-        "LIKE": "like",
-        "NOTLIKE": "not like",
-        "LEFTLIKE": "开头like",
-        "LEFTNOTLIKE": "开头not like",
-        "RIGHTLIKE": "结尾like",
-        "RIGHTNOTLIKE": "结尾not like",
-        "IN": "在范围中",
-        "NOTIN": "不在范围中",
-        "MATCHES": "MATCHES",
-        "NOTMATCHES": "NOT MATCHES",
-        "INC2S": "INC2S",
-        "NOTINC2S": "NOTINC2S",
-        "empty": ""
-    },
-    CLMetricType: {
-        "COUNT": "COUNT",
-        "COUNT_DISTINCT": "COUNT_DISTINCT",
-        "SUM": "SUM",
-        "AVG": "AVG",
-        "MAX": "MAX",
-        "MIN": "MIN",
-        "empty": ""
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": ""
-    },
-    CLMetric: {
-        "empty": "",
-    },
-    CLRuleGroup: {
-        "empty": "",
-    },
-    AppType: {
-        "INNER": "内置应用",
-        "THIRD-PARTY": "第三方应用",
-        "empty": ""
-    },
-    CLExtOP: {
-        "YOY": "同比",
-        "MOM": "环比",
-        "Y3": "3年定基比",
-        "PER": "占比",
-        "PER_ORI": "占比（原始值）",
-        "empty": ""
-    },
-};
\ No newline at end of file
+import codelist_en_US_Base from './codelist_en_US_base';
+
+function getLocaleResource(){
+    const codelist_en_US_OwnData = {};
+    const targetData = Object.assign(codelist_en_US_Base(), codelist_en_US_OwnData);
+    return targetData;
+}
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/codelist/codelist_en_US_base.ts
+++ b/app_web/src/locale/lanres/codelist/codelist_en_US_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      CLModel: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      OPCond: {
+          "EQ": commonLogic.appcommonhandle("等于",null),
+          "NOTEQ": commonLogic.appcommonhandle("不等于",null),
+          "GTANDEQ": commonLogic.appcommonhandle(">=",null),
+          "GT": commonLogic.appcommonhandle(">",null),
+          "LTANDEQ": commonLogic.appcommonhandle("<=",null),
+          "LT": commonLogic.appcommonhandle("<",null),
+          "ISNULL": commonLogic.appcommonhandle("为空",null),
+          "ISNOTNULL": commonLogic.appcommonhandle("不为空",null),
+          "LIKE": commonLogic.appcommonhandle("like",null),
+          "NOTLIKE": commonLogic.appcommonhandle("not like",null),
+          "LEFTLIKE": commonLogic.appcommonhandle("开头like",null),
+          "LEFTNOTLIKE": commonLogic.appcommonhandle("开头not like",null),
+          "RIGHTLIKE": commonLogic.appcommonhandle("结尾like",null),
+          "RIGHTNOTLIKE": commonLogic.appcommonhandle("结尾not like",null),
+          "IN": commonLogic.appcommonhandle("在范围中",null),
+          "NOTIN": commonLogic.appcommonhandle("不在范围中",null),
+          "MATCHES": commonLogic.appcommonhandle("MATCHES",null),
+          "NOTMATCHES": commonLogic.appcommonhandle("NOT MATCHES",null),
+          "INC2S": commonLogic.appcommonhandle("INC2S",null),
+          "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CLMetricType: {
+          "COUNT": commonLogic.appcommonhandle("COUNT",null),
+          "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),
+          "SUM": commonLogic.appcommonhandle("SUM",null),
+          "AVG": commonLogic.appcommonhandle("AVG",null),
+          "MAX": commonLogic.appcommonhandle("MAX",null),
+          "MIN": commonLogic.appcommonhandle("MIN",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CLMetric: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLRuleGroup: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      AppType: {
+          "INNER": commonLogic.appcommonhandle("内置应用",null),
+          "THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CLExtOP: {
+          "YOY": commonLogic.appcommonhandle("同比",null),
+          "MOM": commonLogic.appcommonhandle("环比",null),
+          "Y3": commonLogic.appcommonhandle("3年定基比",null),
+          "PER": commonLogic.appcommonhandle("占比",null),
+          "PER_ORI": commonLogic.appcommonhandle("占比（原始值）",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
+++ b/app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
-export default {
-    CLModel: {
-        "empty": "",
-    },
-    OPCond: {
-        "EQ": "等于",
-        "NOTEQ": "不等于",
-        "GTANDEQ": ">=",
-        "GT": ">",
-        "LTANDEQ": "<=",
-        "LT": "<",
-        "ISNULL": "为空",
-        "ISNOTNULL": "不为空",
-        "LIKE": "like",
-        "NOTLIKE": "not like",
-        "LEFTLIKE": "开头like",
-        "LEFTNOTLIKE": "开头not like",
-        "RIGHTLIKE": "结尾like",
-        "RIGHTNOTLIKE": "结尾not like",
-        "IN": "在范围中",
-        "NOTIN": "不在范围中",
-        "MATCHES": "MATCHES",
-        "NOTMATCHES": "NOT MATCHES",
-        "INC2S": "INC2S",
-        "NOTINC2S": "NOTINC2S",
-        "empty": "",
-    },
-    CLMetricType: {
-        "COUNT": "COUNT",
-        "COUNT_DISTINCT": "COUNT_DISTINCT",
-        "SUM": "SUM",
-        "AVG": "AVG",
-        "MAX": "MAX",
-        "MIN": "MIN",
-        "empty": "",
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": "",
-    },
-    CLMetric: {
-        "empty": "",
-    },
-    CLRuleGroup: {
-        "empty": "",
-    },
-    AppType: {
-        "INNER": "内置应用",
-        "THIRD-PARTY": "第三方应用",
-        "empty": "",
-    },
-    CLExtOP: {
-        "YOY": "同比",
-        "MOM": "环比",
-        "Y3": "3年定基比",
-        "PER": "占比",
-        "PER_ORI": "占比（原始值）",
-        "empty": "",
-    },
-};
\ No newline at end of file
+import codelist_zh_CN_Base from './codelist_zh_CN_base';
+
+function getLocaleResource(){
+    const codelist_zh_CN_OwnData = {};
+    const targetData = Object.assign(codelist_zh_CN_Base(), codelist_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/codelist/codelist_zh_CN_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      CLModel: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      OPCond: {
+          "EQ": commonLogic.appcommonhandle("等于",null),
+          "NOTEQ": commonLogic.appcommonhandle("不等于",null),
+          "GTANDEQ": commonLogic.appcommonhandle(">=",null),
+          "GT": commonLogic.appcommonhandle(">",null),
+          "LTANDEQ": commonLogic.appcommonhandle("<=",null),
+          "LT": commonLogic.appcommonhandle("<",null),
+          "ISNULL": commonLogic.appcommonhandle("为空",null),
+          "ISNOTNULL": commonLogic.appcommonhandle("不为空",null),
+          "LIKE": commonLogic.appcommonhandle("like",null),
+          "NOTLIKE": commonLogic.appcommonhandle("not like",null),
+          "LEFTLIKE": commonLogic.appcommonhandle("开头like",null),
+          "LEFTNOTLIKE": commonLogic.appcommonhandle("开头not like",null),
+          "RIGHTLIKE": commonLogic.appcommonhandle("结尾like",null),
+          "RIGHTNOTLIKE": commonLogic.appcommonhandle("结尾not like",null),
+          "IN": commonLogic.appcommonhandle("在范围中",null),
+          "NOTIN": commonLogic.appcommonhandle("不在范围中",null),
+          "MATCHES": commonLogic.appcommonhandle("MATCHES",null),
+          "NOTMATCHES": commonLogic.appcommonhandle("NOT MATCHES",null),
+          "INC2S": commonLogic.appcommonhandle("INC2S",null),
+          "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLMetricType: {
+          "COUNT": commonLogic.appcommonhandle("COUNT",null),
+          "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),
+          "SUM": commonLogic.appcommonhandle("SUM",null),
+          "AVG": commonLogic.appcommonhandle("AVG",null),
+          "MAX": commonLogic.appcommonhandle("MAX",null),
+          "MIN": commonLogic.appcommonhandle("MIN",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLMetric: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLRuleGroup: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      AppType: {
+          "INNER": commonLogic.appcommonhandle("内置应用",null),
+          "THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLExtOP: {
+          "YOY": commonLogic.appcommonhandle("同比",null),
+          "MOM": commonLogic.appcommonhandle("环比",null),
+          "Y3": commonLogic.appcommonhandle("3年定基比",null),
+          "PER": commonLogic.appcommonhandle("占比",null),
+          "PER_ORI": commonLogic.appcommonhandle("占比（原始值）",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/components/components_en_US.ts
+++ b/app_web/src/locale/lanres/components/components_en_US.ts
--- a/app_web/src/locale/lanres/components/components_en_US_base.ts
+++ b/app_web/src/locale/lanres/components/components_en_US_base.ts
--- a/app_web/src/locale/lanres/components/components_zh_CN.ts
+++ b/app_web/src/locale/lanres/components/components_zh_CN.ts
--- a/app_web/src/locale/lanres/components/components_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/components/components_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dabuild/dabuild_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dabuild/dabuild_en_US.ts
+import DABuild_en_US_Base from './dabuild_en_US_base';

-export default {
-  fields: {
-    build_id: "标识",
-    build_name: "名称",
-    last_runtime: "上次执行时间",
-    model_id: "模型标识",
-    model_name: "模型名称",
-    state: "状态",
-    dadimensions: "维度",
-    system_id: "系统标识",
-  },
-	views: {
-		gridview: {
-			caption: "分析",
-      		title: "分析表格视图",
-		},
-		mpickupview: {
-			caption: "分析",
-      		title: "分析数据多项选择视图",
-		},
-		editview: {
-			caption: "分析",
-      		title: "分析编辑视图",
-		},
-		pickupgridview: {
-			caption: "分析",
-      		title: "分析选择表格视图",
-		},
-		pickupview: {
-			caption: "分析",
-      		title: "分析数据选择视图",
-		},
-	},
-	main_form: {
-		details: {
-			druipart1: "指标", 
-			group1: "分析基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			buildname: "名称", 
-			lastruntime: "上次执行时间", 
-			modelname: "模型名称", 
-			buildstate: "状态", 
-			dadimension: "维度", 
-			modelid: "模型标识", 
-			systemid: "系统标识", 
-			buildid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			buildname: "名称",
-			modelname: "模型名称",
-			lastruntime: "上次执行时间",
-			buildstate: "状态",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_buildname_like: "名称(文本包含(%))", 
-			n_modelname_like: "模型名称(文本包含(%))", 
-			n_systemid_eq: "系统标识(=)", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const DABuild_en_US_OwnData = {};
+    const targetData = Object.assign(DABuild_en_US_Base(), DABuild_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dabuild/dabuild_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dabuild/dabuild_en_US_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		build_id: commonLogic.appcommonhandle("标识",null),
+		build_name: commonLogic.appcommonhandle("名称",null),
+		last_runtime: commonLogic.appcommonhandle("上次执行时间",null),
+		model_id: commonLogic.appcommonhandle("模型标识",null),
+		model_name: commonLogic.appcommonhandle("模型名称",null),
+		state: commonLogic.appcommonhandle("状态",null),
+		dadimensions: commonLogic.appcommonhandle("维度",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+	},
+		views: {
+			gridview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析表格视图",null),
+			},
+			mpickupview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析数据多项选择视图",null),
+			},
+			editview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析编辑视图",null),
+			},
+			pickupgridview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析选择表格视图",null),
+			},
+			pickupview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析数据选择视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				druipart1: commonLogic.appcommonhandle("指标",null), 
+				group1: commonLogic.appcommonhandle("分析基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				buildname: commonLogic.appcommonhandle("名称",null), 
+				lastruntime: commonLogic.appcommonhandle("上次执行时间",null), 
+				modelname: commonLogic.appcommonhandle("模型名称",null), 
+				buildstate: commonLogic.appcommonhandle("状态",null), 
+				dadimension: commonLogic.appcommonhandle("维度",null), 
+				modelid: commonLogic.appcommonhandle("模型标识",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				buildid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				buildname: commonLogic.appcommonhandle("名称",null),
+				modelname: commonLogic.appcommonhandle("模型名称",null),
+				lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
+				buildstate: commonLogic.appcommonhandle("状态",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_buildname_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+				n_modelname_like: commonLogic.appcommonhandle("模型名称(文本包含(%))",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("Export Data Model",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1_run: {
+				caption: commonLogic.appcommonhandle("运行",null),
+				tip: commonLogic.appcommonhandle("运行",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem12: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Save And New",null),
+				tip: commonLogic.appcommonhandle("Save And New",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("第一个记录",null),
+				tip: commonLogic.appcommonhandle("第一个记录",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("上一个记录",null),
+				tip: commonLogic.appcommonhandle("上一个记录",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("下一个记录",null),
+				tip: commonLogic.appcommonhandle("下一个记录",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("最后一个记录",null),
+				tip: commonLogic.appcommonhandle("最后一个记录",null),
+			},
+			tbitem22: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN.ts
-export default {
-  fields: {
-    build_id: "标识",
-    build_name: "名称",
-    last_runtime: "上次执行时间",
-    model_id: "模型标识",
-    model_name: "模型名称",
-    state: "状态",
-    dadimensions: "维度",
-    system_id: "系统标识",
-  },
-	views: {
-		gridview: {
-			caption: "分析",
-      		title: "分析表格视图",
-		},
-		mpickupview: {
-			caption: "分析",
-      		title: "分析数据多项选择视图",
-		},
-		editview: {
-			caption: "分析",
-      		title: "分析编辑视图",
-		},
-		pickupgridview: {
-			caption: "分析",
-      		title: "分析选择表格视图",
-		},
-		pickupview: {
-			caption: "分析",
-      		title: "分析数据选择视图",
-		},
-	},
-	main_form: {
-		details: {
-			druipart1: "指标", 
-			group1: "分析基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			buildname: "名称", 
-			lastruntime: "上次执行时间", 
-			modelname: "模型名称", 
-			buildstate: "状态", 
-			dadimension: "维度", 
-			modelid: "模型标识", 
-			systemid: "系统标识", 
-			buildid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			buildname: "名称",
-			modelname: "模型名称",
-			lastruntime: "上次执行时间",
-			buildstate: "状态",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_buildname_like: "名称(文本包含(%))", 
-			n_modelname_like: "模型名称(文本包含(%))", 
-			n_systemid_eq: "系统标识(=)", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-};
\ No newline at end of file
+import DABuild_zh_CN_Base from './dabuild_zh_CN_base';
+
+function getLocaleResource(){
+    const DABuild_zh_CN_OwnData = {};
+    const targetData = Object.assign(DABuild_zh_CN_Base(), DABuild_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		build_id: commonLogic.appcommonhandle("标识",null),
+		build_name: commonLogic.appcommonhandle("名称",null),
+		last_runtime: commonLogic.appcommonhandle("上次执行时间",null),
+		model_id: commonLogic.appcommonhandle("模型标识",null),
+		model_name: commonLogic.appcommonhandle("模型名称",null),
+		state: commonLogic.appcommonhandle("状态",null),
+		dadimensions: commonLogic.appcommonhandle("维度",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+	},
+		views: {
+			gridview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析表格视图",null),
+			},
+			mpickupview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析数据多项选择视图",null),
+			},
+			editview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析编辑视图",null),
+			},
+			pickupgridview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析选择表格视图",null),
+			},
+			pickupview: {
+				caption: commonLogic.appcommonhandle("分析",null),
+				title: commonLogic.appcommonhandle("分析数据选择视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				druipart1: commonLogic.appcommonhandle("指标",null), 
+				group1: commonLogic.appcommonhandle("分析基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				buildname: commonLogic.appcommonhandle("名称",null), 
+				lastruntime: commonLogic.appcommonhandle("上次执行时间",null), 
+				modelname: commonLogic.appcommonhandle("模型名称",null), 
+				buildstate: commonLogic.appcommonhandle("状态",null), 
+				dadimension: commonLogic.appcommonhandle("维度",null), 
+				modelid: commonLogic.appcommonhandle("模型标识",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				buildid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				buildname: commonLogic.appcommonhandle("名称",null),
+				modelname: commonLogic.appcommonhandle("模型名称",null),
+				lastruntime: commonLogic.appcommonhandle("上次执行时间",null),
+				buildstate: commonLogic.appcommonhandle("状态",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_buildname_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+				n_modelname_like: commonLogic.appcommonhandle("模型名称(文本包含(%))",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1_run: {
+				caption: commonLogic.appcommonhandle("运行",null),
+				tip: commonLogic.appcommonhandle("运行",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem12: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("保存并新建",null),
+				tip: commonLogic.appcommonhandle("保存并新建",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("第一个记录",null),
+				tip: commonLogic.appcommonhandle("第一个记录",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("上一个记录",null),
+				tip: commonLogic.appcommonhandle("上一个记录",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("下一个记录",null),
+				tip: commonLogic.appcommonhandle("下一个记录",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("最后一个记录",null),
+				tip: commonLogic.appcommonhandle("最后一个记录",null),
+			},
+			tbitem22: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dachart/dachart_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dachart/dachart_en_US.ts
+import DAChart_en_US_Base from './dachart_en_US_base';

-export default {
-  fields: {
-    chart_id: "标识",
-    chart_name: "名称",
-    dict: "过滤项字典",
-    group: "分组",
-    config: "展现配置",
-    system_id: "系统标识",
-  },
-	views: {
-		editview: {
-			caption: "图表",
-      		title: "图表编辑视图",
-		},
-		gridview: {
-			caption: "图表",
-      		title: "图表表格视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "图表基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			chartname: "名称", 
-			chartgroup: "分组", 
-			dict: "过滤项字典", 
-			vmcfg: "展现配置", 
-			systemid: "系统标识", 
-			chartid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			chartid: "标识",
-			chartname: "名称",
-			chartgroup: "分组",
-			dict: "过滤项字典",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_chartname_like: "名称(%)", 
-			n_systemid_eq: "系统标识(=)", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const DAChart_en_US_OwnData = {};
+    const targetData = Object.assign(DAChart_en_US_Base(), DAChart_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dachart/dachart_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dachart/dachart_en_US_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		chart_id: commonLogic.appcommonhandle("标识",null),
+		chart_name: commonLogic.appcommonhandle("名称",null),
+		dict: commonLogic.appcommonhandle("过滤项字典",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		config: commonLogic.appcommonhandle("展现配置",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("图表基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				chartname: commonLogic.appcommonhandle("名称",null), 
+				chartgroup: commonLogic.appcommonhandle("分组",null), 
+				dict: commonLogic.appcommonhandle("过滤项字典",null), 
+				vmcfg: commonLogic.appcommonhandle("展现配置",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				chartid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				chartid: commonLogic.appcommonhandle("标识",null),
+				chartname: commonLogic.appcommonhandle("名称",null),
+				chartgroup: commonLogic.appcommonhandle("分组",null),
+				dict: commonLogic.appcommonhandle("过滤项字典",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_chartname_like: commonLogic.appcommonhandle("名称(%)",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("Export Data Model",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem12: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Save And New",null),
+				tip: commonLogic.appcommonhandle("Save And New",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("第一个记录",null),
+				tip: commonLogic.appcommonhandle("第一个记录",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("上一个记录",null),
+				tip: commonLogic.appcommonhandle("上一个记录",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("下一个记录",null),
+				tip: commonLogic.appcommonhandle("下一个记录",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("最后一个记录",null),
+				tip: commonLogic.appcommonhandle("最后一个记录",null),
+			},
+			tbitem22: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dachart/dachart_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dachart/dachart_zh_CN.ts
-export default {
-  fields: {
-    chart_id: "标识",
-    chart_name: "名称",
-    dict: "过滤项字典",
-    group: "分组",
-    config: "展现配置",
-    system_id: "系统标识",
-  },
-	views: {
-		editview: {
-			caption: "图表",
-      		title: "图表编辑视图",
-		},
-		gridview: {
-			caption: "图表",
-      		title: "图表表格视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "图表基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			chartname: "名称", 
-			chartgroup: "分组", 
-			dict: "过滤项字典", 
-			vmcfg: "展现配置", 
-			systemid: "系统标识", 
-			chartid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			chartid: "标识",
-			chartname: "名称",
-			chartgroup: "分组",
-			dict: "过滤项字典",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_chartname_like: "名称(%)", 
-			n_systemid_eq: "系统标识(=)", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-};
\ No newline at end of file
+import DAChart_zh_CN_Base from './dachart_zh_CN_base';
+
+function getLocaleResource(){
+    const DAChart_zh_CN_OwnData = {};
+    const targetData = Object.assign(DAChart_zh_CN_Base(), DAChart_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dachart/dachart_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dachart/dachart_zh_CN_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		chart_id: commonLogic.appcommonhandle("标识",null),
+		chart_name: commonLogic.appcommonhandle("名称",null),
+		dict: commonLogic.appcommonhandle("过滤项字典",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		config: commonLogic.appcommonhandle("展现配置",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("图表基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				chartname: commonLogic.appcommonhandle("名称",null), 
+				chartgroup: commonLogic.appcommonhandle("分组",null), 
+				dict: commonLogic.appcommonhandle("过滤项字典",null), 
+				vmcfg: commonLogic.appcommonhandle("展现配置",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				chartid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				chartid: commonLogic.appcommonhandle("标识",null),
+				chartname: commonLogic.appcommonhandle("名称",null),
+				chartgroup: commonLogic.appcommonhandle("分组",null),
+				dict: commonLogic.appcommonhandle("过滤项字典",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_chartname_like: commonLogic.appcommonhandle("名称(%)",null), 
+				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("删除并关闭",null),
+				tip: commonLogic.appcommonhandle("删除并关闭",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem12: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("保存并新建",null),
+				tip: commonLogic.appcommonhandle("保存并新建",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("第一个记录",null),
+				tip: commonLogic.appcommonhandle("第一个记录",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("上一个记录",null),
+				tip: commonLogic.appcommonhandle("上一个记录",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("下一个记录",null),
+				tip: commonLogic.appcommonhandle("下一个记录",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("最后一个记录",null),
+				tip: commonLogic.appcommonhandle("最后一个记录",null),
+			},
+			tbitem22: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dadimension/dadimension_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dadimension/dadimension_en_US.ts
+import DADimension_en_US_Base from './dadimension_en_US_base';

-export default {
-  fields: {
-    id: "维度标识",
-    name: "维度名称",
-    field: "属性名",
-    dict: "字典",
-    recursive: "Recursive",
-    buildid: "分析标识",
-    modelid: "模型标识",
-  },
-	views: {
-		editview: {
-			caption: "维度",
-      		title: "维度编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "维度基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srforikey: "", 
-			srfkey: "维度标识", 
-			srfmajortext: "维度名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			dimid: "维度标识", 
-		},
-		uiactions: {
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const DADimension_en_US_OwnData = {};
+    const targetData = Object.assign(DADimension_en_US_Base(), DADimension_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dadimension/dadimension_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dadimension/dadimension_en_US_base.ts
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("维度标识",null),
+		name: commonLogic.appcommonhandle("维度名称",null),
+		field: commonLogic.appcommonhandle("属性名",null),
+		dict: commonLogic.appcommonhandle("字典",null),
+		recursive: commonLogic.appcommonhandle("Recursive",null),
+		buildid: commonLogic.appcommonhandle("分析标识",null),
+		modelid: commonLogic.appcommonhandle("模型标识",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("维度",null),
+				title: commonLogic.appcommonhandle("维度编辑视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("维度基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("维度标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("维度名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				dimid: commonLogic.appcommonhandle("维度标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("Remove And Close",null),
+				tip: commonLogic.appcommonhandle("Remove And Close Window",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem12: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Save And New",null),
+				tip: commonLogic.appcommonhandle("Save And New",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("第一个记录",null),
+				tip: commonLogic.appcommonhandle("第一个记录",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("上一个记录",null),
+				tip: commonLogic.appcommonhandle("上一个记录",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("下一个记录",null),
+				tip: commonLogic.appcommonhandle("下一个记录",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("最后一个记录",null),
+				tip: commonLogic.appcommonhandle("最后一个记录",null),
+			},
+			tbitem22: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN.ts
-export default {
-  fields: {
-    id: "维度标识",
-    name: "维度名称",
-    field: "属性名",
-    dict: "字典",
-    recursive: "Recursive",
-    buildid: "分析标识",
-    modelid: "模型标识",
-  },
-	views: {
-		editview: {
-			caption: "维度",
-      		title: "维度编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "维度基本信息", 
-			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
-			srforikey: "", 
-			srfkey: "维度标识", 
-			srfmajortext: "维度名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			dimid: "维度标识", 
-		},
-		uiactions: {
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem18: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-};
\ No newline at end of file
+import DADimension_zh_CN_Base from './dadimension_zh_CN_base';
+
+function getLocaleResource(){
+    const DADimension_zh_CN_OwnData = {};
+    const targetData = Object.assign(DADimension_zh_CN_Base(), DADimension_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dametric/dametric_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dametric/dametric_en_US.ts
--- a/app_web/src/locale/lanres/entities/dametric/dametric_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dametric/dametric_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/dametric/dametric_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dametric/dametric_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/dametric/dametric_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dametric/dametric_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dareport/dareport_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dareport/dareport_en_US.ts
--- a/app_web/src/locale/lanres/entities/dareport/dareport_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dareport/dareport_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/dareport/dareport_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dareport/dareport_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/dareport/dareport_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dareport/dareport_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dst-app/dst-app_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dst-app/dst-app_en_US.ts
--- a/app_web/src/locale/lanres/entities/dst-app/dst-app_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-app/dst-app_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US.ts
--- a/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-data-source/dst-data-source_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/dst-system/dst-system_en_US.ts
+++ b/app_web/src/locale/lanres/entities/dst-system/dst-system_en_US.ts
--- a/app_web/src/locale/lanres/entities/dst-system/dst-system_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-system/dst-system_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/exec-log/exec-log_en_US.ts
+++ b/app_web/src/locale/lanres/entities/exec-log/exec-log_en_US.ts
--- a/app_web/src/locale/lanres/entities/exec-log/exec-log_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/exec-log/exec-log_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/exec-log/exec-log_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/exec-result/exec-result_en_US.ts
+++ b/app_web/src/locale/lanres/entities/exec-result/exec-result_en_US.ts
--- a/app_web/src/locale/lanres/entities/exec-result/exec-result_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/exec-result/exec-result_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-data-set/meta-data-set_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-entity/meta-entity_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-entity/meta-entity_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-field/meta-field_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-field/meta-field_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-field/meta-field_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-field/meta-field_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-model/meta-model_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-model/meta-model_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-module/meta-module_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-module/meta-module_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-module/meta-module_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-module/meta-module_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-module/meta-module_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US.ts
+++ b/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US.ts
--- a/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US.ts
+++ b/app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US.ts
--- a/app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN_base.ts
--- a/app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
+++ b/app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
--- a/app_web/src/locale/lanres/entities/rule-item/rule-item_en_US_base.ts
+++ b/app_web/src/locale/lanres/entities/rule-item/rule-item_en_US_base.ts
--- a/app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
+++ b/app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
--- a/app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN_base.ts
+++ b/app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN_base.ts
--- a/app_web/src/locale/lanres/userCustom/userCustom_en_US.ts
+++ b/app_web/src/locale/lanres/userCustom/userCustom_en_US.ts
 // 用户自定义语言资源 英文
-export default {
-
-    
-};
\ No newline at end of file
+function getLocaleResource(){
+    const data:any = {};
+    return data;
+}
+export default getLocaleResource;
\ No newline at end of file
--- a/app_web/src/locale/lanres/userCustom/userCustom_zh_CN.ts
+++ b/app_web/src/locale/lanres/userCustom/userCustom_zh_CN.ts
--- a/app_web/src/locale/logic/common/common-logic-base.ts
+++ b/app_web/src/locale/logic/common/common-logic-base.ts
--- a/app_web/src/locale/logic/common/common-logic.ts
+++ b/app_web/src/locale/logic/common/common-logic.ts
--- a/app_web/src/locale/logic/custom/common-logic.ts
+++ b/app_web/src/locale/logic/custom/common-logic.ts
--- a/app_web/src/mock/entity/dabuilds/dabuilds.ts
+++ b/app_web/src/mock/entity/dabuilds/dabuilds.ts
--- a/app_web/src/mock/entity/rule-engines/rule-engines.ts
+++ b/app_web/src/mock/entity/rule-engines/rule-engines.ts
--- a/app_web/src/pages/analysis/dabuild-edit-view/dabuild-edit-view-base.vue
+++ b/app_web/src/pages/analysis/dabuild-edit-view/dabuild-edit-view-base.vue
--- a/app_web/src/pages/analysis/dabuild-grid-view/dabuild-grid-view-base.vue
+++ b/app_web/src/pages/analysis/dabuild-grid-view/dabuild-grid-view-base.vue
--- a/app_web/src/pages/analysis/dachart-edit-view/dachart-edit-view-base.vue
+++ b/app_web/src/pages/analysis/dachart-edit-view/dachart-edit-view-base.vue
--- a/app_web/src/pages/analysis/dachart-grid-view/dachart-grid-view-base.vue
+++ b/app_web/src/pages/analysis/dachart-grid-view/dachart-grid-view-base.vue
--- a/app_web/src/pages/analysis/dametric-edit-view/dametric-edit-view-base.vue
+++ b/app_web/src/pages/analysis/dametric-edit-view/dametric-edit-view-base.vue
--- a/app_web/src/pages/analysis/dametric-grid-view/dametric-grid-view-base.vue
+++ b/app_web/src/pages/analysis/dametric-grid-view/dametric-grid-view-base.vue
--- a/app_web/src/pages/analysis/dareport-edit-view/dareport-edit-view-base.vue
+++ b/app_web/src/pages/analysis/dareport-edit-view/dareport-edit-view-base.vue
--- a/app_web/src/pages/analysis/dareport-grid-view/dareport-grid-view-base.vue
+++ b/app_web/src/pages/analysis/dareport-grid-view/dareport-grid-view-base.vue
--- a/app_web/src/pages/lite/dst-data-source-edit-view/dst-data-source-edit-view-base.vue
+++ b/app_web/src/pages/lite/dst-data-source-edit-view/dst-data-source-edit-view-base.vue
--- a/app_web/src/pages/lite/dst-data-source-grid-view/dst-data-source-grid-view-base.vue
+++ b/app_web/src/pages/lite/dst-data-source-grid-view/dst-data-source-grid-view-base.vue
--- a/app_web/src/pages/lite/dst-data-source-pickup-grid-view/dst-data-source-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/dst-data-source-pickup-grid-view/dst-data-source-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/dst-data-source-pickup-view/dst-data-source-pickup-view-base.vue
+++ b/app_web/src/pages/lite/dst-data-source-pickup-view/dst-data-source-pickup-view-base.vue
--- a/app_web/src/pages/lite/dst-system-edit-view/dst-system-edit-view-base.vue
+++ b/app_web/src/pages/lite/dst-system-edit-view/dst-system-edit-view-base.vue
--- a/app_web/src/pages/lite/dst-system-grid-view/dst-system-grid-view-base.vue
+++ b/app_web/src/pages/lite/dst-system-grid-view/dst-system-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-data-set-edit-view/meta-data-set-edit-view-base.vue
+++ b/app_web/src/pages/lite/meta-data-set-edit-view/meta-data-set-edit-view-base.vue
--- a/app_web/src/pages/lite/meta-data-set-grid-view/meta-data-set-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-data-set-grid-view/meta-data-set-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-entity-edit-view/meta-entity-edit-view-base.vue
+++ b/app_web/src/pages/lite/meta-entity-edit-view/meta-entity-edit-view-base.vue
--- a/app_web/src/pages/lite/meta-entity-grid-view/meta-entity-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-entity-grid-view/meta-entity-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-entity-pickup-grid-view/meta-entity-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-entity-pickup-grid-view/meta-entity-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-entity-pickup-view/meta-entity-pickup-view-base.vue
+++ b/app_web/src/pages/lite/meta-entity-pickup-view/meta-entity-pickup-view-base.vue
--- a/app_web/src/pages/lite/meta-field-edit-grid-view/meta-field-edit-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-field-edit-grid-view/meta-field-edit-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-field-edit-view/meta-field-edit-view-base.vue
+++ b/app_web/src/pages/lite/meta-field-edit-view/meta-field-edit-view-base.vue
--- a/app_web/src/pages/lite/meta-field-pickup-grid-view/meta-field-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-field-pickup-grid-view/meta-field-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-field-pickup-view/meta-field-pickup-view-base.vue
+++ b/app_web/src/pages/lite/meta-field-pickup-view/meta-field-pickup-view-base.vue
--- a/app_web/src/pages/lite/meta-model-edit-view/meta-model-edit-view-base.vue
+++ b/app_web/src/pages/lite/meta-model-edit-view/meta-model-edit-view-base.vue
--- a/app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-model-pickup-grid-view/meta-model-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-model-pickup-grid-view/meta-model-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-model-pickup-view/meta-model-pickup-view-base.vue
+++ b/app_web/src/pages/lite/meta-model-pickup-view/meta-model-pickup-view-base.vue
--- a/app_web/src/pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-module-pickup-grid-view/meta-module-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-module-pickup-view/meta-module-pickup-view-base.vue
+++ b/app_web/src/pages/lite/meta-module-pickup-view/meta-module-pickup-view-base.vue
--- a/app_web/src/pages/lite/meta-relationship-edit-grid-view/meta-relationship-edit-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-relationship-edit-grid-view/meta-relationship-edit-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-relationship-edit-view/meta-relationship-edit-view-base.vue
+++ b/app_web/src/pages/lite/meta-relationship-edit-view/meta-relationship-edit-view-base.vue
--- a/app_web/src/pages/lite/meta-relationship-pickup-grid-view/meta-relationship-pickup-grid-view-base.vue
+++ b/app_web/src/pages/lite/meta-relationship-pickup-grid-view/meta-relationship-pickup-grid-view-base.vue
--- a/app_web/src/pages/lite/meta-relationship-pickup-view/meta-relationship-pickup-view-base.vue
+++ b/app_web/src/pages/lite/meta-relationship-pickup-view/meta-relationship-pickup-view-base.vue
--- a/app_web/src/pages/rule/exec-log-edit-view/exec-log-edit-view-base.vue
+++ b/app_web/src/pages/rule/exec-log-edit-view/exec-log-edit-view-base.vue
--- a/app_web/src/pages/rule/exec-log-grid-view/exec-log-grid-view-base.vue
+++ b/app_web/src/pages/rule/exec-log-grid-view/exec-log-grid-view-base.vue
--- a/app_web/src/pages/rule/exec-result-edit-view/exec-result-edit-view-base.vue
+++ b/app_web/src/pages/rule/exec-result-edit-view/exec-result-edit-view-base.vue
--- a/app_web/src/pages/rule/exec-result-grid-view/exec-result-grid-view-base.vue
+++ b/app_web/src/pages/rule/exec-result-grid-view/exec-result-grid-view-base.vue
--- a/app_web/src/pages/rule/rule-engine-edit-view/rule-engine-edit-view-base.vue
+++ b/app_web/src/pages/rule/rule-engine-edit-view/rule-engine-edit-view-base.vue
--- a/app_web/src/pages/rule/rule-engine-grid-view/rule-engine-grid-view-base.vue
+++ b/app_web/src/pages/rule/rule-engine-grid-view/rule-engine-grid-view-base.vue
--- a/app_web/src/pages/rule/rule-item-edit-view/rule-item-edit-view-base.vue
+++ b/app_web/src/pages/rule/rule-item-edit-view/rule-item-edit-view-base.vue
--- a/app_web/src/pages/rule/rule-item-grid-view/rule-item-grid-view-base.vue
+++ b/app_web/src/pages/rule/rule-item-grid-view/rule-item-grid-view-base.vue
--- a/app_web/src/pages/rule/rule-item-pickup-grid-view/rule-item-pickup-grid-view-base.vue
+++ b/app_web/src/pages/rule/rule-item-pickup-grid-view/rule-item-pickup-grid-view-base.vue
--- a/app_web/src/pages/rule/rule-item-pickup-view/rule-item-pickup-view-base.vue
+++ b/app_web/src/pages/rule/rule-item-pickup-view/rule-item-pickup-view-base.vue
--- a/app_web/src/service/dabuild/dabuild-service-base.ts
+++ b/app_web/src/service/dabuild/dabuild-service-base.ts
--- a/app_web/src/service/rule-engine/rule-engine-service-base.ts
+++ b/app_web/src/service/rule-engine/rule-engine-service-base.ts
--- a/app_web/src/uiservice/dabuild/dabuild-ui-service-base.ts
+++ b/app_web/src/uiservice/dabuild/dabuild-ui-service-base.ts
--- a/app_web/src/uiservice/rule-engine/rule-engine-ui-service-base.ts
+++ b/app_web/src/uiservice/rule-engine/rule-engine-ui-service-base.ts
--- a/app_web/src/widgets/dabuild/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dabuild/main-form/main-form-base.vue
--- a/app_web/src/widgets/dabuild/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dabuild/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/dachart/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dachart/main-form/main-form-base.vue
--- a/app_web/src/widgets/dachart/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dachart/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/dametric/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dametric/main-form/main-form-base.vue
--- a/app_web/src/widgets/dametric/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dametric/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/dareport/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dareport/main-form/main-form-base.vue
--- a/app_web/src/widgets/dareport/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dareport/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/dst-data-source/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dst-data-source/main-form/main-form-base.vue
--- a/app_web/src/widgets/dst-data-source/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dst-data-source/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/dst-system/main-form/main-form-base.vue
+++ b/app_web/src/widgets/dst-system/main-form/main-form-base.vue
--- a/app_web/src/widgets/dst-system/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/dst-system/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/exec-log/main-form/main-form-base.vue
+++ b/app_web/src/widgets/exec-log/main-form/main-form-base.vue
--- a/app_web/src/widgets/exec-log/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/exec-log/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/exec-result/main-form/main-form-base.vue
+++ b/app_web/src/widgets/exec-result/main-form/main-form-base.vue
--- a/app_web/src/widgets/exec-result/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/exec-result/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-data-set/main-form/main-form-base.vue
+++ b/app_web/src/widgets/meta-data-set/main-form/main-form-base.vue
--- a/app_web/src/widgets/meta-data-set/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-data-set/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-entity/main-form/main-form-base.vue
+++ b/app_web/src/widgets/meta-entity/main-form/main-form-base.vue
--- a/app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-entity/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-field/edit-main-grid/edit-main-grid-base.vue
+++ b/app_web/src/widgets/meta-field/edit-main-grid/edit-main-grid-base.vue
--- a/app_web/src/widgets/meta-field/main-form/main-form-base.vue
+++ b/app_web/src/widgets/meta-field/main-form/main-form-base.vue
--- a/app_web/src/widgets/meta-field/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-field/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-model/main-form/main-form-base.vue
+++ b/app_web/src/widgets/meta-model/main-form/main-form-base.vue
--- a/app_web/src/widgets/meta-model/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-model/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-module/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-module/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/meta-relationship/edit-main-grid/edit-main-grid-base.vue
+++ b/app_web/src/widgets/meta-relationship/edit-main-grid/edit-main-grid-base.vue
--- a/app_web/src/widgets/meta-relationship/main-form/main-form-base.vue
+++ b/app_web/src/widgets/meta-relationship/main-form/main-form-base.vue
--- a/app_web/src/widgets/meta-relationship/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/meta-relationship/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/rule-engine/main-form/main-form-base.vue
+++ b/app_web/src/widgets/rule-engine/main-form/main-form-base.vue
--- a/app_web/src/widgets/rule-engine/main-form/main-form-model.ts
+++ b/app_web/src/widgets/rule-engine/main-form/main-form-model.ts
--- a/app_web/src/widgets/rule-engine/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/rule-engine/main-grid/main-grid-base.vue
--- a/app_web/src/widgets/rule-item/main-form/main-form-base.vue
+++ b/app_web/src/widgets/rule-item/main-form/main-form-base.vue
--- a/app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDABuildService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDABuildService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDAMetricService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/IDAMetricService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DABuildServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/analysis/service/impl/DAMetricServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/DABuildExService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/DABuildExService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/extensions/service/RuleEngineExService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IDstDataSourceService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IDstDataSourceService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IDstSystemService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IDstSystemService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaEntityService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaEntityService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaModelService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/IMetaModelService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstDataSourceServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstSystemServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaModelServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/RuleEngine.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/IRuleEngineService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/IRuleEngineService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/IRuleItemService.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/IRuleItemService.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleEngineServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleEngineServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/rule/service/impl/RuleItemServiceImpl.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/util/config/XxlJobConfig.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/util/config/XxlJobConfig.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/util/job/AnalysisBuildJobHandler.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/util/job/AnalysisBuildJobHandler.java
--- a/ibzdst-core/src/main/java/cn/ibizlab/core/util/job/RuleExecJobHandler.java
+++ b/ibzdst-core/src/main/java/cn/ibizlab/core/util/job/RuleExecJobHandler.java
--- a/ibzdst-core/src/main/resources/liquibase/h2_table.xml
+++ b/ibzdst-core/src/main/resources/liquibase/h2_table.xml
--- a/ibzdst-core/src/main/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
+++ b/ibzdst-core/src/main/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
--- a/ibzdst-core/src/main/resources/permission/systemResource.json
+++ b/ibzdst-core/src/main/resources/permission/systemResource.json
--- a/ibzdst-core/src/main/resources/sysmodel/ibzdst.json
+++ b/ibzdst-core/src/main/resources/sysmodel/ibzdst.json
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleEngineDTO.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DABuildResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DABuildResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DAMetricResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DAMetricResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstDataSourceResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstSystemResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/DstSystemResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaEntityResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModelResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/MetaModelResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleEngineResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleEngineResource.java
--- a/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleItemResource.java
+++ b/ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/rest/RuleItemResource.java