ibiz4j 发布系统代码 [ibz-dict，字典]

app_web/package.json

@@ -42,7 +42,7 @@
     "vue-class-component": "^7.0.2",
     "vue-grid-layout": "^2.3.7",
     "vue-i18n": "^8.15.3",
-    "vue-property-decorator": "^8.3.0",
+    "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2",
       "xlsx": "^0.15.6"
@@ -53,10 +53,8 @@
     "@types/mockjs": "^1.0.2",
     "@types/qs": "^6.9.0",
     "@vue/cli-plugin-babel": "^4.1.0",
-    "@vue/cli-plugin-e2e-cypress": "^4.1.0",
     "@vue/cli-plugin-router": "^4.1.0",
     "@vue/cli-plugin-typescript": "^4.1.0",
-    "@vue/cli-plugin-unit-jest": "^4.1.0",
     "@vue/cli-plugin-vuex": "^4.1.0",
     "@vue/cli-service": "^4.1.0",
     "@vue/test-utils": "1.0.0-beta.29",

app_web/src/app-register.ts

@@ -108,6 +108,7 @@ import Loadding  from  './directive/loadding/loadding';
 import AppColorSpan  from  './components/app-color-span/app-color-span.vue';
 import AppColorPicker from  './components/app-color-picker/app-color-picker.vue';
 
+
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
 // 全局挂载实体权限服务注册中心

app_web/src/components/app-color-span/app-color-span.vue

@@ -3,7 +3,7 @@
         <span v-if="color" :style="{ color:textColor }">{{ text ? text : '---' }}</span>
         <template v-else>
             <template v-if="dataValue && dataValue.length > 0">
-                <span v-for="(textItem,index) of dataValue" :key="index" class="text-color" :style="{ backgroundColor:textItem.color }">
+                <span v-for="(textItem,index) of dataValue" :key="index" class="text-color" :style="{ backgroundColor: textItem.color, borderColor: textItem.color}">
                 {{ textItem.srfmajortext ? textItem.srfmajortext : '---'}}
                 </span>
             </template>
@@ -58,7 +58,7 @@ export default class AppColorSpan extends Vue {
      * @type {any}
      * @memberof AppColorSpan
      */
-    @Prop() public localContext!: any;
+    @Prop() public localContext?: any;
 
     /**
      * 局部导航参数
@@ -66,7 +66,7 @@ export default class AppColorSpan extends Vue {
      * @type {any}
      * @memberof AppColorSpan
      */
-    @Prop() public localParam!: any;
+    @Prop() public localParam?: any;
 
     /**
      * 视图上下文
@@ -74,7 +74,7 @@ export default class AppColorSpan extends Vue {
      * @type {*}
      * @memberof AppColorSpan
      */
-    @Prop() public context!: any;
+    @Prop() public context?: any;
 
     /**
      * 视图参数
@@ -82,8 +82,7 @@ export default class AppColorSpan extends Vue {
      * @type {*}
      * @memberof AppColorSpan
      */
-    @Prop() public viewparams!: any;
-
+    @Prop() public viewparams?: any;
 
     /**
      * 颜色标识
@@ -91,8 +90,7 @@ export default class AppColorSpan extends Vue {
      * @type {*}
      * @memberof AppColorSpan
      */
-    @Prop() color:any;
-
+    @Prop() color?:any;
 
     /**
      * 颜色
@@ -156,8 +154,10 @@ export default class AppColorSpan extends Vue {
 
 <style lang="less">
     .text-color{
-        padding: 2px;
-        margin: 6px;
-        border-radius: 4px;
+        padding: 2px 8px;
+        margin: 6px 6px 6px 0px;
+        border-radius: 12px;
+        font-size: 13px;
+        border: 2px solid rgb(170, 167, 167);
     }
 </style>
\ No newline at end of file

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

@@ -170,10 +170,20 @@ export default class DropDownList extends Vue {
 
     /**
      * 属性类型
-     * @type {string}
+     *
+     * @type {'string' | 'number'}
+     * @memberof DropDownList
+     */
+    @Prop({ default: 'string' })
+    public valueType!: 'string' | 'number';
+
+     /**
+     * 选择实际值
+     *
+     * @type {*}
      * @memberof DropDownList
      */
-    @Prop() public valueType?: string;
+    public value: any = null;
 
     /**
      * 计算属性(当前值)
@@ -186,7 +196,7 @@ export default class DropDownList extends Vue {
             val = tempVal.length >0?tempVal[0].value:null;
         }
         const type: string = this.$util.typeOf(val);
-        val = Object.is(type, 'null') || Object.is(type, 'undefined') ? undefined : val;
+        val = Object.is(type, 'null') || Object.is(type, 'undefined') ? null : val;
         this.$emit('change', val);
     }
 
@@ -204,7 +214,7 @@ export default class DropDownList extends Vue {
             })
             return JSON.stringify([result]);
         }
-        return this.itemValue;
+        return this.value;
     }
 
     /**
@@ -263,10 +273,12 @@ export default class DropDownList extends Vue {
             this.formStateEvent = this.formState.subscribe(({ type, data }) => {
                 if (Object.is('load', type)) {
                     this.loadData();
+                    this.readyValue();
                 }
             });
         }
         this.loadData();
+        this.readyValue();
     }
 
     /**
@@ -298,6 +310,29 @@ export default class DropDownList extends Vue {
           });
       }
     }
+
+    /**
+     * 准备值
+     *
+     * @memberof DropDownList
+     */
+    public readyValue() {
+        if (this.itemValue == null) {
+            this.value = null;
+            return;
+        }
+        if (this.$util.typeOf(this.itemValue) === this.valueType) {
+            this.value = this.itemValue;
+        } else if (this.valueType === 'number') {
+            if (this.itemValue.indexOf('.') === -1) {
+                this.value = parseInt(this.itemValue);
+            } else {
+                this.value = parseFloat(this.itemValue);
+            }
+        } else {
+            this.value = this.itemValue.toString();
+        }
+    }
     
     /**
      * 下拉点击事件
@@ -331,32 +366,29 @@ export default class DropDownList extends Vue {
      * @memberof DropDownList
      */
     public formatCodeList(items: Array<any>){
-        let matching: boolean = true;
+        let matching: boolean = false;
         this.items = [];
         try{
-            if(this.valueType){
-                items.forEach((item: any)=>{
-                    const type = this.$util.typeOf(item.value);
-                    if(type != this.valueType){
-                        matching = false;
-                        if(type == 'number'){
-                            item.value = item.value.toString();
+            items.forEach((item: any)=>{
+                const type = this.$util.typeOf(item.value);
+                if(type != this.valueType){
+                    matching = true;
+                    if(type === 'number'){
+                        item.value = item.value.toString();
+                    }else{
+                        if(item.value.indexOf('.') == -1){
+                            item.value = parseInt(item.value);
                         }else{
-                            if(item.value.indexOf('.') == -1){
-                                item.value = parseInt(item.value);
-                            }else{
-                                item.value = parseFloat(item.value);
-                            }
+                            item.value = parseFloat(item.value);
                         }
                     }
-                    this.items.push(item);
-                });
-                if(!matching){
-                    console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配，已自动强制转换，请修正代码表值类型和属性类型匹配`);
                 }
-            }else{
-                this.items = items;
+                this.items.push(item);
+            });
+            if(matching){
+                console.warn(`代码表 ${ this.tag } 值类型和属性类型不匹配，已自动强制转换，请修正代码表值类型和属性类型匹配`);
             }
+            
         }catch(error){
             console.warn('代码表值类型和属性类型不匹配，自动强制转换异常，请修正代码表值类型和属性类型匹配');
         }

app_web/src/locale/index.ts

@@ -10,7 +10,7 @@ import iviewZhCnLocale from 'view-design/dist/locale/zh-CN';
 import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN';
 
 const messages = {
-    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn),
+    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn()),
 };
 
 

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

+import dictcatalog_en_US from '@locale/lanres/entities/dict-catalog/dict-catalog_en_US';
+import dictoption_en_US from '@locale/lanres/entities/dict-option/dict-option_en_US';
+import components_en_US from '@locale/lanres/components/components_en_US';
+import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
+import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getAppLocale(){
+    const data:any = {
+        app: {
+            commonWords:{
+                error: "Error",
+                success: "Success",
+                ok: "OK",
+                cancel: "Cancel",
+                save: "Save",
+                codeNotExist: 'Code list does not exist',
+                reqException: "Request exception",
+                sysException: "System abnormality",
+                warning: "Warning",
+                wrong: "Error",
+                rulesException: "Abnormal value check rule",
+                saveSuccess: "Saved successfully",
+                saveFailed: "Save failed",
+                deleteSuccess: "Successfully deleted!",
+                deleteError: "Failed to delete",
+                delDataFail: "Failed to delete data",
+                noData: "No data",
+                startsuccess:"Start successful",
+                loadmore:"Load more",
+                nomore:"No more",
+                other:"other",
+                valueNotEmpty:"The value cannot be null",
+            },
+            local:{
+                new: "New",
+                add: "Add",
+            },
+            gridpage: {
+                choicecolumns: "Choice columns",
+                refresh: "refresh",
+                show: "Show",
+                records: "records",
+                totle: "totle",
+                valueVail: "Value cannot be empty",
+                group:"Group",
+                other:"Other",
+                notConfig: {
+                    fetchAction: "The view table fetchaction parameter is not configured",
+                    removeAction: "The view table removeaction parameter is not configured",
+                    createAction: "The view table createaction parameter is not configured",
+                    updateAction: "The view table updateaction parameter is not configured",
+                    loaddraftAction: "The view table loadtrafaction parameter is not configured",
+                },
+                data: "Data",
+                delDataFail: "Failed to delete data",
+                delSuccess: "Delete successfully!",
+                confirmDel: "Are you sure you want to delete",
+                notRecoverable: "delete will not be recoverable?",
+                notBatch: "Batch addition not implemented",
+                grid: "Grid",
+                exportFail: "Data export failed",
+                sum: "Total",
+                formitemFailed: "Form item update failed",
+            },
+            list: {
+                notConfig: {
+                    fetchAction: "View list fetchAction parameter is not configured",
+                    removeAction: "View table removeAction parameter is not configured",
+                    createAction: "View list createAction parameter is not configured",
+                    updateAction: "View list updateAction parameter is not configured",
+                },
+                confirmDel: "Are you sure you want to delete",
+                notRecoverable: "delete will not be recoverable?",
+            },
+            listExpBar: {
+                title: "List navigation bar",
+            },
+            wfExpBar: {
+                title: "Process navigation bar",
+            },
+            calendarExpBar:{
+                title: "Calendar navigation bar",
+            },
+            treeExpBar: {
+                title: "Tree view navigation bar",
+            },
+            portlet: {
+                noExtensions: "No extensions",
+            },
+            tabpage: {
+                sureclosetip: {
+                    title: "Close warning",
+                    content: "Form data Changed, are sure close?",
+                },
+                closeall: "Close all",
+                closeother: "Close other",
+            },
+            fileUpload: {
+                caption: "Upload",
+            },
+            searchButton: {
+                search: "Search",
+                reset: "Reset",
+            },
+            calendar:{
+            today: "today",
+            month: "month",
+            week: "week",
+            day: "day",
+            list: "list",
+            dateSelectModalTitle: "select the time you wanted",
+            gotoDate: "goto",
+            from: "From",
+            to: "To",
+            },
+            // 非实体视图
+            views: {
+                appindexview: {
+                    caption: commonLogic.appcommonhandle("ibizlab",null),
+                    title: commonLogic.appcommonhandle("dictionary",null),
+                },
+            },
+            utilview:{
+                importview:"Import Data",
+                warning:"warning",
+                info:"Please configure the data import item"    
+            },
+            menus: {
+                appindexview: {
+                    menuitem1: commonLogic.appcommonhandle("目录",null),
+                    menuitem2: commonLogic.appcommonhandle("栏目",null),
+                },
+            },
+            formpage:{
+                error: "Error",
+                desc1: "Operation failed, failed to find current form item",
+                desc2: "Can't continue",
+                notconfig: {
+                    loadaction: "View form loadAction parameter is not configured",
+                    loaddraftaction: "View form loaddraftAction parameter is not configured",
+                    actionname: "View form actionName parameter is not configured",
+                    removeaction: "View form removeAction parameter is not configured",
+                },
+                saveerror: "Error saving data",
+                savecontent: "The data is inconsistent. The background data may have been modified. Do you want to reload the data?",
+                valuecheckex: "Value rule check exception",
+                savesuccess: "Saved successfully!",
+                deletesuccess: "Successfully deleted!",  
+                workflow: {
+                    starterror: "Workflow started successfully",
+                    startsuccess: "Workflow failed to start",
+                    submiterror: "Workflow submission failed",
+                    submitsuccess: "Workflow submitted successfully",
+                },
+                updateerror: "Form item update failed",       
+            },
+            gridBar: {
+                title: "Table navigation bar",
+            },
+            multiEditView: {
+                notConfig: {
+                    fetchAction: "View multi-edit view panel fetchAction parameter is not configured",
+                    loaddraftAction: "View multi-edit view panel loaddraftAction parameter is not configured",
+                },
+            },
+            dataViewExpBar: {
+                title: "Card view navigation bar",
+            },
+            kanban: {
+                notConfig: {
+                    fetchAction: "View list fetchAction parameter is not configured",
+                    removeAction: "View table removeAction parameter is not configured",
+                },
+                delete1: "Confirm to delete ",
+                delete2: "the delete operation will be unrecoverable!",
+                fold: "fold",
+                unfold: "upfold",
+            },
+            dashBoard: {
+                handleClick: {
+                    title: "Panel design",
+                },
+            },
+            dataView: {
+                sum: "total",
+                data: "data",
+            },
+            chart: {
+                undefined: "Undefined",
+                quarter: "Quarter",   
+                year: "Year",
+            },
+            searchForm: {
+                notConfig: {
+                    loadAction: "View search form loadAction parameter is not configured",
+                    loaddraftAction: "View search form loaddraftAction parameter is not configured",
+                },
+                custom: "Store custom queries",
+                title: "Name",
+            },
+            wizardPanel: {
+                back: "Back",
+                next: "Next",
+                complete: "Complete",
+                preactionmessage:"The calculation of the previous behavior is not configured"
+            },
+            viewLayoutPanel: {
+                appLogoutView: {
+                    prompt1: "Dear customer, you have successfully exited the system, after",
+                    prompt2: "seconds, we will jump to the",
+                    logingPage: "login page",
+                },
+                appWfstepTraceView: {
+                    title: "Application process processing record view",
+                },
+                appWfstepDataView: {
+                    title: "Application process tracking view",
+                },
+                appLoginView: {
+                    username: "Username",
+                    password: "Password",
+                    login: "Login",
+                },
+            },
+        },
+        entities: {
+            dictcatalog: dictcatalog_en_US(),
+            dictoption: dictoption_en_US(),
+        },
+        components: components_en_US(),
+        codelist: codelist_en_US(),
+        userCustom: userCustom_en_US(),
+    };
+    return data;
+}
+export default getAppLocale;
\ No newline at end of file

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

-import dictcatalog_en_US from '@locale/lanres/entities/dict-catalog/dict-catalog_en_US';
-import dictoption_en_US from '@locale/lanres/entities/dict-option/dict-option_en_US';
-import components_en_US from '@locale/lanres/components/components_en_US';
-import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
-import userCustom_en_US from '@locale/lanres/userCustom/userCustom_en_US';
+import app_en_US_Base from './en-US-base';
 
-export default {
-    app: {
-        commonWords:{
-            error: "Error",
-            success: "Success",
-            ok: "OK",
-            cancel: "Cancel",
-            save: "Save",
+function getLocaleResource(){
+    const app_en_US_OwnData = {};
+    const targetData = Object.assign(app_en_US_Base(), app_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
-            codeNotExist: 'Code list does not exist',
-            reqException: "Request exception",
-            sysException: "System abnormality",
-            warning: "Warning",
-            wrong: "Error",
-            rulesException: "Abnormal value check rule",
-            saveSuccess: "Saved successfully",
-            saveFailed: "Save failed",
-            deleteSuccess: "Successfully deleted!",
-            deleteError: "Failed to delete",
-            delDataFail: "Failed to delete data",
-            noData: "No data",
-            startsuccess:"Start successful",
-            loadmore:"Load more",
-            nomore:"No more",
-            other:"other"
-        },
-        local:{
-            new: "New",
-            add: "Add",
-        },
-        gridpage: {
-            choicecolumns: "Choice columns",
-            refresh: "refresh",
-            show: "Show",
-            records: "records",
-            totle: "totle",
-            valueVail: "Value cannot be empty",
-            group:"Group",
-            other:"Other",
-            notConfig: {
-                fetchAction: "The view table fetchaction parameter is not configured",
-                removeAction: "The view table removeaction parameter is not configured",
-                createAction: "The view table createaction parameter is not configured",
-                updateAction: "The view table updateaction parameter is not configured",
-                loaddraftAction: "The view table loadtrafaction parameter is not configured",
-            },
-            data: "Data",
-            delDataFail: "Failed to delete data",
-            delSuccess: "Delete successfully!",
-            confirmDel: "Are you sure you want to delete",
-            notRecoverable: "delete will not be recoverable?",
-            notBatch: "Batch addition not implemented",
-            grid: "Grid",
-            exportFail: "Data export failed",
-            sum: "Total",
-            formitemFailed: "Form item update failed",
-        },
-        list: {
-            notConfig: {
-                fetchAction: "View list fetchAction parameter is not configured",
-                removeAction: "View table removeAction parameter is not configured",
-                createAction: "View list createAction parameter is not configured",
-                updateAction: "View list updateAction parameter is not configured",
-            },
-            confirmDel: "Are you sure you want to delete",
-            notRecoverable: "delete will not be recoverable?",
-        },
-        listExpBar: {
-            title: "List navigation bar",
-        },
-        wfExpBar: {
-            title: "Process navigation bar",
-        },
-        calendarExpBar:{
-            title: "Calendar navigation bar",
-        },
-        treeExpBar: {
-            title: "Tree view navigation bar",
-        },
-        portlet: {
-            noExtensions: "No extensions",
-        },
-        tabpage: {
-            sureclosetip: {
-                title: "Close warning",
-                content: "Form data Changed, are sure close?",
-            },
-            closeall: "Close all",
-            closeother: "Close other",
-        },
-        fileUpload: {
-            caption: "Upload",
-        },
-        searchButton: {
-            search: "Search",
-            reset: "Reset",
-        },
-        calendar:{
-          today: "today",
-          month: "month",
-          week: "week",
-          day: "day",
-          list: "list",
-          dateSelectModalTitle: "select the time you wanted",
-          gotoDate: "goto",
-          from: "From",
-          to: "To",
-        },
-        // 非实体视图
-        views: {
-            appindexview: {
-                caption: "ibizlab",
-                title: "dictionary",
-            },
-        },
-        utilview:{
-            importview:"Import Data",
-            warning:"warning",
-            info:"Please configure the data import item"    
-        },
-        menus: {
-            appindexview: {
-                menuitem1: "目录",
-                menuitem2: "栏目",
-            },
-        },
-        formpage:{
-            error: "Error",
-            desc1: "Operation failed, failed to find current form item",
-            desc2: "Can't continue",
-            notconfig: {
-                loadaction: "View form loadAction parameter is not configured",
-                loaddraftaction: "View form loaddraftAction parameter is not configured",
-                actionname: "View form actionName parameter is not configured",
-                removeaction: "View form removeAction parameter is not configured",
-            },
-            saveerror: "Error saving data",
-            savecontent: "The data is inconsistent. The background data may have been modified. Do you want to reload the data?",
-            valuecheckex: "Value rule check exception",
-            savesuccess: "Saved successfully!",
-            deletesuccess: "Successfully deleted!",  
-            workflow: {
-                starterror: "Workflow started successfully",
-                startsuccess: "Workflow failed to start",
-                submiterror: "Workflow submission failed",
-                submitsuccess: "Workflow submitted successfully",
-            },
-            updateerror: "Form item update failed",       
-        },
-        gridBar: {
-            title: "Table navigation bar",
-        },
-        multiEditView: {
-            notConfig: {
-                fetchAction: "View multi-edit view panel fetchAction parameter is not configured",
-                loaddraftAction: "View multi-edit view panel loaddraftAction parameter is not configured",
-            },
-        },
-        dataViewExpBar: {
-            title: "Card view navigation bar",
-        },
-        kanban: {
-            notConfig: {
-                fetchAction: "View list fetchAction parameter is not configured",
-                removeAction: "View table removeAction parameter is not configured",
-            },
-            delete1: "Confirm to delete ",
-            delete2: "the delete operation will be unrecoverable!",
-        },
-        dashBoard: {
-            handleClick: {
-                title: "Panel design",
-            },
-        },
-        dataView: {
-            sum: "total",
-            data: "data",
-        },
-        chart: {
-            undefined: "Undefined",
-            quarter: "Quarter",   
-            year: "Year",
-        },
-        searchForm: {
-            notConfig: {
-                loadAction: "View search form loadAction parameter is not configured",
-                loaddraftAction: "View search form loaddraftAction parameter is not configured",
-            },
-            custom: "Store custom queries",
-            title: "Name",
-        },
-        wizardPanel: {
-            back: "Back",
-            next: "Next",
-            complete: "Complete",
-            preactionmessage:"The calculation of the previous behavior is not configured"
-        },
-        viewLayoutPanel: {
-            appLogoutView: {
-                prompt1: "Dear customer, you have successfully exited the system, after",
-                prompt2: "seconds, we will jump to the",
-                logingPage: "login page",
-            },
-            appWfstepTraceView: {
-                title: "Application process processing record view",
-            },
-            appWfstepDataView: {
-                title: "Application process tracking view",
-            },
-            appLoginView: {
-                username: "Username",
-                password: "Password",
-                login: "Login",
-            },
-        },
-    },
-    entities: {
-        dictcatalog: dictcatalog_en_US,
-        dictoption: dictoption_en_US,
-    },
-    components: components_en_US,
-    codelist: codelist_en_US,
-    userCustom: userCustom_en_US,
-};
\ No newline at end of file

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

+import dictcatalog_zh_CN from '@locale/lanres/entities/dict-catalog/dict-catalog_zh_CN';
+import dictoption_zh_CN from '@locale/lanres/entities/dict-option/dict-option_zh_CN';
+import components_zh_CN from '@locale/lanres/components/components_zh_CN';
+import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
+import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getAppLocale(){
+    const data:any = {
+        app: {
+            commonWords:{
+                error: "失败",
+                success: "成功",
+                ok: "确认",
+                cancel: "取消",
+                save: "保存",
+                codeNotExist: "代码表不存在",
+                reqException: "请求异常",
+                sysException: "系统异常",
+                warning: "警告",
+                wrong: "错误",
+                rulesException: "值规则校验异常",
+                saveSuccess: "保存成功",
+                saveFailed: "保存失败",
+                deleteSuccess: "删除成功",
+                deleteError: "删除失败",
+                delDataFail: "删除数据失败",
+                noData: "暂无数据",
+                startsuccess:"启动成功",
+                loadmore:"加载更多",
+                nomore:"没有更多了",
+                other:"其他",
+                valueNotEmpty:"值不能为空",
+            },
+            local:{
+                new: "新建",
+                add: "增加",
+            },
+            gridpage: {
+                choicecolumns: "选择列",
+                refresh: "刷新",
+                show: "显示",
+                records: "条",
+                totle: "共",
+                valueVail: "值不能为空",
+                group:"分组",
+                other:"其他",
+                notConfig: {
+                    fetchAction: "视图表格fetchAction参数未配置",
+                    removeAction: "视图表格removeAction参数未配置",
+                    createAction: "视图表格createAction参数未配置",
+                    updateAction: "视图表格updateAction参数未配置",
+                    loaddraftAction: "视图表格loaddraftAction参数未配置",
+                },
+                data: "数据",
+                delDataFail: "删除数据失败",
+                delSuccess: "删除成功!",
+                confirmDel: "确认要删除",
+                notRecoverable: "删除操作将不可恢复？",
+                notBatch: "批量添加未实现",
+                grid: "表",
+                exportFail: "数据导出失败",
+                sum: "合计",
+                formitemFailed: "表单项更新失败",
+            },
+            list: {
+                notConfig: {
+                    fetchAction: "视图列表fetchAction参数未配置",
+                    removeAction: "视图表格removeAction参数未配置",
+                    createAction: "视图列表createAction参数未配置",
+                    updateAction: "视图列表updateAction参数未配置",
+                },
+                confirmDel: "确认要删除",
+                notRecoverable: "删除操作将不可恢复？",
+            },
+            listExpBar: {
+                title: "列表导航栏",
+            },
+            wfExpBar: {
+                title: "流程导航栏",
+            },
+            calendarExpBar:{
+                title: "日历导航栏",
+            },
+            treeExpBar: {
+                title: "树视图导航栏",
+            },
+            portlet: {
+                noExtensions: "无扩展插件",
+            },
+            tabpage: {
+                sureclosetip: {
+                    title: "关闭提醒",
+                    content: "表单数据已经修改，确定要关闭？",
+                },
+                closeall: "关闭所有",
+                closeother: "关闭其他",
+            },
+            fileUpload: {
+                caption: "上传",
+            },
+            searchButton: {
+                search: "搜索",
+                reset: "重置",
+            },
+            calendar:{
+            today: "今天",
+            month: "月",
+            week: "周",
+            day: "天",
+            list: "列",
+            dateSelectModalTitle: "选择要跳转的时间",
+            gotoDate: "跳转",
+            from: "从",
+            to: "至",
+            },
+            // 非实体视图
+            views: {
+                appindexview: {
+                    caption: commonLogic.appcommonhandle("ibizlab",null),
+                    title: commonLogic.appcommonhandle("dictionary",null),
+                },
+            },
+            utilview:{
+                importview:"导入数据",
+                warning:"警告",
+                info:"请配置数据导入项" 
+            },
+            menus: {
+                appindexview: {
+                    menuitem1: commonLogic.appcommonhandle("目录",null),
+                    menuitem2: commonLogic.appcommonhandle("栏目",null),
+                },
+            },
+            formpage:{
+                desc1: "操作失败,未能找到当前表单项",
+                desc2: "无法继续操作",
+                notconfig: {
+                    loadaction: "视图表单loadAction参数未配置",
+                    loaddraftaction: "视图表单loaddraftAction参数未配置",
+                    actionname: "视图表单'+actionName+'参数未配置",
+                    removeaction: "视图表单removeAction参数未配置",
+                },
+                saveerror: "保存数据发生错误",
+                savecontent: "数据不一致，可能后台数据已经被修改,是否要重新加载数据？",
+                valuecheckex: "值规则校验异常",
+                savesuccess: "保存成功！",
+                deletesuccess: "删除成功！",  
+                workflow: {
+                    starterror: "工作流启动失败",
+                    startsuccess: "工作流启动成功",
+                    submiterror: "工作流提交失败",
+                    submitsuccess: "工作流提交成功",
+                },
+                updateerror: "表单项更新失败",     
+            },
+            gridBar: {
+                title: "表格导航栏",
+            },
+            multiEditView: {
+                notConfig: {
+                    fetchAction: "视图多编辑视图面板fetchAction参数未配置",
+                    loaddraftAction: "视图多编辑视图面板loaddraftAction参数未配置",
+                },
+            },
+            dataViewExpBar: {
+                title: "卡片视图导航栏",
+            },
+            kanban: {
+                notConfig: {
+                    fetchAction: "视图列表fetchAction参数未配置",
+                    removeAction: "视图表格removeAction参数未配置",
+                },
+                delete1: "确认要删除 ",
+                delete2: "删除操作将不可恢复？",
+                fold: "折叠",
+                unfold: "展开",
+            },
+            dashBoard: {
+                handleClick: {
+                    title: "面板设计",
+                },
+            },
+            dataView: {
+                sum: "共",
+                data: "条数据",
+            },
+            chart: {
+                undefined: "未定义",
+                quarter: "季度",   
+                year: "年",
+            },
+            searchForm: {
+                notConfig: {
+                    loadAction: "视图搜索表单loadAction参数未配置",
+                    loaddraftAction: "视图搜索表单loaddraftAction参数未配置",
+                },
+                custom: "存储自定义查询",
+                title: "名称",
+            },
+            wizardPanel: {
+                back: "上一步",
+                next: "下一步",
+                complete: "完成",
+                preactionmessage:"未配置计算上一步行为"
+            },
+            viewLayoutPanel: {
+                appLogoutView: {
+                    prompt1: "尊敬的客户您好，您已成功退出系统，将在",
+                    prompt2: "秒后跳转至",
+                    logingPage: "登录页",
+                },
+                appWfstepTraceView: {
+                    title: "应用流程处理记录视图",
+                },
+                appWfstepDataView: {
+                    title: "应用流程跟踪视图",
+                },
+                appLoginView: {
+                    username: "用户名",
+                    password: "密码",
+                    login: "登录",
+                },
+            },
+        },
+        entities: {
+            dictcatalog: dictcatalog_zh_CN(),
+            dictoption: dictoption_zh_CN(),
+        },
+        components: components_zh_CN(),
+        codelist: codelist_zh_CN(),
+        userCustom: userCustom_zh_CN(),
+    };
+    return data;
+}
+export default getAppLocale;
\ No newline at end of file

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

-import dictcatalog_zh_CN from '@locale/lanres/entities/dict-catalog/dict-catalog_zh_CN';
-import dictoption_zh_CN from '@locale/lanres/entities/dict-option/dict-option_zh_CN';
-import components_zh_CN from '@locale/lanres/components/components_zh_CN';
-import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
-import userCustom_zh_CN from '@locale/lanres/userCustom/userCustom_zh_CN';
+import app_zh_CN_Base from './zh-CN-base';
 
-export default {
-    app: {
-        commonWords:{
-            error: "失败",
-            success: "成功",
-            ok: "确认",
-            cancel: "取消",
-            save: "保存",
+function getLocaleResource(){
+    const app_zh_CN_OwnData = {};
+    const targetData = Object.assign(app_zh_CN_Base(), app_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file
-            codeNotExist: "代码表不存在",
-            reqException: "请求异常",
-            sysException: "系统异常",
-            warning: "警告",
-            wrong: "错误",
-            rulesException: "值规则校验异常",
-            saveSuccess: "保存成功",
-            saveFailed: "保存失败",
-            deleteSuccess: "删除成功",
-            deleteError: "删除失败",
-            delDataFail: "删除数据失败",
-            noData: "暂无数据",
-            startsuccess:"启动成功",
-            loadmore:"加载更多",
-            nomore:"没有更多了",
-            other:"其他"
-        },
-        local:{
-            new: "新建",
-            add: "增加",
-        },
-        gridpage: {
-            choicecolumns: "选择列",
-            refresh: "刷新",
-            show: "显示",
-            records: "条",
-            totle: "共",
-            valueVail: "值不能为空",
-            group:"分组",
-            other:"其他",
-            notConfig: {
-                fetchAction: "视图表格fetchAction参数未配置",
-                removeAction: "视图表格removeAction参数未配置",
-                createAction: "视图表格createAction参数未配置",
-                updateAction: "视图表格updateAction参数未配置",
-                loaddraftAction: "视图表格loaddraftAction参数未配置",
-            },
-            data: "数据",
-            delDataFail: "删除数据失败",
-            delSuccess: "删除成功!",
-            confirmDel: "确认要删除",
-            notRecoverable: "删除操作将不可恢复？",
-            notBatch: "批量添加未实现",
-            grid: "表",
-            exportFail: "数据导出失败",
-            sum: "合计",
-            formitemFailed: "表单项更新失败",
-        },
-        list: {
-            notConfig: {
-                fetchAction: "视图列表fetchAction参数未配置",
-                removeAction: "视图表格removeAction参数未配置",
-                createAction: "视图列表createAction参数未配置",
-                updateAction: "视图列表updateAction参数未配置",
-            },
-            confirmDel: "确认要删除",
-            notRecoverable: "删除操作将不可恢复？",
-        },
-        listExpBar: {
-            title: "列表导航栏",
-        },
-        wfExpBar: {
-            title: "流程导航栏",
-        },
-        calendarExpBar:{
-            title: "日历导航栏",
-        },
-        treeExpBar: {
-            title: "树视图导航栏",
-        },
-        portlet: {
-            noExtensions: "无扩展插件",
-        },
-        tabpage: {
-            sureclosetip: {
-                title: "关闭提醒",
-                content: "表单数据已经修改，确定要关闭？",
-            },
-            closeall: "关闭所有",
-            closeother: "关闭其他",
-        },
-        fileUpload: {
-            caption: "上传",
-        },
-        searchButton: {
-            search: "搜索",
-            reset: "重置",
-        },
-        calendar:{
-          today: "今天",
-          month: "月",
-          week: "周",
-          day: "天",
-          list: "列",
-          dateSelectModalTitle: "选择要跳转的时间",
-          gotoDate: "跳转",
-          from: "从",
-          to: "至",
-        },
-        // 非实体视图
-        views: {
-            appindexview: {
-                caption: "ibizlab",
-                title: "dictionary",
-            },
-        },
-        utilview:{
-            importview:"导入数据",
-            warning:"警告",
-            info:"请配置数据导入项" 
-        },
-        menus: {
-            appindexview: {
-                menuitem1: "目录",
-                menuitem2: "栏目",
-            },
-        },
-        formpage:{
-            desc1: "操作失败,未能找到当前表单项",
-            desc2: "无法继续操作",
-            notconfig: {
-                loadaction: "视图表单loadAction参数未配置",
-                loaddraftaction: "视图表单loaddraftAction参数未配置",
-                actionname: "视图表单'+actionName+'参数未配置",
-                removeaction: "视图表单removeAction参数未配置",
-            },
-            saveerror: "保存数据发生错误",
-            savecontent: "数据不一致，可能后台数据已经被修改,是否要重新加载数据？",
-            valuecheckex: "值规则校验异常",
-            savesuccess: "保存成功！",
-            deletesuccess: "删除成功！",  
-            workflow: {
-                starterror: "工作流启动失败",
-                startsuccess: "工作流启动成功",
-                submiterror: "工作流提交失败",
-                submitsuccess: "工作流提交成功",
-            },
-            updateerror: "表单项更新失败",     
-        },
-        gridBar: {
-            title: "表格导航栏",
-        },
-        multiEditView: {
-            notConfig: {
-                fetchAction: "视图多编辑视图面板fetchAction参数未配置",
-                loaddraftAction: "视图多编辑视图面板loaddraftAction参数未配置",
-            },
-        },
-        dataViewExpBar: {
-            title: "卡片视图导航栏",
-        },
-        kanban: {
-            notConfig: {
-                fetchAction: "视图列表fetchAction参数未配置",
-                removeAction: "视图表格removeAction参数未配置",
-            },
-            delete1: "确认要删除 ",
-            delete2: "删除操作将不可恢复？",
-        },
-        dashBoard: {
-            handleClick: {
-                title: "面板设计",
-            },
-        },
-        dataView: {
-            sum: "共",
-            data: "条数据",
-        },
-        chart: {
-            undefined: "未定义",
-            quarter: "季度",   
-            year: "年",
-        },
-        searchForm: {
-            notConfig: {
-                loadAction: "视图搜索表单loadAction参数未配置",
-                loaddraftAction: "视图搜索表单loaddraftAction参数未配置",
-            },
-            custom: "存储自定义查询",
-            title: "名称",
-        },
-        wizardPanel: {
-            back: "上一步",
-            next: "下一步",
-            complete: "完成",
-            preactionmessage:"未配置计算上一步行为"
-        },
-        viewLayoutPanel: {
-            appLogoutView: {
-                prompt1: "尊敬的客户您好，您已成功退出系统，将在",
-                prompt2: "秒后跳转至",
-                logingPage: "登录页",
-            },
-            appWfstepTraceView: {
-                title: "应用流程处理记录视图",
-            },
-            appWfstepDataView: {
-                title: "应用流程跟踪视图",
-            },
-            appLoginView: {
-                username: "用户名",
-                password: "密码",
-                login: "登录",
-            },
-        },
-    },
-    entities: {
-        dictcatalog: dictcatalog_zh_CN,
-        dictoption: dictoption_zh_CN,
-    },
-    components: components_zh_CN,
-    codelist: codelist_zh_CN,
-    userCustom: userCustom_zh_CN,
-};
\ No newline at end of file

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

-export default {
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": ""
-    },
-};
+import codelist_en_US_Base from './codelist_en_US_base';
+
+function getLocaleResource(){
+    const codelist_en_US_OwnData = {};
+    const targetData = Object.assign(codelist_en_US_Base(), codelist_en_US_OwnData);
+    return targetData;
+}
\ No newline at end of file
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

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

-export default {
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": "",
-    },
-};
+import codelist_zh_CN_Base from './codelist_zh_CN_base';
+
+function getLocaleResource(){
+    const codelist_zh_CN_OwnData = {};
+    const targetData = Object.assign(codelist_zh_CN_Base(), codelist_zh_CN_OwnData);
+    return targetData;
+}
\ No newline at end of file
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

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

+import DictCatalog_en_US_Base from './dict-catalog_en_US_base';
 
-export default {
-  fields: {
-    id: "标识",
-    code: "代码",
-    name: "名称",
-    group: "分组",
-    memo: "备注",
-    enable: "是否有效",
+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
-    updatedate: "最后修改时间",
-    createdate: "创建时间",
-  },
-	views: {
-		gridview: {
-			caption: "字典",
-      		title: "字典表格视图",
-		},
-		pickupgridview: {
-			caption: "字典",
-      		title: "字典选择表格视图",
-		},
-		pickupview: {
-			caption: "字典",
-      		title: "字典数据选择视图",
-		},
-		editview: {
-			caption: "字典",
-      		title: "字典编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典基本信息", 
-			druipart1: "字典项", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			ccode: "代码", 
-			cname: "名称", 
-			cgroup: "分组", 
-			memo: "备注", 
-			cid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			ccode: "代码",
-			cname: "名称",
-			cgroup: "分组",
-			memo: "备注",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_ccode_like: "代码", 
-			n_cname_like: "名称", 
-			n_cgroup_like: "分组", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-};
\ 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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Save And New",null),
+				tip: commonLogic.appcommonhandle("Save And New",null),
+			},
+			tbitem5: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			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),
+			},
+			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),
+			},
+			tbitem21: {
+				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

-export default {
-  fields: {
-    id: "标识",
-    code: "代码",
-    name: "名称",
-    group: "分组",
-    memo: "备注",
-    enable: "是否有效",
-    updatedate: "最后修改时间",
-    createdate: "创建时间",
+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
-  },
-	views: {
-		gridview: {
-			caption: "字典",
-      		title: "字典表格视图",
-		},
-		pickupgridview: {
-			caption: "字典",
-      		title: "字典选择表格视图",
-		},
-		pickupview: {
-			caption: "字典",
-      		title: "字典数据选择视图",
-		},
-		editview: {
-			caption: "字典",
-      		title: "字典编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			group1: "字典基本信息", 
-			druipart1: "字典项", 
-			formpage1: "基本信息", 
-			srfupdatedate: "最后修改时间", 
-			srforikey: "", 
-			srfkey: "标识", 
-			srfmajortext: "名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			ccode: "代码", 
-			cname: "名称", 
-			cgroup: "分组", 
-			memo: "备注", 
-			cid: "标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			ccode: "代码",
-			cname: "名称",
-			cgroup: "分组",
-			memo: "备注",
-			updatedate: "最后修改时间",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-			n_ccode_like: "代码", 
-			n_cname_like: "名称", 
-			n_cgroup_like: "分组", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		tbitem4: {
-			caption: "保存并新建",
-			tip: "保存并新建",
-		},
-		tbitem5: {
-			caption: "保存并关闭",
-			tip: "保存并关闭",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "删除并关闭",
-			tip: "删除并关闭",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-};
\ 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),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("保存并新建",null),
+				tip: commonLogic.appcommonhandle("保存并新建",null),
+			},
+			tbitem5: {
+				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),
+			},
+			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),
+			},
+			tbitem21: {
+				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_en_US.ts

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

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),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项表格视图",null),
+			},
+			grideditview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典项基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				cname: commonLogic.appcommonhandle("目录",null), 
+				val: commonLogic.appcommonhandle("代码值",null), 
+				label: commonLogic.appcommonhandle("名称",null), 
+				pval: commonLogic.appcommonhandle("父代码值",null), 
+				showorder: commonLogic.appcommonhandle("排序",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				expired: commonLogic.appcommonhandle("过期/失效",null), 
+				vfilter: commonLogic.appcommonhandle("过滤项",null), 
+				iconcls: commonLogic.appcommonhandle("图标",null), 
+				cls: commonLogic.appcommonhandle("栏目样式",null), 
+				extension: commonLogic.appcommonhandle("扩展",null), 
+				cid: commonLogic.appcommonhandle("目录代码",null), 
+				vkey: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		options_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_cname_like: commonLogic.appcommonhandle("目录(文本包含(%))",null), 
+				n_val_like: commonLogic.appcommonhandle("代码值(文本包含(%))",null), 
+				n_label_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("Save And Close",null),
+				tip: commonLogic.appcommonhandle("Save And Close Window",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+		},
+		grideditviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

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

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

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),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项表格视图",null),
+			},
+			grideditview: {
+				caption: commonLogic.appcommonhandle("字典项",null),
+				title: commonLogic.appcommonhandle("字典项表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("字典项基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srfupdatedate: commonLogic.appcommonhandle("最后修改时间",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				cname: commonLogic.appcommonhandle("目录",null), 
+				val: commonLogic.appcommonhandle("代码值",null), 
+				label: commonLogic.appcommonhandle("名称",null), 
+				pval: commonLogic.appcommonhandle("父代码值",null), 
+				showorder: commonLogic.appcommonhandle("排序",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				expired: commonLogic.appcommonhandle("过期/失效",null), 
+				vfilter: commonLogic.appcommonhandle("过滤项",null), 
+				iconcls: commonLogic.appcommonhandle("图标",null), 
+				cls: commonLogic.appcommonhandle("栏目样式",null), 
+				extension: commonLogic.appcommonhandle("扩展",null), 
+				cid: commonLogic.appcommonhandle("目录代码",null), 
+				vkey: commonLogic.appcommonhandle("标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+				updatedate: commonLogic.appcommonhandle("最后修改时间",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		options_grid: {
+			columns: {
+				cid: commonLogic.appcommonhandle("目录代码",null),
+				val: commonLogic.appcommonhandle("代码值",null),
+				label: commonLogic.appcommonhandle("名称",null),
+				pval: commonLogic.appcommonhandle("父代码值",null),
+				showorder: commonLogic.appcommonhandle("排序",null),
+				cname: commonLogic.appcommonhandle("目录",null),
+				cls: commonLogic.appcommonhandle("栏目样式",null),
+				iconcls: commonLogic.appcommonhandle("图标",null),
+				vfilter: commonLogic.appcommonhandle("过滤项",null),
+				disabled: commonLogic.appcommonhandle("是否禁用",null),
+				expired: commonLogic.appcommonhandle("过期/失效",null),
+				extension: commonLogic.appcommonhandle("扩展",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+				n_cname_like: commonLogic.appcommonhandle("目录(文本包含(%))",null), 
+				n_val_like: commonLogic.appcommonhandle("代码值(文本包含(%))",null), 
+				n_label_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
+			},
+			uiactions: {
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem1: {
+				caption: commonLogic.appcommonhandle("保存并关闭",null),
+				tip: commonLogic.appcommonhandle("保存并关闭",null),
+			},
+			tbitem2: {
+				caption: commonLogic.appcommonhandle("关闭",null),
+				tip: commonLogic.appcommonhandle("关闭",null),
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+		},
+		grideditviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem24: {
+				caption: commonLogic.appcommonhandle("行编辑",null),
+				tip: commonLogic.appcommonhandle("行编辑",null),
+			},
+			tbitem25: {
+				caption: commonLogic.appcommonhandle("新建行",null),
+				tip: commonLogic.appcommonhandle("新建行",null),
+			},
+			deuiaction1: {
+				caption: commonLogic.appcommonhandle("保存行",null),
+				tip: commonLogic.appcommonhandle("保存行",null),
+			},
+			tbitem26: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			deuiaction2: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/userCustom/userCustom_en_US.ts

 // 用户自定义语言资源 英文
-export default {
-
-    
-};
+function getLocaleResource(){
+    const data:any = {};
+    return data;
+}
\ No newline at end of file
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/userCustom/userCustom_zh_CN.ts

 // 用户自定义语言资源 中文
-export default {
-
-    
-};
+function getLocaleResource(){
+    const data:any = {};
+    return data;
+}
\ No newline at end of file
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/logic/common/common-logic-base.ts

+export default {
+    /**
+     * 应用通用显示处理
+     * @param param1 显示文本 
+     * @param param2 多语言对象
+     */
+    appcommonhandle:function(param1:any,param2:any){
+        return param1;
+    }
+}
\ No newline at end of file

app_web/src/locale/logic/common/common-logic.ts

+import CommonLogicBase from './common-logic-base';
+
+const CommonLogicOwnData = {};
+const targetData = Object.assign(CommonLogicBase, CommonLogicOwnData);
+export default targetData;
\ No newline at end of file

app_web/src/locale/logic/custom/common-logic.ts

+export default {
+
+}
\ No newline at end of file

app_web/src/pages/dict/app-index-view/app-index-view-base.vue

@@ -548,8 +548,8 @@ export default class AppIndexViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

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

@@ -1396,7 +1396,7 @@ export default class DictCatalogEditViewBase extends Vue {
             }
             if(!params) params = {};
             Object.assign(params,{copymode:true});
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             Object.assign(this.viewparams,{copymode:true});
         }
@@ -1569,8 +1569,8 @@ export default class DictCatalogEditViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

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

@@ -1328,7 +1328,7 @@ export default class DictCatalogGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictcatalog: args[0].dictcatalog })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1354,7 +1354,7 @@ export default class DictCatalogGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictcatalog: args[0].dictcatalog })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1382,7 +1382,7 @@ export default class DictCatalogGridViewBase extends Vue {
             }
             if(!params) params = {};
             Object.assign(params,{copymode:true});
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             Object.assign(this.viewparams,{copymode:true});
         }
@@ -1537,8 +1537,8 @@ export default class DictCatalogGridViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

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

@@ -672,8 +672,8 @@ export default class DictCatalogPickupGridViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

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

@@ -610,8 +610,8 @@ export default class DictCatalogPickupViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

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

@@ -770,8 +770,8 @@ export default class DictOptionEditViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

app_web/src/pages/dict/dict-option-grid-edit-view/dict-option-grid-edit-view-base.vue

@@ -1320,7 +1320,7 @@ export default class DictOptionGridEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictoption: args[0].dictoption })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1346,7 +1346,7 @@ export default class DictOptionGridEditViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictoption: args[0].dictoption })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1374,7 +1374,7 @@ export default class DictOptionGridEditViewBase extends Vue {
             }
             if(!params) params = {};
             Object.assign(params,{copymode:true});
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             Object.assign(this.viewparams,{copymode:true});
         }
@@ -1517,8 +1517,8 @@ export default class DictOptionGridEditViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

app_web/src/pages/dict/dict-option-grid-view/dict-option-grid-view-base.vue

@@ -1320,7 +1320,7 @@ export default class DictOptionGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictoption: args[0].dictoption })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1346,7 +1346,7 @@ export default class DictOptionGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { dictoption: args[0].dictoption })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1374,7 +1374,7 @@ export default class DictOptionGridViewBase extends Vue {
             }
             if(!params) params = {};
             Object.assign(params,{copymode:true});
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             Object.assign(this.viewparams,{copymode:true});
         }
@@ -1517,8 +1517,8 @@ export default class DictOptionGridViewBase extends Vue {
     public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
-            _view.$emit('viewdataschange', [args]);
-            _view.$emit('close', [args]);
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
         } else if (_view.$tabPageExp) {
             _view.$tabPageExp.onClose(_view.$route.fullPath);
         }

app_web/src/utils/types/app-popover.d.ts

@@ -37,7 +37,7 @@ export declare interface AppPopover {
      * @param {number} [height]
      * @memberof AppPopover
      */
-    openPopover(event: MouseEvent, content: (h: CreateElement) => any, title?: string, position?: PopperJs.Placement, isAutoClose?: boolean, width?: number, height?: number): void;
+    openPopover(event: MouseEvent, content: (h: CreateElement) => any, position?: PopperJs.Placement, isAutoClose?: boolean, width?: number, height?: number): void;
     /**
      * 销毁popper(带回填数据)
      *

app_web/src/widgets/dict-catalog/main-form/main-form-base.vue

@@ -569,8 +569,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        }
+    }
 
     /**
      * 校验属性值规则
@@ -579,7 +581,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {{ name: string }} { name }
      * @memberof MainBase
      */
-    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND") :{isPast:boolean,infoMessage:string}{
+    public verifyDeRules(name:string,rule:any = this.deRules(),op:string = "AND") :{isPast:boolean,infoMessage:string}{
         let falg:any = {infoMessage:""};
         if(!rule[name]){
             return falg;
@@ -1199,7 +1201,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */    
     public afterCreated(){
         if(this.isautoload){
-            this.autoLoad({srfkey:this.context.documentcenter});
+            this.autoLoad({srfkey:this.context.dictcatalog});
         }
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {

app_web/src/widgets/dict-option/main-form/main-form-base.vue

@@ -697,8 +697,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        }
+    }
 
     /**
      * 校验属性值规则
@@ -707,7 +709,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {{ name: string }} { name }
      * @memberof MainBase
      */
-    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND") :{isPast:boolean,infoMessage:string}{
+    public verifyDeRules(name:string,rule:any = this.deRules(),op:string = "AND") :{isPast:boolean,infoMessage:string}{
         let falg:any = {infoMessage:""};
         if(!rule[name]){
             return falg;
@@ -1444,7 +1446,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */    
     public afterCreated(){
         if(this.isautoload){
-            this.autoLoad({srfkey:this.context.documentcenter});
+            this.autoLoad({srfkey:this.context.dictoption});
         }
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzdict/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzdict/
-      mvn clean package -Papi
-      cd ibzdict-provider/ibzdict-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdict-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzdict-dependencies/pom.xml

@@ -25,7 +25,7 @@
         <spring-cloud-openfeign.version>2.2.1.RELEASE</spring-cloud-openfeign.version>
 
         <!--  Alibaba Druid  -->
-        <alibaba-druid.version>1.1.16</alibaba-druid.version>
+        <alibaba-druid.version>1.1.21</alibaba-druid.version>
 
         <!--  Mybatis Plus -->
         <mybatis-plus.version>3.3.1</mybatis-plus.version>
@@ -86,7 +86,7 @@
         <!-- 阿里seata分布式事务 -->
         <alibaba-seata.version>1.3.0</alibaba-seata.version>
 
-        <oracle.version>11.2.0.3</oracle.version>
+        <oracle.version>19.8.0.0</oracle.version>
         <postgresql.version>42.2.6</postgresql.version>
 
     </properties>
@@ -327,8 +327,13 @@
 
         <!--  Oracle驱动包 -->
         <dependency>
-            <groupId>com.oracle</groupId>
-            <artifactId>ojdbc6</artifactId>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc8</artifactId>
+            <version>${oracle.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.nls</groupId>
+            <artifactId>orai18n</artifactId>
             <version>${oracle.version}</version>
         </dependency>
         <!--  PostgreSQL驱动包 -->

ibzdict-provider/ibzdict-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzdict-provider-api.jar
 
-EXPOSE 40004
+EXPOSE 8081
 
 ADD ibzdict-provider-api.jar /ibzdict-provider-api.jar

ibzdict-provider/ibzdict-provider-api/src/main/docker/ibzdict-provider-api.yaml

@@ -3,23 +3,9 @@ services:
   ibzdict-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdict-provider-api:latest
     ports:
-      - "40004:40004"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40004
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits:

ibzdict-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -20,10 +20,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.util.*;
 
 @Slf4j
 @Component