ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cronGen 兼容性调整；可视化插件弹框会替换Input框，因此取值时应该从替换后的弹框中取；

This commit is contained in:
xuxueli 2019-10-25 18:31:27 +08:00
parent 3f30df9472
commit 111fdc4f91
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
View File

@ -430,6 +430,8 @@ $(function() {
}
$("#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) {
if (data.code == "200") {
@ -593,6 +595,9 @@ $(function() {
}
$("#updateModal .form input[name='executorFailRetryCount']").val(executorFailRetryCount);
// process-cronGen
$("#updateModal .form input[name='jobCron']").val( $("#updateModal .form input[name='cronGen_display']").val() );
// post
$.post(base_url + "/jobinfo/update", $("#updateModal .form").serialize(), function(data, status) {
if (data.code == "200") {

2
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
View File

@ -331,7 +331,7 @@
// Replace the input with an input group
var $g = $("<div>").addClass("input-group");
// 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);
// Add the button
var $b = $("<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>");

2
xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
View File

@ -331,7 +331,7 @@
// Replace the input with an input group
var $g = $("<div>").addClass("input-group");
// 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);
// Add the button
var $b = $("<button class=\"btn btn-default\"><i class=\"fa fa-edit\"></i></button>");