ibiz4j 部署微服务应用

app_Web/package.json

@@ -27,7 +27,7 @@
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "ibiz-gantt-elastic": "^1.0.17",
-    "ibiz-vue-lib": "^0.1.10",
+    "ibiz-vue-lib": "^0.1.13",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_Web/src/components/app-group-picker/app-group-picker.vue

@@ -20,13 +20,13 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 import { Http } from '../../utils';
 @Component({})
-export default class IBizGroupPicker extends Vue {
+export default class AppGroupPicker extends Vue {
 
     /**
      * 视图上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewdata: any;
 
@@ -34,7 +34,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewparam: any;
 
@@ -42,7 +42,7 @@ export default class IBizGroupPicker extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected multiple: boolean = false;
 
@@ -50,7 +50,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeurl:any;
 
@@ -58,7 +58,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载人员url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected url:any;
 
@@ -66,7 +66,7 @@ export default class IBizGroupPicker extends Vue {
      * 树数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeItems: any[] = [];
 
@@ -74,7 +74,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardItems: any[] = [];
 
@@ -82,7 +82,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图上下文参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewData: any;
 
@@ -90,7 +90,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewParam: any;
 
@@ -98,7 +98,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中值
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeSelectVal: string = '';
 
@@ -106,7 +106,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardSelctVal: any = [];
 
@@ -114,7 +114,7 @@ export default class IBizGroupPicker extends Vue {
      * 数据选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected selects: any[] = [];
 
@@ -122,7 +122,7 @@ export default class IBizGroupPicker extends Vue {
      * 是否显示树
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     get showTree() {
         if(this.viewParam) {
@@ -134,7 +134,7 @@ export default class IBizGroupPicker extends Vue {
      * 生命周期
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public created() {
         if(!this.viewdata || !this.viewparam) {
@@ -158,7 +158,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public load() {
         if(this.showTree) {
@@ -172,7 +172,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadTree() {
         let orgid = this.viewParam.filtervalue;
@@ -191,7 +191,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载分组表数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadGroupData(key: string) {
         let tempUrl = this.url.replace('${selected-orgid}',key);
@@ -209,7 +209,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public treeSelect(event: any) {
         if(!event || JSON.parse(event).length == 0) {
@@ -223,7 +223,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public groupSelect(event: any) {
         if (!event || !event.select) {
@@ -255,7 +255,7 @@ export default class IBizGroupPicker extends Vue {
      * 确认
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onOK() {
         this.$emit('close', this.selects);
@@ -265,7 +265,7 @@ export default class IBizGroupPicker extends Vue {
      * 取消
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onCancel() {
         this.$emit('close');

app_Web/src/components/app-group-select/app-group-select.vue

@@ -23,12 +23,12 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 
 @Component({})
-export default class IBizGroupSelect extends Vue {
+export default class AppGroupSelect extends Vue {
     /**
      * 名称标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() name!: string;
 
@@ -36,7 +36,7 @@ export default class IBizGroupSelect extends Vue {
      * 树加载地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() treeurl?:boolean;
 
@@ -44,7 +44,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据接口地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() url!: string;
 
@@ -52,7 +52,7 @@ export default class IBizGroupSelect extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop({default: false}) multiple?: boolean;
 
@@ -60,7 +60,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据对象
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() data: any;
 
@@ -68,7 +68,7 @@ export default class IBizGroupSelect extends Vue {
      * 过滤属性标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() filter?: string;
 
@@ -76,7 +76,7 @@ export default class IBizGroupSelect extends Vue {
      * 是否启用
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() disabled?: boolean;
 
@@ -84,7 +84,7 @@ export default class IBizGroupSelect extends Vue {
      * 值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() value: any;
 
@@ -92,7 +92,7 @@ export default class IBizGroupSelect extends Vue {
      * 上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() context: any;
 
@@ -100,7 +100,7 @@ export default class IBizGroupSelect extends Vue {
      * 关联属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() valueitem: any;
 
@@ -108,7 +108,7 @@ export default class IBizGroupSelect extends Vue {
      * 填充属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() fillmap: any;
 
@@ -116,7 +116,7 @@ export default class IBizGroupSelect extends Vue {
      * 选中项集合
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     protected selects: any[] = [];
 
@@ -124,7 +124,7 @@ export default class IBizGroupSelect extends Vue {
      * 值变化
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Watch('value')
     onValueChange(newVal: any) {
@@ -154,7 +154,7 @@ export default class IBizGroupSelect extends Vue {
      * 单选时选中名称
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     get selectName() {
         if(this.selects.length > 0) {
@@ -166,11 +166,11 @@ export default class IBizGroupSelect extends Vue {
      * 打开选择视图
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openView() {
         const view: any = {
-            viewname: 'ibiz-group-picker',
+            viewname: 'app-group-picker',
             title: '分组选择'
         };
         const context: any = JSON.parse(JSON.stringify(this.context));
@@ -208,7 +208,7 @@ export default class IBizGroupSelect extends Vue {
      * 选择视图关闭
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openViewClose(result: any) {
         this.selects = [];
@@ -222,7 +222,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据删除
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public remove(item: any) {
         this.selects.splice(this.selects.indexOf(item), 1);
@@ -233,7 +233,7 @@ export default class IBizGroupSelect extends Vue {
      * 设置值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public setValue() {
         let item: any = {};

app_Web/src/pages/ou/ibzteam-member-grid-view/ibzteam-member-grid-view-base.vue

@@ -1165,7 +1165,7 @@ export default class IBZTeamMemberGridViewBase extends Vue {
         batchAddPSAppViews=[
             {view:{viewname:'ibzemployee-mpickup-view',height: 0,width: 0,title: '人员数据多项选择视图'},
             res:['IBZEmployee'],
-            'resAppKey':''}
+            'resAppKey':'userid'}
         ];
         if(batchAddPSAppViews.length == 0 || !this.context.srfparentdename){
             this.$Notice.warning({ title: '错误', desc: '批量添加需添加N:N关系' });
@@ -1224,7 +1224,12 @@ export default class IBZTeamMemberGridViewBase extends Vue {
         if(args.length >0){
             Object.assign(tempContext,args[0]);
         }
-        const deResParameters: any[] = [];
+        let deResParameters: any[] = [];
+        if(tempContext.ibzemployee && true){
+            deResParameters = [
+            { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
+            ]
+        }
         const parameters: any[] = [
             { pathName: 'ibzteammembers', parameterName: 'ibzteammember' },
             { pathName: 'editview', parameterName: 'editview' },

app_Web/src/service/ibzteam/ibzteam-service-base.ts

@@ -75,6 +75,21 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let ibzteammembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
+            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
+            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
+                ibzteammembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.teammemberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
         if(!data.srffrontuf || data.srffrontuf !== "1"){
             data[this.APPDEKEY] = null;
@@ -84,6 +99,7 @@ export default class IBZTeamServiceBase extends EntityService {
         }
         let tempContext:any = JSON.parse(JSON.stringify(context));
         let res:any = await Http.getInstance().post(`/ibzteams`,data,isloading);
+        this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
         return res;
     }
 
@@ -98,8 +114,24 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let ibzteammembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
+            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
+            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
+                ibzteammembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.teammemberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().put(`/ibzteams/${context.ibzteam}`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
             return res;
     }
 
@@ -127,6 +159,7 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
             let res:any = await Http.getInstance().get(`/ibzteams/${context.ibzteam}`,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
             return res;
     }
 
@@ -141,8 +174,24 @@ export default class IBZTeamServiceBase extends EntityService {
      */
     public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let masterData:any = {};
+        let ibzteammembersData:any = [];
+        if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
+            ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
+            if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
+                ibzteammembersData.forEach((item:any) => {
+                    if(item.srffrontuf){
+                        if(Object.is(item.srffrontuf,"0")){
+                            item.teammemberid = null;
+                        }
+                        delete item.srffrontuf;
+                    }
+                });
+            }
+        }
+        masterData.ibzteammembers = ibzteammembersData;
         Object.assign(data,masterData);
             let res:any = await  Http.getInstance().post(`/ibzteams/${context.ibzteam}/save`,data,isloading);
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
             return res;
     }
 
@@ -158,6 +207,7 @@ export default class IBZTeamServiceBase extends EntityService {
     public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         let res:any = await  Http.getInstance().get(`/ibzteams/getdraft`,isloading);
         res.data.ibzteam = data.ibzteam;
+            this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
         return res;
     }
 

app_Web/src/widgets/ibzteam/main-form/main-form-base.vue

@@ -41,6 +41,7 @@
     paramItem='ibzteam' 
     :parentdata='{"srfparentdefname":"TEAMID","srfparentdename":"IBZTEAM","SRFPARENTTYPE":"DER1N","srfparentmode":"DER1N_IBZTEAMMEMBER_IBZTEAM_TEAMID","SRFDER1NID":"DER1N_IBZTEAMMEMBER_IBZTEAM_TEAMID"}'
     :parameters="[
+        { pathName: 'ibzemployees', parameterName: 'ibzemployee' },
     ]"
     :context="context"
     :viewparams="viewparams"