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

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

@@ -4,9 +4,11 @@ export const PageComponents = {
         Vue.component('wfremodel-edit-view', () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-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('wfprocess-instance-active-instance-grid-view', () => import('@pages/workflow/wfprocess-instance-active-instance-grid-view/wfprocess-instance-active-instance-grid-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('wftask-edit-view', () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'));
+        Vue.component('wfprocess-instance-active-instance-option-view', () => import('@pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue'));
         Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
         Vue.component('wfmember-edit-view', () => import('@pages/workflow/wfmember-edit-view/wfmember-edit-view.vue'));
         Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));

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

@@ -91,6 +91,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wftask-grid-view/wftask-grid-view.vue'),
                 },
+                {
+                    path: 'wfprocessinstances/:wfprocessinstance?/activeinstancegridview/:activeinstancegridview?',
+                    meta: {
+                        caption: 'entities.wfprocessinstance.views.activeinstancegridview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
+                            { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+                            { pathName: 'activeinstancegridview', parameterName: 'activeinstancegridview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfprocess-instance-active-instance-grid-view/wfprocess-instance-active-instance-grid-view.vue'),
+                },
                 {
                     path: 'wfprocessdefinitions/:wfprocessdefinition?/editview/:editview?',
                     meta: {
@@ -133,6 +147,20 @@ const router = new Router({
                     },
                     component: () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'),
                 },
+                {
+                    path: 'wfprocessinstances/:wfprocessinstance?/activeinstanceoptionview/:activeinstanceoptionview?',
+                    meta: {
+                        caption: 'entities.wfprocessinstance.views.activeinstanceoptionview.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
+                            { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+                            { pathName: 'activeinstanceoptionview', parameterName: 'activeinstanceoptionview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue'),
+                },
                 {
                     path: 'wfusers/:wfuser?/wfmembers/:wfmember?/gridview/:gridview?',
                     meta: {
@@ -308,6 +336,19 @@ const router = new Router({
             ...indexRoutes,
             ],
         },
+    {
+        path: '/wfprocessinstances/:wfprocessinstance?/activeinstancegridview/:activeinstancegridview?',
+        meta: {
+            caption: 'entities.wfprocessinstance.views.activeinstancegridview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+                { pathName: 'activeinstancegridview', parameterName: 'activeinstancegridview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfprocess-instance-active-instance-grid-view/wfprocess-instance-active-instance-grid-view.vue'),
+    },
     {
         path: '/wfusers/:wfuser?/wfmembers/:wfmember?/gridview/:gridview?',
         meta: {
@@ -546,6 +587,19 @@ const router = new Router({
         },
         component: () => import('@pages/workflow/wftask-edit-view/wftask-edit-view.vue'),
     },
+    {
+        path: '/wfprocessinstances/:wfprocessinstance?/activeinstanceoptionview/:activeinstanceoptionview?',
+        meta: {
+            caption: 'entities.wfprocessinstance.views.activeinstanceoptionview.caption',
+            info:'',
+            parameters: [
+                { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+                { pathName: 'activeinstanceoptionview', parameterName: 'activeinstanceoptionview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/workflow/wfprocess-instance-active-instance-option-view/wfprocess-instance-active-instance-option-view.vue'),
+    },
     {
         path: '/wfgroups/:wfgroup?/gridview/:gridview?',
         meta: {

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

@@ -24,6 +24,7 @@ export const viewstate: any = {
                 '5856bfb8b576cc2ee743801b23e58299',
                 'f498dfb24e88df7c70a5c09ecb587647',
                 '66f4bcca719e75fa9645380cc81bc3e2',
+                '0848b7f2d687480940498fd8e2c39f56',
             ],
         },
         {

app_web/src/widgets/app/wfindex-view-appmenu/wfindex-view-appmenu-base.vue

@@ -720,8 +720,8 @@ export default class WFIndexViewBase extends Vue implements ControlInterface {
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
         const parameters: any[] = [
-            { pathName: 'wftasks', parameterName: 'wftask' },
-            { pathName: 'gridview', parameterName: 'gridview' },
+            { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+            { pathName: 'activeinstancegridview', parameterName: 'activeinstancegridview' },
         ];
         const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
         if(Object.is(this.$route.fullPath,path)){

app_web/src/widgets/app/wfindex-view-appmenu/wfindex-view-appmenu-model.ts

@@ -171,12 +171,12 @@ export default class WFIndexViewModel {
             appfunctag: 'AppFunc',
             appfuncyype: 'APPVIEW',
             openmode: '',
-            codename: 'wftaskgridview',
+            codename: 'wfprocessinstanceactiveinstancegridview',
             deResParameters: [],
-            routepath: '/wfindexview/:wfindexview?/wftasks/:wftask?/gridview/:gridview?',
+            routepath: '/wfindexview/:wfindexview?/wfprocessinstances/:wfprocessinstance?/activeinstancegridview/:activeinstancegridview?',
             parameters: [
-                { pathName: 'wftasks', parameterName: 'wftask' },
-                { pathName: 'gridview', parameterName: 'gridview' },
+                { pathName: 'wfprocessinstances', parameterName: 'wfprocessinstance' },
+                { pathName: 'activeinstancegridview', parameterName: 'activeinstancegridview' },
             ],
         },
 	];

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-9-1">
+    <changeSet author="root" id="tab-wf_group-9-1">
         <createTable tableName="IBZWFGROUP">
                 <column name="GROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
@@ -20,7 +20,7 @@
 
 
     <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-13-2">
+    <changeSet author="root" id="tab-wf_group_member-13-2">
         <createTable tableName="IBZWFMEMBER">
                 <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
@@ -36,7 +36,7 @@
 
 
     <!--输出实体[WF_DEFINITION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_definition-1-3">
+    <changeSet author="root" id="tab-wf_definition-1-3">
         <createTable tableName="IBZWFDEFINITION">
                 <column name="DEFINITIONKEY" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WF_DEFINITION_DEFINITIONKEY"/>
@@ -79,7 +79,7 @@
 
         <!--输出实体[WF_GROUP]外键关系 -->
         <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-13-5">
+    <changeSet author="root" id="fk-wf_group_member-13-5">
        <addForeignKeyConstraint baseColumnNames="GROUPID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_GROUP" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="GROUPID" referencedTableName="IBZWFGROUP" validate="true"/>
     </changeSet>
         <!--输出实体[WF_DEFINITION]外键关系 -->