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

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

@@ -27,6 +27,9 @@ export default {
 	},
 	main_form: {
 		details: {
+			tabpage1: "规则设置", 
+			tabpage2: "属性集合", 
+			tabpanel1: "", 
 			group1: "指标基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -47,6 +50,7 @@ export default {
 			updatedate: "更新时间", 
 			modelid: "模型标识", 
 			buildid: "模型构建标识", 
+			modelname: "模型", 
 			da_metricid: "指标标识", 
 		},
 		uiactions: {

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

@@ -26,6 +26,9 @@ export default {
 	},
 	main_form: {
 		details: {
+			tabpage1: "规则设置", 
+			tabpage2: "属性集合", 
+			tabpanel1: "", 
 			group1: "指标基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
@@ -46,6 +49,7 @@ export default {
 			updatedate: "更新时间", 
 			modelid: "模型标识", 
 			buildid: "模型构建标识", 
+			modelname: "模型", 
 			da_metricid: "指标标识", 
 		},
 		uiactions: {

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

@@ -82,15 +82,44 @@
 </app-form-item>
 
 </i-col>
-<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.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 }">
         <app-form-json-logic v-model="data.cfg" :formState="formState" :data="data" :disabled="detailsModel.cfg.disabled"  ></app-form-json-logic>
 
 
 </i-col>
-<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 }">
+
+
+        </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 }">
         <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">
@@ -111,16 +140,6 @@
 
 </app-form-item>
 
-</i-col>
-<i-col v-show="detailsModel.modelid.visible" :style="{}"  :sm="{ span: 6, offset: 0 }" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
-    <app-form-item name='modelid' :itemRules="this.rules().modelid" class='' :caption="$t('entities.dametric.main_form.details.modelid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelid.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-span name='modelid' :value="data.modelid" dataType="PICKUPDATA"     :precision="0"
-:data="data" :context="context" :viewparams="viewparams" :localContext ='{ }'  :localParam ='{ }'  style="">  
-</app-span>
-
-</app-form-item>
-
 </i-col>
     
     </row>
@@ -532,6 +551,7 @@ export default class MainBase extends Vue implements ControlInterface {
         updatedate: null,
         modelid: null,
         buildid: null,
+        modelname: null,
         da_metricid: null,
         dametric:null,
     };
@@ -616,10 +636,6 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.updatedate.required, type: 'string', message: '更新时间 值不能为空', trigger: 'change' },
             { required: this.detailsModel.updatedate.required, type: 'string', message: '更新时间 值不能为空', trigger: 'blur' },
         ],
-        modelid: [
-            { required: this.detailsModel.modelid.required, type: 'string', message: '模型标识 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.modelid.required, type: 'string', message: '模型标识 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -725,6 +741,12 @@ 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  })
@@ -764,6 +786,8 @@ export default class MainBase extends Vue implements ControlInterface {
         modelid: new FormItemModel({ caption: '模型标识', detailType: 'FORMITEM', name: 'modelid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         buildid: new FormItemModel({ caption: '模型构建标识', detailType: 'FORMITEM', name: 'buildid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        modelname: new FormItemModel({ caption: '模型', detailType: 'FORMITEM', name: 'modelname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         da_metricid: new FormItemModel({ caption: '指标标识', detailType: 'FORMITEM', name: 'da_metricid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -985,6 +1009,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'buildid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 modelname 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.modelname')
+    onModelnameChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'modelname', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 da_metricid 值
      *
@@ -1067,6 +1103,10 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
+
+
+
 
 
 

app_web/src/widgets/dametric/main-form/main-form-model.ts

@@ -105,6 +105,11 @@ export default class MainModel {
         prop: 'build_id',
         dataType: 'PICKUP',
       },
+      {
+        name: 'modelname',
+        prop: 'model_name',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'da_metricid',
         prop: 'metric_id',

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

@@ -48,7 +48,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_metric-48-3">
+    <changeSet author="a_A_5d9d78509" id="tab-da_metric-49-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-48-17">
+    <changeSet author="a_A_5d9d78509" id="fk-da_metric-49-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]外键关系 -->