From 4476fd7e54561f7098dabd58de991d875fbd9d2c Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Thu, 21 May 2020 19:48:49 +0800
Subject: [PATCH] =?UTF-8?q?-=201=E3=80=81Cron=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=EF=BC=9ACron=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9cron=E6=97=B6=E5=8F=AF=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=9C=80=E8=BF=91=E8=BF=90=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4;=20-=202=E3=80=81Cron=E7=BC=96=E8=BE=91=E5=99=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=B0=8F=E6=A6=82=E7=8E=87=E6=83=85=E5=86=B5=E4=B8=8Bcron?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=85=B6=E4=BB=96=E5=AD=97=E6=AE=B5=E8=A2=AB?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                                    | 4 +++-
 .../src/main/resources/static/plugins/cronGen/cronGen.js      | 2 +-
 .../src/main/resources/static/plugins/cronGen/cronGen_en.js   | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index db22d091..9089bd6e 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1961,7 +1961,9 @@ data: post-data
 注意：XxlJobSpringExecutor组件个别字段调整：“appName” 调整为 “appname” ，升级时该组件时需要注意；
 
 ### 7.31 版本 v2.2.1 Release Notes[迭代中]
-- 1、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
+- 1、Cron编辑器增强：Cron编辑器修改cron时可实时查看最近运行时间;
+- 2、Cron编辑器问题修复：修复小概率情况下cron单个字段修改时导致其他字段被重置问题；
+- 3、[迭代中] 新增任务属性 "XxlJobContent" ，统一维护任务上下文信息，方便运行时存取任务相关信息；
 
 
 ### TODO LIST
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 2ebf3375..dc52267a 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
@@ -10,7 +10,7 @@
             options = $.extend({}, $.fn.cronGen.defaultOptions, options);
             //create top menu
             var cronContainer = $("<div/>", { id: "CronContainer", style: "display:none;width:300px;height:300px;" });
-            var mainDiv = $("<div/>", { id: "CronGenMainDiv", style: "width:410px;height:430px;" });
+            var mainDiv = $("<div/>", { id: "CronGenMainDiv", style: "width:410px;height:420px;" });
             var topMenu = $("<ul/>", { "class": "nav nav-tabs", id: "CronGenTabs" });
             $('<li/>', { 'class': 'active' }).html($('<a id="SecondlyTab" href="#Secondly">秒</a>')).appendTo(topMenu);
             $('<li/>').html($('<a id="MinutesTab" href="#Minutes">分钟</a>')).appendTo(topMenu);
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 a88be4a7..78bbbb77 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
@@ -10,7 +10,7 @@
             options = $.extend({}, $.fn.cronGen.defaultOptions, options);
             //create top menu
             var cronContainer = $("<div/>", { id: "CronContainer", style: "display:none;width:300px;height:300px;" });
-            var mainDiv = $("<div/>", { id: "CronGenMainDiv", style: "width:410px;height:430px;" });
+            var mainDiv = $("<div/>", { id: "CronGenMainDiv", style: "width:410px;height:420px;" });
             var topMenu = $("<ul/>", { "class": "nav nav-tabs", id: "CronGenTabs" });
             $('<li/>', { 'class': 'active' }).html($('<a id="SecondlyTab" href="#Secondly">秒</a>')).appendTo(topMenu);
             $('<li/>').html($('<a id="MinutesTab" href="#Minutes">Minute</a>')).appendTo(topMenu);