zhouweidong 发布系统代码 [ibz-wf，统一工作流]

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

@@ -31,6 +31,14 @@
         "viewname": "WFGroupPickupGridView",
         "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
     },
+    "wfprocessnodeprocessnodepickupgridview": {
+        "title": "流程定义节点选择表格视图",
+        "caption": "流程定义节点",
+        "viewtype": "DEPICKUPGRIDVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFProcessNodeProcessNodePickupGridView",
+        "viewtag": "1f9254bad5514e07a0fe9195d42daefa"
+    },
     "wfprocessdefinitioneditview": {
         "title": "流程定义查看",
         "caption": "流程定义查看",
@@ -87,6 +95,14 @@
         "viewname": "WFUserMPickupView",
         "viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
     },
+    "wfprocessnodeporcessnodepickupview": {
+        "title": "流程定义节点数据选择视图",
+        "caption": "流程定义节点",
+        "viewtype": "DEPICKUPVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFProcessNodePorcessNodePickupView",
+        "viewtag": "8668e70613999260896dd9f3bde96204"
+    },
     "wfgroupmpickupview": {
         "title": "角色/用户组数据多项选择视图",
         "caption": "角色/用户组",

app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_BO_CN_base.ts

@@ -12,10 +12,18 @@ function getLocaleResourceBase(){
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
 	},
 		views: {
+			processnodepickupgridview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
 			},
+			porcessnodepickupview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
+			},
 			pickupgridview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),

app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_en_US_base.ts

@@ -12,10 +12,18 @@ function getLocaleResourceBase(){
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
 	},
 		views: {
+			processnodepickupgridview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
 			},
+			porcessnodepickupview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
+			},
 			pickupgridview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),

app_web/src/locale/lanres/entities/wfprocess-node/wfprocess-node_zh_CN_base.ts

@@ -12,10 +12,18 @@ function getLocaleResourceBase(){
 		processdefinitionid: commonLogic.appcommonhandle("DefinitionId",null),
 	},
 		views: {
+			processnodepickupgridview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),
+			},
 			pickupview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
 			},
+			porcessnodepickupview: {
+				caption: commonLogic.appcommonhandle("流程定义节点",null),
+				title: commonLogic.appcommonhandle("流程定义节点数据选择视图",null),
+			},
 			pickupgridview: {
 				caption: commonLogic.appcommonhandle("流程定义节点",null),
 				title: commonLogic.appcommonhandle("流程定义节点选择表格视图",null),

app_web/src/mock/entity/wfprocess-nodes/wfprocess-nodes.ts

@@ -286,6 +286,50 @@ mock.onGet(new RegExp(/^\/wfprocessnodes\/fetchdefault(\?[\w-./?%&=,]*)*$/)).rep
     console.groupEnd();
     return [status, records ?  records : []];
 });
+    
+// FetchProcessNode
+mock.onGet(new RegExp(/^\/wfprocessnodes\/fetchprocessnode$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessnode 方法: FetchProcessNode");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(mockDatas);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, mockDatas ? mockDatas : []];
+});
+
+// FetchProcessNode
+mock.onGet(new RegExp(/^\/wfprocessnodes\/fetchprocessnode(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessnode 方法: FetchProcessNode");
+    console.table({url:config.url, method: config.method, data:config.data});
+    if(config.url.includes('page')){
+        let url = config.url.split('?')[1];
+        let params  =  qs.parse(url);
+        Object.assign(config, params);
+    }
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }
+    let total = mockDatas.length;
+    let records: Array<any> = [];
+    if(!config.page || !config.size){
+        records = mockDatas;
+    }else{
+        if((config.page-1)*config.size < total){
+          records = mockDatas.slice(config.page,config.size);
+        }
+    }
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(records ?  records : []);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, records ?  records : []];
+});
 // URI参数传递情况未实现
 // URI参数传递情况未实现
 // URI参数传递情况未实现

app_web/src/mock/viewconfig/viewconfig.ts

@@ -39,6 +39,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "WFGroupPickupGridView",
             "viewtag": "17ccd6d8d2bb7cf30158253da129ec1b"
         },
+        "wfprocessnodeprocessnodepickupgridview": {
+            "title": "流程定义节点选择表格视图",
+            "caption": "流程定义节点",
+            "viewtype": "DEPICKUPGRIDVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFProcessNodeProcessNodePickupGridView",
+            "viewtag": "1f9254bad5514e07a0fe9195d42daefa"
+        },
         "wfprocessdefinitioneditview": {
             "title": "流程定义查看",
             "caption": "流程定义查看",
@@ -95,6 +103,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "WFUserMPickupView",
             "viewtag": "84e5a5b589b434dfdc60a3d0ad087d37"
         },
