ibiz4j 发布系统代码 [ibiz-uaa，UAA鉴权]

app_web/package.json

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

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

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

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

@@ -36,7 +36,8 @@ function getAppLocale(){
                 startsuccess:"Start successful",
                 loadmore:"Load more",
                 nomore:"No more",
-                other:"other"
+                other:"other",
+                valueNotEmpty:"The value cannot be null",
             },
             local:{
                 new: "New",
@@ -183,6 +184,8 @@ function getAppLocale(){
                 },
                 delete1: "Confirm to delete ",
                 delete2: "the delete operation will be unrecoverable!",
+                fold: "fold",
+                unfold: "upfold",
             },
             dashBoard: {
                 handleClick: {

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

@@ -36,7 +36,8 @@ function getAppLocale(){
                 startsuccess:"启动成功",
                 loadmore:"加载更多",
                 nomore:"没有更多了",
-                other:"其他"
+                other:"其他",
+                valueNotEmpty:"值不能为空",
             },
             local:{
                 new: "新建",
@@ -182,6 +183,8 @@ function getAppLocale(){
                 },
                 delete1: "确认要删除 ",
                 delete2: "删除操作将不可恢复？",
+                fold: "折叠",
+                unfold: "展开",
             },
             dashBoard: {
                 handleClick: {

app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SysAppEditViewBase 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});
         }

app_web/src/pages/uaa/sys-app-grid-view/sys-app-grid-view-base.vue

@@ -1310,7 +1310,7 @@ export default class SysAppGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysapp: args[0].sysapp })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1336,7 +1336,7 @@ export default class SysAppGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysapp: args[0].sysapp })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1364,7 +1364,7 @@ export default class SysAppGridViewBase 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});
         }

app_web/src/pages/uaa/sys-open-access-edit-view/sys-open-access-edit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SysOpenAccessEditViewBase 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});
         }

app_web/src/pages/uaa/sys-open-access-grid-view/sys-open-access-grid-view-base.vue

@@ -1281,7 +1281,7 @@ export default class SysOpenAccessGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysopenaccess: args[0].sysopenaccess })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1307,7 +1307,7 @@ export default class SysOpenAccessGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysopenaccess: args[0].sysopenaccess })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1335,7 +1335,7 @@ export default class SysOpenAccessGridViewBase 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});
         }

app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SYS_PERMISSIONEditViewBase 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});
         }

app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue

@@ -1087,7 +1087,7 @@ export default class SYS_PERMISSIONEditView2Base 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});
         }

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue

@@ -1255,7 +1255,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { syspermission: args[0].syspermission })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1281,7 +1281,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { syspermission: args[0].syspermission })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1309,7 +1309,7 @@ export default class SYS_PERMISSIONGridViewBase 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});
         }

app_web/src/pages/uaa/sys-role-edit-view/sys-role-edit-view-base.vue

@@ -820,7 +820,7 @@ export default class SysRoleEditViewBase 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});
         }

app_web/src/pages/uaa/sys-role-edit-view2/sys-role-edit-view2-base.vue

@@ -1087,7 +1087,7 @@ export default class SysRoleEditView2Base 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});
         }

app_web/src/pages/uaa/sys-role-grid-view/sys-role-grid-view-base.vue

@@ -1255,7 +1255,7 @@ export default class SysRoleGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysrole: args[0].sysrole })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1281,7 +1281,7 @@ export default class SysRoleGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysrole: args[0].sysrole })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1309,7 +1309,7 @@ export default class SysRoleGridViewBase 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});
         }

app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view-base.vue

@@ -1280,7 +1280,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysrolepermission: args[0].sysrolepermission })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1306,7 +1306,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysrolepermission: args[0].sysrolepermission })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1334,7 +1334,7 @@ export default class SysRolePermissionGridViewBase 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});
         }

app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SYS_ROLE_PERMISSIONEditViewBase 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});
         }

app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue

@@ -1087,7 +1087,7 @@ export default class SYS_ROLE_PERMISSIONEditView2Base 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});
         }

app_web/src/pages/uaa/sys-user-edit-view/sys-user-edit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SysUserEditViewBase 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});
         }

app_web/src/pages/uaa/sys-user-grid-view/sys-user-grid-view-base.vue

@@ -1255,7 +1255,7 @@ export default class SysUserGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysuser: args[0].sysuser })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1281,7 +1281,7 @@ export default class SysUserGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysuser: args[0].sysuser })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1309,7 +1309,7 @@ export default class SysUserGridViewBase 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});
         }

app_web/src/pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view-base.vue

@@ -1050,7 +1050,7 @@ export default class SysUserRoleEditViewBase 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});
         }

app_web/src/pages/uaa/sys-user-role-edit-view2/sys-user-role-edit-view2-base.vue

@@ -1087,7 +1087,7 @@ export default class SysUserRoleEditView2Base 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});
         }

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -1294,7 +1294,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysuserrole: args[0].sysuserrole })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1320,7 +1320,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             if (args.length > 0) {
                 Object.assign(data, { sysuserrole: args[0].sysuserrole })
             }
-            _this.opendata([{ ...data }], params, $event, xData);
+            _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
         }
@@ -1348,7 +1348,7 @@ export default class SYS_USER_ROLEGridViewBase 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});
         }

app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue

@@ -1087,7 +1087,7 @@ export default class SYS_USEREditView2Base 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});
         }

app_web/src/service/sys-role/sys-role-service-base.ts

@@ -169,6 +169,20 @@ export default class SysRoleServiceBase extends EntityService {
             return res;
     }
 
