ibiz4j 发布系统代码

app_web/src/environments/environment.ts

@@ -21,6 +21,8 @@ export const Environment = {
     uniteAddress:"http://172.16.100.202:8114",
     // 是否为开发模式
     devMode: true,
+    // 是否开启权限认证
+    enablePermissionValid:false,
     // 项目模板地址
     ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7",
     // 配置平台地址

app_web/src/pages/uaa/index/index-base.vue

@@ -265,6 +265,9 @@ export default class IndexBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -315,6 +315,9 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -334,6 +334,9 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -342,6 +342,9 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -381,6 +381,9 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }
@@ -992,6 +995,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
             data.srfsourcekey = args[0].srfsourcekey;
         }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
+        delete curViewParam.syspermission;
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
         }

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

@@ -313,6 +313,9 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -287,6 +287,9 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -280,6 +280,9 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -230,6 +230,9 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -378,6 +378,9 @@ export default class SysRolePermissionGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -236,6 +236,9 @@ export default class SYS_ROLE_PERMISSIONCustomViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -334,6 +334,9 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -342,6 +342,9 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -313,6 +313,9 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -287,6 +287,9 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -280,6 +280,9 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -230,6 +230,9 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -334,6 +334,9 @@ export default class SYS_ROLEEditViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -342,6 +342,9 @@ export default class SYS_ROLEEditView2Base extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -381,6 +381,9 @@ export default class SYS_ROLEGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }
@@ -992,6 +995,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
             data.srfsourcekey = args[0].srfsourcekey;
         }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
+        delete curViewParam.sysrole;
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
         }

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

@@ -313,6 +313,9 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -287,6 +287,9 @@ export default class SYS_ROLEPickupGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -280,6 +280,9 @@ export default class SYS_ROLEPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -230,6 +230,9 @@ export default class SYS_ROLERedirectViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -334,6 +334,9 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -342,6 +342,9 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -378,6 +378,9 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -313,6 +313,9 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -287,6 +287,9 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -280,6 +280,9 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -230,6 +230,9 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -334,6 +334,9 @@ export default class SYS_USEREditViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -342,6 +342,9 @@ export default class SYS_USEREditView2Base extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -381,6 +381,9 @@ export default class SYS_USERGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }
@@ -992,6 +995,7 @@ export default class SYS_USERGridViewBase extends Vue {
             data.srfsourcekey = args[0].srfsourcekey;
         }
         let curViewParam = JSON.parse(JSON.stringify(this.context));
+        delete curViewParam.sysuser;
         if(args.length >0){
             Object.assign(curViewParam,args[0]);
         }

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

@@ -313,6 +313,9 @@ export default class SYS_USERMPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -287,6 +287,9 @@ export default class SYS_USERPickupGridViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -280,6 +280,9 @@ export default class SYS_USERPickupViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

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

@@ -230,6 +230,9 @@ export default class SYS_USERRedirectViewBase extends Vue {
             if(this.context && this.context.srfparentkey){
                 Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
             }
+            if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+                Object.assign(this.context,this.$store.getters.getAppData().context);
+            }
             this.handleCustomViewData();
             return;
         }

app_web/src/service/entity-service.ts

@@ -637,6 +637,36 @@ export default class EntityService {
         }
     }
 
+    /**
+     * getDynaModel(获取动态模型)接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async getDynaModel(context: any = {},data: any, isloading?: boolean):Promise<any> {
+        if(data && data.configType && data.targetType){
+            return Http.getInstance().get(`/configs/${data.configType}/${data.targetType}`);
+        }
+    }
+
+    /**
+     * setDynaModel(设置动态模型)接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async setDynaModel(context: any = {},data: any, isloading?: boolean):Promise<any> {
+        if(data && data.configType && data.targetType){
+            return Http.getInstance().put(`/configs/${data.configType}/${data.targetType}`,{model:data.model});
+        }
+    }
+
 	/**
      * WFStart接口方法
      *

app_web/src/store/modules/auth-resource/actions.ts

@@ -4,10 +4,13 @@
  * @param param0 
  * @param data 
  */
