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

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

 {
+    "wfprocessinstanceactiveinstancegridview": {
+        "title": "流程中实例表格视图",
+        "caption": "流程实例",
+        "viewtype": "DEGRIDVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFProcessInstanceActiveInstanceGridView",
+        "viewtag": "0848b7f2d687480940498fd8e2c39f56"
+    },
     "wfindexview": {
         "title": "workflow",
         "caption": "ibizlab",
@@ -127,6 +135,14 @@
         "viewname": "WFTaskEditView",
         "viewtag": "e3020680a441ab58a29db6fe2434f08b"
     },
+    "wfprocessinstanceactiveinstanceoptionview": {
+        "title": "流程中实例选项操作视图",
+        "caption": "流程实例",
+        "viewtype": "DEOPTVIEW",
+        "viewmodule": "workflow",
+        "viewname": "WFProcessInstanceActiveInstanceOptionView",
+        "viewtag": "e8bb7dc695c3c5c2e2367b4755c8ee23"
+    },
     "wfgroupgridview": {
         "title": "角色/用户组表格视图",
         "caption": "角色/用户组",

app_web/src/authservice/auth-service-register.ts

@@ -42,6 +42,7 @@ export class AuthServiceRegister {
                 this.allAuthService.set('wftask', () => import('@/authservice/wftask/wftask-auth-service'));
         this.allAuthService.set('wfmember', () => import('@/authservice/wfmember/wfmember-auth-service'));
         this.allAuthService.set('wfuser', () => import('@/authservice/wfuser/wfuser-auth-service'));
+        this.allAuthService.set('wfprocessinstance', () => import('@/authservice/wfprocess-instance/wfprocess-instance-auth-service'));
         this.allAuthService.set('wfgroup', () => import('@/authservice/wfgroup/wfgroup-auth-service'));
         this.allAuthService.set('wfremodel', () => import('@/authservice/wfremodel/wfremodel-auth-service'));
         this.allAuthService.set('wfsystem', () => import('@/authservice/wfsystem/wfsystem-auth-service'));

app_web/src/authservice/wfprocess-instance/wfprocess-instance-auth-service-base.ts

+import AuthService from '../auth-service';
+
+/**
+ * 流程实例权限服务对象基类
+ *
+ * @export
+ * @class WFProcessInstanceAuthServiceBase
+ * @extends {AuthService}
+ */
+export default class WFProcessInstanceAuthServiceBase extends AuthService {
+
+    /**
+     * Creates an instance of  WFProcessInstanceAuthServiceBase.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WFProcessInstanceAuthServiceBase
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+    /**
+     * 根据当前数据获取实体操作标识
+     *
+     * @param {*} mainSateOPPrivs 传入数据操作标识
+     * @returns {any}
+     * @memberof WFProcessInstanceAuthServiceBase
+     */
+    public getOPPrivs(mainSateOPPrivs:any):any{
+        let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
+        if(mainSateOPPrivs){
+            Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
+        }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
+        return curDefaultOPPrivs;
+    }
+
+}
\ No newline at end of file

app_web/src/authservice/wfprocess-instance/wfprocess-instance-auth-service.ts

+import WFProcessInstanceAuthServiceBase from './wfprocess-instance-auth-service-base';
+
+
+/**
+ * 流程实例权限服务对象
+ *
+ * @export
+ * @class WFProcessInstanceAuthService
+ * @extends {WFProcessInstanceAuthServiceBase}
+ */
+export default class WFProcessInstanceAuthService extends WFProcessInstanceAuthServiceBase {
+
+    /**
+     * Creates an instance of  WFProcessInstanceAuthService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WFProcessInstanceAuthService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

app_web/src/locale/lang/BO-CN-base.ts

 import wftask_BO_CN from '@locale/lanres/entities/wftask/wftask_BO_CN';
 import wfmember_BO_CN from '@locale/lanres/entities/wfmember/wfmember_BO_CN';
 import wfuser_BO_CN from '@locale/lanres/entities/wfuser/wfuser_BO_CN';
+import wfprocessinstance_BO_CN from '@locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN';
 import wfgroup_BO_CN from '@locale/lanres/entities/wfgroup/wfgroup_BO_CN';
 import wfremodel_BO_CN from '@locale/lanres/entities/wfremodel/wfremodel_BO_CN';
 import wfsystem_BO_CN from '@locale/lanres/entities/wfsystem/wfsystem_BO_CN';
@@ -139,6 +140,7 @@ function getAppLocale(){
                     menuitem3: commonLogic.appcommonhandle("发布新流程",null),
                     menuitem2: commonLogic.appcommonhandle("用户组",null),
                     menuitem4: commonLogic.appcommonhandle("我的待办",null),
+                    menuitem5: commonLogic.appcommonhandle("流程实例",null),
                 },
             },
             formpage:{
@@ -236,6 +238,7 @@ function getAppLocale(){
             wftask: wftask_BO_CN(),
             wfmember: wfmember_BO_CN(),
             wfuser: wfuser_BO_CN(),
+            wfprocessinstance: wfprocessinstance_BO_CN(),
             wfgroup: wfgroup_BO_CN(),
             wfremodel: wfremodel_BO_CN(),
             wfsystem: wfsystem_BO_CN(),

app_web/src/locale/lang/en-US-base.ts

 import wftask_en_US from '@locale/lanres/entities/wftask/wftask_en_US';
 import wfmember_en_US from '@locale/lanres/entities/wfmember/wfmember_en_US';
 import wfuser_en_US from '@locale/lanres/entities/wfuser/wfuser_en_US';
+import wfprocessinstance_en_US from '@locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US';
 import wfgroup_en_US from '@locale/lanres/entities/wfgroup/wfgroup_en_US';
 import wfremodel_en_US from '@locale/lanres/entities/wfremodel/wfremodel_en_US';
 import wfsystem_en_US from '@locale/lanres/entities/wfsystem/wfsystem_en_US';
@@ -45,6 +46,8 @@ function getAppLocale(){
             },
             gridpage: {
                 choicecolumns: "Choice columns",
+                saveconfig: "Save the current configuration",
+                resetconfig: "Restoring default Settings",
                 refresh: "refresh",
                 show: "Show",
                 records: "records",
@@ -59,6 +62,12 @@ function getAppLocale(){
                     updateAction: "The view table updateaction parameter is not configured",
                     loaddraftAction: "The view table loadtrafaction parameter is not configured",
                 },
+                message: {
+                  saveconfigsuccess: "Configuration saved successfully!",
+                  saveconfigerror: "Failed to save configuration!",
+                  resetconfigsuccess: "Reset configuration succeeded!",
+                  resetconfigerror: "Reset configuration failed!",
+                },
                 data: "Data",
                 delDataFail: "Failed to delete data",
                 delSuccess: "Delete successfully!",
@@ -139,6 +148,7 @@ function getAppLocale(){
                     menuitem3: commonLogic.appcommonhandle("发布新流程",null),
                     menuitem2: commonLogic.appcommonhandle("用户组",null),
                     menuitem4: commonLogic.appcommonhandle("我的待办",null),
+                    menuitem5: commonLogic.appcommonhandle("流程实例",null),
                 },
             },
             formpage:{
@@ -237,6 +247,7 @@ function getAppLocale(){
             wftask: wftask_en_US(),
             wfmember: wfmember_en_US(),
             wfuser: wfuser_en_US(),
+            wfprocessinstance: wfprocessinstance_en_US(),
             wfgroup: wfgroup_en_US(),
             wfremodel: wfremodel_en_US(),
             wfsystem: wfsystem_en_US(),

app_web/src/locale/lang/zh-CN-base.ts

 import wftask_zh_CN from '@locale/lanres/entities/wftask/wftask_zh_CN';
 import wfmember_zh_CN from '@locale/lanres/entities/wfmember/wfmember_zh_CN';
 import wfuser_zh_CN from '@locale/lanres/entities/wfuser/wfuser_zh_CN';
+import wfprocessinstance_zh_CN from '@locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN';
 import wfgroup_zh_CN from '@locale/lanres/entities/wfgroup/wfgroup_zh_CN';
 import wfremodel_zh_CN from '@locale/lanres/entities/wfremodel/wfremodel_zh_CN';
 import wfsystem_zh_CN from '@locale/lanres/entities/wfsystem/wfsystem_zh_CN';
@@ -45,6 +46,8 @@ function getAppLocale(){
             },
             gridpage: {
                 choicecolumns: "选择列",
+                saveconfig: "保存当前配置",
+                resetconfig: "恢复默认配置",
                 refresh: "刷新",
                 show: "显示",
                 records: "条",
@@ -59,6 +62,12 @@ function getAppLocale(){
                     updateAction: "视图表格updateAction参数未配置",
                     loaddraftAction: "视图表格loaddraftAction参数未配置",
                 },
+                message: {
+                  saveconfigsuccess: "保存配置成功！",
+                  saveconfigerror: "保存配置失败！",
+                  resetconfigsuccess: "重置配置成功！",
+                  resetconfigerror: "重置配置失败！",
+                },
                 data: "数据",
                 delDataFail: "删除数据失败",
                 delSuccess: "删除成功!",
@@ -139,6 +148,7 @@ function getAppLocale(){
                     menuitem3: commonLogic.appcommonhandle("发布新流程",null),
                     menuitem2: commonLogic.appcommonhandle("用户组",null),
                     menuitem4: commonLogic.appcommonhandle("我的待办",null),
+                    menuitem5: commonLogic.appcommonhandle("流程实例",null),
                 },
             },
             formpage:{
@@ -236,6 +246,7 @@ function getAppLocale(){
             wftask: wftask_zh_CN(),
             wfmember: wfmember_zh_CN(),
             wfuser: wfuser_zh_CN(),
+            wfprocessinstance: wfprocessinstance_zh_CN(),
             wfgroup: wfgroup_zh_CN(),
             wfremodel: wfremodel_zh_CN(),
             wfsystem: wfsystem_zh_CN(),

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN.ts

+import WFProcessInstance_BO_CN_Base from './wfprocess-instance_BO_CN_base';
+
+function getLocaleResource(){
+    const WFProcessInstance_BO_CN_OwnData = {};
+    const targetData = Object.assign(WFProcessInstance_BO_CN_Base(), WFProcessInstance_BO_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_BO_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("实例标识",null),
+		name: commonLogic.appcommonhandle("实例名称",null),
+		processdefinitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
+		processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
+		businesskey: commonLogic.appcommonhandle("业务键值",null),
+		starttime: commonLogic.appcommonhandle("启动时间",null),
+		endtime: commonLogic.appcommonhandle("结束时间",null),
+		startuserid: commonLogic.appcommonhandle("发起人标识",null),
+		startusername: commonLogic.appcommonhandle("发起人",null),
+	},
+		views: {
+			activeinstancegridview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例表格视图",null),
+			},
+			activeinstanceoptionview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("实例标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				instanceid: commonLogic.appcommonhandle("实例标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				instancename: commonLogic.appcommonhandle("实例名称",null),
+				businesskey: commonLogic.appcommonhandle("业务键值",null),
+				definitionname: commonLogic.appcommonhandle("流程定义名称",null),
+				starttime: commonLogic.appcommonhandle("启动时间",null),
+				startuserid: commonLogic.appcommonhandle("发起人标识",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		activeinstancegridviewtoolbar_toolbar: {
+			deuiaction1_jump: {
+				caption: commonLogic.appcommonhandle("流程跳转",null),
+				tip: commonLogic.appcommonhandle("流程跳转",null),
+			},
+			deuiaction1_restart: {
+				caption: commonLogic.appcommonhandle("重启流程",null),
+				tip: commonLogic.appcommonhandle("重启流程",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US.ts

+import WFProcessInstance_en_US_Base from './wfprocess-instance_en_US_base';
+
+function getLocaleResource(){
+    const WFProcessInstance_en_US_OwnData = {};
+    const targetData = Object.assign(WFProcessInstance_en_US_Base(), WFProcessInstance_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_en_US_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("实例标识",null),
+		name: commonLogic.appcommonhandle("实例名称",null),
+		processdefinitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
+		processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
+		businesskey: commonLogic.appcommonhandle("业务键值",null),
+		starttime: commonLogic.appcommonhandle("启动时间",null),
+		endtime: commonLogic.appcommonhandle("结束时间",null),
+		startuserid: commonLogic.appcommonhandle("发起人标识",null),
+		startusername: commonLogic.appcommonhandle("发起人",null),
+	},
+		views: {
+			activeinstancegridview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例表格视图",null),
+			},
+			activeinstanceoptionview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("实例标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				instanceid: commonLogic.appcommonhandle("实例标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				instancename: commonLogic.appcommonhandle("实例名称",null),
+				businesskey: commonLogic.appcommonhandle("业务键值",null),
+				definitionname: commonLogic.appcommonhandle("流程定义名称",null),
+				starttime: commonLogic.appcommonhandle("启动时间",null),
+				startuserid: commonLogic.appcommonhandle("发起人标识",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		activeinstancegridviewtoolbar_toolbar: {
+			deuiaction1_jump: {
+				caption: commonLogic.appcommonhandle("流程跳转",null),
+				tip: commonLogic.appcommonhandle("流程跳转",null),
+			},
+			deuiaction1_restart: {
+				caption: commonLogic.appcommonhandle("重启流程",null),
+				tip: commonLogic.appcommonhandle("重启流程",null),
+			},
+		},
+	};
+	return data;
+}
+
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN.ts

+import WFProcessInstance_zh_CN_Base from './wfprocess-instance_zh_CN_base';
+
+function getLocaleResource(){
+    const WFProcessInstance_zh_CN_OwnData = {};
+    const targetData = Object.assign(WFProcessInstance_zh_CN_Base(), WFProcessInstance_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

app_web/src/locale/lanres/entities/wfprocess-instance/wfprocess-instance_zh_CN_base.ts

+import commonLogic from '@/locale/logic/common/common-logic';
+
+function getLocaleResourceBase(){
+	const data:any = {
+	fields: {
+		id: commonLogic.appcommonhandle("实例标识",null),
+		name: commonLogic.appcommonhandle("实例名称",null),
+		processdefinitionkey: commonLogic.appcommonhandle("DefinitionKey",null),
+		processdefinitionname: commonLogic.appcommonhandle("流程定义名称",null),
+		businesskey: commonLogic.appcommonhandle("业务键值",null),
+		starttime: commonLogic.appcommonhandle("启动时间",null),
+		endtime: commonLogic.appcommonhandle("结束时间",null),
+		startuserid: commonLogic.appcommonhandle("发起人标识",null),
+		startusername: commonLogic.appcommonhandle("发起人",null),
+	},
+		views: {
+			activeinstancegridview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例表格视图",null),
+			},
+			activeinstanceoptionview: {
+				caption: commonLogic.appcommonhandle("流程实例",null),
+				title: commonLogic.appcommonhandle("流程中实例选项操作视图",null),
+			},
+		},
+		main_form: {
+			details: {
+				group1: commonLogic.appcommonhandle("实例基本信息",null), 
+				formpage1: commonLogic.appcommonhandle("基本信息",null), 
+				group2: commonLogic.appcommonhandle("操作信息",null), 
+				formpage2: commonLogic.appcommonhandle("其它",null), 
+				srforikey: commonLogic.appcommonhandle("",null), 
+				srfkey: commonLogic.appcommonhandle("实例标识",null), 
+				srfmajortext: commonLogic.appcommonhandle("实例名称",null), 
+				srftempmode: commonLogic.appcommonhandle("",null), 
+				srfuf: commonLogic.appcommonhandle("",null), 
+				srfdeid: commonLogic.appcommonhandle("",null), 
+				srfsourcekey: commonLogic.appcommonhandle("",null), 
+				instanceid: commonLogic.appcommonhandle("实例标识",null), 
+			},
+			uiactions: {
+			},
+		},
+		main_grid: {
+			columns: {
+				instancename: commonLogic.appcommonhandle("实例名称",null),
+				businesskey: commonLogic.appcommonhandle("业务键值",null),
+				definitionname: commonLogic.appcommonhandle("流程定义名称",null),
+				starttime: commonLogic.appcommonhandle("启动时间",null),
+				startuserid: commonLogic.appcommonhandle("发起人标识",null),
+			},
+			nodata:commonLogic.appcommonhandle("",null),
+			uiactions: {
+			},
+		},
+		default_searchform: {
+			details: {
+				formpage1: commonLogic.appcommonhandle("常规条件",null), 
+			},
+			uiactions: {
+			},
+		},
+		activeinstancegridviewtoolbar_toolbar: {
+			deuiaction1_jump: {
+				caption: commonLogic.appcommonhandle("流程跳转",null),
+				tip: commonLogic.appcommonhandle("流程跳转",null),
+			},
+			deuiaction1_restart: {
+				caption: commonLogic.appcommonhandle("重启流程",null),
+				tip: commonLogic.appcommonhandle("重启流程",null),
+			},
+		},
+	};
+	return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

app_web/src/mock/app/wfindex-view-appmenu/wfindex-view-appmenu.ts

@@ -81,6 +81,24 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: 'Auto4',
 	resourcetag: '',
+},
+            {
+	id: '779874AB-C6E8-41D5-8F4C-4055097DF699',
+	name: 'menuitem5',
+	text: '流程实例',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '流程实例',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc',
+	resourcetag: '',
 },
         ],
     }];

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

+import qs from 'qs';
+import { MockAdapter } from '@/mock/mock-adapter';
+const mock = MockAdapter.getInstance();
+
+// 模拟数据
+const mockDatas: Array<any> = [
+];
+
+
+//getwflink
+mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfprocessinstances\/[a-zA-Z0-9\-\;]+\/usertasks\/[a-zA-Z0-9\-\;]+\/ways$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: getwflink");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status,[
+        {"sequenceFlowId":"dfdsfdsfdsfdsfds","sequenceFlowName":"同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddlfldldfldsfds","refViewKey":""},
+        {"sequenceFlowId":"ddssdfdfdfdfsfdf","sequenceFlowName":"不同意",
+         "taskId":"aaaaddddccccddddd","processDefinitionKey":"support-workorders-approve-v1",
+         "processInstanceId":"ddfdsldlfdlldsf","refViewKey":"workorder_ltform_editview"}
+        ]];
+});
+
+// getwfstep
+mock.onGet(new RegExp(/^\/wfcore\/ibzwf-app-web\/wfprocessinstances\/process-definitions-nodes$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: getwfstep");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, [
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-dfdfd",
+        "userTaskName":"待审",
+        "cnt":0,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"
+        },
+        {"userTaskId":"sddfddfd-dfdf-fdfd-fdf-87927",
+        "userTaskName":"待分配",
+        "cnt":3,
+        "processDefinitionKey":"support-workorders-approve-v1",
+        "processDefinitionName":"工单审批流程v1"}
+        ]];
+});
+
+// createBatch
+mock.onPost(new RegExp(/^\/wfprocessinstances\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: createBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// updateBatch
+mock.onPut(new RegExp(/^\/wfprocessinstances\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: updateBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// removeBatch
+mock.onDelete(new RegExp(/^\/wfprocessinstances\/batch$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: removeBatch");
+    console.table({url:config.url, method: config.method, data:config.data});
+    console.groupEnd();
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, {}];
+    }
+    return [status, {}];
+});
+
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+    
+// FetchActiveProcessInstance
+mock.onGet(new RegExp(/^\/wfprocessinstances$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: FetchActiveProcessInstance");
+    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 : []];
+});
+
+// FetchActiveProcessInstance
+mock.onGet(new RegExp(/^\/wfprocessinstances(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: FetchActiveProcessInstance");
+    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 : []];
+});
+    
+// FetchDefault
+mock.onGet(new RegExp(/^\/wfprocessinstances$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: FetchDefault");
+    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 : []];
+});
+
+// FetchDefault
+mock.onGet(new RegExp(/^\/wfprocessinstances(\?[\w-./?%&=,]*)*$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: FetchDefault");
+    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参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+// URI参数传递情况未实现
+
+// Select
+mock.onGet(new RegExp(/^\/wfprocessinstances\/([a-zA-Z0-9\-\;]{1,35})\/select$/)).reply((config: any) => {
+    console.groupCollapsed("实体:wfprocessinstance 方法: Select");
+    console.table({url:config.url, method: config.method, data:config.data});
+    let status = MockAdapter.mockStatus(config);
+    if (status !== 200) {
+        return [status, null];
+    }    
+    const paramArray:Array<any> = ['id'];
+    const matchArray:any = new RegExp(/^\/wfprocessinstances\/([a-zA-Z0-9\-\;]{1,35})\/select$/).exec(config.url);
+    let tempValue: any = {};
+    if(matchArray && matchArray.length >1 && paramArray && paramArray.length >0){
+        paramArray.forEach((item: any, index: number) => {
+            Object.defineProperty(tempValue, item, {
+                enumerable: true,
+                value: matchArray[index + 1]
+            });
+        });
+    }
+    let items = mockDatas ? mockDatas : [];
+    let _items = items.find((item: any) => Object.is(item.id, tempValue.id));
+    console.groupCollapsed("response数据  status: "+status+" data: ");
+    console.table(_items);
+    console.groupEnd();
+    console.groupEnd();
+    return [status, _items];
+});
+

app_web/src/mock/index.ts

@@ -10,6 +10,7 @@ import './upload/upload';
 import './entity/wftasks/wftasks';
 import './entity/wfmembers/wfmembers';
 import './entity/wfusers/wfusers';
+import './entity/wfprocess-instances/wfprocess-instances';
 import './entity/wfgroups/wfgroups';
 import './entity/wfremodels/wfremodels';
 import './entity/wfsystems/wfsystems';

app_web/src/mock/viewconfig/viewconfig.ts

@@ -7,7 +7,15 @@ import Mock from 'mockjs'
 mock.onGet('./assets/json/view-config.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status,{
-                "wfindexview": {
+                "wfprocessinstanceactiveinstancegridview": {
+            "title": "流程中实例表格视图",
+            "caption": "流程实例",
+            "viewtype": "DEGRIDVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFProcessInstanceActiveInstanceGridView",
+            "viewtag": "0848b7f2d687480940498fd8e2c39f56"
+        },
+        "wfindexview": {
             "title": "workflow",
             "caption": "ibizlab",
             "viewtype": "APPINDEXVIEW",
@@ -135,6 +143,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "WFTaskEditView",
             "viewtag": "e3020680a441ab58a29db6fe2434f08b"
         },
+        "wfprocessinstanceactiveinstanceoptionview": {
+            "title": "流程中实例选项操作视图",
+            "caption": "流程实例",
+            "viewtype": "DEOPTVIEW",
+            "viewmodule": "workflow",
+            "viewname": "WFProcessInstanceActiveInstanceOptionView",
+            "viewtag": "e8bb7dc695c3c5c2e2367b4755c8ee23"
+        },
         "wfgroupgridview": {
             "title": "角色/用户组表格视图",
             "caption": "角色/用户组",

app_web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue

@@ -113,9 +113,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -744,38 +744,38 @@ export default class WFGroupEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -1715,6 +1715,7 @@ export default class WFGroupEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue

@@ -110,9 +110,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>
@@ -137,11 +137,11 @@
                 :opendata="opendata"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @remove="grid_remove($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -321,9 +321,9 @@ export default class WFGroupGridViewBase extends Vue {
      * @memberof WFGroupGridViewBase
      */
     public containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
     };
 
     /**
@@ -737,52 +737,14 @@ export default class WFGroupGridViewBase extends Vue {
 
 
     /**
-     * toolbar 部件 click 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem21')) {
-            this.toolbar_tbitem21_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click(null, '', $event2);
-        }
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
@@ -799,86 +761,124 @@ export default class WFGroupGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 beforeload 事件
+     * grid 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
     }
 
 
     /**
-     * grid 部件 remove 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public grid_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'remove', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
     /**
-     * grid 部件 load 事件
+     * searchform 部件 search 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public grid_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'load', $event);
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
     }
 
 
     /**
-     * searchform 部件 save 事件
+     * searchform 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
     }
 
 
     /**
-     * searchform 部件 search 事件
+     * searchform 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
     }
 
 
     /**
-     * searchform 部件 load 事件
+     * toolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupGridViewBase
      */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem24')) {
+            this.toolbar_tbitem24_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem25')) {
+            this.toolbar_tbitem25_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem21')) {
+            this.toolbar_tbitem21_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem23')) {
+            this.toolbar_tbitem23_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem18')) {
+            this.toolbar_tbitem18_click(null, '', $event2);
+        }
     }
 
 
@@ -1666,6 +1666,7 @@ export default class WFGroupGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
     /**

app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue

@@ -19,8 +19,8 @@
         name="pickupviewpanel"  
         ref='pickupviewpanel' 
         @selectionchange="pickupviewpanel_selectionchange($event)"  
-        @activated="pickupviewpanel_activated($event)"  
         @load="pickupviewpanel_load($event)"  
+        @activated="pickupviewpanel_activated($event)"  
         @closeview="closeView($event)">
     </view_pickupviewpanel>
                 </div>
@@ -611,26 +611,26 @@ export default class WFGroupMPickupViewBase extends Vue {
 
 
     /**
-     * pickupviewpanel 部件 activated 事件
+     * pickupviewpanel 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupMPickupViewBase
      */
-    public pickupviewpanel_activated($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
     }
 
 
     /**
-     * pickupviewpanel 部件 load 事件
+     * pickupviewpanel 部件 activated 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupMPickupViewBase
      */
-    public pickupviewpanel_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
     }
 
 
