ibiz4j 发布系统代码

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

@@ -279,6 +279,14 @@
         "viewname": "IBZEmployeePickupView",
         "viewtag": "9ffa35efe3d70cf4b9fa4e83dd1979c6"
     },
+    "sysrolempickupview": {
+        "title": "角色数据多项选择视图",
+        "caption": "系统角色",
+        "viewtype": "DEMPICKUPVIEW",
+        "viewmodule": "uaa",
+        "viewname": "SysRoleMPickupView",
+        "viewtag": "a1f8d44a9d7be49687062c63434b0f3f"
+    },
     "wfgrouppickupview": {
         "title": "角色/用户组数据选择视图",
         "caption": "角色/用户组",

app_Web/src/locale/lanres/sys-role/sys-role_en_US.ts

@@ -24,6 +24,10 @@ export default {
 			caption: "Start workflow",
       title: 'Tables Information',
 		},
+		mpickupview: {
+			caption: "Start workflow",
+      title: 'Others',
+		},
 	},
 	main_form: {
 		details: {

app_Web/src/locale/lanres/sys-role/sys-role_zh_CN.ts

@@ -21,6 +21,10 @@ export default {
 		},
 		pickupgridview: {
 			caption: '系统角色',
+      title: '系统角色',
+		},
+		mpickupview: {
+			caption: '系统角色',
       title: '系统角色',
 		},
 	},

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -287,6 +287,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "IBZEmployeePickupView",
             "viewtag": "9ffa35efe3d70cf4b9fa4e83dd1979c6"
         },
+        "sysrolempickupview": {
+            "title": "角色数据多项选择视图",
+            "caption": "系统角色",
+            "viewtype": "DEMPICKUPVIEW",
+            "viewmodule": "uaa",
+            "viewname": "SysRoleMPickupView",
+            "viewtag": "a1f8d44a9d7be49687062c63434b0f3f"
+        },
         "wfgrouppickupview": {
             "title": "角色/用户组数据选择视图",
             "caption": "角色/用户组",

app_Web/src/pages/rt/index/page-register.ts

@@ -2,6 +2,7 @@ export const PageComponents = {
     install(Vue: any, opt: any) {
                 Vue.component('ibzorganization-grid-view', () => import('@pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.vue'));
         Vue.component('ibzemployee-mpickup-view', () => import('@pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view.vue'));
+        Vue.component('sys-role-mpickup-view', () => import('@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'));
         Vue.component('wfremodel-edit-view', () => import('@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue'));
         Vue.component('ibzemployee-pickup-view', () => import('@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'));
         Vue.component('sys-auth-log-grid-view', () => import('@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue'));

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

@@ -103,6 +103,19 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view.vue'),
                 },
+                {
+                    path: 'sysroles/:sysrole?/mpickupview/:mpickupview?',
+                    meta: {
+                        caption: 'entities.sysrole.views.mpickupview.caption',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'sysroles', parameterName: 'sysrole' },
+                            { pathName: 'mpickupview', parameterName: 'mpickupview' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'),
+                },
                 {
                     path: 'wfremodels/:wfremodel?/editview/:editview?',
                     meta: {
@@ -2091,6 +2104,18 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'),
     },
+    {
+        path: '/sysroles/:sysrole?/mpickupview/:mpickupview?',
+        meta: {
+            caption: 'entities.sysrole.views.mpickupview.caption',
+            parameters: [
+                { pathName: 'sysroles', parameterName: 'sysrole' },
+                { pathName: 'mpickupview', parameterName: 'mpickupview' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'),
+    },
     {
         path: '/wfgroups/:wfgroup?/editview/:editview?',
         meta: {

app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.less

+.sys-role-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/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import SysRoleMPickupViewBase from './sys-role-mpickup-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 SysRoleMPickupView extends SysRoleMPickupViewBase {
+
+}
+</script>
\ No newline at end of file

app_Web/src/pages/uaa/sys-user-role-grid-view/sys-user-role-grid-view-base.vue

@@ -1129,6 +1129,9 @@ export default class SysUserRoleGridViewBase extends Vue {
      */
     public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
         const batchAddPSAppViews=[
+            {view:{viewname:'sys-role-mpickup-view',height: 0,width: 0,title: '角色数据多项选择视图'},
+            res:['SysRole'],
+            'resAppKey':'roleid'},
             {view:{viewname:'sys-user-mpickup-view',height: 0,width: 0,title: '用户表数据多项选择视图'},
             res:['SysUser'],
             'resAppKey':'userid'}

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

@@ -174,6 +174,7 @@ export const viewstate: any = {
             viewdatachange: false,
             refviews: [
                 '1f8cf7e78d6d88588d1d568d1866cc77',
+                'a1f8d44a9d7be49687062c63434b0f3f',
                 'edde313015e1db7c366028307d88d20c',
             ],
         },
@@ -338,6 +339,16 @@ export const viewstate: any = {
                 'c84df2684f29705ac6c5dec67df9f217',
             ],
         },
+        {
+            viewtag: 'a1f8d44a9d7be49687062c63434b0f3f',
+            viewmodule: 'uaa',
+            viewname: 'SysRoleMPickupView',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+                '7c25865f5864a734477c7cb987632f4f',
+            ],
+        },
         {
             viewtag: 'b23a721ca159ac2490b768d795e85d17',
             viewmodule: 'workflow',

app_Web/src/uiservice/sys-role/sys-role-ui-service-base.ts

@@ -83,6 +83,7 @@ export default class SysRoleUIServiceBase extends UIService {
         this.allViewMap.set('PICKUPVIEW:',{viewname:'pickupview',srfappde:'sysroles'});
         this.allViewMap.set('EDITVIEW:',{viewname:'editview',srfappde:'sysroles'});
         this.allViewMap.set(':',{viewname:'pickupgridview',srfappde:'sysroles'});
+        this.allViewMap.set('MPICKUPVIEW:',{viewname:'mpickupview',srfappde:'sysroles'});
     }
 
     /**

app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue

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

app_Web/src/widgets/sys-role/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: 'sysrole',
+        prop: 'roleid',
+      },
+      {
+        name: 'rolename',
+      },
+      {
+        name: 'memo',
+      },
+      {
+        name: 'createdate',
+      },
+      {
+        name: 'updatedate',
+      },
+    ]
+  }
+
+
+}
\ 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

app_Web/src/widgets/sys-role/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.vue

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

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzrt/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzrt/
-      mvn clean package -Pweb
-      cd ibzrt-app/ibzrt-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
 
-EXPOSE 30000
+EXPOSE 8080
 
 ADD ibzrt-app-web.jar /ibzrt-app-web.jar

ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml

@@ -3,21 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       mode: replicated
       replicas: 1