ibizdev提交

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

@@ -1104,6 +1104,30 @@ const router = new Router({
         },
         component: () => import('@pages/uaa/sys-rolegrid-view/sys-rolegrid-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: '/sys_users/:sys_user?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_user.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_users', parameterName: 'sys_user' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue'),
+    },
     {
         path: '/ibzdicts/:ibzdict?/editview/:editview?',
         meta: {
@@ -1453,6 +1477,42 @@ const router = new Router({
         },
         component: () => import('@pages/dict/ibzdict-item-grid-view/ibzdict-item-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: '/sys_permissions/:sys_permission?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_permission.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_permissions', parameterName: 'sys_permission' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-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: '/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/editview/:editview?',
         meta: {
@@ -1579,6 +1639,18 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'),
     },
+    {
+        path: '/sys_roles/:sys_role?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sys_role.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sys_roles', parameterName: 'sys_role' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue'),
+    },
     {
         path: '/sys_roles/:sys_role?/sys_role_permissions/:sys_role_permission?/editview/:editview?',
         meta: {

app_Web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view.less

+.sys-permissionmpickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_Web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SYS_PERMISSIONMPickupViewBase from './sys-permissionmpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SYS_PERMISSIONMPickupView extends SYS_PERMISSIONMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view.less

+.sys-rolempickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_Web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SYS_ROLEMPickupViewBase from './sys-rolempickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SYS_ROLEMPickupView extends SYS_ROLEMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view.less

+.sys-usermpickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_Web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SYS_USERMPickupViewBase from './sys-usermpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/sys-user/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class SYS_USERMPickupView extends SYS_USERMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.less

+.wfgroup-mpickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_Web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFGroupMPickupViewBase from './wfgroup-mpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/wfgroup/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class WFGroupMPickupView extends WFGroupMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.less

+.wfgroup-pickup-grid-view{
+    position: relative;
+}
+
+
+.wfgroup-pickup-grid-view{
+    width:100%;
+}
\ No newline at end of file

app_Web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFGroupPickupGridViewBase from './wfgroup-pickup-grid-view-base.vue';
+
+import view_grid from '@widgets/wfgroup/main-grid/main-grid.vue';
+import view_searchform from '@widgets/wfgroup/default-searchform/default-searchform.vue';
+@Component({
+    components: {
+        view_grid, 
+        view_searchform, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class WFGroupPickupGridView extends WFGroupPickupGridViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.less

+.wfuser-mpickup-view{
+    position: relative;
+}
+
+
+
+.pickup-view {
+    >.translate-contant {
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-end;
+        height: calc(100% - 64px);
+        .translate-buttons {
+            width: 80px;
+            display: flex;
+            align-items: center;
+            text-align: center;
+            button {
+                margin-bottom: 5px;
+            }
+        }
+        .left, .right {
+            width: 300px;
+        }
+        .right {
+            border: 1px solid #e9e9e9;
+            .mpicker-select {
+                font-family: helvetica, sans-serif;
+                font-size: 16px;
+                text-align: justify; 
+                word-spacing: -3.8pt;
+                line-height: 1.6;
+                font-weight: bold;
+                word-spacing: 10px;
+                height: 100%;
+                overflow: auto;
+            }
+            .mpicker-select > div {
+                padding: 3px 10px;
+                font-size: 14px;
+                color: rgba(0, 0, 0, 0.85);
+                font-weight: initial;
+                cursor: pointer;
+                min-height: 28px;
+                border: 1px solid #e9e9e9;
+                margin: 4px 4px;
+                transition: all .3s;
+            }
+            .mpicker-select > div:hover {
+                background: #ecf6fd;
+            }
+            .mpicker-select > .select{
+                color: #108ee9;
+                background: #ecf6fd;
+            }
+        }
+        .center{
+            width: calc(100% - 380px);
+            .pickupviewpanel {
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    >.footer {
+        height: 64px;
+    }
+}
\ No newline at end of file

app_Web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import WFUserMPickupViewBase from './wfuser-mpickup-view-base.vue';
+
+import view_pickupviewpanel from '@widgets/wfuser/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue';
+@Component({
+    components: {
+        view_pickupviewpanel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class WFUserMPickupView extends WFUserMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

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

@@ -56,6 +56,25 @@ export const viewstate: any = {
                 '6bd0981f6dd67a59f211b5cf97ac8f30',
             ],
         },
+        {
+            viewtag: '17ccd6d8d2bb7cf30158253da129ec1b',
+            viewmodule: 'workflow',
+            viewname: 'WFGroupPickupGridView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
+        {
+            viewtag: '1f8cf7e78d6d88588d1d568d1866cc77',
+            viewmodule: 'uaa',
+            viewname: 'SYS_USERMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '6869875c7409bd1dddd3d0fc62c502db',
+            ],
+        },
         {
             viewtag: '2546b76ba07280621632d7965d8878be',
             viewmodule: 'dict',
@@ -220,6 +239,36 @@ export const viewstate: any = {
                 '3df57007c5cac396f548be7c926b851c',
             ],
         },
+        {
+            viewtag: '84e5a5b589b434dfdc60a3d0ad087d37',
+            viewmodule: 'workflow',
+            viewname: 'WFUserMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                'c9c73c8d2e61bd29a304622f3d39b522',
+            ],
+        },
+        {
+            viewtag: '86bd4f6d4f771870e10b9717046a1b14',
+            viewmodule: 'uaa',
+            viewname: 'SYS_PERMISSIONMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '95d8c933cf4df47634a25d791b3d8564',
+            ],
+        },
+        {
+            viewtag: '90a777962337daaf4cffd846eecb1f0f',
+            viewmodule: 'workflow',
+            viewname: 'WFGroupMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '17ccd6d8d2bb7cf30158253da129ec1b',
+            ],
+        },
         {
             viewtag: '90c0ced2720b85d5e051e7935a93d3c5',
             viewmodule: 'ou',
@@ -272,6 +321,16 @@ export const viewstate: any = {
                 'ccff36439eacae953f85ff636c9dac74',
             ],
         },
+        {
+            viewtag: 'a1f8d44a9d7be49687062c63434b0f3f',
+            viewmodule: 'uaa',
+            viewname: 'SYS_ROLEMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '7c25865f5864a734477c7cb987632f4f',
+            ],
+        },
         {
             viewtag: 'a93a129850b81c3c921aa1911ec9eb8c',
             viewmodule: 'uaa',

app_Web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

+/**
+ * MPickupViewpickupviewpanel 部件模型
+ *
+ * @export
+ * @class MPickupViewpickupviewpanelModel
+ */
+export default class MPickupViewpickupviewpanelModel {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof MPickupViewpickupviewpanelModel
+    */
+  public getDataItems(): any[] {
+    return [
+      {
+        name: 'sys_permission',
+        prop: 'permissionid',
+      },
+      {
+        name: 'permissionname',
+      },
+      {
+        name: 'pssystemid',
+      },
+      {
+        name: 'permissiontype',
+      },
+      {
+        name: 'enable',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
+      {
+        name: 'pssourcename',
+      },
+      {
+        name: 'pssourcetype',
+      },
+    ]
+  }
+
+
+}
\ No newline at end of file

app_Web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts

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

app_Web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.less

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

app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts

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