@@ -694,6 +694,7 @@ export default class WFGroupMPickupViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 是否显示按钮

app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue

@@ -16,9 +16,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>                    </div>            <view_grid 
@@ -36,10 +36,10 @@
                 fetchAction="FetchDefault"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -578,38 +578,26 @@ export default class WFGroupPickupGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 selectionchange 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof WFGroupPickupGridViewBase
-     */
-    public grid_selectionchange($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
-    }
-
-
-    /**
-     * grid 部件 beforeload 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupPickupGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 selectionchange 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupPickupGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_selectionchange($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
     }
 
 
@@ -626,14 +614,14 @@ export default class WFGroupPickupGridViewBase extends Vue {
 
 
     /**
-     * searchform 部件 save 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupPickupGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
@@ -661,6 +649,18 @@ export default class WFGroupPickupGridViewBase extends Vue {
     }
 
 
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof WFGroupPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+
 
 
     /**
@@ -721,6 +721,7 @@ export default class WFGroupPickupGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 选中数据字符串

app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue

@@ -17,8 +17,8 @@
                 name="pickupviewpanel"  
                 ref='pickupviewpanel' 
                 @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
                 @load="pickupviewpanel_load($event)"  
+                @activated="pickupviewpanel_activated($event)"  
                 @closeview="closeView($event)">
             </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
@@ -576,26 +576,26 @@ export default class WFGroupPickupViewBase extends Vue {
 
 
     /**
-     * pickupviewpanel 部件 activated 事件
+     * pickupviewpanel 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupPickupViewBase
      */
