ibiz4j 发布系统代码 [ ibiz-pay，支付]

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 paytrade_en_US from '@locale/lanres/entities/pay-trade/pay-trade_en_US';
+import payopenaccess_en_US from '@locale/lanres/entities/pay-open-access/pay-open-access_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: {
+                payindexview: {
+                    caption: commonLogic.appcommonhandle("ibizlab",null),
+                    title: commonLogic.appcommonhandle("pay",null),
+                },
+            },
+            utilview:{
+                importview:"Import Data",
+                warning:"warning",
+                info:"Please configure the data import item"    
+            },
+            menus: {
+                payindexview: {
+                    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: {
+            paytrade: paytrade_en_US(),
+            payopenaccess: payopenaccess_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 paytrade_en_US from '@locale/lanres/entities/pay-trade/pay-trade_en_US';
-import payopenaccess_en_US from '@locale/lanres/entities/pay-open-access/pay-open-access_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",
-            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: {
-            payindexview: {
-                caption: "ibizlab",
-                title: "pay",
-            },
-        },
-        utilview:{
-            importview:"Import Data",
-            warning:"warning",
-            info:"Please configure the data import item"    
-        },
-        menus: {
-            payindexview: {
-                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: {
-        paytrade: paytrade_en_US,
-        payopenaccess: payopenaccess_en_US,
-    },
-    components: components_en_US,
-    codelist: codelist_en_US,
-    userCustom: userCustom_en_US,
-};
\ No newline at end of file
+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

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

+import paytrade_zh_CN from '@locale/lanres/entities/pay-trade/pay-trade_zh_CN';
+import payopenaccess_zh_CN from '@locale/lanres/entities/pay-open-access/pay-open-access_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: {
+                payindexview: {
+                    caption: commonLogic.appcommonhandle("ibizlab",null),
+                    title: commonLogic.appcommonhandle("pay",null),
+                },
+            },
+            utilview:{
+                importview:"导入数据",
+                warning:"警告",
+                info:"请配置数据导入项" 
+            },
+            menus: {
+                payindexview: {
+                    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: {
+            paytrade: paytrade_zh_CN(),
+            payopenaccess: payopenaccess_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 paytrade_zh_CN from '@locale/lanres/entities/pay-trade/pay-trade_zh_CN';
-import payopenaccess_zh_CN from '@locale/lanres/entities/pay-open-access/pay-open-access_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: "保存",
-            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: {
-            payindexview: {
-                caption: "ibizlab",
-                title: "pay",
-            },
-        },
-        utilview:{
-            importview:"导入数据",
-            warning:"警告",
-            info:"请配置数据导入项" 
-        },
-        menus: {
-            payindexview: {
-                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: {
-        paytrade: paytrade_zh_CN,
-        payopenaccess: payopenaccess_zh_CN,
-    },
-    components: components_zh_CN,
-    codelist: codelist_zh_CN,
-    userCustom: userCustom_zh_CN,
-};
\ No newline at end of file
+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

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

-export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": ""
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": ""
-    },
-};
\ No newline at end of file
+import codelist_en_US_Base from './codelist_en_US_base';
+
+function getLocaleResource(){
+    const codelist_en_US_OwnData = {};
+    const targetData = Object.assign(codelist_en_US_Base(), codelist_en_US_OwnData);
+    return targetData;
+}
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      OpenAccessType: {
+          "aliyun": commonLogic.appcommonhandle("阿里云",null),
+          "wechat": commonLogic.appcommonhandle("微信开放平台",null),
+          "qq": commonLogic.appcommonhandle("QQ互联",null),
+          "dingtalk": commonLogic.appcommonhandle("钉钉开放平台",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null)
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

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

-export default {
-    OpenAccessType: {
-        "aliyun": "阿里云",
-        "wechat": "微信开放平台",
-        "qq": "QQ互联",
-        "dingtalk": "钉钉开放平台",
-        "empty": "",
-    },
-    YesNo: {
-        "1": "是",
-        "0": "否",
-        "empty": "",
-    },
-};
\ No newline at end of file
+import codelist_zh_CN_Base from './codelist_zh_CN_base';
+
+function getLocaleResource(){
+    const codelist_zh_CN_OwnData = {};
+    const targetData = Object.assign(codelist_zh_CN_Base(), codelist_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

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

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+  const data:any = {
+      OpenAccessType: {
+          "aliyun": commonLogic.appcommonhandle("阿里云",null),
+          "wechat": commonLogic.appcommonhandle("微信开放平台",null),
+          "qq": commonLogic.appcommonhandle("QQ互联",null),
+          "dingtalk": commonLogic.appcommonhandle("钉钉开放平台",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+      YesNo: {
+          "1": commonLogic.appcommonhandle("是",null),
+          "0": commonLogic.appcommonhandle("否",null),
+          "empty": commonLogic.appcommonhandle("",null),
+      },
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/components/components_en_US.ts

-export default {
-    "404": {
-        errorText1: 'sorry，the page you visited is not exist！',
-        errorText2: 'The page you visited is not exist，please return to',
-        indexPage: 'home page',
-        continue: 'to continue browsing',
-    },
-    "500": {
-        errorText1: "sorry，there's something wrong with the server！",
-        errorText2: "There's something wrong with the server，please return to",
-        indexPage: 'home page',
-        continue: 'to continue browsing',
-    },
-    appOrgSector:{
-      successSwitch:'The switch was successful',
-      errorSwitch:'The switchover failed',
-    },
-    appAutocomplete: {
-        error: 'Error',
-        miss: 'Missing parameter ',
-        requestException: 'Request Exception！',
-    },
-    appBuild: {
-        custom: 'Customize',
-    },
-    appCheckBox: {
-        notExist: 'codelist is not existed',
-    },
-    appColumnLink: {
-      error: 'error',
-      valueItemException:"value item exception",
-      rowDataException:"table row data exception",
-    },
-    appColumnRender: {
-      select: 'please select...',
-      unsupported: 'unsupported',
-    },
-    appDashboardDesign: {
-      global: 'Global',
-    },
-    appDataUploadView: {
-      "viewtitle":"AppDataUploadView",
-      "selectfile":"Select File",
-      "uploadserver":"Upload Server",
-      "datatemplate":"Download Import Data Template",
-      "dataid":"Data ID is ",
-      "read":" read Successful",
-      "importing":"Importing",
-      "completed":"Import Completed",
-      "confirm":"OK",
-      "datatemp":"Data Template",
-      "importfailed":"Import Failed"
-    },
-    appDebugActions: {
-      button: 'Open Configuration Mode',
-    },
-    appExportExcel: {
-      total: 'All',
-      max: 'At Most',
-      row: 'Lines',
-      currentPage: 'Current Page',
-      desc:'Please enter the start page',
-      desc1:'Please enter a valid start page',
-    },
-    appFileUpload: {
-      preview: 'preview',
-      uploadText: 'Drag files here，or <em>Click</em> to upload',
-      fileTypeErrorTitle: 'File type incorrect',
-      fileTypeErrorInfo: 'Please select files with picture types，such as JPEG，GIF，PNG，BMP',
-    },
-    appFormDRUIPart: {
-      blockUITipInfo: 'Please save the major data first',
-      viewLoadComp:'After the multi data view is loaded, the subsequent form item update will be triggered',
-      save:'Relationship data save complete',
-      change:'Relationship data value change',
-      change1:'View data changes',
-      loadComp:'View loading complete',
-    },
-    appHeaderMenus: {
-      ibizlab:{
-          title: 'iBizLab',
-      },
-      publishProject:{
-          title: 'Publish Project',
-      },
-      ibizstudio:{
-          title: 'Model Design Tools',
-      },
-      ibizbbs:{
-          title: 'iBizBBS',
-      },
-    },
-    appMpicker: {
-      error: 'Error',
-      miss: 'Missing parameter ',
-      requestException: 'Request Exception！',
-    },
-    appPicker: {
-      error: 'Error',
-      miss: 'Missing parameter ',
-      requestException: 'Request Exception！',
-      newAndEdit: 'Create And Edit...',
-      systemException: 'System Error！',
-      valueitemException: 'valueitem Error！',
-      formdataException: 'formdata Error！',
-    },
-    appPickerSelectView: {
-      error: 'Error',
-      valueitemException: 'valueitem Error！',
-      formdataException: 'formdata Error！',
-      placeholder: 'Please select...',
-    },
-    appPortalDesign: {
-      customPortal: 'Custom portal',
-      save: 'Save',
-    },
-    appRangDate: {
-      placeholder: 'Please select time...',
-      from: 'from',
-      daystart: '00:00:00 to',
-      dayend: '24:00:00',
-    },
-    appRangeEditor: {
-      placeholder: 'Please select time...',
-      input: 'Please input...',
-    },
-    appStudioAction: {
-      configTitle: 'Enter the configuration of current view',
-      configButton: 'Configuration',
-      issueTitle: 'Create issues of current view',
-      issueButton: 'Create issues',
-    },
-    appTreePicker: {
-      placeholder: 'please select...',
-    },
-    dateRange: {
-      startText: 'Insurance period ： From',
-      endText: '24:00:00',
-      startPlaceholder: 'Begin Date',
-      rangeSeparatorr: ' 00:00:00 To',
-      endPlaceholder: 'End Dat4e',
-    },
-    dropDownList: {
-      placeholder: 'please select...',
-    },
-    dropDownListDynamic: {
-      placeholder: 'please select...',
-    },
-    dropDownListMpicker: {
-      placeholder: 'please select...',
-    },
-    login: {
-      error: 'Error',
-      caption: 'Welcome to login',
-      placeholder1:'User name',
-      placeholder2:'Password',
-      name: 'Login',
-      reset:'Reset',
-      other:'Other login methods',
-      tip: 'Enter username and password',
-      warning1:'QQ authorization login not supported',
-      warning2:'Wechat authorized login not supported',
-      loginname: {
-          placeholder: 'Username',
-          message: 'The username cannot be empty',
-      },
-      password: {
-          placeholder: 'Password',
-          message: 'The password cannot be empty',
-      },
-      loginfailed: 'Login failed',
-    },
-    appUser: {
-      name: 'System',
-      logout: 'Logout',
-      surelogout: 'Are you sure logout?',
-      changepwd: "Change Password",
-    },
-    appTheme: {
-      caption: {
-        theme: 'Theme',
-        font: 'Font family',
-      },
-      fontFamilys: {
-          MicrosoftYaHei: 'Microsoft YaHei',
-          SimHei: 'SimHei',
-          YouYuan: 'YouYuan',
-      },
-    },
-    appFormGroup: {
-      hide: 'hide',
-      showMore: 'show more',
-    },
-    appUpdatePassword: {
-      oldPwd: 'Original password',
-      newPwd: 'New password',
-      confirmPwd: 'Confirm password',
-      sure: 'Confirm modification',
-      oldPwdErr: 'The original password cannot be empty!',
-      newPwdErr: 'New password cannot be empty!',
-      confirmPwdErr: 'The two input passwords are inconsistent!',
-    },
-    appAddressSelection: {
-      loadDataFail: 'City data loading failed'
-    },
-    appGroupSelect:{
-      groupSelect:'Group selection', 
-    },
-    appImageUpload:{
-      uploadFail:'Upload failed'
-    },
-    appOrgSelect:{
-      loadFail:'Failed to load data'
-    },
-    appTransfer:{
-      title1:'Not selected',
-      title2:'Selected',
-    },
-    appWFApproval:{
-      commit:'Commit',
-      wait:'Waiting',
-      handle:'Handle',
-      placeholder:'Please enter the content',
-      end:'End'
-    },
-    contextMenuDrag:{
-      allApp:'All applications',
-      noFind:'The app was not found'
-    },
-    filterMode:{
-      placeholder:'Conditional logic',  
-    },
-    filterTree:{
-      title1:'Add condition',
-      title2:'Add group',
-      placeholder:'Attribute', 
-    },
-    iBizGroupPicker:{
-      ok:'Ok',
-      cancel:'Cancel',
-    },
-    iBizGroupSelect:{
-      groupSelect:'Group selection'
-    },
-    tabPageExp:{
-      more:'More',
-    },
-    uploadFile:{
-      imgMsg:'Drag the picture here to replace it',
-      localUpload:'Local upload',
-      or:'Or',
-      imgMsg1:'Select from stock'
-    },
-    lockScren:{
-      title:'Set the password lock screen',
-      label:'password',
-      message:'The lock screen password cannot be empty',
-      placeholder:'Please enter the lock screen password',
-      placeholder1:'Please enter your login password',
-      message1: 'The unlock password is wrong. Please reenter it',
-      promptInformation:'Do you want to quit the system? Do you want to continue?',
-      prompt:'prompt',
-      confirmButtonText:'determine',
-      cancelButtonText:'cancel',
-    },
-    cronEditor: {
-      label: {
-        second: 'Second',
-        minute: 'Minute',
-        hour: 'Hour',
-        day: 'Day',
-        week: 'Week',
-        month: 'Month',
-        year: 'Year',
-      },
-      public : {
-        specify: 'Specify',
-        notSpecify: 'Not specify',
-        cycle: 'Cycle',
-        from: 'From',
-        to: 'to',
-        loop: 'Loop',
-        every: 'Every',
-        once: 'execute once',
-      },
-      second: 'second',
-      minute: 'minute',
-      hour: {
-        title: 'hour',
-        everyHour: 'Every hour',
-        hourStart: "o'clock start, every ",
-        onceAHour: "o'clock to execute once.",
-      },
-      day: {
-        title: 'day',
-        daily: 'Every day',
-        workDay: 'Working day',
-        dayStart: 'rd start, every ',
-        onceADay: 'rd to execute once',
-        thisMonth: 'this month',
-        lastWorkDay: 'rd, Recent working day',
-        lastDayOfMonth: 'Last day of the month',
-      },
-      month: {
-        title: 'month',
-        everyMonth: 'Every month',
-        monthStart: ' month start, every',
-        onceAMonth: ' month to execute once',
-      },
-      week: {
-        title: 'week',
-        everyWeek: 'Every week',
-        from: '',
-        to: 'from weekday',
-        start: 'start, every',
-        onceADay: 'days to execute once',
-        specifyWeek: 'Specify week',
-        weekOfMonth: 'this month',
-        weekWeek: 'week, weekday',
-        lastOfMonth: 'Last of the month',
-        week: 'weekday',
-      },
-      year: {
-        title: 'year',
-        everyYear: 'Every year',
-      },
-      message: {
-        error1: 'Date and day of the week cannot be "not specified" at the same time',
-        error2: 'Both the date and the day of the week must be "not specified"',
-      },
-    },
-    appMessagePopover: {
-      loadMore: 'Load more',
-      noMore: 'No more'
-    },
-    diskFileUpload:{
-      fileDrag: 'Drag the file here, or',
-      clickUpload: 'Click on the upload',
-      load: 'Load',
-      preview: 'preview',
-      edit: 'Edit',
-      delete: 'Delete',
-      clues: 'Individual file sizes do not exceed',
-      clues1: 'Documents not exceeding',
-      getFileFailure: 'Failed to get file list',
-      loadFailure: 'Upload file failed',
-      loadFailure1: 'Upload failed, individual file cannot exceed',
-      downloadFile: 'Download file failed',
-      downloadFile1: 'Download file failed, not get file!',
-      deleteFile: 'This action will permanently delete the file. Do you want to continue?',
-      deleteFilePrompt: 'Prompt',
-      true: 'True',
-      false: 'False',
-      deleteFileFailure: 'File deletion failed',
-      updateFailure: 'Batch update file failed',
-    },
-    diskImageUpload:{
-      preview: 'Preview',
-      OCRdiscern: 'OCRdiscern',
-      load: 'Load',
-      delete: 'Delete',
-      getImageFailure: 'Failed to get list of images',
-      loadImageFailure: 'Failed to download thumbnails',
-      loadImageFailure1: 'Failed to download thumbnail, failed to get file!',
-      loadImageFailure2:'Download image failed',
-      loadImageFailure3:'Download picture failed, no picture found!',
-      ImageIdNone: 'Picture ID does not exist!',
-      uploadImageFailure: 'Failed to upload image',
-      uploadImageFailure1: "Upload failed, only support 'GIF, JPG, PNG, BMP' format images!",
-      uploadFailure: 'Upload failed, individual image must not exceed',
-      notImageUrl: 'The image URL does not exist',
-      deleteFile: 'This action will permanently delete the file. Do you want to continue?',
-      deleteFilePrompt: 'Prompt',
-      true: 'True',
-      false: 'False',
-      deleteImageFailure:'Image deletion failed',
-      updateFailure: 'Batch update file failed',
-    },
-    appMapPosition: {
-      submit: 'Submit',
-      title: 'Please select address'
-    },
-    appSortBar: {
-      title: 'Sort'
-    },
-    appAfterTime:{
-      minutesAgo: 'minutes ago',
-      hoursAgo: 'hours ago',
-      dayAgo: 'days ago',
-      monthsAgo: 'months ago',
-      yearsAgo: 'years ago'
-  }
-};
\ No newline at end of file
+import components_en_US_Base from './components_en_US_base';
+
+function getLocaleResource(){
+    const components_en_US_OwnData = {};
+    const targetData = Object.assign(components_en_US_Base(), components_en_US_OwnData);
+    return targetData;
+}
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/components/components_en_US_base.ts

+function getLocaleResourceBase(){
+  const data:any = {
+      "404": {
+          errorText1: 'sorry，the page you visited is not exist！',
+          errorText2: 'The page you visited is not exist，please return to',
+          indexPage: 'home page',
+          continue: 'to continue browsing',
+      },
+      "500": {
+          errorText1: "sorry，there's something wrong with the server！",
+          errorText2: "There's something wrong with the server，please return to",
+          indexPage: 'home page',
+          continue: 'to continue browsing',
+      },
+      appOrgSector:{
+        successSwitch:'The switch was successful',
+        errorSwitch:'The switchover failed',
+      },
+      appAutocomplete: {
+          error: 'Error',
+          miss: 'Missing parameter ',
+          requestException: 'Request Exception！',
+      },
+      appBuild: {
+          custom: 'Customize',
+      },
+      appCheckBox: {
+          notExist: 'codelist is not existed',
+      },
+      appColumnLink: {
+        error: 'error',
+        valueItemException:"value item exception",
+        rowDataException:"table row data exception",
+      },
+      appColumnRender: {
+        select: 'please select...',
+        unsupported: 'unsupported',
+      },
+      appDashboardDesign: {
+        global: 'Global',
+      },
+      appDataUploadView: {
+        "viewtitle":"AppDataUploadView",
+        "selectfile":"Select File",
+        "uploadserver":"Upload Server",
+        "datatemplate":"Download Import Data Template",
+        "dataid":"Data ID is ",
+        "read":" read Successful",
+        "importing":"Importing",
+        "completed":"Import Completed",
+        "confirm":"OK",
+        "datatemp":"Data Template",
+        "importfailed":"Import Failed"
+      },
+      appDebugActions: {
+        button: 'Open Configuration Mode',
+      },
+      appExportExcel: {
+        total: 'All',
+        max: 'At Most',
+        row: 'Lines',
+        currentPage: 'Current Page',
+        desc:'Please enter the start page',
+        desc1:'Please enter a valid start page',
+      },
+      appFileUpload: {
+        preview: 'preview',
+        uploadText: 'Drag files here，or <em>Click</em> to upload',
+        fileTypeErrorTitle: 'File type incorrect',
+        fileTypeErrorInfo: 'Please select files with picture types，such as JPEG，GIF，PNG，BMP',
+      },
+      appFormDRUIPart: {
+        blockUITipInfo: 'Please save the major data first',
+        viewLoadComp:'After the multi data view is loaded, the subsequent form item update will be triggered',
+        save:'Relationship data save complete',
+        change:'Relationship data value change',
+        change1:'View data changes',
+        loadComp:'View loading complete',
+      },
+      appHeaderMenus: {
+        ibizlab:{
+            title: 'iBizLab',
+        },
+        publishProject:{
+            title: 'Publish Project',
+        },
+        ibizstudio:{
+            title: 'Model Design Tools',
+        },
+        ibizbbs:{
+            title: 'iBizBBS',
+        },
+      },
+      appMpicker: {
+        error: 'Error',
+        miss: 'Missing parameter ',
+        requestException: 'Request Exception！',
+      },
+      appPicker: {
+        error: 'Error',
+        miss: 'Missing parameter ',
+        requestException: 'Request Exception！',
+        newAndEdit: 'Create And Edit...',
+        systemException: 'System Error！',
+        valueitemException: 'valueitem Error！',
+        formdataException: 'formdata Error！',
+      },
+      appPickerSelectView: {
+        error: 'Error',
+        valueitemException: 'valueitem Error！',
+        formdataException: 'formdata Error！',
+        placeholder: 'Please select...',
+      },
+      appPortalDesign: {
+        customPortal: 'Custom portal',
+        save: 'Save',
+      },
+      appRangDate: {
+        placeholder: 'Please select time...',
+        from: 'from',
+        daystart: '00:00:00 to',
+        dayend: '24:00:00',
+      },
+      appRangeEditor: {
+        placeholder: 'Please select time...',
+        input: 'Please input...',
+      },
+      appStudioAction: {
+        configTitle: 'Enter the configuration of current view',
+        configButton: 'Configuration',
+        issueTitle: 'Create issues of current view',
+        issueButton: 'Create issues',
+      },
+      appTreePicker: {
+        placeholder: 'please select...',
+      },
+      dateRange: {
+        startText: 'Insurance period ： From',
+        endText: '24:00:00',
+        startPlaceholder: 'Begin Date',
+        rangeSeparatorr: ' 00:00:00 To',
+        endPlaceholder: 'End Dat4e',
+      },
+      dropDownList: {
+        placeholder: 'please select...',
+      },
+      dropDownListDynamic: {
+        placeholder: 'please select...',
+      },
+      dropDownListMpicker: {
+        placeholder: 'please select...',
+      },
+      login: {
+        error: 'Error',
+        caption: 'Welcome to login',
+        placeholder1:'User name',
+        placeholder2:'Password',
+        name: 'Login',
+        reset:'Reset',
+        other:'Other login methods',
+        tip: 'Enter username and password',
+        warning1:'QQ authorization login not supported',
+        warning2:'Wechat authorized login not supported',
+        loginname: {
+            placeholder: 'Username',
+            message: 'The username cannot be empty',
+        },
+        password: {
+            placeholder: 'Password',
+            message: 'The password cannot be empty',
+        },
+        loginfailed: 'Login failed',
+      },
+      appUser: {
+        name: 'System',
+        logout: 'Logout',
+        surelogout: 'Are you sure logout?',
+        changepwd: "Change Password",
+      },
+      appTheme: {
+        caption: {
+          theme: 'Theme',
+          font: 'Font family',
+        },
+        fontFamilys: {
+            MicrosoftYaHei: 'Microsoft YaHei',
+            SimHei: 'SimHei',
+            YouYuan: 'YouYuan',
+        },
+      },
+      appFormGroup: {
+        hide: 'hide',
+        showMore: 'show more',
+      },
+      appUpdatePassword: {
+        oldPwd: 'Original password',
+        newPwd: 'New password',
+        confirmPwd: 'Confirm password',
+        sure: 'Confirm modification',
+        oldPwdErr: 'The original password cannot be empty!',
+        newPwdErr: 'New password cannot be empty!',
+        confirmPwdErr: 'The two input passwords are inconsistent!',
+      },
+      appAddressSelection: {
+        loadDataFail: 'City data loading failed'
+      },
+      appGroupSelect:{
+        groupSelect:'Group selection', 
+      },
+      appImageUpload:{
+        uploadFail:'Upload failed'
+      },
+      appOrgSelect:{
+        loadFail:'Failed to load data'
+      },
+      appTransfer:{
+        title1:'Not selected',
+        title2:'Selected',
+      },
+      appWFApproval:{
+        commit:'Commit',
+        wait:'Waiting',
+        handle:'Handle',
+        placeholder:'Please enter the content',
+        end:'End'
+      },
+      contextMenuDrag:{
+        allApp:'All applications',
+        noFind:'The app was not found'
+      },
+      filterMode:{
+        placeholder:'Conditional logic',  
+      },
+      filterTree:{
+        title1:'Add condition',
+        title2:'Add group',
+        placeholder:'Attribute', 
+      },
+      iBizGroupPicker:{
+        ok:'Ok',
+        cancel:'Cancel',
+      },
+      iBizGroupSelect:{
+        groupSelect:'Group selection'
+      },
+      tabPageExp:{
+        more:'More',
+      },
+      uploadFile:{
+        imgMsg:'Drag the picture here to replace it',
+        localUpload:'Local upload',
+        or:'Or',
+        imgMsg1:'Select from stock'
+      },
+      lockScren:{
+        title:'Set the password lock screen',
+        label:'password',
+        message:'The lock screen password cannot be empty',
+        placeholder:'Please enter the lock screen password',
+        placeholder1:'Please enter your login password',
+        message1: 'The unlock password is wrong. Please reenter it',
+        promptInformation:'Do you want to quit the system? Do you want to continue?',
+        prompt:'prompt',
+        confirmButtonText:'determine',
+        cancelButtonText:'cancel',
+      },
+      cronEditor: {
+        label: {
+          second: 'Second',
+          minute: 'Minute',
+          hour: 'Hour',
+          day: 'Day',
+          week: 'Week',
+          month: 'Month',
+          year: 'Year',
+        },
+        public : {
+          specify: 'Specify',
+          notSpecify: 'Not specify',
+          cycle: 'Cycle',
+          from: 'From',
+          to: 'to',
+          loop: 'Loop',
+          every: 'Every',
+          once: 'execute once',
+        },
+        second: 'second',
+        minute: 'minute',
+        hour: {
+          title: 'hour',
+          everyHour: 'Every hour',
+          hourStart: "o'clock start, every ",
+          onceAHour: "o'clock to execute once.",
+        },
+        day: {
+          title: 'day',
+          daily: 'Every day',
+          workDay: 'Working day',
+          dayStart: 'rd start, every ',
+          onceADay: 'rd to execute once',
+          thisMonth: 'this month',
+          lastWorkDay: 'rd, Recent working day',
+          lastDayOfMonth: 'Last day of the month',
+        },
+        month: {
+          title: 'month',
+          everyMonth: 'Every month',
+          monthStart: ' month start, every',
+          onceAMonth: ' month to execute once',
+        },
+        week: {
+          title: 'week',
+          everyWeek: 'Every week',
+          from: '',
+          to: 'from weekday',
+          start: 'start, every',
+          onceADay: 'days to execute once',
+          specifyWeek: 'Specify week',
+          weekOfMonth: 'this month',
+          weekWeek: 'week, weekday',
+          lastOfMonth: 'Last of the month',
+          week: 'weekday',
+        },
+        year: {
+          title: 'year',
+          everyYear: 'Every year',
+        },
+        message: {
+          error1: 'Date and day of the week cannot be "not specified" at the same time',
+          error2: 'Both the date and the day of the week must be "not specified"',
+        },
+      },
+      appMessagePopover: {
+        loadMore: 'Load more',
+        noMore: 'No more'
+      },
+      diskFileUpload:{
+        fileDrag: 'Drag the file here, or',
+        clickUpload: 'Click on the upload',
+        load: 'Load',
+        preview: 'preview',
+        edit: 'Edit',
+        delete: 'Delete',
+        clues: 'Individual file sizes do not exceed',
+        clues1: 'Documents not exceeding',
+        getFileFailure: 'Failed to get file list',
+        loadFailure: 'Upload file failed',
+        loadFailure1: 'Upload failed, individual file cannot exceed',
+        downloadFile: 'Download file failed',
+        downloadFile1: 'Download file failed, not get file!',
+        deleteFile: 'This action will permanently delete the file. Do you want to continue?',
+        deleteFilePrompt: 'Prompt',
+        true: 'True',
+        false: 'False',
+        deleteFileFailure: 'File deletion failed',
+        updateFailure: 'Batch update file failed',
+      },
+      diskImageUpload:{
+        preview: 'Preview',
+        OCRdiscern: 'OCRdiscern',
+        load: 'Load',
+        delete: 'Delete',
+        getImageFailure: 'Failed to get list of images',
+        loadImageFailure: 'Failed to download thumbnails',
+        loadImageFailure1: 'Failed to download thumbnail, failed to get file!',
+        loadImageFailure2:'Download image failed',
+        loadImageFailure3:'Download picture failed, no picture found!',
+        ImageIdNone: 'Picture ID does not exist!',
+        uploadImageFailure: 'Failed to upload image',
+        uploadImageFailure1: "Upload failed, only support 'GIF, JPG, PNG, BMP' format images!",
+        uploadFailure: 'Upload failed, individual image must not exceed',
+        notImageUrl: 'The image URL does not exist',
+        deleteFile: 'This action will permanently delete the file. Do you want to continue?',
+        deleteFilePrompt: 'Prompt',
+        true: 'True',
+        false: 'False',
+        deleteImageFailure:'Image deletion failed',
+        updateFailure: 'Batch update file failed',
+      },
+      appMapPosition: {
+        submit: 'Submit',
+        title: 'Please select address'
+      },
+      appSortBar: {
+        title: 'Sort'
+      },
+      appAfterTime:{
+        minutesAgo: 'minutes ago',
+        hoursAgo: 'hours ago',
+        dayAgo: 'days ago',
+        monthsAgo: 'months ago',
+        yearsAgo: 'years ago'
+      }
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/components/components_zh_CN.ts

-export default {
-    "404": {
-        errorText1: '抱歉，您访问的页面不存在！',
-        errorText2: '您要找的页面不存在，请返回',
-        indexPage: '首页',
-        continue: '继续浏览',
-    },
-    "500": {
-        errorText1: '抱歉，服务器出错了！',
-        errorText2: '服务器出错了，请返回 ',
-        indexPage: '首页',
-        continue: '继续浏览',
-    },
-    appOrgSector:{
-      successSwitch:'切换成功',
-      errorSwitch:'切换失败',
-    },
-    appAutocomplete: {
-        error: '错误',
-        miss: '缺少参数',
-        requestException: '请求异常！',
-    },
-    appBuild: {
-      custom: '定制',
-    },
-    appCheckBox: {
-        notExist: '代码表不存在',
-    },
-    appColumnLink: {
-      error: '错误',
-      valueItemException:"值项异常",
-      rowDataException:"表格行数据异常",
-    },
-    appColumnRender: {
-      select: '请选择...',
-      unsupported: '不支持',
-    },
-    appDashboardDesign: {
-      global: '全局',
-    },
-    appDataUploadView: {
-      "viewtitle":"应用数据导入视图",
-      "selectfile":"选取文件",
-      "uploadserver":"上传服务器",
-      "datatemplate":"下载导入数据模板",
-      "dataid":"数据标识为",
-      "read":"读取成功",
-      "importing":"导入中",
-      "completed":"导入完成",
-      "confirm":"确认",
-      "datatemp":"导入数据模板",
-      "importfailed":"导入失败"
-    },
-    appDebugActions:{
-      button: '开启配置模式',
-    },
-    appExportExcel: {
-      total: '全部',
-      max: '最大',
-      row: '行',
-      currentPage: '当前页',
-      desc:'请输入起始页',
-      desc1:'请输入有效的起始页',
-    },
-    appFileUpload: {
-      preview: '查看',
-      uploadText: '将文件拖到此处，或<em>点击上传</em>',
-      uploadError: '上传失败',
-      fileTypeErrorTitle: '文件类型错误',
-      fileTypeErrorInfo: '请选择图片类型的文件，如JPEG，GIF，PNG，BMP',
-    },
-    appFormDRUIPart: {
-      blockUITipInfo: '请先保存主数据',
-      viewLoadComp:'多数据视图加载完成，触发后续表单项更新',
-      save:'关系数据保存完成',
-      change:'关系数据值变化',
-      change1:'视图数据变化',
-      loadComp:'视图加载完成',
-    },
-    appHeaderMenus: {
-      ibizlab:{
-          title: 'iBiz开放平台',
-      },
-      publishProject:{
-          title: '项目文件',
-      },
-      ibizstudio:{
-          title: '模型设计工具',
-      },
-      ibizbbs:{
-          title: 'iBiz论坛',
-      },
-    },
-    appMpicker: {
-      error: '错误',
-      miss: '缺少参数',
-      requestException: '请求异常！',
-    },
-    appPicker: {
-      error: '错误',
-      miss: '缺少参数',
-      requestException: '请求异常！',
-      newAndEdit: '创建并编辑...',
-      systemException: '系统异常！',
-      valueitemException: '值项异常！',
-      formdataException: '表单数据异常！',
-    },
-    appPickerSelectView: {
-      error: '错误',
-      valueitemException: '值项异常！',
-      formdataException: '表单数据异常！',
-      placeholder: '请选择...',
-    },
-    appPortalDesign: {
-      customPortal: '自定义门户',
-      save: '保存',
-    },
-    appRangDate: {
-      placeholder: '请选择时间...',
-      from: '自',
-      daystart: '日 0 时 起 至',
-      dayend: '日 24 时 止',
-    },
-    appRangeEditor: {
-      placeholder: '请选择时间...',
-      input: '请输入...',
-    },
-    appStudioAction: {
-      configTitle: '进入当前视图配置界面',
-      configButton: '配置',
-      issueTitle: '建立当前界面的issues',
-      issueButton: '新建issues',
-    },
-    appTreePicker: {
-      placeholder: '请选择...',
-    },
-    dateRange: {
-      startText: '保险期限 ： 自',
-      endText: '日 24 时 止',
-      startPlaceholder: '开始日期',
-      rangeSeparatorr: ' 0 时起 至',
-      endPlaceholder: '结束日期',
-    },
-    dropDownList: {
-      placeholder: '请选择...',
-    },
-    dropDownListDynamic: {
-      placeholder: '请选择...',
-    },
-    dropDownListMpicker: {
-      placeholder: '请选择...',
-    },
-    login: {
-      error: '错误',
-      caption: '欢迎登录',
-      placeholder1:'用户名',
-      placeholder2:'密码',
-      name: '登录',
-      reset:'重置',
-      other:'其他登录方式',
-      tip: '输入用户名和密码',
-      warning1:'qq授权登录暂未支持',
-      warning2:'微信授权登录暂未支持',
-      loginname: {
-          placeholder: '请输入用户名',
-          message: '用户名不能为空',
-      },
-      password: {
-          placeholder: '请输入密码',
-          message: '密码不能为空',
-      },
-      loginfailed: '登录失败',
-    },
-    appUser: {
-      name: '系统管理员',
-      logout: '退出登录',
-      surelogout: '确认要退出登录？',
-      changepwd: "修改密码",
-    },
-    appTheme: {
-      caption: {
-        theme: '主题',
-        font: '字体',
-      },
-      fontFamilys: {
-          MicrosoftYaHei: '微软雅黑',
-          SimHei: '黑体',
-          YouYuan: '幼圆',
-      },
-    },
-    appFormGroup: {
-      hide: '隐藏字段',
-      showMore: '显示更多字段',
-    },
-    appUpdatePassword: {
-      oldPwd: '原密码',
-      newPwd: '新密码',
-      confirmPwd: '确认密码',
-      sure: '确认修改',
-      oldPwdErr: '原密码不能为空！',
-      newPwdErr: '新密码不能为空！',
-      confirmPwdErr: '两次输入密码不一致！',
-    },
-    appAddressSelection: {
-      loadDataFail: '城市数据加载失败'
-    },
-    appGroupSelect:{
-      groupSelect:'分组选择', 
-    },
-    appImageUpload:{
-      uploadFail:'上传失败'
-    },
-    appOrgSelect:{
-      loadFail:'加载数据失败'
-    },
-    appTransfer:{
-      title1:'未选择',
-      title2:'已选择',
-    },
-    appWFApproval:{
-      commit:'提交',
-      wait:'等待',
-      handle:'处理',
-      placeholder:'请输入内容',
-      end:'结束'
-    },
-    contextMenuDrag:{
-      allApp:'全部应用',
-      noFind:'未找到该应用'
-    },
-    filterMode:{
-      placeholder:'条件逻辑',  
-    },
-    filterTree:{
-      title1:'添加条件',
-      title2:'添加组',
-      placeholder:'属性', 
-    },
-    iBizGroupPicker:{
-      ok:'确认',
-      cancel:'取消',
-    },
-    iBizGroupSelect:{
-      groupSelect:'分组选择'
-    },
-    tabPageExp:{
-      more:'更多',
-    },
-    uploadFile:{
-      imgMsg:'将图片拖到这里替换',
-      localUpload:'本地上传',
-      or:'或',
-      imgMsg1:'从素材库选择'
-    },
-    lockScren:{
-      title:'设置锁屏密码',
-      label:'锁屏密码',
-      message:'锁屏密码不能为空',
-      placeholder:'请输入锁屏密码',
-      placeholder1:'请输入登录密码',
-      message1: '解锁密码错误,请重新输入',
-      promptInformation:'是否退出系统, 是否继续?',
-      prompt:'提示',
-      confirmButtonText:'确定',
-      cancelButtonText:'取消',
-    },
-    cronEditor: {
-      label: {
-        second: '秒',
-        minute: '分',
-        hour: '时',
-        day: '日',
-        week: '周',
-        month: '月',
-        year: '年',
-      },
-      public : {
-        specify: '指定',
-        notSpecify: '不指定',
-        cycle: '周期',
-        from: '从',
-        to: '至',
-        loop: '循环',
-        every: '每',
-        once: '执行一次',
-      },
-      second: '秒',
-      minute: '分',
-      hour: {
-        title: '时',
-        everyHour: '每时',
-        hourStart: '时开始，每',
-        onceAHour: '时执行一次',
-      },
-      day: {
-        title: '日',
-        daily: '每日',
-        workDay: '工作日',
-        dayStart: '日开始，每',
-        onceADay: '日执行一次',
-        thisMonth: '本月',
-        lastWorkDay: '号，最近的工作日',
-        lastDayOfMonth: '本月最后一天',
-      },
-      month: {
-        title: '月',
-        everyMonth: '每月',
-        monthStart: '月开始，每',
-        onceAMonth: '月执行一次',
-      },
-      week: {
-        title: '周',
-        everyWeek: '每周',
-        from: '从星期',
-        to: '至星期',
-        start: '开始，每',
-        onceADay: '天执行一次',
-        specifyWeek: '指定周',
-        weekOfMonth: '本月第',
-        weekWeek: '周，星期',
-        lastOfMonth: '本月最后一个',
-        week: '星期',
-      },
-      year: {
-        title: '年',
-        everyYear: '每年',
-      },
-      message: {
-        error1: '日期与星期不可以同时为“不指定”',
-        error2: '日期与星期必须有一个为“不指定”',
-      },
-    },
-    appMessagePopover: {
-      loadMore: '加载更多',
-      noMore: '没有更多了'
-    },
-    diskFileUpload:{
-      fileDrag: '将文件拖到此处，或',
-      clickUpload: '点击上传',
-      load: '下载',
-      preview: '预览',
-      edit: '编辑',
-      delete: '删除',
-      clues: '单个文件大小不超过',
-      clues1: '文件不超过',
-      getFileFailure: '获取文件列表失败',
-      loadFailure: '上传文件失败',
-      loadFailure1: '上传失败,单个文件不得超过',
-      downloadFile: '下载文件失败',
-      downloadFile1: '下载文件失败,未获取到文件!',
-      deleteFile: '此操作将永久删除该文件, 是否继续?',
-      deleteFilePrompt: '提示',
-      true: '确定',
-      false: '取消',
-      deleteFileFailure: '删除文件失败',
-      updateFailure: '批量更新文件失败',
-    },
-    diskImageUpload:{
-      preview: '预览',
-      OCRdiscern: 'ORC识别',
-      load: '下载',
-      delete: '删除',
-      getImageFailure: '获取图片列表失败',
-      loadImageFailure: '下载缩略图失败',
-      loadImageFailure1: '下载缩略图失败,未获取到文件!',
-      loadImageFailure2:'下载图片失败',
-      loadImageFailure3:'下载图片失败,未找到图片!',
-      ImageIdNone: '图片id不存在!',
-      uploadImageFailure: '上传图片失败',
-      uploadImageFailure1: '上传失败,仅支持＇gif，jpg，png，bmp＇格式的图片!',
-      uploadFailure: '上传失败,单个图片不得超过',
-      notImageUrl: '图片url不存在',
-      deleteFile: '此操作将永久删除该文件, 是否继续?',
-      deleteFilePrompt: '提示',
-      true: '确定',
-      false: '取消',
-      deleteImageFailure:'删除图片失败',
-      updateFailure: '批量更新文件失败',
-    },
-    appMapPosition: {
-      submit: '确认',
-      title: '请选择地址'
-    },
-    appSortBar: {
-      title: '排序'
-    },
-    appAfterTime:{
-      minutesAgo: '分钟前',
-      hoursAgo: '小时前',
-      dayAgo: '天前',
-      monthsAgo: '月前',
-      yearsAgo: '年前'
-  }
-};
\ No newline at end of file
+import components_zh_CN_Base from './components_zh_CN_base';
+
+function getLocaleResource(){
+    const components_zh_CN_OwnData = {};
+    const targetData = Object.assign(components_zh_CN_Base(), components_zh_CN_OwnData);
+    return targetData;
+}
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/components/components_zh_CN_base.ts

+function getLocaleResourceBase(){
+  const data:any = {
+      "404": {
+          errorText1: '抱歉，您访问的页面不存在！',
+          errorText2: '您要找的页面不存在，请返回',
+          indexPage: '首页',
+          continue: '继续浏览',
+      },
+      "500": {
+          errorText1: '抱歉，服务器出错了！',
+          errorText2: '服务器出错了，请返回 ',
+          indexPage: '首页',
+          continue: '继续浏览',
+      },
+      appOrgSector:{
+        successSwitch:'切换成功',
+        errorSwitch:'切换失败',
+      },
+      appAutocomplete: {
+          error: '错误',
+          miss: '缺少参数',
+          requestException: '请求异常！',
+      },
+      appBuild: {
+        custom: '定制',
+      },
+      appCheckBox: {
+          notExist: '代码表不存在',
+      },
+      appColumnLink: {
+        error: '错误',
+        valueItemException:"值项异常",
+        rowDataException:"表格行数据异常",
+      },
+      appColumnRender: {
+        select: '请选择...',
+        unsupported: '不支持',
+      },
+      appDashboardDesign: {
+        global: '全局',
+      },
+      appDataUploadView: {
+        "viewtitle":"应用数据导入视图",
+        "selectfile":"选取文件",
+        "uploadserver":"上传服务器",
+        "datatemplate":"下载导入数据模板",
+        "dataid":"数据标识为",
+        "read":"读取成功",
+        "importing":"导入中",
+        "completed":"导入完成",
+        "confirm":"确认",
+        "datatemp":"导入数据模板",
+        "importfailed":"导入失败"
+      },
+      appDebugActions:{
+        button: '开启配置模式',
+      },
+      appExportExcel: {
+        total: '全部',
+        max: '最大',
+        row: '行',
+        currentPage: '当前页',
+        desc:'请输入起始页',
+        desc1:'请输入有效的起始页',
+      },
+      appFileUpload: {
+        preview: '查看',
+        uploadText: '将文件拖到此处，或<em>点击上传</em>',
+        uploadError: '上传失败',
+        fileTypeErrorTitle: '文件类型错误',
+        fileTypeErrorInfo: '请选择图片类型的文件，如JPEG，GIF，PNG，BMP',
+      },
+      appFormDRUIPart: {
+        blockUITipInfo: '请先保存主数据',
+        viewLoadComp:'多数据视图加载完成，触发后续表单项更新',
+        save:'关系数据保存完成',
+        change:'关系数据值变化',
+        change1:'视图数据变化',
+        loadComp:'视图加载完成',
+      },
+      appHeaderMenus: {
+        ibizlab:{
+            title: 'iBiz开放平台',
+        },
+        publishProject:{
+            title: '项目文件',
+        },
+        ibizstudio:{
+            title: '模型设计工具',
+        },
+        ibizbbs:{
+            title: 'iBiz论坛',
+        },
+      },
+      appMpicker: {
+        error: '错误',
+        miss: '缺少参数',
+        requestException: '请求异常！',
+      },
+      appPicker: {
+        error: '错误',
+        miss: '缺少参数',
+        requestException: '请求异常！',
+        newAndEdit: '创建并编辑...',
+        systemException: '系统异常！',
+        valueitemException: '值项异常！',
+        formdataException: '表单数据异常！',
+      },
+      appPickerSelectView: {
+        error: '错误',
+        valueitemException: '值项异常！',
+        formdataException: '表单数据异常！',
+        placeholder: '请选择...',
+      },
+      appPortalDesign: {
+        customPortal: '自定义门户',
+        save: '保存',
+      },
+      appRangDate: {
+        placeholder: '请选择时间...',
+        from: '自',
+        daystart: '日 0 时 起 至',
+        dayend: '日 24 时 止',
+      },
+      appRangeEditor: {
+        placeholder: '请选择时间...',
+        input: '请输入...',
+      },
+      appStudioAction: {
+        configTitle: '进入当前视图配置界面',
+        configButton: '配置',
+        issueTitle: '建立当前界面的issues',
+        issueButton: '新建issues',
+      },
+      appTreePicker: {
+        placeholder: '请选择...',
+      },
+      dateRange: {
+        startText: '保险期限 ： 自',
+        endText: '日 24 时 止',
+        startPlaceholder: '开始日期',
+        rangeSeparatorr: ' 0 时起 至',
+        endPlaceholder: '结束日期',
+      },
+      dropDownList: {
+        placeholder: '请选择...',
+      },
+      dropDownListDynamic: {
+        placeholder: '请选择...',
+      },
+      dropDownListMpicker: {
+        placeholder: '请选择...',
+      },
+      login: {
+        error: '错误',
+        caption: '欢迎登录',
+        placeholder1:'用户名',
+        placeholder2:'密码',
+        name: '登录',
+        reset:'重置',
+        other:'其他登录方式',
+        tip: '输入用户名和密码',
+        warning1:'qq授权登录暂未支持',
+        warning2:'微信授权登录暂未支持',
+        loginname: {
+            placeholder: '请输入用户名',
+            message: '用户名不能为空',
+        },
+        password: {
+            placeholder: '请输入密码',
+            message: '密码不能为空',
+        },
+        loginfailed: '登录失败',
+      },
+      appUser: {
+        name: '系统管理员',
+        logout: '退出登录',
+        surelogout: '确认要退出登录？',
+        changepwd: "修改密码",
+      },
+      appTheme: {
+        caption: {
+          theme: '主题',
+          font: '字体',
+        },
+        fontFamilys: {
+            MicrosoftYaHei: '微软雅黑',
+            SimHei: '黑体',
+            YouYuan: '幼圆',
+        },
+      },
+      appFormGroup: {
+        hide: '隐藏字段',
+        showMore: '显示更多字段',
+      },
+      appUpdatePassword: {
+        oldPwd: '原密码',
+        newPwd: '新密码',
+        confirmPwd: '确认密码',
+        sure: '确认修改',
+        oldPwdErr: '原密码不能为空！',
+        newPwdErr: '新密码不能为空！',
+        confirmPwdErr: '两次输入密码不一致！',
+      },
+      appAddressSelection: {
+        loadDataFail: '城市数据加载失败'
+      },
+      appGroupSelect:{
+        groupSelect:'分组选择', 
+      },
+      appImageUpload:{
+        uploadFail:'上传失败'
+      },
+      appOrgSelect:{
+        loadFail:'加载数据失败'
+      },
+      appTransfer:{
+        title1:'未选择',
+        title2:'已选择',
+      },
+      appWFApproval:{
+        commit:'提交',
+        wait:'等待',
+        handle:'处理',
+        placeholder:'请输入内容',
+        end:'结束'
+      },
+      contextMenuDrag:{
+        allApp:'全部应用',
+        noFind:'未找到该应用'
+      },
+      filterMode:{
+        placeholder:'条件逻辑',  
+      },
+      filterTree:{
+        title1:'添加条件',
+        title2:'添加组',
+        placeholder:'属性', 
+      },
+      iBizGroupPicker:{
+        ok:'确认',
+        cancel:'取消',
+      },
+      iBizGroupSelect:{
+        groupSelect:'分组选择'
+      },
+      tabPageExp:{
+        more:'更多',
+      },
+      uploadFile:{
+        imgMsg:'将图片拖到这里替换',
+        localUpload:'本地上传',
+        or:'或',
+        imgMsg1:'从素材库选择'
+      },
+      lockScren:{
+        title:'设置锁屏密码',
+        label:'锁屏密码',
+        message:'锁屏密码不能为空',
+        placeholder:'请输入锁屏密码',
+        placeholder1:'请输入登录密码',
+        message1: '解锁密码错误,请重新输入',
+        promptInformation:'是否退出系统, 是否继续?',
+        prompt:'提示',
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+      },
+      cronEditor: {
+        label: {
+          second: '秒',
+          minute: '分',
+          hour: '时',
+          day: '日',
+          week: '周',
+          month: '月',
+          year: '年',
+        },
+        public : {
+          specify: '指定',
+          notSpecify: '不指定',
+          cycle: '周期',
+          from: '从',
+          to: '至',
+          loop: '循环',
+          every: '每',
+          once: '执行一次',
+        },
+        second: '秒',
+        minute: '分',
+        hour: {
+          title: '时',
+          everyHour: '每时',
+          hourStart: '时开始，每',
+          onceAHour: '时执行一次',
+        },
+        day: {
+          title: '日',
+          daily: '每日',
+          workDay: '工作日',
+          dayStart: '日开始，每',
+          onceADay: '日执行一次',
+          thisMonth: '本月',
+          lastWorkDay: '号，最近的工作日',
+          lastDayOfMonth: '本月最后一天',
+        },
+        month: {
+          title: '月',
+          everyMonth: '每月',
+          monthStart: '月开始，每',
+          onceAMonth: '月执行一次',
+        },
+        week: {
+          title: '周',
+          everyWeek: '每周',
+          from: '从星期',
+          to: '至星期',
+          start: '开始，每',
+          onceADay: '天执行一次',
+          specifyWeek: '指定周',
+          weekOfMonth: '本月第',
+          weekWeek: '周，星期',
+          lastOfMonth: '本月最后一个',
+          week: '星期',
+        },
+        year: {
+          title: '年',
+          everyYear: '每年',
+        },
+        message: {
+          error1: '日期与星期不可以同时为“不指定”',
+          error2: '日期与星期必须有一个为“不指定”',
+        },
+      },
+      appMessagePopover: {
+        loadMore: '加载更多',
+        noMore: '没有更多了'
+      },
+      diskFileUpload:{
+        fileDrag: '将文件拖到此处，或',
+        clickUpload: '点击上传',
+        load: '下载',
+        preview: '预览',
+        edit: '编辑',
+        delete: '删除',
+        clues: '单个文件大小不超过',
+        clues1: '文件不超过',
+        getFileFailure: '获取文件列表失败',
+        loadFailure: '上传文件失败',
+        loadFailure1: '上传失败,单个文件不得超过',
+        downloadFile: '下载文件失败',
+        downloadFile1: '下载文件失败,未获取到文件!',
+        deleteFile: '此操作将永久删除该文件, 是否继续?',
+        deleteFilePrompt: '提示',
+        true: '确定',
+        false: '取消',
+        deleteFileFailure: '删除文件失败',
+        updateFailure: '批量更新文件失败',
+      },
+      diskImageUpload:{
+        preview: '预览',
+        OCRdiscern: 'ORC识别',
+        load: '下载',
+        delete: '删除',
+        getImageFailure: '获取图片列表失败',
+        loadImageFailure: '下载缩略图失败',
+        loadImageFailure1: '下载缩略图失败,未获取到文件!',
+        loadImageFailure2:'下载图片失败',
+        loadImageFailure3:'下载图片失败,未找到图片!',
+        ImageIdNone: '图片id不存在!',
+        uploadImageFailure: '上传图片失败',
+        uploadImageFailure1: '上传失败,仅支持＇gif，jpg，png，bmp＇格式的图片!',
+        uploadFailure: '上传失败,单个图片不得超过',
+        notImageUrl: '图片url不存在',
+        deleteFile: '此操作将永久删除该文件, 是否继续?',
+        deleteFilePrompt: '提示',
+        true: '确定',
+        false: '取消',
+        deleteImageFailure:'删除图片失败',
+        updateFailure: '批量更新文件失败',
+      },
+      appMapPosition: {
+        submit: '确认',
+        title: '请选择地址'
+      },
+      appSortBar: {
+        title: '排序'
+      },
+      appAfterTime:{
+        minutesAgo: '分钟前',
+        hoursAgo: '小时前',
+        dayAgo: '天前',
+        monthsAgo: '月前',
+        yearsAgo: '年前'
+      }
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_en_US.ts

+import PayOpenAccess_en_US_Base from './pay-open-access_en_US_base';
 
-export default {
-  fields: {
-    id: "开放平台接入标识",
-    name: "开放平台",
-    open_type: "开放平台类型",
-    access_key: "AccessKey(AppId)",
-    secret_key: "SecretKey(AppSecret)",
-    region_id: "RegionId",
-    access_token: "管理账号token",
-    expires_time: "管理账号token过期时间",
-    disabled: "是否禁用",
-    redirect_uri: "RedirectURI",
-    notify_url: "NotifyUrl",
-    agent_id: "AGENT_ID",
-  },
-	views: {
-		gridview: {
-			caption: "支付平台",
-      		title: "支付平台表格视图",
-		},
-		pickupgridview: {
-			caption: "支付平台",
-      		title: "支付平台选择表格视图",
-		},
-		pickupview: {
-			caption: "支付平台",
-      		title: "支付平台数据选择视图",
-		},
-		editview: {
-			caption: "支付平台",
-      		title: "支付平台编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "开放平台接入标识", 
-			srfmajortext: "开放平台", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			accessname: "开放平台", 
-			open_type: "开放平台类型", 
-			access_key: "AccessKey(AppId)", 
-			secret_key: "SecretKey(AppSecret)", 
-			region_id: "RegionId", 
-			access_token: "管理账号token", 
-			expires_time: "管理账号token过期时间", 
-			redirect_uri: "RedirectURI", 
-			notify_url: "NotifyUrl", 
-			agent_id: "AGENT_ID", 
-			disabled: "是否禁用", 
-			accessid: "开放平台接入标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			accessname: "开放平台",
-			open_type: "开放平台类型",
-			region_id: "RegionId",
-			redirect_uri: "RedirectURI",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		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
+function getLocaleResource(){
+    const PayOpenAccess_en_US_OwnData = {};
+    const targetData = Object.assign(PayOpenAccess_en_US_Base(), PayOpenAccess_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("开放平台接入标识",null),
+		name: commonLogic.appcommonhandle("开放平台",null),
+		open_type: commonLogic.appcommonhandle("开放平台类型",null),
+		access_key: commonLogic.appcommonhandle("AccessKey(AppId)",null),
+		secret_key: commonLogic.appcommonhandle("SecretKey(AppSecret)",null),
+		region_id: commonLogic.appcommonhandle("RegionId",null),
+		access_token: commonLogic.appcommonhandle("管理账号token",null),
+		expires_time: commonLogic.appcommonhandle("管理账号token过期时间",null),
+		disabled: commonLogic.appcommonhandle("是否禁用",null),
+		redirect_uri: commonLogic.appcommonhandle("RedirectURI",null),
+		notify_url: commonLogic.appcommonhandle("NotifyUrl",null),
+		agent_id: commonLogic.appcommonhandle("AGENT_ID",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: {
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("开放平台接入标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("开放平台",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				accessname: commonLogic.appcommonhandle("开放平台",null), 
+				open_type: commonLogic.appcommonhandle("开放平台类型",null), 
+				access_key: commonLogic.appcommonhandle("AccessKey(AppId)",null), 
+				secret_key: commonLogic.appcommonhandle("SecretKey(AppSecret)",null), 
+				region_id: commonLogic.appcommonhandle("RegionId",null), 
+				access_token: commonLogic.appcommonhandle("管理账号token",null), 
+				expires_time: commonLogic.appcommonhandle("管理账号token过期时间",null), 
+				redirect_uri: commonLogic.appcommonhandle("RedirectURI",null), 
+				notify_url: commonLogic.appcommonhandle("NotifyUrl",null), 
+				agent_id: commonLogic.appcommonhandle("AGENT_ID",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				accessid: commonLogic.appcommonhandle("开放平台接入标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				accessname: commonLogic.appcommonhandle("开放平台",null),
+				open_type: commonLogic.appcommonhandle("开放平台类型",null),
+				region_id: commonLogic.appcommonhandle("RegionId",null),
+				redirect_uri: commonLogic.appcommonhandle("RedirectURI",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("Export Data Model",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("Save",null),
+				tip: commonLogic.appcommonhandle("Save",null),
+			},
+			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/pay-open-access/pay-open-access_zh_CN.ts

-export default {
-  fields: {
-    id: "开放平台接入标识",
-    name: "开放平台",
-    open_type: "开放平台类型",
-    access_key: "AccessKey(AppId)",
-    secret_key: "SecretKey(AppSecret)",
-    region_id: "RegionId",
-    access_token: "管理账号token",
-    expires_time: "管理账号token过期时间",
-    disabled: "是否禁用",
-    redirect_uri: "RedirectURI",
-    notify_url: "NotifyUrl",
-    agent_id: "AGENT_ID",
-  },
-	views: {
-		gridview: {
-			caption: "支付平台",
-      		title: "支付平台表格视图",
-		},
-		pickupgridview: {
-			caption: "支付平台",
-      		title: "支付平台选择表格视图",
-		},
-		pickupview: {
-			caption: "支付平台",
-      		title: "支付平台数据选择视图",
-		},
-		editview: {
-			caption: "支付平台",
-      		title: "支付平台编辑视图",
-		},
-	},
-	main_form: {
-		details: {
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "开放平台接入标识", 
-			srfmajortext: "开放平台", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			accessname: "开放平台", 
-			open_type: "开放平台类型", 
-			access_key: "AccessKey(AppId)", 
-			secret_key: "SecretKey(AppSecret)", 
-			region_id: "RegionId", 
-			access_token: "管理账号token", 
-			expires_time: "管理账号token过期时间", 
-			redirect_uri: "RedirectURI", 
-			notify_url: "NotifyUrl", 
-			agent_id: "AGENT_ID", 
-			disabled: "是否禁用", 
-			accessid: "开放平台接入标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			accessname: "开放平台",
-			open_type: "开放平台类型",
-			region_id: "RegionId",
-			redirect_uri: "RedirectURI",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-		},
-		uiactions: {
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "保存",
-			tip: "保存",
-		},
-		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
+import PayOpenAccess_zh_CN_Base from './pay-open-access_zh_CN_base';
+
+function getLocaleResource(){
+    const PayOpenAccess_zh_CN_OwnData = {};
+    const targetData = Object.assign(PayOpenAccess_zh_CN_Base(), PayOpenAccess_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-open-access/pay-open-access_zh_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("开放平台接入标识",null),
+		name: commonLogic.appcommonhandle("开放平台",null),
+		open_type: commonLogic.appcommonhandle("开放平台类型",null),
+		access_key: commonLogic.appcommonhandle("AccessKey(AppId)",null),
+		secret_key: commonLogic.appcommonhandle("SecretKey(AppSecret)",null),
+		region_id: commonLogic.appcommonhandle("RegionId",null),
+		access_token: commonLogic.appcommonhandle("管理账号token",null),
+		expires_time: commonLogic.appcommonhandle("管理账号token过期时间",null),
+		disabled: commonLogic.appcommonhandle("是否禁用",null),
+		redirect_uri: commonLogic.appcommonhandle("RedirectURI",null),
+		notify_url: commonLogic.appcommonhandle("NotifyUrl",null),
+		agent_id: commonLogic.appcommonhandle("AGENT_ID",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: {
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("开放平台接入标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("开放平台",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				accessname: commonLogic.appcommonhandle("开放平台",null), 
+				open_type: commonLogic.appcommonhandle("开放平台类型",null), 
+				access_key: commonLogic.appcommonhandle("AccessKey(AppId)",null), 
+				secret_key: commonLogic.appcommonhandle("SecretKey(AppSecret)",null), 
+				region_id: commonLogic.appcommonhandle("RegionId",null), 
+				access_token: commonLogic.appcommonhandle("管理账号token",null), 
+				expires_time: commonLogic.appcommonhandle("管理账号token过期时间",null), 
+				redirect_uri: commonLogic.appcommonhandle("RedirectURI",null), 
+				notify_url: commonLogic.appcommonhandle("NotifyUrl",null), 
+				agent_id: commonLogic.appcommonhandle("AGENT_ID",null), 
+				disabled: commonLogic.appcommonhandle("是否禁用",null), 
+				accessid: commonLogic.appcommonhandle("开放平台接入标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				accessname: commonLogic.appcommonhandle("开放平台",null),
+				open_type: commonLogic.appcommonhandle("开放平台类型",null),
+				region_id: commonLogic.appcommonhandle("RegionId",null),
+				redirect_uri: commonLogic.appcommonhandle("RedirectURI",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+		editviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("保存",null),
+				tip: commonLogic.appcommonhandle("保存",null),
+			},
+			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/pay-trade/pay-trade_en_US.ts

+import PayTrade_en_US_Base from './pay-trade_en_US_base';
 
-export default {
-  fields: {
-    subject: "订单标题",
-    total_amount: "订单金额",
-    trade_name: "交易名称",
-    trade_type: "支付类型",
-    trade_status: "支付状态",
-    out_trade_no: "订单号",
-    trade_id: "交易标识",
-    app_id: "AccessKey(AppId)",
-    access_name: "支付平台",
-    access_id: "支付平台接入标识",
-  },
-	views: {
-		editview: {
-			caption: "支付交易",
-      		title: "支付交易编辑视图",
-		},
-		gridview: {
-			caption: "支付交易",
-      		title: "支付交易表格视图",
-		},
-	},
-	main_form: {
-		details: {
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "交易标识", 
-			srfmajortext: "交易名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			tradename: "交易名称", 
-			outtradeno: "订单号", 
-			subject: "订单标题", 
-			totalamount: "订单金额", 
-			accessname: "支付平台", 
-			tradeid: "交易标识", 
-			accessid: "支付平台接入标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			tradename: "交易名称",
-			subject: "订单标题",
-			outtradeno: "订单号",
-			totalamount: "订单金额",
-			accessname: "支付平台",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-		},
-		uiactions: {
-		},
-	},
-	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",
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem4: {
-			caption: "Edit",
-			tip: "Edit {0}",
-		},
-		tbitem6: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "Remove",
-			tip: "Remove {0}",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "Export",
-			tip: "Export {0} Data To Excel",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "Filter",
-			tip: "Filter",
-		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
-};
\ No newline at end of file
+function getLocaleResource(){
+    const PayTrade_en_US_OwnData = {};
+    const targetData = Object.assign(PayTrade_en_US_Base(), PayTrade_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-trade/pay-trade_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		subject: commonLogic.appcommonhandle("订单标题",null),
+		total_amount: commonLogic.appcommonhandle("订单金额",null),
+		trade_name: commonLogic.appcommonhandle("交易名称",null),
+		trade_type: commonLogic.appcommonhandle("支付类型",null),
+		trade_status: commonLogic.appcommonhandle("支付状态",null),
+		out_trade_no: commonLogic.appcommonhandle("订单号",null),
+		trade_id: commonLogic.appcommonhandle("交易标识",null),
+		app_id: commonLogic.appcommonhandle("AccessKey(AppId)",null),
+		access_name: commonLogic.appcommonhandle("支付平台",null),
+		access_id: commonLogic.appcommonhandle("支付平台接入标识",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("支付交易",null),
+				title: commonLogic.appcommonhandle("支付交易编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("支付交易",null),
+				title: commonLogic.appcommonhandle("支付交易表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("交易标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("交易名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				tradename: commonLogic.appcommonhandle("交易名称",null), 
+				outtradeno: commonLogic.appcommonhandle("订单号",null), 
+				subject: commonLogic.appcommonhandle("订单标题",null), 
+				totalamount: commonLogic.appcommonhandle("订单金额",null), 
+				accessname: commonLogic.appcommonhandle("支付平台",null), 
+				tradeid: commonLogic.appcommonhandle("交易标识",null), 
+				accessid: commonLogic.appcommonhandle("支付平台接入标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				tradename: commonLogic.appcommonhandle("交易名称",null),
+				subject: commonLogic.appcommonhandle("订单标题",null),
+				outtradeno: commonLogic.appcommonhandle("订单号",null),
+				totalamount: commonLogic.appcommonhandle("订单金额",null),
+				accessname: commonLogic.appcommonhandle("支付平台",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		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),
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("New",null),
+				tip: commonLogic.appcommonhandle("New",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("Edit",null),
+				tip: commonLogic.appcommonhandle("Edit {0}",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("Copy",null),
+				tip: commonLogic.appcommonhandle("Copy {0}",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("Remove",null),
+				tip: commonLogic.appcommonhandle("Remove {0}",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("Export",null),
+				tip: commonLogic.appcommonhandle("Export {0} Data To Excel",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("Export Data Model",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("Filter",null),
+				tip: commonLogic.appcommonhandle("Filter",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("Help",null),
+				tip: commonLogic.appcommonhandle("Help",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN.ts

-export default {
-  fields: {
-    subject: "订单标题",
-    total_amount: "订单金额",
-    trade_name: "交易名称",
-    trade_type: "支付类型",
-    trade_status: "支付状态",
-    out_trade_no: "订单号",
-    trade_id: "交易标识",
-    app_id: "AccessKey(AppId)",
-    access_name: "支付平台",
-    access_id: "支付平台接入标识",
-  },
-	views: {
-		editview: {
-			caption: "支付交易",
-      		title: "支付交易编辑视图",
-		},
-		gridview: {
-			caption: "支付交易",
-      		title: "支付交易表格视图",
-		},
-	},
-	main_form: {
-		details: {
-			formpage1: "基本信息", 
-			srforikey: "", 
-			srfkey: "交易标识", 
-			srfmajortext: "交易名称", 
-			srftempmode: "", 
-			srfuf: "", 
-			srfdeid: "", 
-			srfsourcekey: "", 
-			tradename: "交易名称", 
-			outtradeno: "订单号", 
-			subject: "订单标题", 
-			totalamount: "订单金额", 
-			accessname: "支付平台", 
-			tradeid: "交易标识", 
-			accessid: "支付平台接入标识", 
-		},
-		uiactions: {
-		},
-	},
-	main_grid: {
-		columns: {
-			tradename: "交易名称",
-			subject: "订单标题",
-			outtradeno: "订单号",
-			totalamount: "订单金额",
-			accessname: "支付平台",
-		},
-		nodata:"",
-		uiactions: {
-		},
-	},
-	default_searchform: {
-		details: {
-			formpage1: "常规条件", 
-		},
-		uiactions: {
-		},
-	},
-	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: "帮助",
-		},
-	},
-	gridviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "新建",
-			tip: "新建",
-		},
-		tbitem4: {
-			caption: "编辑",
-			tip: "编辑",
-		},
-		tbitem6: {
-			caption: "拷贝",
-			tip: "拷贝",
-		},
-		tbitem7: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem8: {
-			caption: "删除",
-			tip: "删除",
-		},
-		tbitem9: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem13: {
-			caption: "导出",
-			tip: "导出",
-		},
-		tbitem10: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem19: {
-			caption: "过滤",
-			tip: "过滤",
-		},
-		tbitem18: {
-			caption: "帮助",
-			tip: "帮助",
-		},
-	},
-};
\ No newline at end of file
+import PayTrade_zh_CN_Base from './pay-trade_zh_CN_base';
+
+function getLocaleResource(){
+    const PayTrade_zh_CN_OwnData = {};
+    const targetData = Object.assign(PayTrade_zh_CN_Base(), PayTrade_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/pay-trade/pay-trade_zh_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		subject: commonLogic.appcommonhandle("订单标题",null),
+		total_amount: commonLogic.appcommonhandle("订单金额",null),
+		trade_name: commonLogic.appcommonhandle("交易名称",null),
+		trade_type: commonLogic.appcommonhandle("支付类型",null),
+		trade_status: commonLogic.appcommonhandle("支付状态",null),
+		out_trade_no: commonLogic.appcommonhandle("订单号",null),
+		trade_id: commonLogic.appcommonhandle("交易标识",null),
+		app_id: commonLogic.appcommonhandle("AccessKey(AppId)",null),
+		access_name: commonLogic.appcommonhandle("支付平台",null),
+		access_id: commonLogic.appcommonhandle("支付平台接入标识",null),
+	},
+		views: {
+			editview: {
+				caption: commonLogic.appcommonhandle("支付交易",null),
+				title: commonLogic.appcommonhandle("支付交易编辑视图",null),
+			},
+			gridview: {
+				caption: commonLogic.appcommonhandle("支付交易",null),
+				title: commonLogic.appcommonhandle("支付交易表格视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("交易标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("交易名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				tradename: commonLogic.appcommonhandle("交易名称",null), 
+				outtradeno: commonLogic.appcommonhandle("订单号",null), 
+				subject: commonLogic.appcommonhandle("订单标题",null), 
+				totalamount: commonLogic.appcommonhandle("订单金额",null), 
+				accessname: commonLogic.appcommonhandle("支付平台",null), 
+				tradeid: commonLogic.appcommonhandle("交易标识",null), 
+				accessid: commonLogic.appcommonhandle("支付平台接入标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				tradename: commonLogic.appcommonhandle("交易名称",null),
+				subject: commonLogic.appcommonhandle("订单标题",null),
+				outtradeno: commonLogic.appcommonhandle("订单号",null),
+				totalamount: commonLogic.appcommonhandle("订单金额",null),
+				accessname: commonLogic.appcommonhandle("支付平台",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		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),
+			},
+		},
+		gridviewtoolbar_toolbar: {
+			tbitem3: {
+				caption: commonLogic.appcommonhandle("新建",null),
+				tip: commonLogic.appcommonhandle("新建",null),
+			},
+			tbitem4: {
+				caption: commonLogic.appcommonhandle("编辑",null),
+				tip: commonLogic.appcommonhandle("编辑",null),
+			},
+			tbitem6: {
+				caption: commonLogic.appcommonhandle("拷贝",null),
+				tip: commonLogic.appcommonhandle("拷贝",null),
+			},
+			tbitem7: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem8: {
+				caption: commonLogic.appcommonhandle("删除",null),
+				tip: commonLogic.appcommonhandle("删除",null),
+			},
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem13: {
+				caption: commonLogic.appcommonhandle("导出",null),
+				tip: commonLogic.appcommonhandle("导出",null),
+			},
+			tbitem10: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem16: {
+				caption: commonLogic.appcommonhandle("其它",null),
+				tip: commonLogic.appcommonhandle("其它",null),
+			},
+			tbitem21: {
+				caption: commonLogic.appcommonhandle("导出数据模型",null),
+				tip: commonLogic.appcommonhandle("导出数据模型",null),
+			},
+			tbitem23: {
+				caption: commonLogic.appcommonhandle("数据导入",null),
+				tip: commonLogic.appcommonhandle("数据导入",null),
+			},
+			tbitem17: {
+				caption: commonLogic.appcommonhandle("-",null),
+				tip: commonLogic.appcommonhandle("",null),
+			},
+			tbitem19: {
+				caption: commonLogic.appcommonhandle("过滤",null),
+				tip: commonLogic.appcommonhandle("过滤",null),
+			},
+			tbitem18: {
+				caption: commonLogic.appcommonhandle("帮助",null),
+				tip: commonLogic.appcommonhandle("帮助",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

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

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

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

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

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/pay/pay-index-view/pay-index-view-base.vue

@@ -548,8 +548,8 @@ export default class PayIndexViewBase 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/pay/pay-open-access-edit-view/pay-open-access-edit-view-base.vue

@@ -1396,7 +1396,7 @@ export default class PayOpenAccessEditViewBase 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 PayOpenAccessEditViewBase 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/pay/pay-open-access-grid-view/pay-open-access-grid-view-base.vue

@@ -1368,7 +1368,7 @@ export default class PayOpenAccessGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { payopenaccess: args[0].payopenaccess })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1394,7 +1394,7 @@ export default class PayOpenAccessGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { payopenaccess: args[0].payopenaccess })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1422,7 +1422,7 @@ export default class PayOpenAccessGridViewBase 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});
         }
@@ -1591,8 +1591,8 @@ export default class PayOpenAccessGridViewBase 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/pay/pay-open-access-pickup-grid-view/pay-open-access-pickup-grid-view-base.vue

@@ -672,8 +672,8 @@ export default class PayOpenAccessPickupGridViewBase 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/pay/pay-open-access-pickup-view/pay-open-access-pickup-view-base.vue

@@ -610,8 +610,8 @@ export default class PayOpenAccessPickupViewBase 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/pay/pay-trade-edit-view/pay-trade-edit-view-base.vue

@@ -1396,7 +1396,7 @@ export default class PayTradeEditViewBase 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 PayTradeEditViewBase 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/pay/pay-trade-grid-view/pay-trade-grid-view-base.vue

@@ -1368,7 +1368,7 @@ export default class PayTradeGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { paytrade: args[0].paytrade })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1394,7 +1394,7 @@ export default class PayTradeGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { paytrade: args[0].paytrade })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1422,7 +1422,7 @@ export default class PayTradeGridViewBase 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});
         }
@@ -1591,8 +1591,8 @@ export default class PayTradeGridViewBase 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/pay-open-access/main-form/main-form-base.vue

@@ -673,8 +673,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        }
+    }
 
     /**
      * 校验属性值规则
@@ -683,7 +685,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;
@@ -1387,7 +1389,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.payopenaccess});
         }
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {

app_web/src/widgets/pay-open-access/main-grid/main-grid-base.vue

@@ -285,7 +285,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */  
-    public ActionModel:any ={
+    public actionModel:any ={
     };
 
     /**
@@ -722,7 +722,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getActionState(data:any){
-        let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
+        let tempActionModel:any = JSON.parse(JSON.stringify(this.actionModel));
         let targetData:any = this.transformData(data);
         ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
         return tempActionModel;
@@ -746,8 +746,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        };
+    }
 
     /**
      * 值规则集合
@@ -755,11 +757,13 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public rules: any = {
-        srfkey: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '开放平台接入标识 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '开放平台接入标识 值不能为空', trigger: 'blur' },
-        ],
+    public rules(){
+        return {
+            srfkey: [
+                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.payopenaccess.main_grid.columns.srfkey')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
+                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.payopenaccess.main_grid.columns.srfkey')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
+            ],
+        }
     }
 
     /**
@@ -774,7 +778,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public validate(property:string, data:any, rowIndex:number):Promise<any>{
         return new Promise((resolve, reject) => {
-            this.$util.validateItem(property,data,this.rules).then(()=>{
+            this.$util.validateItem(property,data,this.rules()).then(()=>{
                 this.gridItemsModel[rowIndex][property].setError(null);
                 resolve(true);
             }).catch(({ errors, fields }) => {
@@ -798,7 +802,7 @@ export default class MainBase extends Vue implements ControlInterface {
             let tempMessage: string = '';
             index++;
             if (item.rowDataState === "create" || item.rowDataState === "update") {
-                for (let property of Object.keys(this.rules)) {
+                for (let property of Object.keys(this.rules())) {
                     if (!await this.validate(property, item, index)) {
                         validateState = false;
                         tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
@@ -834,6 +838,11 @@ export default class MainBase extends Vue implements ControlInterface {
             const sort: string = this.minorSortPSDEF+","+this.minorSortDir;
             Object.assign(page, { sort: sort });
         }
+        //清空selections
+        if(this.selections && this.selections.length > 0) {
+            this.selections = [];
+            this.$emit('selectionchange', this.selections);
+        }
         Object.assign(arg, page);
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
@@ -853,7 +862,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.totalrow = response.total;
             this.items = JSON.parse(JSON.stringify(data));
             // 清空selections,gridItemsModel
-            //this.selections = [];
+            // this.selections = [];
             this.gridItemsModel = [];
             this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
             this.items.forEach((item:any)=>{
@@ -1389,6 +1398,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         return codelist;
     }
+
     /**
      * 根据分组代码表绘制分组列表
      * 
@@ -1409,13 +1419,12 @@ export default class MainBase extends Vue implements ControlInterface {
             let children:Array<any> = [];
             this.items.forEach((item: any,j: number)=>{
                 if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    if(Object.is(group.label,arr[0].label)){
+                    if(Object.is(group.label,item[this.groupAppField])){
                         item.groupById = Number((i+1) * 100 + (j+1) * 1);
                         item.group = '';
                         children.push(item);
                     }
-                }else if(Object.is(group.label,item[this.groupAppField])){
+                }else if(Object.is(group.value,item[this.groupAppField])){
                     item.groupById = Number((i+1) * 100 + (j+1) * 1);
                     item.group = '';
                     children.push(item);
@@ -1436,10 +1445,9 @@ export default class MainBase extends Vue implements ControlInterface {
         this.items.forEach((item: any,index: number)=>{
             let i: number = 0;
             if(allGroupField && allGroupField.length > 0){
-                const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                i = allGroup.findIndex((group: any)=>Object.is(group.label,arr[0].label));
-            }else{
                 i = allGroup.findIndex((group: any)=>Object.is(group.label,item[this.groupAppField]));
+            }else{
+                i = allGroup.findIndex((group: any)=>Object.is(group.value,item[this.groupAppField]));
             }
             if(i < 0){
                 item.groupById = Number((allGroup.length+1) * 100 + (index+1) * 1);
@@ -1481,16 +1489,9 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.isEnableGroup) return;
         // 分组
         let allGroup: Array<any> = [];
-        let allGroupField: Array<any> =[];
-        allGroupField = this.getGroupCodelist(this.groupAppFieldCodelistType,this.groupAppFieldCodelistTag);
         this.items.forEach((item: any)=>{
             if(item.hasOwnProperty(this.groupAppField)){
-                if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    allGroup.push(arr[0].label);
-                }else{
-                    allGroup.push(item[this.groupAppField]);
-                }
+                allGroup.push(item[this.groupAppField]);
             }
         });
         let groupTree:Array<any> = [];
@@ -1502,14 +1503,7 @@ export default class MainBase extends Vue implements ControlInterface {
         allGroup.forEach((group: any, groupIndex: number)=>{
             let children:Array<any> = [];
             this.items.forEach((item: any,itemIndex: number)=>{
-                if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    if(Object.is(group,arr[0].label)){
-                        item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
-                        item.group = '';
-                        children.push(item);
-                    }
-                }else if(Object.is(group,item[this.groupAppField])){
+                if(Object.is(group,item[this.groupAppField])){
                     item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
                     item.group = '';
                     children.push(item);
@@ -2201,7 +2195,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",value:any) :{isPast:boolean}{
+    public verifyDeRules(name:string,rule:any = this.deRules(),op:string = "AND",value:any) :{isPast:boolean}{
         let falg:any = {};
         if(!rule || !rule[name]){
             return falg;

app_web/src/widgets/pay-trade/main-form/main-form-base.vue

@@ -567,8 +567,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        }
+    }
 
     /**
      * 校验属性值规则
@@ -577,7 +579,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;
@@ -1206,7 +1208,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.paytrade});
         }
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {

app_web/src/widgets/pay-trade/main-grid/main-grid-base.vue

@@ -295,7 +295,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */  
-    public ActionModel:any ={
+    public actionModel:any ={
     };
 
     /**
@@ -755,7 +755,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getActionState(data:any){
-        let tempActionModel:any = JSON.parse(JSON.stringify(this.ActionModel));
+        let tempActionModel:any = JSON.parse(JSON.stringify(this.actionModel));
         let targetData:any = this.transformData(data);
         ViewTool.calcActionItemAuthState(targetData,tempActionModel,this.appUIService);
         return tempActionModel;
@@ -779,8 +779,10 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public deRules:any = {
-    };
+    public deRules(){
+        return {
+        };
+    }
 
     /**
      * 值规则集合
@@ -788,11 +790,13 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
-    public rules: any = {
-        srfkey: [
-             { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '交易标识 值不能为空', trigger: 'change' },
-            { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '交易标识 值不能为空', trigger: 'blur' },
-        ],
+    public rules(){
+        return {
+            srfkey: [
+                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.paytrade.main_grid.columns.srfkey')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'change' },
+                { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `${this.$t('entities.paytrade.main_grid.columns.srfkey')}${this.$t('app.commonWords.valueNotEmpty')}`, trigger: 'blur' },
+            ],
+        }
     }
 
     /**
@@ -807,7 +811,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public validate(property:string, data:any, rowIndex:number):Promise<any>{
         return new Promise((resolve, reject) => {
-            this.$util.validateItem(property,data,this.rules).then(()=>{
+            this.$util.validateItem(property,data,this.rules()).then(()=>{
                 this.gridItemsModel[rowIndex][property].setError(null);
                 resolve(true);
             }).catch(({ errors, fields }) => {
@@ -831,7 +835,7 @@ export default class MainBase extends Vue implements ControlInterface {
             let tempMessage: string = '';
             index++;
             if (item.rowDataState === "create" || item.rowDataState === "update") {
-                for (let property of Object.keys(this.rules)) {
+                for (let property of Object.keys(this.rules())) {
                     if (!await this.validate(property, item, index)) {
                         validateState = false;
                         tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
@@ -867,6 +871,11 @@ export default class MainBase extends Vue implements ControlInterface {
             const sort: string = this.minorSortPSDEF+","+this.minorSortDir;
             Object.assign(page, { sort: sort });
         }
+        //清空selections
+        if(this.selections && this.selections.length > 0) {
+            this.selections = [];
+            this.$emit('selectionchange', this.selections);
+        }
         Object.assign(arg, page);
         const parentdata: any = {};
         this.$emit('beforeload', parentdata);
@@ -886,7 +895,7 @@ export default class MainBase extends Vue implements ControlInterface {
             this.totalrow = response.total;
             this.items = JSON.parse(JSON.stringify(data));
             // 清空selections,gridItemsModel
-            //this.selections = [];
+            // this.selections = [];
             this.gridItemsModel = [];
             this.items.forEach(()=>{this.gridItemsModel.push(this.getGridRowModel())});
             this.items.forEach((item:any)=>{
@@ -1414,6 +1423,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         return codelist;
     }
+
     /**
      * 根据分组代码表绘制分组列表
      * 
@@ -1434,13 +1444,12 @@ export default class MainBase extends Vue implements ControlInterface {
             let children:Array<any> = [];
             this.items.forEach((item: any,j: number)=>{
                 if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    if(Object.is(group.label,arr[0].label)){
+                    if(Object.is(group.label,item[this.groupAppField])){
                         item.groupById = Number((i+1) * 100 + (j+1) * 1);
                         item.group = '';
                         children.push(item);
                     }
-                }else if(Object.is(group.label,item[this.groupAppField])){
+                }else if(Object.is(group.value,item[this.groupAppField])){
                     item.groupById = Number((i+1) * 100 + (j+1) * 1);
                     item.group = '';
                     children.push(item);
@@ -1462,10 +1471,9 @@ export default class MainBase extends Vue implements ControlInterface {
         this.items.forEach((item: any,index: number)=>{
             let i: number = 0;
             if(allGroupField && allGroupField.length > 0){
-                const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                i = allGroup.findIndex((group: any)=>Object.is(group.label,arr[0].label));
-            }else{
                 i = allGroup.findIndex((group: any)=>Object.is(group.label,item[this.groupAppField]));
+            }else{
+                i = allGroup.findIndex((group: any)=>Object.is(group.value,item[this.groupAppField]));
             }
             if(i < 0){
                 item.groupById = Number((allGroup.length+1) * 100 + (index+1) * 1);
@@ -1508,16 +1516,9 @@ export default class MainBase extends Vue implements ControlInterface {
         if(!this.isEnableGroup) return;
         // 分组
         let allGroup: Array<any> = [];
-        let allGroupField: Array<any> =[];
-        allGroupField = this.getGroupCodelist(this.groupAppFieldCodelistType,this.groupAppFieldCodelistTag);
         this.items.forEach((item: any)=>{
             if(item.hasOwnProperty(this.groupAppField)){
-                if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    allGroup.push(arr[0].label);
-                }else{
-                    allGroup.push(item[this.groupAppField]);
-                }
+                allGroup.push(item[this.groupAppField]);
             }
         });
         let groupTree:Array<any> = [];
@@ -1529,14 +1530,7 @@ export default class MainBase extends Vue implements ControlInterface {
         allGroup.forEach((group: any, groupIndex: number)=>{
             let children:Array<any> = [];
             this.items.forEach((item: any,itemIndex: number)=>{
-                if(allGroupField && allGroupField.length > 0){
-                    const arr:Array<any> = allGroupField.filter((field:any)=>{return field.value == item[this.groupAppField]});
-                    if(Object.is(group,arr[0].label)){
-                        item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
-                        item.group = '';
-                        children.push(item);
-                    }
-                }else if(Object.is(group,item[this.groupAppField])){
+                if(Object.is(group,item[this.groupAppField])){
                     item.groupById = Number((groupIndex+1) * 100 + (itemIndex+1) * 1);
                     item.group = '';
                     children.push(item);
@@ -2229,7 +2223,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",value:any) :{isPast:boolean}{
+    public verifyDeRules(name:string,rule:any = this.deRules(),op:string = "AND",value:any) :{isPast:boolean}{
         let falg:any = {};
         if(!rule || !rule[name]){
             return falg;

ibzpay-app/ibzpay-app-web/src/main/java/cn/ibizlab/web/webApplication.java

@@ -29,6 +29,7 @@ import java.util.List;
 @MapperScan("cn.ibizlab.*.mapper")
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+            com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class
 })
 public class webApplication extends WebMvcConfigurerAdapter {
 

ibzpay-boot/src/main/java/cn/ibizlab/DevBootApplication.java

@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 @EnableTransactionManagement
 @EnableFeignClients(basePackages = {"cn.ibizlab" })
 @SpringBootApplication(exclude = {
+            com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class
 })
 @ComponentScan(basePackages = {"cn.ibizlab"}
 //        ,excludeFilters = {

ibzpay-core/src/main/java/cn/ibizlab/core/pay/mapper/PayOpenAccessMapper.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.alibaba.fastjson.JSONObject;
 
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface PayOpenAccessMapper extends BaseMapper<PayOpenAccess> {
 
     Page<PayOpenAccess> searchDefault(IPage page, @Param("srf") PayOpenAccessSearchContext context, @Param("ew") Wrapper<PayOpenAccess> wrapper);

ibzpay-core/src/main/java/cn/ibizlab/core/pay/mapper/PayTradeMapper.java

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.alibaba.fastjson.JSONObject;
 
+@com.baomidou.dynamic.datasource.annotation.DS("db2")
 public interface PayTradeMapper extends BaseMapper<PayTrade> {
 
     Page<PayTrade> searchDefault(IPage page, @Param("srf") PayTradeSearchContext context, @Param("ew") Wrapper<PayTrade> wrapper);

ibzpay-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[PAY_OPEN_ACCESS]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-pay_open_access-8-1">
+    <changeSet author="root" id="tab-pay_open_access-10-1">
         <createTable tableName="IBZOPENACCESS">
                 <column name="ACCESSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_PAY_OPEN_ACCESS_ACCESSID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[PAY_TRADE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-pay_trade-8-2">
+    <changeSet author="root" id="tab-pay_trade-10-2">
         <createTable tableName="IBZPAYTRADE">
                 <column name="SUBJECT" remarks="" type="VARCHAR(100)">
                 </column>

ibzpay-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驱动包 -->
@@ -343,6 +348,11 @@
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
+        <!--  mp动态数据源 -->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+        </dependency>
 
 
 

ibzpay-provider/ibzpay-provider-api/src/main/java/cn/ibizlab/api/ibzpayapiApplication.java

@@ -33,6 +33,7 @@ import java.util.List;
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
             org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
+            com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class
 })
 @Import({
         org.springframework.cloud.openfeign.FeignClientsConfiguration.class

ibzpay-util/src/main/java/cn/ibizlab/util/domain/LiquibaseProp.java

@@ -6,7 +6,7 @@ import org.springframework.stereotype.Component;
 
 @Data
 @Component
-@ConfigurationProperties(prefix = "spring.datasource")
+@ConfigurationProperties(prefix = "spring.datasource.dynamic.datasource.master")
 public class LiquibaseProp{
 
     private  String url;

ibzpay-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

ibzpay-util/src/main/resources/application-sys.yml

@@ -25,27 +25,45 @@ spring:
     password: '@6dEfb3@'
     url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
     driver-class-name: com.mysql.jdbc.Driver
-    filters: stat,wall,log4j2
-    #配置初始化大小/最小/最大
-    initial-size: 1
-    min-idle: 1
-    max-active: 20
-    #获取连接等待超时时间
-    max-wait: 60000
-    #间隔多久进行一次检测，检测需要关闭的空闲连接
-    time-between-eviction-runs-millis: 60000
-    #一个连接在池中最小生存的时间
-    min-evictable-idle-time-millis: 300000
-    validation-query: SELECT 1 FROM DUAL
-    test-while-idle: true
-    test-on-borrow: false
-    test-on-return: false
-    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
-    pool-prepared-statements: false
-    max-pool-prepared-statement-per-connection-size: 20
     isSyncDBSchema: false
     defaultSchema: a_A_5d9d78509
-    conf: classpath:liquibase/master.xml
+    dynamic:
+      druid: #以下是全局默认值，可以全局更改
+        filters: stat,wall,log4j2
+        #配置初始化大小/最小/最大
+        initial-size: 1
+        min-idle: 1
+        max-active: 20
+        #获取连接等待超时时间
+        max-wait: 60000
+        #间隔多久进行一次检测，检测需要关闭的空闲连接
+        time-between-eviction-runs-millis: 60000
+        #一个连接在池中最小生存的时间
+        min-evictable-idle-time-millis: 300000
+        validation-query: SELECT 1 FROM DUAL
+        test-while-idle: true
+        test-on-borrow: false
+        test-on-return: false
+        #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+        pool-prepared-statements: false
+        max-pool-prepared-statement-per-connection-size: 20
+      datasource:
+        master:
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          url: ${spring.datasource.url}
+          driver-class-name: ${spring.datasource.driver-class-name}
+          conf: classpath:liquibase/master.xml
+          isSyncDBSchema: ${spring.datasource.isSyncDBSchema}
+          defaultSchema: ${spring.datasource.defaultSchema}
+        db2:
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          url: ${spring.datasource.url}
+          driver-class-name: ${spring.datasource.driver-class-name}
+          conf: classpath:liquibase/master.xml
+          isSyncDBSchema: ${spring.datasource.isSyncDBSchema}
+          defaultSchema: ${spring.datasource.defaultSchema}
 
 #Mybatis-plus配置
 mybatis-plus: