ibizdev提交

cf7fe6ad · ibizdev · 384c2438 · cf7fe6ad · cf7fe6ad · cf7fe6ad
--- a/app_web/src/pages/workflow/wfindex-view/page-register.ts
+++ b/app_web/src/pages/workflow/wfindex-view/page-register.ts
 export const PageComponents = {
    install(Vue: any, opt: any) {
-                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'));
+                Vue.component('wfuser-pickup-grid-view', () => import('@pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view.vue'));
        Vue.component('wfprocess-definition-grid-view', () => import('@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'));
        Vue.component('wfuser-pickup-view', () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-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('wfuser-mpickup-view', () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'));
-        Vue.component('wfgroup-mpickup-view', () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'));
        Vue.component('wfmember-grid-view', () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'));
        Vue.component('wfgroup-edit-view', () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'));
        Vue.component('wfprocess-definition-edit-view', () => import('@pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view.vue'));

--- a/app_web/src/pages/workflow/wfindex-view/router.ts
+++ b/app_web/src/pages/workflow/wfindex-view/router.ts
@@ -34,19 +34,6 @@ const router = new Router({
            },
            component: () => import('@pages/workflow/wfindex-view/wfindex-view.vue'),
            children: [
-                {
-                    path: 'wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
-                    meta: {
-                        caption: 'entities.wfgroup.views.pickupgridview.caption',
-                        parameters: [
-                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfgroups', parameterName: 'wfgroup' },
-                            { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
-                },
                {
                    path: 'wfusers/:wfuser?/pickupgridview/:pickupgridview?',
                    meta: {
@@ -126,32 +113,6 @@ const router = new Router({
                    },
                    component: () => import('@pages/workflow/wfgroup-grid-view/wfgroup-grid-view.vue'),
                },
-                {
-                    path: 'wfusers/:wfuser?/mpickupview/:mpickupview?',
-                    meta: {
-                        caption: 'entities.wfuser.views.mpickupview.caption',
-                        parameters: [
-                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfusers', parameterName: 'wfuser' },
-                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
-                },
-                {
-                    path: 'wfgroups/:wfgroup?/mpickupview/:mpickupview?',
-                    meta: {
-                        caption: 'entities.wfgroup.views.mpickupview.caption',
-                        parameters: [
-                            { pathName: 'wfindexview', parameterName: 'wfindexview' },
-                            { pathName: 'wfgroups', parameterName: 'wfgroup' },
-                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
-                },
                {
                    path: 'wfgroups/:wfgroup?/wfmembers/:wfmember?/gridview/:gridview?',
                    meta: {
@@ -233,18 +194,6 @@ const router = new Router({
        },
        component: () => import('@pages/workflow/wfmember-grid-view/wfmember-grid-view.vue'),
    },
-    {
-        path: '/wfusers/:wfuser?/mpickupview/:mpickupview?',
-        meta: {
-            caption: 'entities.wfuser.views.mpickupview.caption',
-            parameters: [
-                { pathName: 'wfusers', parameterName: 'wfuser' },
-                { pathName: 'mpickupview', parameterName: 'mpickupview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue'),
-    },
    {
        path: '/wfusers/:wfuser?/pickupview/:pickupview?',
        meta: {
@@ -257,18 +206,6 @@ const router = new Router({
        },
        component: () => import('@pages/workflow/wfuser-pickup-view/wfuser-pickup-view.vue'),
    },
-    {
-        path: '/wfgroups/:wfgroup?/mpickupview/:mpickupview?',
-        meta: {
-            caption: 'entities.wfgroup.views.mpickupview.caption',
-            parameters: [
-                { pathName: 'wfgroups', parameterName: 'wfgroup' },
-                { pathName: 'mpickupview', parameterName: 'mpickupview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue'),
-    },
    {
        path: '/wfprocessdefinitions/:wfprocessdefinition?/editview/:editview?',
        meta: {
@@ -342,18 +279,6 @@ const router = new Router({
        },
        component: () => import('@pages/workflow/wfgroup-edit-view/wfgroup-edit-view.vue'),
    },
-    {
-        path: '/wfgroups/:wfgroup?/pickupgridview/:pickupgridview?',
-        meta: {
-            caption: 'entities.wfgroup.views.pickupgridview.caption',
-            parameters: [
-                { pathName: 'wfgroups', parameterName: 'wfgroup' },
-                { pathName: 'pickupgridview', parameterName: 'pickupgridview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue'),
-    },
    {
        path: '/wfgroups/:wfgroup?/gridview/:gridview?',
        meta: {

--- a/app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
+++ b/app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue
@@ -1087,43 +1087,29 @@ export default class WFMemberGridViewBase extends Vue {
     * @memberof WFMemberGridView
     */
    protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
-        const batchAddPSAppViews=[
-            {view:{viewname:'wfgroup-mpickup-view',height: 0,width: 0,title: '角色/用户组数据多项选择视图'},
-            res:['WFGroup']},
-            {view:{viewname:'wfuser-mpickup-view',height: 0,width: 0,title: '用户数据多项选择视图'},
-            res:[]}
+        const data: any = {};
+        let curViewParam = JSON.parse(JSON.stringify(this.context));
+        if(args.length >0){
+            Object.assign(curViewParam,args[0]);
+        }
+        let deResParameters: any[] = [];
+        if(curViewParam.wfgroup && true){
+            deResParameters = [
+            { pathName: 'wfgroups', parameterName: 'wfgroup' },
+            ]
+        }
+        const parameters: any[] = [
+            { pathName: 'wfmembers', parameterName: 'wfmember' },
+            { pathName: 'editview', parameterName: 'editview' },
        ];
-        if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
-            this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
-            return;
+        const _this: any = this;
+        const openIndexViewTab = (data: any) => {
+            const _data: any = { w: (new Date().getTime()) };
+            Object.assign(_data, data);
+            const routePath = this.$viewTool.buildUpRoutePath(this.$route, curViewParam, deResParameters, parameters, args, _data);
+            this.$router.push(routePath);
        }
-        let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
-            return (item.res && (item.res[0] !== this.context.srfparentdename));
-        })
-        let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
-        container.subscribe((result: any) => {
-            if (!result || !Object.is(result.ret, 'OK')) {
-                return;
-            }
-            if(result.datas && result.datas.length == 0){
-                return;
-            }
-            let requestParam:Array<any> = [];
-            result.datas.forEach((record:any) => {
-                record[this.appEntityService.APPDEKEY] = this.context['srfparentkey'];
-                requestParam.push(record);
-            });
-            this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
-                if (!response || response.status !== 200) {
-                    this.$Notice.error({ title: '错误', desc: '批处理操作失败' });
-                    return;
-                }
-                if (!xData || !(xData.refresh instanceof Function)) {
-                    return;
-                }
-                xData.refresh(result.datas);
-            });
-        });
+        openIndexViewTab(data);
    }



--- a/app_web/src/store/modules/view-action/state.ts
+++ b/app_web/src/store/modules/view-action/state.ts
@@ -11,8 +11,6 @@ export const viewstate: any = {
            viewdatachange: false,
            refviews: [
                'ac7cba0b131aa74021747169735a4f90',
-                '3b32fb97ab849d5f36e8a283c85b5098',
-                '5db49698557288612b9247b259ffbcd7',
            ],
        },
        {

--- a/ibzwf-core/src/main/resources/liquibase/h2_table.xml
+++ b/ibzwf-core/src/main/resources/liquibase/h2_table.xml
@@ -26,7 +26,7 @@
        </createTable>
    </changeSet>
    <!--输出实体[WF_USER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_user-24-3">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_user-25-3">
        <createTable tableName="IBZUSER">
                <column name="USERID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_WF_USER_USERID"/>
@@ -38,7 +38,7 @@
        </createTable>
    </changeSet>
    <!--输出实体[WF_GROUP]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group-22-4">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group-23-4">
        <createTable tableName="IBZWFGROUP">
                <column name="GROUPID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_GROUPID"/>
@@ -114,7 +114,7 @@
        </createTable>
    </changeSet>
    <!--输出实体[WF_GROUP_MEMBER]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-31-8">
+    <changeSet author="a_A_5d9d78509" id="tab-wf_group_member-35-8">
        <createTable tableName="IBZWFMEMBER">
                <column name="MEMBERID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_WF_GROUP_MEMBER_MEMBERID"/>
@@ -154,10 +154,10 @@
        <!--输出实体[WF_TASK_WAY]外键关系 -->
        <!--输出实体[WF_DEFINITION]外键关系 -->
        <!--输出实体[WF_GROUP_MEMBER]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-31-10">
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-35-10">
       <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>
-    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-31-11">
+    <changeSet author="a_A_5d9d78509" id="fk-wf_group_member-35-11">
       <addForeignKeyConstraint baseColumnNames="USERID" baseTableName="IBZWFMEMBER" constraintName="DER1N_WF_GROUP_MEMBER_WF_USER_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="USERID" referencedTableName="IBZUSER" validate="true"/>
    </changeSet>
        <!--输出实体[WF_TASK]外键关系 -->