-export const commitResourceData = ({ commit, state }: { commit: any, state: any }, { unires, enablepermissionvalid }: { unires: Array<any>, enablepermissionvalid: boolean }) => {
+export const commitAuthData = ({ commit, state }: { commit: any, state: any }, { unires,appmenu,enablepermissionvalid }: { unires: Array<any>, appmenu: Array<any>, enablepermissionvalid: boolean }) => {
     if(unires && unires.length > 0){
         commit('setResourceData', unires);
     }
+    if(appmenu && appmenu.length >0){
+        commit('setMenuData', appmenu);
+    }
     if(enablepermissionvalid){
         commit('setEnablePermissionValid', enablepermissionvalid);
     }

app_web/src/store/modules/auth-resource/getters.ts

@@ -10,6 +10,18 @@ export const getResourceData = (state: any) => (resourcetag: string) => {
     return itemIndex === -1 ? false : true;
 }
 
+/**
+ * 判断指定菜单权限是否存在
+ * 
+ * @param state 
+ */
+export const getMenuData = (state: any) => (menutag: string) => {
+    let itemIndex: any = state.menuData.findIndex((menucode: any, objIndex: any, objs: any) => {
+        return Object.is(menucode, menutag);
+    })
+    return itemIndex === -1 ? false : true;
+}
+
 /**
  * 获取是否开启权限认证
  * 
@@ -17,4 +29,24 @@ export const getResourceData = (state: any) => (resourcetag: string) => {
  */
 export const getEnablePermissionValid = (state: any) => {
     return state.enablePermissionValid;
+}
+
+/**
+ * 判断指定菜单是否显示
+ * 
+ * @param state 
+ */
+export const getAuthMenu = (state: any) => (menu:any) =>{
+    // 存在权限
+    let resourceIndex: any;
+    let menuIndex:any;
+    if(state.enablePermissionValid){
+        resourceIndex= state.resourceData.findIndex((resourcetag: any, objIndex: any, objs: any) => {
+            return Object.is(menu.resourcetag, resourcetag);
+        })
+    }
+    menuIndex= state.menuData.findIndex((menutag: any, objIndex: any, objs: any) => {
+        return Object.is(menu.authtag, menutag);
+    })
+    return (resourceIndex !== -1 || menuIndex !== -1)?true:false;
 }
\ No newline at end of file

app_web/src/store/modules/auth-resource/mutations.ts

@@ -11,6 +11,19 @@ export const setResourceData = (state: any, resourceArray:Array<any>) => {
     state.resourceData = resourceArray;
 }
 
+/**
+ * 设置菜单数据
+ * 
+ * @param state 
+ * @param resourceArray
+ */
+export const setMenuData = (state: any, menuArray:Array<any>) => {
+    if(menuArray && menuArray.length === 0){
+        return;
+    }
+    state.menuData = menuArray;
+}
+
 /**
  * 设置是否开启权限认证
  * 

app_web/src/store/modules/auth-resource/state.ts

@@ -4,6 +4,8 @@
 export const resourcestate: any = {
     // 统一资源数据
     resourceData: [],
+    // 菜单数据
+    menuData:[],
     // 是否开启权限认证
     enablePermissionValid: false
 }
\ No newline at end of file

app_web/src/styles/default.less

@@ -207,7 +207,7 @@
     }
 }
 
-.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9, .view-container.decalendarview, .view-container.decalendarview9{
   >.view-card.view-no-caption{
     >.ivu-card-body{
       height: 100%;

app_web/src/utils/auth-guard/auth-guard.ts

@@ -67,7 +67,7 @@ export class AuthGuard {
                         }
                         router.app.$store.commit('addAppData', data);
                         // 提交统一资源数据
-                        router.app.$store.dispatch('authresource/commitResourceData', data);
+                        router.app.$store.dispatch('authresource/commitAuthData', data);
                     }
                 }
                 resolve(true);

app_web/src/widgets/app/main-appmenu/main-appmenu-base.vue

@@ -126,6 +126,7 @@ import { UIActionTool,Util } from '@/utils';
 import MainService from './main-appmenu-service';
 
 import MainModel from './main-appmenu-model';
+import { Environment } from '@/environments/environment';
 
 
 @Component({
@@ -645,11 +646,11 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
     public handleMenusResource(inputMenus:Array<any>){
-        if(this.$store.getters['authresource/getEnablePermissionValid']){
+        if(Environment.enablePermissionValid){
             this.computedEffectiveMenus(inputMenus);
         }
-        this.dataProcess(this.menuMode.getAppMenuItems());
-        this.menus = this.menuMode.getAppMenuItems();
+        this.dataProcess(inputMenus);
+        this.menus = inputMenus;
         this.doMenuSelect();
     }
 
@@ -661,7 +662,7 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public computedEffectiveMenus(inputMenus:Array<any>){
         inputMenus.forEach((_item:any) =>{
-            if(_item.resourcetag && !this.$store.getters['authresource/getResourceData'](_item.resourcetag)){
+            if(!this.$store.getters['authresource/getAuthMenu'](_item)){
                 _item.hidden = true;
                 if (_item.items && _item.items.length > 0) {
                     this.computedEffectiveMenus(_item.items);

app_web/src/widgets/app/main-appmenu/main-appmenu-model.ts

@@ -31,6 +31,7 @@ export default class MainModel {
 	textcls: '',
 	appfunctag: 'Auto5',
 	resourcetag: '',
+	authtag:'web-Main-menuitem3',
 },
         {
 	id: 'db3e0d48d6e76a66784adc84edd90cdc',
@@ -49,6 +50,7 @@ export default class MainModel {
 	textcls: '',
 	appfunctag: 'Auto10',
 	resourcetag: '',
+	authtag:'web-Main-menuitem6',
 },
         {
 	id: 'BCF452A9-F6C1-40C9-B107-1D3E9E8839D3',
@@ -67,6 +69,7 @@ export default class MainModel {
 	textcls: '',
 	appfunctag: 'Auto6',
 	resourcetag: '',
+	authtag:'web-Main-menuitem1',
 },
     ];
 

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 -Pweb
-      cd ibzuaa-app/ibzuaa-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/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-app-web.jar
 
-EXPOSE 30002
+EXPOSE 8080
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,23 +3,9 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "30002:30002"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - 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
-      - ABC=1
-      - DEC=2
     deploy:
       resources:
            limits:

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

@@ -9,7 +9,7 @@ services:
     deploy:
       resources:
            limits:
-               memory: 1024M
+               memory: 4048M
            reservations:
                memory: 400M    
       mode: replicated