lab_gzf 部署微服务应用

app_AssetManagement/public/assets/json/view-config.json

 {
     "eamlocationstateeditview": {
-        "title": "功能位置状态编辑视图",
+        "title": "功能位置状态信息",
         "caption": "功能位置状态",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "Location",

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model-line/eamlocation-state-model-line_en_US.ts

@@ -63,10 +63,18 @@ export default {
 			caption: "New",
 			tip: "New",
 		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
 		tbitem2: {
 			caption: "Edit",
 			tip: "Edit {0}",
 		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
 		tbitem1: {
 			caption: "Copy",
 			tip: "Copy {0}",
@@ -91,30 +99,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem20: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem24: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem25: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem10: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem4: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem2: {

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model-line/eamlocation-state-model-line_zh_CN.ts

@@ -62,10 +62,18 @@ export default {
 			caption: "新建",
 			tip: "新建",
 		},
+		seperator1: {
+			caption: "",
+			tip: "",
+		},
 		tbitem2: {
 			caption: "编辑",
 			tip: "编辑",
 		},
+		seperator2: {
+			caption: "",
+			tip: "",
+		},
 		tbitem1: {
 			caption: "拷贝",
 			tip: "拷贝",
@@ -90,30 +98,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem20: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem24: {
-			caption: "导出数据模型",
-			tip: "导出数据模型",
-		},
-		tbitem25: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem21: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem10: {
 			caption: "过滤",
 			tip: "过滤",
 		},
-		tbitem4: {
-			caption: "帮助",
-			tip: "帮助",
-		},
 	},
 	editviewtoolbar_toolbar: {
 		tbitem2: {

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_en_US.ts

@@ -62,11 +62,23 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem2: {
+		tbitem10: {
+			caption: "Save",
+			tip: "Save",
+		},
+		tbitem18: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem11: {
 			caption: "Save And Close",
 			tip: "Save And Close Window",
 		},
-		tbitem1: {
+		tbitem19: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_AssetManagement/src/locale/lanres/entities/eamlocation-state-model/eamlocation-state-model_zh_CN.ts

@@ -61,11 +61,23 @@ export default {
 		},
 	},
 	editviewtoolbar_toolbar: {
-		tbitem2: {
+		tbitem10: {
+			caption: "保存",
+			tip: "保存",
+		},
+		tbitem18: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem11: {
 			caption: "保存并关闭",
 			tip: "保存并关闭",
 		},
-		tbitem1: {
+		tbitem19: {
+			caption: "-",
+			tip: "",
+		},
+		tbitem8: {
 			caption: "关闭",
 			tip: "关闭",
 		},

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_en_US.ts

@@ -13,7 +13,7 @@ export default {
 	views: {
 		editview: {
 			caption: "功能位置状态",
-      		title: "功能位置状态编辑视图",
+      		title: "功能位置状态信息",
 		},
 		pickupview: {
 			caption: "功能位置状态",
@@ -51,6 +51,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			eamlocationstateid: "功能位置状态标识",
 			eamlocationstatename: "功能位置状态名称",
 			available: "是否有效",
 			setup: "是否创建资产",

app_AssetManagement/src/locale/lanres/entities/eamlocation-state/eamlocation-state_zh_CN.ts

@@ -12,7 +12,7 @@ export default {
 	views: {
 		editview: {
 			caption: "功能位置状态",
-      		title: "功能位置状态编辑视图",
+      		title: "功能位置状态信息",
 		},
 		pickupview: {
 			caption: "功能位置状态",
@@ -50,6 +50,7 @@ export default {
 	},
 	main_grid: {
 		columns: {
+			eamlocationstateid: "功能位置状态标识",
 			eamlocationstatename: "功能位置状态名称",
 			available: "是否有效",
 			setup: "是否创建资产",

app_AssetManagement/src/mock/viewconfig/viewconfig.ts

@@ -8,7 +8,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status,{
                 "eamlocationstateeditview": {
-            "title": "功能位置状态编辑视图",
+            "title": "功能位置状态信息",
             "caption": "功能位置状态",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "Location",

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view-base.tsx

@@ -6,7 +6,7 @@ import EditViewEngine from '@engine/view/edit-view-engine';
 import EAMLocationStateUIService from '@/uiservice/eamlocation-state/eamlocation-state-ui-service';
 
 /**
- * 功能位置状态编辑视图视图基类
+ * 功能位置状态信息视图基类
  *
  * @export
  * @class EAMLocationStateEditViewBase

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.html

-<studio-view-style2 viewName="eamlocationstateeditview" viewTitle="功能位置状态编辑视图" class='deeditview eamlocation-state-edit-view'>
+<studio-view-style2 viewName="eamlocationstateeditview" viewTitle="功能位置状态信息" class='deeditview eamlocation-state-edit-view'>
     <template slot='title'>
     <span class='caption-info'>{{$t(model.srfTitle)}}</span>
     </template>

app_AssetManagement/src/pages/location/eamlocation-state-edit-view/eamlocation-state-edit-view.vue

@@ -6,7 +6,7 @@ import { EAMLocationStateEditViewBase } from './eamlocation-state-edit-view-base
 import view_form from '@widgets/eamlocation-state/main-form/main-form.vue';
 
 /**
- * 功能位置状态编辑视图视图
+ * 功能位置状态信息视图
  *
  * @export
  * @class EAMLocationStateEditView

app_AssetManagement/src/pages/location/eamlocation-state-model-edit-view/eamlocation-state-model-edit-view-base.tsx

@@ -99,9 +99,13 @@ export class EAMLocationStateModelEditViewBase extends EditViewBase {
      * @memberof EAMLocationStateModelEditView
      */
     public toolBarModels: any = {
-        tbitem2: { name: 'tbitem2', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+        tbitem10: { name: 'tbitem10', caption: '保存', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存', iconcls: 'fa fa-save', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Save', target: '', class: '' } },
 
-        tbitem1: { name: 'tbitem1', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
+        tbitem18: {  name: 'tbitem18', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem11: { name: 'tbitem11', caption: '保存并关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '保存并关闭', iconcls: 'sx-tb-saveandclose', icon: '../sasrfex/images/default/icon_saveandclose.png', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '', class: '' } },
+
+        tbitem19: {  name: 'tbitem19', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
+        tbitem8: { name: 'tbitem8', caption: '关闭', 'isShowCaption': true, 'isShowIcon': true, tooltip: '关闭', iconcls: 'fa fa-sign-out', icon: '', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Exit', target: '', class: '' } },
 
     };
 
@@ -151,11 +155,14 @@ export class EAMLocationStateModelEditViewBase extends EditViewBase {
      * @memberof EAMLocationStateModelEditViewBase
      */
     public toolbar_click($event: any, $event2?: any): void {
-        if (Object.is($event.tag, 'tbitem2')) {
-            this.toolbar_tbitem2_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem10')) {
+            this.toolbar_tbitem10_click(null, '', $event2);
+        }
+        if (Object.is($event.tag, 'tbitem11')) {
+            this.toolbar_tbitem11_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem1')) {
-            this.toolbar_tbitem1_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem8')) {
+            this.toolbar_tbitem8_click(null, '', $event2);
         }
     }
 
@@ -200,7 +207,35 @@ export class EAMLocationStateModelEditViewBase extends EditViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem2_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem10_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.Save(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationStateModel");
+    }
+
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem11_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -228,7 +263,7 @@ export class EAMLocationStateModelEditViewBase extends EditViewBase {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem8_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -248,6 +283,32 @@ export class EAMLocationStateModelEditViewBase extends EditViewBase {
         this.Exit(datas, contextJO,paramJO,  $event, xData,this,"EAMLocationStateModel");
     }
 
+    /**
+     * 保存
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof EAMLocationStateModelEditViewBase
+     */
+    public Save(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        // 界面行为容器对象 _this
+        const _this: any = this;
+        if (xData && xData.save instanceof Function) {
+            xData.save().then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                _this.$emit('viewdataschange', [{ ...response.data }]);
+            });
+        } else if (_this.save && _this.save instanceof Function) {
+            _this.save();
+        }
+    }
+
     /**
      * 保存并关闭
      *

app_AssetManagement/src/pages/location/eamlocation-state-model-line-grid-view/eamlocation-state-model-line-grid-view.html

 <studio-view-style2 viewName="eamlocationstatemodellinegridview" viewTitle="功能位置状态模型明细表格视图" class='degridview eamlocation-state-model-line-grid-view'>
-    <template slot='title'>
-    <span class='caption-info'>{{$t(model.srfTitle)}}</span>
-    </template>
     <i-input slot="quickSearch" v-show="!isExpandSearchForm" v-model="query" placeholder="功能位置状态模型明细名称" search @on-search="onSearch($event)"/>
     <template slot="toolbar">
                 <view-toolbar mode="STYLE2" :model="toolBarModels" @item-click="toolbar_click($event)"/>    </template>

app_AssetManagement/src/widgets/eamlocation-state/main-grid/main-grid-base.tsx

@@ -83,6 +83,14 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainGridBase
      */
     public allColumns: any[] = [
+        {
+            name: 'eamlocationstateid',
+            label: '功能位置状态标识',
+            langtag: 'entities.eamlocationstate.main_grid.columns.eamlocationstateid',
+            show: true,
+            util: 'PX',
+            isEnableRowEdit: false,
+        },
         {
             name: 'eamlocationstatename',
             label: '功能位置状态名称',
@@ -141,6 +149,7 @@ export class MainGridBase extends GridControlBase {
      * @memberof MainBase
      */
     public hasRowEdit: any = {
+        'eamlocationstateid':false,
         'eamlocationstatename':false,
         'available':false,
         'setup':false,

app_AssetManagement/src/widgets/eamlocation-state/main-grid/main-grid-model.ts

@@ -31,6 +31,11 @@ export default class MainModel {
           prop: 'eamlocationstatename',
           dataType: 'TEXT',
         },
+        {
+          name: 'eamlocationstateid',
+          prop: 'eamlocationstateid',
+          dataType: 'GUID',
+        },
         {
           name: 'setup',
           prop: 'setup',

app_AssetManagement/src/widgets/eamlocation-state/main-grid/main-grid.html

@@ -23,6 +23,18 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
+            <template v-if="getColumnState('eamlocationstateid')">
+                <el-table-column show-overflow-tooltip :prop="'eamlocationstateid'" :label="$t('entities.eamlocationstate.main_grid.columns.eamlocationstateid')" :width="180"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.eamlocationstate.main_grid.columns.eamlocationstateid')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.eamlocationstateid}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="getColumnState('eamlocationstatename')">
                 <el-table-column show-overflow-tooltip :prop="'eamlocationstatename'" :label="$t('entities.eamlocationstate.main_grid.columns.eamlocationstatename')" :width="180"  :align="'left'" :sortable="'custom'">
                     <template v-slot:header="{column}">

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

@@ -254,7 +254,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-29-12">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstate-31-12">
         <createTable tableName="EAMLOCATIONSTATE">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -278,7 +278,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATEMODEL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-18-13">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodel-19-13">
         <createTable tableName="EAMLOCATIONSTATEMODEL">
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -298,7 +298,7 @@
 
 
     <!--输出实体[EAMLOCATIONSTATEMODELLINE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-18-14">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationstatemodelline-21-14">
         <createTable tableName="EAMLOCATIONSTATEMODELLINE">
                 <column name="UPDATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -322,7 +322,7 @@
 
 
     <!--输出实体[EAMLOCATIONTYPE]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationtype-17-15">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamlocationtype-20-15">
         <createTable tableName="EAMLOCATIONTYPE">
                 <column name="EAMLOCATIONTYPENAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -603,11 +603,11 @@
         <!--输出实体[EAMLOCATIONSTATE]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODEL]外键关系 -->
         <!--输出实体[EAMLOCATIONSTATEMODELLINE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-18-40">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationstatemodelline-21-40">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONSTATEMODELLINE" constraintName="DER1N_EAMLOCATIONSTATEMODELLIN" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMLOCATIONTYPE]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-17-42">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-eamlocationtype-20-42">
        <addForeignKeyConstraint baseColumnNames="EAMLOCATIONSTATEMODELID" baseTableName="EAMLOCATIONTYPE" constraintName="DER1N_EAMLOCATIONTYPE_EAMLOCAT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EAMLOCATIONSTATEMODELID" referencedTableName="EAMLOCATIONSTATEMODEL" validate="true"/>
     </changeSet>
         <!--输出实体[EAMPLAN]外键关系 -->