+    /**
+     * NoRepeatBatch接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof SysRoleServiceBase
+     */
+    public async NoRepeatBatch(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return await Http.getInstance().post(`/sysrole/norepeatbatch`,tempData,isloading);
+    }
+
     /**
      * Save接口方法
      *

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/sys-app/main-grid/main-grid-base.vue

@@ -1109,6 +1109,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);
@@ -1128,7 +1133,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)=>{
@@ -1554,10 +1559,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue

@@ -936,6 +936,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);
@@ -955,7 +960,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)=>{
@@ -1373,10 +1378,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

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

@@ -917,6 +917,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);
@@ -936,7 +941,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)=>{
@@ -1362,10 +1367,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -794,6 +794,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);
@@ -813,7 +818,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)=>{
@@ -1223,10 +1228,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -829,6 +829,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);
@@ -848,7 +853,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)=>{
@@ -1258,10 +1263,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -885,6 +885,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);
@@ -904,7 +909,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)=>{
@@ -1314,10 +1319,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -871,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);
@@ -890,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)=>{
@@ -1300,10 +1305,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -878,6 +878,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);
@@ -897,7 +902,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)=>{
@@ -1307,10 +1312,6 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if(Object.is(action,'appRefresh')){
-                    if(this.selections && this.selections.length > 0) {
-                        this.selections = [];
-                        this.$emit('selectionchange', this.selections);
-                    }
                     this.refresh([data]);
                 }
             })

ibzuaa-app/ibzuaa-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 {
 

ibzuaa-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 = {

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysAuthLogMapper.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 SysAuthLogMapper extends BaseMapper<SysAuthLog> {
 
     Page<SysAuthLog> searchDefault(IPage page, @Param("srf") SysAuthLogSearchContext context, @Param("ew") Wrapper<SysAuthLog> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysOpenAccessMapper.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 SysOpenAccessMapper extends BaseMapper<SysOpenAccess> {
 
     Page<SysOpenAccess> searchDefault(IPage page, @Param("srf") SysOpenAccessSearchContext context, @Param("ew") Wrapper<SysOpenAccess> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysPermissionMapper.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 SysPermissionMapper extends BaseMapper<SysPermission> {
 
     Page<SysPermission> searchDefault(IPage page, @Param("srf") SysPermissionSearchContext context, @Param("ew") Wrapper<SysPermission> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysRoleMapper.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 SysRoleMapper extends BaseMapper<SysRole> {
 
     Page<SysRole> searchDefault(IPage page, @Param("srf") SysRoleSearchContext context, @Param("ew") Wrapper<SysRole> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysRolePermissionMapper.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 SysRolePermissionMapper extends BaseMapper<SysRolePermission> {
 
     Page<SysRolePermission> searchDefault(IPage page, @Param("srf") SysRolePermissionSearchContext context, @Param("ew") Wrapper<SysRolePermission> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysUserAuthMapper.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 SysUserAuthMapper extends BaseMapper<SysUserAuth> {
 
     Page<SysUserAuth> searchDefault(IPage page, @Param("srf") SysUserAuthSearchContext context, @Param("ew") Wrapper<SysUserAuth> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysUserMapper.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 SysUserMapper extends BaseMapper<SysUser> {
 
     Page<SysUser> searchDefault(IPage page, @Param("srf") SysUserSearchContext context, @Param("ew") Wrapper<SysUser> wrapper);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SysUserRoleMapper.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 SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
     Page<SysUserRole> searchDefault(IPage page, @Param("srf") SysUserRoleSearchContext context, @Param("ew") Wrapper<SysUserRole> wrapper);

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

@@ -6,7 +6,7 @@
 
 
     <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="root" id="tab-sys_authlog-1-1">
+    <changeSet author="root" id="tab-sys_authlog-3-1">
         <createTable tableName="IBZAUTHLOG">
                 <column name="LOGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
@@ -32,7 +32,7 @@
 
 
     <!--输出实体[SYS_OPEN_ACCESS]数据结构 -->
-    <changeSet author="root" id="tab-sys_open_access-35-2">
+    <changeSet author="root" id="tab-sys_open_access-37-2">
         <createTable tableName="IBZOPENACCESS">
                 <column name="ACCESSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_OPEN_ACCESS_ACCESSID"/>
@@ -84,7 +84,7 @@
 
 
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="root" id="tab-sys_permission-1-4">
+    <changeSet author="root" id="tab-sys_permission-5-4">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -106,7 +106,7 @@
 
 
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="root" id="tab-sys_role-32-5">
+    <changeSet author="root" id="tab-sys_role-40-5">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -130,7 +130,7 @@
 
 
     <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="root" id="tab-sys_role_permission-3-6">
+    <changeSet author="root" id="tab-sys_role_permission-11-6">
         <createTable tableName="IBZROLE_PERMISSION">
                 <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
@@ -150,7 +150,7 @@
 
 
     <!--输出实体[SYS_USER_AUTH]数据结构 -->
-    <changeSet author="root" id="tab-sys_user_auth-20-7">
+    <changeSet author="root" id="tab-sys_user_auth-22-7">
         <createTable tableName="IBZUSERAUTH">
                 <column name="AUTHID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_AUTH_AUTHID"/>
@@ -168,7 +168,7 @@
 
 
     <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="root" id="tab-sys_user_role-7-8">
+    <changeSet author="root" id="tab-sys_user_role-13-8">
         <createTable tableName="IBZUSER_ROLE">
                 <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -189,16 +189,16 @@
         <!--输出实体[SYS_PSSYSTEM]外键关系 -->
         <!--输出实体[SYS_PERMISSION]外键关系 -->
         <!--输出实体[SYS_ROLE]外键关系 -->
-    <changeSet author="root" id="fk-sys_role-32-9">
+    <changeSet author="root" id="fk-sys_role-40-9">
        <addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="root" id="fk-sys_role_permission-3-10">
+    <changeSet author="root" id="fk-sys_role_permission-11-10">
        <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_USER_AUTH]外键关系 -->
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="root" id="fk-sys_user_role-7-12">
+    <changeSet author="root" id="fk-sys_user_role-13-12">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
 

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

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/ibzuaaapiApplication.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

ibzuaa-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;

ibzuaa-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: