Skip to content

I
ibzdst
提交 01e551b8 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 dc76b30a
隐藏空白字符变更
内嵌 并排
正在显示 包含 80 行增加 和 37 行删除
app_web/src/locale/lanres/entities/meta-field/meta-field_BO_CN_base.ts
浏览文件 @ 01e551b8
...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){ ...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name: commonLogic.appcommonhandle("显示名称",null), field_show_name: commonLogic.appcommonhandle("显示名称",null),
ref_field_id: commonLogic.appcommonhandle("引用属性标识",null), ref_field_id: commonLogic.appcommonhandle("引用属性标识",null),
ref_field_name: commonLogic.appcommonhandle("引用属性名称",null), ref_field_name: commonLogic.appcommonhandle("引用属性名称",null),
ref_field_code_name: commonLogic.appcommonhandle("引用属性代码名称",null),
relation_id: commonLogic.appcommonhandle("引用关系标识",null), relation_id: commonLogic.appcommonhandle("引用关系标识",null),
relation_name: commonLogic.appcommonhandle("引用关系",null), relation_name: commonLogic.appcommonhandle("引用关系",null),
relation_code_name: commonLogic.appcommonhandle("关系代码",null), relation_code_name: commonLogic.appcommonhandle("关系代码",null),
......
app_web/src/locale/lanres/entities/meta-field/meta-field_en_US_base.ts
浏览文件 @ 01e551b8
...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){ ...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name: commonLogic.appcommonhandle("显示名称",null), field_show_name: commonLogic.appcommonhandle("显示名称",null),
ref_field_id: commonLogic.appcommonhandle("引用属性标识",null), ref_field_id: commonLogic.appcommonhandle("引用属性标识",null),
ref_field_name: commonLogic.appcommonhandle("引用属性名称",null), ref_field_name: commonLogic.appcommonhandle("引用属性名称",null),
ref_field_code_name: commonLogic.appcommonhandle("引用属性代码名称",null),
relation_id: commonLogic.appcommonhandle("引用关系标识",null), relation_id: commonLogic.appcommonhandle("引用关系标识",null),
relation_name: commonLogic.appcommonhandle("引用关系",null), relation_name: commonLogic.appcommonhandle("引用关系",null),
relation_code_name: commonLogic.appcommonhandle("关系代码",null), relation_code_name: commonLogic.appcommonhandle("关系代码",null),
......
app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN_base.ts
浏览文件 @ 01e551b8
...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){ ...@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name: commonLogic.appcommonhandle("显示名称",null), field_show_name: commonLogic.appcommonhandle("显示名称",null),
ref_field_id: commonLogic.appcommonhandle("引用属性标识",null), ref_field_id: commonLogic.appcommonhandle("引用属性标识",null),
ref_field_name: commonLogic.appcommonhandle("引用属性名称",null), ref_field_name: commonLogic.appcommonhandle("引用属性名称",null),
ref_field_code_name: commonLogic.appcommonhandle("引用属性代码名称",null),
relation_id: commonLogic.appcommonhandle("引用关系标识",null), relation_id: commonLogic.appcommonhandle("引用关系标识",null),
relation_name: commonLogic.appcommonhandle("引用关系",null), relation_name: commonLogic.appcommonhandle("引用关系",null),
relation_code_name: commonLogic.appcommonhandle("关系代码",null), relation_code_name: commonLogic.appcommonhandle("关系代码",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ 01e551b8
...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){ ...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
}, },
}, },
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: { tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null), caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null), tip: commonLogic.appcommonhandle("模型导出",null),
}, },
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: { tbitem2: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ 01e551b8
...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){ ...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
}, },
}, },
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: { tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null), caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null), tip: commonLogic.appcommonhandle("模型导出",null),
}, },
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: { tbitem2: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ 01e551b8
...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){ ...@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
}, },
}, },
gridviewtoolbar_toolbar: { gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: { tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null), caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null), tip: commonLogic.appcommonhandle("模型导出",null),
}, },
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: { tbitem2: {
caption: commonLogic.appcommonhandle("-",null), caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null), tip: commonLogic.appcommonhandle("",null),
......
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ 01e551b8
...@@ -13,18 +13,18 @@ ...@@ -13,18 +13,18 @@
<div class='pull-right'> <div class='pull-right'>
<div class='toolbar-container'> <div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)"> <i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i> <i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span> <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div> <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)"> <i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i> <i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span> <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div> <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip> </tooltip>
<span class='seperator'>|</span> <span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
...@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView * @memberof MetaModelGridView
*/ */
public toolBarModels: any = { public toolBarModels: any = {
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } }, tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } }, tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } }, tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
...@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase * @memberof MetaModelGridViewBase
*/ */
public toolbar_click($event: any, $event2?: any) { public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) { if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2); this.toolbar_tbitem1_export_click(null, '', $event2);
} }
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) { if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2); this.toolbar_tbitem3_click(null, '', $event2);
} }
...@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
} }
// 界面行为 // 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService(); const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel"); curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
} }
/** /**
...@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) { public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue { ...@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
} }
// 界面行为 // 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService(); const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel"); curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
} }
/** /**
......
app_web/src/widgets/meta-field/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 01e551b8
...@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel { ...@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'ref_field_name', name: 'ref_field_name',
}, },
{
name: 'ref_field_code_name',
},
{ {
name: 'relation_id', name: 'relation_id',
}, },
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaField.java
浏览文件 @ 01e551b8
...@@ -143,6 +143,14 @@ public class MetaField extends EntityMP implements Serializable { ...@@ -143,6 +143,14 @@ public class MetaField extends EntityMP implements Serializable {
@JsonProperty("ref_field_name") @JsonProperty("ref_field_name")
@ApiModelProperty("引用属性名称") @ApiModelProperty("引用属性名称")
private String refFieldName; private String refFieldName;
/**
* 引用属性代码名称
*/
@TableField(exist = false)
@JSONField(name = "ref_field_code_name")
@JsonProperty("ref_field_code_name")
@ApiModelProperty("引用属性代码名称")
private String refFieldCodeName;
/** /**
* 引用关系标识 * 引用关系标识
*/ */
......
ibzdst-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
浏览文件 @ 01e551b8
...@@ -290,6 +290,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField ...@@ -290,6 +290,7 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
reffield=majorEntity; reffield=majorEntity;
} }
et.setRefFieldName(reffield.getFieldName()); et.setRefFieldName(reffield.getFieldName());
et.setRefFieldCodeName(reffield.getCodeName());
} }
//实体关系[DER1N_META_FIELD_META_RELATION_RELATIONID] //实体关系[DER1N_META_FIELD_META_RELATION_RELATIONID]
if(!ObjectUtils.isEmpty(et.getRelationId())){ if(!ObjectUtils.isEmpty(et.getRelationId())){
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 01e551b8
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 --> <!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="root" id="tab-da_report-11-4"> <changeSet author="root" id="tab-da_report-12-4">
<createTable tableName="IBZDAREPORT"> <createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)"> <column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
<!--输出实体[META_FIELD]数据结构 --> <!--输出实体[META_FIELD]数据结构 -->
<changeSet author="root" id="tab-meta_field-1-13"> <changeSet author="root" id="tab-meta_field-11-13">
<createTable tableName="IBZFIELD"> <createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)"> <column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/> <constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......
ibzdst-core/src/main/resources/mapper/lite/metafield/MetaFieldMapper.xml
浏览文件 @ 01e551b8
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN `IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` LEFT JOIN `IBZRELATION` t21 ON t1.`RELATIONID` = t21.`RELATIONID` ) t1 where fieldid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN `IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` LEFT JOIN `IBZRELATION` t21 ON t1.`RELATIONID` = t21.`RELATIONID` ) t1 where fieldid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="MetaFieldResultMap" databaseId="oracle"> <select id="selectById" resultMap="MetaFieldResultMap" databaseId="oracle">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t31.REFENTITYNAME, t21.CODENAME AS REFFIELDCODENAME, t1.REFFIELDID, t1.REFFIELDNAME, t31.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZFIELD t21 ON t1.REFFIELDID = t21.FIELDID LEFT JOIN IBZRELATION t31 ON t1.RELATIONID = t31.RELATIONID ) t1 where fieldid=#{id}]]>
</select> </select>
<select id="selectById" resultMap="MetaFieldResultMap" databaseId="postgresql"> <select id="selectById" resultMap="MetaFieldResultMap" databaseId="postgresql">
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]> <![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="oracle"> <sql id="Default" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID <![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t31.REFENTITYNAME, t21.CODENAME AS REFFIELDCODENAME, t1.REFFIELDID, t1.REFFIELDNAME, t31.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZFIELD t21 ON t1.REFFIELDID = t21.FIELDID LEFT JOIN IBZRELATION t31 ON t1.RELATIONID = t31.RELATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[Default]--> <!--数据查询[Default]-->
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
<sql id="View" databaseId="oracle"> <sql id="View" databaseId="oracle">
<![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID <![CDATA[ SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t31.REFENTITYNAME, t21.CODENAME AS REFFIELDCODENAME, t1.REFFIELDID, t1.REFFIELDNAME, t31.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZFIELD t21 ON t1.REFFIELDID = t21.FIELDID LEFT JOIN IBZRELATION t31 ON t1.RELATIONID = t31.RELATIONID
]]> ]]>
</sql> </sql>
<!--数据查询[View]--> <!--数据查询[View]-->
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ 01e551b8
...@@ -2548,7 +2548,7 @@ ...@@ -2548,7 +2548,7 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":14, "show_order":12,
"major_field":0 "major_field":0
}, },
{ {
...@@ -2566,7 +2566,25 @@ ...@@ -2566,7 +2566,25 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":15, "show_order":13,
"major_field":0
},
{
"fieldname":"REFFIELDCODENAME" ,
"codename":"Ref_field_code_name",
"field_logic_name":"引用属性代码名称",
"entity_name":"META_FIELD",
"ref_de":"META_FIELD",
"ref_field_name":"CODENAME",
"relation_name":"DER1N_META_FIELD_META_FIELD_REFFIELDID",
"relation_codename":"RefField",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":14,
"major_field":0 "major_field":0
}, },
{ {
...@@ -2584,7 +2602,7 @@ ...@@ -2584,7 +2602,7 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":16, "show_order":15,
"major_field":0 "major_field":0
}, },
{ {
...@@ -2602,7 +2620,7 @@ ...@@ -2602,7 +2620,7 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":17, "show_order":16,
"major_field":0 "major_field":0
}, },
{ {
...@@ -2620,7 +2638,7 @@ ...@@ -2620,7 +2638,7 @@
"data_type":"VARCHAR", "data_type":"VARCHAR",
"data_length":100, "data_length":100,
"key_field":0, "key_field":0,
"show_order":18, "show_order":17,
"major_field":0 "major_field":0
}, },
{ {
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/MetaFieldDTO.java
浏览文件 @ 01e551b8
...@@ -152,6 +152,16 @@ public class MetaFieldDTO extends DTOBase implements Serializable { ...@@ -152,6 +152,16 @@ public class MetaFieldDTO extends DTOBase implements Serializable {
@ApiModelProperty("引用属性名称") @ApiModelProperty("引用属性名称")
private String refFieldName; private String refFieldName;
/**
* 属性 [REFFIELDCODENAME]
*
*/
@JSONField(name = "ref_field_code_name")
@JsonProperty("ref_field_code_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("引用属性代码名称")
private String refFieldCodeName;
/** /**
* 属性 [RELATIONID] * 属性 [RELATIONID]
* *
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或