From 111fdc4f91ac9cd43e2fcbaa544d7b9559dcc5cf Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Fri, 25 Oct 2019 18:31:27 +0800
Subject: [PATCH] =?UTF-8?q?cronGen=20=E5=85=BC=E5=AE=B9=E6=80=A7=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B=E5=8F=AF=E8=A7=86=E5=8C=96=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BC=9A=E6=9B=BF=E6=8D=A2Input=E6=A1=86?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E6=AD=A4=E5=8F=96=E5=80=BC=E6=97=B6=E5=BA=94?=
 =?UTF-8?q?=E8=AF=A5=E4=BB=8E=E6=9B=BF=E6=8D=A2=E5=90=8E=E7=9A=84=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E4=B8=AD=E5=8F=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/static/js/jobinfo.index.1.js          | 5 +++++
 .../src/main/resources/static/plugins/cronGen/cronGen.js     | 2 +-
 .../src/main/resources/static/plugins/cronGen/cronGen_en.js  | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
index 8354d598..815c26fe 100644
--- a/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js
@@ -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") {
diff --git a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
index ba191776..5ec7046d 100755
--- a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
+++ b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js
@@ -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>");
diff --git a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
index 3f59edf2..72018339 100755
--- a/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
+++ b/xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js
@@ -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>");