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

Merge pull request #1680 from wjllp/cronGen_fix 

修复使用cronGen修改表达式时的bug--修改一个字段会导致其他字段也被修改
This commit is contained in:
许雪里 2020-05-21 19:32:45 +08:00 committed by GitHub
parent 74055a5390 b9a0fd76bc
commit eba4695089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1011,12 +1011,12 @@
//获取参数中表达式的值
if (cronExpress) {
var regs = cronExpress.split(' ');
$("input[name=secondHidden]").val(regs[0]);
$("input[name=minHidden]").val(regs[1]);
$("input[name=hourHidden]").val(regs[2]);
$("input[name=dayHidden]").val(regs[3]);
$("input[name=monthHidden]").val(regs[4]);
$("input[name=weekHidden]").val(regs[5]);
$("#secondHidden").val(regs[0]);
$("#minHidden").val(regs[1]);
$("#hourHidden").val(regs[2]);
$("#dayHidden").val(regs[3]);
$("#monthHidden").val(regs[4]);
$("#weekHidden").val(regs[5]);
$.fn.cronGen.tools.initObj(regs[0], "second");
$.fn.cronGen.tools.initObj(regs[1], "min");

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

@ -1011,12 +1011,12 @@
//获取参数中表达式的值
if (cronExpress) {
var regs = cronExpress.split(' ');
$("input[name=secondHidden]").val(regs[0]);
$("input[name=minHidden]").val(regs[1]);
$("input[name=hourHidden]").val(regs[2]);
$("input[name=dayHidden]").val(regs[3]);
$("input[name=monthHidden]").val(regs[4]);
$("input[name=weekHidden]").val(regs[5]);
$("#secondHidden").val(regs[0]);
$("#minHidden").val(regs[1]);
$("#hourHidden").val(regs[2]);
$("#dayHidden").val(regs[3]);
$("#monthHidden").val(regs[4]);
$("#weekHidden").val(regs[5]);
$.fn.cronGen.tools.initObj(regs[0], "second");
$.fn.cronGen.tools.initObj(regs[1], "min");