-    public pickupviewpanel_activated($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
     }
 
 
     /**
-     * pickupviewpanel 部件 load 事件
+     * pickupviewpanel 部件 activated 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFGroupPickupViewBase
      */
-    public pickupviewpanel_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
     }
 
 
@@ -659,6 +659,7 @@ export default class WFGroupPickupViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 选中数据的字符串

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

 export const PageComponents = {
     install(Vue: any, opt: any) {
-                Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));
-        Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
-        Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue'));
+                Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
         Vue.component('wfremodel-edit-view', () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue'));
-        Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
+        Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
         Vue.component('wftask-grid-view', () => import('@pages/workflow/wftask-grid-view/wftask-grid-view.vue'));
-        Vue.component('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'));
-        Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
+        Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));
         Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'));
-        Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
+        Vue.component('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'));
+        Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
         Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
-        Vue.component('wfgroup-grid-view', () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'));
         Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
+        Vue.component('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
         Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'));
-        Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
+        Vue.component('wfgroup-pickup-view', () => import('@pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view.vue'));
+        Vue.component('wfgroup-pickup-grid-view', () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'));
+        Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
     }
 };
\ No newline at end of file

app_web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue

@@ -113,9 +113,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -744,38 +744,38 @@ export default class WFMemberEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -1715,6 +1715,7 @@ export default class WFMemberEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

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

@@ -110,9 +110,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>
@@ -137,11 +137,11 @@
                 :opendata="opendata"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @remove="grid_remove($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -321,9 +321,9 @@ export default class WFMemberGridViewBase extends Vue {
      * @memberof WFMemberGridViewBase
      */
     public containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
     };
 
     /**
@@ -737,52 +737,14 @@ export default class WFMemberGridViewBase extends Vue {
 
 
     /**
-     * toolbar 部件 click 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem21')) {
-            this.toolbar_tbitem21_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click(null, '', $event2);
-        }
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
@@ -799,86 +761,124 @@ export default class WFMemberGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 beforeload 事件
+     * grid 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
     }
 
 
     /**
-     * grid 部件 remove 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public grid_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'remove', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
     /**
-     * grid 部件 load 事件
+     * searchform 部件 search 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public grid_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'load', $event);
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
     }
 
 
     /**
-     * searchform 部件 save 事件
+     * searchform 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
     }
 
 
     /**
-     * searchform 部件 search 事件
+     * searchform 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
     }
 
 
     /**
-     * searchform 部件 load 事件
+     * toolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFMemberGridViewBase
      */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem24')) {
