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

app_web/public/assets/json/data-dictionary.json

  [
         {
-        "srfkey": "CLModel",
+        "srfkey": "CLMetric",
         "emptytext": "未定义",
         "codelisttype":"dynamic",
-        "appdataentity":"DABuild",
+        "appdataentity":"DAMetric",
         "appdedataset":"FetchDefault",
         "items": []
     }, 
@@ -234,6 +234,14 @@
             }
         ]
     }, 
+    {
+        "srfkey": "CLModel",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DABuild",
+        "appdedataset":"FetchDefault",
+        "items": []
+    }, 
     {
         "srfkey": "CLMetricType",
         "emptytext": "未定义",
@@ -336,14 +344,6 @@
             }
         ]
     }, 
-    {
-        "srfkey": "CLMetric",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"DAMetric",
-        "appdedataset":"FetchDefault",
-        "items": []
-    }, 
     {
         "srfkey": "CLRuleGroup",
         "emptytext": "",

app_web/src/authservice/auth-service-register.ts

@@ -50,11 +50,14 @@ export class AuthServiceRegister {
         this.allAuthService.set('dstdatasource', () => import('@/authservice/dst-data-source/dst-data-source-auth-service'));
         this.allAuthService.set('metafield', () => import('@/authservice/meta-field/meta-field-auth-service'));
         this.allAuthService.set('execlog', () => import('@/authservice/exec-log/exec-log-auth-service'));
+        this.allAuthService.set('dictcatalog', () => import('@/authservice/dict-catalog/dict-catalog-auth-service'));
         this.allAuthService.set('execresult', () => import('@/authservice/exec-result/exec-result-auth-service'));
         this.allAuthService.set('metarelationship', () => import('@/authservice/meta-relationship/meta-relationship-auth-service'));
         this.allAuthService.set('dametric', () => import('@/authservice/dametric/dametric-auth-service'));
+        this.allAuthService.set('tablesync', () => import('@/authservice/table-sync/table-sync-auth-service'));
         this.allAuthService.set('ruleengine', () => import('@/authservice/rule-engine/rule-engine-auth-service'));
         this.allAuthService.set('metaentity', () => import('@/authservice/meta-entity/meta-entity-auth-service'));
+        this.allAuthService.set('dictoption', () => import('@/authservice/dict-option/dict-option-auth-service'));
         this.allAuthService.set('metamodule', () => import('@/authservice/meta-module/meta-module-auth-service'));
         this.allAuthService.set('metamodel', () => import('@/authservice/meta-model/meta-model-auth-service'));
     }

app_web/src/authservice/dict-catalog/dict-catalog-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 字典权限服务对象基类
+ *
+ * @export
+ * @class DictCatalogAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class DictCatalogAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  DictCatalogAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  DictCatalogAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof DictCatalogAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_web/src/authservice/dict-catalog/dict-catalog-auth-service.ts

+import DictCatalogAuthServiceBase from './dict-catalog-auth-service-base';
+
+
+/**
+ * 字典权限服务对象
+ *
+ * @export
+ * @class DictCatalogAuthService
+ * @extends {DictCatalogAuthServiceBase}
+ */
+export default class DictCatalogAuthService extends DictCatalogAuthServiceBase {
+
+    /**
+     * Creates an instance of  DictCatalogAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  DictCatalogAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_web/src/authservice/dict-option/dict-option-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 字典项权限服务对象基类
+ *
+ * @export
+ * @class DictOptionAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class DictOptionAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  DictOptionAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  DictOptionAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof DictOptionAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_web/src/authservice/dict-option/dict-option-auth-service.ts

+import DictOptionAuthServiceBase from './dict-option-auth-service-base';
+
+
+/**
+ * 字典项权限服务对象
+ *
+ * @export
+ * @class DictOptionAuthService
+ * @extends {DictOptionAuthServiceBase}
+ */
+export default class DictOptionAuthService extends DictOptionAuthServiceBase {
+
+    /**
+     * Creates an instance of  DictOptionAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  DictOptionAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_web/src/authservice/table-sync/table-sync-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * ETL表同步权限服务对象基类
+ *
+ * @export
+ * @class TableSyncAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class TableSyncAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  TableSyncAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  TableSyncAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof TableSyncAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_web/src/authservice/table-sync/table-sync-auth-service.ts

+import TableSyncAuthServiceBase from './table-sync-auth-service-base';
+
+
+/**
+ * ETL表同步权限服务对象
+ *
+ * @export
+ * @class TableSyncAuthService
+ * @extends {TableSyncAuthServiceBase}
+ */
+export default class TableSyncAuthService extends TableSyncAuthServiceBase {
+
+    /**
+     * Creates an instance of  TableSyncAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  TableSyncAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_web/src/codelist/codelist-register.ts

@@ -39,8 +39,8 @@ export class CodeListRegister {
      * @memberof CodeListRegister
      */
     protected init(): void {
-            this.allCodeList.set('CLModel', () => import('@/codelist/clmodel'));
-        this.allCodeList.set('CLMetric', () => import('@/codelist/clmetric'));
+            this.allCodeList.set('CLMetric', () => import('@/codelist/clmetric'));
+        this.allCodeList.set('CLModel', () => import('@/codelist/clmodel'));
         this.allCodeList.set('CLRuleGroup', () => import('@/codelist/clrule-group'));
     }
 

app_web/src/components/app-data-upload/app-data-upload.vue

@@ -52,6 +52,7 @@ import CodeListService from "@/codelist/codelist-service";
 import EntityService from '@/service/entity-service';
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { Environment } from '@/environments/environment';
+import moment from "moment"; 
 
 @Component({
 })
@@ -395,11 +396,11 @@ export default class AppDataUploadView extends Vue {
        let reader = new FileReader();
        reader.onload = (e:any) => {
            let data = e.target.result;
-           this.workBookData = XLSX.read(data, {type: 'binary'});
+           this.workBookData = XLSX.read(data, {type: 'binary',cellDates: true});
            let xlsxData = XLSX.utils.sheet_to_json(this.workBookData.Sheets[this.workBookData.SheetNames[0]]);
            let list1 = this.getFirstRow(this.workBookData);
            xlsxData = this.AddXlsxData(xlsxData, list1);
-           this.importDataArray = JSON.parse(JSON.stringify(xlsxData));
+           this.importDataArray = this.$util.deepCopy(xlsxData);
            (this.$refs.inputUpLoad as any).value = '';
        };
        reader.readAsBinaryString(f);
@@ -505,6 +506,11 @@ export default class AppDataUploadView extends Vue {
         data.forEach((item:any) =>{
             let curObject:any = {};
             Object.keys(item).forEach((ele:any) => {
+                // todo XLSX读取时间为国际时间(东8区)+8H转为标准时间
+                if (item[ele] instanceof Date){
+                    const tempDate:Date = item[ele];
+                    item[ele] = moment(tempDate).add(8, 'h').format("YYYY-MM-DD HH:mm:ss");
+                }
                 if(this.allFieldMap.get(ele).codelist){
                     let codelistTag:string = this.allFieldMap.get(ele).codelist.tag;
                      let codelistIsNumber:boolean = this.allFieldMap.get(ele).codelist.isnumber;

app_web/src/components/app-message-popover/app-message-popover.vue

@@ -84,140 +84,142 @@
 </template>
 
 <script lang="ts">
-    import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator";
-    import {Subject} from "rxjs";
-    import {Environment} from '@/environments/environment';
-    import moment from 'moment';
+import {Vue, Component, Prop, Model, Emit} from "vue-property-decorator";
+import {Environment} from '@/environments/environment';
+import moment from 'moment';
 
-    @Component({})
-    export default class AppMessagePopover extends Vue {
+@Component({})
+export default class AppMessagePopover extends Vue {
 
-        // 是否显示小圆点
-        public showIsDot: any = false;
-        // 默认显示的tab页
-        public default_tab_pane: any = "first";
-        // 待办列表
-        public myTasks: any = [];
-        // 待办面板标签
-        public myTasksLabel: any = "待办";
-        //  待办面板显示条数
-        public taskShowCnt:number = 0;
-        // 消息列表
-        public myMsgs: any = [];
-        // 消息面板标签
-        public myMsgsLabel: any = "消息";
-        //  信息面板显示条数
-        public msgShowCnt:number = 0;
+    // 是否显示小圆点
+    public showIsDot: any = false;
+    // 默认显示的tab页
+    public default_tab_pane: any = "first";
+    // 待办列表
+    public myTasks: any = [];
+    // 待办面板标签
+    public myTasksLabel: any = "待办";
+    //  待办面板显示条数
+    public taskShowCnt:number = 0;
+    // 消息列表
+    public myMsgs: any = [];
+    // 消息面板标签
+    public myMsgsLabel: any = "消息";
+    //  信息面板显示条数
+    public msgShowCnt:number = 0;
 
-        /**
-         * vue创建
-         */
-        created(): void {}
+    /**
+     * vue创建
+     */
+    created(): void {}
 
-        /**
-         * vue挂载
-         */
-        mounted(): void {
-            // 首次获取待办列表
-            this.getMyTasks();
-            // 定时器:每隔１分钟重新获取待办列表
-            const timer = setInterval(()=>{
-                this.getMyTasks();
-            },60000);
-            // 监听定时器,在vue销毁前清除定时器
-            this.$once('hook:beforeDestroy',()=>{
-                // 清除定时器
-                clearInterval(timer);
-            });
+    /**
+     * vue挂载
+     */
+    mounted(): void {
+        if(!Environment.workflow){
+            return;
         }
+        // 首次获取待办列表
+        this.getMyTasks();
+        // 定时器:每隔１分钟重新获取待办列表
+        const timer = setInterval(()=>{
+            this.getMyTasks();
+        },60000);
+        // 监听定时器,在vue销毁前清除定时器
+        this.$once('hook:beforeDestroy',()=>{
+            // 清除定时器
+            clearInterval(timer);
+        });
+    }
 
-        /**
-         * 获取待办列表
-         */
-        public getMyTasks() {
-            let url: any = '/wfcore/mytasks';
-            this.$http.get(url).then((response: any) => {
-                if (response && response.status == 200) {
-                    const data: any = response.data;
-                    if (data && data.length > 0) {
-                        this.myTasks = data;
-                        this.showIsDot = true;
-                    } else {
-                        this.myTasks = [];
-                    }
-                    // 获取消息列表
-                    this.getMyMsgs();
+    /**
+     * 获取待办列表
+     */
+    public getMyTasks() {
+        let url: any = '/wfcore/mytasks';
+        this.$http.get(url).then((response: any) => {
+            if (response && response.status == 200) {
+                const data: any = response.data;
+                if (data && data.length > 0) {
+                    this.myTasks = data;
+                    this.showIsDot = true;
+                } else {
+                    this.myTasks = [];
                 }
-            }).catch((error: any) => {
-                console.warn("加载数据错误");
-            })
-        }
-
-        /**
-         * 获取消息列表
-         */
-        public getMyMsgs(){
-            // TODO:接口获取消息列表，这里用的待办数据
-            this.myMsgs = this.myTasks;
-            if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
-                // 显示小圆点
-                this.showIsDot = true;
+                // 获取消息列表
+                this.getMyMsgs();
             }
-        }
+        }).catch((error: any) => {
+            console.warn("加载数据错误");
+        })
+    }
 
-        /**
-         * 点击标签事件
-         */
-        public handleTag(data: any) {
-            if (!data)  return this.$message.error("未获取到标签内容");
-            // 拼接要打开的窗口地址
-            const baseUrl:any = Environment.BaseUrl;
-            const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`;
-            // 打开新窗口
-            window.open(openUrl,'_blank');
+    /**
+     * 获取消息列表
+     */
+    public getMyMsgs(){
+        // TODO:接口获取消息列表，这里用的待办数据
+        this.myMsgs = this.myTasks;
+        if (this.myMsgs.length > 0 && this.myTasks.length == 0) {
+            // 显示小圆点
+            this.showIsDot = true;
         }
+    }
 
-        /**
-         * 销毁之前
-         */
-        beforeDestroy(): void {
-            // 清空数据
-            this.showIsDot = false;
-            this.myTasks = [];
-            this.myMsgs = [];
-        }
+    /**
+     * 点击标签事件
+     */
+    public handleTag(data: any) {
+        if (!data)  return this.$message.error("未获取到标签内容");
+        // 拼接要打开的窗口地址
+        const baseUrl:any = Environment.BaseUrl;
+        const openUrl:any = baseUrl + `/wfcore/mytasks/${data.processDefinitionKey}/web/${data.processInstanceBusinessKey}/usertasks/${data.taskDefinitionKey}`;
+        // 打开新窗口
+        window.open(openUrl,'_blank');
+    }
 
-        /**
-         * 时间格式转换
-         */
-        public formatDate(date: string, format: string) {
-            if(date && format) {
-                return moment(date).format(format);
-            }
-            return date;
-        }
+    /**
+     * 销毁之前
+     */
+    beforeDestroy(): void {
+        // 清空数据
+        this.showIsDot = false;
+        this.myTasks = [];
+        this.myMsgs = [];
+    }
 
-        /**
-         * 加载更多
-         */
-        public showMore(cnt: string) {
-            if(Object.is('taskShowCnt', cnt)) {
-                this.taskShowCnt + 10 < this.myTasks.length ? this.taskShowCnt += 10 : this.taskShowCnt += this.myTasks.length-this.taskShowCnt;
-            }
-            if(Object.is('msgShowCnt', cnt)) {
-                this.msgShowCnt + 10 < this.myMsgs.length ? this.msgShowCnt += 10 : this.msgShowCnt += this.myMsgs.length-this.msgShowCnt;
-            }
+    /**
+     * 时间格式转换
+     */
+    public formatDate(date: string, format: string) {
+        if(date && format) {
+            return moment(date).format(format);
         }
+        return date;
+    }
 
-        /**
-         * 弹出框 显示/隐藏 时显示条数初始化
-         */
-        public initTabCnt() {
-            this.taskShowCnt = this.myTasks.length >= 10 ? 10 : this.myTasks.length;
-            this.msgShowCnt = this.myMsgs.length >= 10 ? 10 : this.myMsgs.length;
+    /**
+     * 加载更多
+     */
+    public showMore(cnt: string) {
+        if(Object.is('taskShowCnt', cnt)) {
+            this.taskShowCnt + 10 < this.myTasks.length ? this.taskShowCnt += 10 : this.taskShowCnt += this.myTasks.length-this.taskShowCnt;
+        }
+        if(Object.is('msgShowCnt', cnt)) {
+            this.msgShowCnt + 10 < this.myMsgs.length ? this.msgShowCnt += 10 : this.msgShowCnt += this.myMsgs.length-this.msgShowCnt;
         }
+    }
 
+    /**
+     * 弹出框 显示/隐藏 时显示条数初始化
+     */
+    public initTabCnt() {
+        this.taskShowCnt = this.myTasks.length >= 10 ? 10 : this.myTasks.length;
+        this.msgShowCnt = this.myMsgs.length >= 10 ? 10 : this.myMsgs.length;
     }
+
+}
 </script>
 
 <style lang='less'>

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -12,8 +12,8 @@
             :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="placeholder?placeholder:$t('components.dropDownListMpicker.placeholder')">
-            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value.toString()" :label="item.text">
-            <Checkbox :value = "(currentVal.indexOf(item.value.toString()))==-1?false:true">
+            <i-option v-for="(item, index) in items" :key="index" :class="item.class" :value="item.value ? item.value.toString():''" :label="item.text">
+            <Checkbox :value="(currentVal.indexOf(item.value ? item.value.toString() : '')) == -1 ? false : true">
                 {{Object.is(codelistType,'STATIC') ? $t('codelist.'+tag+'.'+item.value) : item.text}}
             </Checkbox>
             </i-option>

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

@@ -394,7 +394,9 @@ export default class DropDownList extends Vue {
                     if(type === 'number'){
                         item.value = item.value.toString();
                     }else{
-                        if(item.value.indexOf('.') == -1){
+                        if(type == "null") {
+                            this.valueType == "number" ? item.value = 0 : item.value = '';
+                        }else if(item.value.indexOf('.') == -1){
                             item.value = parseInt(item.value);
                         }else{
                             item.value = parseFloat(item.value);

app_web/src/environments/environment.ts

@@ -45,6 +45,8 @@ export const Environment = {
     ibizlabtUrl: 'https://www.ibizlab.cn',
     // ibiz论坛地址
     ibizbbstUrl: 'https://bbs.ibizlab.cn',
+    // 是否启用工作流
+    workflow: false,
 };
 // 挂载外部配置文件
 if ((window as any).Environment) {

app_web/src/locale/lang/BO-CN-base.ts

@@ -9,11 +9,14 @@ import dabuild_BO_CN from '@locale/lanres/entities/dabuild/dabuild_BO_CN';
 import dstdatasource_BO_CN from '@locale/lanres/entities/dst-data-source/dst-data-source_BO_CN';
 import metafield_BO_CN from '@locale/lanres/entities/meta-field/meta-field_BO_CN';
 import execlog_BO_CN from '@locale/lanres/entities/exec-log/exec-log_BO_CN';
+import dictcatalog_BO_CN from '@locale/lanres/entities/dict-catalog/dict-catalog_BO_CN';
 import execresult_BO_CN from '@locale/lanres/entities/exec-result/exec-result_BO_CN';
 import metarelationship_BO_CN from '@locale/lanres/entities/meta-relationship/meta-relationship_BO_CN';
 import dametric_BO_CN from '@locale/lanres/entities/dametric/dametric_BO_CN';
+import tablesync_BO_CN from '@locale/lanres/entities/table-sync/table-sync_BO_CN';
 import ruleengine_BO_CN from '@locale/lanres/entities/rule-engine/rule-engine_BO_CN';
 import metaentity_BO_CN from '@locale/lanres/entities/meta-entity/meta-entity_BO_CN';
+import dictoption_BO_CN from '@locale/lanres/entities/dict-option/dict-option_BO_CN';
 import metamodule_BO_CN from '@locale/lanres/entities/meta-module/meta-module_BO_CN';
 import metamodel_BO_CN from '@locale/lanres/entities/meta-model/meta-model_BO_CN';
 import components_BO_CN from '@locale/lanres/components/components_BO_CN';
@@ -149,6 +152,8 @@ function getAppLocale(){
                     menuitem14: commonLogic.appcommonhandle("系统",null),
                     menuitem1: commonLogic.appcommonhandle("实体",null),
                     menuitem9: commonLogic.appcommonhandle("模型",null),
+                    menuitem15: commonLogic.appcommonhandle("同步",null),
+                    menuitem16: commonLogic.appcommonhandle("字典",null),
                     menuitem4: commonLogic.appcommonhandle("规则",null),
                     menuitem10: commonLogic.appcommonhandle("规则",null),
                     menuitem11: commonLogic.appcommonhandle("引擎",null),
@@ -263,11 +268,14 @@ function getAppLocale(){
             dstdatasource: dstdatasource_BO_CN(),
             metafield: metafield_BO_CN(),
             execlog: execlog_BO_CN(),
+            dictcatalog: dictcatalog_BO_CN(),
             execresult: execresult_BO_CN(),
             metarelationship: metarelationship_BO_CN(),
             dametric: dametric_BO_CN(),
+            tablesync: tablesync_BO_CN(),
             ruleengine: ruleengine_BO_CN(),
             metaentity: metaentity_BO_CN(),
+            dictoption: dictoption_BO_CN(),
             metamodule: metamodule_BO_CN(),
             metamodel: metamodel_BO_CN(),
         },

app_web/src/locale/lang/en-US-base.ts

@@ -9,11 +9,14 @@ import dabuild_en_US from '@locale/lanres/entities/dabuild/dabuild_en_US';
 import dstdatasource_en_US from '@locale/lanres/entities/dst-data-source/dst-data-source_en_US';
 import metafield_en_US from '@locale/lanres/entities/meta-field/meta-field_en_US';
 import execlog_en_US from '@locale/lanres/entities/exec-log/exec-log_en_US';
+import dictcatalog_en_US from '@locale/lanres/entities/dict-catalog/dict-catalog_en_US';
 import execresult_en_US from '@locale/lanres/entities/exec-result/exec-result_en_US';
 import metarelationship_en_US from '@locale/lanres/entities/meta-relationship/meta-relationship_en_US';
 import dametric_en_US from '@locale/lanres/entities/dametric/dametric_en_US';
+import tablesync_en_US from '@locale/lanres/entities/table-sync/table-sync_en_US';
 import ruleengine_en_US from '@locale/lanres/entities/rule-engine/rule-engine_en_US';
 import metaentity_en_US from '@locale/lanres/entities/meta-entity/meta-entity_en_US';
+import dictoption_en_US from '@locale/lanres/entities/dict-option/dict-option_en_US';
 import metamodule_en_US from '@locale/lanres/entities/meta-module/meta-module_en_US';
 import metamodel_en_US from '@locale/lanres/entities/meta-model/meta-model_en_US';
 import components_en_US from '@locale/lanres/components/components_en_US';
@@ -149,6 +152,8 @@ function getAppLocale(){
                     menuitem14: commonLogic.appcommonhandle("系统",null),
                     menuitem1: commonLogic.appcommonhandle("实体",null),
                     menuitem9: commonLogic.appcommonhandle("模型",null),
+                    menuitem15: commonLogic.appcommonhandle("同步",null),
+                    menuitem16: commonLogic.appcommonhandle("字典",null),
                     menuitem4: commonLogic.appcommonhandle("规则",null),
                     menuitem10: commonLogic.appcommonhandle("规则",null),
                     menuitem11: commonLogic.appcommonhandle("引擎",null),
@@ -264,11 +269,14 @@ function getAppLocale(){
             dstdatasource: dstdatasource_en_US(),
             metafield: metafield_en_US(),
             execlog: execlog_en_US(),
+            dictcatalog: dictcatalog_en_US(),
             execresult: execresult_en_US(),
             metarelationship: metarelationship_en_US(),
             dametric: dametric_en_US(),
+            tablesync: tablesync_en_US(),
             ruleengine: ruleengine_en_US(),
             metaentity: metaentity_en_US(),
+            dictoption: dictoption_en_US(),
             metamodule: metamodule_en_US(),
             metamodel: metamodel_en_US(),
         },

app_web/src/locale/lang/zh-CN-base.ts

@@ -9,11 +9,14 @@ import dabuild_zh_CN from '@locale/lanres/entities/dabuild/dabuild_zh_CN';
 import dstdatasource_zh_CN from '@locale/lanres/entities/dst-data-source/dst-data-source_zh_CN';
 import metafield_zh_CN from '@locale/lanres/entities/meta-field/meta-field_zh_CN';
 import execlog_zh_CN from '@locale/lanres/entities/exec-log/exec-log_zh_CN';
+import dictcatalog_zh_CN from '@locale/lanres/entities/dict-catalog/dict-catalog_zh_CN';
 import execresult_zh_CN from '@locale/lanres/entities/exec-result/exec-result_zh_CN';
 import metarelationship_zh_CN from '@locale/lanres/entities/meta-relationship/meta-relationship_zh_CN';
 import dametric_zh_CN from '@locale/lanres/entities/dametric/dametric_zh_CN';
+import tablesync_zh_CN from '@locale/lanres/entities/table-sync/table-sync_zh_CN';
 import ruleengine_zh_CN from '@locale/lanres/entities/rule-engine/rule-engine_zh_CN';
 import metaentity_zh_CN from '@locale/lanres/entities/meta-entity/meta-entity_zh_CN';
+import dictoption_zh_CN from '@locale/lanres/entities/dict-option/dict-option_zh_CN';
 import metamodule_zh_CN from '@locale/lanres/entities/meta-module/meta-module_zh_CN';
 import metamodel_zh_CN from '@locale/lanres/entities/meta-model/meta-model_zh_CN';
 import components_zh_CN from '@locale/lanres/components/components_zh_CN';
@@ -149,6 +152,8 @@ function getAppLocale(){
                     menuitem14: commonLogic.appcommonhandle("系统",null),
                     menuitem1: commonLogic.appcommonhandle("实体",null),
                     menuitem9: commonLogic.appcommonhandle("模型",null),
+                    menuitem15: commonLogic.appcommonhandle("同步",null),
+                    menuitem16: commonLogic.appcommonhandle("字典",null),
                     menuitem4: commonLogic.appcommonhandle("规则",null),
                     menuitem10: commonLogic.appcommonhandle("规则",null),
                     menuitem11: commonLogic.appcommonhandle("引擎",null),
@@ -263,11 +268,14 @@ function getAppLocale(){
             dstdatasource: dstdatasource_zh_CN(),
             metafield: metafield_zh_CN(),
             execlog: execlog_zh_CN(),
+            dictcatalog: dictcatalog_zh_CN(),
             execresult: execresult_zh_CN(),
             metarelationship: metarelationship_zh_CN(),
             dametric: dametric_zh_CN(),
+            tablesync: tablesync_zh_CN(),
             ruleengine: ruleengine_zh_CN(),
             metaentity: metaentity_zh_CN(),
+            dictoption: dictoption_zh_CN(),
             metamodule: metamodule_zh_CN(),
             metamodel: metamodel_zh_CN(),
         },

app_web/src/locale/lanres/codelist/codelist_BO_CN_base.ts

@@ -2,7 +2,7 @@ import commonLogic from '@/locale/logic/common/common-logic';
 
 function getLocaleResourceBase(){
   const data:any = {
-      CLModel: {
+      CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
       OPCond: {
@@ -28,6 +28,9 @@ function getLocaleResourceBase(){
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
+      CLModel: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),
@@ -42,9 +45,6 @@ function getLocaleResourceBase(){
           "0": commonLogic.appcommonhandle("否",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
-      CLMetric: {
-          "empty": commonLogic.appcommonhandle("",null),
-      },
       CLRuleGroup: {
           "empty": commonLogic.appcommonhandle("",null),
       },

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

@@ -2,7 +2,7 @@ import commonLogic from '@/locale/logic/common/common-logic';
 
 function getLocaleResourceBase(){
   const data:any = {
-      CLModel: {
+      CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
       OPCond: {
@@ -28,6 +28,9 @@ function getLocaleResourceBase(){
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
+      CLModel: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),
@@ -42,9 +45,6 @@ function getLocaleResourceBase(){
           "0": commonLogic.appcommonhandle("否",null),
           "empty": commonLogic.appcommonhandle("",null)
       },
-      CLMetric: {
-          "empty": commonLogic.appcommonhandle("",null),
-      },
       CLRuleGroup: {
           "empty": commonLogic.appcommonhandle("",null),
       },

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

@@ -2,7 +2,7 @@ import commonLogic from '@/locale/logic/common/common-logic';
 
 function getLocaleResourceBase(){
   const data:any = {
-      CLModel: {
+      CLMetric: {
           "empty": commonLogic.appcommonhandle("",null),
       },
       OPCond: {
@@ -28,6 +28,9 @@ function getLocaleResourceBase(){
           "NOTINC2S": commonLogic.appcommonhandle("NOTINC2S",null),
           "empty": commonLogic.appcommonhandle("",null),
       },
+      CLModel: {
+          "empty": commonLogic.appcommonhandle("",null),
+      },
       CLMetricType: {
           "COUNT": commonLogic.appcommonhandle("COUNT",null),
           "COUNT_DISTINCT": commonLogic.appcommonhandle("COUNT_DISTINCT",null),
@@ -42,9 +45,6 @@ function getLocaleResourceBase(){
           "0": commonLogic.appcommonhandle("否",null),
           "empty": commonLogic.appcommonhandle("",null),
       },
-      CLMetric: {
-          "empty": commonLogic.appcommonhandle("",null),
-      },
       CLRuleGroup: {
           "empty": commonLogic.appcommonhandle("",null),
       },

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("图表",null),
-				title: commonLogic.appcommonhandle("图表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("图表",null),
 				title: commonLogic.appcommonhandle("图表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("图表",null),
-				title: commonLogic.appcommonhandle("图表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("图表",null),
 				title: commonLogic.appcommonhandle("图表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("图表",null),
-				title: commonLogic.appcommonhandle("图表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("图表",null),
 				title: commonLogic.appcommonhandle("图表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("图表",null),
+				title: commonLogic.appcommonhandle("图表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -18,14 +18,14 @@ function getLocaleResourceBase(){
 		updatedate: commonLogic.appcommonhandle("更新时间",null),
 	},
 		views: {
-			gridview: {
-				caption: commonLogic.appcommonhandle("指标",null),
-				title: commonLogic.appcommonhandle("指标表格视图",null),
-			},
 			editview: {
 				caption: commonLogic.appcommonhandle("指标",null),
 				title: commonLogic.appcommonhandle("指标编辑视图",null),
 			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("指标",null),
+				title: commonLogic.appcommonhandle("指标表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -18,14 +18,14 @@ function getLocaleResourceBase(){
 		updatedate: commonLogic.appcommonhandle("更新时间",null),
 	},
 		views: {
-			gridview: {
-				caption: commonLogic.appcommonhandle("指标",null),
-				title: commonLogic.appcommonhandle("指标表格视图",null),
-			},
 			editview: {
 				caption: commonLogic.appcommonhandle("指标",null),
 				title: commonLogic.appcommonhandle("指标编辑视图",null),
 			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("指标",null),
+				title: commonLogic.appcommonhandle("指标表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -18,14 +18,14 @@ function getLocaleResourceBase(){
 		updatedate: commonLogic.appcommonhandle("更新时间",null),
 	},
 		views: {
-			gridview: {
-				caption: commonLogic.appcommonhandle("指标",null),
-				title: commonLogic.appcommonhandle("指标表格视图",null),
-			},
 			editview: {
 				caption: commonLogic.appcommonhandle("指标",null),
 				title: commonLogic.appcommonhandle("指标编辑视图",null),
 			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("指标",null),
+				title: commonLogic.appcommonhandle("指标表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("报表",null),
-				title: commonLogic.appcommonhandle("报表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("报表",null),
 				title: commonLogic.appcommonhandle("报表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("报表",null),
+				title: commonLogic.appcommonhandle("报表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("报表",null),
-				title: commonLogic.appcommonhandle("报表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("报表",null),
 				title: commonLogic.appcommonhandle("报表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("报表",null),
+				title: commonLogic.appcommonhandle("报表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -11,14 +11,14 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("报表",null),
-				title: commonLogic.appcommonhandle("报表编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("报表",null),
 				title: commonLogic.appcommonhandle("报表表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("报表",null),
+				title: commonLogic.appcommonhandle("报表编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

+import DictCatalog_BO_CN_Base from './dict-catalog_BO_CN_base';
+
+function getLocaleResource(){
+    const DictCatalog_BO_CN_OwnData = {};
+    const targetData = Object.assign(DictCatalog_BO_CN_Base(), DictCatalog_BO_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/dict-catalog/dict-catalog_BO_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),
+		createdate: 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),
+			},
+			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

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

+import DictCatalog_en_US_Base from './dict-catalog_en_US_base';
+
+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),
+		createdate: 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),
+			},
+			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

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

+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),
+		createdate: 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),
+			},
+			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

app_web/src/locale/lanres/entities/dict-option/dict-option_BO_CN.ts

+import DictOption_BO_CN_Base from './dict-option_BO_CN_base';
+
+function getLocaleResource(){
+    const DictOption_BO_CN_OwnData = {};
+    const targetData = Object.assign(DictOption_BO_CN_Base(), DictOption_BO_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/dict-option/dict-option_BO_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),
+		createdate: commonLogic.appcommonhandle("创建时间",null),
+	},
+		views: {
+			editview: {
+				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: {
+			},
+		},
+		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: {
+			},
+		},
+		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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem2: {
+				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';
+
+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),
+		createdate: commonLogic.appcommonhandle("创建时间",null),
+	},
+		views: {
+			editview: {
+				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: {
+			},
+		},
+		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: {
+			},
+		},
+		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),
+			},
+		},
+		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),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

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

+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),
+		createdate: commonLogic.appcommonhandle("创建时间",null),
+	},
+		views: {
+			editview: {
+				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: {
+			},
+		},
+		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: {
+			},
+		},
+		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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem2: {
+				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/exec-result/exec-result_BO_CN_base.ts

@@ -12,10 +12,10 @@ function getLocaleResourceBase(){
 		key_value_field: commonLogic.appcommonhandle("标识属性",null),
 		domains_field: commonLogic.appcommonhandle("分区字段",null),
 		time_field: commonLogic.appcommonhandle("时间属性",null),
-		createdate: commonLogic.appcommonhandle("建立时间",null),
 		dim_field: commonLogic.appcommonhandle("维度属性",null),
-		updatedate: commonLogic.appcommonhandle("更新时间",null),
+		createdate: commonLogic.appcommonhandle("建立时间",null),
 		metric_field: commonLogic.appcommonhandle("指标属性",null),
+		updatedate: commonLogic.appcommonhandle("更新时间",null),
 		ext1_field: commonLogic.appcommonhandle("扩展属性1",null),
 		ext2_field: commonLogic.appcommonhandle("扩展属性2",null),
 		system_id: commonLogic.appcommonhandle("系统标识",null),

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

@@ -12,10 +12,10 @@ function getLocaleResourceBase(){
 		key_value_field: commonLogic.appcommonhandle("标识属性",null),
 		domains_field: commonLogic.appcommonhandle("分区字段",null),
 		time_field: commonLogic.appcommonhandle("时间属性",null),
-		createdate: commonLogic.appcommonhandle("建立时间",null),
 		dim_field: commonLogic.appcommonhandle("维度属性",null),
-		updatedate: commonLogic.appcommonhandle("更新时间",null),
+		createdate: commonLogic.appcommonhandle("建立时间",null),
 		metric_field: commonLogic.appcommonhandle("指标属性",null),
+		updatedate: commonLogic.appcommonhandle("更新时间",null),
 		ext1_field: commonLogic.appcommonhandle("扩展属性1",null),
 		ext2_field: commonLogic.appcommonhandle("扩展属性2",null),
 		system_id: commonLogic.appcommonhandle("系统标识",null),

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

@@ -12,10 +12,10 @@ function getLocaleResourceBase(){
 		key_value_field: commonLogic.appcommonhandle("标识属性",null),
 		domains_field: commonLogic.appcommonhandle("分区字段",null),
 		time_field: commonLogic.appcommonhandle("时间属性",null),
-		createdate: commonLogic.appcommonhandle("建立时间",null),
 		dim_field: commonLogic.appcommonhandle("维度属性",null),
-		updatedate: commonLogic.appcommonhandle("更新时间",null),
+		createdate: commonLogic.appcommonhandle("建立时间",null),
 		metric_field: commonLogic.appcommonhandle("指标属性",null),
+		updatedate: commonLogic.appcommonhandle("更新时间",null),
 		ext1_field: commonLogic.appcommonhandle("扩展属性1",null),
 		ext2_field: commonLogic.appcommonhandle("扩展属性2",null),
 		system_id: commonLogic.appcommonhandle("系统标识",null),

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

@@ -30,14 +30,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型编辑视图",null),
 			},
-			importfile: {
-				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
-				title: commonLogic.appcommonhandle("模型实体导入文件",null),
-			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型数据多项选择视图",null),
 			},
+			importfile: {
+				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
+				title: commonLogic.appcommonhandle("模型实体导入文件",null),
+			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型表格视图",null),

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

@@ -30,14 +30,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型编辑视图",null),
 			},
-			importfile: {
-				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
-				title: commonLogic.appcommonhandle("模型实体导入文件",null),
-			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型数据多项选择视图",null),
 			},
+			importfile: {
+				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
+				title: commonLogic.appcommonhandle("模型实体导入文件",null),
+			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型表格视图",null),

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

@@ -30,14 +30,14 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型编辑视图",null),
 			},
-			importfile: {
-				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
-				title: commonLogic.appcommonhandle("模型实体导入文件",null),
-			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型数据多项选择视图",null),
 			},
+			importfile: {
+				caption: commonLogic.appcommonhandle("模型实体导入文件",null),
+				title: commonLogic.appcommonhandle("模型实体导入文件",null),
+			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("模型",null),
 				title: commonLogic.appcommonhandle("模型表格视图",null),

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

@@ -16,14 +16,14 @@ function getLocaleResourceBase(){
 		ext_params: commonLogic.appcommonhandle("扩展参数",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("规则引擎",null),
-				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("规则引擎",null),
 				title: commonLogic.appcommonhandle("规则引擎表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("规则引擎",null),
+				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -16,14 +16,14 @@ function getLocaleResourceBase(){
 		ext_params: commonLogic.appcommonhandle("扩展参数",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("规则引擎",null),
-				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("规则引擎",null),
 				title: commonLogic.appcommonhandle("规则引擎表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("规则引擎",null),
+				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -16,14 +16,14 @@ function getLocaleResourceBase(){
 		ext_params: commonLogic.appcommonhandle("扩展参数",null),
 	},
 		views: {
-			editview: {
-				caption: commonLogic.appcommonhandle("规则引擎",null),
-				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
-			},
 			gridview: {
 				caption: commonLogic.appcommonhandle("规则引擎",null),
 				title: commonLogic.appcommonhandle("规则引擎表格视图",null),
 			},
+			editview: {
+				caption: commonLogic.appcommonhandle("规则引擎",null),
+				title: commonLogic.appcommonhandle("规则引擎编辑视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -20,26 +20,26 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			gridview: {
+			editview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则表格视图",null),
+				title: commonLogic.appcommonhandle("规则编辑视图",null),
 			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据选择视图",null),
 			},
-			pickupgridview: {
-				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则选择表格视图",null),
-			},
-			editview: {
+			gridview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则编辑视图",null),
+				title: commonLogic.appcommonhandle("规则表格视图",null),
 			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据多项选择视图",null),
 			},
+			pickupgridview: {
+				caption: commonLogic.appcommonhandle("规则",null),
+				title: commonLogic.appcommonhandle("规则选择表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -20,26 +20,26 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			gridview: {
+			editview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则表格视图",null),
+				title: commonLogic.appcommonhandle("规则编辑视图",null),
 			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据选择视图",null),
 			},
-			pickupgridview: {
-				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则选择表格视图",null),
-			},
-			editview: {
+			gridview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则编辑视图",null),
+				title: commonLogic.appcommonhandle("规则表格视图",null),
 			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据多项选择视图",null),
 			},
+			pickupgridview: {
+				caption: commonLogic.appcommonhandle("规则",null),
+				title: commonLogic.appcommonhandle("规则选择表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

@@ -20,26 +20,26 @@ function getLocaleResourceBase(){
 		system_id: commonLogic.appcommonhandle("系统标识",null),
 	},
 		views: {
-			gridview: {
+			editview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则表格视图",null),
+				title: commonLogic.appcommonhandle("规则编辑视图",null),
 			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据选择视图",null),
 			},
-			pickupgridview: {
-				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则选择表格视图",null),
-			},
-			editview: {
+			gridview: {
 				caption: commonLogic.appcommonhandle("规则",null),
-				title: commonLogic.appcommonhandle("规则编辑视图",null),
+				title: commonLogic.appcommonhandle("规则表格视图",null),
 			},
 			mpickupview: {
 				caption: commonLogic.appcommonhandle("规则",null),
 				title: commonLogic.appcommonhandle("规则数据多项选择视图",null),
 			},
+			pickupgridview: {
+				caption: commonLogic.appcommonhandle("规则",null),
+				title: commonLogic.appcommonhandle("规则选择表格视图",null),
+			},
 		},
 		main_form: {
 			details: {

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

+import TableSync_BO_CN_Base from './table-sync_BO_CN_base';
+
+function getLocaleResource(){
+    const TableSync_BO_CN_OwnData = {};
+    const targetData = Object.assign(TableSync_BO_CN_Base(), TableSync_BO_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("标识",null),
+		name: commonLogic.appcommonhandle("标题",null),
+		source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
+		source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
+		source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
+		source_expression: commonLogic.appcommonhandle("源数据表达式",null),
+		entity_id: commonLogic.appcommonhandle("目标实体标识",null),
+		entity_name: commonLogic.appcommonhandle("目标实体",null),
+		ds_id: commonLogic.appcommonhandle("目标数据源",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+		mapping_config: commonLogic.appcommonhandle("映射配置",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		run_order: commonLogic.appcommonhandle("排序",null),
+		run_cron: commonLogic.appcommonhandle("定时器cron",null),
+		etl_timestamp: commonLogic.appcommonhandle("时间戳",null),
+		last_run_time: commonLogic.appcommonhandle("上次运行开始时间",null),
+		last_end_time: commonLogic.appcommonhandle("上次运行结束时间",null),
+		last_run_result: commonLogic.appcommonhandle("上次运行结果",null),
+		last_read: commonLogic.appcommonhandle("上次运行读取行",null),
+		last_write: commonLogic.appcommonhandle("上次运行写入行",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("ETL表同步基本信息",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), 
+				syncid: commonLogic.appcommonhandle("标识",null), 
+				syncname: commonLogic.appcommonhandle("标题",null), 
+				syncgroup: commonLogic.appcommonhandle("分组",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
+				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
+				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
+				entityname: commonLogic.appcommonhandle("目标实体",null), 
+				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 
+				runorder: commonLogic.appcommonhandle("排序",null), 
+				runcron: commonLogic.appcommonhandle("定时器cron",null), 
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null), 
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null), 
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null), 
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null), 
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null), 
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null), 
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				syncname: commonLogic.appcommonhandle("标题",null),
+				syncgroup: commonLogic.appcommonhandle("分组",null),
+				runorder: commonLogic.appcommonhandle("排序",null),
+				entityname: commonLogic.appcommonhandle("目标实体",null),
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null),
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null),
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null),
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null),
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null),
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null),
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_syncname_like: commonLogic.appcommonhandle("标题(文本包含(%))",null), 
+				n_srcentityname_like: commonLogic.appcommonhandle("源实体名称(文本包含(%))",null), 
+				n_entityname_like: commonLogic.appcommonhandle("目标实体标识(文本包含(%))",null), 
+				n_lastrunresult_eq: 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),
+			},
+			deuiaction2: {
+				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

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

+import TableSync_en_US_Base from './table-sync_en_US_base';
+
+function getLocaleResource(){
+    const TableSync_en_US_OwnData = {};
+    const targetData = Object.assign(TableSync_en_US_Base(), TableSync_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/table-sync/table-sync_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),
+		source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
+		source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
+		source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
+		source_expression: commonLogic.appcommonhandle("源数据表达式",null),
+		entity_id: commonLogic.appcommonhandle("目标实体标识",null),
+		entity_name: commonLogic.appcommonhandle("目标实体",null),
+		ds_id: commonLogic.appcommonhandle("目标数据源",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+		mapping_config: commonLogic.appcommonhandle("映射配置",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		run_order: commonLogic.appcommonhandle("排序",null),
+		run_cron: commonLogic.appcommonhandle("定时器cron",null),
+		etl_timestamp: commonLogic.appcommonhandle("时间戳",null),
+		last_run_time: commonLogic.appcommonhandle("上次运行开始时间",null),
+		last_end_time: commonLogic.appcommonhandle("上次运行结束时间",null),
+		last_run_result: commonLogic.appcommonhandle("上次运行结果",null),
+		last_read: commonLogic.appcommonhandle("上次运行读取行",null),
+		last_write: commonLogic.appcommonhandle("上次运行写入行",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("ETL表同步基本信息",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), 
+				syncid: commonLogic.appcommonhandle("标识",null), 
+				syncname: commonLogic.appcommonhandle("标题",null), 
+				syncgroup: commonLogic.appcommonhandle("分组",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
+				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
+				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
+				entityname: commonLogic.appcommonhandle("目标实体",null), 
+				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 
+				runorder: commonLogic.appcommonhandle("排序",null), 
+				runcron: commonLogic.appcommonhandle("定时器cron",null), 
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null), 
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null), 
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null), 
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null), 
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null), 
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null), 
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				syncname: commonLogic.appcommonhandle("标题",null),
+				syncgroup: commonLogic.appcommonhandle("分组",null),
+				runorder: commonLogic.appcommonhandle("排序",null),
+				entityname: commonLogic.appcommonhandle("目标实体",null),
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null),
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null),
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null),
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null),
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null),
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null),
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_syncname_like: commonLogic.appcommonhandle("标题(文本包含(%))",null), 
+				n_srcentityname_like: commonLogic.appcommonhandle("源实体名称(文本包含(%))",null), 
+				n_entityname_like: commonLogic.appcommonhandle("目标实体标识(文本包含(%))",null), 
+				n_lastrunresult_eq: 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),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",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

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

+import TableSync_zh_CN_Base from './table-sync_zh_CN_base';
+
+function getLocaleResource(){
+    const TableSync_zh_CN_OwnData = {};
+    const targetData = Object.assign(TableSync_zh_CN_Base(), TableSync_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("标识",null),
+		name: commonLogic.appcommonhandle("标题",null),
+		source_entity_id: commonLogic.appcommonhandle("源实体标识",null),
+		source_entity_name: commonLogic.appcommonhandle("源实体名称",null),
+		source_ds_id: commonLogic.appcommonhandle("源实体数据源",null),
+		source_expression: commonLogic.appcommonhandle("源数据表达式",null),
+		entity_id: commonLogic.appcommonhandle("目标实体标识",null),
+		entity_name: commonLogic.appcommonhandle("目标实体",null),
+		ds_id: commonLogic.appcommonhandle("目标数据源",null),
+		system_id: commonLogic.appcommonhandle("系统标识",null),
+		mapping_config: commonLogic.appcommonhandle("映射配置",null),
+		group: commonLogic.appcommonhandle("分组",null),
+		run_order: commonLogic.appcommonhandle("排序",null),
+		run_cron: commonLogic.appcommonhandle("定时器cron",null),
+		etl_timestamp: commonLogic.appcommonhandle("时间戳",null),
+		last_run_time: commonLogic.appcommonhandle("上次运行开始时间",null),
+		last_end_time: commonLogic.appcommonhandle("上次运行结束时间",null),
+		last_run_result: commonLogic.appcommonhandle("上次运行结果",null),
+		last_read: commonLogic.appcommonhandle("上次运行读取行",null),
+		last_write: commonLogic.appcommonhandle("上次运行写入行",null),
+		updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("ETL表同步",null),
+				title: commonLogic.appcommonhandle("ETL表同步表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("ETL表同步基本信息",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), 
+				syncid: commonLogic.appcommonhandle("标识",null), 
+				syncname: commonLogic.appcommonhandle("标题",null), 
+				syncgroup: commonLogic.appcommonhandle("分组",null), 
+				systemid: commonLogic.appcommonhandle("系统标识",null), 
+				srcdsid: commonLogic.appcommonhandle("源实体数据源",null), 
+				srcentityid: commonLogic.appcommonhandle("源实体标识",null), 
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null), 
+				srcexp: commonLogic.appcommonhandle("源数据表达式",null), 
+				dsid: commonLogic.appcommonhandle("目标数据源",null), 
+				entityid: commonLogic.appcommonhandle("目标实体标识",null), 
+				entityname: commonLogic.appcommonhandle("目标实体",null), 
+				mappingcfg: commonLogic.appcommonhandle("映射配置",null), 
+				runorder: commonLogic.appcommonhandle("排序",null), 
+				runcron: commonLogic.appcommonhandle("定时器cron",null), 
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null), 
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null), 
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null), 
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null), 
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null), 
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null), 
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				syncname: commonLogic.appcommonhandle("标题",null),
+				syncgroup: commonLogic.appcommonhandle("分组",null),
+				runorder: commonLogic.appcommonhandle("排序",null),
+				entityname: commonLogic.appcommonhandle("目标实体",null),
+				srcentityname: commonLogic.appcommonhandle("源实体名称",null),
+				etltimestamp: commonLogic.appcommonhandle("时间戳",null),
+				lastrunresult: commonLogic.appcommonhandle("上次运行结果",null),
+				lastruntime: commonLogic.appcommonhandle("上次运行开始时间",null),
+				lastendtime: commonLogic.appcommonhandle("上次运行结束时间",null),
+				lastread: commonLogic.appcommonhandle("上次运行读取行",null),
+				lastwrite: commonLogic.appcommonhandle("上次运行写入行",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_syncname_like: commonLogic.appcommonhandle("标题(文本包含(%))",null), 
+				n_srcentityname_like: commonLogic.appcommonhandle("源实体名称(文本包含(%))",null), 
+				n_entityname_like: commonLogic.appcommonhandle("目标实体标识(文本包含(%))",null), 
+				n_lastrunresult_eq: 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),
+			},
+			deuiaction2: {
+				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

app_web/src/mock/app/dst-index-appmenu/dst-index-appmenu.ts

@@ -11,7 +11,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
         name: 'appmenu',
         items:  [
             {
-	id: 'FB7FCEEC-E119-40CA-9289-8F3DB7A8EAB6',
+	id: 'ea02fe6a8591138f0393bf1defd90aa0',
 	name: 'menuitem3',
 	text: '模型',
 	type: 'MENUITEM',
@@ -29,7 +29,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: '74a33204e965b655cae5e019a39cee5f',
+	id: '765f22c56a7f34e69232e3a9ebafa6ed',
 	name: 'menuitem2',
 	text: '数据源',
 	type: 'MENUITEM',
@@ -47,7 +47,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '36FFC4E0-AE22-4ECE-BA54-279C5AFB3442',
+	id: '093e1120800258595fd0e79f313d98c6',
 	name: 'menuitem14',
 	text: '系统',
 	type: 'MENUITEM',
@@ -65,7 +65,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: 'b9f1d604d37a54d51660aee235359816',
+	id: '8440526e47edfe59a78318369faa7cb6',
 	name: 'menuitem1',
 	text: '实体',
 	type: 'MENUITEM',
@@ -83,7 +83,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '79a83249232b5b664331e51872836aae',
+	id: 'cec0e6983bf01188e9f57b50930d6758',
 	name: 'menuitem9',
 	text: '模型',
 	type: 'MENUITEM',
@@ -99,11 +99,47 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: 'AppFunc9',
 	resourcetag: '',
+},
+		{
+	id: '8D525541-4B33-4CAF-8C03-CF02655CCE3D',
+	name: 'menuitem15',
+	text: '同步',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '同步',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc13',
+	resourcetag: '',
+},
+		{
+	id: '5D7C29BF-5EDC-43E6-8D7D-75FBAE31ACE9',
+	name: 'menuitem16',
+	text: '字典',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '字典',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc14',
+	resourcetag: '',
 },
 	],
 },
             {
-	id: '0699877D-7768-4E54-B4F3-FFBFE881C61D',
+	id: '2487b51e48ec6f08939715c67395c61f',
 	name: 'menuitem4',
 	text: '规则',
 	type: 'MENUITEM',
@@ -121,7 +157,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: 'C3D3BFAC-5B20-4CDE-AE38-4C13CA0E3B4B',
+	id: '94de025e0619949ae819e5bfa55ff693',
 	name: 'menuitem10',
 	text: '规则',
 	type: 'MENUITEM',
@@ -139,7 +175,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '2FAAE4AC-E26B-4547-A7B3-85CC7D3B47D6',
+	id: '72d3bb2c87f098f61bd94d4f5b493f90',
 	name: 'menuitem11',
 	text: '引擎',
 	type: 'MENUITEM',
@@ -157,7 +193,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '91318BCC-16F6-4C47-BDB9-D1A8D30D622B',
+	id: 'e311a6c443c63696d7e917523da1af76',
 	name: 'menuitem12',
 	text: '结果',
 	type: 'MENUITEM',
@@ -175,7 +211,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '7D22B9FE-F7A8-4198-ACB0-EFA8EC7CACA5',
+	id: '93f960468eaa7b76c603e7782da6e0db',
 	name: 'menuitem13',
 	text: '日志',
 	type: 'MENUITEM',
@@ -195,7 +231,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	],
 },
             {
-	id: '16E9D2F8-4584-426F-9503-BC35AF45BCE7',
+	id: '0dfa4d13fb6096447791f1672c4d2959',
 	name: 'menuitem5',
 	text: '分析',
 	type: 'MENUITEM',
@@ -213,7 +249,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 	items: [
 		{
-	id: 'CD376B73-4DA5-4328-A0FF-70C619BFBF59',
+	id: '654f43aaf2869dbb0d687d9f3c995322',
 	name: 'menuitem6',
 	text: '构建',
 	type: 'MENUITEM',
@@ -231,7 +267,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '45319624-52F4-48C9-A543-3760A8F72EDD',
+	id: 'c5695c96dbede4175152dd4b96b8274a',
 	name: 'menuitem7',
 	text: '报表',
 	type: 'MENUITEM',
@@ -249,7 +285,7 @@ mock.onGet('v7/dst-indexappmenu').reply((config: any) => {
 	resourcetag: '',
 },
 		{
-	id: '8C2A60A0-502A-4532-A1C1-9A5A5FFCC83B',
+	id: 'f6f6ee07056eb4673f5ff7454ee4c36c',
 	name: 'menuitem8',
 	text: '图表',
 	type: 'MENUITEM',

app_web/src/mock/codelist/codelist.ts

@@ -8,10 +8,10 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
         {
-        "srfkey": "CLModel",
+        "srfkey": "CLMetric",
         "emptytext": "未定义",
         "codelisttype":"dynamic",
-        "appdataentity":"DABuild",
+        "appdataentity":"DAMetric",
         "appdedataset":"FetchDefault",
         "items": []
     },
@@ -242,6 +242,14 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
+    {
+        "srfkey": "CLModel",
+        "emptytext": "未定义",
+        "codelisttype":"dynamic",
+        "appdataentity":"DABuild",
+        "appdedataset":"FetchDefault",
+        "items": []
+    },
     {
         srfkey: "CLMetricType",
         emptytext: "未定义",
@@ -344,14 +352,6 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
             },
         ]
     },
-    {
-        "srfkey": "CLMetric",
-        "emptytext": "未定义",
-        "codelisttype":"dynamic",
-        "appdataentity":"DAMetric",
-        "appdedataset":"FetchDefault",
-        "items": []
-    },
     {
         "srfkey": "CLRuleGroup",
         "emptytext": "",

app_web/src/mock/index.ts

@@ -18,10 +18,13 @@ import './entity/dabuilds/dabuilds';
 import './entity/dst-data-sources/dst-data-sources';
 import './entity/meta-fields/meta-fields';
 import './entity/exec-logs/exec-logs';
+import './entity/dict-catalogs/dict-catalogs';
 import './entity/exec-results/exec-results';
 import './entity/meta-relationships/meta-relationships';
 import './entity/dametrics/dametrics';
+import './entity/table-syncs/table-syncs';
 import './entity/rule-engines/rule-engines';
 import './entity/meta-entitys/meta-entitys';
+import './entity/dict-options/dict-options';
 import './entity/meta-modules/meta-modules';
 import './entity/meta-models/meta-models';

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

@@ -265,7 +265,7 @@ export default class DABuildEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DABuildEditViewBase
 	 */
-	public viewtag: string = '5e18c7b90bbee897eb493d3ac7d27cc4';
+	public viewtag: string = '86eb9ea66cbe65aa8348cd1747426eae';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/analysis/dabuild-grid-view/dabuild-grid-view-base.vue

@@ -240,7 +240,7 @@ export default class DABuildGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DABuildGridViewBase
 	 */
-	public viewtag: string = '08ffec9daab32e20d7b560f58c5c5ede';
+	public viewtag: string = '0227f6278fe9d3e67b52988f169644b8';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -250,7 +250,7 @@ export default class DAChartEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAChartEditViewBase
 	 */
-	public viewtag: string = '596fc713bbfe4da8b2089303bf681fd1';
+	public viewtag: string = 'c7de509d3488c91db58688723d81bc2f';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -240,7 +240,7 @@ export default class DAChartGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAChartGridViewBase
 	 */
-	public viewtag: string = 'a4a6b127d490b6e0c0572dcf8ff1e304';
+	public viewtag: string = '05e4236b54e9970342b10d90295ec381';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -250,7 +250,7 @@ export default class DAMetricEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAMetricEditViewBase
 	 */
-	public viewtag: string = 'b0fc4bae7655b93b1e554b05f06029f0';
+	public viewtag: string = '012642bfe75adfc8995c33c4015b6197';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -240,7 +240,7 @@ export default class DAMetricGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAMetricGridViewBase
 	 */
-	public viewtag: string = '311397b990a864f52992aa9b391bfc32';
+	public viewtag: string = 'ddd57351b9ba3e36ded697a14e5a8387';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -250,7 +250,7 @@ export default class DAReportEditViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAReportEditViewBase
 	 */
-	public viewtag: string = '4425be08b70d5319481f443085373932';
+	public viewtag: string = '9e70e297556aa0bb0ec3f34a531f1dea';
 
 	/**
 	 * 自定义视图导航上下文集合

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

@@ -240,7 +240,7 @@ export default class DAReportGridViewBase extends Vue {
 	 * @type {string}
 	 * @memberof DAReportGridViewBase
 	 */
-	public viewtag: string = 'a9502936dd5b510e79ada6cc477f6ff5';
+	public viewtag: string = '358419facd5dd4c78091ccba4aa69743';
 
 	/**
 	 * 自定义视图导航上下文集合

app_web/src/pages/dict/dict-catalog-edit-view/dict-catalog-edit-view.less

+.view-card {
+    >.ivu-card-extra {
+        top: 5px;
+        right: 0px;
+    }
+}
+
+.dict-catalog-edit-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

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

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import DictCatalogEditViewBase from './dict-catalog-edit-view-base.vue';
+
+import view_form from '@widgets/dict-catalog/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class DictCatalogEditView extends DictCatalogEditViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.less

+.dict-catalog-grid-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/dict/dict-catalog-grid-view/dict-catalog-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import DictCatalogGridViewBase from './dict-catalog-grid-view-base.vue';
+
+import view_grid from '@widgets/dict-catalog/main-grid/main-grid.vue';
+import view_searchform from '@widgets/dict-catalog/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class DictCatalogGridView extends DictCatalogGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/dict/dict-catalog-pickup-grid-view/dict-catalog-pickup-grid-view.less

+.dict-catalog-pickup-grid-view{
+    position: relative;
+}
+
+
+.dict-catalog-pickup-grid-view{
+    display: block;
+}
\ No newline at end of file

app_web/src/pages/dict/dict-catalog-pickup-view/dict-catalog-pickup-view.less

+.dict-catalog-pickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file