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

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

@@ -37,6 +37,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			lookup: "", 
 			group1: "实体关系基本信息", 
 			formpage1: "基本信息", 
 			srforikey: "", 
@@ -54,7 +55,6 @@ export default {
 			nestedname: "嵌套代码名称", 
 			refentityid: "引用实体标识", 
 			entityid: "实体标识", 
-			lookup: "Lookup", 
 			relationid: "关系标识", 
 		},
 		uiactions: {

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

@@ -36,6 +36,7 @@ export default {
 	},
 	main_form: {
 		details: {
+			lookup: "", 
 			group1: "实体关系基本信息", 
 			formpage1: "基本信息", 
 			srforikey: "", 
@@ -53,7 +54,6 @@ export default {
 			nestedname: "嵌套代码名称", 
 			refentityid: "引用实体标识", 
 			entityid: "实体标识", 
-			lookup: "Lookup", 
 			relationid: "关系标识", 
 		},
 		uiactions: {

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

@@ -118,9 +118,7 @@
 
 </i-col>
 <i-col v-show="detailsModel.lookup.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
-    <app-form-item name='lookup' :itemRules="this.rules().lookup" class='' :caption="$t('entities.metarelationship.main_form.details.lookup')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.lookup.error" :isEmptyCaption="false" labelPos="LEFT">
-    <avue-custom-form :isSubForm="true" :isParseString="true" :isFormData="false" :options="{"column":[{"type":"dynamic","label":"","span":24,"display":true,"children":{"type":"crud","index":false,"align":"center","headerAlign":"center","addBtn":true,"delBtn":true,"column":[{"type":"select","label":"Key field","cascaderItem":[],"span":24,"display":true,"prop":"fieldname","props":{"label":"showName","value":"columnName"},"dicUrl":`lite/ibzlite/entitys/${entityname}/fields`,"dicMethod":"get","filterable":true},{"type":"select","label":"References key field","cascaderItem":[],"span":24,"display":true,"prop":"reffieldname","props":{"label":"showName","value":"columnName"},"dicUrl":`lite/ibzlite/entitys/${refentityname}/fields`,"dicMethod":"get"}]},"prop":"dstlookups"}],"labelPosition":"top","labelSuffix":"","labelWidth":80,"gutter":0,"menuBtn":false,"submitBtn":true,"submitText":"提交","emptyBtn":true,"emptyText":"清空","menuPosition":"center"}" v-model="data.lookup" :formData="data"  :formState="formState"></avue-custom-form>
-</app-form-item>
+    <app-form-part name="lookup" :context="context" :viewparams="viewparams" :data="mixinData" :formState="formState" systemCodeName="ibzlite" appCodeName="web" deCodeName="MetaRelationship" formCodeName="Main" formDetailCodeName="lookup" @change="onFormItemValueChange"></app-form-part>
 
 </i-col>
     
@@ -515,6 +513,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public data: any = {
+        lookup: null,
         srforikey: null,
         srfkey: null,
         srfmajortext: null,
@@ -530,7 +529,6 @@ export default class MainBase extends Vue implements ControlInterface {
         nestedname: null,
         refentityid: null,
         entityid: null,
-        lookup: null,
         relationid: null,
         metarelationship:null,
     };
@@ -607,10 +605,6 @@ export default class MainBase extends Vue implements ControlInterface {
             { required: this.detailsModel.nestedname.required, type: 'string', message: '嵌套代码名称 值不能为空', trigger: 'change' },
             { required: this.detailsModel.nestedname.required, type: 'string', message: '嵌套代码名称 值不能为空', trigger: 'blur' },
         ],
-        lookup: [
-            { required: this.detailsModel.lookup.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'change' },
-            { required: this.detailsModel.lookup.required, type: 'string', message: 'Lookup 值不能为空', trigger: 'blur' },
-        ],
         }
     }
 
@@ -716,6 +710,8 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public detailsModel: any = {
+        lookup: new FormPartModel({ caption: '', detailType: 'FORMPART', name: 'lookup', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
+, 
         group1: new FormGroupPanelModel({ caption: '实体关系基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: false, form: this, isControlledContent: false , uiActionGroup: { caption: '', langbase: 'entities.metarelationship.main_form', extractMode: 'ITEM', details: [] }, isManageContainer: false, showMoreModeItems: []  })
 , 
         formpage1: new FormPageModel({ caption: '基本信息', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this, isControlledContent: false  })
@@ -749,8 +745,6 @@ 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 })
-, 
-        lookup: new FormItemModel({ caption: 'Lookup', detailType: 'FORMITEM', name: 'lookup', 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 })
 , 
@@ -936,18 +930,6 @@ export default class MainBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'entityid', newVal: newVal, oldVal: oldVal });
     }
 
-    /**
-     * 监控表单属性 lookup 值
-     *
-     * @param {*} newVal
-     * @param {*} oldVal
-     * @memberof MainBase
-     */
-    @Watch('data.lookup')
-    onLookupChange(newVal: any, oldVal: any) {
-        this.formDataChange({ name: 'lookup', newVal: newVal, oldVal: oldVal });
-    }
-
     /**
      * 监控表单属性 relationid 值
      *

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

@@ -24,6 +24,10 @@ export default class MainModel {
         name: 'srffrontuf',
         prop: 'srffrontuf',
         dataType: 'TEXT',
+      },
+        {
+        name: 'lookup',
+        dataType:'FORMPART'
       },
       {
         name: 'srforikey',
@@ -90,11 +94,6 @@ export default class MainModel {
         prop: 'entity_id',
         dataType: 'PICKUP',
       },
-      {
-        name: 'lookup',
-        prop: 'lookups',
-        dataType: 'ONE2MANYDATA',
-      },
       {
         name: 'relationid',
         prop: 'id',

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

@@ -360,7 +360,7 @@
 
 
     <!--输出实体[META_RELATION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-91-16">
+    <changeSet author="a_A_5d9d78509" id="tab-meta_relation-98-16">
         <createTable tableName="IBZRELATION">
                 <column name="RELATIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>

ibzlite-provider/ibzlite-provider-api/src/main/java/cn/ibizlab/api/dto/MetaRelationshipDTO.java

@@ -189,9 +189,9 @@ public class MetaRelationshipDTO extends DTOBase implements Serializable {
     /**
      *  [META_LOOKUP]
      */
-    @JsonProperty("lookups")
-    @JSONField(name = "lookups")
-	private List<lookupDTO> lookups ;
+    @JsonProperty("metalookups")
+    @JSONField(name = "metalookups")
+	private List<MetaLookupDTO> lookups ;
 
 }