+        "wfprocessnodeporcessnodepickupview": {
+            "title": "流程定义节点数据选择视图",
+            "caption": "流程定义节点",
+            "viewtype": "DEPICKUPVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFProcessNodePorcessNodePickupView",
+            "viewtag": "8668e70613999260896dd9f3bde96204"
+        },
         "wfgroupmpickupview": {
             "title": "角色/用户组数据多项选择视图",
             "caption": "角色/用户组",

app_web/src/pages/workflow/wfindex-view/page-register.ts

@@ -10,11 +10,11 @@ export const PageComponents = {
         Vue.component('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'));
         Vue.component('wfprocess-instance-active-instance-option-view', () => import('@pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue'));
         Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
-        Vue.component('wfprocess-node-pickup-view', () => import('@pages/workflow/wfprocess-node-pickup-view/wfprocess-node-pickup-view.vue'));
+        Vue.component('wfprocess-node-porcess-node-pickup-view', () => import('@pages/workflow/wfprocess-node-porcess-node-pickup-view/wfprocess-node-porcess-node-pickup-view.vue'));
         Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
         Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
         Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
-        Vue.component('wfprocess-node-pickup-grid-view', () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'));
+        Vue.component('wfprocess-node-process-node-pickup-grid-view', () => import('@pages/workflow/wfprocess-node-process-node-pickup-grid-view/wfprocess-node-process-node-pickup-grid-view.vue'));
         Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
         Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
         Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue'));

app_web/src/pages/workflow/wfindex-view/router.ts

@@ -206,18 +206,18 @@ const router = new Router({
                     component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'),
                 },
                 {
-                    path: 'wfprocessnodes/:wfprocessnode?/pickupview/:pickupview?',
+                    path: 'wfprocessnodes/:wfprocessnode?/porcessnodepickupview/:porcessnodepickupview?',
                     meta: {
-                        caption: 'entities.wfprocessnode.views.pickupview.caption',
+                        caption: 'entities.wfprocessnode.views.porcessnodepickupview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'wfindexview', parameterName: 'wfindexview' },
                             { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
-                            { pathName: 'pickupview', parameterName: 'pickupview' },
+                            { pathName: 'porcessnodepickupview', parameterName: 'porcessnodepickupview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/workflow/wfprocess-node-pickup-view/wfprocess-node-pickup-view.vue'),
+                    component: () => import('@pages/workflow/wfprocess-node-porcess-node-pickup-view/wfprocess-node-porcess-node-pickup-view.vue'),
                 },
                 {
                     path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
@@ -292,18 +292,18 @@ const router = new Router({
                     component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
                 },
                 {
-                    path: 'wfprocessnodes/:wfprocessnode?/pickupgridview/:pickupgridview?',
+                    path: 'wfprocessnodes/:wfprocessnode?/processnodepickupgridview/:processnodepickupgridview?',
                     meta: {
-                        caption: 'entities.wfprocessnode.views.pickupgridview.caption',
+                        caption: 'entities.wfprocessnode.views.processnodepickupgridview.caption',
                         info:'',
                         parameters: [
                             { pathName: 'wfindexview', parameterName: 'wfindexview' },
                             { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
-                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
+                            { pathName: 'processnodepickupgridview', parameterName: 'processnodepickupgridview' },
                         ],
                         requireAuth: true,
                     },
-                    component: () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'),
+                    component: () => import('@pages/workflow/wfprocess-node-process-node-pickup-grid-view/wfprocess-node-process-node-pickup-grid-view.vue'),
                 },
                 {
                     path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?',
@@ -431,6 +431,19 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
     },
+    {
+        path: '/wfprocessnodes/:wfprocessnode?/processnodepickupgridview/:processnodepickupgridview?',
+        meta: {
+            caption: 'entities.wfprocessnode.views.processnodepickupgridview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
+                { pathName: 'processnodepickupgridview', parameterName: 'processnodepickupgridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfprocess-node-process-node-pickup-grid-view/wfprocess-node-process-node-pickup-grid-view.vue'),
+    },
     {
         path: '/wfprocessdefinitions/:wfprocessdefinition?/editview/:editview?',
         meta: {
@@ -457,19 +470,6 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue'),
     },
-    {
-        path: '/wfprocessnodes/:wfprocessnode?/pickupview/:pickupview?',
-        meta: {
-            caption: 'entities.wfprocessnode.views.pickupview.caption',
-            info:'',
-            parameters: [
-                { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
-                { pathName: 'pickupview', parameterName: 'pickupview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/workflow/wfprocess-node-pickup-view/wfprocess-node-pickup-view.vue'),
-    },
     {
         path: '/wfusers/:wfuser?/pickupview/:pickupview?',
         meta: {
@@ -550,6 +550,19 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
     },
+    {
+        path: '/wfprocessnodes/:wfprocessnode?/porcessnodepickupview/:porcessnodepickupview?',
+        meta: {
+            caption: 'entities.wfprocessnode.views.porcessnodepickupview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
+                { pathName: 'porcessnodepickupview', parameterName: 'porcessnodepickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfprocess-node-porcess-node-pickup-view/wfprocess-node-porcess-node-pickup-view.vue'),
+    },
     {
         path: '/wfgroups/:wfgroup?/mpickupview/:mpickupview?',
         meta: {
@@ -615,19 +628,6 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'),
     },
-    {
-        path: '/wfprocessnodes/:wfprocessnode?/pickupgridview/:pickupgridview?',
-        meta: {
-            caption: 'entities.wfprocessnode.views.pickupgridview.caption',
-            info:'',
-            parameters: [
-                { pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' },
-                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/workflow/wfprocess-node-pickup-grid-view/wfprocess-node-pickup-grid-view.vue'),
-    },
     {
         path: '/wftasks/:wftask?/editview/:editview?',
         meta: {

app_web/src/pages/workflow/wfprocess-node-porcess-node-pickup-view/wfprocess-node-porcess-node-pickup-view.less

+.wfprocess-node-porcess-node-pickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.pickupviewpanel {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-node-porcess-node-pickup-view/wfprocess-node-porcess-node-pickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFProcessNodePorcessNodePickupViewBase from './wfprocess-node-porcess-node-pickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class WFProcessNodePorcessNodePickupView extends WFProcessNodePorcessNodePickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-node-process-node-pickup-grid-view/wfprocess-node-process-node-pickup-grid-view.less

+.wfprocess-node-process-node-pickup-grid-view{
+    position: relative;
+}
+
+
+.wfprocess-node-process-node-pickup-grid-view{
+    display: block;
+}
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-node-process-node-pickup-grid-view/wfprocess-node-process-node-pickup-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFProcessNodeProcessNodePickupGridViewBase from './wfprocess-node-process-node-pickup-grid-view-base.vue';
+
+import view_grid from '@widgets/wfprocess-node/main-grid/main-grid.vue';
+import view_searchform from '@widgets/wfprocess-node/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class WFProcessNodeProcessNodePickupGridView extends WFProcessNodeProcessNodePickupGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/service/wfprocess-node/wfprocess-node-service-base.ts

@@ -184,6 +184,35 @@ export default class WFProcessNodeServiceBase extends EntityService {
         return await Http.getInstance().post(`/wfprocessnodes/searchdefault`,tempData,isloading);
     }
 
+    /**
+     * FetchProcessNode接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFProcessNodeServiceBase
+     */
+    public async FetchProcessNode(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        let res:any = Http.getInstance().get(`/wfprocessnodes/fetchprocessnode`,tempData,isloading);
+        return res;
+    }
+
+    /**
+     * searchProcessNode接口方法
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @returns {Promise<any>}
+     * @memberof WFProcessNodeServiceBase
+     */
+    public async searchProcessNode(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
+        let tempData:any = JSON.parse(JSON.stringify(data));
+        return await Http.getInstance().post(`/wfprocessnodes/searchprocessnode`,tempData,isloading);
+    }
+
     /**
      * Select接口方法
      *

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

@@ -48,6 +48,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: '1f9254bad5514e07a0fe9195d42daefa',
+            viewmodule: 'workflow',
+            viewname: 'WFProcessNodeProcessNodePickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: '3fcd491c13d05ab7dcce8d2c920d0aec',
             viewmodule: 'workflow',
@@ -117,6 +126,16 @@ export const viewstate: any = {
                 'c9c73c8d2e61bd29a304622f3d39b522',
             ],
         },
+        {
+            viewtag: '8668e70613999260896dd9f3bde96204',
+            viewmodule: 'workflow',
+            viewname: 'WFProcessNodePorcessNodePickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '1f9254bad5514e07a0fe9195d42daefa',
+            ],
+        },
         {
             viewtag: '90a777962337daaf4cffd846eecb1f0f',
             viewmodule: 'workflow',
@@ -201,7 +220,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '598d910e2d38250d2cdd0f9ad61100ca',
+                '8668e70613999260896dd9f3bde96204',
                 '84e5a5b589b434dfdc60a3d0ad087d37',
             ],
         },

app_web/src/uiservice/wfprocess-node/wfprocess-node-ui-service-base.ts

@@ -96,7 +96,9 @@ export default class WFProcessNodeUIServiceBase extends UIService {
      * @memberof  WFProcessNodeUIServiceBase
      */  
     public initViewMap(){
+        this.allViewMap.set(':',{viewname:'processnodepickupgridview',srfappde:'wfprocessnodes',component:'wfprocess-node-process-node-pickup-grid-view'});
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'wfprocessnodes',component:'wfprocess-node-pickup-view'});
+        this.allViewMap.set(':',{viewname:'porcessnodepickupview',srfappde:'wfprocessnodes',component:'wfprocess-node-porcess-node-pickup-view'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'wfprocessnodes',component:'wfprocess-node-pickup-grid-view'});
     }
 

app_web/src/widgets/wfprocess-instance/jump-form/jump-form-base.vue

@@ -23,7 +23,7 @@
   valueitem='taskdefinitionkey' 
   :value="data.taskdefinitionname" 
   editortype="" 
-  :pickupView="{ viewname: 'wfprocess-node-pickup-view', title: $t('entities.wfprocessnode.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
+  :pickupView="{ viewname: 'wfprocess-node-porcess-node-pickup-view', title: $t('entities.wfprocessnode.views.porcessnodepickupview.title'), deResParameters: [], parameters: [{ pathName: 'wfprocessnodes', parameterName: 'wfprocessnode' }, { pathName: 'porcessnodepickupview', parameterName: 'porcessnodepickupview' } ], placement:'' }"
   style=""  
   @formitemvaluechange="onFormItemValueChange">
 </app-picker>

app_web/src/widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-base.vue

+<template>
+    <div class='pickupviewpanel'>
+        <component 
+          v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
+          :is="view.viewname"
+          class="viewcontainer3"
+          :viewdata="viewdata"
+          :viewparam="viewparam"
+          :viewDefaultUsage="false"
+          :isSingleSelect="isSingleSelect"
+          :selectedData="selectedData"
+          :isShowButton="isShowButton"
+          @viewdataschange="onViewDatasChange"
+          @viewdatasactivated="viewDatasActivated"
+          @viewload="onViewLoad">
+        </component>
+    </div>
+</template>
+
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util,ViewTool } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import AppCenterService from "@service/app/app-center-service";
+import WFProcessNodeEntityService from '@/service/wfprocess-node/wfprocess-node-service';
+import PorcessNodePickupViewpickupviewpanelService from './porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-service';
+import WFProcessNodeUIService from '@/uiservice/wfprocess-node/wfprocess-node-ui-service';
+import PorcessNodePickupViewpickupviewpanelModel from './porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-model';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class PorcessNodePickupViewpickupviewpanelBase extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public getControlType(): string {
+        return 'PICKUPVIEWPANEL'
+    }
+
+
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {PorcessNodePickupViewpickupviewpanelService}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public service: PorcessNodePickupViewpickupviewpanelService = new PorcessNodePickupViewpickupviewpanelService({ $store: this.$store });
+
+    /**
+     * 实体服务对象
+     *
+     * @type {WFProcessNodeService}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public appEntityService: WFProcessNodeEntityService = new WFProcessNodeEntityService({ $store: this.$store });
+    
+
+
+    /**
+     * 转化数据
+     *
+     * @param {any} args
+     * @memberof  PorcessNodePickupViewpickupviewpanelBase
+     */
+    public transformData(args: any) {
+        let _this: any = this;
+        if(_this.service && _this.service.handleRequestData instanceof Function && _this.service.handleRequestData('transform',_this.context,args)){
+            return _this.service.handleRequestData('transform',_this.context,args)['data'];
+        }
+    }
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+
+
+
+    /**
+     * 选中数据字符串
+     *
+     * @type {string}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public selectedData?: string;
+
+    /**
+     * 获取多项数据
+     *
+     * @returns {any[]}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public getDatas(): any[] {
+        return [];
+    }
+
+    /**
+     * 获取单项树
+     *
+     * @returns {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public getData(): any {
+        return {};
+    }
+
+    /**
+     * 视图名称
+     *
+     * @type {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public view: any = {
+        viewname: 'wfprocess-node-process-node-pickup-grid-view',
+        data: {},
+    }
+
+    /**
+     * 局部上下文
+     *
+     * @type {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public localContext: any = null;
+
+    /**
+     * 局部视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public localViewParam: any = null;
+
+    /**
+     * 视图数据
+     *
+     * @type {*}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public viewdata: string  = JSON.stringify(this.context);
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof PickupViewpickupviewpanel
+     */
+    public viewparam: string  = JSON.stringify(this.viewparams);
+
+    /**
+     * 是否显示按钮
+     *
+     * @type {boolean}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop({default: true}) public isShowButton!: boolean;
+
+    /**
+     * 是否单选
+     *
+     * @type {boolean}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    @Prop() public isSingleSelect?: boolean;
+
+    /**
+     * 初始化完成
+     *
+     * @type {boolean}
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public inited: boolean = false;
+
+    /**
+     * 视图数据变化
+     *
+     * @param {*} $event
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public onViewDatasChange($event: any): void {
+        if($event.length>0){
+          $event.forEach((item:any,index:any) => {
+              let srfmajortext = item.srfmajortext?item.srfmajortext:item['usertaskname'];
+              if(srfmajortext){
+                Object.assign($event[index],{srfmajortext: srfmajortext});
+              }
+          });
+        }
+        this.$emit('selectionchange', $event);
+    }
+
+    /**
+     * 视图数据被激活
+     *
+     * @param {*} $event
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public viewDatasActivated($event: any): void {
+        this.$emit('activated', $event);
+    }
+
+    /**
+     * 视图加载完成
+     *
+     * @param {*} $event
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public onViewLoad($event: any): void {
+        this.$emit('load', $event);
+    }
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     *  @memberof PorcessNodePickupViewpickupviewpanelBase
+     */    
+    public afterCreated(){
+        this.initNavParam();
+        if (this.viewState) {
+            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
+                if (!Object.is(tag, this.name)) {
+                    return;
+                }
+                if (Object.is('load', action)) {
+                    this.viewdata = JSON.stringify(this.context);
+                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
+                    this.inited = true;
+                }
+            });
+        }
+    }
+
+    /**
+     * 初始化导航参数
+     *
+     *  @memberof PorcessNodePickupViewpickupviewpanelBase
+     */  
+    public initNavParam(){
+        if(this.localContext && Object.keys(this.localContext).length >0){
+            let _context:any = this.$util.computedNavData({},this.context,this.viewparams,this.localContext);
+            Object.assign(this.context,_context);
+        }
+        if(this.localViewParam && Object.keys(this.localViewParam).length >0){
+            let _param:any = this.$util.computedNavData({},this.context,this.viewparams,this.localViewParam);
+            Object.assign(this.viewparams,_param);
+        }
+        this.viewdata = JSON.stringify(this.context);
+        this.viewparam = JSON.stringify(this.viewparams);
+    }
+
+
+    /**
+     * vue 生命周期
+     *
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public destroyed() {
+        this.afterDestroy();
+    }
+
+    /**
+     * 执行destroyed后的逻辑
+     *
+     * @memberof PorcessNodePickupViewpickupviewpanelBase
+     */
+    public afterDestroy() {
+        if (this.viewStateEvent) {
+            this.viewStateEvent.unsubscribe();
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './porcess-node-pickup-viewpickupviewpanel-pickupviewpanel.less';
+</style>
\ No newline at end of file

app_web/src/widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * PorcessNodePickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class PorcessNodePickupViewpickupviewpanelModel
+ */
+export default class PorcessNodePickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof PorcessNodePickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'wfprocessnode',
+        prop: 'usertaskid',
+      },
+      {
+        name: 'usertaskname',
+      },
+      {
+        name: 'processdefinitionkey',
+      },
+      {
+        name: 'processdefinitionname',
+      },
+      {
+        name: 'version',
+      },
+      {
+        name: 'cnt',
+      },
+      {
+        name: 'processdefinitionid',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_web/src/widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-service.ts

+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * PorcessNodePickupViewpickupviewpanel 部件服务对象
+ *
+ * @export
+ * @class PorcessNodePickupViewpickupviewpanelService
+ */
+export default class PorcessNodePickupViewpickupviewpanelService extends ControlService {
+}
\ No newline at end of file

app_web/src/widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel.less

+// this is less
+.pickupviewpanel{
+  width: 100%;
+}
\ No newline at end of file

app_web/src/widgets/wfprocess-node/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel/porcess-node-pickup-viewpickupviewpanel-pickupviewpanel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import PorcessNodePickupViewpickupviewpanelBase from './porcess-node-pickup-viewpickupviewpanel-pickupviewpanel-base.vue';
+
+ 
+@Component({
+    components: {
+         
+    }
+})
+export default class PorcessNodePickupViewpickupviewpanel extends PorcessNodePickupViewpickupviewpanelBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue

@@ -626,7 +626,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -662,7 +662,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public loadDraft(opt: any = {},mode?:string): void {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserPickupGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'WFUserGridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/IWFProcessNodeService.java

@@ -36,6 +36,7 @@ public interface IWFProcessNodeService {
     boolean save(WFProcessNode et);
     void saveBatch(List<WFProcessNode> list);
     Page<WFProcessNode> searchDefault(WFProcessNodeSearchContext context);
+    Page<WFProcessNode> searchProcessNode(WFProcessNodeSearchContext context);
 
 }
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFProcessNodeServiceImpl.java

@@ -107,6 +107,14 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
         return new PageImpl<WFProcessNode>(new ArrayList(),context.getPageable(),0);
     }
 
+    /**
+     * 查询集合 查询当前实例流程节点
+     */
+    @Override
+    public Page<WFProcessNode> searchProcessNode(WFProcessNodeSearchContext context) {
+        return new PageImpl<WFProcessNode>(new ArrayList(),context.getPageable(),0);
+    }
+
 
 
 }

ibzwf-core/src/main/resources/permission/systemResource.json

@@ -40,7 +40,7 @@
     "dename":"WFProcessNode",
     "delogicname":"流程定义节点",
     "sysmoudle":{"id":"WORKFLOW","name":"workflow"},
-    "dedataset":[{"id":"Default" , "name":"DEFAULT"}],
+    "dedataset":[{"id":"Default" , "name":"DEFAULT"},{"id":"ProcessNode" , "name":"查询当前实例流程节点"}],
     "deaction":[{"id":"Create" , "name":"Create" , "type":"BUILTIN" },{"id":"Update" , "name":"Update" , "type":"BUILTIN" },{"id":"Remove" , "name":"Remove" , "type":"BUILTIN" },{"id":"Get" , "name":"Get" , "type":"BUILTIN" },{"id":"GetDraft" , "name":"GetDraft" , "type":"BUILTIN" },{"id":"CheckKey" , "name":"CheckKey" , "type":"BUILTIN" },{"id":"Save" , "name":"Save" , "type":"BUILTIN" }],
     "datascope":[{"id":"all","name":"全部数据"}]
     }

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/rest/WFProcessNodeResource.java

@@ -149,6 +149,26 @@ public class WFProcessNodeResource {
                 .body(new PageImpl(wfprocessnodeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
 	}
 
+	@ApiOperation(value = "获取查询当前实例流程节点", tags = {"流程定义节点" } ,notes = "获取查询当前实例流程节点")
+    @RequestMapping(method= RequestMethod.GET , value="/wfprocessnodes/fetchprocessnode")
+	public ResponseEntity<List<WFProcessNodeDTO>> fetchProcessNode(WFProcessNodeSearchContext context) {
+        Page<WFProcessNode> domains = wfprocessnodeService.searchProcessNode(context) ;
+        List<WFProcessNodeDTO> list = wfprocessnodeMapping.toDto(domains.getContent());
+        return ResponseEntity.status(HttpStatus.OK)
+                .header("x-page", String.valueOf(context.getPageable().getPageNumber()))
+                .header("x-per-page", String.valueOf(context.getPageable().getPageSize()))
+                .header("x-total", String.valueOf(domains.getTotalElements()))
+                .body(list);
+	}
+
+	@ApiOperation(value = "查询查询当前实例流程节点", tags = {"流程定义节点" } ,notes = "查询查询当前实例流程节点")
+    @RequestMapping(method= RequestMethod.POST , value="/wfprocessnodes/searchprocessnode")
+	public ResponseEntity<Page<WFProcessNodeDTO>> searchProcessNode(@RequestBody WFProcessNodeSearchContext context) {
+        Page<WFProcessNode> domains = wfprocessnodeService.searchProcessNode(context) ;
+	    return ResponseEntity.status(HttpStatus.OK)
+                .body(new PageImpl(wfprocessnodeMapping.toDto(domains.getContent()), context.getPageable(), domains.getTotalElements()));
+	}
+
 
 
 }