+            this.toolbar_tbitem24_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem25')) {
+            this.toolbar_tbitem25_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem21')) {
+            this.toolbar_tbitem21_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem23')) {
+            this.toolbar_tbitem23_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem18')) {
+            this.toolbar_tbitem18_click(null, '', $event2);
+        }
     }
 
 
@@ -1682,6 +1682,7 @@ export default class WFMemberGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
     /**

app_web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue

@@ -113,9 +113,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -744,38 +744,38 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -1715,6 +1715,7 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view-base.vue

@@ -110,9 +110,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>
@@ -137,11 +137,11 @@
                 :opendata="opendata"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @remove="grid_remove($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -321,9 +321,9 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
      * @memberof WFProcessDefinitionGridViewBase
      */
     public containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
     };
 
     /**
@@ -737,52 +737,14 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
 
 
     /**
-     * toolbar 部件 click 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem21')) {
-            this.toolbar_tbitem21_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click(null, '', $event2);
-        }
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
@@ -799,86 +761,124 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 beforeload 事件
+     * grid 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
     }
 
 
     /**
-     * grid 部件 remove 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public grid_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'remove', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
     /**
-     * grid 部件 load 事件
+     * searchform 部件 search 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public grid_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'load', $event);
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
     }
 
 
     /**
-     * searchform 部件 save 事件
+     * searchform 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
     }
 
 
     /**
-     * searchform 部件 search 事件
+     * searchform 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
     }
 
 
     /**
-     * searchform 部件 load 事件
+     * toolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFProcessDefinitionGridViewBase
      */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem24')) {
