Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
91ff6f9d
提交
91ff6f9d
编写于
12月 11, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibz-dst,应用]
上级
4abfeff3
变更
9
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
169 行增加
和
59 行删除
+169
-59
rule-item_en_US.ts
...b/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
+4
-1
rule-item_zh_CN.ts
...b/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
+4
-1
main-form-base.vue
app_web/src/widgets/rule-item/main-form/main-form-base.vue
+40
-6
main-form-model.ts
app_web/src/widgets/rule-item/main-form/main-form-model.ts
+5
-0
main-grid-base.vue
app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
+67
-19
main-grid-model.ts
app_web/src/widgets/rule-item/main-grid/main-grid-model.ts
+21
-11
RuleItemSearchContext.java
...va/cn/ibizlab/core/rule/filter/RuleItemSearchContext.java
+7
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+18
-18
RuleItemMapper.xml
...rc/main/resources/mapper/rule/ruleitem/RuleItemMapper.xml
+3
-3
未找到文件。
app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
浏览文件 @
91ff6f9d
...
...
@@ -54,6 +54,7 @@ export default {
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
rulecode
:
"规则码"
,
rulename
:
"名称"
,
modelname
:
"模型"
,
businesscat
:
"业务类别"
,
...
...
@@ -76,12 +77,14 @@ export default {
main_grid
:
{
columns
:
{
ruleid
:
"规则标识"
,
rulecode
:
"规则码"
,
rulename
:
"名称"
,
rulegroup
:
"规则分组"
,
memo
:
"备注"
,
businesscat
:
"业务类别"
,
modelname
:
"模型"
,
createdate
:
"建立时间"
,
updatedate
:
"更新时间"
,
createdate
:
"建立时间"
,
},
nodata
:
""
,
uiactions
:
{
...
...
app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
浏览文件 @
91ff6f9d
...
...
@@ -53,6 +53,7 @@ export default {
srfuf
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
rulecode
:
"规则码"
,
rulename
:
"名称"
,
modelname
:
"模型"
,
businesscat
:
"业务类别"
,
...
...
@@ -75,12 +76,14 @@ export default {
main_grid
:
{
columns
:
{
ruleid
:
"规则标识"
,
rulecode
:
"规则码"
,
rulename
:
"名称"
,
rulegroup
:
"规则分组"
,
memo
:
"备注"
,
businesscat
:
"业务类别"
,
modelname
:
"模型"
,
createdate
:
"建立时间"
,
updatedate
:
"更新时间"
,
createdate
:
"建立时间"
,
},
nodata
:
""
,
uiactions
:
{
...
...
app_web/src/widgets/rule-item/main-form/main-form-base.vue
浏览文件 @
91ff6f9d
...
...
@@ -5,7 +5,21 @@
<i-col
v-show=
"detailsModel.group1.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-group
:uiService=
"appUIService"
:data=
"transformData(data)"
:manageContainerStatus=
"detailsModel.group1.manageContainerStatus"
:isManageContainer=
"detailsModel.group1.isManageContainer"
@
managecontainerclick=
"manageContainerClick('group1')"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.ruleitem.main_form.details.group1')"
:isShowCaption=
"false"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<row>
<i-col
v-show=
"detailsModel.rulename.visible"
:style=
"
{}" :sm="{ span: 8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<i-col
v-show=
"detailsModel.rulecode.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item
name=
'rulecode'
:itemRules=
"this.rules().rulecode"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.rulecode')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.rulecode.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<input-box
v-model=
"data.rulecode"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.rulecode.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.rulename.visible"
:style=
"
{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item
name=
'rulename'
:itemRules=
"this.rules().rulename"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.rulename')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.rulename.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<input-box
v-model=
"data.rulename"
...
...
@@ -19,7 +33,7 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.modelname.visible"
:style=
"
{}" :sm="{ span:
8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8
, offset: 0 }">
<i-col
v-show=
"detailsModel.modelname.visible"
:style=
"
{}" :sm="{ span:
12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6
, offset: 0 }">
<app-form-item
name=
'modelname'
:itemRules=
"this.rules().modelname"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.modelname')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.modelname.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<app-picker
...
...
@@ -47,7 +61,7 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.businesscat.visible"
:style=
"
{}" :sm="{ span:
8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8
, offset: 0 }">
<i-col
v-show=
"detailsModel.businesscat.visible"
:style=
"
{}" :sm="{ span:
12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6
, offset: 0 }">
<app-form-item
name=
'businesscat'
:itemRules=
"this.rules().businesscat"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.businesscat')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.businesscat.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<input-box
v-model=
"data.businesscat"
...
...
@@ -136,7 +150,7 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.custag.visible"
:style=
"
{}" :sm="{ span:
8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8
, offset: 0 }">
<i-col
v-show=
"detailsModel.custag.visible"
:style=
"
{}" :sm="{ span:
12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6
, offset: 0 }">
<app-form-item
name=
'custag'
:itemRules=
"this.rules().custag"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.custag')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.custag.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<dropdown-list
...
...
@@ -157,7 +171,7 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.createdate.visible"
:style=
"
{}" :sm="{ span:
8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8
, offset: 0 }">
<i-col
v-show=
"detailsModel.createdate.visible"
:style=
"
{}" :sm="{ span:
12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6
, offset: 0 }">
<app-form-item
name=
'createdate'
:itemRules=
"this.rules().createdate"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.createdate')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.createdate.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<app-span
name=
'createdate'
:value=
"data.createdate"
dataType=
"DATETIME"
valueFormat=
"%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
:precision=
"0"
...
...
@@ -167,7 +181,7 @@
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.updatedate.visible"
:style=
"
{}" :sm="{ span:
8, offset: 0 }" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8
, offset: 0 }">
<i-col
v-show=
"detailsModel.updatedate.visible"
:style=
"
{}" :sm="{ span:
12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6
, offset: 0 }">
<app-form-item
name=
'updatedate'
:itemRules=
"this.rules().updatedate"
class=
''
:caption=
"$t('entities.ruleitem.main_form.details.updatedate')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.updatedate.error"
:isEmptyCaption=
"false"
labelPos=
"TOP"
>
<app-span
name=
'updatedate'
:value=
"data.updatedate"
dataType=
"DATETIME"
valueFormat=
"%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS"
:precision=
"0"
...
...
@@ -577,6 +591,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf
:
null
,
srfdeid
:
null
,
srfsourcekey
:
null
,
rulecode
:
null
,
rulename
:
null
,
modelname
:
null
,
businesscat
:
null
,
...
...
@@ -643,6 +658,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
rules
()
:
any
{
return
{
rulecode
:
[
{
required
:
this
.
detailsModel
.
rulecode
.
required
,
type
:
'string'
,
message
:
'规则码 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
rulecode
.
required
,
type
:
'string'
,
message
:
'规则码 值不能为空'
,
trigger
:
'blur'
},
],
rulename
:
[
{
required
:
this
.
detailsModel
.
rulename
.
required
,
type
:
'string'
,
message
:
'名称 值不能为空'
,
trigger
:
'change'
},
{
required
:
this
.
detailsModel
.
rulename
.
required
,
type
:
'string'
,
message
:
'名称 值不能为空'
,
trigger
:
'blur'
},
...
...
@@ -817,6 +836,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfdeid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
rulecode
:
new
FormItemModel
({
caption
:
'规则码'
,
detailType
:
'FORMITEM'
,
name
:
'rulecode'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
true
,
disabled
:
false
,
enableCond
:
3
})
,
rulename
:
new
FormItemModel
({
caption
:
'名称'
,
detailType
:
'FORMITEM'
,
name
:
'rulename'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
required
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
...
...
@@ -946,6 +967,18 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'srfsourcekey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 rulecode 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.rulecode'
)
onRulecodeChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'rulecode'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 rulename 值
*
...
...
@@ -1207,6 +1240,7 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
Object
.
is
(
name
,
'modelname'
)){
...
...
app_web/src/widgets/rule-item/main-form/main-form-model.ts
浏览文件 @
91ff6f9d
...
...
@@ -55,6 +55,11 @@ export default class MainModel {
{
name
:
'srfsourcekey'
,
},
{
name
:
'rulecode'
,
prop
:
'rule_code'
,
dataType
:
'TEXT'
,
},
{
name
:
'rulename'
,
prop
:
'rule_name'
,
...
...
app_web/src/widgets/rule-item/main-grid/main-grid-base.vue
浏览文件 @
91ff6f9d
...
...
@@ -33,8 +33,20 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('rulecode')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'rulecode'"
:label=
"$t('entities.ruleitem.main_grid.columns.rulecode')"
:width=
"200"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ruleitem.main_grid.columns.rulecode'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
rulecode
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('rulename')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'rulename'"
:label=
"$t('entities.ruleitem.main_grid.columns.rulename')"
:width=
"
3
00"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'rulename'"
:label=
"$t('entities.ruleitem.main_grid.columns.rulename')"
:width=
"
4
00"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ruleitem.main_grid.columns.rulename'
)
}}
...
...
@@ -59,6 +71,18 @@
</template>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('memo')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'memo'"
:label=
"$t('entities.ruleitem.main_grid.columns.memo')"
:width=
"400"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ruleitem.main_grid.columns.memo'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
memo
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('businesscat')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'businesscat'"
:label=
"$t('entities.ruleitem.main_grid.columns.businesscat')"
:width=
"300"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
...
...
@@ -83,27 +107,27 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('
cre
atedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'
createdate'"
:label=
"$t('entities.ruleitem.main_grid.columns.cre
atedate')"
:width=
"300"
:align=
"'left'"
:sortable=
"'custom'"
>
<
template
v-if=
"getColumnState('
upd
atedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'
updatedate'"
:label=
"$t('entities.ruleitem.main_grid.columns.upd
atedate')"
:width=
"300"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ruleitem.main_grid.columns.
cre
atedate'
)
}}
{{
$t
(
'entities.ruleitem.main_grid.columns.
upd
atedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<app-format-data
format=
"YYYY-MM-DD HH:mm:ss"
:data=
"row.
cre
atedate"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD HH:mm:ss"
:data=
"row.
upd
atedate"
></app-format-data>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('
upd
atedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'
updatedate'"
:label=
"$t('entities.ruleitem.main_grid.columns.upd
atedate')"
:width=
"300"
:align=
"'left'"
:sortable=
"'custom'"
>
<
template
v-if=
"getColumnState('
cre
atedate')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'
createdate'"
:label=
"$t('entities.ruleitem.main_grid.columns.cre
atedate')"
:width=
"300"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ruleitem.main_grid.columns.
upd
atedate'
)
}}
{{
$t
(
'entities.ruleitem.main_grid.columns.
cre
atedate'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<app-format-data
format=
"YYYY-MM-DD HH:mm:ss"
:data=
"row.
upd
atedate"
></app-format-data>
<app-format-data
format=
"YYYY-MM-DD HH:mm:ss"
:data=
"row.
cre
atedate"
></app-format-data>
</
template
>
</el-table-column>
</template>
...
...
@@ -659,6 +683,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'rulecode'
,
label
:
'规则码'
,
langtag
:
'entities.ruleitem.main_grid.columns.rulecode'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'rulename'
,
label
:
'名称'
,
...
...
@@ -677,6 +710,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'memo'
,
label
:
'备注'
,
langtag
:
'entities.ruleitem.main_grid.columns.memo'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'businesscat'
,
label
:
'业务类别'
,
...
...
@@ -696,18 +738,18 @@ export default class MainBase extends Vue implements ControlInterface {
enableCond
:
3
,
},
{
name
:
'
cre
atedate'
,
label
:
'
建立
时间'
,
langtag
:
'entities.ruleitem.main_grid.columns.
cre
atedate'
,
name
:
'
upd
atedate'
,
label
:
'
更新
时间'
,
langtag
:
'entities.ruleitem.main_grid.columns.
upd
atedate'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'
upd
atedate'
,
label
:
'
更新
时间'
,
langtag
:
'entities.ruleitem.main_grid.columns.
upd
atedate'
,
name
:
'
cre
atedate'
,
label
:
'
建立
时间'
,
langtag
:
'entities.ruleitem.main_grid.columns.
cre
atedate'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
...
...
@@ -1411,7 +1453,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'ruleid'
,
'rule
name'
,
'rulegroup'
,
'businesscat'
,
'modelname'
,
'createdate'
,
'upd
atedate'
];
let
allColumns
:
Array
<
any
>
=
[
'ruleid'
,
'rule
code'
,
'rulename'
,
'rulegroup'
,
'memo'
,
'businesscat'
,
'modelname'
,
'updatedate'
,
'cre
atedate'
];
if
(
row
&&
row
.
children
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
...
...
@@ -1492,12 +1534,14 @@ export default class MainBase extends Vue implements ControlInterface {
groupById
:
Number
((
i
+
1
)
*
100
),
group
:
group
.
label
,
ruleid
:
''
,
rulecode
:
''
,
rulename
:
''
,
rulegroup
:
''
,
memo
:
''
,
businesscat
:
''
,
modelname
:
''
,
createdate
:
''
,
updatedate
:
''
,
createdate
:
''
,
children
:
children
}
groupTree
.
push
(
tree
);
...
...
@@ -1525,12 +1569,14 @@ export default class MainBase extends Vue implements ControlInterface {
groupById
:
Number
((
allGroup
.
length
+
1
)
*
100
),
group
:
this
.
$t
(
'app.gridpage.other'
),
ruleid
:
''
,
rulecode
:
''
,
rulename
:
''
,
rulegroup
:
''
,
memo
:
''
,
businesscat
:
''
,
modelname
:
''
,
createdate
:
''
,
updatedate
:
''
,
createdate
:
''
,
children
:
child
}
if
(
child
&&
child
.
length
>
0
){
...
...
@@ -1578,12 +1624,14 @@ export default class MainBase extends Vue implements ControlInterface {
groupById
:
Number
((
groupIndex
+
1
)
*
100
),
group
:
group
,
ruleid
:
''
,
rulecode
:
''
,
rulename
:
''
,
rulegroup
:
''
,
memo
:
''
,
businesscat
:
''
,
modelname
:
''
,
createdate
:
''
,
updatedate
:
''
,
createdate
:
''
,
children
:
children
,
}
groupTree
.
push
(
tree
);
...
...
app_web/src/widgets/rule-item/main-grid/main-grid-model.ts
浏览文件 @
91ff6f9d
...
...
@@ -31,6 +31,16 @@ export default class MainModel {
prop
:
'model_name'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'memo'
,
prop
:
'memo'
,
dataType
:
'LONGTEXT_1000'
,
},
{
name
:
'rulecode'
,
prop
:
'rule_code'
,
dataType
:
'TEXT'
,
},
{
name
:
'rulename'
,
prop
:
'rule_name'
,
...
...
@@ -51,25 +61,21 @@ export default class MainModel {
prop
:
'business_cat'
,
dataType
:
'TEXT'
,
},
{
name
:
'updatedate'
,
prop
:
'updatedate'
,
dataType
:
'DATETIME'
,
},
{
name
:
'rulegroup'
,
prop
:
'group'
,
dataType
:
'SMCODELIST'
,
},
{
name
:
'
ruleid
'
,
prop
:
'rule_
id
'
,
name
:
'
srfmajortext
'
,
prop
:
'rule_
name
'
,
dataType
:
'TEXT'
,
},
{
name
:
'srf
majortext
'
,
prop
:
'rule_
name
'
,
name
:
'srf
key
'
,
prop
:
'rule_
id
'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
{
name
:
'srfdataaccaction'
,
...
...
@@ -77,10 +83,14 @@ export default class MainModel {
dataType
:
'TEXT'
,
},
{
name
:
'srfkey'
,
name
:
'updatedate'
,
prop
:
'updatedate'
,
dataType
:
'DATETIME'
,
},
{
name
:
'ruleid'
,
prop
:
'rule_id'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
{
name
:
'ruleitem'
,
...
...
ibzdst-core/src/main/java/cn/ibizlab/core/rule/filter/RuleItemSearchContext.java
浏览文件 @
91ff6f9d
...
...
@@ -54,6 +54,13 @@ public class RuleItemSearchContext extends QueryWrapperContext<RuleItem> {
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_modelname_like
)){
this
.
getSearchCond
().
like
(
"modelname"
,
n_modelname_like
);
}
}
private
String
n_rulecode_like
;
//[规则码]
public
void
setN_rulecode_like
(
String
n_rulecode_like
)
{
this
.
n_rulecode_like
=
n_rulecode_like
;
if
(!
ObjectUtils
.
isEmpty
(
this
.
n_rulecode_like
)){
this
.
getSearchCond
().
like
(
"rulecode"
,
n_rulecode_like
);
}
}
private
String
n_systemid_eq
;
//[系统标识]
public
void
setN_systemid_eq
(
String
n_systemid_eq
)
{
...
...
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
91ff6f9d
...
...
@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_build-45-1"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_build-45-1"
>
<createTable
tableName=
"IBZDABUILD"
>
<column
name=
"BUILDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_BUILD_BUILDID"
/>
...
...
@@ -26,7 +26,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_chart-22-2"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_chart-22-2"
>
<createTable
tableName=
"IBZDACHART"
>
<column
name=
"CHARTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_CHART_CHARTID"
/>
...
...
@@ -48,7 +48,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_metric-53-3"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_metric-53-3"
>
<createTable
tableName=
"IBZDAMETRIC"
>
<column
name=
"DA_METRICID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_METRIC_DA_METRICID"
/>
...
...
@@ -76,7 +76,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_report-24-4"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_report-24-4"
>
<createTable
tableName=
"IBZDAREPORT"
>
<column
name=
"REPORTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_REPORT_REPORTID"
/>
...
...
@@ -98,7 +98,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-dst_datasource-6-5"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_datasource-6-5"
>
<createTable
tableName=
"IBZDATASOURCE"
>
<column
name=
"DSID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_DATASOURCE_DSID"
/>
...
...
@@ -114,7 +114,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-dst_system-5-6"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_system-5-6"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
...
...
@@ -134,7 +134,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_execlog-31-7"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execlog-31-7"
>
<createTable
tableName=
"IBZRULELOG"
>
<column
name=
"RU_EXECLOGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECLOG_RU_EXECLOGID"
/>
...
...
@@ -164,7 +164,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_execresult-43-8"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execresult-43-8"
>
<createTable
tableName=
"IBZRULERESULT"
>
<column
name=
"RU_EXECRESULTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECRESULT_RU_EXECRESULT"
/>
...
...
@@ -204,7 +204,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_dataset-2-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=
"
root
"
id=
"tab-meta_entity-12-10"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_entity-12-10"
>
<createTable
tableName=
"IBZENTITY"
>
<column
name=
"ENTITYID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_ENTITY_ENTITYID"
/>
...
...
@@ -258,7 +258,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_field-7-11"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_field-7-11"
>
<createTable
tableName=
"IBZFIELD"
>
<column
name=
"FIELDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_FIELD_FIELDID"
/>
...
...
@@ -322,7 +322,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_model-18-12"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_model-18-12"
>
<createTable
tableName=
"IBZMODEL"
>
<column
name=
"MODELID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODEL_MODELID"
/>
...
...
@@ -348,7 +348,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_module-7-13"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_module-7-13"
>
<createTable
tableName=
"IBZMODULE"
>
<column
name=
"MODULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODULE_MODULEID"
/>
...
...
@@ -366,7 +366,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_relation-6-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=
"
root
"
id=
"tab-ru_engine-29-15"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_engine-29-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=
"
root
"
id=
"tab-ru_item-59-16"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_item-59-16"
>
<createTable
tableName=
"IBZRULE"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
...
...
@@ -457,7 +457,7 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet
author=
"
root
"
id=
"fk-da_metric-53-17"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-da_metric-53-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]外键关系 -->
...
...
@@ -465,7 +465,7 @@
<!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[RU_EXECLOG]外键关系 -->
<!--输出实体[RU_EXECRESULT]外键关系 -->
<changeSet
author=
"
root
"
id=
"fk-ru_execresult-43-18"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-ru_execresult-43-18"
>
<addForeignKeyConstraint
baseColumnNames=
"RULEID"
baseTableName=
"IBZRULERESULT"
constraintName=
"DER1N_RU_EXECRESULT_RU_ITEM_RU"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"RULEID"
referencedTableName=
"IBZRULE"
validate=
"true"
/>
</changeSet>
<!--输出实体[META_DATASET]外键关系 -->
...
...
ibzdst-core/src/main/resources/mapper/rule/ruleitem/RuleItemMapper.xml
浏览文件 @
91ff6f9d
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"RuleItemResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULE
CODE`, t1.`RULE
GROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"RuleItemResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULECODE, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
...
...
@@ -44,7 +44,7 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULE
CODE`, t1.`RULE
GROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -59,7 +59,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULE
CODE`, t1.`RULE
GROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[View]-->
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录