From e6d27bba6ae508e57fbca9149c858adf7b15148d Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Thu, 9 Jun 2022 09:49:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?REPORT-73071=20fix:=20=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E8=AE=B0=E5=BD=95datetime=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=89=8D=E6=98=AF=E5=90=A6=E8=A7=A6=E5=8F=91?= =?UTF-8?q?=E8=BF=87error?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 1b8a58243..281ac0957 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -32,6 +32,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { var date = BI.getDate(); this.storeValue = opts.value; var border = opts.simple ? 1 : 2; + var errorState = false; return { type: "bi.absolute", @@ -120,6 +121,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }; self.combo.element.addClass("error"); + errorState = true; self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); } }, { @@ -138,10 +140,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { action: function () { var dateStore = self.storeTriggerValue; var dateObj = self.trigger.getKey(); - if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore)) { + if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore) && !errorState) { return; } - if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) { + if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore) + || BI.isEqual(dateObj, dateStore) && errorState) { self.storeValue = self.trigger.getValue(); self.setValue(self.trigger.getValue()); } else if (BI.isEmptyString(dateObj)) { @@ -150,6 +153,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } self._checkDynamicValue(self.storeValue); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); + errorState = false; } }] }] From 21e662b9050547ecb63c09b2c26d686a41bf4ac8 Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Thu, 9 Jun 2022 10:53:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?datetime=20valid=E8=A7=A6=E5=8F=91=E6=97=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0value?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index 1b8a58243..d533205fe 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -125,6 +125,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { }, { eventName: BI.DynamicDateTimeTrigger.EVENT_VALID, action: function () { + self.storeValue = self.trigger.getValue(); self.combo.element.removeClass("error"); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_VALID); } From f1e3174b4514cba0b545ff65d02cd94f7d41c7aa Mon Sep 17 00:00:00 2001 From: "Austin.Duan" Date: Thu, 9 Jun 2022 10:56:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/dynamicdatetime/dynamicdatetime.combo.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js index bed4bc0f1..d533205fe 100644 --- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js +++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js @@ -32,7 +32,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { var date = BI.getDate(); this.storeValue = opts.value; var border = opts.simple ? 1 : 2; - var errorState = false; return { type: "bi.absolute", @@ -121,7 +120,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } }; self.combo.element.addClass("error"); - errorState = true; self.fireEvent(BI.DynamicDateTimeCombo.EVENT_ERROR); } }, { @@ -141,11 +139,10 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { action: function () { var dateStore = self.storeTriggerValue; var dateObj = self.trigger.getKey(); - if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore) && !errorState) { + if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore)) { return; } - if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore) - || BI.isEqual(dateObj, dateStore) && errorState) { + if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) { self.storeValue = self.trigger.getValue(); self.setValue(self.trigger.getValue()); } else if (BI.isEmptyString(dateObj)) { @@ -154,7 +151,6 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, { } self._checkDynamicValue(self.storeValue); self.fireEvent(BI.DynamicDateTimeCombo.EVENT_CONFIRM); - errorState = false; } }] }]