lab_qyk 部署微服务应用

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts

@@ -117,9 +117,9 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
+		deuiaction1: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN.ts

@@ -116,9 +116,9 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
+		deuiaction1: {
+			caption: '关闭',
+			tip: '关闭',
 		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-log/jobs-log_en_US.ts

@@ -71,70 +71,4 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: "Save",
-			tip: "Save",
-		},
-		tbitem4: {
-			caption: "Save And New",
-			tip: "Save And New",
-		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
-		},
-		tbitem6: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem7: {
-			caption: "Remove And Close",
-			tip: "Remove And Close Window",
-		},
-		tbitem8: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem12: {
-			caption: "New",
-			tip: "New",
-		},
-		tbitem13: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem14: {
-			caption: "Copy",
-			tip: "Copy {0}",
-		},
-		tbitem16: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem23: {
-			caption: "第一个记录",
-			tip: "第一个记录",
-		},
-		tbitem24: {
-			caption: "上一个记录",
-			tip: "上一个记录",
-		},
-		tbitem25: {
-			caption: "下一个记录",
-			tip: "下一个记录",
-		},
-		tbitem26: {
-			caption: "最后一个记录",
-			tip: "最后一个记录",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
-		tbitem22: {
-			caption: "Help",
-			tip: "Help",
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-log/jobs-log_zh_CN.ts

@@ -70,70 +70,4 @@ export default {
 		uiactions: {
 		},
 	},
-	editviewtoolbar_toolbar: {
-		tbitem3: {
-			caption: '保存',
-			tip: '保存',
-		},
-		tbitem4: {
-			caption: '保存并新建',
-			tip: '保存并新建',
-		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
-		},
-		tbitem6: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem7: {
-			caption: '删除并关闭',
-			tip: '删除并关闭',
-		},
-		tbitem8: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem12: {
-			caption: '新建',
-			tip: '新建',
-		},
-		tbitem13: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem14: {
-			caption: '拷贝',
-			tip: '拷贝',
-		},
-		tbitem16: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem23: {
-			caption: '第一个记录',
-			tip: '第一个记录',
-		},
-		tbitem24: {
-			caption: '上一个记录',
-			tip: '上一个记录',
-		},
-		tbitem25: {
-			caption: '下一个记录',
-			tip: '下一个记录',
-		},
-		tbitem26: {
-			caption: '最后一个记录',
-			tip: '最后一个记录',
-		},
-		tbitem21: {
-			caption: '-',
-			tip: '',
-		},
-		tbitem22: {
-			caption: '帮助',
-			tip: '帮助',
-		},
-	},
 };
\ No newline at end of file

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_en_US.ts

@@ -60,9 +60,9 @@ export default {
 			caption: "Save",
 			tip: "Save",
 		},
-		tbitem5: {
-			caption: "Save And Close",
-			tip: "Save And Close Window",
+		deuiaction1: {
+			caption: "关闭",
+			tip: "关闭",
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_zh_CN.ts

@@ -59,9 +59,9 @@ export default {
 			caption: '保存',
 			tip: '保存',
 		},
-		tbitem5: {
-			caption: '保存并关闭',
-			tip: '保存并关闭',
+		deuiaction1: {
+			caption: '关闭',
+			tip: '关闭',
 		},
 	},
 	gridviewtoolbar_toolbar: {

app_web/src/pages/task/jobs-info-edit-view/jobs-info-edit-view-base.vue

@@ -17,11 +17,11 @@
                 <div slot='content'>{{$t('entities.jobsinfo.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.jobsinfo.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                    <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i class='fa fa-sign-out'></i>
+                        <span class='caption'>{{$t('entities.jobsinfo.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
                     </i-button>
-                <div slot='content'>{{$t('entities.jobsinfo.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+                <div slot='content'>{{$t('entities.jobsinfo.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
             </tooltip>
         </div>
         
@@ -248,7 +248,7 @@ export default class JobsInfoEditViewBase 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: '' } },
+        deuiaction1: { name: 'deuiaction1', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
 
     };
 
@@ -505,8 +505,8 @@ export default class JobsInfoEditViewBase 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, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
         }
     }
 
@@ -584,7 +584,7 @@ export default class JobsInfoEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -601,7 +601,7 @@ export default class JobsInfoEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"JobsInfo");
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"JobsInfo");
     }
 
     /**
@@ -631,7 +631,7 @@ export default class JobsInfoEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
+     * 关闭
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文
@@ -641,29 +641,14 @@ export default class JobsInfoEditViewBase extends Vue {
      * @param {*} [actionContext]  执行行为上下文
      * @memberof JobsInfoEditViewBase
      */
-    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 }],'*');
-                }
-            });
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
         }
     }
 
+
     /**
      * 关闭视图
      *

app_web/src/pages/task/jobs-log-edit-view/jobs-log-edit-view.less

@@ -8,19 +8,5 @@
 .jobs-log-edit-view{
     position: relative;
 }
-        .toolbar-container {
-            button {
-                margin: 6px 0px 4px 4px;
-                .caption {
-                    margin-left: 4px;
-                }
-            }
-            .seperator {
-                color: #dcdee2;
-                margin: 0 0px 0 4px;
-            }
-        }
-        
-        // this is less
 
 

app_web/src/pages/task/jobs-registry-edit-view/jobs-registry-edit-view-base.vue

@@ -17,11 +17,11 @@
                 <div slot='content'>{{$t('entities.jobsregistry.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.jobsregistry.editviewtoolbar_toolbar.tbitem5.caption')}}</span>
+                    <i-button v-show="toolBarModels.deuiaction1.visabled" :disabled="toolBarModels.deuiaction1.disabled" class='' @click="toolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i class='fa fa-sign-out'></i>
+                        <span class='caption'>{{$t('entities.jobsregistry.editviewtoolbar_toolbar.deuiaction1.caption')}}</span>
                     </i-button>
-                <div slot='content'>{{$t('entities.jobsregistry.editviewtoolbar_toolbar.tbitem5.tip')}}</div>
+                <div slot='content'>{{$t('entities.jobsregistry.editviewtoolbar_toolbar.deuiaction1.tip')}}</div>
             </tooltip>
         </div>
         
@@ -248,7 +248,7 @@ export default class JobsRegistryEditViewBase 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: '' } },
+        deuiaction1: { name: 'deuiaction1', caption: '关闭', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Exit', target: '' } },
 
     };
 
@@ -505,8 +505,8 @@ export default class JobsRegistryEditViewBase 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, 'deuiaction1')) {
+            this.toolbar_deuiaction1_click(null, '', $event2);
         }
     }
 
@@ -584,7 +584,7 @@ export default class JobsRegistryEditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem5_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -601,7 +601,7 @@ export default class JobsRegistryEditViewBase extends Vue {
           datas = [params];
         }
         // 界面行为
-        this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"JobsRegistry");
+        this.Exit(datas, contextJO,paramJO,  $event, xData,this,"JobsRegistry");
     }
 
     /**
@@ -631,7 +631,7 @@ export default class JobsRegistryEditViewBase extends Vue {
     }
 
     /**
-     * 保存并关闭
+     * 关闭
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文
@@ -641,29 +641,14 @@ export default class JobsRegistryEditViewBase extends Vue {
      * @param {*} [actionContext]  执行行为上下文
      * @memberof JobsRegistryEditViewBase
      */
-    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 }],'*');
-                }
-            });
+    public Exit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        this.closeView(args);
+        if(window.parent){
+            window.parent.postMessage([{ ...args }],'*');
         }
     }
 
+
     /**
      * 关闭视图
      *

ibztask-core/src/main/resources/liquibase/h2_table.xml

@@ -76,7 +76,7 @@
 
 
     <!--输出实体[JOBS_LOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-jobs_log-44-4">
+    <changeSet author="a_A_5d9d78509" id="tab-jobs_log-46-4">
         <createTable tableName="JOBS_LOG">
                 <column name="ID" remarks="" type="BIGINT">
                     <constraints primaryKey="true" primaryKeyName="PK_JOBS_LOG_ID"/>