+            this.toolbar_tbitem24_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem25')) {
+            this.toolbar_tbitem25_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem21')) {
+            this.toolbar_tbitem21_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem23')) {
+            this.toolbar_tbitem23_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem18')) {
+            this.toolbar_tbitem18_click(null, '', $event2);
+        }
     }
 
 
@@ -1652,6 +1652,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
     /**

app_web/src/pages/workflow/wfprocess-instance-active-instance-grid-view/wfprocess-instance-active-instance-grid-view.less

+.wfprocess-instance-active-instance-grid-view{
+    position: relative;
+}
+        .toolbar-container {
+            button {
+                margin: 6px 0px 4px 4px;
+                .caption {
+                    margin-left: 4px;
+                }
+            }
+            .seperator {
+                color: #dcdee2;
+                margin: 0 0px 0 4px;
+            }
+        }
+        
+        // this is less
+
+

app_web/src/pages/workflow/wfprocess-instance-active-instance-grid-view/wfprocess-instance-active-instance-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFProcessInstanceActiveInstanceGridViewBase from './wfprocess-instance-active-instance-grid-view-base.vue';
+
+import view_grid from '@widgets/wfprocess-instance/main-grid/main-grid.vue';
+import view_searchform from '@widgets/wfprocess-instance/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 WFProcessInstanceActiveInstanceGridView extends WFProcessInstanceActiveInstanceGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.less

+.wfprocess-instance-active-instance-option-view{
+    position: relative;
+}
+
+
+.app-modal{
+  .view-container {
+    .view-card {
+      .ivu-card-body {
+        .content-container{
+          height: calc(100% - 64px);
+          .ivu-badge{
+            .ivu-badge-count{
+              top: -5px;
+            }
+          }
+        }
+      } 
+    } 
+  }
+}
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFProcessInstanceActiveInstanceOptionViewBase from './wfprocess-instance-active-instance-option-view-base.vue';
+
+import view_form from '@widgets/wfprocess-instance/main-form/main-form.vue';
+@Component({
+    components: {
+        view_form, 
+    },
+    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 WFProcessInstanceActiveInstanceOptionView extends WFProcessInstanceActiveInstanceOptionViewBase {
+
+}
+</script>
\ No newline at end of file

app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue

@@ -38,9 +38,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -605,38 +605,38 @@ export default class WFREModelEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFREModelEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFREModelEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFREModelEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -754,6 +754,7 @@ export default class WFREModelEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

app_web/src/pages/workflow/wftask-edit-view/wftask-edit-view-base.vue

@@ -113,9 +113,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -744,38 +744,38 @@ export default class WFTaskEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -1715,6 +1715,7 @@ export default class WFTaskEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view-base.vue

@@ -88,9 +88,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>
@@ -114,11 +114,11 @@
                 :opendata="opendata"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @remove="grid_remove($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -298,9 +298,9 @@ export default class WFTaskGridViewBase extends Vue {
      * @memberof WFTaskGridViewBase
      */
     public containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
     };
 
     /**
@@ -704,52 +704,14 @@ export default class WFTaskGridViewBase extends Vue {
 
 
     /**
-     * toolbar 部件 click 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem21')) {
-            this.toolbar_tbitem21_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click(null, '', $event2);
-        }
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
@@ -766,86 +728,124 @@ export default class WFTaskGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 beforeload 事件
+     * grid 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
     }
 
 
     /**
-     * grid 部件 remove 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public grid_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'remove', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
     /**
-     * grid 部件 load 事件
+     * searchform 部件 search 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public grid_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'load', $event);
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
     }
 
 
     /**
-     * searchform 部件 save 事件
+     * searchform 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
     }
 
 
     /**
-     * searchform 部件 search 事件
+     * searchform 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
     }
 
 
     /**
-     * searchform 部件 load 事件
+     * toolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFTaskGridViewBase
      */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem24')) {
