From fd0b89d0da7a562e9a9ceae3d8d452964d5825c7 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 25 Nov 2020 14:45:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8D=95=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/__test__/base.test.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/__test__/base.test.js b/src/core/__test__/base.test.js
index 16b16ec251..2f4c483b2e 100644
--- a/src/core/__test__/base.test.js
+++ b/src/core/__test__/base.test.js
@@ -437,7 +437,7 @@ describe("baseFunctionTest", function () {
      * test_author_teller
      * 只传一个时分秒format的时间进去后,在某些情况下,返回的是当前时间,然而想要的是返回正确的时分秒
     */
-    it("parseDateTime", function () {
-        expect(BI.parseDateTime("14:13:16", "%H:%M:%S").getTime()).to.eql(1602655996000);
+    it("parseDateTime2", function () {
+        expect(BI.parseDateTime("2020-11-11 14:13:16", "%Y-%X-%e %H:%M:%S").getTime()).to.eql(1605075196000);
     });
 });

From 3652a9a6b19de97e7a96741d278f0351048ba511 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 25 Nov 2020 15:21:22 +0800
Subject: [PATCH 2/3] update

---
 src/core/__test__/base.test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/__test__/base.test.js b/src/core/__test__/base.test.js
index 2f4c483b2e..558191d023 100644
--- a/src/core/__test__/base.test.js
+++ b/src/core/__test__/base.test.js
@@ -438,6 +438,7 @@ describe("baseFunctionTest", function () {
      * 只传一个时分秒format的时间进去后,在某些情况下,返回的是当前时间,然而想要的是返回正确的时分秒
     */
     it("parseDateTime2", function () {
-        expect(BI.parseDateTime("2020-11-11 14:13:16", "%Y-%X-%e %H:%M:%S").getTime()).to.eql(1605075196000);
+        var date = BI.getDate();
+        expect(BI.parseDateTime("14:13:16", "%H:%M:%S").getTime()).to.eql(BI.getDate(date.getFullYear(), date.getMonth(), 14, 14, 13, 16).getTime());
     });
 });

From 44cb6b6deb0f5aaf7fa1d73062ede442d6b15d35 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Wed, 25 Nov 2020 15:40:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?BI-77248=20fix:=20=E6=97=A0=E9=80=8F?=
 =?UTF-8?q?=E6=98=8E=E5=92=8C=E8=87=AA=E5=8A=A8=E6=97=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E9=80=8F=E6=98=8E=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../colorchooser/colorpicker/editor.colorpicker.hex.simple.js   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
index abeac571c2..0440d25db4 100644
--- a/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
+++ b/src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
@@ -181,7 +181,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
         this.R.setValue(BI.isNull(json.r) ? "" : json.r);
         this.G.setValue(BI.isNull(json.g) ? "" : json.g);
         this.B.setValue(BI.isNull(json.b) ? "" : json.b);
-        this.hexEditor.setValue(color.slice(this.constants.HEX_PREFIX_POSITION));
+        this.hexEditor.setValue(BI.isEmptyObject(json) ? "" : color.slice(this.constants.HEX_PREFIX_POSITION));
     },
 
     getValue: function () {