Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
a740f537
提交
a740f537
编写于
2年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
hebao1234 发布系统代码 [ibz-dst,应用]
上级
e6deebc1
变更
9
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
195 行增加
和
38 行删除
+195
-38
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
default-searchform-base.vue
...ct-catalog/default-searchform/default-searchform-base.vue
+2
-2
main-grid-base.vue
...web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
+22
-8
RuleEngineMapper.java
...in/java/cn/ibizlab/core/rule/mapper/RuleEngineMapper.java
+67
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+1
-1
RuleEngineMapper.xml
...ain/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
+76
-0
未找到文件。
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @
a740f537
...
@@ -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
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @
a740f537
...
@@ -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
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @
a740f537
...
@@ -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
),
...
...
This diff is collapsed.
Click to expand it.
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @
a740f537
...
@@ -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_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>
<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>
</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>
<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_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>
<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>
</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>
</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
:
''
}
},
...
@@ -860,12 +860,12 @@ export default class MetaModelGridViewBase extends Vue {
...
@@ -860,12 +860,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_
im
port_click
(
params
:
any
=
{},
tag
?:
any
,
$event
?:
any
)
{
public
toolbar_tbitem1_
ex
port_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_
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 {
...
@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @param {*} [$event]
* @memberof
* @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
[]
=
[];
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_
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/dict-catalog/default-searchform/default-searchform-base.vue
浏览文件 @
a740f537
...
@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -698,7 +698,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
*/
public
load
(
opt
:
any
=
{}):
void
{
public
load
(
opt
:
any
=
{}):
void
{
if
(
!
this
.
loadAction
){
if
(
!
this
.
loadAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loadAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loadAction'
)
as
string
)
});
return
;
return
;
}
}
const
arg
:
any
=
{
...
opt
};
const
arg
:
any
=
{
...
opt
};
...
@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
...
@@ -734,7 +734,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
*/
public
loadDraft
(
opt
:
any
=
{},
mode
?:
string
):
void
{
public
loadDraft
(
opt
:
any
=
{},
mode
?:
string
):
void
{
if
(
!
this
.
loaddraftAction
){
if
(
!
this
.
loaddraftAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loaddraftAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.searchForm.notConfig.loaddraftAction'
)
as
string
)
});
return
;
return
;
}
}
const
arg
:
any
=
{
...
opt
}
;
const
arg
:
any
=
{
...
opt
}
;
...
...
This diff is collapsed.
Click to expand it.
app_web/src/widgets/dict-catalog/main-grid/main-grid-base.vue
浏览文件 @
a740f537
...
@@ -330,6 +330,20 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -330,6 +330,20 @@ export default class MainBase extends Vue implements ControlInterface {
return
this
.
selections
[
0
];
return
this
.
selections
[
0
];
}
}
/**
* 打开新建数据视图
*
* @type {any}
* @memberof MainBase
*/
@
Prop
()
public
newdata
:
any
;
/**
* 打开编辑数据视图
*
* @type {any}
* @memberof MainBase
*/
@
Prop
()
public
opendata
:
any
;
/**
/**
* 是否嵌入关系界面
* 是否嵌入关系界面
...
@@ -852,7 +866,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -852,7 +866,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
load
(
opt
:
any
=
{},
pageReset
:
boolean
=
false
):
void
{
public
load
(
opt
:
any
=
{},
pageReset
:
boolean
=
false
):
void
{
if
(
!
this
.
fetchAction
){
if
(
!
this
.
fetchAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
return
;
return
;
}
}
if
(
pageReset
){
if
(
pageReset
){
...
@@ -947,7 +961,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -947,7 +961,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
async
remove
(
datas
:
any
[]):
Promise
<
any
>
{
public
async
remove
(
datas
:
any
[]):
Promise
<
any
>
{
if
(
!
this
.
removeAction
){
if
(
!
this
.
removeAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.removeAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.removeAction'
)
as
string
)
});
return
;
return
;
}
}
let
_datas
:
any
[]
=
[];
let
_datas
:
any
[]
=
[];
...
@@ -1053,7 +1067,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1053,7 +1067,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
addBatch
(
arg
:
any
=
{}):
void
{
public
addBatch
(
arg
:
any
=
{}):
void
{
if
(
!
this
.
fetchAction
){
if
(
!
this
.
fetchAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.fetchAction'
)
as
string
)
});
return
;
return
;
}
}
if
(
!
arg
){
if
(
!
arg
){
...
@@ -1846,7 +1860,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1846,7 +1860,7 @@ export default class MainBase extends Vue implements ControlInterface {
public
setColState
()
{
public
setColState
()
{
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcatalog
pickup
gridview_grid_main'
});
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcataloggridview_grid_main'
});
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
...
@@ -1913,7 +1927,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1913,7 +1927,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
saveDynaConfig
()
{
public
saveDynaConfig
()
{
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcatalog
pickup
gridview_grid_main'
,
model
:
this
.
allColumns
});
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibzdst_web_dictcataloggridview_grid_main'
,
model
:
this
.
allColumns
});
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
)
{
if
(
response
.
status
==
200
)
{
...
@@ -1984,7 +1998,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1984,7 +1998,7 @@ export default class MainBase extends Vue implements ControlInterface {
try
{
try
{
if
(
Object
.
is
(
item
.
rowDataState
,
'create'
)){
if
(
Object
.
is
(
item
.
rowDataState
,
'create'
)){
if
(
!
this
.
createAction
){
if
(
!
this
.
createAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.createAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.createAction'
)
as
string
)
});
}
else
{
}
else
{
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
let
response
=
await
this
.
service
.
add
(
this
.
createAction
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
)),
item
,
this
.
showBusyIndicator
);
let
response
=
await
this
.
service
.
add
(
this
.
createAction
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
)),
item
,
this
.
showBusyIndicator
);
...
@@ -1992,7 +2006,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1992,7 +2006,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
}
}
else
if
(
Object
.
is
(
item
.
rowDataState
,
'update'
)){
}
else
if
(
Object
.
is
(
item
.
rowDataState
,
'update'
)){
if
(
!
this
.
updateAction
){
if
(
!
this
.
updateAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.updateAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.updateAction'
)
as
string
)
});
}
else
{
}
else
{
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
Object
.
assign
(
item
,{
viewparams
:
this
.
viewparams
});
if
(
item
.
dictcatalog
){
if
(
item
.
dictcatalog
){
...
@@ -2059,7 +2073,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -2059,7 +2073,7 @@ export default class MainBase extends Vue implements ControlInterface {
*/
*/
public
newRow
(
args
:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
):
void
{
public
newRow
(
args
:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
):
void
{
if
(
!
this
.
loaddraftAction
){
if
(
!
this
.
loaddraftAction
){
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalog
Pickup
GridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.loaddraftAction'
)
as
string
)
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.wrong'
)
as
string
),
desc
:
'DictCatalogGridView'
+
(
this
.
$t
(
'app.gridpage.notConfig.loaddraftAction'
)
as
string
)
});
return
;
return
;
}
}
let
_this
=
this
;
let
_this
=
this
;
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/java/cn/ibizlab/core/rule/mapper/RuleEngineMapper.java
0 → 100644
浏览文件 @
a740f537
package
cn
.
ibizlab
.
core
.
rule
.
mapper
;
import
java.util.List
;
import
org.apache.ibatis.annotations.*
;
import
java.util.Map
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
java.util.Map
;
import
org.apache.ibatis.annotations.Select
;
import
cn.ibizlab.core.rule.domain.RuleEngine
;
import
cn.ibizlab.core.rule.filter.RuleEngineSearchContext
;
import
org.springframework.cache.annotation.CacheEvict
;
import
org.springframework.cache.annotation.Cacheable
;
import
java.io.Serializable
;
import
com.baomidou.mybatisplus.core.toolkit.Constants
;
import
com.alibaba.fastjson.JSONObject
;
public
interface
RuleEngineMapper
extends
BaseMapper
<
RuleEngine
>
{
Page
<
RuleEngine
>
searchDefault
(
IPage
page
,
@Param
(
"srf"
)
RuleEngineSearchContext
context
,
@Param
(
"ew"
)
Wrapper
<
RuleEngine
>
wrapper
);
@Override
RuleEngine
selectById
(
Serializable
id
);
@Override
int
insert
(
RuleEngine
entity
);
@Override
int
updateById
(
@Param
(
Constants
.
ENTITY
)
RuleEngine
entity
);
@Override
int
update
(
@Param
(
Constants
.
ENTITY
)
RuleEngine
entity
,
@Param
(
"ew"
)
Wrapper
<
RuleEngine
>
updateWrapper
);
@Override
int
deleteById
(
Serializable
id
);
/**
* 自定义查询SQL
* @param sql
* @return
*/
@Select
(
"${sql}"
)
List
<
JSONObject
>
selectBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
/**
* 自定义更新SQL
* @param sql
* @return
*/
@Update
(
"${sql}"
)
boolean
updateBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
/**
* 自定义插入SQL
* @param sql
* @return
*/
@Insert
(
"${sql}"
)
boolean
insertBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
/**
* 自定义删除SQL
* @param sql
* @return
*/
@Delete
(
"${sql}"
)
boolean
deleteBySQL
(
@Param
(
"sql"
)
String
sql
,
@Param
(
"et"
)
Map
param
);
List
<
RuleEngine
>
selectByModelId
(
@Param
(
"id"
)
Serializable
id
);
}
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
a740f537
...
@@ -496,7 +496,7 @@
...
@@ -496,7 +496,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet
author=
"root"
id=
"tab-ru_item-1
5
-18"
>
<changeSet
author=
"root"
id=
"tab-ru_item-1
7
-18"
>
<createTable
tableName=
"IBZRULE"
>
<createTable
tableName=
"IBZRULE"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
...
...
This diff is collapsed.
Click to expand it.
ibzdst-core/src/main/resources/mapper/rule/ruleengine/RuleEngineMapper.xml
0 → 100644
浏览文件 @
a740f537
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"cn.ibizlab.core.rule.mapper.RuleEngineMapper"
>
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`ENGINEID`, t1.`ENGINENAME`, t1.`EXECSTATE`, t1.`EXTPARAMS`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t1.`PROCESSED`, t1.`RULEGROUP`, t11.`SYSTEMID`, t1.`TOTAL` FROM `IBZRULEENGINE` t1 LEFT JOIN `IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID` ) t1 where engineid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"RuleEngineResultMap"
databaseId=
"postgresql"
>
<![CDATA[select t1.* from (SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where engineid=#{id}]]>
</select>
<!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
<resultMap
id=
"RuleEngineResultMap"
type=
"cn.ibizlab.core.rule.domain.RuleEngine"
autoMapping=
"true"
>
<id
property=
"engineId"
column=
"engineid"
/>
<!--主键字段映射-->
<result
property=
"group"
column=
"rulegroup"
/>
<result
property=
"modelId"
column=
"modelid"
/>
<result
property=
"state"
column=
"execstate"
/>
<!--通过mybatis自动注入关系属性[主实体],fetchType="lazy"为懒加载配置 -->
<association
property=
"model"
javaType=
"cn.ibizlab.core.lite.domain.MetaModel"
column=
"modelid"
select=
"cn.ibizlab.core.lite.mapper.MetaModelMapper.selectById"
fetchType=
"lazy"
></association>
</resultMap>
<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_RU_ENGINE_META_MODEL_MODELID] -->
<select
id=
"selectByModelId"
resultMap=
"RuleEngineResultMap"
>
select t1.* from (
<include
refid=
"Default"
/>
) t1
where modelid=#{id}
</select>
<!--数据集合[Default]-->
<select
id=
"searchDefault"
parameterType=
"cn.ibizlab.core.rule.filter.RuleEngineSearchContext"
resultMap=
"RuleEngineResultMap"
>
select t1.* from (
<include
refid=
"Default"
/>
)t1
<where><if
test=
"ew!=null and ew.sqlSegment!=null and !ew.emptyOfWhere"
>
${ew.sqlSegment}
</if></where>
<if
test=
"ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere"
>
${ew.sqlSegment}
</if>
</select>
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`ENGINEID`, t1.`ENGINENAME`, t1.`EXECSTATE`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t1.`PROCESSED`, t1.`RULEGROUP`, t11.`SYSTEMID`, t1.`TOTAL` FROM `IBZRULEENGINE` t1 LEFT JOIN `IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID`
]]>
</sql>
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"postgresql"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`ENGINEID`, t1.`ENGINENAME`, t1.`EXECSTATE`, t1.`EXTPARAMS`, t1.`LASTRUNTIME`, t1.`MODELID`, t1.`MODELNAME`, t1.`PROCESSED`, t1.`RULEGROUP`, t11.`SYSTEMID`, t1.`TOTAL` FROM `IBZRULEENGINE` t1 LEFT JOIN `IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID`
]]>
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"oracle"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"postgresql"
>
<![CDATA[ SELECT t1.ENGINEID, t1.ENGINENAME, t1.EXECSTATE, t1.EXTPARAMS, t1.LASTRUNTIME, t1.MODELID, t1.MODELNAME, t1.PROCESSED, t1.RULEGROUP, t11.SYSTEMID, t1.TOTAL FROM IBZRULEENGINE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID
]]>
</sql>
</mapper>
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录