Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibztask
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibztask
提交
d77787f7
提交
d77787f7
编写于
11月 04, 2022
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码 [ibiz-task,任务调度]
上级
9ecfc1b2
变更
44
显示空白字符变更
内嵌
并排
正在显示
44 个修改的文件
包含
779 行增加
和
297 行删除
+779
-297
en-US-base.ts
app_web/src/locale/lang/en-US-base.ts
+8
-0
zh-CN-base.ts
app_web/src/locale/lang/zh-CN-base.ts
+8
-0
jobs-info-edit-view-base.vue
...ges/task/jobs-info-edit-view/jobs-info-edit-view-base.vue
+11
-10
jobs-info-grid-view-base.vue
...ges/task/jobs-info-grid-view/jobs-info-grid-view-base.vue
+49
-48
jobs-log-edit-view-base.vue
...pages/task/jobs-log-edit-view/jobs-log-edit-view-base.vue
+11
-10
jobs-log-grid-view-base.vue
...pages/task/jobs-log-grid-view/jobs-log-grid-view-base.vue
+25
-24
jobs-registry-edit-view-base.vue
.../jobs-registry-edit-view/jobs-registry-edit-view-base.vue
+11
-10
jobs-registry-grid-view-base.vue
.../jobs-registry-grid-view/jobs-registry-grid-view-base.vue
+43
-42
page-register.ts
app_web/src/pages/task/task-index-view/page-register.ts
+3
-3
router.ts
app_web/src/pages/task/task-index-view/router.ts
+18
-18
state.ts
app_web/src/store/modules/view-action/state.ts
+1
-1
template.html
app_web/src/template.html
+2
-2
task-index-view-appmenu-base.vue
.../task-index-view-appmenu/task-index-view-appmenu-base.vue
+12
-12
task-index-view-appmenu-model.ts
.../task-index-view-appmenu/task-index-view-appmenu-model.ts
+12
-12
task-index-view-appmenu-service.ts
...ask-index-view-appmenu/task-index-view-appmenu-service.ts
+10
-0
default-searchform-service.ts
...obs-info/default-searchform/default-searchform-service.ts
+10
-0
main-form-base.vue
app_web/src/widgets/jobs-info/main-form/main-form-base.vue
+1
-0
main-form-service.ts
app_web/src/widgets/jobs-info/main-form/main-form-service.ts
+10
-0
main-grid-base.vue
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
+77
-10
main-grid-model.ts
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
+30
-30
main-grid-service.ts
app_web/src/widgets/jobs-info/main-grid/main-grid-service.ts
+54
-0
main-grid.less
app_web/src/widgets/jobs-info/main-grid/main-grid.less
+3
-0
default-searchform-service.ts
...jobs-log/default-searchform/default-searchform-service.ts
+10
-0
main-form-base.vue
app_web/src/widgets/jobs-log/main-form/main-form-base.vue
+1
-0
main-form-service.ts
app_web/src/widgets/jobs-log/main-form/main-form-service.ts
+10
-0
main-grid-base.vue
app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue
+77
-10
main-grid-model.ts
app_web/src/widgets/jobs-log/main-grid/main-grid-model.ts
+20
-20
main-grid-service.ts
app_web/src/widgets/jobs-log/main-grid/main-grid-service.ts
+54
-0
main-grid.less
app_web/src/widgets/jobs-log/main-grid/main-grid.less
+3
-0
default-searchform-service.ts
...registry/default-searchform/default-searchform-service.ts
+10
-0
main-form-base.vue
...eb/src/widgets/jobs-registry/main-form/main-form-base.vue
+1
-0
main-form-service.ts
.../src/widgets/jobs-registry/main-form/main-form-service.ts
+10
-0
main-grid-base.vue
...eb/src/widgets/jobs-registry/main-grid/main-grid-base.vue
+77
-10
main-grid-model.ts
...eb/src/widgets/jobs-registry/main-grid/main-grid-model.ts
+10
-10
main-grid-service.ts
.../src/widgets/jobs-registry/main-grid/main-grid-service.ts
+54
-0
main-grid.less
app_web/src/widgets/jobs-registry/main-grid/main-grid.less
+3
-0
Dockerfile
ibztask-app/ibztask-app-web/src/main/docker/Dockerfile
+1
-1
JobsInfoServiceImpl.java
...n/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
+2
-2
h2_table.xml
ibztask-core/src/main/resources/liquibase/h2_table.xml
+4
-4
systemResource.json
...sk-core/src/main/resources/permission/systemResource.json
+1
-0
pom.xml
ibztask-dependencies/pom.xml
+15
-0
Dockerfile
...-provider/ibztask-provider-api/src/main/docker/Dockerfile
+1
-1
Dockerfile
...ovider/ibztask-provider-api/src/main/dockerwar/Dockerfile
+1
-1
logback-spring.xml
...bztask-provider-api/src/main/resources/logback-spring.xml
+5
-6
未找到文件。
app_web/src/locale/lang/en-US-base.ts
浏览文件 @
d77787f7
...
@@ -42,6 +42,8 @@ function getAppLocale(){
...
@@ -42,6 +42,8 @@ function getAppLocale(){
},
},
gridpage
:
{
gridpage
:
{
choicecolumns
:
"Choice columns"
,
choicecolumns
:
"Choice columns"
,
saveconfig
:
"Save the current configuration"
,
resetconfig
:
"Restoring default Settings"
,
refresh
:
"refresh"
,
refresh
:
"refresh"
,
show
:
"Show"
,
show
:
"Show"
,
records
:
"records"
,
records
:
"records"
,
...
@@ -56,6 +58,12 @@ function getAppLocale(){
...
@@ -56,6 +58,12 @@ function getAppLocale(){
updateAction
:
"The view table updateaction parameter is not configured"
,
updateAction
:
"The view table updateaction parameter is not configured"
,
loaddraftAction
:
"The view table loadtrafaction parameter is not configured"
,
loaddraftAction
:
"The view table loadtrafaction parameter is not configured"
,
},
},
message
:
{
saveconfigsuccess
:
"Configuration saved successfully!"
,
saveconfigerror
:
"Failed to save configuration!"
,
resetconfigsuccess
:
"Reset configuration succeeded!"
,
resetconfigerror
:
"Reset configuration failed!"
,
},
data
:
"Data"
,
data
:
"Data"
,
delDataFail
:
"Failed to delete data"
,
delDataFail
:
"Failed to delete data"
,
delSuccess
:
"Delete successfully!"
,
delSuccess
:
"Delete successfully!"
,
...
...
app_web/src/locale/lang/zh-CN-base.ts
浏览文件 @
d77787f7
...
@@ -42,6 +42,8 @@ function getAppLocale(){
...
@@ -42,6 +42,8 @@ function getAppLocale(){
},
},
gridpage
:
{
gridpage
:
{
choicecolumns
:
"选择列"
,
choicecolumns
:
"选择列"
,
saveconfig
:
"保存当前配置"
,
resetconfig
:
"恢复默认配置"
,
refresh
:
"刷新"
,
refresh
:
"刷新"
,
show
:
"显示"
,
show
:
"显示"
,
records
:
"条"
,
records
:
"条"
,
...
@@ -56,6 +58,12 @@ function getAppLocale(){
...
@@ -56,6 +58,12 @@ function getAppLocale(){
updateAction
:
"视图表格updateAction参数未配置"
,
updateAction
:
"视图表格updateAction参数未配置"
,
loaddraftAction
:
"视图表格loaddraftAction参数未配置"
,
loaddraftAction
:
"视图表格loaddraftAction参数未配置"
,
},
},
message
:
{
saveconfigsuccess
:
"保存配置成功!"
,
saveconfigerror
:
"保存配置失败!"
,
resetconfigsuccess
:
"重置配置成功!"
,
resetconfigerror
:
"重置配置失败!"
,
},
data
:
"数据"
,
data
:
"数据"
,
delDataFail
:
"删除数据失败"
,
delDataFail
:
"删除数据失败"
,
delSuccess
:
"删除成功!"
,
delSuccess
:
"删除成功!"
,
...
...
app_web/src/pages/task/jobs-info-edit-view/jobs-info-edit-view-base.vue
浏览文件 @
d77787f7
...
@@ -45,9 +45,9 @@
...
@@ -45,9 +45,9 @@
style=
''
style=
''
name=
"form"
name=
"form"
ref=
'form'
ref=
'form'
@
load=
"form_load($event)"
@
save=
"form_save($event)"
@
save=
"form_save($event)"
@
remove=
"form_remove($event)"
@
remove=
"form_remove($event)"
@
load=
"form_load($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_form
>
</view
_form
>
</div>
</div>
...
@@ -617,38 +617,38 @@ export default class JobsInfoEditViewBase extends Vue {
...
@@ -617,38 +617,38 @@ export default class JobsInfoEditViewBase extends Vue {
/**
/**
* form 部件
save
事件
* form 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoEditViewBase
* @memberof JobsInfoEditViewBase
*/
*/
public
form_
save
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
}
}
/**
/**
* form 部件
remo
ve 事件
* form 部件
sa
ve 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoEditViewBase
* @memberof JobsInfoEditViewBase
*/
*/
public
form_
remo
ve
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
sa
ve
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remo
ve'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
sa
ve'
,
$event
);
}
}
/**
/**
* form 部件
load
事件
* form 部件
remove
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoEditViewBase
* @memberof JobsInfoEditViewBase
*/
*/
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
remove
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remove
'
,
$event
);
}
}
...
@@ -812,6 +812,7 @@ export default class JobsInfoEditViewBase extends Vue {
...
@@ -812,6 +812,7 @@ export default class JobsInfoEditViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
...
...
app_web/src/pages/task/jobs-info-grid-view/jobs-info-grid-view-base.vue
浏览文件 @
d77787f7
...
@@ -75,9 +75,9 @@
...
@@ -75,9 +75,9 @@
name=
"searchform"
name=
"searchform"
ref=
'searchform'
ref=
'searchform'
@
save=
"searchform_save($event)"
@
search=
"searchform_search($event)"
@
search=
"searchform_search($event)"
@
load=
"searchform_load($event)"
@
load=
"searchform_load($event)"
@
save=
"searchform_save($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_searchform
>
</view
_searchform
>
<div
class=
'view-body-messages'
>
<div
class=
'view-body-messages'
>
...
@@ -102,11 +102,11 @@
...
@@ -102,11 +102,11 @@
:opendata=
"opendata"
:opendata=
"opendata"
name=
"grid"
name=
"grid"
ref=
'grid'
ref=
'grid'
@
selectionchange=
"grid_selectionchange($event)"
@
beforeload=
"grid_beforeload($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
selectionchange=
"grid_selectionchange($event)"
@
remove=
"grid_remove($event)"
@
remove=
"grid_remove($event)"
@
load=
"grid_load($event)"
@
load=
"grid_load($event)"
@
beforeload=
"grid_beforeload($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_grid
>
</view
_grid
>
</div>
</div>
...
@@ -286,9 +286,9 @@ export default class JobsInfoGridViewBase extends Vue {
...
@@ -286,9 +286,9 @@ export default class JobsInfoGridViewBase extends Vue {
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
containerModel
:
any
=
{
public
containerModel
:
any
=
{
view_toolbar
:
{
name
:
'toolbar'
,
type
:
'TOOLBAR'
},
view_grid
:
{
name
:
'grid'
,
type
:
'GRID'
},
view_grid
:
{
name
:
'grid'
,
type
:
'GRID'
},
view_searchform
:
{
name
:
'searchform'
,
type
:
'SEARCHFORM'
},
view_searchform
:
{
name
:
'searchform'
,
type
:
'SEARCHFORM'
},
view_toolbar
:
{
name
:
'toolbar'
,
type
:
'TOOLBAR'
},
};
};
/**
/**
...
@@ -692,34 +692,14 @@ export default class JobsInfoGridViewBase extends Vue {
...
@@ -692,34 +692,14 @@ export default class JobsInfoGridViewBase extends Vue {
/**
/**
*
toolbar 部件
click 事件
*
grid 部件 rowdbl
click 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction1'
))
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'rowdblclick'
,
$event
);
this
.
toolbar_deuiaction1_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction2'
))
{
this
.
toolbar_deuiaction2_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction3'
))
{
this
.
toolbar_deuiaction3_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction4'
))
{
this
.
toolbar_deuiaction4_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction5'
))
{
this
.
toolbar_deuiaction5_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction6'
))
{
this
.
toolbar_deuiaction6_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction7'
))
{
this
.
toolbar_deuiaction7_click
(
null
,
''
,
$event2
);
}
}
}
...
@@ -736,86 +716,106 @@ export default class JobsInfoGridViewBase extends Vue {
...
@@ -736,86 +716,106 @@ export default class JobsInfoGridViewBase extends Vue {
/**
/**
* grid 部件
beforeload
事件
* grid 部件
remove
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
grid_
beforeload
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
remove
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
beforeload
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
remove
'
,
$event
);
}
}
/**
/**
* grid 部件
rowdblclick
事件
* grid 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
grid_
rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
rowdblclick
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
load
'
,
$event
);
}
}
/**
/**
* grid 部件
remove
事件
* grid 部件
beforeload
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
grid_
remove
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
beforeload
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
remove
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
beforeload
'
,
$event
);
}
}
/**
/**
*
grid 部件 load
事件
*
searchform 部件 search
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
grid_load
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_search
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'
grid'
,
'load
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'
searchform'
,
'search
'
,
$event
);
}
}
/**
/**
* searchform 部件
save
事件
* searchform 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
searchform_
save
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'
save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'
load
'
,
$event
);
}
}
/**
/**
* searchform 部件 s
earch
事件
* searchform 部件 s
ave
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
searchform_s
earch
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_s
ave
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
's
earch
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'searchform'
,
's
ave
'
,
$event
);
}
}
/**
/**
*
searchform 部件 load
事件
*
toolbar 部件 click
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsInfoGridViewBase
* @memberof JobsInfoGridViewBase
*/
*/
public
searchform_load
(
$event
:
any
,
$event2
?:
any
)
{
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'load'
,
$event
);
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction1'
))
{
this
.
toolbar_deuiaction1_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction2'
))
{
this
.
toolbar_deuiaction2_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction3'
))
{
this
.
toolbar_deuiaction3_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction4'
))
{
this
.
toolbar_deuiaction4_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction5'
))
{
this
.
toolbar_deuiaction5_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction6'
))
{
this
.
toolbar_deuiaction6_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction7'
))
{
this
.
toolbar_deuiaction7_click
(
null
,
''
,
$event2
);
}
}
}
...
@@ -1266,6 +1266,7 @@ export default class JobsInfoGridViewBase extends Vue {
...
@@ -1266,6 +1266,7 @@ export default class JobsInfoGridViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
/**
/**
...
...
app_web/src/pages/task/jobs-log-edit-view/jobs-log-edit-view-base.vue
浏览文件 @
d77787f7
...
@@ -29,9 +29,9 @@
...
@@ -29,9 +29,9 @@
style=
''
style=
''
name=
"form"
name=
"form"
ref=
'form'
ref=
'form'
@
load=
"form_load($event)"
@
save=
"form_save($event)"
@
save=
"form_save($event)"
@
remove=
"form_remove($event)"
@
remove=
"form_remove($event)"
@
load=
"form_load($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_form
>
</view
_form
>
</div>
</div>
...
@@ -570,38 +570,38 @@ export default class JobsLogEditViewBase extends Vue {
...
@@ -570,38 +570,38 @@ export default class JobsLogEditViewBase extends Vue {
/**
/**
* form 部件
save
事件
* form 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogEditViewBase
* @memberof JobsLogEditViewBase
*/
*/
public
form_
save
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
}
}
/**
/**
* form 部件
remo
ve 事件
* form 部件
sa
ve 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogEditViewBase
* @memberof JobsLogEditViewBase
*/
*/
public
form_
remo
ve
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
sa
ve
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remo
ve'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
sa
ve'
,
$event
);
}
}
/**
/**
* form 部件
load
事件
* form 部件
remove
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogEditViewBase
* @memberof JobsLogEditViewBase
*/
*/
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
remove
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remove
'
,
$event
);
}
}
...
@@ -665,6 +665,7 @@ export default class JobsLogEditViewBase extends Vue {
...
@@ -665,6 +665,7 @@ export default class JobsLogEditViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
...
...
app_web/src/pages/task/jobs-log-grid-view/jobs-log-grid-view-base.vue
浏览文件 @
d77787f7
...
@@ -24,9 +24,9 @@
...
@@ -24,9 +24,9 @@
name=
"searchform"
name=
"searchform"
ref=
'searchform'
ref=
'searchform'
@
save=
"searchform_save($event)"
@
search=
"searchform_search($event)"
@
search=
"searchform_search($event)"
@
load=
"searchform_load($event)"
@
load=
"searchform_load($event)"
@
save=
"searchform_save($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_searchform
>
</view
_searchform
>
<div
class=
'view-body-messages'
>
<div
class=
'view-body-messages'
>
...
@@ -51,11 +51,11 @@
...
@@ -51,11 +51,11 @@
:opendata=
"opendata"
:opendata=
"opendata"
name=
"grid"
name=
"grid"
ref=
'grid'
ref=
'grid'
@
selectionchange=
"grid_selectionchange($event)"
@
beforeload=
"grid_beforeload($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
selectionchange=
"grid_selectionchange($event)"
@
remove=
"grid_remove($event)"
@
remove=
"grid_remove($event)"
@
load=
"grid_load($event)"
@
load=
"grid_load($event)"
@
beforeload=
"grid_beforeload($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_grid
>
</view
_grid
>
</div>
</div>
...
@@ -617,38 +617,26 @@ export default class JobsLogGridViewBase extends Vue {
...
@@ -617,38 +617,26 @@ export default class JobsLogGridViewBase extends Vue {
/**
/**
* grid 部件 selectionchange 事件
* grid 部件 rowdblclick 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof JobsLogGridViewBase
*/
public
grid_selectionchange
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'selectionchange'
,
$event
);
}
/**
* grid 部件 beforeload 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogGridViewBase
* @memberof JobsLogGridViewBase
*/
*/
public
grid_
beforeload
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
beforeload
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
rowdblclick
'
,
$event
);
}
}
/**
/**
* grid 部件
rowdblclick
事件
* grid 部件
selectionchange
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogGridViewBase
* @memberof JobsLogGridViewBase
*/
*/
public
grid_
rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
selectionchange
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
rowdblclick
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
selectionchange
'
,
$event
);
}
}
...
@@ -677,14 +665,14 @@ export default class JobsLogGridViewBase extends Vue {
...
@@ -677,14 +665,14 @@ export default class JobsLogGridViewBase extends Vue {
/**
/**
*
searchform 部件 save
事件
*
grid 部件 beforeload
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsLogGridViewBase
* @memberof JobsLogGridViewBase
*/
*/
public
searchform_save
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_beforeload
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'
searchform'
,
'save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'
grid'
,
'beforeload
'
,
$event
);
}
}
...
@@ -712,6 +700,18 @@ export default class JobsLogGridViewBase extends Vue {
...
@@ -712,6 +700,18 @@ export default class JobsLogGridViewBase extends Vue {
}
}
/**
* searchform 部件 save 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof JobsLogGridViewBase
*/
public
searchform_save
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'save'
,
$event
);
}
/**
/**
* 打开新建数据视图
* 打开新建数据视图
...
@@ -878,6 +878,7 @@ export default class JobsLogGridViewBase extends Vue {
...
@@ -878,6 +878,7 @@ export default class JobsLogGridViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
/**
/**
...
...
app_web/src/pages/task/jobs-registry-edit-view/jobs-registry-edit-view-base.vue
浏览文件 @
d77787f7
...
@@ -45,9 +45,9 @@
...
@@ -45,9 +45,9 @@
style=
''
style=
''
name=
"form"
name=
"form"
ref=
'form'
ref=
'form'
@
load=
"form_load($event)"
@
save=
"form_save($event)"
@
save=
"form_save($event)"
@
remove=
"form_remove($event)"
@
remove=
"form_remove($event)"
@
load=
"form_load($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_form
>
</view
_form
>
</div>
</div>
...
@@ -617,38 +617,38 @@ export default class JobsRegistryEditViewBase extends Vue {
...
@@ -617,38 +617,38 @@ export default class JobsRegistryEditViewBase extends Vue {
/**
/**
* form 部件
save
事件
* form 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryEditViewBase
* @memberof JobsRegistryEditViewBase
*/
*/
public
form_
save
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
}
}
/**
/**
* form 部件
remo
ve 事件
* form 部件
sa
ve 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryEditViewBase
* @memberof JobsRegistryEditViewBase
*/
*/
public
form_
remo
ve
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
sa
ve
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remo
ve'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
sa
ve'
,
$event
);
}
}
/**
/**
* form 部件
load
事件
* form 部件
remove
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryEditViewBase
* @memberof JobsRegistryEditViewBase
*/
*/
public
form_
load
(
$event
:
any
,
$event2
?:
any
)
{
public
form_
remove
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'form'
,
'
load
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'form'
,
'
remove
'
,
$event
);
}
}
...
@@ -812,6 +812,7 @@ export default class JobsRegistryEditViewBase extends Vue {
...
@@ -812,6 +812,7 @@ export default class JobsRegistryEditViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
...
...
app_web/src/pages/task/jobs-registry-grid-view/jobs-registry-grid-view-base.vue
浏览文件 @
d77787f7
...
@@ -54,9 +54,9 @@
...
@@ -54,9 +54,9 @@
name=
"searchform"
name=
"searchform"
ref=
'searchform'
ref=
'searchform'
@
save=
"searchform_save($event)"
@
search=
"searchform_search($event)"
@
search=
"searchform_search($event)"
@
load=
"searchform_load($event)"
@
load=
"searchform_load($event)"
@
save=
"searchform_save($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_searchform
>
</view
_searchform
>
<div
class=
'view-body-messages'
>
<div
class=
'view-body-messages'
>
...
@@ -81,11 +81,11 @@
...
@@ -81,11 +81,11 @@
:opendata=
"opendata"
:opendata=
"opendata"
name=
"grid"
name=
"grid"
ref=
'grid'
ref=
'grid'
@
selectionchange=
"grid_selectionchange($event)"
@
beforeload=
"grid_beforeload($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
rowdblclick=
"grid_rowdblclick($event)"
@
selectionchange=
"grid_selectionchange($event)"
@
remove=
"grid_remove($event)"
@
remove=
"grid_remove($event)"
@
load=
"grid_load($event)"
@
load=
"grid_load($event)"
@
beforeload=
"grid_beforeload($event)"
@
closeview=
"closeView($event)"
>
@
closeview=
"closeView($event)"
>
</view
_grid
>
</view
_grid
>
</div>
</div>
...
@@ -265,9 +265,9 @@ export default class JobsRegistryGridViewBase extends Vue {
...
@@ -265,9 +265,9 @@ export default class JobsRegistryGridViewBase extends Vue {
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
containerModel
:
any
=
{
public
containerModel
:
any
=
{
view_toolbar
:
{
name
:
'toolbar'
,
type
:
'TOOLBAR'
},
view_grid
:
{
name
:
'grid'
,
type
:
'GRID'
},
view_grid
:
{
name
:
'grid'
,
type
:
'GRID'
},
view_searchform
:
{
name
:
'searchform'
,
type
:
'SEARCHFORM'
},
view_searchform
:
{
name
:
'searchform'
,
type
:
'SEARCHFORM'
},
view_toolbar
:
{
name
:
'toolbar'
,
type
:
'TOOLBAR'
},
};
};
/**
/**
...
@@ -665,28 +665,14 @@ export default class JobsRegistryGridViewBase extends Vue {
...
@@ -665,28 +665,14 @@ export default class JobsRegistryGridViewBase extends Vue {
/**
/**
*
toolbar 部件
click 事件
*
grid 部件 rowdbl
click 事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
if
(
Object
.
is
(
$event
.
tag
,
'tbitem3'
))
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'rowdblclick'
,
$event
);
this
.
toolbar_tbitem3_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem4'
))
{
this
.
toolbar_tbitem4_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem5'
))
{
this
.
toolbar_tbitem5_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem8'
))
{
this
.
toolbar_tbitem8_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction1'
))
{
this
.
toolbar_deuiaction1_click
(
null
,
''
,
$event2
);
}
}
}
...
@@ -703,86 +689,100 @@ export default class JobsRegistryGridViewBase extends Vue {
...
@@ -703,86 +689,100 @@ export default class JobsRegistryGridViewBase extends Vue {
/**
/**
* grid 部件
beforeload
事件
* grid 部件
remove
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
grid_
beforeload
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
remove
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
beforeload
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
remove
'
,
$event
);
}
}
/**
/**
* grid 部件
rowdblclick
事件
* grid 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
grid_
rowdblclick
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
rowdblclick
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
load
'
,
$event
);
}
}
/**
/**
* grid 部件
remove
事件
* grid 部件
beforeload
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
grid_
remove
(
$event
:
any
,
$event2
?:
any
)
{
public
grid_
beforeload
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
remove
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'grid'
,
'
beforeload
'
,
$event
);
}
}
/**
/**
*
grid 部件 load
事件
*
searchform 部件 search
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
grid_load
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_search
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'
grid'
,
'load
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'
searchform'
,
'search
'
,
$event
);
}
}
/**
/**
* searchform 部件
save
事件
* searchform 部件
load
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
searchform_
save
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_
load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'
save
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'
load
'
,
$event
);
}
}
/**
/**
* searchform 部件 s
earch
事件
* searchform 部件 s
ave
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
searchform_s
earch
(
$event
:
any
,
$event2
?:
any
)
{
public
searchform_s
ave
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
's
earch
'
,
$event
);
this
.
engine
.
onCtrlEvent
(
'searchform'
,
's
ave
'
,
$event
);
}
}
/**
/**
*
searchform 部件 load
事件
*
toolbar 部件 click
事件
*
*
* @param {*} [args={}]
* @param {*} [args={}]
* @param {*} $event
* @param {*} $event
* @memberof JobsRegistryGridViewBase
* @memberof JobsRegistryGridViewBase
*/
*/
public
searchform_load
(
$event
:
any
,
$event2
?:
any
)
{
public
toolbar_click
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'searchform'
,
'load'
,
$event
);
if
(
Object
.
is
(
$event
.
tag
,
'tbitem3'
))
{
this
.
toolbar_tbitem3_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem4'
))
{
this
.
toolbar_tbitem4_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem5'
))
{
this
.
toolbar_tbitem5_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'tbitem8'
))
{
this
.
toolbar_tbitem8_click
(
null
,
''
,
$event2
);
}
if
(
Object
.
is
(
$event
.
tag
,
'deuiaction1'
))
{
this
.
toolbar_deuiaction1_click
(
null
,
''
,
$event2
);
}
}
}
...
@@ -1200,6 +1200,7 @@ export default class JobsRegistryGridViewBase extends Vue {
...
@@ -1200,6 +1200,7 @@ export default class JobsRegistryGridViewBase extends Vue {
if
(
this
.
portletStateEvent
){
if
(
this
.
portletStateEvent
){
this
.
portletStateEvent
.
unsubscribe
();
this
.
portletStateEvent
.
unsubscribe
();
}
}
this
.
viewState
.
complete
();
}
}
/**
/**
...
...
app_web/src/pages/task/task-index-view/page-register.ts
浏览文件 @
d77787f7
export
const
PageComponents
=
{
export
const
PageComponents
=
{
install
(
Vue
:
any
,
opt
:
any
)
{
install
(
Vue
:
any
,
opt
:
any
)
{
Vue
.
component
(
'jobs-registry-grid-view'
,
()
=>
import
(
'@pages/task/jobs-registry-grid-view/jobs-registry-grid-view.vue'
));
Vue
.
component
(
'jobs-registry-grid-view'
,
()
=>
import
(
'@pages/task/jobs-registry-grid-view/jobs-registry-grid-view.vue'
));
Vue
.
component
(
'jobs-info-grid-view'
,
()
=>
import
(
'@pages/task/jobs-info-grid-view/jobs-info-grid-view.vue'
));
Vue
.
component
(
'jobs-log-grid-view'
,
()
=>
import
(
'@pages/task/jobs-log-grid-view/jobs-log-grid-view.vue'
));
Vue
.
component
(
'jobs-registry-edit-view'
,
()
=>
import
(
'@pages/task/jobs-registry-edit-view/jobs-registry-edit-view.vue'
));
Vue
.
component
(
'jobs-info-edit-view'
,
()
=>
import
(
'@pages/task/jobs-info-edit-view/jobs-info-edit-view.vue'
));
Vue
.
component
(
'jobs-info-edit-view'
,
()
=>
import
(
'@pages/task/jobs-info-edit-view/jobs-info-edit-view.vue'
));
Vue
.
component
(
'jobs-log-edit-view'
,
()
=>
import
(
'@pages/task/jobs-log-edit-view/jobs-log-edit-view.vue'
));
Vue
.
component
(
'jobs-log-edit-view'
,
()
=>
import
(
'@pages/task/jobs-log-edit-view/jobs-log-edit-view.vue'
));
Vue
.
component
(
'jobs-registry-edit-view'
,
()
=>
import
(
'@pages/task/jobs-registry-edit-view/jobs-registry-edit-view.vue'
));
Vue
.
component
(
'jobs-log-grid-view'
,
()
=>
import
(
'@pages/task/jobs-log-grid-view/jobs-log-grid-view.vue'
));
Vue
.
component
(
'jobs-info-grid-view'
,
()
=>
import
(
'@pages/task/jobs-info-grid-view/jobs-info-grid-view.vue'
));
}
}
};
};
\ No newline at end of file
app_web/src/pages/task/task-index-view/router.ts
浏览文件 @
d77787f7
...
@@ -50,32 +50,32 @@ const router = new Router({
...
@@ -50,32 +50,32 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/task/jobs-registry-grid-view/jobs-registry-grid-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-registry-grid-view/jobs-registry-grid-view.vue'
),
},
},
{
{
path
:
'jobsinfos/:jobsinfo?/
editview/:edit
view?'
,
path
:
'jobsinfos/:jobsinfo?/
gridview/:grid
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.jobsinfo.views.
edit
view.caption'
,
caption
:
'entities.jobsinfo.views.
grid
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'jobsinfos'
,
parameterName
:
'jobsinfo'
},
{
pathName
:
'jobsinfos'
,
parameterName
:
'jobsinfo'
},
{
pathName
:
'
editview'
,
parameterName
:
'edit
view'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/task/jobs-info-
edit-view/jobs-info-edit
-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-info-
grid-view/jobs-info-grid
-view.vue'
),
},
},
{
{
path
:
'jobslogs/:jobslog?/
editview/:edit
view?'
,
path
:
'jobslogs/:jobslog?/
gridview/:grid
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.jobslog.views.
edit
view.caption'
,
caption
:
'entities.jobslog.views.
grid
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'jobslogs'
,
parameterName
:
'jobslog'
},
{
pathName
:
'jobslogs'
,
parameterName
:
'jobslog'
},
{
pathName
:
'
editview'
,
parameterName
:
'edit
view'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/task/jobs-log-
edit-view/jobs-log-edit
-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-log-
grid-view/jobs-log-grid
-view.vue'
),
},
},
{
{
path
:
'jobsregistries/:jobsregistry?/editview/:editview?'
,
path
:
'jobsregistries/:jobsregistry?/editview/:editview?'
,
...
@@ -92,32 +92,32 @@ const router = new Router({
...
@@ -92,32 +92,32 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/task/jobs-registry-edit-view/jobs-registry-edit-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-registry-edit-view/jobs-registry-edit-view.vue'
),
},
},
{
{
path
:
'jobs
logs/:jobslog?/gridview/:grid
view?'
,
path
:
'jobs
infos/:jobsinfo?/editview/:edit
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.jobs
log.views.grid
view.caption'
,
caption
:
'entities.jobs
info.views.edit
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
{
pathName
:
'
editview'
,
parameterName
:
'edit
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/task/jobs-
log-grid-view/jobs-log-grid
-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-
info-edit-view/jobs-info-edit
-view.vue'
),
},
},
{
{
path
:
'jobs
infos/:jobsinfo?/gridview/:grid
view?'
,
path
:
'jobs
logs/:jobslog?/editview/:edit
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.jobs
info.views.grid
view.caption'
,
caption
:
'entities.jobs
log.views.edit
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'taskindexview'
,
parameterName
:
'taskindexview'
},
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
{
pathName
:
'
editview'
,
parameterName
:
'edit
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/task/jobs-
info-grid-view/jobs-info-grid
-view.vue'
),
component
:
()
=>
import
(
'@pages/task/jobs-
log-edit-view/jobs-log-edit
-view.vue'
),
},
},
...
indexRoutes
,
...
indexRoutes
,
],
],
...
...
app_web/src/store/modules/view-action/state.ts
浏览文件 @
d77787f7
...
@@ -49,8 +49,8 @@ export const viewstate: any = {
...
@@ -49,8 +49,8 @@ export const viewstate: any = {
viewdatachange
:
false
,
viewdatachange
:
false
,
refviews
:
[
refviews
:
[
'3fc39744066bd5343be378ec5703f556'
,
'3fc39744066bd5343be378ec5703f556'
,
'67b4d1e928a08679ce63051ccc88da9c'
,
'e4856779577562e9880855e6c66d63e5'
,
'e4856779577562e9880855e6c66d63e5'
,
'67b4d1e928a08679ce63051ccc88da9c'
,
],
],
},
},
{
{
...
...
app_web/src/template.html
浏览文件 @
d77787f7
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=edge"
>
<meta
name=
"viewport"
content=
"width=device-width,initial-scale=1.0"
>
<meta
name=
"viewport"
content=
"width=device-width,initial-scale=1.0"
>
<link
rel=
"icon"
href=
"
<%= BASE_URL %>
favicon.ico"
>
<link
rel=
"icon"
href=
"
./
favicon.ico"
>
<title>
<
%=
htmlWebpackPlugin
.
options
.
title
%
>
</title>
<title>
任务调度
</title>
</head>
</head>
<body>
<body>
<noscript>
<noscript>
...
...
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-base.vue
浏览文件 @
d77787f7
...
@@ -595,15 +595,15 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
...
@@ -595,15 +595,15 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
navDataService
.
removeNavData
(
this
.
viewtag
);
navDataService
.
removeNavData
(
this
.
viewtag
);
}
}
switch
(
item
.
appfunctag
)
{
switch
(
item
.
appfunctag
)
{
case
'Auto1'
:
this
.
clickAuto1
(
item
);
return
;
case
'Auto3'
:
case
'Auto3'
:
this
.
clickAuto3
(
item
);
this
.
clickAuto3
(
item
);
return
;
return
;
case
'Auto2'
:
case
'Auto2'
:
this
.
clickAuto2
(
item
);
this
.
clickAuto2
(
item
);
return
;
return
;
case
'Auto1'
:
this
.
clickAuto1
(
item
);
return
;
default
:
default
:
console
.
warn
(
'未指定应用功能'
);
console
.
warn
(
'未指定应用功能'
);
}
}
...
@@ -612,17 +612,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
...
@@ -612,17 +612,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
/**
/**
* 任务
* 任务
注册
*
*
* @param {*} [item={}]
* @param {*} [item={}]
* @memberof TaskIndexView
* @memberof TaskIndexView
*/
*/
public
clickAuto
3
(
item
:
any
=
{})
{
public
clickAuto
1
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
const
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
const
parameters
:
any
[]
=
[
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'jobs
registries'
,
parameterName
:
'jobsregistry
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
];
];
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
...
@@ -635,17 +635,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
...
@@ -635,17 +635,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
}
}
/**
/**
* 任务
调度日志
* 任务
*
*
* @param {*} [item={}]
* @param {*} [item={}]
* @memberof TaskIndexView
* @memberof TaskIndexView
*/
*/
public
clickAuto
2
(
item
:
any
=
{})
{
public
clickAuto
3
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
const
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
const
parameters
:
any
[]
=
[
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
];
];
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
...
@@ -658,17 +658,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
...
@@ -658,17 +658,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
}
}
/**
/**
* 任务
注册
* 任务
调度日志
*
*
* @param {*} [item={}]
* @param {*} [item={}]
* @memberof TaskIndexView
* @memberof TaskIndexView
*/
*/
public
clickAuto
1
(
item
:
any
=
{})
{
public
clickAuto
2
(
item
:
any
=
{})
{
const
viewparam
:
any
=
{};
const
viewparam
:
any
=
{};
Object
.
assign
(
viewparam
,
{});
Object
.
assign
(
viewparam
,
{});
const
deResParameters
:
any
[]
=
[];
const
deResParameters
:
any
[]
=
[];
const
parameters
:
any
[]
=
[
const
parameters
:
any
[]
=
[
{
pathName
:
'jobs
registries'
,
parameterName
:
'jobsregistry
'
},
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
];
];
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
const
path
:
string
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
{},
deResParameters
,
parameters
,
[],
viewparam
);
...
...
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-model.ts
浏览文件 @
d77787f7
...
@@ -82,38 +82,38 @@ export default class TaskIndexViewModel {
...
@@ -82,38 +82,38 @@ export default class TaskIndexViewModel {
*/
*/
public
funcs
:
any
[]
=
[
public
funcs
:
any
[]
=
[
{
{
appfunctag
:
'Auto
3
'
,
appfunctag
:
'Auto
1
'
,
appfuncyype
:
'APPVIEW'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
openmode
:
''
,
codename
:
'jobs
info
gridview'
,
codename
:
'jobs
registry
gridview'
,
deResParameters
:
[],
deResParameters
:
[],
routepath
:
'/taskindexview/:taskindexview?/jobs
infos/:jobsinfo
?/gridview/:gridview?'
,
routepath
:
'/taskindexview/:taskindexview?/jobs
registries/:jobsregistry
?/gridview/:gridview?'
,
parameters
:
[
parameters
:
[
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'jobs
registries'
,
parameterName
:
'jobsregistry
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
],
},
},
{
{
appfunctag
:
'Auto
2
'
,
appfunctag
:
'Auto
3
'
,
appfuncyype
:
'APPVIEW'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
openmode
:
''
,
codename
:
'jobs
log
gridview'
,
codename
:
'jobs
info
gridview'
,
deResParameters
:
[],
deResParameters
:
[],
routepath
:
'/taskindexview/:taskindexview?/jobs
logs/:jobslog
?/gridview/:gridview?'
,
routepath
:
'/taskindexview/:taskindexview?/jobs
infos/:jobsinfo
?/gridview/:gridview?'
,
parameters
:
[
parameters
:
[
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'jobs
infos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
],
},
},
{
{
appfunctag
:
'Auto
1
'
,
appfunctag
:
'Auto
2
'
,
appfuncyype
:
'APPVIEW'
,
appfuncyype
:
'APPVIEW'
,
openmode
:
''
,
openmode
:
''
,
codename
:
'jobs
registry
gridview'
,
codename
:
'jobs
log
gridview'
,
deResParameters
:
[],
deResParameters
:
[],
routepath
:
'/taskindexview/:taskindexview?/jobs
registries/:jobsregistry
?/gridview/:gridview?'
,
routepath
:
'/taskindexview/:taskindexview?/jobs
logs/:jobslog
?/gridview/:gridview?'
,
parameters
:
[
parameters
:
[
{
pathName
:
'jobs
registries'
,
parameterName
:
'jobsregistry
'
},
{
pathName
:
'jobs
logs'
,
parameterName
:
'jobslog
'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
{
pathName
:
'gridview'
,
parameterName
:
'gridview'
},
],
],
},
},
...
...
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
TaskIndexViewModel
from
'./task-index-view-appmenu-model'
;
import
TaskIndexViewModel
from
'./task-index-view-appmenu-model'
;
...
@@ -21,6 +22,15 @@ export default class TaskIndexViewService extends ControlService {
...
@@ -21,6 +22,15 @@ export default class TaskIndexViewService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof TaskIndexViewService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of TaskIndexViewService.
* Creates an instance of TaskIndexViewService.
*
*
...
...
app_web/src/widgets/jobs-info/default-searchform/default-searchform-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
DefaultModel
from
'./default-searchform-model'
;
import
DefaultModel
from
'./default-searchform-model'
;
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof DefaultService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of DefaultService.
* Creates an instance of DefaultService.
*
*
...
...
app_web/src/widgets/jobs-info/main-form/main-form-base.vue
浏览文件 @
d77787f7
...
@@ -1572,6 +1572,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1572,6 +1572,7 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
this
.
appStateEvent
){
if
(
this
.
appStateEvent
){
this
.
appStateEvent
.
unsubscribe
();
this
.
appStateEvent
.
unsubscribe
();
}
}
this
.
formState
.
complete
();
}
}
/**
/**
...
...
app_web/src/widgets/jobs-info/main-form/main-form-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
MainModel
from
'./main-form-model'
;
import
MainModel
from
'./main-form-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
...
app_web/src/widgets/jobs-info/main-grid/main-grid-base.vue
浏览文件 @
d77787f7
...
@@ -165,6 +165,8 @@
...
@@ -165,6 +165,8 @@
</
template
>
</
template
>
</div>
</div>
</poptip>
</poptip>
<i-button
class=
"config-button"
@
click=
"saveDynaConfig"
>
{{$t('app.gridpage.saveconfig')}}
</i-button>
<i-button
class=
"config-button"
@
click=
"resetDynaConfig"
>
{{$t('app.gridpage.resetconfig')}}
</i-button>
</span>
</span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span>
<span>
...
@@ -793,6 +795,14 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -793,6 +795,14 @@ export default class MainBase extends Vue implements ControlInterface {
},
},
]
]
/**
* 重置表格列模型缓存
*
* @type {any[]}
* @memberof MainBase
*/
public
resetColModel
:
any
[]
=
[];
/**
/**
* 表格模型集合
* 表格模型集合
*
*
...
@@ -1978,6 +1988,33 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1978,6 +1988,33 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
* @memberof MainBase
*/
*/
public
setColState
()
{
public
setColState
()
{
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsinfogridview_grid_main'
});
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
const
columns
=
response
.
data
;
columns
.
forEach
((
col
:
any
)
=>
{
let
column
=
this
.
allColumns
.
find
((
item
)
=>
Object
.
is
(
col
.
name
,
item
.
name
));
if
(
column
)
{
Object
.
assign
(
column
,
col
);
}
});
}
else
{
this
.
getColStorage
();
}
}).
catch
(()
=>
{
this
.
getColStorage
();
});
}
/**
* 获取列缓存
*
* @memberof MainBase
*/
public
getColStorage
()
{
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_info_main_grid'
);
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_info_main_grid'
);
if
(
_data
)
{
if
(
_data
)
{
let
columns
=
JSON
.
parse
(
_data
);
let
columns
=
JSON
.
parse
(
_data
);
...
@@ -2013,6 +2050,36 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -2013,6 +2050,36 @@ export default class MainBase extends Vue implements ControlInterface {
return
column
.
show
?
true
:
false
;
return
column
.
show
?
true
:
false
;
}
}
/**
* 保存动态表格配置
*
* @memberof MainBase
*/
public
saveDynaConfig
()
{
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsinfogridview_grid_main'
,
model
:
this
.
allColumns
});
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
)
{
this
.
$Message
.
success
(
this
.
$t
(
'app.gridpage.message.saveconfigsuccess'
));
}
else
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
}
}).
catch
(()
=>
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
});
}
/**
* 重置动态表格配置
*
* @memberof MainBase
*/
public
resetDynaConfig
()
{
this
.
allColumns
=
Util
.
deepCopy
(
this
.
resetColModel
);
localStorage
.
setItem
(
'dynaconfig_main_grid'
,
JSON
.
stringify
(
this
.
allColumns
));
}
/**
/**
* 表格列是否自适应布局
* 表格列是否自适应布局
*
*
...
...
app_web/src/widgets/jobs-info/main-grid/main-grid-model.ts
浏览文件 @
d77787f7
...
@@ -27,8 +27,8 @@ export default class MainModel {
...
@@ -27,8 +27,8 @@ export default class MainModel {
}
else
{
}
else
{
return
[
return
[
{
{
name
:
'
app
'
,
name
:
'
id
'
,
prop
:
'
app
'
,
prop
:
'
id
'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
...
@@ -37,45 +37,39 @@ export default class MainModel {
...
@@ -37,45 +37,39 @@ export default class MainModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'status'
,
name
:
'app'
,
prop
:
'status'
,
prop
:
'app'
,
dataType
:
'NSCODELIST'
,
dataType
:
'TEXT'
,
},
{
name
:
'last_time'
,
prop
:
'last_time'
,
dataType
:
'BIGINT'
,
},
},
{
{
name
:
'
srfmajortext
'
,
name
:
'
handler
'
,
prop
:
'handler'
,
prop
:
'handler'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'
srfkey
'
,
name
:
'
cron
'
,
prop
:
'
id
'
,
prop
:
'
cron
'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
},
{
{
name
:
'
srfdataaccaction
'
,
name
:
'
last_time
'
,
prop
:
'
id
'
,
prop
:
'
last_time
'
,
dataType
:
'
TEX
T'
,
dataType
:
'
BIGIN
T'
,
},
},
{
{
name
:
'
id
'
,
name
:
'
next_time
'
,
prop
:
'
id
'
,
prop
:
'
next_time
'
,
dataType
:
'
TEX
T'
,
dataType
:
'
BIGIN
T'
,
},
},
{
{
name
:
'
cron
'
,
name
:
'
status
'
,
prop
:
'
cron
'
,
prop
:
'
status
'
,
dataType
:
'
TEX
T'
,
dataType
:
'
NSCODELIS
T'
,
},
},
{
{
name
:
'
next_time
'
,
name
:
'
timeout
'
,
prop
:
'
next_time
'
,
prop
:
'
timeout
'
,
dataType
:
'
BIG
INT'
,
dataType
:
'INT'
,
},
},
{
{
name
:
'update_time'
,
name
:
'update_time'
,
...
@@ -83,12 +77,18 @@ export default class MainModel {
...
@@ -83,12 +77,18 @@ export default class MainModel {
dataType
:
'DATETIME'
,
dataType
:
'DATETIME'
,
},
},
{
{
name
:
'timeout'
,
name
:
'srfkey'
,
prop
:
'timeout'
,
prop
:
'id'
,
dataType
:
'INT'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
},
{
{
name
:
'handler'
,
name
:
'srfdataaccaction'
,
prop
:
'id'
,
dataType
:
'TEXT'
,
},
{
name
:
'srfmajortext'
,
prop
:
'handler'
,
prop
:
'handler'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
...
...
app_web/src/widgets/jobs-info/main-grid/main-grid-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
JobsInfoService
from
'@/service/jobs-info/jobs-info-service'
;
import
MainModel
from
'./main-grid-model'
;
import
MainModel
from
'./main-grid-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
this
.
model
=
new
MainModel
();
this
.
model
=
new
MainModel
();
}
}
/**
* 加载数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
loadModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
loadModelData
(
JSON
.
stringify
(
context
),
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
* 保存数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
saveModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
saveModelData
(
JSON
.
stringify
(
context
),
''
,
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
/**
* 备份原生数据
* 备份原生数据
*
*
...
...
app_web/src/widgets/jobs-info/main-grid/main-grid.less
浏览文件 @
d77787f7
...
@@ -92,6 +92,9 @@
...
@@ -92,6 +92,9 @@
.page-column {
.page-column {
position: absolute;
position: absolute;
left: 0;
left: 0;
.config-button {
margin-left: 8px;
}
}
}
.batch-toolbar{
.batch-toolbar{
position: absolute;
position: absolute;
...
...
app_web/src/widgets/jobs-log/default-searchform/default-searchform-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
DefaultModel
from
'./default-searchform-model'
;
import
DefaultModel
from
'./default-searchform-model'
;
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof DefaultService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of DefaultService.
* Creates an instance of DefaultService.
*
*
...
...
app_web/src/widgets/jobs-log/main-form/main-form-base.vue
浏览文件 @
d77787f7
...
@@ -1392,6 +1392,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1392,6 +1392,7 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
this
.
appStateEvent
){
if
(
this
.
appStateEvent
){
this
.
appStateEvent
.
unsubscribe
();
this
.
appStateEvent
.
unsubscribe
();
}
}
this
.
formState
.
complete
();
}
}
/**
/**
...
...
app_web/src/widgets/jobs-log/main-form/main-form-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
MainModel
from
'./main-form-model'
;
import
MainModel
from
'./main-form-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
...
app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue
浏览文件 @
d77787f7
...
@@ -139,6 +139,8 @@
...
@@ -139,6 +139,8 @@
</
template
>
</
template
>
</div>
</div>
</poptip>
</poptip>
<i-button
class=
"config-button"
@
click=
"saveDynaConfig"
>
{{$t('app.gridpage.saveconfig')}}
</i-button>
<i-button
class=
"config-button"
@
click=
"resetDynaConfig"
>
{{$t('app.gridpage.resetconfig')}}
</i-button>
</span>
</span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span>
<span>
...
@@ -749,6 +751,14 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -749,6 +751,14 @@ export default class MainBase extends Vue implements ControlInterface {
},
},
]
]
/**
* 重置表格列模型缓存
*
* @type {any[]}
* @memberof MainBase
*/
public
resetColModel
:
any
[]
=
[];
/**
/**
* 表格模型集合
* 表格模型集合
*
*
...
@@ -1920,6 +1930,33 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1920,6 +1930,33 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
* @memberof MainBase
*/
*/
public
setColState
()
{
public
setColState
()
{
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsloggridview_grid_main'
});
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
const
columns
=
response
.
data
;
columns
.
forEach
((
col
:
any
)
=>
{
let
column
=
this
.
allColumns
.
find
((
item
)
=>
Object
.
is
(
col
.
name
,
item
.
name
));
if
(
column
)
{
Object
.
assign
(
column
,
col
);
}
});
}
else
{
this
.
getColStorage
();
}
}).
catch
(()
=>
{
this
.
getColStorage
();
});
}
/**
* 获取列缓存
*
* @memberof MainBase
*/
public
getColStorage
()
{
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_log_main_grid'
);
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_log_main_grid'
);
if
(
_data
)
{
if
(
_data
)
{
let
columns
=
JSON
.
parse
(
_data
);
let
columns
=
JSON
.
parse
(
_data
);
...
@@ -1955,6 +1992,36 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1955,6 +1992,36 @@ export default class MainBase extends Vue implements ControlInterface {
return
column
.
show
?
true
:
false
;
return
column
.
show
?
true
:
false
;
}
}
/**
* 保存动态表格配置
*
* @memberof MainBase
*/
public
saveDynaConfig
()
{
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsloggridview_grid_main'
,
model
:
this
.
allColumns
});
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
)
{
this
.
$Message
.
success
(
this
.
$t
(
'app.gridpage.message.saveconfigsuccess'
));
}
else
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
}
}).
catch
(()
=>
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
});
}
/**
* 重置动态表格配置
*
* @memberof MainBase
*/
public
resetDynaConfig
()
{
this
.
allColumns
=
Util
.
deepCopy
(
this
.
resetColModel
);
localStorage
.
setItem
(
'dynaconfig_main_grid'
,
JSON
.
stringify
(
this
.
allColumns
));
}
/**
/**
* 表格列是否自适应布局
* 表格列是否自适应布局
*
*
...
...
app_web/src/widgets/jobs-log/main-grid/main-grid-model.ts
浏览文件 @
d77787f7
...
@@ -31,6 +31,16 @@ export default class MainModel {
...
@@ -31,6 +31,16 @@ export default class MainModel {
prop
:
'id'
,
prop
:
'id'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'job_id'
,
prop
:
'job_id'
,
dataType
:
'TEXT'
,
},
{
name
:
'handler'
,
prop
:
'handler'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'address'
,
name
:
'address'
,
prop
:
'address'
,
prop
:
'address'
,
...
@@ -41,25 +51,20 @@ export default class MainModel {
...
@@ -41,25 +51,20 @@ export default class MainModel {
prop
:
'trigger_code'
,
prop
:
'trigger_code'
,
dataType
:
'INT'
,
dataType
:
'INT'
,
},
},
{
name
:
'create_time'
,
prop
:
'create_time'
,
dataType
:
'DATETIME'
,
},
{
{
name
:
'trigger_type'
,
name
:
'trigger_type'
,
prop
:
'trigger_type'
,
prop
:
'trigger_type'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'
srfmajortex
t'
,
name
:
'
fail_retry_coun
t'
,
prop
:
'
handler
'
,
prop
:
'
fail_retry_count
'
,
dataType
:
'
TEX
T'
,
dataType
:
'
IN
T'
,
},
},
{
{
name
:
'
srfdataaccaction
'
,
name
:
'
create_time
'
,
prop
:
'
id
'
,
prop
:
'
create_time
'
,
dataType
:
'
TEXT
'
,
dataType
:
'
DATETIME
'
,
},
},
{
{
name
:
'srfkey'
,
name
:
'srfkey'
,
...
@@ -68,18 +73,13 @@ export default class MainModel {
...
@@ -68,18 +73,13 @@ export default class MainModel {
isEditable
:
true
isEditable
:
true
},
},
{
{
name
:
'fail_retry_count'
,
name
:
'srfdataaccaction'
,
prop
:
'fail_retry_count'
,
prop
:
'id'
,
dataType
:
'INT'
,
},
{
name
:
'handler'
,
prop
:
'handler'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'
job_id
'
,
name
:
'
srfmajortext
'
,
prop
:
'
job_id
'
,
prop
:
'
handler
'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
...
...
app_web/src/widgets/jobs-log/main-grid/main-grid-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
JobsLogService
from
'@/service/jobs-log/jobs-log-service'
;
import
MainModel
from
'./main-grid-model'
;
import
MainModel
from
'./main-grid-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
this
.
model
=
new
MainModel
();
this
.
model
=
new
MainModel
();
}
}
/**
* 加载数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
loadModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
loadModelData
(
JSON
.
stringify
(
context
),
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
* 保存数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
saveModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
saveModelData
(
JSON
.
stringify
(
context
),
''
,
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
/**
* 备份原生数据
* 备份原生数据
*
*
...
...
app_web/src/widgets/jobs-log/main-grid/main-grid.less
浏览文件 @
d77787f7
...
@@ -92,6 +92,9 @@
...
@@ -92,6 +92,9 @@
.page-column {
.page-column {
position: absolute;
position: absolute;
left: 0;
left: 0;
.config-button {
margin-left: 8px;
}
}
}
.batch-toolbar{
.batch-toolbar{
position: absolute;
position: absolute;
...
...
app_web/src/widgets/jobs-registry/default-searchform/default-searchform-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
DefaultModel
from
'./default-searchform-model'
;
import
DefaultModel
from
'./default-searchform-model'
;
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class DefaultService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof DefaultService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of DefaultService.
* Creates an instance of DefaultService.
*
*
...
...
app_web/src/widgets/jobs-registry/main-form/main-form-base.vue
浏览文件 @
d77787f7
...
@@ -1213,6 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1213,6 +1213,7 @@ export default class MainBase extends Vue implements ControlInterface {
if
(
this
.
appStateEvent
){
if
(
this
.
appStateEvent
){
this
.
appStateEvent
.
unsubscribe
();
this
.
appStateEvent
.
unsubscribe
();
}
}
this
.
formState
.
complete
();
}
}
/**
/**
...
...
app_web/src/widgets/jobs-registry/main-form/main-form-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
MainModel
from
'./main-form-model'
;
import
MainModel
from
'./main-form-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
...
app_web/src/widgets/jobs-registry/main-grid/main-grid-base.vue
浏览文件 @
d77787f7
...
@@ -93,6 +93,8 @@
...
@@ -93,6 +93,8 @@
</
template
>
</
template
>
</div>
</div>
</poptip>
</poptip>
<i-button
class=
"config-button"
@
click=
"saveDynaConfig"
>
{{$t('app.gridpage.saveconfig')}}
</i-button>
<i-button
class=
"config-button"
@
click=
"resetDynaConfig"
>
{{$t('app.gridpage.resetconfig')}}
</i-button>
</span>
</span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span
class=
"page-button"
><i-button
icon=
"md-refresh"
:title=
"$t('app.gridpage.refresh')"
@
click=
"pageRefresh()"
></i-button></span>
<span>
<span>
...
@@ -667,6 +669,14 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -667,6 +669,14 @@ export default class MainBase extends Vue implements ControlInterface {
},
},
]
]
/**
* 重置表格列模型缓存
*
* @type {any[]}
* @memberof MainBase
*/
public
resetColModel
:
any
[]
=
[];
/**
/**
* 表格模型集合
* 表格模型集合
*
*
...
@@ -1834,6 +1844,33 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1834,6 +1844,33 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
* @memberof MainBase
*/
*/
public
setColState
()
{
public
setColState
()
{
this
.
resetColModel
=
Util
.
deepCopy
(
this
.
allColumns
);
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsregistrygridview_grid_main'
});
const
post
=
this
.
service
.
loadModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
&&
response
.
data
)
{
const
columns
=
response
.
data
;
columns
.
forEach
((
col
:
any
)
=>
{
let
column
=
this
.
allColumns
.
find
((
item
)
=>
Object
.
is
(
col
.
name
,
item
.
name
));
if
(
column
)
{
Object
.
assign
(
column
,
col
);
}
});
}
else
{
this
.
getColStorage
();
}
}).
catch
(()
=>
{
this
.
getColStorage
();
});
}
/**
* 获取列缓存
*
* @memberof MainBase
*/
public
getColStorage
()
{
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_registry_main_grid'
);
const
_data
:
any
=
localStorage
.
getItem
(
'jobs_registry_main_grid'
);
if
(
_data
)
{
if
(
_data
)
{
let
columns
=
JSON
.
parse
(
_data
);
let
columns
=
JSON
.
parse
(
_data
);
...
@@ -1869,6 +1906,36 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -1869,6 +1906,36 @@ export default class MainBase extends Vue implements ControlInterface {
return
column
.
show
?
true
:
false
;
return
column
.
show
?
true
:
false
;
}
}
/**
* 保存动态表格配置
*
* @memberof MainBase
*/
public
saveDynaConfig
()
{
const
viewParams
:
any
=
Util
.
deepCopy
(
this
.
viewparams
);
Object
.
assign
(
viewParams
,{
utilServiceName
:
'grid_dynaconfig'
,
modelid
:
'ibztask_web_jobsregistrygridview_grid_main'
,
model
:
this
.
allColumns
});
const
post
=
this
.
service
.
saveModel
(
'grid_dynaconfig'
,
this
.
context
,
viewParams
);
post
.
then
((
response
:
any
)
=>
{
if
(
response
.
status
==
200
)
{
this
.
$Message
.
success
(
this
.
$t
(
'app.gridpage.message.saveconfigsuccess'
));
}
else
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
}
}).
catch
(()
=>
{
this
.
$Message
.
error
(
this
.
$t
(
'app.gridpage.message.saveconfigerror'
));
});
}
/**
* 重置动态表格配置
*
* @memberof MainBase
*/
public
resetDynaConfig
()
{
this
.
allColumns
=
Util
.
deepCopy
(
this
.
resetColModel
);
localStorage
.
setItem
(
'dynaconfig_main_grid'
,
JSON
.
stringify
(
this
.
allColumns
));
}
/**
/**
* 表格列是否自适应布局
* 表格列是否自适应布局
*
*
...
...
app_web/src/widgets/jobs-registry/main-grid/main-grid-model.ts
浏览文件 @
d77787f7
...
@@ -36,20 +36,21 @@ export default class MainModel {
...
@@ -36,20 +36,21 @@ export default class MainModel {
prop
:
'app'
,
prop
:
'app'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
name
:
'status'
,
prop
:
'status'
,
dataType
:
'NSCODELIST'
,
},
{
{
name
:
'address'
,
name
:
'address'
,
prop
:
'address'
,
prop
:
'address'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srfmajortext'
,
name
:
'status'
,
prop
:
'app'
,
prop
:
'status'
,
dataType
:
'NSCODELIST'
,
},
{
name
:
'srfkey'
,
prop
:
'id'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
},
{
{
name
:
'srfdataaccaction'
,
name
:
'srfdataaccaction'
,
...
@@ -57,10 +58,9 @@ export default class MainModel {
...
@@ -57,10 +58,9 @@ export default class MainModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
},
},
{
{
name
:
'srf
key
'
,
name
:
'srf
majortext
'
,
prop
:
'
id
'
,
prop
:
'
app
'
,
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
isEditable
:
true
},
},
{
{
name
:
'jobsregistry'
,
name
:
'jobsregistry'
,
...
...
app_web/src/widgets/jobs-registry/main-grid/main-grid-service.ts
浏览文件 @
d77787f7
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
{
Http
,
Util
,
Errorlog
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
UtilService
from
'@/utilservice/util-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
JobsRegistryService
from
'@/service/jobs-registry/jobs-registry-service'
;
import
MainModel
from
'./main-grid-model'
;
import
MainModel
from
'./main-grid-model'
;
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
...
@@ -30,6 +31,15 @@ export default class MainService extends ControlService {
this
.
isTempMode
=
false
;
this
.
isTempMode
=
false
;
}
}
/**
* 工具服务对象
*
* @protected
* @type {UtilService}
* @memberof MainService
*/
protected
utilService
:
UtilService
=
new
UtilService
();
/**
/**
* Creates an instance of MainService.
* Creates an instance of MainService.
*
*
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
...
@@ -41,6 +51,50 @@ export default class MainService extends ControlService {
this
.
model
=
new
MainModel
();
this
.
model
=
new
MainModel
();
}
}
/**
* 加载数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
loadModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
loadModelData
(
JSON
.
stringify
(
context
),
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
* 保存数据模型
*
* @param {string} serviceName
* @param {*} context
* @param {*} viewparams
* @memberof MainService
*/
public
saveModel
(
serviceName
:
string
,
context
:
any
,
viewparams
:
any
)
{
return
new
Promise
((
resolve
:
any
,
reject
:
any
)
=>
{
this
.
utilService
.
getService
(
serviceName
).
then
((
service
:
any
)
=>
{
service
.
saveModelData
(
JSON
.
stringify
(
context
),
''
,
viewparams
).
then
((
response
:
any
)
=>
{
resolve
(
response
);
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
}).
catch
((
response
:
any
)
=>
{
reject
(
response
);
});
});
}
/**
/**
* 备份原生数据
* 备份原生数据
*
*
...
...
app_web/src/widgets/jobs-registry/main-grid/main-grid.less
浏览文件 @
d77787f7
...
@@ -92,6 +92,9 @@
...
@@ -92,6 +92,9 @@
.page-column {
.page-column {
position: absolute;
position: absolute;
left: 0;
left: 0;
.config-button {
margin-left: 8px;
}
}
}
.batch-toolbar{
.batch-toolbar{
position: absolute;
position: absolute;
...
...
ibztask-app/ibztask-app-web/src/main/docker/Dockerfile
浏览文件 @
d77787f7
FROM
adoptopenjdk/openjdk8:jdk8u242-b08-centos
FROM
image.ibizlab.cn/library/openjdk:8-jre-alpine
ENV
TZ=Asia/Shanghai \
ENV
TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
...
...
ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java
浏览文件 @
d77787f7
...
@@ -196,17 +196,17 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
...
@@ -196,17 +196,17 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Override
@Override
@Transactional
@Transactional
public
JobsInfo
start
(
JobsInfo
et
)
{
public
JobsInfo
start
(
JobsInfo
et
)
{
et
.
set
(
"Status"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Status"
,
"0"
);
update
(
et
);
update
(
et
);
return
et
;
return
et
;
}
}
@Override
@Override
@Transactional
@Transactional
public
JobsInfo
stop
(
JobsInfo
et
)
{
public
JobsInfo
stop
(
JobsInfo
et
)
{
et
.
set
(
"Next_time"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Last_time"
,
"0"
);
et
.
set
(
"Status"
,
"1"
);
et
.
set
(
"Status"
,
"1"
);
et
.
set
(
"Next_time"
,
"0"
);
update
(
et
);
update
(
et
);
return
et
;
return
et
;
}
}
...
...
ibztask-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
d77787f7
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
<!--输出实体[JOBS_INFO]数据结构 -->
<!--输出实体[JOBS_INFO]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_info-6-1"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_info-6-1"
>
<createTable
tableName=
"JOBS_INFO"
>
<createTable
tableName=
"JOBS_INFO"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_INFO_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_INFO_ID"
/>
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
<!--输出实体[JOBS_LOCK]数据结构 -->
<!--输出实体[JOBS_LOCK]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_lock-1-2"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_lock-1-2"
>
<createTable
tableName=
"JOBS_LOCK"
>
<createTable
tableName=
"JOBS_LOCK"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOCK_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOCK_ID"
/>
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
<!--输出实体[JOBS_LOG]数据结构 -->
<!--输出实体[JOBS_LOG]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_log-1-3"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_log-1-3"
>
<createTable
tableName=
"JOBS_LOG"
>
<createTable
tableName=
"JOBS_LOG"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOG_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_LOG_ID"
/>
...
@@ -86,7 +86,7 @@
...
@@ -86,7 +86,7 @@
<!--输出实体[JOBS_REGISTRY]数据结构 -->
<!--输出实体[JOBS_REGISTRY]数据结构 -->
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-jobs_registry-1-4"
>
<changeSet
author=
"
root
"
id=
"tab-jobs_registry-1-4"
>
<createTable
tableName=
"JOBS_REGISTRY"
>
<createTable
tableName=
"JOBS_REGISTRY"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<column
name=
"ID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_REGISTRY_ID"
/>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_JOBS_REGISTRY_ID"
/>
...
...
ibztask-core/src/main/resources/permission/systemResource.json
浏览文件 @
d77787f7
{
{
"systemid"
:
"ibztask"
,
"systemid"
:
"ibztask"
,
"systemname"
:
"ibztask"
,
"unires"
:[
"unires"
:[
],
],
"entities"
:[
"entities"
:[
...
...
ibztask-dependencies/pom.xml
浏览文件 @
d77787f7
...
@@ -83,9 +83,13 @@
...
@@ -83,9 +83,13 @@
<!-- 阿里seata分布式事务 -->
<!-- 阿里seata分布式事务 -->
<alibaba-seata.version>
1.3.0
</alibaba-seata.version>
<alibaba-seata.version>
1.3.0
</alibaba-seata.version>
<log4j2.version>
2.16.0
</log4j2.version>
<oracle.version>
19.8.0.0
</oracle.version>
<oracle.version>
19.8.0.0
</oracle.version>
<postgresql.version>
42.2.6
</postgresql.version>
<postgresql.version>
42.2.6
</postgresql.version>
<flowable-modeler.version>
6.4.2
</flowable-modeler.version>
<flowable-modeler.version>
6.4.2
</flowable-modeler.version>
<alibaba-fastjson.version>
1.2.57_noneautotype
</alibaba-fastjson.version>
</properties>
</properties>
<dependencyManagement>
<dependencyManagement>
...
@@ -108,6 +112,12 @@
...
@@ -108,6 +112,12 @@
<scope>
import
</scope>
<scope>
import
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<artifactId>
fastjson
</artifactId>
<version>
${alibaba-fastjson.version}
</version>
</dependency>
<!-- Alibaba Druid -->
<!-- Alibaba Druid -->
<dependency>
<dependency>
<groupId>
com.alibaba
</groupId>
<groupId>
com.alibaba
</groupId>
...
@@ -356,6 +366,11 @@
...
@@ -356,6 +366,11 @@
<artifactId>
mysql-connector-java
</artifactId>
<artifactId>
mysql-connector-java
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
com.dameng
</groupId>
<artifactId>
DmJdbcDriver18
</artifactId>
<version>
8.1.1.193
</version>
</dependency>
</dependencies>
</dependencies>
...
...
ibztask-provider/ibztask-provider-api/src/main/docker/Dockerfile
浏览文件 @
d77787f7
FROM
adoptopenjdk/openjdk8:jdk8u242-b08-centos
FROM
image.ibizlab.cn/library/openjdk:8-jre-alpine
ENV
TZ=Asia/Shanghai \
ENV
TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
...
...
ibztask-provider/ibztask-provider-api/src/main/dockerwar/Dockerfile
浏览文件 @
d77787f7
FROM
registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
FROM
registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
-withSSL
ENV
TZ Asia/Shanghai
ENV
TZ Asia/Shanghai
ENV
LANG C.UTF-8
ENV
LANG C.UTF-8
...
...
ibztask-provider/ibztask-provider-api/src/main/resources/logback-spring.xml
浏览文件 @
d77787f7
...
@@ -20,18 +20,17 @@
...
@@ -20,18 +20,17 @@
<appender
name=
"file"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
<appender
name=
"file"
class=
"ch.qos.logback.core.rolling.RollingFileAppender"
>
<rollingPolicy
class=
"ch.qos.logback.core.rolling.TimeBasedRollingPolicy"
>
<rollingPolicy
class=
"ch.qos.logback.core.rolling.TimeBasedRollingPolicy"
>
<!--日志文件输出的文件名-->
<!--日志文件输出的文件名-->
<FileNamePattern>
${LOG_PATH}/ibztask-api.%d{yyyy-MM-dd}.log
</FileNamePattern>
<FileNamePattern>
${LOG_PATH}/ibztask-api.%d{yyyy-MM-dd}.%i.log
</FileNamePattern>
<!--日志文件最大的大小-->
<timeBasedFileNamingAndTriggeringPolicy
class=
"ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"
>
<maxFileSize>
100MB
</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<!--日志文件保留天数-->
<!--日志文件保留天数-->
<MaxHistory>
30
</MaxHistory>
<MaxHistory>
30
</MaxHistory>
</rollingPolicy>
</rollingPolicy>
<encoder
class=
"ch.qos.logback.classic.encoder.PatternLayoutEncoder"
>
<encoder
class=
"ch.qos.logback.classic.encoder.PatternLayoutEncoder"
>
<pattern>
${LOG_PATTERN}
</pattern>
<pattern>
${LOG_PATTERN}
</pattern>
</encoder>
</encoder>
<!--日志文件最大的大小-->
<triggeringPolicy
class=
"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"
>
<MaxFileSize>
100MB
</MaxFileSize>
</triggeringPolicy>
</appender>
</appender>
<!-- 日志输出级别 -->
<!-- 日志输出级别 -->
<root
level=
"INFO"
>
<root
level=
"INFO"
>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录