laizhilong 发布系统代码

app_web/package.json

@@ -24,7 +24,7 @@
     "element-ui": "^2.13.0",
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
-    "ibiz-gantt-elastic": "^1.0.6",
+    "ibiz-gantt-elastic": "^1.0.8",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_web/src/pages/uaa/index/page-register.ts

@@ -2,6 +2,7 @@ export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('sys-permissionpickup-grid-view', () => import('@pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view.vue'));
         Vue.component('sys-rolepickup-view', () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue'));
+        Vue.component('sys-role-permissionmpickup-view', () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'));
         Vue.component('sys-usermpickup-view', () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'));
         Vue.component('sys-userpickup-grid-view', () => import('@pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view.vue'));
         Vue.component('sys-roleedit-view', () => import('@pages/uaa/sys-roleedit-view/sys-roleedit-view.vue'));
@@ -15,6 +16,7 @@ export const PageComponents = {
         Vue.component('sys-permissionmpickup-view', () => import('@pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view.vue'));
         Vue.component('sys-useredit-view', () => import('@pages/uaa/sys-useredit-view/sys-useredit-view.vue'));
         Vue.component('sys-role-permissionedit-view', () => import('@pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view.vue'));
+        Vue.component('sys-role-permissionpickup-grid-view', () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'));
         Vue.component('sys-user-rolegrid-view', () => import('@pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view.vue'));
         Vue.component('sys-permissiongrid-view', () => import('@pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view.vue'));
         Vue.component('sys-rolepickup-grid-view', () => import('@pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view.vue'));

app_web/src/pages/uaa/index/router.ts

@@ -60,6 +60,47 @@ const router = new Router({
                     },
                     component: () => import('@pages/uaa/sys-rolepickup-view/sys-rolepickup-view.vue'),
                 },
+                {
+                    path: 'sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_roles', parameterName: 'sys_role' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+                },
+                {
+                    path: 'sys_permissions/:sys_permission?/sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_permissions', parameterName: 'sys_permission' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+                },
+                {
+                    path: 'sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+                },
                 {
                     path: 'sys_users/:sys_user?/mpickupview/:mpickupview?',
                     meta: {
@@ -313,6 +354,47 @@ const router = new Router({
                     },
                     component: () => import('@pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view.vue'),
                 },
+                {
+                    path: 'sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_roles', parameterName: 'sys_role' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+                },
+                {
+                    path: 'sys_permissions/:sys_permission?/sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_permissions', parameterName: 'sys_permission' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+                },
+                {
+                    path: 'sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+                },
                 {
                     path: 'sys_users/:sys_user?/sys_user_roles/:sys_user_role?/gridview/:gridview?',
                     meta: {
@@ -513,6 +595,44 @@ const router = new Router({
         },
         component: () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'),
     },
+    {
+        path: '/sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_roles', parameterName: 'sys_role' },
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+    },
+    {
+        path: '/sys_permissions/:sys_permission?/sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_permissions', parameterName: 'sys_permission' },
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+    },
+    {
+        path: '/sys_role_permissions/:sys_role_permission?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view.vue'),
+    },
     {
         path: '/sys_permissions/:sys_permission?/gridview/:gridview?',
         meta: {
@@ -563,6 +683,44 @@ const router = new Router({
         },
         component: () => import('@pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view.vue'),
     },
+    {
+        path: '/sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+            parameters: [
+                { pathName: 'sys_roles', parameterName: 'sys_role' },
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+    },
+    {
+        path: '/sys_permissions/:sys_permission?/sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+            parameters: [
+                { pathName: 'sys_permissions', parameterName: 'sys_permission' },
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+    },
+    {
+        path: '/sys_role_permissions/:sys_role_permission?/pickupgridview/:pickupgridview?',
+        meta: {
+            caption: 'entities.sys_role_permission.views.pickupgridview.caption',
+            parameters: [
+                { pathName: 'sys_role_permissions', parameterName: 'sys_role_permission' },
+                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view.vue'),
+    },
     {
         path: '/sys_roles/:sys_role?/editview/:editview?',
         meta: {

app_web/src/store/modules/view-action/state.ts

@@ -103,7 +103,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '61a949e3c23ebdda724888662ded1478',
+                '3e133a839b837d9e47f80e161d66a861',
                 'fb89f9af95f2caf92ccc1249025c9a1b',
             ],
         },
@@ -155,7 +155,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '61a949e3c23ebdda724888662ded1478',
+                '3e133a839b837d9e47f80e161d66a861',
                 'fb89f9af95f2caf92ccc1249025c9a1b',
             ],
         },

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

@@ -56,10 +56,10 @@
     :viewparams="viewparams"
     parameterName='sys_role'
     parentName="SYS_ROLE"  
-    refviewtype='DEGRIDVIEW' 
+    refviewtype='DEMPICKUPVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='sys-role-permissiongrid-view' 
+    viewname='sys-role-permissionmpickup-view' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">

app_web/yarn.lock

@@ -5209,10 +5209,10 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-ibiz-gantt-elastic@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.6.tgz#1e74b0c1a684d90a6d1b203606ad52fcf613f799"
-  integrity sha512-8sHiSh4dRMzOQxVvKj0OeJEAoIbLeqChfMRJ4Tabum+1qYTFqZC3LNBDxg4O+xBGPi4iMBqeBjssosi25FZpOA==
+ibiz-gantt-elastic@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/ibiz-gantt-elastic/-/ibiz-gantt-elastic-1.0.8.tgz#d7c40b6b0068a9303772594608375d42b8dbcb61"
+  integrity sha512-vlawRcYGiNv6N8N9Wx2ZO7oorV3R6dZWYT7Yvb2lxWfdWYX+cK1KZP0p+2S/Is1/A7+eDFhu60iZ2nf7LExaFQ==
   dependencies:
     dayjs "^1.8.16"
     resize-observer-polyfill "^1.5.1"

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

@@ -136,7 +136,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-57-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-59-7">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/rest/SYS_ROLE_PERMISSIONResource.java

@@ -67,7 +67,7 @@ public class SYS_ROLE_PERMISSIONResource {
 
 
 
-    @PreAuthorize("hasPermission('Remove',{#sys_role_permission_id,{this.getEntity(),'Sql'}})")
+    @PreAuthorize("hasPermission(#sys_role_permission_id,'Remove',{this.getEntity(),'Sql'})")
     @ApiOperation(value = "Remove", tags = {"SYS_ROLE_PERMISSION" },  notes = "Remove")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/sys_role_permissions/{sys_role_permission_id}")
     @Transactional

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -48,40 +48,32 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
     @Lazy
     private MongoTemplate mongoTemplate;
 
-    /**
-     * 表格权限检查 ：用于检查当前用户是否拥有表格数据的读取、删除权限
-     *
-     * @param authentication
-     * @param deAction     表格行为，如：[READ,DELETE]
-     * @param gridParam     表格参数，如：当前表格所处实体(EntityName)、表格删除的数据主键(srfkeys)
-     * @return true/false true则允许当前行为，false拒绝行为
-     */
+
     @Override
     public boolean hasPermission(Authentication authentication, Object deAction, Object gridParam) {
-
-                return true;
+            return true;
     }
 
 
     /**
-     * 表单权限检查 ：用于检查当前用户是否拥有表单的新建、编辑、删除权限
+     * 实体行为权限检查 ：用于检查当前用户是否拥有实体的新建、编辑、删除权限
      *
      * @param authentication
      * @param srfKey         当前操作数据的主键
      * @param action         当前操作行为：如：[READ、UPDATE、DELETE]
-     * @param formParam      表单参数对象
+     * @param params         相关参数
      * @return true/false true则允许当前行为，false拒绝行为
      */
     @Override
-    public boolean hasPermission(Authentication authentication, Serializable srfKey, String action, Object formParam) {
+    public boolean hasPermission(Authentication authentication, Serializable srfKey, String action, Object params) {
 
         //未开启权限校验、超级管理员则不进行权限检查
         if(AuthenticationUser.getAuthenticationUser().getSuperuser()==1  || !enablePermissionValid)
             return true;
 
-        List formParamList = (ArrayList) formParam;
-        EntityBase  entity = (EntityBase) formParamList.get(0);
-        String deStorageMode= (String) formParamList.get(1);
+        List paramList = (ArrayList) params;
+        EntityBase  entity = (EntityBase) paramList.get(0);
+        String deStorageMode= (String) paramList.get(1);
 
         if (StringUtils.isEmpty(entity))
             return false;