Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
111fdc4f
authored
Oct 25, 2019
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
cronGen 兼容性调整;可视化插件弹框会替换Input框,因此取值时应该从替换后的弹框中取;
parent
3f30df94
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
View file @
111fdc4f
...
@@ -430,6 +430,8 @@ $(function() {
...
@@ -430,6 +430,8 @@ $(function() {
}
}
$
(
"#addModal .form input[name='executorFailRetryCount']"
).
val
(
executorFailRetryCount
);
$
(
"#addModal .form input[name='executorFailRetryCount']"
).
val
(
executorFailRetryCount
);
// process-cronGen
$
(
"#addModal .form input[name='jobCron']"
).
val
(
$
(
"#addModal .form input[name='cronGen_display']"
).
val
()
);
$
.
post
(
base_url
+
"/jobinfo/add"
,
$
(
"#addModal .form"
).
serialize
(),
function
(
data
,
status
)
{
$
.
post
(
base_url
+
"/jobinfo/add"
,
$
(
"#addModal .form"
).
serialize
(),
function
(
data
,
status
)
{
if
(
data
.
code
==
"200"
)
{
if
(
data
.
code
==
"200"
)
{
...
@@ -593,6 +595,9 @@ $(function() {
...
@@ -593,6 +595,9 @@ $(function() {
}
}
$
(
"#updateModal .form input[name='executorFailRetryCount']"
).
val
(
executorFailRetryCount
);
$
(
"#updateModal .form input[name='executorFailRetryCount']"
).
val
(
executorFailRetryCount
);
// process-cronGen
$
(
"#updateModal .form input[name='jobCron']"
).
val
(
$
(
"#updateModal .form input[name='cronGen_display']"
).
val
()
);
// post
// post
$
.
post
(
base_url
+
"/jobinfo/update"
,
$
(
"#updateModal .form"
).
serialize
(),
function
(
data
,
status
)
{
$
.
post
(
base_url
+
"/jobinfo/update"
,
$
(
"#updateModal .form"
).
serialize
(),
function
(
data
,
status
)
{
if
(
data
.
code
==
"200"
)
{
if
(
data
.
code
==
"200"
)
{
...
...
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
View file @
111fdc4f
...
@@ -331,7 +331,7 @@
...
@@ -331,7 +331,7 @@
// Replace the input with an input group
// Replace the input with an input group
var
$g
=
$
(
"<div>"
).
addClass
(
"input-group"
);
var
$g
=
$
(
"<div>"
).
addClass
(
"input-group"
);
// Add an input
// Add an input
var
$i
=
$
(
"<input>"
,
{
type
:
'text'
,
placeholder
:
'cron表达式...'
}).
addClass
(
"form-control"
).
val
(
$
(
that
).
val
());
var
$i
=
$
(
"<input>"
,
{
type
:
'text'
,
placeholder
:
'cron表达式...'
,
name
:
'cronGen_display'
}).
addClass
(
"form-control"
).
val
(
$
(
that
).
val
());
$i
.
appendTo
(
$g
);
$i
.
appendTo
(
$g
);
// Add the button
// Add the button
var
$b
=
$
(
"<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>"
);
var
$b
=
$
(
"<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>"
);
...
...
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
View file @
111fdc4f
...
@@ -331,7 +331,7 @@
...
@@ -331,7 +331,7 @@
// Replace the input with an input group
// Replace the input with an input group
var
$g
=
$
(
"<div>"
).
addClass
(
"input-group"
);
var
$g
=
$
(
"<div>"
).
addClass
(
"input-group"
);
// Add an input
// Add an input
var
$i
=
$
(
"<input>"
,
{
type
:
'text'
,
placeholder
:
'cron expression...'
}).
addClass
(
"form-control"
).
val
(
$
(
that
).
val
());
var
$i
=
$
(
"<input>"
,
{
type
:
'text'
,
placeholder
:
'cron expression...'
,
name
:
'cronGen_display'
}).
addClass
(
"form-control"
).
val
(
$
(
that
).
val
());
$i
.
appendTo
(
$g
);
$i
.
appendTo
(
$g
);
// Add the button
// Add the button
var
$b
=
$
(
"<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>"
);
var
$b
=
$
(
"<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment