From fb1e8548774e26b0e82e76f1e17d026e095c254f Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 22:09:56 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96=E4=B8=8BuseC?=
 =?UTF-8?q?ontext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/useContext.html                | 7 +++++--
 src/base/combination/group.button.js    | 7 +++++--
 src/base/combination/navigation.js      | 2 ++
 src/base/combination/tab.js             | 2 ++
 src/core/4.widget.js                    | 8 ++++++--
 src/widget/date/calendar/popup.month.js | 4 ++--
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index 4ed6c9661..00bc3a455 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -5,8 +5,8 @@
     <!-- <link rel="stylesheet" type="text/css" href="../dist/2.0/fineui.min.css"/>
     <script src="../dist/2.0/fineui.js"></script> -->
     <link rel="stylesheet" type="text/css" href="http://fanruan.design/fineui/2.0/fineui.min.css"/>
-     <script src="http://fanruan.design/fineui/2.0/fineui.min.js"></script>
-<!--    <script src="http://localhost:9001/fineui.js"></script>-->
+<!--     <script src="http://fanruan.design/fineui/2.0/fineui.min.js"></script>-->
+    <script src="http://localhost:9001/fineui.js"></script>
 </head>
 <style>
 .my-parent {
@@ -50,6 +50,9 @@
         if (!BI.isNumber(pix)) {
             return pix;
         }
+        if (border > 0) {
+            return "calc(var(--css-scale) * " + pix + "px" + " - " + border + "px"+")";
+        }
         return "calc(var(--css-scale) * " + pix + "px)";
     };
 
diff --git a/src/base/combination/group.button.js b/src/base/combination/group.button.js
index 49d56167c..184a6d146 100644
--- a/src/base/combination/group.button.js
+++ b/src/base/combination/group.button.js
@@ -42,9 +42,12 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
     },
 
     _createBtns: function (items) {
-        return BI.createWidgets(BI.createItems(items, {
+        BI.Widget.pushContext(this);
+        var btns = BI.createWidgets(BI.createItems(items, {
             type: "bi.text_button",
-        }), this);
+        }));
+        BI.Widget.popContext();
+        return btns;
     },
 
     _btnsCreator: function (items) {
diff --git a/src/base/combination/navigation.js b/src/base/combination/navigation.js
index 971ec9ba9..efbf68404 100644
--- a/src/base/combination/navigation.js
+++ b/src/base/combination/navigation.js
@@ -104,7 +104,9 @@ BI.Navigation = BI.inherit(BI.Widget, {
 
     _assertCard: function (v) {
         if (!this.layout.isCardExisted(v)) {
+            BI.Widget.pushContext(this);
             var card = this.options.cardCreator(v);
+            BI.Widget.popContext();
             this.cardMap[v] = card;
             this.layout.addCardByName(v, card);
             this.afterCardCreated(v);
diff --git a/src/base/combination/tab.js b/src/base/combination/tab.js
index fe5904804..85fca3483 100644
--- a/src/base/combination/tab.js
+++ b/src/base/combination/tab.js
@@ -72,7 +72,9 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     _assertCard: function (v) {
         if (!this.layout.isCardExisted(v)) {
+            BI.Widget.pushContext(this);
             var card = this.options.cardCreator(v);
+            BI.Widget.popContext();
             this.cardMap[v] = card;
             this.layout.addCardByName(v, card);
         }
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 9910f010f..16d915bac 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -288,14 +288,18 @@
 
         _initElementWidth: function () {
             var o = this.options;
-            if (BI.isWidthOrHeight(o.width)) {
+            if (BI.isArray(o.width)) {
+                this.element.css("width", BI.pixFormat(...o.width));
+            } else if (BI.isWidthOrHeight(o.width)) {
                 this.element.css("width", BI.isNumber(o.width) ? BI.pixFormat(o.width) : o.width);
             }
         },
 
         _initElementHeight: function () {
             var o = this.options;
-            if (BI.isWidthOrHeight(o.height)) {
+            if (BI.isArray(o.height)) {
+                this.element.css("height", BI.pixFormat(...o.height));
+            } else if (BI.isWidthOrHeight(o.height)) {
                 this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height);
             }
         },
diff --git a/src/widget/date/calendar/popup.month.js b/src/widget/date/calendar/popup.month.js
index fca6c2a6f..56d518e36 100644
--- a/src/widget/date/calendar/popup.month.js
+++ b/src/widget/date/calendar/popup.month.js
@@ -67,7 +67,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
                     whiteSpace: "nowrap",
                     once: false,
                     forceSelected: true,
-                    height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
+                    height: [BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1],
                     width: 30,
                     value: td,
                     text: td,
@@ -94,4 +94,4 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
     }
 });
 BI.MonthPopup.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.month_popup", BI.MonthPopup);
\ No newline at end of file
+BI.shortcut("bi.month_popup", BI.MonthPopup);