From 6a9999c8475ce09ef882c6f1af45a37129328d7c Mon Sep 17 00:00:00 2001
From: "Jimmy.Chai" <Jimmy.Chai@fanruan.com>
Date: Thu, 24 Sep 2020 17:11:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?BI-73636=20fix=EF=BC=9A=E5=B9=B4=E5=AD=A3?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A7=E4=BB=B6=E2=80=9C=E5=AD=A3=E5=BA=A6=E2=80=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/yearquarter/trigger.yearquarter.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js
index 015911a7b..22e5588fc 100644
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@@ -18,6 +18,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
         this.yearEditor = this._createEditor(true);
         this.quarterEditor = this._createEditor(false);
 
+        // 暂时的解决方法
+        var heigth = o.height + 2;
+
         BI.createWidget({
             element: this,
             type: "bi.htape",
@@ -29,9 +32,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                         el: {
                             type: "bi.text_button",
                             text: BI.i18nText("BI-Multi_Date_Year"),
-                            width: o.height
+                            width: heigth
                         },
-                        width: o.height
+                        width: heigth
                     }]
                 }, {
                     type: "bi.htape",
@@ -39,16 +42,17 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                         el: {
                             type: "bi.text_button",
                             text: BI.i18nText("BI-Multi_Date_Quarter"),
-                            width: o.height
+                            width: heigth
                         },
-                        width: o.height}]
+                        width: heigth
+                    }]
                 }]
             }, {
                 el: {
                     type: "bi.trigger_icon_button",
-                    width: o.height
+                    width: heigth
                 },
-                width: o.height
+                width: heigth
             }]
         });
         this.setValue(o.value);

From 35fe068d4cfe9139616aea6767de18195798f8ad Mon Sep 17 00:00:00 2001
From: "Jimmy.Chai" <Jimmy.Chai@fanruan.com>
Date: Thu, 24 Sep 2020 17:16:34 +0800
Subject: [PATCH 2/2] =?UTF-8?q?BI-73636=20fix=EF=BC=9A=E5=B9=B4=E5=AD=A3?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=A7=E4=BB=B6=E2=80=9C=E5=AD=A3=E5=BA=A6=E2=80=9D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/yearquarter/trigger.yearquarter.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js
index 22e5588fc..f021b8d64 100644
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@@ -19,7 +19,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
         this.quarterEditor = this._createEditor(false);
 
         // 暂时的解决方法
-        var heigth = o.height + 2;
+        var height = o.height + 2;
 
         BI.createWidget({
             element: this,
@@ -32,9 +32,9 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                         el: {
                             type: "bi.text_button",
                             text: BI.i18nText("BI-Multi_Date_Year"),
-                            width: heigth
+                            width: height
                         },
-                        width: heigth
+                        width: height
                     }]
                 }, {
                     type: "bi.htape",
@@ -42,17 +42,17 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                         el: {
                             type: "bi.text_button",
                             text: BI.i18nText("BI-Multi_Date_Quarter"),
-                            width: heigth
+                            width: height
                         },
-                        width: heigth
+                        width: height
                     }]
                 }]
             }, {
                 el: {
                     type: "bi.trigger_icon_button",
-                    width: heigth
+                    width: height
                 },
-                width: heigth
+                width: height
             }]
         });
         this.setValue(o.value);