Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
01e551b8
提交
01e551b8
编写于
3年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-dst,应用]
上级
dc76b30a
master
cql4
hebao
master-xuhui
无相关合并请求
变更
14
显示空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
80 行增加
和
37 行删除
+80
-37
meta-field_BO_CN_base.ts
...ocale/lanres/entities/meta-field/meta-field_BO_CN_base.ts
+1
-0
meta-field_en_US_base.ts
...ocale/lanres/entities/meta-field/meta-field_en_US_base.ts
+1
-0
meta-field_zh_CN_base.ts
...ocale/lanres/entities/meta-field/meta-field_zh_CN_base.ts
+1
-0
meta-model_BO_CN_base.ts
...ocale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
+4
-4
meta-model_en_US_base.ts
...ocale/lanres/entities/meta-model/meta-model_en_US_base.ts
+4
-4
meta-model_zh_CN_base.ts
...ocale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
+4
-4
meta-model-grid-view-base.vue
...s/lite/meta-model-grid-view/meta-model-grid-view-base.vue
+15
-15
pickup-viewpickupviewpanel-pickupviewpanel-model.ts
...panel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
+3
-0
MetaField.java
.../src/main/java/cn/ibizlab/core/lite/domain/MetaField.java
+8
-0
MetaFieldServiceImpl.java
.../ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java
+1
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+2
-2
MetaFieldMapper.xml
.../main/resources/mapper/lite/metafield/MetaFieldMapper.xml
+3
-3
ibzdst.json
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
+23
-5
MetaFieldDTO.java
...er-api/src/main/java/cn/ibizlab/api/dto/MetaFieldDTO.java
+10
-0
未找到文件。
app_web/src/locale/lanres/entities/meta-field/meta-field_BO_CN_base.ts
浏览文件 @
01e551b8
...
...
@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name
:
commonLogic
.
appcommonhandle
(
"显示名称"
,
null
),
ref_field_id
:
commonLogic
.
appcommonhandle
(
"引用属性标识"
,
null
),
ref_field_name
:
commonLogic
.
appcommonhandle
(
"引用属性名称"
,
null
),
ref_field_code_name
:
commonLogic
.
appcommonhandle
(
"引用属性代码名称"
,
null
),
relation_id
:
commonLogic
.
appcommonhandle
(
"引用关系标识"
,
null
),
relation_name
:
commonLogic
.
appcommonhandle
(
"引用关系"
,
null
),
relation_code_name
:
commonLogic
.
appcommonhandle
(
"关系代码"
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-field/meta-field_en_US_base.ts
浏览文件 @
01e551b8
...
...
@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name
:
commonLogic
.
appcommonhandle
(
"显示名称"
,
null
),
ref_field_id
:
commonLogic
.
appcommonhandle
(
"引用属性标识"
,
null
),
ref_field_name
:
commonLogic
.
appcommonhandle
(
"引用属性名称"
,
null
),
ref_field_code_name
:
commonLogic
.
appcommonhandle
(
"引用属性代码名称"
,
null
),
relation_id
:
commonLogic
.
appcommonhandle
(
"引用关系标识"
,
null
),
relation_name
:
commonLogic
.
appcommonhandle
(
"引用关系"
,
null
),
relation_code_name
:
commonLogic
.
appcommonhandle
(
"关系代码"
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-field/meta-field_zh_CN_base.ts
浏览文件 @
01e551b8
...
...
@@ -15,6 +15,7 @@ function getLocaleResourceBase(){
field_show_name
:
commonLogic
.
appcommonhandle
(
"显示名称"
,
null
),
ref_field_id
:
commonLogic
.
appcommonhandle
(
"引用属性标识"
,
null
),
ref_field_name
:
commonLogic
.
appcommonhandle
(
"引用属性名称"
,
null
),
ref_field_code_name
:
commonLogic
.
appcommonhandle
(
"引用属性代码名称"
,
null
),
relation_id
:
commonLogic
.
appcommonhandle
(
"引用关系标识"
,
null
),
relation_name
:
commonLogic
.
appcommonhandle
(
"引用关系"
,
null
),
relation_code_name
:
commonLogic
.
appcommonhandle
(
"关系代码"
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @
01e551b8
...
...
@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar
:
{
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem1_export
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
},
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem2
:
{
caption
:
commonLogic
.
appcommonhandle
(
"-"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @
01e551b8
...
...
@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar
:
{
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem1_export
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
},
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem2
:
{
caption
:
commonLogic
.
appcommonhandle
(
"-"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @
01e551b8
...
...
@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar
:
{
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem1_export
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导出"
,
null
),
},
tbitem1_import
:
{
caption
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
"模型导入"
,
null
),
},
tbitem2
:
{
caption
:
commonLogic
.
appcommonhandle
(
"-"
,
null
),
tip
:
commonLogic
.
appcommonhandle
(
""
,
null
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @
01e551b8
...
...
@@ -13,18 +13,18 @@
<div
class=
'pull-right'
>
<div
class=
'toolbar-container'
>
<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_im
port' }, $event)">
<i-button
v-show=
"toolBarModels.tbitem1_
export.visabled"
:disabled=
"toolBarModels.tbitem1_export.disabled"
class=
''
v-loading:i-button
@
click=
"toolbar_click(
{ tag: 'tbitem1_ex
port' }, $event)">
<i
class=
''
></i>
<span
class=
'caption'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
im
port.caption'
)
}}
</span>
<span
class=
'caption'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
ex
port.caption'
)
}}
</span>
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
im
port.tip'
)
}}
</div>
<div
slot=
'content'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
ex
port.tip'
)
}}
</div>
</tooltip>
<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_ex
port' }, $event)">
<i-button
v-show=
"toolBarModels.tbitem1_
import.visabled"
:disabled=
"toolBarModels.tbitem1_import.disabled"
class=
''
v-loading:i-button
@
click=
"toolbar_click(
{ tag: 'tbitem1_im
port' }, $event)">
<i
class=
''
></i>
<span
class=
'caption'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
ex
port.caption'
)
}}
</span>
<span
class=
'caption'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
im
port.caption'
)
}}
</span>
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
ex
port.tip'
)
}}
</div>
<div
slot=
'content'
>
{{
$t
(
'entities.metamodel.gridviewtoolbar_toolbar.tbitem1_
im
port.tip'
)
}}
</div>
</tooltip>
<span
class=
'seperator'
>
|
</span>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
...
...
@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
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_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
:
{
}
},
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 {
* @memberof MetaModelGridViewBase
*/
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'
))
{
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'
))
{
this
.
toolbar_tbitem3_click
(
null
,
''
,
$event2
);
}
...
...
@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public
toolbar_tbitem1_
im
port_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
public
toolbar_tbitem1_
ex
port_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
...
...
@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const
curUIService
:
MetaModelUIService
=
new
MetaModelUIService
();
curUIService
.
MetaModel_
im
port
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"MetaModel"
);
curUIService
.
MetaModel_
ex
port
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"MetaModel"
);
}
/**
...
...
@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public
toolbar_tbitem1_
ex
port_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
public
toolbar_tbitem1_
im
port_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
// 参数
// 取数
let
datas
:
any
[]
=
[];
...
...
@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const
curUIService
:
MetaModelUIService
=
new
MetaModelUIService
();
curUIService
.
MetaModel_
ex
port
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"MetaModel"
);
curUIService
.
MetaModel_
im
port
(
datas
,
contextJO
,
paramJO
,
$event
,
xData
,
this
,
"MetaModel"
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/meta-field/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @
01e551b8
...
...
@@ -51,6 +51,9 @@ export default class PickupViewpickupviewpanelModel {
{
name
:
'ref_field_name'
,
},
{
name
:
'ref_field_code_name'
,
},
{
name
:
'relation_id'
,
},
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/MetaField.java
浏览文件 @
01e551b8
...
...
@@ -143,6 +143,14 @@ public class MetaField extends EntityMP implements Serializable {
@JsonProperty
(
"ref_field_name"
)
@ApiModelProperty
(
"引用属性名称"
)
private
String
refFieldName
;
/**
* 引用属性代码名称
*/
@TableField
(
exist
=
false
)
@JSONField
(
name
=
"ref_field_code_name"
)
@JsonProperty
(
"ref_field_code_name"
)
@ApiModelProperty
(
"引用属性代码名称"
)
private
String
refFieldCodeName
;
/**
* 引用关系标识
*/
...
...
This diff is collapsed.
Click to expand it.
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
reffield
=
majorEntity
;
}
et
.
setRefFieldName
(
reffield
.
getFieldName
());
et
.
setRefFieldCodeName
(
reffield
.
getCodeName
());
}
//实体关系[DER1N_META_FIELD_META_RELATION_RELATIONID]
if
(!
ObjectUtils
.
isEmpty
(
et
.
getRelationId
())){
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
01e551b8
...
...
@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet
author=
"root"
id=
"tab-da_report-1
1
-4"
>
<changeSet
author=
"root"
id=
"tab-da_report-1
2
-4"
>
<createTable
tableName=
"IBZDAREPORT"
>
<column
name=
"REPORTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_REPORT_REPORTID"
/>
...
...
@@ -326,7 +326,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet
author=
"root"
id=
"tab-meta_field-1-13"
>
<changeSet
author=
"root"
id=
"tab-meta_field-1
1
-13"
>
<createTable
tableName=
"IBZFIELD"
>
<column
name=
"FIELDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_FIELD_FIELDID"
/>
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/resources/mapper/lite/metafield/MetaFieldMapper.xml
浏览文件 @
01e551b8
...
...
@@ -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}]]>
</select>
<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, t
21.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 = t2
1.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, t
31.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 = t3
1.RELATIONID ) t1 where fieldid=#{id}]]>
</select>
<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}]]>
...
...
@@ -67,7 +67,7 @@
</sql>
<!--数据查询[Default]-->
<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, t
21.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 = t2
1.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, t
31.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 = t3
1.RELATIONID
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -82,7 +82,7 @@
</sql>
<!--数据查询[View]-->
<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, t
21.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 = t2
1.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, t
31.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 = t3
1.RELATIONID
]]>
</sql>
<!--数据查询[View]-->
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @
01e551b8
...
...
@@ -2548,7 +2548,7 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1
4
,
"show_order"
:
1
2
,
"major_field"
:
0
},
{
...
...
@@ -2566,7 +2566,25 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"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
},
{
...
...
@@ -2584,7 +2602,7 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1
6
,
"show_order"
:
1
5
,
"major_field"
:
0
},
{
...
...
@@ -2602,7 +2620,7 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1
7
,
"show_order"
:
1
6
,
"major_field"
:
0
},
{
...
...
@@ -2620,7 +2638,7 @@
"data_type"
:
"VARCHAR"
,
"data_length"
:
100
,
"key_field"
:
0
,
"show_order"
:
1
8
,
"show_order"
:
1
7
,
"major_field"
:
0
},
{
...
...
This diff is collapsed.
Click to expand it.
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 {
@ApiModelProperty
(
"引用属性名称"
)
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]
*
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录