+            this.toolbar_tbitem24_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem25')) {
+            this.toolbar_tbitem25_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem21')) {
+            this.toolbar_tbitem21_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem23')) {
+            this.toolbar_tbitem23_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem18')) {
+            this.toolbar_tbitem18_click(null, '', $event2);
+        }
     }
 
 
@@ -1581,6 +1581,7 @@ export default class WFTaskGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
     /**

app_web/src/pages/workflow/wfuser-edit-view/wfuser-edit-view-base.vue

@@ -113,9 +113,9 @@
             style='' 
             name="form"  
             ref='form' 
+            @load="form_load($event)"  
             @save="form_save($event)"  
             @remove="form_remove($event)"  
-            @load="form_load($event)"  
             @closeview="closeView($event)">
         </view_form>
         </div>
@@ -744,38 +744,38 @@ export default class WFUserEditViewBase extends Vue {
 
 
     /**
-     * form 部件 save 事件
+     * form 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserEditViewBase
      */
-    public form_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'save', $event);
+    public form_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'load', $event);
     }
 
 
     /**
-     * form 部件 remove 事件
+     * form 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserEditViewBase
      */
-    public form_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'remove', $event);
+    public form_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'save', $event);
     }
 
 
     /**
-     * form 部件 load 事件
+     * form 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserEditViewBase
      */
