lab_gzf 部署微服务应用

app_AssetManagement/src/locale/lanres/entities/eamspare-parts-group/eamspare-parts-group_en_US.ts

@@ -43,8 +43,6 @@ export default {
 		details: {
 			group1: "备件包基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "备件包标识", 

app_AssetManagement/src/locale/lanres/entities/eamspare-parts-group/eamspare-parts-group_zh_CN.ts

@@ -42,8 +42,6 @@ export default {
 		details: {
 			group1: "备件包基本信息", 
 			formpage1: "基本信息", 
-			group2: "操作信息", 
-			formpage2: "其它", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
 			srfkey: "备件包标识", 

app_AssetManagement/src/widgets/eamspare-parts-group/board-001-dashboard/board-001-dashboard.html

@@ -6,7 +6,7 @@
       <i-col :md="{ span: 24, offset: 0 }">
         <card class="portlet-card" :bordered="false" dis-hover :padding="0">
           <span>
-                      <div class='portlet-container dashboard-viewdashboard-container1 ' :style="{}">
+                      <div class='portlet-container dashboard-viewdashboard-container1  portlet-container-no-border' :style="{}">
                 <row>
                   <i-col :md="{ span: 24, offset: 0 }">
                       <div class="portlet-without-title">
@@ -16,7 +16,7 @@
                             :viewState="viewState"  
                             :viewparams="viewparams" 
                             :context="context" 
-                            :height="300"
+                            :height="0"
                             :width="0"
                             name="dashboard_sysportlet1"  
                             ref='dashboard_sysportlet1' 

app_AssetManagement/src/widgets/eamspare-parts-group/info-viewtabexppanel-tabexppanel/info-viewtabexppanel-tabexppanel.html

@@ -34,7 +34,7 @@
             :label="(h) =>{
                 return h('div', [
                     h('i',{
-                        class:'fa fa-dashcube',
+                        class:'fa fa-cubes',
                         style:{
                             'margin-right' : '2px'
                         }

app_AssetManagement/src/widgets/eamspare-parts-group/main-form/main-form-base.tsx

@@ -116,10 +116,6 @@ export class MainEditFormBase extends EditFormControlBase {
 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
 
-        group2: new FormGroupPanelModel({ caption: '操作信息', detailType: 'GROUPPANEL', name: 'group2', visible: true, isShowCaption: true, form: this, showMoreMode: 0, uiActionGroup: { caption: '', langbase: 'entities.eamsparepartsgroup.main_form', extractMode: 'ITEM', details: [] } }),
-
-        formpage2: new FormPageModel({ caption: '其它', detailType: 'FORMPAGE', name: 'formpage2', visible: true, isShowCaption: true, form: this, showMoreMode: 0 }),
-
         srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
         srforikey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srforikey', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
@@ -142,6 +138,5 @@ export class MainEditFormBase extends EditFormControlBase {
 
         eamsparepartsgroupid: new FormItemModel({ caption: '备件包标识', detailType: 'FORMITEM', name: 'eamsparepartsgroupid', visible: true, isShowCaption: true, form: this, showMoreMode: 0, disabled: false, enableCond: 3 }),
 
-        form: new FormTabPanelModel({ caption: 'form', detailType: 'TABPANEL', name: 'form', visible: true, isShowCaption: true, form: this, tabPages: [{ name: 'formpage1', index: 0, visible: true }, { name: 'formpage2', index: 1, visible: true }] }),
     };
 }
\ No newline at end of file

app_AssetManagement/src/widgets/eamspare-parts-group/main-form/main-form.html

 <i-form :model="this.data" class='app-form' ref='form'  id='eamsparepartsgroup_main' style="">
     <input style="display:none;" />
     <row >
-    <tabs :animated="false" size="small" name='main' :value="detailsModel.form.activiedPage" 
-        @on-click="detailsModel.form.clickPage($event)">
-            <tab-pane v-show="detailsModel.formpage1.visible" name='formpage1' :index="0" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamsparepartsgroup.main_form.details.formpage1')
-                    ])
-                }">
-                    
+            
 <i-col class="form-layout-container" v-show="detailsModel.group1.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-group :model="detailsModel.group1" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamsparepartsgroup.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
     <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group1" :data="data" :context="context" :viewparams="viewparams"/>
@@ -51,28 +41,5 @@
 </i-col>
 
 
-            </tab-pane> 
-            <tab-pane v-show="detailsModel.formpage2.visible" name='formpage2' :index="1" tab='main' class=''  
-                :label="(h) =>{
-                    return h('span',{
-                        class:'caption'
-                    },[
-                    $t('entities.eamsparepartsgroup.main_form.details.formpage2')
-                    ])
-                }">
-                    
-<i-col class="form-layout-container" v-show="detailsModel.group2.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-group :model="detailsModel.group2" layoutType="TABLE_24COL" titleStyle="" class='' :uiActionGroup="detailsModel.group2.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.eamsparepartsgroup.main_form.details.group2')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >    
-    <app-form-group-data-panel slot="dataInfoPanel" :model="detailsModel.group2" :data="data" :context="context" :viewparams="viewparams"/>
-    <row>
-            
-    </row>
-</app-form-group>
-
-</i-col>
-
-
-            </tab-pane> 
-    </tabs>
     </row>
 </i-form>
\ No newline at end of file

app_AssetManagement/src/widgets/eamspare-parts-group/part-v-001-portlet/part-v-001-portlet-base.tsx

@@ -110,7 +110,7 @@ export class PART_V_001PortletBase extends MainControlBase {
                 return this.height+'px';
             }
         } else {
-            return '300px';
+            return 'auto';
         }
     }
 

app_AssetManagement/src/widgets/eamspare-parts-group/part-v-001-portlet/part-v-001-portlet.html

-<div class='portlet part-v-001  portlet-container-no-border' :style="{'height': isAdaptiveSize ? 'calc(100% - 16px)' : getHeight,}">
-        <p class='portlet-title'>
-            <span>
-            
-            备件包信息
-            </span>
-        </p>
-        <div class="portlet-with-title">
+<div class='portlet part-v-001 ' :style="{}">
+        <div class="portlet-without-title">
         <eamspare-parts-group-info-main-view :viewUsage="4" :viewdata="JSON.stringify(context)" :viewDefaultUsage="false" ></eamspare-parts-group-info-main-view>
         </div>
 </div>

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

@@ -494,7 +494,7 @@
 
 
     <!--输出实体[EAMSPAREPARTSGROUP]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-eamsparepartsgroup-28-22">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-eamsparepartsgroup-33-22">
         <createTable tableName="EAMSPAREPARTSGROUP">
                 <column name="EAMSPAREPARTSGROUPID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_EAMSPAREPARTSGROUP_EAMSPARE"/>