ibiz4j 发布系统代码

app_web/src/components/app-picker-select-view/app-picker-select-view.vue

@@ -316,7 +316,14 @@ export default class AppPickerSelectView extends Vue {
             this.keySet = [];
             this.selectItems = [];
             if (newVal) {
-                this.selectItems = JSON.parse(newVal);
+                if (!this.data || !this.valueitem || !this.data[this.valueitem]) {
+                    this.$Notice.error({ title: (this.$t('components.appPickerSelectView.error') as any), desc: (this.$t('components.appPickerSelectView.editor') as any)+this.name+(this.$t('components.appPickerSelectView.valueitemException') as any) });
+                }else{
+                    let tempvalue: Array<any> = this.data[this.valueitem].split(',');
+                    let temptext: Array<any> = newVal.split(',');
+                    tempvalue.forEach((srfkey: any, index: number)=>{
+                        this.selectItems.push({ srfmajortext : temptext[index], srfkey: srfkey });
+                    });
                     this.selectItems.forEach((item: any) => {
                         this.keySet.push(item.srfkey);
                         let index = this.items.findIndex((i) => Object.is(i.srfkey, item.srfkey));
@@ -325,6 +332,7 @@ export default class AppPickerSelectView extends Vue {
                         }
                     });
                 }
+            }
             let _viewparam = JSON.parse(this.viewparam);
             _viewparam.selectedData = this.selectItems;
             this.viewparam = JSON.stringify(_viewparam);
@@ -376,23 +384,31 @@ export default class AppPickerSelectView extends Vue {
                 this.$emit('formitemvaluechange', { name: this.valueitem, value: tempvalue });
             }
             if (this.name) {
-                let tempvalue = $event[0][this.deMajorField] ? $event[0][this.deMajorField] : $event[0].srfmajortext;
-                this.$emit('formitemvaluechange', { name: this.name, value: tempvalue });
+                let temptext = $event[0][this.deMajorField] ? $event[0][this.deMajorField] : $event[0].srfmajortext;
+                this.$emit('formitemvaluechange', { name: this.name, value: temptext });
             }
         }else{
-            let selects: Array<any> = [];
+            let tempvalue: string = '';
+            let temptext: string = '';
             if ($event && Array.isArray($event)) {
                 $event.forEach((select: any) => {
-                    selects.push({ srfkey: select.srfkey, srfmajortext: select.srfmajortext });
-                    let index = this.items.findIndex((item) => Object.is(item.srfkey, select.srfkey));
+                    let srfkey = select[this.deKeyField] ? select[this.deKeyField] : select.srfkey;
+                    tempvalue += srfkey+",";
+                    let srfmajortext = select[this.deMajorField] ? select[this.deMajorField] : select.srfmajortext;
+                    temptext += srfmajortext+","; 
+                    let index = this.items.findIndex((item) => Object.is(item.srfkey, srfkey));
                     if (index < 0) {
-                        this.items.push({ srfmajortext : select.srfmajortext, srfkey: select.srfkey });
+                        this.items.push({ srfmajortext : srfmajortext, srfkey: srfkey });
                     }
                 });
             }
+            tempvalue = tempvalue.substring(0,tempvalue.length-1);
+            temptext = temptext.substring(0,temptext.length-1);
+            if(this.valueitem){
+                this.$emit('formitemvaluechange',{ name: this.valueitem, value: tempvalue });
+            }
             if (this.name) {
-                let value = selects.length > 0 ? JSON.stringify(selects) : '';
-                this.$emit('formitemvaluechange', { name: this.name, value: value });
+                this.$emit('formitemvaluechange', { name: this.name, value: temptext });
             }
         }
     }
@@ -553,8 +569,18 @@ export default class AppPickerSelectView extends Vue {
                 }
             });
         }
-        let value = val.length > 0 ? JSON.stringify(val) : '';
-        this.$emit('formitemvaluechange', { name: this.name, value: value });
+        let tempvalue: string = '';
+        let temptext: string = '';
+        val.forEach((select: any)=>{
+            let srfkey = select[this.deKeyField] ? select[this.deKeyField] : select.srfkey;
+            tempvalue += srfkey+",";
+            let srfmajortext = select[this.deMajorField] ? select[this.deMajorField] : select.srfmajortext;
+            temptext += srfmajortext+","; 
+        });
+        tempvalue = tempvalue.substring(0,tempvalue.length-1);
+        temptext = temptext.substring(0,temptext.length-1);
+        this.$emit('formitemvaluechange',{ name: this.valueitem, value: tempvalue });
+        this.$emit('formitemvaluechange', { name: this.name, value: temptext });
     }
 
 }

app_web/src/locale/lanres/entities/wfprocess-definition/wfprocess-definition_en_US.ts

@@ -41,6 +41,8 @@ export default {
 			modelenable: "模型是否启用", 
 			bpmnfile: "BPMN", 
 			md5check: "校验", 
+			webserviceids: "WebServiceIds", 
+			mobileserviceids: "MobileServiceIds", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/entities/wfprocess-definition/wfprocess-definition_zh_CN.ts

@@ -40,6 +40,8 @@ export default {
 			modelenable: "模型是否启用", 
 			bpmnfile: "BPMN", 
 			md5check: "校验", 
+			webserviceids: "WebServiceIds", 
+			mobileserviceids: "MobileServiceIds", 
 		},
 		uiactions: {
 		},

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue

@@ -119,6 +119,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue

@@ -119,6 +119,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view-base.vue

@@ -119,6 +119,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view-base.vue

@@ -98,6 +98,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view-base.vue

@@ -119,6 +119,7 @@
                 :showBusyIndicator="true"
                 :isOpenEdit="false"
                 :gridRowActiveMode="gridRowActiveMode"
+                :isformDruipart="isformDruipart"
                 @save="onSave"
                 updateAction=""
                 removeAction="Remove"

app_web/src/styles/default.less

@@ -120,7 +120,7 @@
         > .ivu-card-body {
             // height: 50%;
             // flex-grow: 1;
-            height: calc(100% - 62px);
+            height: calc(100% - 74px);
             padding: 0px;
             > .content-container {
                 height: 100%;

app_web/src/widgets/wfgroup/default-searchform/default-searchform-base.vue

@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

app_web/src/widgets/wfgroup/main-grid/main-grid-base.vue

@@ -309,6 +309,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     @Prop() public opendata: any;
     
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
     /**
      * 显示处理提示
      *
@@ -1477,7 +1485,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/wfmember/default-searchform/default-searchform-base.vue

@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

app_web/src/widgets/wfmember/main-grid/main-grid-base.vue

@@ -321,6 +321,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     @Prop() public opendata: any;
     
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
     /**
      * 显示处理提示
      *
@@ -1497,7 +1505,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/wfprocess-definition/default-searchform/default-searchform-base.vue

@@ -399,11 +399,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -411,15 +412,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -442,6 +447,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -658,7 +670,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -702,7 +713,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -103,6 +103,34 @@
 
 </app-form-item>
 
+</i-col>
+<i-col v-show="detailsModel.webserviceids.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='webserviceids' :itemRules="this.rules().webserviceids" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.webserviceids')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.webserviceids.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.webserviceids"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.webserviceids.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
+</i-col>
+<i-col v-show="detailsModel.mobileserviceids.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+    <app-form-item name='mobileserviceids' :itemRules="this.rules().mobileserviceids" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.mobileserviceids')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobileserviceids.error" :isEmptyCaption="false" labelPos="LEFT">
+    <input-box 
+    v-model="data.mobileserviceids"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.mobileserviceids.disabled" 
+    type='text' 
+    style="">
+</input-box>
+
+</app-form-item>
+
 </i-col>
     
     </row>
@@ -455,6 +483,8 @@ export default class MainBase extends Vue implements ControlInterface {
         modelenable: null,
         bpmnfile: null,
         md5check: null,
+        webserviceids: null,
+        mobileserviceids: null,
         wfprocessdefinition:null,
     };
 
@@ -588,6 +618,18 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '校验 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '校验 值不能为空', trigger: 'blur' },
         ],
+        webserviceids: [
+            { type: 'string', message: 'WebServiceIds 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: 'WebServiceIds 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: 'WebServiceIds 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: 'WebServiceIds 值不能为空', trigger: 'blur' },
+        ],
+        mobileserviceids: [
+            { type: 'string', message: 'MobileServiceIds 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: 'MobileServiceIds 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: 'MobileServiceIds 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: 'MobileServiceIds 值不能为空', trigger: 'blur' },
+        ],
         }
     }
 
@@ -709,6 +751,10 @@ export default class MainBase extends Vue implements ControlInterface {
         bpmnfile: new FormItemModel({ caption: 'BPMN', detailType: 'FORMITEM', name: 'bpmnfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
         md5check: new FormItemModel({ caption: '校验', detailType: 'FORMITEM', name: 'md5check', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
+, 
+        webserviceids: new FormItemModel({ caption: 'WebServiceIds', detailType: 'FORMITEM', name: 'webserviceids', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
+, 
+        mobileserviceids: new FormItemModel({ caption: 'MobileServiceIds', detailType: 'FORMITEM', name: 'mobileserviceids', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
 , 
     };
 
@@ -892,6 +938,30 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'md5check', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 webserviceids 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.webserviceids')
+    onWebserviceidsChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'webserviceids', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 mobileserviceids 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.mobileserviceids')
+    onMobileserviceidsChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'mobileserviceids', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 显示更多模式切换操作
@@ -963,6 +1033,8 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
     }
 
     /**

app_web/src/widgets/wfprocess-definition/main-form/main-form-model.ts

@@ -90,6 +90,16 @@ export default class MainModel {
         prop: 'md5check',
         dataType: 'TEXT',
       },
+      {
+        name: 'webserviceids',
+        prop: 'webserviceids',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'mobileserviceids',
+        prop: 'mobileserviceids',
+        dataType: 'TEXT',
+      },
       {
         name: 'wfprocessdefinition',
         prop: 'definitionkey',

app_web/src/widgets/wfprocess-definition/main-grid/main-grid-base.vue

@@ -335,6 +335,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     @Prop() public opendata: any;
     
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
     /**
      * 显示处理提示
      *
@@ -1527,7 +1535,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/wftask/default-searchform/default-searchform-base.vue

@@ -477,11 +477,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -489,15 +490,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -520,6 +525,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -736,7 +748,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -780,7 +791,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

app_web/src/widgets/wftask/main-grid/main-grid-base.vue

@@ -386,6 +386,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     @Prop() public opendata: any;
     
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
     /**
      * 显示处理提示
      *
@@ -1610,7 +1618,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

app_web/src/widgets/wfuser/default-searchform/default-searchform-base.vue

@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      *
      * @public
      * @param {*} [data={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public onFormLoad(data: any = {}): void {
+    public onFormLoad(data: any = {},action:string): void {
         this.setFormEnableCond(data);
-        this.fillForm(data);
+        this.fillForm(data,action);
         this.formLogic({ name: '', newVal: null, oldVal: null });
     }
 
@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * 值填充
      *
      * @param {*} [_datas={}]
+     * @param {string} [action]
      * @memberof DefaultBase
      */
-    public fillForm(_datas: any = {}): void {
+    public fillForm(_datas: any = {},action:string): void {
         this.ignorefieldvaluechange = true;
         Object.keys(_datas).forEach((name: string) => {
             if (this.data.hasOwnProperty(name)) {
                 this.data[name] = _datas[name];
             }
         });
+        if(Object.is(action,'loadDraft')){
+            this.createDefault();
+        }
         this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
         })
@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
         });
     }
 
