ibiz4j 发布系统代码

app_Web/public/assets/json/view-config.json

@@ -31,6 +31,14 @@
         "viewname": "SYS_ROLEGridView",
         "viewtag": "13c174556f45e9b10b66dc51834a6ab5"
     },
+    "wfgrouppickupgridview": {
+        "title": "角色/用户组选择表格视图",
+        "caption": "角色/用户组",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFGroupPickupGridView",
+        "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
+    },
     "sysauthloggridview": {
         "title": "认证日志表格视图",
         "caption": "认证日志",
@@ -167,6 +175,14 @@
         "viewname": "SysRolePickupGridView",
         "viewtag": "7c25865f5864a734477c7cb987632f4f"
     },
+    "wfusermpickupview": {
+        "title": "用户数据多项选择视图",
+        "caption": "用户",
+        "viewtype": "DEMPICKUPVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFUserMPickupView",
+        "viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
+    },
     "syspermissionmpickupview": {
         "title": "权限表数据多项选择视图",
         "caption": "权限/资源",
@@ -175,6 +191,14 @@
         "viewname": "SysPermissionMPickupView",
         "viewtag": "86bd4f6d4f771870e10b9717046a1b14"
     },
+    "wfgroupmpickupview": {
+        "title": "角色/用户组数据多项选择视图",
+        "caption": "角色/用户组",
+        "viewtype": "DEMPICKUPVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFGroupMPickupView",
+        "viewtag": "90a777962337daaf4cffd846eecb1f0f"
+    },
     "ibzdepartmenteditview": {
         "title": "部门编辑视图",
         "caption": "部门",

app_Web/src/locale/lanres/wfgroup/wfgroup_en_US.ts

@@ -6,6 +6,14 @@ export default {
     groupscope: '范围',
   },
 	views: {
+		pickupgridview: {
+			caption: "角色/用户组",
+      title: '角色/用户组',
+		},
+		mpickupview: {
+			caption: "角色/用户组",
+      title: '角色/用户组',
+		},
 		editview: {
 			caption: "角色/用户组",
       title: '角色/用户组',

app_Web/src/locale/lanres/wfgroup/wfgroup_zh_CN.ts

@@ -5,6 +5,14 @@ export default {
     groupscope: '范围',
   },
 	views: {
+		pickupgridview: {
+			caption: '角色/用户组',
+      title: '角色/用户组',
+		},
+		mpickupview: {
+			caption: '角色/用户组',
+      title: '角色/用户组',
+		},
 		editview: {
 			caption: '角色/用户组',
       title: '角色/用户组',

app_Web/src/locale/lanres/wfuser/wfuser_en_US.ts

@@ -8,6 +8,10 @@ export default {
 	views: {
 		pickupview: {
 			caption: "用户",
+      title: '用户',
+		},
+		mpickupview: {
+			caption: "用户",
       title: '用户',
 		},
 		pickupgridview: {

app_Web/src/locale/lanres/wfuser/wfuser_zh_CN.ts

@@ -7,6 +7,10 @@ export default {
 	views: {
 		pickupview: {
 			caption: '用户',
+      title: '用户',
+		},
+		mpickupview: {
+			caption: '用户',
       title: '用户',
 		},
 		pickupgridview: {

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -39,6 +39,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SYS_ROLEGridView",
             "viewtag": "13c174556f45e9b10b66dc51834a6ab5"
         },
+        "wfgrouppickupgridview": {
+            "title": "角色/用户组选择表格视图",
+            "caption": "角色/用户组",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFGroupPickupGridView",
+            "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
+        },
         "sysauthloggridview": {
             "title": "认证日志表格视图",
             "caption": "认证日志",
@@ -175,6 +183,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SysRolePickupGridView",
             "viewtag": "7c25865f5864a734477c7cb987632f4f"
         },
+        "wfusermpickupview": {
+            "title": "用户数据多项选择视图",
+            "caption": "用户",
+            "viewtype": "DEMPICKUPVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFUserMPickupView",
+            "viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
+        },
         "syspermissionmpickupview": {
             "title": "权限表数据多项选择视图",
             "caption": "权限/资源",
@@ -183,6 +199,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "SysPermissionMPickupView",
             "viewtag": "86bd4f6d4f771870e10b9717046a1b14"
         },
+        "wfgroupmpickupview": {
+            "title": "角色/用户组数据多项选择视图",
+            "caption": "角色/用户组",
+            "viewtype": "DEMPICKUPVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFGroupMPickupView",
+            "viewtag": "90a777962337daaf4cffd846eecb1f0f"
+        },
         "ibzdepartmenteditview": {
             "title": "部门编辑视图",
             "caption": "部门",

app_Web/src/pages/rt/index/page-register.ts

@@ -6,6 +6,7 @@ export const PageComponents = {
         Vue.component('sys-auth-log-grid-view', () => import('@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue'));
         Vue.component('ibzemployee-pickup-grid-view', () => import('@pages/ou/ibzemployee-pickup-grid-view/ibzemployee-pickup-grid-view.vue'));
         Vue.component('ibzorganization-edit-view', () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'));
+        Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
         Vue.component('ibzemployee-option-view', () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'));
         Vue.component('sys-user-pickup-view', () => import('@pages/uaa/sys-user-pickup-view/sys-user-pickup-view.vue'));
         Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
@@ -23,6 +24,7 @@ export const PageComponents = {
         Vue.component('sys-role-edit-view', () => import('@pages/uaa/sys-role-edit-view/sys-role-edit-view.vue'));
         Vue.component('ibzemployee-edit-view', () => import('@pages/ou/ibzemployee-edit-view/ibzemployee-edit-view.vue'));
         Vue.component('ibzorganization-tree-exp-view', () => import('@pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view.vue'));
+        Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
         Vue.component('ibzdepartment-option-view', () => import('@pages/ou/ibzdepartment-option-view/ibzdepartment-option-view.vue'));
         Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));
         Vue.component('sys-user-role-edit-view', () => import('@pages/uaa/sys-user-role-edit-view/sys-user-role-edit-view.vue'));
@@ -32,6 +34,7 @@ export const PageComponents = {
         Vue.component('ibzdept-member-edit-view', () => import('@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'));
         Vue.component('sys-role-pickup-view', () => import('@pages/uaa/sys-role-pickup-view/sys-role-pickup-view.vue'));
         Vue.component('sys-rolegrid-view', () => import('@pages/uaa/sys-rolegrid-view/sys-rolegrid-view.vue'));
+        Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
         Vue.component('ibzorganization-pickup-view', () => import('@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'));
         Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
         Vue.component('ibzorganization-pickup-grid-view', () => import('@pages/ou/ibzorganization-pickup-grid-view/ibzorganization-pickup-grid-view.vue'));

app_Web/src/pages/rt/index/router.ts

@@ -198,6 +198,19 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'),
                 },
+                {
+                    path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.wfuser.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'wfusers', parameterName: 'wfuser' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
+                },
                 {
                     path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/optionview/:optionview?',
                     meta: {
@@ -720,6 +733,19 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view.vue'),
                 },
+                {
+                    path: 'wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
+                    meta: {
+                        caption: 'entities.wfgroup.views.pickupgridview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'wfgroups', parameterName: 'wfgroup' },
+                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
+                },
                 {
                     path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/optionview/:optionview?',
                     meta: {
@@ -995,6 +1021,19 @@ const router = new Router({
                     },
                     component: () => import('@pages/uaa/sys-rolegrid-view/sys-rolegrid-view.vue'),
                 },
+                {
+                    path: 'wfgroups/:wfgroup?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.wfgroup.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'wfgroups', parameterName: 'wfgroup' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
+                },
                 {
                     path: 'ibzorganizations/:ibzorganization?/pickupview/:pickupview?',
                     meta: {

app_Web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue

@@ -1131,6 +1131,14 @@ export default class WFMemberGridViewBase extends Vue {
      * @memberof WFMemberGridView
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
+        const batchAddPSAppViews=[
+            {view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
+            res:['WFGroup'],
+            'resAppKey':'groupid'},
+            {view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
+            res:['WFUser'],
+            'resAppKey':'userid'}
+        ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
             return;

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

@@ -32,7 +32,9 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                '84e5a5b589b434dfdc60a3d0ad087d37',
                 '6e1b35989dd6470b5c890369ab87b545',
+                '90a777962337daaf4cffd846eecb1f0f',
             ],
         },
         {

app_Web/src/uiservice/wfgroup/wfgroup-ui-service-base.ts

@@ -79,6 +79,8 @@ export default class WFGroupUIServiceBase extends UIService {
      * @memberof  WFGroupUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfgroups'});
+        this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfgroups'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'wfgroups'});
         this.allViewMap.set('MDATAVIEW:',{viewname:'gridview',srfappde:'wfgroups'});
     }

app_Web/src/uiservice/wfuser/wfuser-ui-service-base.ts

@@ -80,6 +80,7 @@ export default class WFUserUIServiceBase extends UIService {
      */  
     public initViewMap(){
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfusers'});
+        this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'wfusers'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfusers'});
     }
 

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

@@ -30,7 +30,7 @@
 
 
     <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-2-1">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-3-1">
         <createTable tableName="IBZWFGROUP">
                 <column name="GROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>