ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

app_Web/package.json

@@ -42,7 +42,7 @@
     "vue-class-component": "^7.0.2",
     "vue-grid-layout": "^2.3.7",
     "vue-i18n": "^8.15.3",
-    "vue-property-decorator": "^8.3.0",
+    "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2",
       "xlsx": "^0.15.6"

app_Web/src/components/dropdown-list/dropdown-list.vue

@@ -196,7 +196,7 @@ export default class DropDownList extends Vue {
             val = tempVal.length >0?tempVal[0].value:null;
         }
         const type: string = this.$util.typeOf(val);
-        val = Object.is(type, 'null') || Object.is(type, 'undefined') ? undefined : val;
+        val = Object.is(type, 'null') || Object.is(type, 'undefined') ? null : val;
         this.$emit('change', val);
     }
 

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()),
 };
 
 

app_Web/src/locale/lanres/codelist/codelist_en_US.ts

-export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": ""
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": ""
-    },
-    CLIBZSex: {
-        "男": "男性",
-        "女": "女性",
-        "性别不详": "性别不详",
-        "empty": ""
-    },
-    CodeListJobStatus: {
-        "0": "ENABLED",
-        "1": "DISABLED",
-        "empty": ""
-    },
-    CLAuthCode: {
-        "200": "成功",
-        "400": "用户不存在",
-        "401.1": "密码错误",
-        "401.2": "配置错误",
-        "403.6": "地址被拒绝",
-        "empty": ""
-    },
-    AppType: {
-        "INNER": "内置应用",
-        "THIRD-PARTY": "第三方应用",
-        "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

app_Web/src/locale/lanres/codelist/codelist_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      OpenAccessType: {
+          "aliyun": commonLogic.appcommonhandle("阿里云",null),
+          "wechat": commonLogic.appcommonhandle("微信开放平台",null),
+          "qq": commonLogic.appcommonhandle("QQ互联",null),
+          "dingtalk": commonLogic.appcommonhandle("钉钉开放平台",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CLIBZSex: {
+          "男": commonLogic.appcommonhandle("男性",null),
+          "女": commonLogic.appcommonhandle("女性",null),
+          "性别不详": commonLogic.appcommonhandle("性别不详",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CodeListJobStatus: {
+          "0": commonLogic.appcommonhandle("ENABLED",null),
+          "1": commonLogic.appcommonhandle("DISABLED",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      CLAuthCode: {
+          "200": commonLogic.appcommonhandle("成功",null),
+          "400": commonLogic.appcommonhandle("用户不存在",null),
+          "401.1": commonLogic.appcommonhandle("密码错误",null),
+          "401.2": commonLogic.appcommonhandle("配置错误",null),
+          "403.6": commonLogic.appcommonhandle("地址被拒绝",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      AppType: {
+          "INNER": commonLogic.appcommonhandle("内置应用",null),
+          "THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/codelist/codelist_zh_CN.ts

-export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": "",
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": "",
-    },
-    CLIBZSex: {
-        "男": "男性",
-        "女": "女性",
-        "性别不详": "性别不详",
-        "empty": "",
-    },
-    CodeListJobStatus: {
-        "0": "ENABLED",
-        "1": "DISABLED",
-        "empty": "",
-    },
-    CLAuthCode: {
-        "200": "成功",
-        "400": "用户不存在",
-        "401.1": "密码错误",
-        "401.2": "配置错误",
-        "403.6": "地址被拒绝",
-        "empty": "",
-    },
-    AppType: {
-        "INNER": "内置应用",
-        "THIRD-PARTY": "第三方应用",
-        "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

app_Web/src/locale/lanres/codelist/codelist_zh_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      OpenAccessType: {
+          "aliyun": commonLogic.appcommonhandle("阿里云",null),
+          "wechat": commonLogic.appcommonhandle("微信开放平台",null),
+          "qq": commonLogic.appcommonhandle("QQ互联",null),
+          "dingtalk": commonLogic.appcommonhandle("钉钉开放平台",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLIBZSex: {
+          "男": commonLogic.appcommonhandle("男性",null),
+          "女": commonLogic.appcommonhandle("女性",null),
+          "性别不详": commonLogic.appcommonhandle("性别不详",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CodeListJobStatus: {
+          "0": commonLogic.appcommonhandle("ENABLED",null),
+          "1": commonLogic.appcommonhandle("DISABLED",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      CLAuthCode: {
+          "200": commonLogic.appcommonhandle("成功",null),
+          "400": commonLogic.appcommonhandle("用户不存在",null),
+          "401.1": commonLogic.appcommonhandle("密码错误",null),
+          "401.2": commonLogic.appcommonhandle("配置错误",null),
+          "403.6": commonLogic.appcommonhandle("地址被拒绝",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      AppType: {
+          "INNER": commonLogic.appcommonhandle("内置应用",null),
+          "THIRD-PARTY": commonLogic.appcommonhandle("第三方应用",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-catalog/dict-catalog_en_US.ts

+import DictCatalog_en_US_Base from './dict-catalog_en_US_base';
 
-export default {
-  fields: {
-    id: "标识",
-    code: "代码",
-    name: "名称",
-    group: "分组",
-    memo: "备注",
-    enable: "是否有效",
-    updatedate: "最后修改时间",
-  },
-	views: {
-		gridview: {
-			caption: "目录",
-      		title: "目录",
-		},
-		pickupgridview: {
-			caption: "字典",
-      		title: "字典选择表格视图",
-		},
-		pickupview: {
-			caption: "字典",
-      		title: "字典数据选择视图",
-		},
-		editview: {
-			caption: "目录",
-      		title: "目录",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典基本信息", 
-			druipart1: "字典项", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			ccode: "代码", 
-			cname: "名称", 
-			cgroup: "分组", 
-			memo: "备注", 
-			cid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			ccode: "代码",
-			cname: "名称",
-			cgroup: "分组",
-			memo: "备注",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_ccode_like: "代码", 
-			n_cname_like: "名称", 
-			n_cgroup_like: "分组", 
-		},
-		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",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		deuiaction1: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		deuiaction2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const DictCatalog_en_US_OwnData = {};
+    const targetData = Object.assign(DictCatalog_en_US_Base(), DictCatalog_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("标识",null),
+		code: commonLogic.appcommonhandle("代码",null),
+		name: commonLogic.appcommonhandle("名称",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		memo: commonLogic.appcommonhandle("备注",null),
+		enable: commonLogic.appcommonhandle("是否有效",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			gridview: {
+				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),
+			},
+			editview: {
+				caption: commonLogic.appcommonhandle("目录",null),
+				title: commonLogic.appcommonhandle("目录",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典基本信息",null), 
+				druipart1: commonLogic.appcommonhandle("字典项",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: 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), 
+				ccode: commonLogic.appcommonhandle("代码",null), 
+				cname: commonLogic.appcommonhandle("名称",null), 
+				cgroup: commonLogic.appcommonhandle("分组",null), 
+				memo: commonLogic.appcommonhandle("备注",null), 
+				cid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				ccode: commonLogic.appcommonhandle("代码",null),
+				cname: commonLogic.appcommonhandle("名称",null),
+				cgroup: commonLogic.appcommonhandle("分组",null),
+				memo: commonLogic.appcommonhandle("备注",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_ccode_like: commonLogic.appcommonhandle("代码",null), 
+				n_cname_like: commonLogic.appcommonhandle("名称",null), 
+				n_cgroup_like: 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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-catalog/dict-catalog_zh_CN.ts

-export default {
-  fields: {
-    id: "标识",
-    code: "代码",
-    name: "名称",
-    group: "分组",
-    memo: "备注",
-    enable: "是否有效",
-    updatedate: "最后修改时间",
-  },
-	views: {
-		gridview: {
-			caption: "目录",
-      		title: "目录",
-		},
-		pickupgridview: {
-			caption: "字典",
-      		title: "字典选择表格视图",
-		},
-		pickupview: {
-			caption: "字典",
-      		title: "字典数据选择视图",
-		},
-		editview: {
-			caption: "目录",
-      		title: "目录",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典基本信息", 
-			druipart1: "字典项", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			ccode: "代码", 
-			cname: "名称", 
-			cgroup: "分组", 
-			memo: "备注", 
-			cid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			ccode: "代码",
-			cname: "名称",
-			cgroup: "分组",
-			memo: "备注",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_ccode_like: "代码", 
-			n_cname_like: "名称", 
-			n_cgroup_like: "分组", 
-		},
-		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: "过滤",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		deuiaction1: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		deuiaction2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-	},
-};
\ No newline at end of file
+import DictCatalog_zh_CN_Base from './dict-catalog_zh_CN_base';
+
+function getLocaleResource(){
+    const DictCatalog_zh_CN_OwnData = {};
+    const targetData = Object.assign(DictCatalog_zh_CN_Base(), DictCatalog_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("标识",null),
+		code: commonLogic.appcommonhandle("代码",null),
+		name: commonLogic.appcommonhandle("名称",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		memo: commonLogic.appcommonhandle("备注",null),
+		enable: commonLogic.appcommonhandle("是否有效",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			gridview: {
+				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),
+			},
+			editview: {
+				caption: commonLogic.appcommonhandle("目录",null),
+				title: commonLogic.appcommonhandle("目录",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典基本信息",null), 
+				druipart1: commonLogic.appcommonhandle("字典项",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: 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), 
+				ccode: commonLogic.appcommonhandle("代码",null), 
+				cname: commonLogic.appcommonhandle("名称",null), 
+				cgroup: commonLogic.appcommonhandle("分组",null), 
+				memo: commonLogic.appcommonhandle("备注",null), 
+				cid: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				ccode: commonLogic.appcommonhandle("代码",null),
+				cname: commonLogic.appcommonhandle("名称",null),
+				cgroup: commonLogic.appcommonhandle("分组",null),
+				memo: commonLogic.appcommonhandle("备注",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_ccode_like: commonLogic.appcommonhandle("代码",null), 
+				n_cname_like: commonLogic.appcommonhandle("名称",null), 
+				n_cgroup_like: 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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem14: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-option/dict-option_en_US.ts

+import DictOption_en_US_Base from './dict-option_en_US_base';
 
-export default {
-  fields: {
-    value_key: "标识",
-    catalog_id: "目录代码",
-    catalog_name: "目录",
-    value: "代码值",
-    label: "名称",
-    parent: "父代码值",
-    filter: "过滤项",
-    cls: "栏目样式",
-    icon_class: "图标",
-    disabled: "是否禁用",
-    expired: "过期/失效",
-    showorder: "排序",
-    extension: "扩展",
-    updatedate: "最后修改时间",
-  },
-	views: {
-		editview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-		gridview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-		grideditview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典项基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			cname: "目录", 
-			val: "代码值", 
-			label: "名称", 
-			pval: "父代码值", 
-			showorder: "排序", 
-			disabled: "是否禁用", 
-			expired: "过期/失效", 
-			vfilter: "过滤项", 
-			iconcls: "图标", 
-			cls: "栏目样式", 
-			extension: "扩展", 
-			cid: "目录代码", 
-			vkey: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			cid: "目录代码",
-			val: "代码值",
-			label: "名称",
-			pval: "父代码值",
-			showorder: "排序",
-			cname: "目录",
-			cls: "栏目样式",
-			iconcls: "图标",
-			vfilter: "过滤项",
-			disabled: "是否禁用",
-			expired: "过期/失效",
-			extension: "扩展",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	options_grid: {
-		columns: {
-			cid: "目录代码",
-			val: "代码值",
-			label: "名称",
-			pval: "父代码值",
-			showorder: "排序",
-			cname: "目录",
-			cls: "栏目样式",
-			iconcls: "图标",
-			vfilter: "过滤项",
-			disabled: "是否禁用",
-			expired: "过期/失效",
-			extension: "扩展",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_cname_like: "目录(文本包含(%))", 
-			n_val_like: "代码值(文本包含(%))", 
-			n_label_like: "名称(文本包含(%))", 
-		},
-		uiactions: {
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		deuiaction2: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
-	grideditviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		deuiaction2: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const DictOption_en_US_OwnData = {};
+    const targetData = Object.assign(DictOption_en_US_Base(), DictOption_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-option/dict-option_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		value_key: commonLogic.appcommonhandle("标识",null),
+		catalog_id: commonLogic.appcommonhandle("目录代码",null),
+		catalog_name: commonLogic.appcommonhandle("目录",null),
+		value: commonLogic.appcommonhandle("代码值",null),
+		label: commonLogic.appcommonhandle("名称",null),
+		parent: commonLogic.appcommonhandle("父代码值",null),
+		filter: commonLogic.appcommonhandle("过滤项",null),
+		cls: commonLogic.appcommonhandle("栏目样式",null),
+		icon_class: commonLogic.appcommonhandle("图标",null),
+		disabled: commonLogic.appcommonhandle("是否禁用",null),
+		expired: commonLogic.appcommonhandle("过期/失效",null),
+		showorder: commonLogic.appcommonhandle("排序",null),
+		extension: commonLogic.appcommonhandle("扩展",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+			grideditview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典项基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: 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), 
+				cname: commonLogic.appcommonhandle("目录",null), 
+				val: commonLogic.appcommonhandle("代码值",null), 
+				label: commonLogic.appcommonhandle("名称",null), 
+				pval: commonLogic.appcommonhandle("父代码值",null), 
+				showorder: commonLogic.appcommonhandle("排序",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				expired: commonLogic.appcommonhandle("过期/失效",null), 
+				vfilter: commonLogic.appcommonhandle("过滤项",null), 
+				iconcls: commonLogic.appcommonhandle("图标",null), 
+				cls: commonLogic.appcommonhandle("栏目样式",null), 
+				extension: commonLogic.appcommonhandle("扩展",null), 
+				cid: commonLogic.appcommonhandle("目录代码",null), 
+				vkey: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		options_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_cname_like: commonLogic.appcommonhandle("目录(文本包含(%))",null), 
+				n_val_like: commonLogic.appcommonhandle("代码值(文本包含(%))",null), 
+				n_label_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+		},
+		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),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				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),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+		},
+		grideditviewtoolbar_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),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				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),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-option/dict-option_zh_CN.ts

-export default {
-  fields: {
-    value_key: "标识",
-    catalog_id: "目录代码",
-    catalog_name: "目录",
-    value: "代码值",
-    label: "名称",
-    parent: "父代码值",
-    filter: "过滤项",
-    cls: "栏目样式",
-    icon_class: "图标",
-    disabled: "是否禁用",
-    expired: "过期/失效",
-    showorder: "排序",
-    extension: "扩展",
-    updatedate: "最后修改时间",
-  },
-	views: {
-		editview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-		gridview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-		grideditview: {
-			caption: "字典项",
-      		title: "字典项",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典项基本信息", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			cname: "目录", 
-			val: "代码值", 
-			label: "名称", 
-			pval: "父代码值", 
-			showorder: "排序", 
-			disabled: "是否禁用", 
-			expired: "过期/失效", 
-			vfilter: "过滤项", 
-			iconcls: "图标", 
-			cls: "栏目样式", 
-			extension: "扩展", 
-			cid: "目录代码", 
-			vkey: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			cid: "目录代码",
-			val: "代码值",
-			label: "名称",
-			pval: "父代码值",
-			showorder: "排序",
-			cname: "目录",
-			cls: "栏目样式",
-			iconcls: "图标",
-			vfilter: "过滤项",
-			disabled: "是否禁用",
-			expired: "过期/失效",
-			extension: "扩展",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	options_grid: {
-		columns: {
-			cid: "目录代码",
-			val: "代码值",
-			label: "名称",
-			pval: "父代码值",
-			showorder: "排序",
-			cname: "目录",
-			cls: "栏目样式",
-			iconcls: "图标",
-			vfilter: "过滤项",
-			disabled: "是否禁用",
-			expired: "过期/失效",
-			extension: "扩展",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_cname_like: "目录(文本包含(%))", 
-			n_val_like: "代码值(文本包含(%))", 
-			n_label_like: "名称(文本包含(%))", 
-		},
-		uiactions: {
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem1: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem2: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		deuiaction2: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
-	grideditviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem24: {
-			caption: "行编辑",
-			tip: "行编辑",
-		},
-		tbitem25: {
-			caption: "新建行",
-			tip: "新建行",
-		},
-		deuiaction1: {
-			caption: "保存行",
-			tip: "保存行",
-		},
-		tbitem26: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		deuiaction2: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
-};
\ No newline at end of file
+import DictOption_zh_CN_Base from './dict-option_zh_CN_base';
+
+function getLocaleResource(){
+    const DictOption_zh_CN_OwnData = {};
+    const targetData = Object.assign(DictOption_zh_CN_Base(), DictOption_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_Web/src/locale/lanres/entities/dict-option/dict-option_zh_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		value_key: commonLogic.appcommonhandle("标识",null),
+		catalog_id: commonLogic.appcommonhandle("目录代码",null),
+		catalog_name: commonLogic.appcommonhandle("目录",null),
+		value: commonLogic.appcommonhandle("代码值",null),
+		label: commonLogic.appcommonhandle("名称",null),
+		parent: commonLogic.appcommonhandle("父代码值",null),
+		filter: commonLogic.appcommonhandle("过滤项",null),
+		cls: commonLogic.appcommonhandle("栏目样式",null),
+		icon_class: commonLogic.appcommonhandle("图标",null),
+		disabled: commonLogic.appcommonhandle("是否禁用",null),
+		expired: commonLogic.appcommonhandle("过期/失效",null),
+		showorder: commonLogic.appcommonhandle("排序",null),
+		extension: commonLogic.appcommonhandle("扩展",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+			grideditview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典项基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: 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), 
+				cname: commonLogic.appcommonhandle("目录",null), 
+				val: commonLogic.appcommonhandle("代码值",null), 
+				label: commonLogic.appcommonhandle("名称",null), 
+				pval: commonLogic.appcommonhandle("父代码值",null), 
+				showorder: commonLogic.appcommonhandle("排序",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				expired: commonLogic.appcommonhandle("过期/失效",null), 
+				vfilter: commonLogic.appcommonhandle("过滤项",null), 
+				iconcls: commonLogic.appcommonhandle("图标",null), 
+				cls: commonLogic.appcommonhandle("栏目样式",null), 
+				extension: commonLogic.appcommonhandle("扩展",null), 
+				cid: commonLogic.appcommonhandle("目录代码",null), 
+				vkey: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		options_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_cname_like: commonLogic.appcommonhandle("目录(文本包含(%))",null), 
+				n_val_like: commonLogic.appcommonhandle("代码值(文本包含(%))",null), 
+				n_label_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+		},
+		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),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				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),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+		},
+		grideditviewtoolbar_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),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				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),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts

+import JobsInfo_en_US_Base from './jobs-info_en_US_base';
 
-export default {
-  fields: {
-    id: "主键ID",
-    tenant_id: "租户ID",
-    app: "服务名",
-    cron: "任务执行CRON",
-    handler: "执行器任务HANDLER",
-    param: "执行器任务参数",
-    timeout: "任务执行超时时间（秒）",
-    fail_retry_count: "失败重试次数",
-    last_time: "上次调度时间",
-    next_time: "下次调度时间",
-    author: "所有者",
-    remark: "备注",
-    status: "状态",
-    update_time: "更新时间",
-    create_time: "创建时间",
-  },
-	views: {
-		editview: {
-			caption: "任务",
-      		title: "任务",
-		},
-		gridview: {
-			caption: "任务",
-      		title: "任务",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "任务信息基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "主键ID", 
-			srfmajortext: "执行器任务HANDLER", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			app: "服务名", 
-			handler: "执行器任务HANDLER", 
-			cron: "任务执行CRON", 
-			param: "执行器任务参数", 
-			last_time: "上次调度时间", 
-			next_time: "下次调度时间", 
-			timeout: "任务执行超时时间（秒）", 
-			fail_retry_count: "失败重试次数", 
-			author: "所有者", 
-			remark: "备注", 
-			status: "状态", 
-			tenant_id: "租户ID", 
-			create_time: "创建时间", 
-			update_time: "更新时间", 
-			id: "主键ID", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			id: "主键ID",
-			app: "服务名",
-			handler: "执行器任务HANDLER",
-			cron: "任务执行CRON",
-			last_time: "上次调度时间",
-			next_time: "下次调度时间",
-			status: "状态",
-			timeout: "任务执行超时时间（秒）",
-			update_time: "更新时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_app_like: "服务名(文本包含(%))", 
-			n_handler_like: "执行器任务HANDLER(文本包含(%))", 
-			n_status_eq: "状态(等于(=))", 
-		},
-		uiactions: {
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		deuiaction2: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		deuiaction1: {
-			caption: "关闭",
-			tip: "关闭",
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		deuiaction1: {
-			caption: "启动",
-			tip: "启动",
-		},
-		deuiaction2: {
-			caption: "停止",
-			tip: "停止",
-		},
-		deuiaction3: {
-			caption: "执行",
-			tip: "执行",
-		},
-		deuiaction4: {
-			caption: "New",
-			tip: "New",
-		},
-		deuiaction5: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		deuiaction6: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		deuiaction7: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const JobsInfo_en_US_OwnData = {};
+    const targetData = Object.assign(JobsInfo_en_US_Base(), JobsInfo_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_Web/src/locale/lanres/entities/jobs-info/jobs-info_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("主键ID",null),
+		tenant_id: commonLogic.appcommonhandle("租户ID",null),
+		app: commonLogic.appcommonhandle("服务名",null),
+		cron: commonLogic.appcommonhandle("任务执行CRON",null),
+		handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
+		param: commonLogic.appcommonhandle("执行器任务参数",null),
+		timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
+		fail_retry_count: commonLogic.appcommonhandle("失败重试次数",null),
+		last_time: commonLogic.appcommonhandle("上次调度时间",null),
+		next_time: commonLogic.appcommonhandle("下次调度时间",null),
+		author: commonLogic.appcommonhandle("所有者",null),
+		remark: commonLogic.appcommonhandle("备注",null),
+		status: commonLogic.appcommonhandle("状态",null),
+		update_time: commonLogic.appcommonhandle("更新时间",null),
+		create_time: 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("主键ID",null), 
+				srfmajortext: commonLogic.appcommonhandle("执行器任务HANDLER",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				app: commonLogic.appcommonhandle("服务名",null), 
+				handler: commonLogic.appcommonhandle("执行器任务HANDLER",null), 
+				cron: commonLogic.appcommonhandle("任务执行CRON",null), 
+				param: commonLogic.appcommonhandle("执行器任务参数",null), 
+				last_time: commonLogic.appcommonhandle("上次调度时间",null), 
+				next_time: commonLogic.appcommonhandle("下次调度时间",null), 
+				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null), 
+				fail_retry_count: commonLogic.appcommonhandle("失败重试次数",null), 
+				author: commonLogic.appcommonhandle("所有者",null), 
+				remark: commonLogic.appcommonhandle("备注",null), 
+				status: commonLogic.appcommonhandle("状态",null), 
+				tenant_id: commonLogic.appcommonhandle("租户ID",null), 
+				create_time: commonLogic.appcommonhandle("创建时间",null), 
+				update_time: commonLogic.appcommonhandle("更新时间",null), 
+				id: commonLogic.appcommonhandle("主键ID",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				id: commonLogic.appcommonhandle("主键ID",null),
+				app: commonLogic.appcommonhandle("服务名",null),
+				handler: commonLogic.appcommonhandle("执行器任务HANDLER",null),
+				cron: commonLogic.appcommonhandle("任务执行CRON",null),
+				last_time: commonLogic.appcommonhandle("上次调度时间",null),
+				next_time: commonLogic.appcommonhandle("下次调度时间",null),
+				status: commonLogic.appcommonhandle("状态",null),
+				timeout: commonLogic.appcommonhandle("任务执行超时时间（秒）",null),
+				update_time: commonLogic.appcommonhandle("更新时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_app_like: commonLogic.appcommonhandle("服务名(文本包含(%))",null), 
+				n_handler_like: commonLogic.appcommonhandle("执行器任务HANDLER(文本包含(%))",null), 
+				n_status_eq: commonLogic.appcommonhandle("状态(等于(=))",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("启动",null),
+				tip: commonLogic.appcommonhandle("启动",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("停止",null),
+				tip: commonLogic.appcommonhandle("停止",null),
+			},
+			deuiaction3: {
+				caption: commonLogic.appcommonhandle("执行",null),
+				tip: commonLogic.appcommonhandle("执行",null),
+			},
+			deuiaction4: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			deuiaction5: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			deuiaction6: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			deuiaction7: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

app_Web/src/locale/lanres/entities/jobs-log/jobs-log_en_US.ts

+import JobsLog_en_US_Base from './jobs-log_en_US_base';
 
-export default {
-  fields: {
-    id: "主键ID",
-    job_id: "任务ID",
-    address: "执行地址",
-    handler: "执行器任务HANDLER",
-    param: "执行器任务参数",
-    fail_retry_count: "失败重试次数",
-    trigger_code: "触发器调度返回码",
-    trigger_type: "触发器调度类型",
-    trigger_msg: "触发器调度信息",
-    create_time: "创建时间",
-  },
-	views: {
-		gridview: {
-			caption: "日志",
-      		title: "日志",
-		},
-		editview: {
-			caption: "日志",
-      		title: "日志",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "任务调度日志基本信息", 
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "主键ID", 
-			srfmajortext: "执行器任务HANDLER", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			job_id: "任务ID", 
-			handler: "执行器任务HANDLER", 
-			param: "执行器任务参数", 
-			fail_retry_count: "失败重试次数", 
-			trigger_code: "触发器调度返回码", 
-			trigger_type: "触发器调度类型", 
-			trigger_msg: "触发器调度信息", 
-			address: "执行地址", 
-			create_time: "创建时间", 
-			id: "主键ID", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			id: "主键ID",
-			job_id: "任务ID",
-			handler: "执行器任务HANDLER",
-			address: "执行地址",
-			trigger_code: "触发器调度返回码",
-			trigger_type: "触发器调度类型",
-			fail_retry_count: "失败重试次数",
-			create_time: "创建时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_job_id_eq: "任务ID(等于(=))", 
-			n_handler_like: "执行器任务HANDLER(文本包含(%))", 
-			n_trigger_code_eq: "触发器调度返回码(等于(=))", 
-		},
-		uiactions: {
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const JobsLog_en_US_OwnData = {};
+    const targetData = Object.assign(JobsLog_en_US_Base(), JobsLog_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file