Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
978b56f3
提交
978b56f3
编写于
3月 09, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-dst,应用]
上级
1d75f3d6
变更
14
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
240 行增加
和
27 行删除
+240
-27
table-sync_BO_CN_base.ts
...ocale/lanres/entities/table-sync/table-sync_BO_CN_base.ts
+4
-0
table-sync_en_US_base.ts
...ocale/lanres/entities/table-sync/table-sync_en_US_base.ts
+4
-0
table-sync_zh_CN_base.ts
...ocale/lanres/entities/table-sync/table-sync_zh_CN_base.ts
+4
-0
default-searchform-base.vue
...table-sync/default-searchform/default-searchform-base.vue
+43
-0
default-searchform-model.ts
...table-sync/default-searchform/default-searchform-model.ts
+5
-0
main-form-base.vue
app_web/src/widgets/table-sync/main-form/main-form-base.vue
+47
-0
main-form-model.ts
app_web/src/widgets/table-sync/main-form/main-form-model.ts
+5
-0
main-grid-base.vue
app_web/src/widgets/table-sync/main-grid/main-grid-base.vue
+35
-1
main-grid-model.ts
app_web/src/widgets/table-sync/main-grid/main-grid-model.ts
+15
-5
TableSync.java
.../src/main/java/cn/ibizlab/core/lite/domain/TableSync.java
+17
-0
TableSyncSearchContext.java
...a/cn/ibizlab/core/lite/filter/TableSyncSearchContext.java
+7
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+23
-21
ibzdst.json
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
+14
-0
TableSyncDTO.java
...er-api/src/main/java/cn/ibizlab/api/dto/TableSyncDTO.java
+17
-0
未找到文件。
app_web/src/locale/lanres/entities/table-sync/table-sync_BO_CN_base.ts
浏览文件 @
978b56f3
...
...
@@ -23,6 +23,7 @@ function getLocaleResourceBase(){
last_run_result
:
commonLogic
.
appcommonhandle
(
"上次运行结果"
,
null
),
last_read
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
last_write
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
is_enable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
views
:
{
...
...
@@ -67,6 +68,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
uiactions
:
{
...
...
@@ -85,6 +87,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
uiactions
:
{
...
...
@@ -97,6 +100,7 @@ function getLocaleResourceBase(){
n_srcentityname_like
:
commonLogic
.
appcommonhandle
(
"源实体名称(文本包含(%))"
,
null
),
n_entityname_like
:
commonLogic
.
appcommonhandle
(
"目标实体标识(文本包含(%))"
,
null
),
n_lastrunresult_eq
:
commonLogic
.
appcommonhandle
(
"上次运行结果(等于(=))"
,
null
),
n_isenable_eq
:
commonLogic
.
appcommonhandle
(
"是否启用(=)"
,
null
),
n_systemid_eq
:
commonLogic
.
appcommonhandle
(
"系统标识(等于(=))"
,
null
),
},
uiactions
:
{
...
...
app_web/src/locale/lanres/entities/table-sync/table-sync_en_US_base.ts
浏览文件 @
978b56f3
...
...
@@ -23,6 +23,7 @@ function getLocaleResourceBase(){
last_run_result
:
commonLogic
.
appcommonhandle
(
"上次运行结果"
,
null
),
last_read
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
last_write
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
is_enable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
views
:
{
...
...
@@ -67,6 +68,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
uiactions
:
{
...
...
@@ -85,6 +87,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
uiactions
:
{
...
...
@@ -97,6 +100,7 @@ function getLocaleResourceBase(){
n_srcentityname_like
:
commonLogic
.
appcommonhandle
(
"源实体名称(文本包含(%))"
,
null
),
n_entityname_like
:
commonLogic
.
appcommonhandle
(
"目标实体标识(文本包含(%))"
,
null
),
n_lastrunresult_eq
:
commonLogic
.
appcommonhandle
(
"上次运行结果(等于(=))"
,
null
),
n_isenable_eq
:
commonLogic
.
appcommonhandle
(
"是否启用(=)"
,
null
),
n_systemid_eq
:
commonLogic
.
appcommonhandle
(
"系统标识(等于(=))"
,
null
),
},
uiactions
:
{
...
...
app_web/src/locale/lanres/entities/table-sync/table-sync_zh_CN_base.ts
浏览文件 @
978b56f3
...
...
@@ -23,6 +23,7 @@ function getLocaleResourceBase(){
last_run_result
:
commonLogic
.
appcommonhandle
(
"上次运行结果"
,
null
),
last_read
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
last_write
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
is_enable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
views
:
{
...
...
@@ -67,6 +68,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
updatedate
:
commonLogic
.
appcommonhandle
(
"最后修改时间"
,
null
),
},
uiactions
:
{
...
...
@@ -85,6 +87,7 @@ function getLocaleResourceBase(){
lastendtime
:
commonLogic
.
appcommonhandle
(
"上次运行结束时间"
,
null
),
lastread
:
commonLogic
.
appcommonhandle
(
"上次运行读取行"
,
null
),
lastwrite
:
commonLogic
.
appcommonhandle
(
"上次运行写入行"
,
null
),
isenable
:
commonLogic
.
appcommonhandle
(
"是否启用"
,
null
),
},
nodata
:
commonLogic
.
appcommonhandle
(
""
,
null
),
uiactions
:
{
...
...
@@ -97,6 +100,7 @@ function getLocaleResourceBase(){
n_srcentityname_like
:
commonLogic
.
appcommonhandle
(
"源实体名称(文本包含(%))"
,
null
),
n_entityname_like
:
commonLogic
.
appcommonhandle
(
"目标实体标识(文本包含(%))"
,
null
),
n_lastrunresult_eq
:
commonLogic
.
appcommonhandle
(
"上次运行结果(等于(=))"
,
null
),
n_isenable_eq
:
commonLogic
.
appcommonhandle
(
"是否启用(=)"
,
null
),
n_systemid_eq
:
commonLogic
.
appcommonhandle
(
"系统标识(等于(=))"
,
null
),
},
uiactions
:
{
...
...
app_web/src/widgets/table-sync/default-searchform/default-searchform-base.vue
浏览文件 @
978b56f3
...
...
@@ -59,6 +59,27 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.n_isenable_eq.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item
name=
'n_isenable_eq'
:itemRules=
"this.rules.n_isenable_eq"
class=
''
:caption=
"$t('entities.tablesync.default_searchform.details.n_isenable_eq')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.n_isenable_eq.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<dropdown-list
v-model=
"data.n_isenable_eq"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'
{ }'
:localParam ='{ }'
:disabled="detailsModel.n_isenable_eq.disabled"
valueType="number"
style="width: 100px;"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</i-col>
</row>
</i-col>
...
...
@@ -321,6 +342,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
n_srcentityname_like
:
null
,
n_entityname_like
:
null
,
n_lastrunresult_eq
:
null
,
n_isenable_eq
:
null
,
n_systemid_eq
:
null
,
};
...
...
@@ -340,6 +362,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
n_entityname_like
:
new
FormItemModel
({
caption
:
'目标实体标识(文本包含(%))'
,
detailType
:
'FORMITEM'
,
name
:
'n_entityname_like'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
n_lastrunresult_eq
:
new
FormItemModel
({
caption
:
'上次运行结果(等于(=))'
,
detailType
:
'FORMITEM'
,
name
:
'n_lastrunresult_eq'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
n_isenable_eq
:
new
FormItemModel
({
caption
:
'是否启用(=)'
,
detailType
:
'FORMITEM'
,
name
:
'n_isenable_eq'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
n_systemid_eq
:
new
FormItemModel
({
caption
:
'系统标识(等于(=))'
,
detailType
:
'FORMITEM'
,
name
:
'n_systemid_eq'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -376,6 +400,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
{
required
:
this
.
detailsModel
.
n_lastrunresult_eq
.
required
,
type
:
'string'
,
message
:
'上次运行结果(等于(=)) 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
n_lastrunresult_eq
.
required
,
type
:
'string'
,
message
:
'上次运行结果(等于(=)) 值不能为空'
,
trigger
:
'blur'
},
],
n_isenable_eq
:
[
{
type
:
'number'
,
message
:
'是否启用(=) 值必须为数值类型'
,
trigger
:
'change'
},
{
type
:
'number'
,
message
:
'是否启用(=) 值必须为数值类型'
,
trigger
:
'blur'
},
{
required
:
this
.
detailsModel
.
n_isenable_eq
.
required
,
type
:
'number'
,
message
:
'是否启用(=) 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
n_isenable_eq
.
required
,
type
:
'number'
,
message
:
'是否启用(=) 值不能为空'
,
trigger
:
'blur'
},
],
n_systemid_eq
:
[
{
type
:
'string'
,
message
:
'系统标识(等于(=)) 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'系统标识(等于(=)) 值必须为字符串类型'
,
trigger
:
'blur'
},
...
...
@@ -432,6 +462,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'n_lastrunresult_eq'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 n_isenable_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@
Watch
(
'data.n_isenable_eq'
)
onN_isenable_eqChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'n_isenable_eq'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 n_systemid_eq 值
*
...
...
@@ -470,6 +512,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
...
...
app_web/src/widgets/table-sync/default-searchform/default-searchform-model.ts
浏览文件 @
978b56f3
...
...
@@ -45,6 +45,11 @@ export default class DefaultModel {
prop
:
'last_run_result'
,
dataType
:
'TEXT'
,
},
{
name
:
'n_isenable_eq'
,
prop
:
'is_enable'
,
dataType
:
'YESNO'
,
},
{
name
:
'n_systemid_eq'
,
prop
:
'system_id'
,
...
...
app_web/src/widgets/table-sync/main-form/main-form-base.vue
浏览文件 @
978b56f3
...
...
@@ -245,6 +245,27 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.isenable.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'isenable'
:itemRules=
"this.rules().isenable"
class=
''
:caption=
"$t('entities.tablesync.main_form.details.isenable')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.isenable.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<dropdown-list
v-model=
"data.isenable"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'
{ }'
:localParam ='{ }'
:disabled="detailsModel.isenable.disabled"
valueType="number"
style="width:100px;width: 100px;"
tag='YesNo'
codelistType='STATIC'
placeholder='请选择...'>
</dropdown-list>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.updatedate.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'updatedate'
:itemRules=
"this.rules().updatedate"
class=
''
:caption=
"$t('entities.tablesync.main_form.details.updatedate')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.updatedate.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
...
...
@@ -685,6 +706,7 @@ export default class MainBase extends Vue implements ControlInterface {
lastendtime
:
null
,
lastread
:
null
,
lastwrite
:
null
,
isenable
:
null
,
updatedate
:
null
,
tablesync
:
null
,
};
...
...
@@ -809,6 +831,10 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
this
.
detailsModel
.
lastwrite
.
required
,
type
:
'number'
,
message
:
'上次运行写入行 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
lastwrite
.
required
,
type
:
'number'
,
message
:
'上次运行写入行 值不能为空'
,
trigger
:
'blur'
},
],
isenable
:
[
{
required
:
this
.
detailsModel
.
isenable
.
required
,
type
:
'number'
,
message
:
'是否启用 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
isenable
.
required
,
type
:
'number'
,
message
:
'是否启用 值不能为空'
,
trigger
:
'blur'
},
],
updatedate
:
[
{
required
:
this
.
detailsModel
.
updatedate
.
required
,
type
:
'string'
,
message
:
'最后修改时间 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
updatedate
.
required
,
type
:
'string'
,
message
:
'最后修改时间 值不能为空'
,
trigger
:
'blur'
},
...
...
@@ -979,6 +1005,8 @@ export default class MainBase extends Vue implements ControlInterface {
lastread
:
new
FormItemModel
({
caption
:
'上次运行读取行'
,
detailType
:
'FORMITEM'
,
name
:
'lastread'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
lastwrite
:
new
FormItemModel
({
caption
:
'上次运行写入行'
,
detailType
:
'FORMITEM'
,
name
:
'lastwrite'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
isenable
:
new
FormItemModel
({
caption
:
'是否启用'
,
detailType
:
'FORMITEM'
,
name
:
'isenable'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
updatedate
:
new
FormItemModel
({
caption
:
'最后修改时间'
,
detailType
:
'FORMITEM'
,
name
:
'updatedate'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -1320,6 +1348,18 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'lastwrite'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 isenable 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.isenable'
)
onIsenableChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'isenable'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 updatedate 值
*
...
...
@@ -1415,6 +1455,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
...
...
@@ -2505,6 +2546,9 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
this
.
data
.
hasOwnProperty
(
'systemid'
))
{
this
.
data
[
'systemid'
]
=
this
.
context
[
'dstsystemid'
];
}
if
(
this
.
data
.
hasOwnProperty
(
'isenable'
))
{
this
.
data
[
'isenable'
]
=
1
;
}
}
/**
...
...
@@ -2515,6 +2559,9 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
this
.
data
.
hasOwnProperty
(
'systemid'
)
&&
!
this
.
data
.
systemid
)
{
this
.
data
[
'systemid'
]
=
this
.
context
[
'dstsystemid'
];
}
if
(
this
.
data
.
hasOwnProperty
(
'isenable'
)
&&
!
this
.
data
.
isenable
)
{
this
.
data
[
'isenable'
]
=
1
;
}
}
...
...
app_web/src/widgets/table-sync/main-form/main-form-model.ts
浏览文件 @
978b56f3
...
...
@@ -155,6 +155,11 @@ export default class MainModel {
prop
:
'last_write'
,
dataType
:
'BIGINT'
,
},
{
name
:
'isenable'
,
prop
:
'is_enable'
,
dataType
:
'YESNO'
,
},
{
name
:
'updatedate'
,
prop
:
'updatedate'
,
...
...
app_web/src/widgets/table-sync/main-grid/main-grid-base.vue
浏览文件 @
978b56f3
...
...
@@ -154,6 +154,20 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('isenable')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'isenable'"
:label=
"$t('entities.tablesync.main_grid.columns.isenable')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.tablesync.main_grid.columns.isenable'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.isenable"
tag=
'YesNo'
codelistType=
'STATIC'
></codelist>
</
template
>
</template>
</el-table-column>
</template>
<
template
v-if=
"adaptiveState"
>
<el-table-column></el-table-column>
</
template
>
...
...
@@ -810,6 +824,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'isenable'
,
label
:
'是否启用'
,
langtag
:
'entities.tablesync.main_grid.columns.isenable'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
]
/**
...
...
@@ -1300,6 +1323,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'isenable'
,
srfkey
:
'YesNo'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
@@ -1506,7 +1537,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'syncname'
,
'syncgroup'
,
'runorder'
,
'entityname'
,
'srcentityname'
,
'etltimestamp'
,
'lastrunresult'
,
'lastruntime'
,
'lastendtime'
,
'lastread'
,
'lastwrite'
];
let
allColumns
:
Array
<
any
>
=
[
'syncname'
,
'syncgroup'
,
'runorder'
,
'entityname'
,
'srcentityname'
,
'etltimestamp'
,
'lastrunresult'
,
'lastruntime'
,
'lastendtime'
,
'lastread'
,
'lastwrite'
,
'isenable'
];
if
(
row
&&
row
.
children
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
...
...
@@ -1597,6 +1628,7 @@ export default class MainBase extends Vue implements ControlInterface {
lastendtime
:
''
,
lastread
:
''
,
lastwrite
:
''
,
isenable
:
''
,
children
:
children
}
groupTree
.
push
(
tree
);
...
...
@@ -1634,6 +1666,7 @@ export default class MainBase extends Vue implements ControlInterface {
lastendtime
:
''
,
lastread
:
''
,
lastwrite
:
''
,
isenable
:
''
,
children
:
child
}
if
(
child
&&
child
.
length
>
0
){
...
...
@@ -1691,6 +1724,7 @@ export default class MainBase extends Vue implements ControlInterface {
lastendtime
:
''
,
lastread
:
''
,
lastwrite
:
''
,
isenable
:
''
,
children
:
children
,
}
groupTree
.
push
(
tree
);
...
...
app_web/src/widgets/table-sync/main-grid/main-grid-model.ts
浏览文件 @
978b56f3
...
...
@@ -51,6 +51,11 @@ export default class MainModel {
prop
:
'source_entity_name'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'isenable'
,
prop
:
'is_enable'
,
dataType
:
'YESNO'
,
},
{
name
:
'srfmajortext'
,
prop
:
'name'
,
...
...
@@ -61,17 +66,17 @@ export default class MainModel {
prop
:
'id'
,
dataType
:
'TEXT'
,
},
{
name
:
'runorder'
,
prop
:
'run_order'
,
dataType
:
'INT'
,
},
{
name
:
'srfkey'
,
prop
:
'id'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
{
name
:
'runorder'
,
prop
:
'run_order'
,
dataType
:
'INT'
,
},
{
name
:
'srcentityid'
,
prop
:
'source_entity_id'
,
...
...
@@ -131,6 +136,11 @@ export default class MainModel {
prop
:
'n_lastrunresult_eq'
,
dataType
:
'QUERYPARAM'
},
{
name
:
'n_isenable_eq'
,
prop
:
'n_isenable_eq'
,
dataType
:
'QUERYPARAM'
},
{
name
:
'n_systemid_eq'
,
prop
:
'n_systemid_eq'
,
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/lite/domain/TableSync.java
浏览文件 @
978b56f3
...
...
@@ -217,6 +217,15 @@ public class TableSync extends EntityMP implements Serializable {
@JsonProperty
(
"last_write"
)
@ApiModelProperty
(
"上次运行写入行"
)
private
Long
lastWrite
;
/**
* 是否启用
*/
@DEField
(
defaultValue
=
"1"
)
@TableField
(
value
=
"isenable"
)
@JSONField
(
name
=
"is_enable"
)
@JsonProperty
(
"is_enable"
)
@ApiModelProperty
(
"是否启用"
)
private
Integer
isEnable
;
/**
* 最后修改时间
*/
...
...
@@ -428,6 +437,14 @@ public class TableSync extends EntityMP implements Serializable {
this
.
modify
(
"lastwrite"
,
lastWrite
);
}
/**
* 设置 [是否启用]
*/
public
void
setIsEnable
(
Integer
isEnable
)
{
this
.
isEnable
=
isEnable
;
this
.
modify
(
"isenable"
,
isEnable
);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/lite/filter/TableSyncSearchContext.java
浏览文件 @
978b56f3
...
...
@@ -90,6 +90,13 @@ public class TableSyncSearchContext extends QueryWrapperContext<TableSync> {
this
.
getSearchCond
().
eq
(
"lastrunresult"
,
n_lastrunresult_eq
);
}
}
private
Integer
n_isenable_eq
;
//[是否启用]
public
void
setN_isenable_eq
(
Integer
n_isenable_eq
)
{
this
.
n_isenable_eq
=
n_isenable_eq
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_isenable_eq
)){
this
.
getSearchCond
().
eq
(
"isenable"
,
n_isenable_eq
);
}
}
/**
* 启用快速搜索
...
...
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
978b56f3
...
...
@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_build-1-1"
>
<changeSet
author=
"
root
"
id=
"tab-da_build-1-1"
>
<createTable
tableName=
"IBZDABUILD"
>
<column
name=
"BUILDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_BUILD_BUILDID"
/>
...
...
@@ -32,7 +32,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_chart-1-2"
>
<changeSet
author=
"
root
"
id=
"tab-da_chart-1-2"
>
<createTable
tableName=
"IBZDACHART"
>
<column
name=
"CHARTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_CHART_CHARTID"
/>
...
...
@@ -54,7 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_metric-1-3"
>
<changeSet
author=
"
root
"
id=
"tab-da_metric-1-3"
>
<createTable
tableName=
"IBZDAMETRIC"
>
<column
name=
"DA_METRICID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_METRIC_DA_METRICID"
/>
...
...
@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_report-1-4"
>
<changeSet
author=
"
root
"
id=
"tab-da_report-1-4"
>
<createTable
tableName=
"IBZDAREPORT"
>
<column
name=
"REPORTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_REPORT_REPORTID"
/>
...
...
@@ -102,7 +102,7 @@
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dict_catalog-6-5"
>
<changeSet
author=
"
root
"
id=
"tab-dict_catalog-6-5"
>
<createTable
tableName=
"IBZDICTCATALOG"
>
<column
name=
"CID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DICT_CATALOG_CID"
/>
...
...
@@ -126,7 +126,7 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dict_option-5-6"
>
<changeSet
author=
"
root
"
id=
"tab-dict_option-5-6"
>
<createTable
tableName=
"IBZDICTOPTION"
>
<column
name=
"VKEY"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DICT_OPTION_VKEY"
/>
...
...
@@ -166,7 +166,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_datasource-1-7"
>
<changeSet
author=
"
root
"
id=
"tab-dst_datasource-1-7"
>
<createTable
tableName=
"IBZDATASOURCE"
>
<column
name=
"DSID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_DATASOURCE_DSID"
/>
...
...
@@ -182,7 +182,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_system-1-8"
>
<changeSet
author=
"
root
"
id=
"tab-dst_system-1-8"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
...
...
@@ -202,7 +202,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execlog-1-9"
>
<changeSet
author=
"
root
"
id=
"tab-ru_execlog-1-9"
>
<createTable
tableName=
"IBZRULELOG"
>
<column
name=
"RU_EXECLOGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECLOG_RU_EXECLOGID"
/>
...
...
@@ -232,7 +232,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execresult-1-10"
>
<changeSet
author=
"
root
"
id=
"tab-ru_execresult-1-10"
>
<createTable
tableName=
"IBZRULERESULT"
>
<column
name=
"RU_EXECRESULTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECRESULT_RU_EXECRESULT"
/>
...
...
@@ -272,7 +272,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_dataset-1-11"
>
<changeSet
author=
"
root
"
id=
"tab-meta_dataset-1-11"
>
<createTable
tableName=
"IBZDATASET"
>
<column
name=
"DATASETID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_DATASET_DATASETID"
/>
...
...
@@ -294,7 +294,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_entity-5-12"
>
<changeSet
author=
"
root
"
id=
"tab-meta_entity-5-12"
>
<createTable
tableName=
"IBZENTITY"
>
<column
name=
"ENTITYID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_ENTITY_ENTITYID"
/>
...
...
@@ -326,7 +326,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_field-1-13"
>
<changeSet
author=
"
root
"
id=
"tab-meta_field-1-13"
>
<createTable
tableName=
"IBZFIELD"
>
<column
name=
"FIELDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_FIELD_FIELDID"
/>
...
...
@@ -390,7 +390,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_model-1-14"
>
<changeSet
author=
"
root
"
id=
"tab-meta_model-1-14"
>
<createTable
tableName=
"IBZMODEL"
>
<column
name=
"MODELID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODEL_MODELID"
/>
...
...
@@ -416,7 +416,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_module-1-15"
>
<changeSet
author=
"
root
"
id=
"tab-meta_module-1-15"
>
<createTable
tableName=
"IBZMODULE"
>
<column
name=
"MODULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODULE_MODULEID"
/>
...
...
@@ -434,7 +434,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_relation-1-16"
>
<changeSet
author=
"
root
"
id=
"tab-meta_relation-1-16"
>
<createTable
tableName=
"IBZRELATION"
>
<column
name=
"RELATIONID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_RELATION_RELATIONID"
/>
...
...
@@ -466,7 +466,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_engine-1-17"
>
<changeSet
author=
"
root
"
id=
"tab-ru_engine-1-17"
>
<createTable
tableName=
"IBZRULEENGINE"
>
<column
name=
"ENGINEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ENGINE_ENGINEID"
/>
...
...
@@ -494,7 +494,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_item-1-18"
>
<changeSet
author=
"
root
"
id=
"tab-ru_item-1-18"
>
<createTable
tableName=
"IBZRULE"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
...
...
@@ -530,7 +530,7 @@
<!--输出实体[ETL_TABLE_SYNC]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-etl_table_sync-51-19"
>
<changeSet
author=
"
root
"
id=
"tab-etl_table_sync-51-19"
>
<createTable
tableName=
"IBZTABLESYNC"
>
<column
name=
"SYNCID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_ETL_TABLE_SYNC_SYNCID"
/>
...
...
@@ -573,6 +573,8 @@
</column>
<column
name=
"LASTWRITE"
remarks=
""
type=
"BIGINT"
>
</column>
<column
name=
"ISENABLE"
remarks=
""
type=
"INT"
>
</column>
<column
name=
"UPDATEDATE"
remarks=
""
type=
"DATETIME"
>
</column>
</createTable>
...
...
@@ -581,13 +583,13 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-da_metric-1-20"
>
<changeSet
author=
"
root
"
id=
"fk-da_metric-1-20"
>
<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]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-dict_option-5-21"
>
<changeSet
author=
"
root
"
id=
"fk-dict_option-5-21"
>
<addForeignKeyConstraint
baseColumnNames=
"CID"
baseTableName=
"IBZDICTOPTION"
constraintName=
"DER1N_DICT_OPTION_DICT_CATALOG"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"CID"
referencedTableName=
"IBZDICTCATALOG"
validate=
"true"
/>
</changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 -->
...
...
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @
978b56f3
...
...
@@ -4259,6 +4259,20 @@
"major_field"
:
0
},
{
"fieldname"
:
"ISENABLE"
,
"codename"
:
"Is_enable"
,
"field_logic_name"
:
"是否启用"
,
"entity_name"
:
"ETL_TABLE_SYNC"
,
"field_type"
:
"YESNO"
,
"dict"
:
"YesNo"
,
"nullable"
:
1
,
"physical_field"
:
1
,
"data_type"
:
"INT"
,
"key_field"
:
0
,
"show_order"
:
30
,
"major_field"
:
0
},
{
"fieldname"
:
"UPDATEDATE"
,
"codename"
:
"UpdateDate"
,
"field_logic_name"
:
"最后修改时间"
,
...
...
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/TableSyncDTO.java
浏览文件 @
978b56f3
...
...
@@ -231,6 +231,15 @@ public class TableSyncDTO extends DTOBase implements Serializable {
@ApiModelProperty
(
"上次运行写入行"
)
private
Long
lastWrite
;
/**
* 属性 [ISENABLE]
*
*/
@JSONField
(
name
=
"is_enable"
)
@JsonProperty
(
"is_enable"
)
@ApiModelProperty
(
"是否启用"
)
private
Integer
isEnable
;
/**
* 属性 [UPDATEDATE]
*
...
...
@@ -394,6 +403,14 @@ public class TableSyncDTO extends DTOBase implements Serializable {
this
.
modify
(
"lastwrite"
,
lastWrite
);
}
/**
* 设置 [ISENABLE]
*/
public
void
setIsEnable
(
Integer
isEnable
){
this
.
isEnable
=
isEnable
;
this
.
modify
(
"isenable"
,
isEnable
);
}
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录