laizhilong 发布系统代码

app_web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts

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

app_web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts

@@ -91,6 +91,10 @@ export default {
 			caption: "保存",
 			tip: "保存",
 		},
+		tbitem5: {
+			caption: "保存并关闭",
+			tip: "保存并关闭",
+		},
 		tbitem6: {
 			caption: "-",
 			tip: "",

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

@@ -13,6 +13,13 @@
                 </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.tbitem12.visabled" :disabled="toolBarModels.tbitem12.disabled" class='' @click="toolbar_click({ tag: 'tbitem12' }, $event)">
                     <i class='fa fa-file-text-o'></i>
@@ -264,6 +271,8 @@ export default class SysRoleEditViewBase extends Vue {
     public toolBarModels: any = {
         tbitem3: { name: 'tbitem3', caption: '保存', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '' } },
 
+        tbitem5: { name: 'tbitem5', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
+
         tbitem6: {  name: 'tbitem6', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem12: { name: 'tbitem12', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
@@ -576,6 +585,9 @@ 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, 'tbitem9')) {
             this.toolbar_tbitem9_click(null, '', $event2);
         }
@@ -659,6 +671,34 @@ 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");
+    }
+
     /**
      * 逻辑事件
      *
@@ -825,6 +865,39 @@ 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 }],'*');
+                }
+            });
+        }
+    }
     /**
      * 开始流程
      *