-    public form_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('form', 'load', $event);
+    public form_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('form', 'remove', $event);
     }
 
 
@@ -1715,6 +1715,7 @@ export default class WFUserEditViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
 

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view-base.vue

@@ -110,9 +110,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>
@@ -137,11 +137,11 @@
                 :opendata="opendata"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @remove="grid_remove($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -321,9 +321,9 @@ export default class WFUserGridViewBase extends Vue {
      * @memberof WFUserGridViewBase
      */
     public containerModel: any = {
-        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
         view_grid: { name: 'grid', type: 'GRID' },
         view_searchform: { name: 'searchform', type: 'SEARCHFORM' },
+        view_toolbar: { name: 'toolbar', type: 'TOOLBAR' },
     };
 
     /**
@@ -737,52 +737,14 @@ export default class WFUserGridViewBase extends Vue {
 
 
     /**
-     * toolbar 部件 click 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem3')) {
-            this.toolbar_tbitem3_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem4')) {
-            this.toolbar_tbitem4_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem6')) {
-            this.toolbar_tbitem6_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem24')) {
-            this.toolbar_tbitem24_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem25')) {
-            this.toolbar_tbitem25_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem8')) {
-            this.toolbar_tbitem8_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem13')) {
-            this.toolbar_tbitem13_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem11')) {
-            this.toolbar_tbitem11_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem21')) {
-            this.toolbar_tbitem21_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem23')) {
-            this.toolbar_tbitem23_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem19')) {
-            this.toolbar_tbitem19_click(null, '', $event2);
-        }
-        if (Object.is($event.tag, 'tbitem18')) {
-            this.toolbar_tbitem18_click(null, '', $event2);
-        }
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
@@ -799,86 +761,124 @@ export default class WFUserGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 beforeload 事件
+     * grid 部件 remove 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_remove($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'remove', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'load', $event);
     }
 
 
     /**
-     * grid 部件 remove 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public grid_remove($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'remove', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
     /**
-     * grid 部件 load 事件
+     * searchform 部件 search 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public grid_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'load', $event);
+    public searchform_search($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'search', $event);
     }
 
 
     /**
-     * searchform 部件 save 事件
+     * searchform 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public searchform_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'load', $event);
     }
 
 
     /**
-     * searchform 部件 search 事件
+     * searchform 部件 save 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public searchform_search($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'search', $event);
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
     }
 
 
     /**
-     * searchform 部件 load 事件
+     * toolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserGridViewBase
      */
-    public searchform_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'load', $event);
+    public toolbar_click($event: any, $event2?: any) {
+        if (Object.is($event.tag, 'tbitem3')) {
+            this.toolbar_tbitem3_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem4')) {
+            this.toolbar_tbitem4_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem5')) {
+            this.toolbar_tbitem5_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem6')) {
+            this.toolbar_tbitem6_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem24')) {
+            this.toolbar_tbitem24_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem25')) {
+            this.toolbar_tbitem25_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem13')) {
+            this.toolbar_tbitem13_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem21')) {
+            this.toolbar_tbitem21_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem23')) {
+            this.toolbar_tbitem23_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem19')) {
+            this.toolbar_tbitem19_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem18')) {
+            this.toolbar_tbitem18_click(null, '', $event2);
+        }
     }
 
 
@@ -1652,6 +1652,7 @@ export default class WFUserGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
 
     /**

app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue

@@ -19,8 +19,8 @@
         name="pickupviewpanel"  
         ref='pickupviewpanel' 
         @selectionchange="pickupviewpanel_selectionchange($event)"  
-        @activated="pickupviewpanel_activated($event)"  
         @load="pickupviewpanel_load($event)"  
+        @activated="pickupviewpanel_activated($event)"  
         @closeview="closeView($event)">
     </view_pickupviewpanel>
                 </div>
@@ -611,26 +611,26 @@ export default class WFUserMPickupViewBase extends Vue {
 
 
     /**
-     * pickupviewpanel 部件 activated 事件
+     * pickupviewpanel 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserMPickupViewBase
      */
-    public pickupviewpanel_activated($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
     }
 
 
     /**
-     * pickupviewpanel 部件 load 事件
+     * pickupviewpanel 部件 activated 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserMPickupViewBase
      */
-    public pickupviewpanel_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
     }
 
 
@@ -694,6 +694,7 @@ export default class WFUserMPickupViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 是否显示按钮

app_web/src/pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view-base.vue

@@ -16,9 +16,9 @@
             
                 name="searchform"  
                 ref='searchform' 
-                @save="searchform_save($event)"  
                 @search="searchform_search($event)"  
                 @load="searchform_load($event)"  
+                @save="searchform_save($event)"  
                 @closeview="closeView($event)">
             </view_searchform>
                     <div class='view-body-messages'>                    </div>            <view_grid 
@@ -36,10 +36,10 @@
                 fetchAction="FetchDefault"
                 name="grid"  
                 ref='grid' 
-                @selectionchange="grid_selectionchange($event)"  
-                @beforeload="grid_beforeload($event)"  
                 @rowdblclick="grid_rowdblclick($event)"  
+                @selectionchange="grid_selectionchange($event)"  
                 @load="grid_load($event)"  
+                @beforeload="grid_beforeload($event)"  
                 @closeview="closeView($event)">
             </view_grid>
         </div>
@@ -578,38 +578,26 @@ export default class WFUserPickupGridViewBase extends Vue {
 
 
     /**
-     * grid 部件 selectionchange 事件
-     *
-     * @param {*} [args={}]
-     * @param {*} $event
-     * @memberof WFUserPickupGridViewBase
-     */
-    public grid_selectionchange($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
-    }
-
-
-    /**
-     * grid 部件 beforeload 事件
+     * grid 部件 rowdblclick 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserPickupGridViewBase
      */
-    public grid_beforeload($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'beforeload', $event);
+    public grid_rowdblclick($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
     }
 
 
     /**
-     * grid 部件 rowdblclick 事件
+     * grid 部件 selectionchange 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserPickupGridViewBase
      */
-    public grid_rowdblclick($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('grid', 'rowdblclick', $event);
+    public grid_selectionchange($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'selectionchange', $event);
     }
 
 
@@ -626,14 +614,14 @@ export default class WFUserPickupGridViewBase extends Vue {
 
 
     /**
-     * searchform 部件 save 事件
+     * grid 部件 beforeload 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserPickupGridViewBase
      */
-    public searchform_save($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('searchform', 'save', $event);
+    public grid_beforeload($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('grid', 'beforeload', $event);
     }
 
 
@@ -661,6 +649,18 @@ export default class WFUserPickupGridViewBase extends Vue {
     }
 
 
+    /**
+     * searchform 部件 save 事件
+     *
+     * @param {*} [args={}]
+     * @param {*} $event
+     * @memberof WFUserPickupGridViewBase
+     */
+    public searchform_save($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('searchform', 'save', $event);
+    }
+
+
 
 
     /**
@@ -721,6 +721,7 @@ export default class WFUserPickupGridViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 选中数据字符串

app_web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue

@@ -17,8 +17,8 @@
                 name="pickupviewpanel"  
                 ref='pickupviewpanel' 
                 @selectionchange="pickupviewpanel_selectionchange($event)"  
-                @activated="pickupviewpanel_activated($event)"  
                 @load="pickupviewpanel_load($event)"  
+                @activated="pickupviewpanel_activated($event)"  
                 @closeview="closeView($event)">
             </view_pickupviewpanel>
             <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
@@ -576,26 +576,26 @@ export default class WFUserPickupViewBase extends Vue {
 
 
     /**
-     * pickupviewpanel 部件 activated 事件
+     * pickupviewpanel 部件 load 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserPickupViewBase
      */
-    public pickupviewpanel_activated($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
+    public pickupviewpanel_load($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
     }
 
 
     /**
-     * pickupviewpanel 部件 load 事件
+     * pickupviewpanel 部件 activated 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof WFUserPickupViewBase
      */
-    public pickupviewpanel_load($event: any, $event2?: any) {
-        this.engine.onCtrlEvent('pickupviewpanel', 'load', $event);
+    public pickupviewpanel_activated($event: any, $event2?: any) {
+        this.engine.onCtrlEvent('pickupviewpanel', 'activated', $event);
     }
 
 
@@ -659,6 +659,7 @@ export default class WFUserPickupViewBase extends Vue {
         if(this.portletStateEvent){
             this.portletStateEvent.unsubscribe();
         }
+        this.viewState.complete();        
     }
     /**
      * 选中数据的字符串

app_web/src/service/entity-service-register.ts

@@ -42,6 +42,7 @@ export class EntityServiceRegister {
                 this.allEntityService.set('wftask', () => import('@/service/wftask/wftask-service'));
         this.allEntityService.set('wfmember', () => import('@/service/wfmember/wfmember-service'));
         this.allEntityService.set('wfuser', () => import('@/service/wfuser/wfuser-service'));
+        this.allEntityService.set('wfprocessinstance', () => import('@/service/wfprocess-instance/wfprocess-instance-service'));
         this.allEntityService.set('wfgroup', () => import('@/service/wfgroup/wfgroup-service'));
         this.allEntityService.set('wfremodel', () => import('@/service/wfremodel/wfremodel-service'));
         this.allEntityService.set('wfsystem', () => import('@/service/wfsystem/wfsystem-service'));

app_web/src/service/wfprocess-instance/wfprocess-instance-service.ts

+import { Http,Util } from '@/utils';
+import WFProcessInstanceServiceBase from './wfprocess-instance-service-base';
+
+
+/**
+ * 流程实例服务对象
+ *
+ * @export
+ * @class WFProcessInstanceService
+ * @extends {WFProcessInstanceServiceBase}
+ */
+export default class WFProcessInstanceService extends WFProcessInstanceServiceBase {
+
+    /**
+     * Creates an instance of  WFProcessInstanceService.
+     * 
+     * @param {*} [opts={}]
+     * @memberof  WFProcessInstanceService
+     */
+    constructor(opts: any = {}) {
+        super(opts);
+    }
+
+
+}
\ No newline at end of file

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

@@ -3,6 +3,16 @@
  */
 export const viewstate: any = {
     appviews: [
+        {
+            viewtag: '0848b7f2d687480940498fd8e2c39f56',
+            viewmodule: 'workflow',
+            viewname: 'WFProcessInstanceActiveInstanceGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'e8bb7dc695c3c5c2e2367b4755c8ee23',
+            ],
+        },
         {
             viewtag: '096fd4090f21e0fa0f4a303ed9041bff',
             viewmodule: 'workflow',
@@ -10,10 +20,10 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
+                'bfa86be8c02420f87d5cf4ff9a768948',
                 '5856bfb8b576cc2ee743801b23e58299',
-                '66f4bcca719e75fa9645380cc81bc3e2',
                 'f498dfb24e88df7c70a5c09ecb587647',
-                'bfa86be8c02420f87d5cf4ff9a768948',
+                '66f4bcca719e75fa9645380cc81bc3e2',
             ],
         },
         {
@@ -23,9 +33,9 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '84e5a5b589b434dfdc60a3d0ad087d37',
                 '6e1b35989dd6470b5c890369ab87b545',
                 '90a777962337daaf4cffd846eecb1f0f',
+                '84e5a5b589b434dfdc60a3d0ad087d37',
             ],
         },
         {
@@ -82,8 +92,8 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                'b05c9353d499f973106e6ed4dde58074',
                 '61c5bff70bcf56e1dc0bb0900df9c98c',
+                'b05c9353d499f973106e6ed4dde58074',
             ],
         },
         {
@@ -164,6 +174,15 @@ export const viewstate: any = {
             refviews: [
             ],
         },
+        {
+            viewtag: 'e8bb7dc695c3c5c2e2367b4755c8ee23',
+            viewmodule: 'workflow',
+            viewname: 'WFProcessInstanceActiveInstanceOptionView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'f498dfb24e88df7c70a5c09ecb587647',
             viewmodule: 'workflow',

app_web/src/template.html

@@ -4,8 +4,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <link rel="icon" href="./favicon.ico">
+    <title>统一工作流</title>
   </head>
   <body>
     <noscript>