laizhilong 发布系统代码

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

@@ -2,7 +2,6 @@ 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'));
@@ -16,7 +15,6 @@ 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,47 +60,6 @@ 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: {
@@ -354,47 +313,6 @@ 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: {
@@ -595,44 +513,6 @@ 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: {
@@ -683,44 +563,6 @@ 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: [
-                '3e133a839b837d9e47f80e161d66a861',
+                'b8a97c1797a1b91fbb37f8c2d14b1fb6',
                 'fb89f9af95f2caf92ccc1249025c9a1b',
             ],
         },
@@ -155,7 +155,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '3e133a839b837d9e47f80e161d66a861',
+                'b8a97c1797a1b91fbb37f8c2d14b1fb6',
                 'fb89f9af95f2caf92ccc1249025c9a1b',
             ],
         },

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

@@ -48,9 +48,8 @@
     :formState="formState"
     :isForbidLoad="this.data.srfuf === '0'"
     paramItem='sys_role' 
-    :parentdata='{"srfparentdefname":"SYS_ROLEID","srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID","SRFDER1NID":"DER1N_SYS_ROLE_PERMISSION_SYS_ROLE_SYS_ROLEID"}'
+    :parentdata='{"srfparentdename":"SYS_ROLE","SRFPARENTTYPE":"CUSTOM"}'
     :parameters="[
-        { pathName: 'sys_permissions', parameterName: 'sys_permission' },
     ]"
     :context="context"
     :viewparams="viewparams"
@@ -59,7 +58,7 @@
     refviewtype='DEMPICKUPVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='sys-role-permissionmpickup-view' 
+    viewname='sys-permissionmpickup-view' 
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">

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-59-7">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-62-7">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>