ibiz4j 发布系统代码 [ibz-dst，应用]

app_web/src/locale/lanres/entities/dametric/dametric_en_US.ts

@@ -27,9 +27,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			tabpage1: "规则设置", 
-			tabpage2: "属性集合", 
-			tabpanel1: "", 
 			group1: "指标基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 

app_web/src/locale/lanres/entities/dametric/dametric_zh_CN.ts

@@ -26,9 +26,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			tabpage1: "规则设置", 
-			tabpage2: "属性集合", 
-			tabpanel1: "", 
 			group1: "指标基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 

app_web/src/widgets/dametric/main-form/main-form-base.vue

@@ -82,44 +82,15 @@
 </app-form-item>
 
 </i-col>
-<i-col v-show="detailsModel.tabpanel1.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
-    <tabs :animated="false" name='tabpanel1' v-show="detailsModel.tabpanel1.visible" class=''  
-    :value="detailsModel.tabpanel1.activiedPage" @on-click="detailsModel.tabpanel1.clickPage($event)">
-        <tab-pane v-show="detailsModel.tabpage1.visible" name='tabpage1' :index="0" tab='tabpanel1' class=''  
-            :label="(h) =>{
-                return h('span',{
-                    class:'caption'
-                },[
-                  $t('entities.dametric.main_form.details.tabpage1')
-                ])
-            }">
-            
-    <i-col v-show="detailsModel.cfg.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
+<i-col v-show="detailsModel.cfg.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
         <app-form-json-logic v-model="data.cfg" :formState="formState" :data="data" :disabled="detailsModel.cfg.disabled"  ></app-form-json-logic>
 
 
 </i-col>
-
-
-        </tab-pane>
-        <tab-pane v-show="detailsModel.tabpage2.visible" name='tabpage2' :index="1" tab='tabpanel1' class=''  
-            :label="(h) =>{
-                return h('span',{
-                    class:'caption'
-                },[
-                  $t('entities.dametric.main_form.details.tabpage2')
-                ])
-            }">
-            
-    <i-col v-show="detailsModel.fieldset.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
+<i-col v-show="detailsModel.fieldset.visible" :style="{}"  :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
         <app-form-json-field-set v-model="data.fieldset" :formState="formState" :data="data" :disabled="detailsModel.fieldset.disabled"  ></app-form-json-field-set>
 
 
-</i-col>
-
-
-        </tab-pane>
-</tabs>
 </i-col>
 <i-col v-show="detailsModel.createdate.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
     <app-form-item name='createdate' :itemRules="this.rules().createdate" class='' :caption="$t('entities.dametric.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
@@ -741,12 +712,6 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public detailsModel: any = {
-        tabpage1: new FormTabPageModel({ caption: '规则设置', detailType: 'TABPAGE', name: 'tabpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
-, 
-        tabpage2: new FormTabPageModel({ caption: '属性集合', detailType: 'TABPAGE', name: 'tabpage2', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
-, 
-        tabpanel1: new FormTabPanelModel({ caption: '', detailType: 'TABPANEL', name: 'tabpanel1', visible: true, isShowCaption: false, form: this, isControlledContent: false , tabPages: [{ name: 'tabpage1', index: 0, visible: true }, { name: 'tabpage2', index: 1, visible: true }] })
-, 
         group1: new FormGroupPanelModel({ caption: '指标基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.dametric.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
@@ -1105,9 +1070,6 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
-
-
-
 
 
 

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

@@ -48,7 +48,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_metric-49-3">
+    <changeSet author="a_A_5d9d78509" id="tab-da_metric-50-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -455,7 +455,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-da_metric-49-17">
+    <changeSet author="a_A_5d9d78509" id="fk-da_metric-50-17">
        <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
     </changeSet>
         <!--输出实体[DA_REPORT]外键关系 -->