ibiz4j 发布系统代码

app_Web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -139,10 +139,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -138,17 +138,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts

@@ -105,10 +105,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts

@@ -104,17 +104,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts

@@ -194,10 +194,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts

@@ -193,17 +193,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts

@@ -118,10 +118,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts

@@ -117,17 +117,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

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

@@ -136,10 +136,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

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

@@ -135,17 +135,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

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

@@ -119,10 +119,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

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

@@ -118,17 +118,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/wfgroup/wfgroup_en_US.ts

@@ -68,10 +68,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/wfgroup/wfgroup_zh_CN.ts

@@ -67,17 +67,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/wfmember/wfmember_en_US.ts

@@ -116,10 +116,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/wfmember/wfmember_zh_CN.ts

@@ -115,17 +115,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/locale/lanres/wfprocess-definition/wfprocess-definition_en_US.ts

@@ -68,10 +68,6 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

app_Web/src/locale/lanres/wfprocess-definition/wfprocess-definition_zh_CN.ts

@@ -67,17 +67,13 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
 		tbitem6: {
 			caption: '-',
 			tip: '',
 		},
 		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
+			caption: '删除',
+			tip: '删除',
 		},
 		tbitem8: {
 			caption: '-',

app_Web/src/pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.ibzdepartment.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class IBZDepartmentEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class IBZDepartmentEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class IBZDepartmentEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"IBZDepartment");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"IBZDepartment");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class IBZDepartmentEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZDepartmentEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.ibzdeptmember.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class IBZDeptMemberEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class IBZDeptMemberEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class IBZDeptMemberEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"IBZDeptMember");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"IBZDeptMember");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class IBZDeptMemberEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZDeptMemberEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.ibzemployee.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class IBZEmployeeEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class IBZEmployeeEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class IBZEmployeeEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"IBZEmployee");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"IBZEmployee");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class IBZEmployeeEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZEmployeeEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/ou/ibzorganization-edit-view/ibzorganization-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.ibzorganization.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class IBZOrganizationEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class IBZOrganizationEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class IBZOrganizationEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"IBZOrganization");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"IBZOrganization");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class IBZOrganizationEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBZOrganizationEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

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

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.sysrole.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.sysrole.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.sysrole.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class SysRoleEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class SysRoleEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class SysRoleEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SysRole");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SysRole");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class SysRoleEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof SysRoleEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

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

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.sysuserrole.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.sysuserrole.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.sysuserrole.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class SysUserRoleEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class SysUserRoleEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class SysUserRoleEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"SysUserRole");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"SysUserRole");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class SysUserRoleEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof SysUserRoleEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.wfgroup.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.wfgroup.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.wfgroup.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class WFGroupEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class WFGroupEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class WFGroupEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFGroup");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class WFGroupEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof WFGroupEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.wfmember.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.wfmember.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.wfmember.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class WFMemberEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class WFMemberEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class WFMemberEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFMember");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class WFMemberEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof WFMemberEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue

@@ -16,13 +16,6 @@
                     </i-button>
                 <div slot='content'>{{$t('entities.wfprocessdefinition.editviewtoolbar_toolbar.tbitem3.tip')}}</div>
             </tooltip>
-            <tooltip :transfer="true" :max-width="600">
-                    <i-button v-show="toolBarModels.tbitem5.visabled" :disabled="toolBarModels.tbitem5.disabled" class='' @click="toolbar_click({ tag: 'tbitem5' }, $event)">
-                        <i class='sx-tb-saveandclose'></i>
-                        <span class='caption'>{{$t('entities.wfprocessdefinition.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
-                    </i-button>
-                <div slot='content'>{{$t('entities.wfprocessdefinition.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
-            </tooltip>
             <span class='seperator'>|</span>    <tooltip :transfer="true" :max-width="600">
                     <i-button v-show="toolBarModels.tbitem7.visabled" :disabled="toolBarModels.tbitem7.disabled" class='' @click="toolbar_click({ tag: 'tbitem7' }, $event)">
                         <i class='fa fa-remove'></i>
@@ -273,10 +266,8 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
-        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
-
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem7: { name: 'tbitem7', caption: '删除并关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
+        tbitem7: { name: 'tbitem7', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'RemoveAndExit', target: 'SINGLEKEY' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'New', target: '' } },
@@ -518,9 +509,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem5')) {
-            this.toolbar_tbitem5_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem7')) {
             this.toolbar_tbitem7_click(null, '', $event2);
         }
@@ -608,35 +596,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
         this.Save(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
     }
 
-    /**
-     * 逻辑事件
-     *
-     * @param {*} [params={}]
-     * @param {*} [tag]
-     * @param {*} [$event]
-     * @memberof 
-     */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
-        // 参数
-        // 取数
-        let datas: any[] = [];
-        let xData: any = null;
-        // _this 指向容器对象
-        const _this: any = this;
-        let paramJO:any = {};
-        
-        let contextJO:any = {};
-        xData = this.$refs.form;
-        if (xData.getDatas && xData.getDatas instanceof Function) {
-            datas = [...xData.getDatas()];
-        }
-        if(params){
-          datas = [params];
-        }
-        // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"WFProcessDefinition");
-    }
-
     /**
      * 逻辑事件
      *
@@ -838,40 +797,7 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
-     *
-     * @param {any[]} args 当前数据
-     * @param {any} contextJO 行为附加上下文
-     * @param {*} [params] 附加参数
-     * @param {*} [$event] 事件源
-     * @param {*} [xData]  执行行为所需当前部件
-     * @param {*} [actionContext]  执行行为上下文
-     * @memberof WFProcessDefinitionEditViewBase
-     */
-    public SaveAndExit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
-        if (xData && xData.saveAndExit instanceof Function) {
-            xData.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        } else if (_this.saveAndExit && _this.saveAndExit instanceof Function) {
-            _this.saveAndExit().then((response: any) => {
-                if (!response || response.status !== 200) {
-                    return;
-                }
-                if(window.parent){
-                    window.parent.postMessage([{ ...response.data }],'*');
-                }
-            });
-        }
-    }
-    /**
-     * 删除并关闭
+     * 删除
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文