zhouweidong@lab.ibiz5.com 发布系统代码

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

@@ -145,9 +145,8 @@ export default class AppSpan extends Vue {
      * @memberof AppSpan
      */
     public load(){
-        if(!this.value || this.tag){
+        if(this.tag){
             return;  //代码表走codelist组件
-
         }else if(this.editorType === "ADDRESSPICKUP"){
             JSON.parse(this.value).forEach((item:any,index:number) => {
               this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext;

app_web/src/components/app-transfer/app-transfer.vue

@@ -6,7 +6,7 @@
       v-for="(item,i) in dataRight"
       :key="i"
     >{{dataLeft[item-1].label}}</Option>
-    <el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange"></el-transfer>
+    <el-transfer v-model="dataRight" :data="dataLeft" @change="dataChange" :titles="['未选择', '已选择']"></el-transfer>
   </Select>
 </template>
 <script lang="ts">

app_web/src/engine/view/edit-view-engine.ts

@@ -249,7 +249,9 @@ export default class EditViewEngine extends ViewEngine {
         let viewdata: any = this.view.model;
         if (viewdata  && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
             this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info);
+            if(this.view.$route){
                 this.view.$route.meta.info = info;
+            }
             this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
         }
     }

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

@@ -577,7 +577,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SysAppEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -724,7 +724,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -753,7 +752,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -782,7 +780,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -811,7 +808,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -840,7 +836,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -869,7 +864,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -898,7 +892,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -927,7 +920,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -956,7 +948,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -985,7 +976,6 @@ export default class SysAppGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -1009,14 +999,16 @@ export default class SysAppGridViewBase extends Vue {
      * @memberof SysAppGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
         if(args[0].srfsourcekey){
             data.srfsourcekey = args[0].srfsourcekey;
         }
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
-        delete curViewParam.sysapp;
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.sysapp;
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1024,7 +1016,7 @@ export default class SysAppGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openDrawer = (view: any, data: any) => {
-            let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
             container.subscribe((result: any) => {
                 if (!result || !Object.is(result.ret, 'OK')) {
                     return;
@@ -1057,10 +1049,12 @@ export default class SysAppGridViewBase extends Vue {
      * @memberof SysAppGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1068,7 +1062,7 @@ export default class SysAppGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openDrawer = (view: any, data: any) => {
-            let container: Subject<any> = this.$appdrawer.openDrawer(view, curViewParam, data);
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
             container.subscribe((result: any) => {
                 if (!result || !Object.is(result.ret, 'OK')) {
                     return;

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

@@ -593,6 +593,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
      * @memberof SYS_AUTHLOGGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
     this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
     }
 
@@ -608,6 +610,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
      * @memberof SYS_AUTHLOGGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
     this.$Notice.warning({ title: '错误', desc: '未指定关系视图' });
     }
 

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

@@ -577,7 +577,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -609,7 +609,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -638,7 +637,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -667,7 +665,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -696,7 +693,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -725,7 +721,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -754,7 +749,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -783,7 +777,6 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -705,7 +705,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -734,7 +733,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -763,7 +761,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -792,7 +789,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -821,7 +817,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -850,7 +845,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -879,7 +873,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -908,7 +901,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -937,7 +929,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -966,7 +957,6 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -990,14 +980,16 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      * @memberof SYS_PERMISSIONGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
         if(args[0].srfsourcekey){
             data.srfsourcekey = args[0].srfsourcekey;
         }
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
-        delete curViewParam.syspermission;
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.syspermission;
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1008,7 +1000,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         const openIndexViewTab = (data: any) => {
             const _data: any = { w: (new Date().getTime()) };
             Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);
@@ -1026,10 +1018,12 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      * @memberof SYS_PERMISSIONGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1038,7 +1032,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);

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

@@ -702,7 +702,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -731,7 +730,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -760,7 +758,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -789,7 +786,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -818,7 +814,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -847,7 +842,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -876,7 +870,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -905,7 +898,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -934,7 +926,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -963,7 +954,6 @@ export default class SysRolePermissionGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -987,6 +977,8 @@ export default class SysRolePermissionGridViewBase extends Vue {
      * @memberof SysRolePermissionGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const batchAddPSAppViews=[
             {view:{viewname:'sys-permissionmpickup-view',height: 0,width: 0,title: '权限表数据多项选择视图'},
             res:['SysPermission'],
@@ -1045,13 +1037,15 @@ export default class SysRolePermissionGridViewBase extends Vue {
      * @memberof SysRolePermissionGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(curViewParam.syspermission && true){
+        if(tempContext.syspermission && true){
             deResParameters = [
             { pathName: 'syspermissions', parameterName: 'syspermission' },
             ]
@@ -1062,7 +1056,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);

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

@@ -577,7 +577,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -609,7 +609,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -638,7 +637,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -667,7 +665,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -696,7 +693,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -725,7 +721,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -754,7 +749,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -783,7 +777,6 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -577,7 +577,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SYS_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -609,7 +609,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -638,7 +637,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -667,7 +665,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -696,7 +693,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -725,7 +721,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -754,7 +749,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -783,7 +777,6 @@ export default class SYS_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -705,7 +705,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -734,7 +733,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -763,7 +761,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -792,7 +789,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -821,7 +817,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -850,7 +845,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -879,7 +873,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -908,7 +901,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -937,7 +929,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -966,7 +957,6 @@ export default class SYS_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -990,14 +980,16 @@ export default class SYS_ROLEGridViewBase extends Vue {
      * @memberof SYS_ROLEGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
         if(args[0].srfsourcekey){
             data.srfsourcekey = args[0].srfsourcekey;
         }
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
-        delete curViewParam.sysrole;
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.sysrole;
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1008,7 +1000,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
         const openIndexViewTab = (data: any) => {
             const _data: any = { w: (new Date().getTime()) };
             Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);
@@ -1026,10 +1018,12 @@ export default class SYS_ROLEGridViewBase extends Vue {
      * @memberof SYS_ROLEGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1038,7 +1032,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);

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

@@ -577,7 +577,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -609,7 +609,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -638,7 +637,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -667,7 +665,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -696,7 +693,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -725,7 +721,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -754,7 +749,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -783,7 +777,6 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -702,7 +702,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -731,7 +730,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -760,7 +758,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -789,7 +786,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -818,7 +814,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -847,7 +842,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -876,7 +870,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -905,7 +898,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -934,7 +926,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -963,7 +954,6 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -987,6 +977,8 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      * @memberof SYS_USER_ROLEGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const batchAddPSAppViews=[
             {view:{viewname:'sys-rolempickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
             res:['SysRole'],
@@ -1045,13 +1037,15 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      * @memberof SYS_USER_ROLEGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         let deResParameters: any[] = [];
-        if(curViewParam.sysrole && true){
+        if(tempContext.sysrole && true){
             deResParameters = [
             { pathName: 'sysroles', parameterName: 'sysrole' },
             ]
@@ -1062,7 +1056,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);

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

@@ -577,7 +577,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -606,7 +605,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -635,7 +633,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -664,7 +661,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -693,7 +689,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -722,7 +717,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -751,7 +745,6 @@ export default class SYS_USEREditViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -609,7 +609,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -638,7 +637,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -667,7 +665,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -696,7 +693,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -725,7 +721,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -754,7 +749,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -783,7 +777,6 @@ export default class SYS_USEREditView2Base extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.form;
         if (xData.getDatas && xData.getDatas instanceof Function) {

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

@@ -705,7 +705,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -734,7 +733,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -763,7 +761,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -792,7 +789,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -821,7 +817,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -850,7 +845,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -879,7 +873,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -908,7 +901,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -937,7 +929,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -966,7 +957,6 @@ export default class SYS_USERGridViewBase extends Vue {
         // _this 指向容器对象
         const _this: any = this;
         let paramJO:any = {};
-        
         let contextJO:any = {};
         xData = this.$refs.grid;
         if (xData.getDatas && xData.getDatas instanceof Function) {
@@ -990,14 +980,16 @@ export default class SYS_USERGridViewBase extends Vue {
      * @memberof SYS_USERGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
         if(args[0].srfsourcekey){
             data.srfsourcekey = args[0].srfsourcekey;
         }
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
-        delete curViewParam.sysuser;
+        let tempContext = JSON.parse(JSON.stringify(this.context));
+        delete tempContext.sysuser;
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1008,7 +1000,7 @@ export default class SYS_USERGridViewBase extends Vue {
         const openIndexViewTab = (data: any) => {
             const _data: any = { w: (new Date().getTime()) };
             Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);
@@ -1026,10 +1018,12 @@ export default class SYS_USERGridViewBase extends Vue {
      * @memberof SYS_USERGridView
      */
     public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
+        let localContext:any = null;
+        let localViewParam:any =null;
         const data: any = {};
-        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        let tempContext = JSON.parse(JSON.stringify(this.context));
         if(args.length >0){
-            Object.assign(curViewParam,args[0]);
+            Object.assign(tempContext,args[0]);
         }
         const deResParameters: any[] = [];
         const parameters: any[] = [
@@ -1038,7 +1032,7 @@ export default class SYS_USERGridViewBase extends Vue {
         ];
         const _this: any = this;
         const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
             this.$router.push(routePath);
         }
         openIndexViewTab(data);

app_web/src/utils/types/uiaction-tool.d.ts

@@ -13,18 +13,22 @@ export declare interface UIActionTool {
      * 
      * @param actionTarget 数据目标
      * @param args  传入数据对象
+     * @param parentContext 父上下文
+     * @param parentParams  父参数
      * @param param 传入应用上下数据参数
      */
-    handleContextParam(actionTarget:any,args:any,context:any):any;
+    handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any):any;
 
     /**
      * 处理界面行为参数
      * 
      * @param actionTarget 数据目标
      * @param args  传入数据对象
+     * @param parentContext 父上下文
+     * @param parentParams  父参数
      * @param param 传入界面行为附加参数
      */
-    handleActionParam(actionTarget:any,args:any,params:any):any;
+    handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any):any;
 }
 
 declare module "vue/types/vue" {

app_web/src/utils/uiaction-tool/uiaction-tool.ts

@@ -8,10 +8,12 @@ export class UIActionTool {
      * 
      * @param actionTarget 数据目标
      * @param args  传入数据对象
+     * @param parentContext 父上下文
+     * @param parentParams  父参数
      * @param param 传入应用上下数据参数
      */
-    public static handleContextParam(actionTarget: any, args: any, context: any) {
-        return this.formatData(actionTarget, args, context);
+    public static handleContextParam(actionTarget: any, args: any,parentContext:any,parentParams:any, context: any) {
+        return this.formatData(actionTarget, args,parentContext,parentParams,context);
     }
 
     /**
@@ -19,10 +21,12 @@ export class UIActionTool {
      * 
      * @param actionTarget 数据目标
      * @param args  传入数据对象
+     * @param parentContext 父上下文
+     * @param parentParams  父参数
      * @param param 传入界面行为附加参数
      */
-    public static handleActionParam(actionTarget: any, args: any, params: any) {
-        return this.formatData(actionTarget, args, params);
+    public static handleActionParam(actionTarget: any, args: any,parentContext:any,parentParams:any, params: any) {
+        return this.formatData(actionTarget, args,parentContext,parentParams,params);
     }
 
     /**
@@ -32,11 +36,13 @@ export class UIActionTool {
      * @static
      * @param {*} actionTarget
      * @param {*} args
+     * @param parentContext
+     * @param parentParams
      * @param {*} _params
      * @returns {*}
      * @memberof UIActionTool
      */
-    private static formatData(actionTarget: any, args: any, _params: any): any {
+    private static formatData(actionTarget: any, args: any,parentContext:any,parentParams:any, _params: any): any {
         let _data: any = {};
         if (Object.is(actionTarget, 'SINGLEKEY')) {
             let [arg] = args;
@@ -50,12 +56,16 @@ export class UIActionTool {
                     const key = value.substring(1, value.length - 1);
                     if (arg && arg.hasOwnProperty(key)) {
                         value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
-                    } else {
+                    } else if(parentContext && parentContext.hasOwnProperty(key)){
+                        value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
+                    }else if(parentParams && parentParams.hasOwnProperty(key)){
+                        value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
+                    }else {
                         hasProperty = false;
                     }
                 }
                 if(hasProperty){
-                    Object.assign(_data, { [name]: value });
+                    Object.assign(_data, { [name.toLowerCase()]: value });
                 }
             });
         } else if (Object.is(actionTarget, 'MULTIKEY')) {
@@ -71,7 +81,11 @@ export class UIActionTool {
                     args.forEach((arg: any) => {
                         if (arg && arg.hasOwnProperty(key)) {
                             value = (arg[key] !== null && arg[key] !== undefined) ? arg[key] : null;
-                        } else {
+                        }else if(parentContext && parentContext.hasOwnProperty(key)){
+                            value = (parentContext[key] !== null && parentContext[key] !== undefined) ? parentContext[key] : null;
+                        }else if(parentParams && parentParams.hasOwnProperty(key)){
+                            value = (parentParams[key] !== null && parentParams[key] !== undefined) ? parentParams[key] : null;
+                        }else {
                             value = null;
                             noPropertyNum++;
                         }
@@ -79,7 +93,7 @@ export class UIActionTool {
                     });
                 }
                 if(values.length !== noPropertyNum){
-                    Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value });
+                    Object.assign(_data, { [name.toLowerCase()]: values.length > 0 ? values.join(',') : value });
                 }
             });
         }

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

@@ -1706,6 +1706,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 return;
             }
             const data = response.data;
+            this.createDefault(data);
             data.rowDataState = "create";
             _this.items.push(data);
             _this.gridItemsModel.push(_this.getGridRowModel());
@@ -1810,6 +1811,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1513,6 +1513,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1375,6 +1375,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1427,6 +1427,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1403,6 +1403,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

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

@@ -1408,6 +1408,14 @@ export default class MainBase extends Vue implements ControlInterface {
         });
         return isSelected ? "grid-selected-row" : "";
     }
+
+    /**
+     * 新建默认值
+     * @param {*}  row 行数据
+     * @memberof Main
+     */
+    public createDefault(row: any){                    
+    }
 }
 </script>
 

config.xml

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

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysAuthLogSearchContext.java

@@ -31,21 +31,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 	public void setN_username_like(String n_username_like) {
         this.n_username_like = n_username_like;
         if(!ObjectUtils.isEmpty(this.n_username_like)){
-            this.getSelectCond().like("username", n_username_like);
+            this.getSearchCond().like("username", n_username_like);
         }
     }
 	private String n_personname_like;//[用户名称]
 	public void setN_personname_like(String n_personname_like) {
         this.n_personname_like = n_personname_like;
         if(!ObjectUtils.isEmpty(this.n_personname_like)){
-            this.getSelectCond().like("personname", n_personname_like);
+            this.getSearchCond().like("personname", n_personname_like);
         }
     }
 	private String n_domain_like;//[域]
 	public void setN_domain_like(String n_domain_like) {
         this.n_domain_like = n_domain_like;
         if(!ObjectUtils.isEmpty(this.n_domain_like)){
-            this.getSelectCond().like("domain", n_domain_like);
+            this.getSearchCond().like("domain", n_domain_like);
         }
     }
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@@ -54,7 +54,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 	public void setN_authtime_gtandeq(Timestamp n_authtime_gtandeq) {
         this.n_authtime_gtandeq = n_authtime_gtandeq;
         if(!ObjectUtils.isEmpty(this.n_authtime_gtandeq)){
-            this.getSelectCond().ge("authtime", n_authtime_gtandeq);
+            this.getSearchCond().ge("authtime", n_authtime_gtandeq);
         }
     }
     @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
@@ -63,21 +63,21 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 	public void setN_authtime_ltandeq(Timestamp n_authtime_ltandeq) {
         this.n_authtime_ltandeq = n_authtime_ltandeq;
         if(!ObjectUtils.isEmpty(this.n_authtime_ltandeq)){
-            this.getSelectCond().le("authtime", n_authtime_ltandeq);
+            this.getSearchCond().le("authtime", n_authtime_ltandeq);
         }
     }
 	private String n_ipaddr_like;//[IP地址]
 	public void setN_ipaddr_like(String n_ipaddr_like) {
         this.n_ipaddr_like = n_ipaddr_like;
         if(!ObjectUtils.isEmpty(this.n_ipaddr_like)){
-            this.getSelectCond().like("ipaddr", n_ipaddr_like);
+            this.getSearchCond().like("ipaddr", n_ipaddr_like);
         }
     }
 	private String n_authcode_eq;//[认证结果]
 	public void setN_authcode_eq(String n_authcode_eq) {
         this.n_authcode_eq = n_authcode_eq;
         if(!ObjectUtils.isEmpty(this.n_authcode_eq)){
-            this.getSelectCond().eq("authcode", n_authcode_eq);
+            this.getSearchCond().eq("authcode", n_authcode_eq);
         }
     }
 
@@ -88,7 +88,7 @@ public class SysAuthLogSearchContext extends QueryWrapperContext<SysAuthLog> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("username", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPSSystemSearchContext.java

@@ -31,7 +31,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
 	public void setN_pssystemname_like(String n_pssystemname_like) {
         this.n_pssystemname_like = n_pssystemname_like;
         if(!ObjectUtils.isEmpty(this.n_pssystemname_like)){
-            this.getSelectCond().like("pssystemname", n_pssystemname_like);
+            this.getSearchCond().like("pssystemname", n_pssystemname_like);
         }
     }
 
@@ -42,7 +42,7 @@ public class SysPSSystemSearchContext extends QueryWrapperContext<SysPSSystem> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("pssystemname", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysPermissionSearchContext.java

@@ -31,28 +31,28 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio
 	public void setN_sys_permissionid_like(String n_sys_permissionid_like) {
         this.n_sys_permissionid_like = n_sys_permissionid_like;
         if(!ObjectUtils.isEmpty(this.n_sys_permissionid_like)){
-            this.getSelectCond().like("sys_permissionid", n_sys_permissionid_like);
+            this.getSearchCond().like("sys_permissionid", n_sys_permissionid_like);
         }
     }
 	private String n_sys_permissionname_like;//[资源名称]
 	public void setN_sys_permissionname_like(String n_sys_permissionname_like) {
         this.n_sys_permissionname_like = n_sys_permissionname_like;
         if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){
-            this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like);
+            this.getSearchCond().like("sys_permissionname", n_sys_permissionname_like);
         }
     }
 	private String n_permissiontype_eq;//[资源类别]
 	public void setN_permissiontype_eq(String n_permissiontype_eq) {
         this.n_permissiontype_eq = n_permissiontype_eq;
         if(!ObjectUtils.isEmpty(this.n_permissiontype_eq)){
-            this.getSelectCond().eq("permissiontype", n_permissiontype_eq);
+            this.getSearchCond().eq("permissiontype", n_permissiontype_eq);
         }
     }
 	private Integer n_enable_eq;//[逻辑有效]
 	public void setN_enable_eq(Integer n_enable_eq) {
         this.n_enable_eq = n_enable_eq;
         if(!ObjectUtils.isEmpty(this.n_enable_eq)){
-            this.getSelectCond().eq("enable", n_enable_eq);
+            this.getSearchCond().eq("enable", n_enable_eq);
         }
     }
 
@@ -63,7 +63,7 @@ public class SysPermissionSearchContext extends QueryWrapperContext<SysPermissio
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("sys_permissionname", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRolePermissionSearchContext.java

@@ -31,42 +31,42 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP
 	public void setN_sys_roleid_eq(String n_sys_roleid_eq) {
         this.n_sys_roleid_eq = n_sys_roleid_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){
-            this.getSelectCond().eq("sys_roleid", n_sys_roleid_eq);
+            this.getSearchCond().eq("sys_roleid", n_sys_roleid_eq);
         }
     }
 	private String n_sys_rolename_eq;//[角色名称]
 	public void setN_sys_rolename_eq(String n_sys_rolename_eq) {
         this.n_sys_rolename_eq = n_sys_rolename_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_eq)){
-            this.getSelectCond().eq("sys_rolename", n_sys_rolename_eq);
+            this.getSearchCond().eq("sys_rolename", n_sys_rolename_eq);
         }
     }
 	private String n_sys_rolename_like;//[角色名称]
 	public void setN_sys_rolename_like(String n_sys_rolename_like) {
         this.n_sys_rolename_like = n_sys_rolename_like;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){
-            this.getSelectCond().like("sys_rolename", n_sys_rolename_like);
+            this.getSearchCond().like("sys_rolename", n_sys_rolename_like);
         }
     }
 	private String n_sys_permissionid_eq;//[权限表标识]
 	public void setN_sys_permissionid_eq(String n_sys_permissionid_eq) {
         this.n_sys_permissionid_eq = n_sys_permissionid_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_permissionid_eq)){
-            this.getSelectCond().eq("sys_permissionid", n_sys_permissionid_eq);
+            this.getSearchCond().eq("sys_permissionid", n_sys_permissionid_eq);
         }
     }
 	private String n_sys_permissionname_eq;//[权限名称]
 	public void setN_sys_permissionname_eq(String n_sys_permissionname_eq) {
         this.n_sys_permissionname_eq = n_sys_permissionname_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_permissionname_eq)){
-            this.getSelectCond().eq("sys_permissionname", n_sys_permissionname_eq);
+            this.getSearchCond().eq("sys_permissionname", n_sys_permissionname_eq);
         }
     }
 	private String n_sys_permissionname_like;//[权限名称]
 	public void setN_sys_permissionname_like(String n_sys_permissionname_like) {
         this.n_sys_permissionname_like = n_sys_permissionname_like;
         if(!ObjectUtils.isEmpty(this.n_sys_permissionname_like)){
-            this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like);
+            this.getSearchCond().like("sys_permissionname", n_sys_permissionname_like);
         }
     }
 
@@ -77,7 +77,7 @@ public class SysRolePermissionSearchContext extends QueryWrapperContext<SysRoleP
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("sys_permissionid", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java

@@ -32,7 +32,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
         this.n_sys_rolename_isnotnull = n_sys_rolename_isnotnull;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnotnull)){
 			if(this.n_sys_rolename_isnotnull.toString().equals("1")){
-				this.getSelectCond().isNotNull("sys_rolename");
+				this.getSearchCond().isNotNull("sys_rolename");
 			}
         }
     }
@@ -41,7 +41,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
         this.n_sys_rolename_isnull = n_sys_rolename_isnull;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_isnull)){
 			if(this.n_sys_rolename_isnull.toString().equals("1")){
-				this.getSelectCond().isNull("sys_rolename");
+				this.getSearchCond().isNull("sys_rolename");
 			}
         }
     }
@@ -49,7 +49,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 	public void setN_sys_rolename_like(String n_sys_rolename_like) {
         this.n_sys_rolename_like = n_sys_rolename_like;
         if(!ObjectUtils.isEmpty(this.n_sys_rolename_like)){
-            this.getSelectCond().like("sys_rolename", n_sys_rolename_like);
+            this.getSearchCond().like("sys_rolename", n_sys_rolename_like);
         }
     }
 
@@ -60,7 +60,7 @@ public class SysRoleSearchContext extends QueryWrapperContext<SysRole> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("sys_rolename", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserRoleSearchContext.java

@@ -31,28 +31,28 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
 	public void setN_sys_roleid_eq(String n_sys_roleid_eq) {
         this.n_sys_roleid_eq = n_sys_roleid_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_roleid_eq)){
-            this.getSelectCond().eq("sys_roleid", n_sys_roleid_eq);
+            this.getSearchCond().eq("sys_roleid", n_sys_roleid_eq);
         }
     }
 	private String n_sys_userid_eq;//[用户标识]
 	public void setN_sys_userid_eq(String n_sys_userid_eq) {
         this.n_sys_userid_eq = n_sys_userid_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_userid_eq)){
-            this.getSelectCond().eq("sys_userid", n_sys_userid_eq);
+            this.getSearchCond().eq("sys_userid", n_sys_userid_eq);
         }
     }
 	private String n_sys_username_eq;//[用户名称]
 	public void setN_sys_username_eq(String n_sys_username_eq) {
         this.n_sys_username_eq = n_sys_username_eq;
         if(!ObjectUtils.isEmpty(this.n_sys_username_eq)){
-            this.getSelectCond().eq("sys_username", n_sys_username_eq);
+            this.getSearchCond().eq("sys_username", n_sys_username_eq);
         }
     }
 	private String n_sys_username_like;//[用户名称]
 	public void setN_sys_username_like(String n_sys_username_like) {
         this.n_sys_username_like = n_sys_username_like;
         if(!ObjectUtils.isEmpty(this.n_sys_username_like)){
-            this.getSelectCond().like("sys_username", n_sys_username_like);
+            this.getSearchCond().like("sys_username", n_sys_username_like);
         }
     }
 
@@ -63,7 +63,7 @@ public class SysUserRoleSearchContext extends QueryWrapperContext<SysUserRole> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("sys_userid", query)   
             );
 		 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserSearchContext.java

@@ -31,14 +31,14 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
 	public void setN_username_like(String n_username_like) {
         this.n_username_like = n_username_like;
         if(!ObjectUtils.isEmpty(this.n_username_like)){
-            this.getSelectCond().like("username", n_username_like);
+            this.getSearchCond().like("username", n_username_like);
         }
     }
 	private String n_personname_like;//[用户姓名]
 	public void setN_personname_like(String n_personname_like) {
         this.n_personname_like = n_personname_like;
         if(!ObjectUtils.isEmpty(this.n_personname_like)){
-            this.getSelectCond().like("personname", n_personname_like);
+            this.getSearchCond().like("personname", n_personname_like);
         }
     }
 
@@ -49,7 +49,7 @@ public class SysUserSearchContext extends QueryWrapperContext<SysUser> {
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
-            this.getSelectCond().and( wrapper ->
+            this.getSearchCond().and( wrapper ->
                      wrapper.like("personname", query)   
             );
 		 }

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

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-
-
-
-    <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-36-1">
-        <createTable tableName="IBZAUTHLOG">
-                <column name="LOGID" remarks="" type="VARCHAR(100)">
+!!!!模版产生代码错误:----
+Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
+----
+
+----
+FTL stack trace ("~" means nesting-related):
+	- Failed at: ${dbinst.getUserName()}  [in template "CODETEMPL_zh_CN" at line 28, column 24]
+----
\ No newline at end of file
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
-                </column>
-                <column name="USERNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="PERSONNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="DOMAIN" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHTIME" remarks="" type="DATETIME">
-                </column>
-                <column name="IPADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="MACADDR" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="USERAGENT" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="AUTHCODE" remarks="" type="VARCHAR(15)">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-
-
-    <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-93-2">
-        <createTable tableName="IBZROLE_PERMISSION">
-                <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-
-
-    <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-62-3">
-        <createTable tableName="IBZUSER_ROLE">
-                <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
-                </column>
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYS_USERID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-89-4">
-        <createTable tableName="IBZROLE">
-                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
-                </column>
-                <column name="SYS_ROLENAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="MEMO" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-36-5">
-        <createTable tableName="IBZPSSYSTEM">
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
-                </column>
-                <column name="PSSYSTEMNAME" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SYSSTRUCTURE" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="APPS" remarks="" type="TEXT(1048576)">
-                </column>
-                <column name="MD5CHECK" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="SHOWORDER" remarks="" type="INT">
-                </column>
-        </createTable>
-    </changeSet>
-
-
-    <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-6">
-        <createTable tableName="IBZPERMISSION">
-                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
-                </column>
-                <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
-                </column>
-                <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
-                </column>
-                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
-                </column>
-                <column name="ENABLE" remarks="" type="INT">
-                </column>
-                <column name="CREATEDATE" remarks="" type="DATETIME">
-                </column>
-                <column name="UPDATEDATE" remarks="" type="DATETIME">
-                </column>
-        </createTable>
-    </changeSet>
-
-        <!--输出实体[SYS_AUTHLOG]外键关系 -->
-        <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-93-7">
-       <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_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-62-9">
-       <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>
-        <!--输出实体[SYS_ROLE]外键关系 -->
-        <!--输出实体[SYS_PSSYSTEM]外键关系 -->
-        <!--输出实体[SYS_PERMISSION]外键关系 -->
-
-</databaseChangeLog>

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

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

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

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

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/swagger/SwaggerConfiguration.java

@@ -17,6 +17,7 @@ import springfox.documentation.spring.web.plugins.Docket;
 import springfox.documentation.spring.web.readers.operation.OperationParameterReader;
 import springfox.documentation.spring.web.readers.parameter.ModelAttributeParameterExpander;
 import springfox.documentation.swagger2.annotations.EnableSwagger2;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
@@ -24,6 +25,7 @@ import java.util.List;
 
 @Configuration
 @EnableSwagger2
+@ConditionalOnExpression("${swagger.enable:false}")
 public class SwaggerConfiguration {
 
     @Bean

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryBuildContext.java

@@ -5,6 +5,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.mongodb.QueryBuilder;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.ObjectUtils;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
 @Slf4j
 @Data
@@ -14,4 +18,163 @@ public class QueryBuildContext extends SearchContextBase implements ISearchConte
     @JSONField(serialize = false)
     private QueryBuilder selectCond=new QueryBuilder();
 
+
+    public QueryBuilder getSearchCond(){
+        return this.selectCond;
+    }
+
+    /**
+     * 填充自定义查询条件
+     * @return
+     */
+    public QueryBuilder getSelectCond() {
+        if(!ObjectUtils.isEmpty(filter)){
+            QueryBuilder queryBuilder=parseQueryFilter(filter);
+            if(!ObjectUtils.isEmpty(queryBuilder)){
+                selectCond.and(queryBuilder.get());
+            }
+        }
+        return selectCond;
+    }
+
+    /**
+     * 解析自定义查询条件
+     * @param queryFilter
+     * @return
+     */
+    private QueryBuilder parseQueryFilter(QueryFilter queryFilter){
+
+        if( ObjectUtils.isEmpty(queryFilter.get$and())  &&   ObjectUtils.isEmpty(queryFilter.get$or()) &&  ObjectUtils.isEmpty(queryFilter.any()))
+            return null;
+
+        QueryBuilder rsBuilder=QueryBuilder.start();
+        QueryBuilder fieldBuilder=parseFieldMap(queryFilter.any());
+        QueryBuilder orBuilder=parseOrQueryFilter(queryFilter.get$or());
+        QueryBuilder andBuilder=parseAndQueryFilter(queryFilter.get$and());
+        if(!ObjectUtils.isEmpty(fieldBuilder)){
+            rsBuilder.and(fieldBuilder.get());
+        }
+        if(!ObjectUtils.isEmpty(orBuilder)){
+            rsBuilder.and(orBuilder.get());
+        }
+        if(!ObjectUtils.isEmpty(andBuilder)){
+            rsBuilder.and(andBuilder.get());
+        }
+        return rsBuilder;
+    }
+
+    /**
+     * 解析自定义条件[or]
+     * @param queryFilters
+     * @return
+     */
+    private QueryBuilder parseOrQueryFilter(List<QueryFilter> queryFilters) {
+        QueryBuilder orBuilder =new QueryBuilder();
+        if(queryFilters==null || queryFilters.size()==0){
+            return null;
+        }
+        for(QueryFilter queryFilter: queryFilters){
+            QueryBuilder queryBuilder=parseQueryFilter(queryFilter);
+            if(!ObjectUtils.isEmpty(queryBuilder)){
+                orBuilder.or(queryBuilder.get());
+            }
+        }
+        return orBuilder;
+    }
+
+    /**
+     * 解析自定义条件[and]
+     * @param queryFilters
+     * @return
+     */
+    private QueryBuilder parseAndQueryFilter(List<QueryFilter> queryFilters) {
+        QueryBuilder orBuilder =new QueryBuilder();
+        if(queryFilters==null || queryFilters.size()==0){
+            return null;
+        }
+        for(QueryFilter queryFilter: queryFilters){
+            QueryBuilder queryBuilder=parseQueryFilter(queryFilter);
+            if(!ObjectUtils.isEmpty(queryBuilder)){
+                orBuilder.and(queryBuilder.get());
+            }
+        }
+        return orBuilder;
+    }
+
+    /**
+     * 解析自定义条件[字段条件]
+     * @param fieldMap
+     * @return
+     */
+    private QueryBuilder parseFieldMap(Map<String , QueryFilter.SegmentCond> fieldMap) {
+        if(fieldMap.size()==0)
+            return null;
+        QueryBuilder fieldBuilders=QueryBuilder.start();
+        for(Map.Entry<String, QueryFilter.SegmentCond> entry: fieldMap.entrySet()){
+            getSegmentCondSql(entry.getKey(),entry.getValue(),fieldBuilders);
+        }
+        return fieldBuilders;
+    }
+
+    /**
+     * 解析自定义条件[字段条件]
+     * @param fieldName
+     * @param segmentCond
+     * @param fieldBuilder
+     */
+    private void getSegmentCondSql(String fieldName, QueryFilter.SegmentCond segmentCond,QueryBuilder fieldBuilder) {
+
+        Map<String , Object> segmentCondMap =  segmentCond.any();
+        for(Map.Entry<String , Object> entry: segmentCondMap.entrySet()){
+            Object value=entry.getValue();
+            switch (entry.getKey()){
+                case "$eq":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).is(value).get());
+                    break;
+                case "$ne":
+                    fieldBuilder.and(QueryBuilder.start().not().and(fieldName).is(value).get());
+                    break;
+                case "$gt":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).greaterThan(value).get());
+                    break;
+                case "$gte":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).greaterThanEquals(value).get());
+                    break;
+                case "$lt":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).lessThan(value).get());
+                    break;
+                case "$lte":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).lessThanEquals(value).get());
+                    break;
+                case "$null":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).exists(null).get());
+                    break;
+                case "$notNull":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).exists(true).and(fieldName).notEquals("").and(fieldName).notEquals(null).get());
+                    break;
+                case "$in":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).in(value).get());
+                    break;
+                case "$notIn":
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).not().in(value).get());
+                    break;
+                case "$like":
+                    Pattern likePattern = Pattern.compile("^.*" + value + ".*$", Pattern.CASE_INSENSITIVE);
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).regex(likePattern).get());
+                    break;
+                case "$startsWith":
+                    Pattern startsWithPattern = Pattern.compile(value + ".*$", Pattern.CASE_INSENSITIVE);
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).regex(startsWithPattern).get());
+                    break;
+                case "$endsWith":
+                    Pattern endsWithPattern = Pattern.compile("^.*" + value + "$", Pattern.CASE_INSENSITIVE);
+                    fieldBuilder.and(QueryBuilder.start().and(fieldName).regex(endsWithPattern).get());
+                    break;
+                case "$exists":
+                    break;
+                case "$notExists":
+                    break;
+            }
+        }
+    }
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryFilter.java

+package cn.ibizlab.util.filter;
+
+import com.fasterxml.jackson.annotation.*;
+import org.springframework.data.annotation.Transient;
+import java.util.*;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class QueryFilter {
+
+    public static QueryFilter createQuery()
+    {
+        QueryFilter queryFilter=new QueryFilter();
+        return queryFilter;
+    }
+
+    public QueryFilter eq(String column,Object value) {
+        return op(column,SegmentCond.eq(value));
+    }
+    public QueryFilter ne(String column,Object value) {
+        return op(column,SegmentCond.ne(value));
+    }
+    public QueryFilter gt(String column,Object value) {
+        return op(column,SegmentCond.gt(value));
+    }
+    public QueryFilter ge(String column,Object value) {
+        return op(column,SegmentCond.ge(value));
+    }
+    public QueryFilter lt(String column,Object value) {
+        return op(column,SegmentCond.lt(value));
+    }
+    public QueryFilter le(String column,Object value) {
+        return op(column,SegmentCond.le(value));
+    }
+    public QueryFilter isnull(String column) {
+        return op(column,SegmentCond.isnull());
+    }
+    public QueryFilter isnotnull(String column) {
+        return op(column,SegmentCond.isnotnull());
+    }
+    public QueryFilter in(String column,Collection value) {
+        return op(column,SegmentCond.in(value));
+    }
+    public QueryFilter notin(String column,Collection value) {
+        return op(column,SegmentCond.notin(value));
+    }
+    public QueryFilter like(String column,String value) {
+        return op(column,SegmentCond.like(value));
+    }
+    public QueryFilter startsWith(String column,String value) {
+        return op(column,SegmentCond.startsWith(value));
+    }
+    public QueryFilter endsWith(String column,String value) {
+        return op(column,SegmentCond.endsWith(value));
+    }
+    public QueryFilter between(String column,Object from,Object to) {
+        return op(column,SegmentCond.between(from,to));
+    }
+
+
+    @JsonIgnore
+    @Transient
+    private Map<String,SegmentCond> map;
+
+    private Map<String,SegmentCond> getMap()
+    {
+        if(map==null)
+            map=new LinkedHashMap<>();
+        return  map;
+    }
+
+    @JsonAnyGetter
+    public Map<String , SegmentCond> any() {
+        return getMap();
+    }
+
+    @JsonAnySetter
+    public void set(String column, SegmentCond value) {
+        getMap().put(column,value);
+    }
+
+    @JsonProperty(index = 999)
+    private List<QueryFilter> $or;
+
+
+    public List<QueryFilter> get$or() {
+        return $or;
+    }
+
+    public void set$or(List<QueryFilter> $or) {
+        this.$or = $or;
+    }
+
+
+    public QueryFilter or(QueryFilter... ors)
+    {
+        if ($or == null) {
+            $or = new ArrayList();
+        }
+        Collections.addAll($or, ors);
+        return this;
+
+    }
+
+    @JsonProperty(index = 999)
+    private List<QueryFilter> $and;
+
+    public List<QueryFilter> get$and() {
+        return $and;
+    }
+
+    public void set$and(List<QueryFilter> $and) {
+        this.$and = $and;
+    }
+
+    public QueryFilter and(QueryFilter... ands)
+    {
+        if ($and == null) {
+            $and = new ArrayList();
+        }
+
+        Collections.addAll($and, ands);
+        return this;
+
+    }
+
+    @Override
+    public String toString() {
+        return "QueryFilter{" +
+                "map=" + map +
+                ", $or=" + $or +
+                '}';
+    }
+
+    private QueryFilter op(String column, SegmentCond segmentCond) {
+
+        if(this.getMap().containsKey(column))
+            ((SegmentCond)this.getMap().get(column)).getMap().putAll(segmentCond.getMap());
+        else
+            this.getMap().put(column,segmentCond);
+        return this;
+    }
+
+
+    public static class SegmentCond  {
+        @JsonIgnore
+        @Transient
+        private Map<String,Object> map;
+
+        @Override
+        public String toString() {
+            return "SegmentCond{" +
+                    "map=" + map +
+                    '}';
+        }
+
+        private Map<String,Object> getMap()
+        {
+            if(map==null)
+                map=new LinkedHashMap<>();
+            return  map;
+        }
+
+        @JsonAnyGetter
+        public Map<String , Object> any() {
+            return getMap();
+        }
+
+        @JsonAnySetter
+        public void set(String column, Object value) {
+            getMap().put(column,value);
+        }
+
+        public static SegmentCond eq(Object value) {
+            return op(Segment.EQ,value);
+        }
+        public static SegmentCond ne(Object value) {
+            return op(Segment.NE,value);
+        }
+        public static SegmentCond gt(Object value) {
+            return op(Segment.GT,value);
+        }
+        public static SegmentCond ge(Object value) {
+            return op(Segment.GE,value);
+        }
+        public static SegmentCond lt(Object value) {
+            return op(Segment.LT,value);
+        }
+        public static SegmentCond le(Object value) {
+            return op(Segment.LE,value);
+        }
+        public static SegmentCond isnull() {
+            return op(Segment.IS_NULL,true);
+        }
+        public static SegmentCond isnotnull() {
+            return op(Segment.IS_NOT_NULL,true);
+        }
+        public static SegmentCond in(Collection value) {
+            return op(Segment.IN,value);
+        }
+        public static SegmentCond notin(Collection value) {
+            return op(Segment.NOTIN,value);
+        }
+        public static SegmentCond like(String value) {
+            return op(Segment.LIKE,value);
+        }
+        public static SegmentCond startsWith(String value) {
+            return op(Segment.LEFTLIKE,value);
+        }
+        public static SegmentCond endsWith(String value) {
+            return op(Segment.RIGHTLIKE,value);
+        }
+        public static SegmentCond between(Object from,Object to) {
+            return op(Segment.GE,from).op(Segment.LT,to);
+        }
+        private static SegmentCond op(Segment segment,Object value) {
+            SegmentCond segmentCond=new SegmentCond();
+            segmentCond.getMap().put(segment.keyword,value);
+            return segmentCond;
+        }
+    }
+
+    public enum Segment  {
+        AND("$and"),
+        OR("$or"),
+
+        EQ("$eq"),
+        NE("$ne"),
+        GT("$gt"),
+        GE("$gte"),
+        LT("$lt"),
+        LE("$lte"),
+        IS_NULL("$null"),
+        IS_NOT_NULL("$notNull"),
+        IN("$in"),
+        NOTIN("$notIn"),
+        LIKE("$like"),
+        LEFTLIKE("$startsWith"),
+        RIGHTLIKE("$endsWith"),
+        EXISTS("$exists"),
+        NOTEXISTS("$notExists");
+
+        private final String keyword;
+
+        Segment(final String keyword) {
+            this.keyword = keyword;
+        }
+
+    }
+
+    /*
+            SQL: (field1>1 and field2='3' and (field3 like "a" or (field4 is not null and field5 in ['11','12']) )
+            JAVA: QueryFilter filter=QueryFilter.createQuery()
+                    .gt("field1",1)
+                    .eq("field2",'3')
+                    .or(QueryFilter.createQuery().like("field3","a")
+                            ,QueryFilter.createQuery().isnotnull("field4").in("field5",Arrays.asList("11","12")));
+            JSON:  {
+                        "$or":[
+                            {
+                                "field3":{"$like":"a"}
+                            },
+                            {
+                                "field4":{ "$notNull":true},
+                                "field5":{"$in":["11","12"]}
+                            }],
+                        "field1":{"$gt":1},
+                        "field2":{"$eq":"3" }
+                    }
+     */
+}

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/QueryWrapperContext.java

@@ -10,11 +10,9 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-
 import java.lang.reflect.ParameterizedType;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
+import java.util.function.Consumer;
 
 @Slf4j
 @Data
@@ -73,4 +71,150 @@ public class QueryWrapperContext<T> extends SearchContextBase implements ISearch
         return page;
     }
 
+    public QueryWrapper<T> getSearchCond(){
+        return this.selectCond;
+    }
+
+    /**
+     * 填充自定义查询条件
+     * @return
+     */
+    public QueryWrapper<T> getSelectCond() {
+        if(!ObjectUtils.isEmpty(filter)){
+            Consumer queryWrapper = parseQueryFilter(filter);
+            if(!ObjectUtils.isEmpty(queryWrapper)){
+                selectCond.and(queryWrapper);
+            }
+        }
+        return selectCond;
+    }
+
+    /**
+     * 解析自定义查询条件
+     * @param queryFilter
+     * @return
+     */
+    private Consumer<QueryWrapper<T>> parseQueryFilter(QueryFilter queryFilter){
+
+        if(queryFilter.any().size()==0  && queryFilter.get$or()==null && queryFilter.get$and()==null)
+             return null;
+        Consumer<QueryWrapper<T>> consumer = queryWrapper -> {
+            Consumer fieldConsumer=parseFieldMap(queryFilter.any());
+            Consumer orConsumer=parseOrQueryFilter(queryFilter.get$or());
+            Consumer andConsumer=parseAndQueryFilter(queryFilter.get$and());
+            if(!ObjectUtils.isEmpty(fieldConsumer)){
+                queryWrapper.and(fieldConsumer);
+            }
+            if(!ObjectUtils.isEmpty(orConsumer)){
+                queryWrapper.and(orConsumer);
+            }
+            if(!ObjectUtils.isEmpty(andConsumer)){
+                queryWrapper.and(andConsumer);
+            }
+        };
+        return consumer;
+    }
+
+    /**
+     * 解析自定义条件[or]
+     * @param queryFilters
+     * @return
+     */
+    private Consumer<QueryWrapper<T>> parseOrQueryFilter(List<QueryFilter> queryFilters) {
+
+        if(queryFilters==null || queryFilters.size()==0)
+            return null;
+            Consumer<QueryWrapper<T>> consumer = queryWrapper -> {
+            for(QueryFilter queryFilter: queryFilters){
+                Consumer tempQueryWrapper=parseQueryFilter(queryFilter);
+                queryWrapper.or(tempQueryWrapper);
+            }
+        };
+        return consumer;
+    }
+
+    /**
+     * 解析自定义条件[and]
+     * @param queryFilters
+     * @return
+     */
+    private Consumer<QueryWrapper<T>> parseAndQueryFilter(List<QueryFilter> queryFilters) {
+
+        if(queryFilters==null || queryFilters.size()==0)
+            return null;
+            Consumer<QueryWrapper<T>> consumer = queryWrapper -> {
+            for(QueryFilter queryFilter: queryFilters){
+                Consumer tempQueryWrapper=parseQueryFilter(queryFilter);
+                queryWrapper.and(tempQueryWrapper);
+            }
+        };
+        return consumer;
+    }
+
+    /**
+     * 解析自定义条件[字段条件]
+     * @param fieldMap
+     * @return
+     */
+    private Consumer<QueryWrapper<T>> parseFieldMap(Map<String , QueryFilter.SegmentCond> fieldMap) {
+
+        if(fieldMap.size()==0)
+            return null;
+            Consumer<QueryWrapper<T>> consumer = queryWrapper -> {
+        for(Map.Entry<String, QueryFilter.SegmentCond> field: fieldMap.entrySet()){
+            String fieldName=field.getKey();
+            QueryFilter.SegmentCond segmentCond=field.getValue();
+            Map<String , Object> segmentCondMap =  segmentCond.any();
+            for(Map.Entry<String , Object> fieldCond: segmentCondMap.entrySet()){
+                Object value=fieldCond.getValue();
+                switch (fieldCond.getKey()){
+                    case "$eq":
+                        queryWrapper.eq(fieldName,value);
+                        break;
+                    case "$ne":
+                        queryWrapper.ne(fieldName,value);
+                        break;
+                    case "$gt":
+                        queryWrapper.gt(fieldName,value);
+                        break;
+                    case "$gte":
+                        queryWrapper.ge(fieldName,value);
+                        break;
+                    case "$lt":
+                        queryWrapper.lt(fieldName,value);
+                        break;
+                    case "$lte":
+                        queryWrapper.le(fieldName,value);
+                        break;
+                    case "$null":
+                        queryWrapper.isNull(fieldName);
+                        break;
+                    case "$notNull":
+                        queryWrapper.isNotNull(fieldName);
+                        break;
+                    case "$in":
+                        queryWrapper.in(fieldName,(Collection)value);
+                        break;
+                    case "$notIn":
+                        queryWrapper.notIn(fieldName,(Collection)value);
+                        break;
+                    case "$like":
+                        queryWrapper.like(fieldName,value);
+                        break;
+                    case "$startsWith":
+                        queryWrapper.likeRight(fieldName,value);
+                        break;
+                    case "$endsWith":
+                        queryWrapper.likeLeft(fieldName,value);
+                        break;
+                    case "$exists":
+                        break;
+                    case "$notExists":
+                        break;
+                }
+            }
+        }
+      };
+        return consumer;
+    }
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -12,9 +12,7 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.StringUtils;
 import org.springframework.util.ObjectUtils;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @Data
@@ -35,7 +33,11 @@ public class SearchContextBase implements ISearchContext{
 	 */
     @JsonProperty("query")
 	public String query;
-
+    /**
+     * 条件表达式
+     */
+    @JsonProperty("filter")
+    public QueryFilter filter;
     /**
      * 数据查询
      */