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

app_web/src/locale/lanres/entities/dabuild/dabuild_en_US.ts

@@ -50,6 +50,7 @@ export default {
 			buildstate: "状态", 
 			dadimension: "维度", 
 			modelid: "模型标识", 
+			systemid: "系统标识", 
 			buildid: "标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/dabuild/dabuild_zh_CN.ts

@@ -49,6 +49,7 @@ export default {
 			buildstate: "状态", 
 			dadimension: "维度", 
 			modelid: "模型标识", 
+			systemid: "系统标识", 
 			buildid: "标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_en_US.ts

@@ -58,6 +58,7 @@ export default {
 			nestedname: "嵌套代码名称", 
 			refentityid: "引用实体标识", 
 			entityid: "实体标识", 
+			systemid: "系统", 
 			relationid: "关系标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/meta-relationship/meta-relationship_zh_CN.ts

@@ -57,6 +57,7 @@ export default {
 			nestedname: "嵌套代码名称", 
 			refentityid: "引用实体标识", 
 			entityid: "实体标识", 
+			systemid: "系统", 
 			relationid: "关系标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/rule-engine/rule-engine_en_US.ts

@@ -37,6 +37,7 @@ export default {
 			execstate: "状态", 
 			lastruntime: "上次执行时间", 
 			modelid: "模型标识", 
+			systemid: "系统", 
 			engineid: "标识", 
 		},
 		uiactions: {

app_web/src/locale/lanres/entities/rule-engine/rule-engine_zh_CN.ts

@@ -36,6 +36,7 @@ export default {
 			execstate: "状态", 
 			lastruntime: "上次执行时间", 
 			modelid: "模型标识", 
+			systemid: "系统", 
 			engineid: "标识", 
 		},
 		uiactions: {

app_web/src/store/modules/view-action/state.ts

@@ -197,7 +197,6 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '601fb9bf6eec2a7e264e7142017715a4',
             ],
         },
         {

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

@@ -505,6 +505,7 @@ export default class MainBase extends Vue implements ControlInterface {
         buildstate: null,
         dadimension: null,
         modelid: null,
+        systemid: null,
         buildid: null,
         dabuild:null,
     };
@@ -713,6 +714,8 @@ export default class MainBase extends Vue implements ControlInterface {
         dadimension: new FormItemModel({ caption: '维度', detailType: 'FORMITEM', name: 'dadimension', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         modelid: new FormItemModel({ caption: '模型标识', detailType: 'FORMITEM', name: 'modelid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        systemid: new FormItemModel({ caption: '系统标识', detailType: 'FORMITEM', name: 'systemid', 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 })
 , 
@@ -874,6 +877,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'modelid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 systemid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.systemid')
+    onSystemidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 buildid 值
      *
@@ -957,6 +972,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**
@@ -2038,6 +2054,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('systemid')) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
     /**
@@ -2045,6 +2064,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public updateDefault(){                    
+        if (this.data.hasOwnProperty('systemid') && !this.data.systemid) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
 

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

@@ -80,6 +80,11 @@ export default class MainModel {
         prop: 'model_id',
         dataType: 'PICKUP',
       },
+      {
+        name: 'systemid',
+        prop: 'system_id',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'buildid',
         prop: 'build_id',

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

@@ -71,7 +71,7 @@
     :viewparams="viewparams"
     :formState="formState" 
     :localContext ='{ }' 
-    :localParam ='{ }' 
+    :localParam ='{ n_buildid_eq:"%buildid%" }' 
     :disabled="detailsModel.refmetric.disabled" 
     valueType="string"
     tag='CLMetric' 

app_web/src/widgets/meta-data-set/main-form/main-form-base.vue

@@ -35,28 +35,14 @@
 </i-col>
 <i-col v-show="detailsModel.entityname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entityname' :itemRules="this.rules().entityname" class='' :caption="$t('entities.metadataset.main_form.details.entityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entityname.disabled"
-  name='entityname'
-  
-  deMajorField='entity_name'
-  deKeyField='metaentity'
-  :service="service"
-  :acParams="{ serviceName: 'MetaEntityService', interfaceName: 'FetchDefault'}"
-  valueitem='entityid' 
-  :value="data.entityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'meta-entity-pickup-view', title: $t('entities.metaentity.views.pickupview.title'), deResParameters: [{ pathName: 'dstsystems', parameterName: 'dstsystem' }, ], parameters: [{ pathName: 'metaentities', parameterName: 'metaentity' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
+    <input-box 
+    v-model="data.entityname"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.entityname.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 

app_web/src/widgets/meta-data-set/main-form/main-form-service.ts

@@ -2,7 +2,6 @@ import { Http,Util,Errorlog } from '@/utils';
 import ControlService from '@/widgets/control-service';
 import MetaDataSetService from '@/service/meta-data-set/meta-data-set-service';
 import MainModel from './main-form-model';
-import MetaEntityService from '@/service/meta-entity/meta-entity-service';
 
 
 /**
@@ -42,14 +41,6 @@ export default class MainService extends ControlService {
         this.model = new MainModel();
     }
 
-    /**
-     * 实体服务对象
-     *
-     * @type {MetaEntityService}
-     * @memberof MainService
-     */
-    public metaentityService: MetaEntityService = new MetaEntityService();
-
     /**
      * 远端数据
      *
@@ -99,9 +90,6 @@ export default class MainService extends ControlService {
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
         data.page = data.page ? data.page : 0;
         data.size = data.size ? data.size : 1000;
-        if (Object.is(serviceName, 'MetaEntityService') && Object.is(interfaceName, 'FetchDefault')) {
-            return this.doItems(this.metaentityService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'entity_id', 'metaentity');
-        }
 
         return Promise.reject([])
     }

app_web/src/widgets/meta-entity/main-form/main-form-base.vue

@@ -70,7 +70,7 @@
   :context="context"
   :viewparams="viewparams"
   :localContext ='{ }' 
-  :localParam ='{ }' 
+  :localParam ='{ n_systemid_eq:"%systemid%" }' 
   :disabled="detailsModel.modulename.disabled"
   name='modulename'
   

app_web/src/widgets/meta-relationship/main-form/main-form-base.vue

@@ -35,28 +35,14 @@
 </i-col>
 <i-col v-show="detailsModel.entityname.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
     <app-form-item name='entityname' :itemRules="this.rules().entityname" class='' :caption="$t('entities.metarelationship.main_form.details.entityname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.entityname.error" :isEmptyCaption="false" labelPos="LEFT">
-    
-<app-picker 
-  :formState="formState"
-  :data="data"
-  :context="context"
-  :viewparams="viewparams"
-  :localContext ='{ }' 
-  :localParam ='{ }' 
-  :disabled="detailsModel.entityname.disabled"
-  name='entityname'
-  
-  deMajorField='entity_name'
-  deKeyField='metaentity'
-  :service="service"
-  :acParams="{ serviceName: 'MetaEntityService', interfaceName: 'FetchDefault'}"
-  valueitem='entityid' 
-  :value="data.entityname" 
-  editortype="" 
-  :pickupView="{ viewname: 'meta-entity-pickup-view', title: $t('entities.metaentity.views.pickupview.title'), deResParameters: [{ pathName: 'dstsystems', parameterName: 'dstsystem' }, ], parameters: [{ pathName: 'metaentities', parameterName: 'metaentity' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
-  style=""  
-  @formitemvaluechange="onFormItemValueChange">
-</app-picker>
+    <input-box 
+    v-model="data.entityname"  
+    @enter="onEnter($event)"  
+     unit=""  
+    :disabled="detailsModel.entityname.disabled" 
+    type='text' 
+    style="">
+</input-box>
 
 </app-form-item>
 
@@ -84,7 +70,7 @@
   :context="context"
   :viewparams="viewparams"
   :localContext ='{ }' 
-  :localParam ='{ }' 
+  :localParam ='{ n_systemid_eq:"%systemid%" }' 
   :disabled="detailsModel.refentityname.disabled"
   name='refentityname'
   
@@ -530,6 +516,7 @@ export default class MainBase extends Vue implements ControlInterface {
         nestedname: null,
         refentityid: null,
         entityid: null,
+        systemid: null,
         relationid: null,
         metarelationship:null,
     };
@@ -748,6 +735,8 @@ export default class MainBase extends Vue implements ControlInterface {
         refentityid: new FormItemModel({ caption: '引用实体标识', detailType: 'FORMITEM', name: 'refentityid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         entityid: new FormItemModel({ caption: '实体标识', detailType: 'FORMITEM', name: 'entityid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        systemid: new FormItemModel({ caption: '系统', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         relationid: new FormItemModel({ caption: '关系标识', detailType: 'FORMITEM', name: 'relationid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -945,6 +934,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'entityid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 systemid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.systemid')
+    onSystemidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 relationid 值
      *
@@ -1029,6 +1030,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
 
 
     }
@@ -2112,6 +2114,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('systemid')) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
     /**
@@ -2119,6 +2124,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public updateDefault(){                    
+        if (this.data.hasOwnProperty('systemid') && !this.data.systemid) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
 

app_web/src/widgets/meta-relationship/main-form/main-form-model.ts

@@ -99,6 +99,11 @@ export default class MainModel {
         prop: 'entity_id',
         dataType: 'PICKUP',
       },
+      {
+        name: 'systemid',
+        prop: 'system_id',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'relationid',
         prop: 'id',

app_web/src/widgets/rule-engine/main-form/main-form-base.vue

@@ -495,6 +495,7 @@ export default class MainBase extends Vue implements ControlInterface {
         execstate: null,
         lastruntime: null,
         modelid: null,
+        systemid: null,
         engineid: null,
         ruleengine:null,
     };
@@ -701,6 +702,8 @@ export default class MainBase extends Vue implements ControlInterface {
         lastruntime: new FormItemModel({ caption: '上次执行时间', detailType: 'FORMITEM', name: 'lastruntime', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         modelid: new FormItemModel({ caption: '模型标识', detailType: 'FORMITEM', name: 'modelid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
+, 
+        systemid: new FormItemModel({ caption: '系统', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
         engineid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'engineid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
 , 
@@ -862,6 +865,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'modelid', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 systemid 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof MainBase
+     */
+    @Watch('data.systemid')
+    onSystemidChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 engineid 值
      *
@@ -944,6 +959,7 @@ export default class MainBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**
@@ -2025,6 +2041,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public createDefault(){                    
+        if (this.data.hasOwnProperty('systemid')) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
     /**
@@ -2032,6 +2051,9 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public updateDefault(){                    
+        if (this.data.hasOwnProperty('systemid') && !this.data.systemid) {
+            this.data['systemid'] = this.context['dstsystemid'];
+        }
     }
 
 

app_web/src/widgets/rule-engine/main-form/main-form-model.ts

@@ -80,6 +80,11 @@ export default class MainModel {
         prop: 'model_id',
         dataType: 'PICKUP',
       },
+      {
+        name: 'systemid',
+        prop: 'system_id',
+        dataType: 'PICKUPDATA',
+      },
       {
         name: 'engineid',
         prop: 'engine_id',

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

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[DA_BUILD]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_build-42-1">
+    <changeSet author="a_A_5d9d78509" id="tab-da_build-44-1">
         <createTable tableName="IBZDABUILD">
                 <column name="BUILDID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
@@ -48,7 +48,7 @@
 
 
     <!--输出实体[DA_METRIC]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-da_metric-50-3">
+    <changeSet author="a_A_5d9d78509" id="tab-da_metric-51-3">
         <createTable tableName="IBZDAMETRIC">
                 <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
@@ -204,7 +204,7 @@
 
 
     <!--输出实体[META_DATASET]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-1-9">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_dataset-2-9">
         <createTable tableName="IBZDATASET">
                 <column name="DATASETID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
@@ -226,7 +226,7 @@
 
 
     <!--输出实体[META_ENTITY]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-8-10">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_entity-9-10">
         <createTable tableName="IBZENTITY">
                 <column name="ENTITYID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
@@ -366,7 +366,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-5-14">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-6-14">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
@@ -398,7 +398,7 @@
 
 
     <!--输出实体[RU_ENGINE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_engine-27-15">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_engine-28-15">
         <createTable tableName="IBZRULEENGINE">
                 <column name="ENGINEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ENGINE_ENGINEID"/>
@@ -420,7 +420,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ru_item-55-16">
+    <changeSet author="a_A_5d9d78509" id="tab-ru_item-56-16">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
@@ -455,7 +455,7 @@
         <!--输出实体[DA_BUILD]外键关系 -->
         <!--输出实体[DA_CHART]外键关系 -->
         <!--输出实体[DA_METRIC]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-da_metric-50-17">
+    <changeSet author="a_A_5d9d78509" id="fk-da_metric-51-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]外键关系 -->