+    /**
+     * 新建默认值
+     * @memberof DefaultBase
+     */
+    public createDefault(){                    
+    }
+
     /**
      * 重置草稿表单状态
      *
@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
         get.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                this.onFormLoad(data);
                 this.$emit('load', data);
                 this.$nextTick(() => {
                     this.formState.next({ type: 'load', data: data });
@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
             const data = response.data;
             this.resetDraftFormStates();
-            this.onFormLoad(data);
+            this.onFormLoad(data,'loadDraft');
             setTimeout(() => {
                 const form: any = this.$refs.form;
                 if (form) {

app_web/src/widgets/wfuser/main-grid/main-grid-base.vue

@@ -333,6 +333,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     @Prop() public opendata: any;
     
+    /**
+    * 是否嵌入关系界面
+    *
+    * @type {boolean}
+    * @memberof MainBase
+    */
+    @Prop({default:false}) public isformDruipart?: boolean;
+
     /**
      * 显示处理提示
      *
@@ -1517,7 +1525,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         this.$emit('save', successItems);
         this.refresh([]);
-        if(errorItems.length === 0){
+        if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
           errorItems.forEach((item:any,index:number)=>{

config.xml

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

ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
 
-EXPOSE 40003
+EXPOSE 8081
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,22 +3,9 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "40003:40003"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40003
-      - 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&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: