From 01b7a3692249e0a322a9d95c9734ce6e4b7da6c3 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Mon, 9 Dec 2019 09:40:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/timeinterval/dateinterval.js | 8 ++++----
 src/widget/timeinterval/timeinterval.js | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js
index 12a1d2b27..97f2b0f73 100644
--- a/src/widget/timeinterval/dateinterval.js
+++ b/src/widget/timeinterval/dateinterval.js
@@ -109,10 +109,10 @@ BI.DateInterval = BI.inherit(BI.Single, {
             }
         });
 
-        combo.on(BI.DynamicDateCombo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.left.hidePopupView();
-            self.right.hidePopupView();
-        });
+        // combo.on(BI.DynamicDateCombo.EVENT_BEFORE_POPUPVIEW, function () {
+        //     self.left.hidePopupView();
+        //     self.right.hidePopupView();
+        // });
 
         combo.on(BI.DynamicDateCombo.EVENT_CONFIRM, function () {
             BI.Bubbles.hide("error");
diff --git a/src/widget/timeinterval/timeinterval.js b/src/widget/timeinterval/timeinterval.js
index 83bd84aa0..20d307da1 100644
--- a/src/widget/timeinterval/timeinterval.js
+++ b/src/widget/timeinterval/timeinterval.js
@@ -109,10 +109,11 @@ BI.TimeInterval = BI.inherit(BI.Single, {
             }
         });
 
-        combo.on(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW, function () {
-            self.left.hidePopupView();
-            self.right.hidePopupView();
-        });
+        // 不知道干啥的,先注释掉
+        // combo.on(BI.DynamicDateTimeCombo.EVENT_BEFORE_POPUPVIEW, function () {
+        //     self.left.hidePopupView();
+        //     self.right.hidePopupView();
+        // });
 
         combo.on(BI.DynamicDateTimeCombo.EVENT_CONFIRM, function () {
             BI.Bubbles.hide("error");

From 091fc335b8d3604917d3c4a33901ccedc3b73fa0 Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Mon, 9 Dec 2019 11:38:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-2418=20refactor:=20=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/core/widget.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typescript/core/widget.ts b/typescript/core/widget.ts
index 65a6a9b5b..a3c5ddf92 100644
--- a/typescript/core/widget.ts
+++ b/typescript/core/widget.ts
@@ -247,7 +247,7 @@ export interface _Widget extends _OB {
     /**
      * 根据wigetname获取子元素实例
      */
-    getWidgetByName(_name: string): _Widget;
+    getWidgetByName(_name: string): _Widget | undefined;
 
     /**
      * 移除子元素