From 8205b3f29440f3217e4ceebe60575cc17b64f818 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 18 Oct 2022 16:58:21 +0800
Subject: [PATCH 01/97] =?UTF-8?q?BI-107080=20fix:=20=E3=80=906.0=E4=B8=89?=
 =?UTF-8?q?=E8=BD=AE=E5=9B=9E=E5=BD=92=E3=80=91=E5=8F=AA=E6=9C=89=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=97=A0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E7=9A=84=E6=97=B6=E5=80=99=E6=82=AC=E6=B5=AE=E6=97=A0?=
 =?UTF-8?q?tooltip?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/dynamicdate/dynamicdate.trigger.js |  3 ++
 .../dynamicdatetime.trigger.js                | 42 ++++++++++---------
 src/widget/time/time.trigger.js               |  3 ++
 src/widget/yearquarter/trigger.yearquarter.js |  2 -
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/widget/dynamicdate/dynamicdate.trigger.js b/src/widget/dynamicdate/dynamicdate.trigger.js
index 012f6c722..9ecaa3cd9 100644
--- a/src/widget/dynamicdate/dynamicdate.trigger.js
+++ b/src/widget/dynamicdate/dynamicdate.trigger.js
@@ -152,6 +152,9 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
 
     _getTitle: function () {
         var storeValue = this.storeValue || {};
+        if (BI.isEmptyObject(storeValue)) {
+            return this.options.watermark;
+        }
         var type = storeValue.type || BI.DynamicDateCombo.Static;
         var value = storeValue.value;
         switch (type) {
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
index dd5c7ed6f..86a942fe7 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.trigger.js
@@ -9,7 +9,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
         iconWidth: 24
     },
 
-    props: {
+    props: () => ({
         extraCls: "bi-date-time-trigger",
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期
@@ -17,8 +17,8 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
         iconWidth: 24,
         format: "", // 显示的日期格式化方式
         allowEdit: true, // 是否允许编辑
-        watermark: ""
-    },
+        watermark: BI.i18nText("BI-Basic_Unrestricted"),
+    }),
 
     _init: function () {
         BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
@@ -44,7 +44,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true,
-            watermark: BI.isKey(o.watermark) ? o.watermark : BI.i18nText("BI-Basic_Unrestricted"),
+            watermark: o.watermark,
             errorText: function (v) {
                 var str = "";
                 if (!BI.isKey(o.format)) {
@@ -149,7 +149,11 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
     },
 
     _getTitle: function () {
+        var o = this.options;
         var storeValue = this.storeValue || {};
+        if (BI.isEmptyObject(storeValue)) {
+            return o.watermark;
+        }
         var type = storeValue.type || BI.DynamicDateCombo.Static;
         var value = storeValue.value;
         switch (type) {
@@ -197,7 +201,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
         // 这边不能直接用\d+去切日期, 因为format格式可能是20190607这样的没有分割符的 = =
         // 先看一下是否是合法的, 如果合法就变成标准格式的走原来的流程, 不合法不关心
         var date = BI.parseDateTime(v, this._getFormatString());
-        if(BI.print(date, this._getFormatString()) === v) {
+        if (BI.print(date, this._getFormatString()) === v) {
             v = BI.print(date, c.compareFormat);
             result = [0, 1, 2];
         }
@@ -214,7 +218,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
             BI.isNumeric(v) && v.length === 1 && (suffixArray[idx] = "0" + v);
         });
         // hh:mm
-        if(suffixArray.length === 2 && !hasSecond) {
+        if (suffixArray.length === 2 && !hasSecond) {
             suffixArray.push("00");
         }
         var suffixString = suffixArray.join(":");
@@ -283,42 +287,42 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
     _getText: function (obj) {
         var value = "";
         var endText = "";
-        if(BI.isNotNull(obj.year)) {
-            if(BI.parseInt(obj.year) !== 0) {
+        if (BI.isNotNull(obj.year)) {
+            if (BI.parseInt(obj.year) !== 0) {
                 value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
             }
             endText = getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
         }
-        if(BI.isNotNull(obj.quarter)) {
-            if(BI.parseInt(obj.quarter) !== 0) {
+        if (BI.isNotNull(obj.quarter)) {
+            if (BI.parseInt(obj.quarter) !== 0) {
                 value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
             }
             endText = getPositionText(BI.i18nText("BI-Basic_Single_Quarter"), obj.position);
         }
-        if(BI.isNotNull(obj.month)) {
-            if(BI.parseInt(obj.month) !== 0) {
+        if (BI.isNotNull(obj.month)) {
+            if (BI.parseInt(obj.month) !== 0) {
                 value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
             }
             endText = getPositionText(BI.i18nText("BI-Basic_Month"), obj.position);
         }
-        if(BI.isNotNull(obj.week)) {
-            if(BI.parseInt(obj.week) !== 0) {
+        if (BI.isNotNull(obj.week)) {
+            if (BI.parseInt(obj.week) !== 0) {
                 value += Math.abs(obj.week) + BI.i18nText("BI-Basic_Week") + (obj.week < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
             }
             endText = getPositionText(BI.i18nText("BI-Basic_Week"), obj.position);
         }
-        if(BI.isNotNull(obj.day)) {
-            if(BI.parseInt(obj.day) !== 0) {
+        if (BI.isNotNull(obj.day)) {
+            if (BI.parseInt(obj.day) !== 0) {
                 value += Math.abs(obj.day) + BI.i18nText("BI-Basic_Day") + (obj.day < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
             }
             endText = BI.size(obj) === 1 ? getPositionText(BI.i18nText("BI-Basic_Month"), obj.position) : "";
         }
-        if(BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) {
+        if (BI.isNotNull(obj.workDay) && BI.parseInt(obj.workDay) !== 0) {
             value += Math.abs(obj.workDay) + BI.i18nText("BI-Basic_Work_Day") + (obj.workDay < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind"));
         }
-        return value +  endText;
+        return value + endText;
 
-        function getPositionText (baseText, position) {
+        function getPositionText(baseText, position) {
             switch (position) {
                 case BI.DynamicDateCard.OFFSET.BEGIN:
                     return baseText + BI.i18nText("BI-Basic_Begin_Start");
diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js
index 6b089fa86..a15235cf4 100644
--- a/src/widget/time/time.trigger.js
+++ b/src/widget/time/time.trigger.js
@@ -157,6 +157,9 @@
 
         _getTitle: function () {
             var storeValue = this.storeValue || {};
+            if (BI.isEmptyObject(storeValue)) {
+                return this.options.watermark;
+            }
             var date = BI.getDate();
             return BI.print(BI.getDate(date.getFullYear(), 0, 1, storeValue.hour, storeValue.minute, storeValue.second), this._getFormatString());
         },
diff --git a/src/widget/yearquarter/trigger.yearquarter.js b/src/widget/yearquarter/trigger.yearquarter.js
index 84bda3b3f..876856379 100644
--- a/src/widget/yearquarter/trigger.yearquarter.js
+++ b/src/widget/yearquarter/trigger.yearquarter.js
@@ -249,9 +249,7 @@ BI.DynamicYearQuarterTrigger = BI.inherit(BI.Trigger, {
                 value = value || {};
                 var quarter = BI.isNull(value.quarter) ? null : value.quarter;
                 this.yearEditor.setValue(value.year);
-                this.yearEditor.setTitle(value.year);
                 this.quarterEditor.setValue(quarter);
-                this.quarterEditor.setTitle(quarter);
                 this.setTitle(this._getStaticTitle(value));
                 break;
         }

From 908ff5cb06c4e2a2730819ceeb1b27aec990d495 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 18 Oct 2022 17:17:47 +0800
Subject: [PATCH 02/97] =?UTF-8?q?=E6=97=A0JIRA:=20sign=5Feditor=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/editor/editor.sign.js | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/case/editor/editor.sign.js b/src/case/editor/editor.sign.js
index 330c31dfe..7a69a5005 100644
--- a/src/case/editor/editor.sign.js
+++ b/src/case/editor/editor.sign.js
@@ -68,17 +68,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.SignEditor.EVENT_CLICK_LABEL);
             });
         });
-        BI.createWidget({
-            type: "bi.absolute",
-            element: this,
-            items: [{
-                el: this.text,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }]
-        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
@@ -137,10 +126,17 @@ BI.SignEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.SignEditor.EVENT_EMPTY, arguments);
         });
         BI.createWidget({
-            type: "bi.vertical",
-            scrolly: false,
+            type: "bi.absolute",
             element: this,
-            items: [this.editor]
+            items: [
+                {
+                    el: this.text,
+                    inset: 0,
+                }, {
+                    el: this.editor,
+                    inset: 0,
+                }
+            ]
         });
         this._showHint();
         self._checkText();

From 23a1aa75cece7a9f2f45285b70e25294e833211c Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 18 Oct 2022 17:19:41 +0800
Subject: [PATCH 03/97] =?UTF-8?q?=E6=97=A0jira=20editor=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/editor/editor.shelter.js | 24 ++++++++++--------------
 src/case/editor/editor.state.js   | 24 ++++++++++--------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/src/case/editor/editor.shelter.js b/src/case/editor/editor.shelter.js
index 39def9d77..31883614c 100644
--- a/src/case/editor/editor.shelter.js
+++ b/src/case/editor/editor.shelter.js
@@ -58,17 +58,6 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             height: o.height,
             hgap: o.hgap + 2
         });
-        BI.createWidget({
-            type: "bi.absolute",
-            element: this,
-            items: [{
-                el: this.text,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }]
-        });
         this.text.on(BI.Controller.EVENT_CHANGE, function () {
             arguments[2] = self;
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
@@ -134,10 +123,17 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.ShelterEditor.EVENT_EMPTY, arguments);
         });
         BI.createWidget({
-            type: "bi.vertical",
-            scrolly: false,
+            type: "bi.absolute",
             element: this,
-            items: [this.editor]
+            items: [
+                {
+                    el: this.text,
+                    inset: 0,
+                }, {
+                    el: this.editor,
+                    inset: 0,
+                }
+            ]
         });
         this._showHint();
         self._checkText();
diff --git a/src/case/editor/editor.state.js b/src/case/editor/editor.state.js
index e9d3900bd..8ed915716 100644
--- a/src/case/editor/editor.state.js
+++ b/src/case/editor/editor.state.js
@@ -77,17 +77,6 @@ BI.StateEditor = BI.inherit(BI.Widget, {
                 self.fireEvent(BI.StateEditor.EVENT_CLICK_LABEL);
             });
         });
-        BI.createWidget({
-            type: "bi.absolute",
-            element: this,
-            items: [{
-                el: this.text,
-                left: 0,
-                right: 0,
-                top: 0,
-                bottom: 0
-            }]
-        });
         this.editor.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
@@ -143,10 +132,17 @@ BI.StateEditor = BI.inherit(BI.Widget, {
             self.fireEvent(BI.StateEditor.EVENT_EMPTY, arguments);
         });
         BI.createWidget({
-            type: "bi.vertical",
-            scrolly: false,
+            type: "bi.absolute",
             element: this,
-            items: [this.editor]
+            items: [
+                {
+                    el: this.text,
+                    inset: 0,
+                }, {
+                    el: this.editor,
+                    inset: 0,
+                }
+            ]
         });
         this._showHint();
         if (BI.isNotNull(o.text)) {

From 97c6a13151d481f5eb350d5f23be1fc1a0ac5594 Mon Sep 17 00:00:00 2001
From: windy <taiyangstorm@gmail.com>
Date: Tue, 18 Oct 2022 17:33:57 +0800
Subject: [PATCH 04/97] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/singleselect/trigger/searcher.singleselect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/singleselect/trigger/searcher.singleselect.js b/src/widget/singleselect/trigger/searcher.singleselect.js
index a5674b8f1..800fd7560 100644
--- a/src/widget/singleselect/trigger/searcher.singleselect.js
+++ b/src/widget/singleselect/trigger/searcher.singleselect.js
@@ -128,7 +128,7 @@ BI.SingleSelectSearcher = BI.inherit(BI.Widget, {
         if (BI.isUndefined(v)) {
             this.editor.setState(BI.Selection.None);
         } else {
-            v = v || "";
+            v = v ?? "";
             this.editor.setState(o.valueFormatter(v + "") || (v + ""));
         }
     },

From fbe7d4eed608a05fdb28c7ba9b9c28522420d633 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 09:44:33 +0800
Subject: [PATCH 05/97] auto upgrade version to 2.0.20221019094420

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6af83cc7a..f857c0271 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221018173445",
+  "version": "2.0.20221019094420",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 8af8c5de8c8da78545f02aa747d179c5670bdc08 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 10:14:15 +0800
Subject: [PATCH 06/97] auto upgrade version to 2.0.20221019101409

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f857c0271..6bf221ed0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019094420",
+  "version": "2.0.20221019101409",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 85faf92e97b33f4e7f16a99fa88d27d12ba8e6b4 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 15:57:37 +0800
Subject: [PATCH 07/97] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81px?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/collection/collection.js             |  19 +--
 src/base/grid/grid.js                         |  19 +--
 src/base/layer/layer.popup.js                 |  16 +--
 src/base/list/virtualgrouplist.js             |   4 +-
 src/base/list/virtuallist.js                  |   4 +-
 src/base/single/1.text.js                     |  14 +--
 src/base/single/button/buttons/button.icon.js |   2 +-
 src/base/single/button/buttons/button.js      |  14 ++-
 src/base/single/html/html.js                  |  15 ++-
 src/base/single/label/abstract.label.js       |   8 +-
 src/base/single/label/icon.label.js           |   2 +-
 src/base/single/tip/tip.toast.js              |   5 +-
 src/base/single/tip/tip.tooltip.js            |   2 +-
 src/case/colorchooser/colorchooser.js         |   4 +-
 .../icontextvaluecombo/combo.icontextvalue.js |   6 +-
 .../combo.searchtextvalue.js                  |   9 +-
 .../combo.textvaluecheck.js                   |   6 +-
 .../combo/textvaluecombo/combo.textvalue.js   |   6 +-
 src/case/layer/panel.js                       |   4 +-
 .../linearsegment/button.linear.segment.js    |   2 +-
 src/case/list/list.select.js                  |   2 +-
 src/case/segment/button.segment.js            |   3 -
 src/case/segment/segment.js                   |   2 +-
 .../tree/treeexpander/tree.expander.popup.js  |   4 +-
 src/case/trigger/trigger.editor.js            |   8 +-
 src/case/trigger/trigger.text.select.small.js |   3 +-
 src/core/4.widget.js                          |   8 +-
 src/core/constant/var.js                      |  13 +++
 src/core/controller/controller.popover.js     |   5 +-
 src/core/controller/controller.tooltips.js    |   5 +-
 src/core/wrapper/layout.js                    |  10 +-
 src/core/wrapper/layout/layout.flow.js        |   8 +-
 src/core/wrapper/layout/layout.inline.js      |   8 +-
 src/widget/date/calendar/popup.month.js       |   2 +-
 src/widget/dynamicdate/dynamicdate.combo.js   |  10 +-
 .../dynamicdate/dynamicdate.param.item.js     |   2 +-
 src/widget/dynamicdate/dynamicdate.popup.js   |   6 +-
 .../dynamicdatetime/dynamicdatetime.combo.js  |   6 +-
 .../dynamicdatetime/dynamicdatetime.popup.js  |   6 +-
 src/widget/editor/editor.search.js            |   4 +-
 src/widget/editor/editor.text.js              |   8 +-
 src/widget/intervalslider/intervalslider.js   |   8 +-
 .../multilayerselecttree.combo.js             |  20 ++--
 .../multilayerselecttree.popup.js             |   2 +-
 .../multilayersingletree.combo.js             |  17 +--
 .../multilayersingletree.popup.js             |   2 +-
 src/widget/multiselect/multiselect.combo.js   |   2 +-
 .../multiselect/multiselect.combo.nobar.js    |   2 +-
 .../multiselect/multiselect.insert.combo.js   |   2 +-
 .../multiselect.insert.combo.nobar.js         |   2 +-
 .../multiselect/multiselect.loader.nobar.js   |   2 +-
 src/widget/multitree/multi.tree.combo.js      |   2 +-
 .../multitree/multi.tree.insert.combo.js      |   2 +-
 src/widget/multitree/multi.tree.list.combo.js |   2 +-
 src/widget/numbereditor/number.editor.js      |   4 +-
 src/widget/numberinterval/numberinterval.js   | 108 ++++++++++--------
 .../multitextvalue.combo.search.js            |   2 +-
 src/widget/selecttree/selecttree.combo.js     |   6 +-
 src/widget/singleselect/singleselect.combo.js |   2 +-
 .../singleselect/singleselect.insert.combo.js |   2 +-
 src/widget/singleselect/singleselect.list.js  |   2 +-
 src/widget/singleslider/singleslider.js       |   4 +-
 src/widget/singleslider/singleslider.label.js |   2 +-
 src/widget/singletree/singletree.combo.js     |   6 +-
 .../combo.textvaluedownlist.js                |   7 +-
 src/widget/time/time.combo.js                 |   4 +-
 src/widget/year/combo.year.js                 |  12 +-
 src/widget/year/popup.year.js                 |   6 +-
 src/widget/yearmonth/card.static.yearmonth.js |   2 +-
 src/widget/yearmonth/combo.yearmonth.js       |  16 +--
 src/widget/yearmonth/popup.yearmonth.js       |   6 +-
 src/widget/yearquarter/combo.yearquarter.js   |  14 +--
 src/widget/yearquarter/popup.yearquarter.js   |   6 +-
 73 files changed, 272 insertions(+), 288 deletions(-)

diff --git a/src/base/collection/collection.js b/src/base/collection/collection.js
index 8f6835aa9..d7f83a0f5 100644
--- a/src/base/collection/collection.js
+++ b/src/base/collection/collection.js
@@ -187,20 +187,11 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                 var index = this.renderedKeys[datum.index] && this.renderedKeys[datum.index][1];
                 var child;
                 if (index >= 0) {
-                    // if (datum.width !== this.renderedCells[index]._width) {
-                    //     this.renderedCells[index]._width = datum.width;
                     this.renderedCells[index].el.setWidth(datum.width);
-                    // }
-                    // if (datum.height !== this.renderedCells[index]._height) {
-                    //     this.renderedCells[index]._height = datum.height;
                     this.renderedCells[index].el.setHeight(datum.height);
-                    // }
-                    // if (this.renderedCells[index]._left !== datum.x) {
-                    this.renderedCells[index].el.element.css("left", datum.x / BI.pixRatio + BI.pixUnit);
-                    // }
-                    // if (this.renderedCells[index]._top !== datum.y) {
-                    this.renderedCells[index].el.element.css("top", datum.y / BI.pixRatio + BI.pixUnit);
-                    // }
+                    // 这里只使用px
+                    this.renderedCells[index].el.element.css("left", datum.x + "px");
+                    this.renderedCells[index].el.element.css("top", datum.y + "px");
                     renderedCells.push(child = this.renderedCells[index]);
                 } else {
                     var item = o.itemFormatter(o.items[datum.index], datum.index);
@@ -215,8 +206,8 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                     }));
                     renderedCells.push({
                         el: child,
-                        left: datum.x,
-                        top: datum.y,
+                        left: datum.x + "px",
+                        top: datum.y + "px",
                         _left: datum.x,
                         _top: datum.y,
                         // _width: datum.width,
diff --git a/src/base/grid/grid.js b/src/base/grid/grid.js
index edeb8a8f3..d1385e4a1 100644
--- a/src/base/grid/grid.js
+++ b/src/base/grid/grid.js
@@ -185,20 +185,11 @@ BI.GridView = BI.inherit(BI.Widget, {
                         var index = this.renderedKeys[key] && this.renderedKeys[key][2];
                         var child;
                         if (index >= 0) {
-                            // if (columnDatum.size !== this.renderedCells[index]._width) {
-                            // this.renderedCells[index]._width = columnDatum.size;
                             this.renderedCells[index].el.setWidth(columnDatum.size);
-                            // }
-                            // if (rowDatum.size !== this.renderedCells[index]._height) {
-                            // this.renderedCells[index]._height = rowDatum.size;
                             this.renderedCells[index].el.setHeight(rowDatum.size);
-                            // }
-                            // if (this.renderedCells[index]._left !== columnDatum.offset + horizontalOffsetAdjustment) {
-                            this.renderedCells[index].el.element.css("left", (columnDatum.offset + horizontalOffsetAdjustment) / BI.pixRatio + BI.pixUnit);
-                            // }
-                            // if (this.renderedCells[index]._top !== rowDatum.offset + verticalOffsetAdjustment) {
-                            this.renderedCells[index].el.element.css("top", (rowDatum.offset + verticalOffsetAdjustment) / BI.pixRatio + BI.pixUnit);
-                            // }
+                            // 这里只使用px
+                            this.renderedCells[index].el.element.css("left", columnDatum.offset + horizontalOffsetAdjustment + "px");
+                            this.renderedCells[index].el.element.css("top", rowDatum.offset + verticalOffsetAdjustment + "px");
                             child = this.renderedCells[index].el;
                             renderedCells.push(this.renderedCells[index]);
                         } else {
@@ -216,8 +207,8 @@ BI.GridView = BI.inherit(BI.Widget, {
                             }), this);
                             renderedCells.push({
                                 el: child,
-                                left: columnDatum.offset + horizontalOffsetAdjustment,
-                                top: rowDatum.offset + verticalOffsetAdjustment,
+                                left: columnDatum.offset + horizontalOffsetAdjustment + "px",
+                                top: rowDatum.offset + verticalOffsetAdjustment + "px",
                                 _left: columnDatum.offset + horizontalOffsetAdjustment,
                                 _top: rowDatum.offset + verticalOffsetAdjustment,
                                 // _width: columnDatum.size,
diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js
index ef7d55749..1e768ae2c 100644
--- a/src/base/layer/layer.popup.js
+++ b/src/base/layer/layer.popup.js
@@ -60,8 +60,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
         }
         this.element.css({
             "z-index": BI.zIndex_popup,
-            "min-width": BI.isNumeric(o.minWidth) ? (o.minWidth / BI.pixRatio + BI.pixUnit) : o.minWidth,
-            "max-width": BI.isNumeric(o.maxWidth) ? (o.maxWidth / BI.pixRatio + BI.pixUnit) : o.maxWidth,
+            "min-width": BI.isNumeric(o.minWidth) ? (BI.pixFormat(o.minWidth)) : o.minWidth,
+            "max-width": BI.isNumeric(o.maxWidth) ? (BI.pixFormat(o.maxWidth)) : o.maxWidth,
         }).bind({ click: fn });
 
         this.element.bind("mousewheel", fn);
@@ -135,11 +135,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
         var o = this.options;
         this.button_group = BI.createWidget(o.el, { type: "bi.button_group", value: o.value });
         this.button_group.element.css({
-            "min-height": BI.isNumeric(o.minHeight) ? (o.minHeight / BI.pixRatio + BI.pixUnit) : o.minHeight,
-            "padding-top": o.innerVgap / BI.pixRatio + BI.pixUnit,
-            "padding-bottom": o.innerVgap / BI.pixRatio + BI.pixUnit,
-            "padding-left": o.innerHgap / BI.pixRatio + BI.pixUnit,
-            "padding-right": o.innerHgap / BI.pixRatio + BI.pixUnit,
+            "min-height": BI.isNumeric(o.minHeight) ? (BI.pixFormat(o.minHeight)) : o.minHeight,
+            "padding-top": BI.pixFormat(o.innerVgap),
+            "padding-bottom": BI.pixFormat(o.innerVgap),
+            "padding-left": BI.pixFormat(o.innerHgap),
+            "padding-right": BI.pixFormat(o.innerHgap),
         });
 
         return this.button_group;
@@ -411,7 +411,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
             toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
         var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVgap;
         this.view.resetHeight ? this.view.resetHeight(resetHeight) :
-            this.view.element.css({ "max-height": resetHeight / BI.pixRatio + BI.pixUnit });
+            this.view.element.css({ "max-height": BI.pixFormat(resetHeight) });
     },
 
     setValue: function (selectedValues) {
diff --git a/src/base/list/virtualgrouplist.js b/src/base/list/virtualgrouplist.js
index d32dc3a58..9b7a1b730 100644
--- a/src/base/list/virtualgrouplist.js
+++ b/src/base/list/virtualgrouplist.js
@@ -117,7 +117,7 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
         var end = this.tree.leastUpperBound(minContentHeightTo);
         var items = [];
         var topHeight = this.tree.sumTo(Math.max(-1, start - 1));
-        this.topBlank.setHeight(topHeight);
+        this.topBlank.setHeight(topHeight + "px");
         if (this._isAutoHeight()) {
             for (var i = (start < 0 ? 0 : start); i <= end && i <= this.renderedIndex; i++) {
                 var index = i * o.blockSize;
@@ -125,7 +125,7 @@ BI.VirtualGroupList = BI.inherit(BI.Widget, {
                     items.push(o.items[j]);
                 }
             }
-            this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)));
+            this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)) + "px");
             this.container.populate(items.map(function (item, i) {
                 return o.itemFormatter(item, (start < 0 ? 0 : start) * o.blockSize + i);
             }));
diff --git a/src/base/list/virtuallist.js b/src/base/list/virtuallist.js
index 3c110b637..f62d00902 100644
--- a/src/base/list/virtuallist.js
+++ b/src/base/list/virtuallist.js
@@ -146,8 +146,8 @@ BI.VirtualList = BI.inherit(BI.Widget, {
         }
         this.container.element.prepend(firstFragment);
         this.container.element.append(lastFragment);
-        this.topBlank.setHeight(this.tree.sumTo(Math.max(-1, start - 1)));
-        this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)));
+        this.topBlank.setHeight(this.tree.sumTo(Math.max(-1, start - 1)) + "px");
+        this.bottomBlank.setHeight(this.tree.sumTo(this.renderedIndex) - this.tree.sumTo(Math.min(end, this.renderedIndex)) + "px");
         BI.each(needMount, function (i, child) {
             child && child._mount();
         });
diff --git a/src/base/single/1.text.js b/src/base/single/1.text.js
index 2a9c77d85..9c4244a9d 100644
--- a/src/base/single/1.text.js
+++ b/src/base/single/1.text.js
@@ -26,32 +26,32 @@
             var self = this, o = this.options;
             if (o.hgap + o.lgap > 0) {
                 this.element.css({
-                    "padding-left": (o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
+                    "padding-left": BI.pixFormat(o.hgap + o.lgap),
                 });
             }
             if (o.hgap + o.rgap > 0) {
                 this.element.css({
-                    "padding-right": (o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit,
+                    "padding-right": BI.pixFormat(o.hgap + o.rgap),
                 });
             }
             if (o.vgap + o.tgap > 0) {
                 this.element.css({
-                    "padding-top": (o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
+                    "padding-top": BI.pixFormat(o.vgap + o.tgap),
                 });
             }
             if (o.vgap + o.bgap > 0) {
                 this.element.css({
-                    "padding-bottom": (o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
+                    "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
                 });
             }
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css({ lineHeight: BI.isNumber(o.height) ? (o.height / BI.pixRatio + BI.pixUnit) : o.height });
+                this.element.css({ lineHeight: BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height });
             }
             if (BI.isWidthOrHeight(o.lineHeight)) {
-                this.element.css({ lineHeight: BI.isNumber(o.lineHeight) ? (o.lineHeight / BI.pixRatio + BI.pixUnit) : o.lineHeight });
+                this.element.css({ lineHeight: BI.isNumber(o.lineHeight) ? BI.pixFormat(o.lineHeight) : o.lineHeight });
             }
             if (BI.isWidthOrHeight(o.maxWidth)) {
-                this.element.css({ maxWidth: BI.isNumber(o.maxWidth) ? (o.maxWidth / BI.pixRatio + BI.pixUnit) : o.maxWidth });
+                this.element.css({ maxWidth: BI.isNumber(o.maxWidth) ? BI.pixFormat(o.maxWidth) : o.maxWidth });
             }
             this.element.css({
                 textAlign: o.textAlign,
diff --git a/src/base/single/button/buttons/button.icon.js b/src/base/single/button/buttons/button.icon.js
index 82048a029..045126c38 100644
--- a/src/base/single/button/buttons/button.icon.js
+++ b/src/base/single/button/buttons/button.icon.js
@@ -31,7 +31,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", o.height / BI.pixRatio + BI.pixUnit);
+            this.element.css("lineHeight", BI.pixFormat(o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js
index 9965b1ff1..25296c846 100644
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@@ -73,12 +73,14 @@
 
             // 由于button默认情况下有个边框，所以要主动算行高
             var lineHeight, textHeight = o.textHeight;
+            var hasBorder = false
             if (BI.isNumber(o.height)) {
                 if (!isVertical(o.iconPosition)) {
                     if (o.clear || o.block || o.light) {
                         lineHeight = o.height;
                     } else {
-                        lineHeight = o.height - 2;
+                        hasBorder = true;
+                        lineHeight = o.height;
                     }
                 } else {
                     lineHeight = textHeight;
@@ -98,8 +100,8 @@
                     type: "bi.icon_label",
                     cls: o.loading ? loadingCls : (o.iconCls || o.icon),
                     width: this._const.iconWidth,
-                    height: lineHeight,
-                    lineHeight: lineHeight,
+                    height: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
+                    lineHeight: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
                     // 不设置，自定义按钮无法居中
                     iconWidth: o.iconWidth,
                     iconHeight: o.iconHeight,
@@ -120,8 +122,8 @@
                 whiteSpace: o.whiteSpace,
                 textAlign: o.textAlign,
                 textWidth: textWidth,
-                textHeight: textHeight,
-                height: lineHeight,
+                textHeight: BI.pixFormat(textHeight, hasBorder ? 2 : 0),
+                height: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
                 value: o.value,
                 title: null,
             });
@@ -163,7 +165,7 @@
             });
 
             if (o.minWidth > 0) {
-                this.element.css({ "min-width": o.minWidth / BI.pixRatio + BI.pixUnit });
+                this.element.css({ "min-width": BI.pixFormat(o.minWidth) });
             }
         },
 
diff --git a/src/base/single/html/html.js b/src/base/single/html/html.js
index 9abbb2149..84c980427 100644
--- a/src/base/single/html/html.js
+++ b/src/base/single/html/html.js
@@ -25,33 +25,36 @@ BI.Html = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (o.hgap + o.lgap > 0) {
             this.element.css({
-                "padding-left": (o.hgap + o.lgap) / BI.pixRatio + BI.pixUnit,
+                "padding-left": BI.pixFormat(o.hgap + o.lgap),
             });
         }
         if (o.hgap + o.rgap > 0) {
             this.element.css({
-                "padding-right": (o.hgap + o.rgap) / BI.pixRatio + BI.pixUnit,
+                "padding-right": BI.pixFormat(o.hgap + o.rgap),
             });
         }
         if (o.vgap + o.tgap > 0) {
             this.element.css({
-                "padding-top": (o.vgap + o.tgap) / BI.pixRatio + BI.pixUnit,
+                "padding-top": BI.pixFormat(o.vgap + o.tgap),
             });
         }
         if (o.vgap + o.bgap > 0) {
             this.element.css({
-                "padding-bottom": (o.vgap + o.bgap) / BI.pixRatio + BI.pixUnit,
+                "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
             });
         }
         if (BI.isNumber(o.height)) {
-            this.element.css({ lineHeight: o.height / BI.pixRatio + BI.pixUnit });
+            this.element.css({ lineHeight: BI.pixFormat(o.height) });
         }
         if (BI.isNumber(o.lineHeight)) {
-            this.element.css({ lineHeight: o.lineHeight / BI.pixRatio + BI.pixUnit });
+            this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
         }
         if (BI.isWidthOrHeight(o.maxWidth)) {
             this.element.css({ maxWidth: o.maxWidth });
         }
+        if (BI.isNumber(o.maxWidth)) {
+            this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) })
+        }
         this.element.css({
             textAlign: o.textAlign,
             whiteSpace: o.whiteSpace,
diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index ab67a671a..19fc0322d 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -109,7 +109,7 @@
                 }
                 if (BI.isNumber(o.height) && o.height > 0) { // 1.4
                     this.element.css({
-                        "line-height": o.height / BI.pixRatio + BI.pixUnit,
+                        "line-height": BI.pixFormat(o.height),
                     });
                     json.textAlign = o.textAlign;
                     delete json.maxWidth;
@@ -183,7 +183,7 @@
             }
             if (BI.isNumber(o.height) && o.height > 0) { // 1.8
                 this.element.css({
-                    "line-height": o.height / BI.pixRatio + BI.pixUnit,
+                    "line-height": BI.pixFormat(o.height),
                 });
                 json.textAlign = o.textAlign;
                 delete json.maxWidth;
@@ -263,7 +263,7 @@
                 if (BI.isNumber(o.height) && o.height > 0) { // 2.3
                     if (o.whiteSpace !== "normal") {
                         this.element.css({
-                            "line-height": (o.height - (o.vgap * 2)) / BI.pixRatio + BI.pixUnit,
+                            "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
                         });
                     }
                     delete json.maxWidth;
@@ -325,7 +325,7 @@
             if (BI.isNumber(o.height) && o.height > 0) {
                 if (o.whiteSpace !== "normal") {
                     this.element.css({
-                        "line-height": (o.height - (o.vgap * 2)) / BI.pixRatio + BI.pixUnit,
+                        "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
                     });
                 }
                 delete json.maxWidth;
diff --git a/src/base/single/label/icon.label.js b/src/base/single/label/icon.label.js
index bff864f1d..53a400a05 100644
--- a/src/base/single/label/icon.label.js
+++ b/src/base/single/label/icon.label.js
@@ -29,7 +29,7 @@ BI.IconLabel = BI.inherit(BI.Single, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", (o.lineHeight || o.height) / BI.pixRatio + BI.pixUnit);
+            this.element.css("lineHeight", BI.pixFormat(o.lineHeight || o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/tip/tip.toast.js b/src/base/single/tip/tip.toast.js
index 4b59260c9..18af9e8e7 100644
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@@ -30,8 +30,9 @@ BI.Toast = BI.inherit(BI.Tip, {
     render: function () {
         var self = this, o = this.options, c = this._const;
         this.element.css({
-            minWidth: (o.closable ? c.closableMinWidth : c.minWidth) / BI.pixRatio + BI.pixUnit,
-            maxWidth: (o.closable ? c.closableMaxWidth : c.maxWidth) / BI.pixRatio + BI.pixUnit,
+            // 这里直接使用px即可
+            minWidth: BI.pixFormat(o.closable ? c.closableMinWidth : c.minWidth),
+            maxWidth: BI.pixFormat(o.closable ? c.closableMaxWidth : c.maxWidth),
         });
         this.element.addClass("toast-" + o.level);
         function fn(e) {
diff --git a/src/base/single/tip/tip.tooltip.js b/src/base/single/tip/tip.tooltip.js
index eadbd05e9..aae6d8e86 100644
--- a/src/base/single/tip/tip.tooltip.js
+++ b/src/base/single/tip/tip.tooltip.js
@@ -73,7 +73,7 @@ BI.Tooltip = BI.inherit(BI.Tip, {
     },
 
     setWidth: function (width) {
-        this.element.width(width - 2 * this._const.hgap);
+        this.element.width(BI.pixFormat(width - 2 * this._const.hgap));
     },
 
     setText: function (text) {
diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js
index df4d9eb1b..e60ee42f9 100644
--- a/src/case/colorchooser/colorchooser.js
+++ b/src/case/colorchooser/colorchooser.js
@@ -36,8 +36,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
                     self.trigger = _ref;
                 },
                 value: o.value,
-                width: o.el.type ? o.width : o.width - 2,
-                height: o.el.type ? o.height : o.height - 2
+                width: o.el.type ? o.width : BI.pixFormat(o.width, 2),
+                height: o.el.type ? o.height : BI.pixFormat(o.height, 2)
             }, o.el),
             popup: () => ({
                 el: BI.extend({
diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
index a4d324da1..704c80f14 100644
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@@ -15,8 +15,6 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        BI.isNumeric(o.width) && (o.width -= 2);
-        BI.isNumeric(o.height) && (o.height -= 2);
         o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
             self.setValue(newValue);
         }) : o.value;
@@ -28,7 +26,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.select_icon_text_trigger",
             cls: "icon-text-value-trigger",
             items: o.items,
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             text: o.text,
             iconCls: o.iconCls,
             value: o.value,
@@ -56,6 +54,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         });
         this.textIconCombo = BI.createWidget({
             type: "bi.combo",
+            height: BI.pixFormat(o.height, 2),
+            width: BI.pixFormat(o.width, 2),
             element: this,
             container: o.container,
             direction: o.direction,
diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index 09608dea9..d394a6017 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -23,16 +23,13 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
             self.populate(newValue);
         }) : o.items;
 
-        var height = BI.isNumeric(o.height) ? (o.height - (o.simple ? 1 : 2)) : o.height;
-        var width = BI.isNumeric(o.width) ? (o.width - 2) : o.width;
-
         return {
             type: "bi.combo",
             cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
-            height: height,
-            width: width,
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            width: BI.pixFormat(o.width, 2),
             ref: function () {
                 self.combo = this;
             },
@@ -44,7 +41,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     self.trigger = this;
                 },
                 items: o.items,
-                height: height,
+                height: BI.pixFormat(o.height, o.simple ? 1 : 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
index 1b9b9a0ce..12c300f22 100644
--- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
+++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
@@ -16,8 +16,6 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        BI.isNumeric(o.width) && (o.width -= 2);
-        BI.isNumeric(o.height) && (o.height -= 2);
         o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
             self.setValue(newValue);
         }) : o.value;
@@ -29,7 +27,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
             type: "bi.select_text_trigger",
             cls: "text-value-trigger",
             items: o.items,
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             text: o.text,
             value: o.value
         });
@@ -52,6 +50,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
             container: o.container,
             direction: o.direction,
             element: this,
+            width: BI.pixFormat(o.width, 2),
+            height: BI.pixFormat(o.height, 2),
             adjustLength: 2,
             el: this.trigger,
             popup: {
diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js
index 8acb19eb0..78cb6fc24 100644
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@@ -22,8 +22,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        BI.isNumeric(o.width) && (o.width -= (o.simple ? 0 : 2));
-        BI.isNumeric(o.height) && (o.height -= (o.simple ? 1 : 2));
         o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
             self.setValue(newValue);
         }) : o.value;
@@ -57,7 +55,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
             ref: ref => this.trigger = ref,
             cls: "text-value-trigger",
             items: o.items,
-            height: o.height,
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             text: o.text,
             value: o.value,
             title,
@@ -118,6 +116,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.combo",
+            height: BI.pixFormat(o.height, 2),
+            width: BI.pixFormat(o.width, 2),
             ref: ref => this.combo = ref,
             container: o.container,
             direction: o.direction,
diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js
index 949f8cbd5..45f5cbf79 100644
--- a/src/case/layer/panel.js
+++ b/src/case/layer/panel.js
@@ -59,7 +59,7 @@ BI.Panel = BI.inherit(BI.Widget, {
             el: {
                 type: "bi.left_right_vertical_adapt",
                 cls: "panel-title bi-header-background bi-border-bottom",
-                height: o.titleHeight - 1,
+                height: BI.pixFormat(o.titleHeight, 1),
                 items: {
                     left: [this.text],
                     right: [this.button_group]
@@ -67,7 +67,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                 lhgap: 10,
                 rhgap: 10
             },
-            height: o.titleHeight - 1
+            height: BI.pixFormat(o.titleHeight, 1)
         };
     },
 
diff --git a/src/case/linearsegment/button.linear.segment.js b/src/case/linearsegment/button.linear.segment.js
index 38479accb..d6c5abe5d 100644
--- a/src/case/linearsegment/button.linear.segment.js
+++ b/src/case/linearsegment/button.linear.segment.js
@@ -15,7 +15,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
             type: "bi.label",
             text: o.text,
             height: o.height,
-            textHeight: o.height - 2,
+            textHeight: BI.pixFormat(o.height, 2),
             value: o.value,
             hgap: o.hgap,
             ref: function () {
diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js
index a1c77107c..dfb3d7c1a 100644
--- a/src/case/list/list.select.js
+++ b/src/case/list/list.select.js
@@ -192,7 +192,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :
-            this.list.element.css({"max-height": (h - toolHeight) / BI.pixRatio + BI.pixUnit});
+            this.list.element.css({"max-height": BI.pixFormat(h - toolHeight)});
     },
 
     setNotSelectedValue: function () {
diff --git a/src/case/segment/button.segment.js b/src/case/segment/button.segment.js
index 2d9d6c19a..05d0a3d83 100644
--- a/src/case/segment/button.segment.js
+++ b/src/case/segment/button.segment.js
@@ -20,9 +20,6 @@ BI.SegmentButton = BI.inherit(BI.BasicButton, {
     _init: function () {
         BI.SegmentButton.superclass._init.apply(this, arguments);
         var opts = this.options, self = this;
-        // if (BI.isNumber(opts.height) && BI.isNull(opts.lineHeight)) {
-        //    this.element.css({lineHeight : (opts.height - 2) + 'px'});
-        // }
         this.text = BI.createWidget({
             type: "bi.label",
             element: this,
diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js
index 789d8cea3..55d8d18db 100644
--- a/src/case/segment/segment.js
+++ b/src/case/segment/segment.js
@@ -22,7 +22,7 @@ BI.Segment = BI.inherit(BI.Widget, {
             value: o.value,
             items: BI.createItems(o.items, {
                 type: "bi.segment_button",
-                height: o.height - 2,
+                height: BI.pixFormat(o.height, 2),
                 whiteSpace: o.whiteSpace
             }),
             layout: [
diff --git a/src/case/tree/treeexpander/tree.expander.popup.js b/src/case/tree/treeexpander/tree.expander.popup.js
index 05b3ba6c5..ada979b0e 100644
--- a/src/case/tree/treeexpander/tree.expander.popup.js
+++ b/src/case/tree/treeexpander/tree.expander.popup.js
@@ -25,8 +25,8 @@
             });
 
             if (o.showLine) {
-                this.popupView.element.css("margin-left", -offset * (o.layer + 1) / BI.pixRatio + BI.pixUnit);
-                this.element.css("margin-left", offset * (o.layer + 1) / BI.pixRatio + BI.pixUnit);
+                this.popupView.element.css("margin-left", BI.pixFormat(-offset * (o.layer + 1)));
+                this.element.css("margin-left", BI.pixFormat(offset * (o.layer + 1)));
             }
 
             return {
diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js
index 55ff83884..4998ea583 100644
--- a/src/case/trigger/trigger.editor.js
+++ b/src/case/trigger/trigger.editor.js
@@ -20,12 +20,11 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
     },
 
     _init: function () {
-        this.options.height -= 2;
         BI.EditorTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
@@ -58,6 +57,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
         BI.createWidget({
             element: this,
             type: "bi.horizontal_fill",
+            height: BI.pixFormat(o.height, 2),
             items: [
                 {
                     el: this.editor,
@@ -65,9 +65,9 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
                 }, {
                     el: {
                         type: "bi.trigger_icon_button",
-                        width: o.triggerWidth || o.height
+                        width: o.triggerWidth || BI.pixFormat(o.height, 2)
                     },
-                    width: o.triggerWidth || o.height
+                    width: o.triggerWidth || BI.pixFormat(o.height, 2)
                 }
             ]
         });
diff --git a/src/case/trigger/trigger.text.select.small.js b/src/case/trigger/trigger.text.select.small.js
index 9c39fe750..8e81a7ac7 100644
--- a/src/case/trigger/trigger.text.select.small.js
+++ b/src/case/trigger/trigger.text.select.small.js
@@ -14,14 +14,13 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
     },
 
     _init: function () {
-        this.options.height -= 2;
         BI.SmallSelectTextTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         var obj = this._digest(o.value, o.items);
         this.trigger = BI.createWidget({
             type: "bi.small_text_trigger",
             element: this,
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             text: obj.text,
             cls: obj.cls,
             textHgap: o.textHgap,
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 49c1238cc..4f91fd490 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -116,8 +116,6 @@
 
         _init: function () {
             BI.Widget.superclass._init.apply(this, arguments);
-            this._initElementWidth();
-            this._initElementHeight();
             this._initVisual();
             this._initState();
             this._initRender();
@@ -203,6 +201,8 @@
 
         _initCurrent: function () {
             var self = this, o = this.options;
+            this._initElementWidth();
+            this._initElementHeight();
             if (o._baseCls || o.baseCls || o.extraCls) {
                 this.element.addClass((o._baseCls || "") + " " + (o.baseCls || "") + " " + (o.extraCls || ""));
             }
@@ -289,14 +289,14 @@
         _initElementWidth: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.width)) {
-                this.element.css("width", BI.isNumber(o.width) ? o.width / BI.pixRatio + BI.pixUnit : 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)) {
-                this.element.css("height", BI.isNumber(o.height) ? o.height / BI.pixRatio + BI.pixUnit : o.height);
+                this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height);
             }
         },
 
diff --git a/src/core/constant/var.js b/src/core/constant/var.js
index ac5755e45..fc89511f5 100644
--- a/src/core/constant/var.js
+++ b/src/core/constant/var.js
@@ -15,6 +15,19 @@ BI._.extend(BI, {
     emptyStr: "",
     pixUnit: "px",
     pixRatio: 1,
+    pixFormat: function (pix, border) {
+        if (!BI.isNumber(pix)) {
+            return pix;
+        }
+        if (BI.pixUnit === "px" && BI.pixRatio === 1) {
+            return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit;
+        }
+        var length = pix / BI.pixRatio + BI.pixUnit;
+        if (border > 0) {
+            return `calc(${length} - ${border + "px"})`;
+        }
+        return length;
+    },
     emptyFn: function () {
     },
     empty: null,
diff --git a/src/core/controller/controller.popover.js b/src/core/controller/controller.popover.js
index 83f1e8d5c..9e36e5849 100644
--- a/src/core/controller/controller.popover.js
+++ b/src/core/controller/controller.popover.js
@@ -59,8 +59,9 @@ BI.PopoverController = BI.inherit(BI.Controller, {
                 top = 0;
             }
             popover.element.css({
-                left: left / BI.pixRatio + BI.pixUnit,
-                top: top / BI.pixRatio + BI.pixUnit
+                // 这里直接用px就可以
+                left: left + "px",
+                top: top + "px"
             });
         }
         return this;
diff --git a/src/core/controller/controller.tooltips.js b/src/core/controller/controller.tooltips.js
index 14dbba9e4..98f90fb0b 100644
--- a/src/core/controller/controller.tooltips.js
+++ b/src/core/controller/controller.tooltips.js
@@ -71,8 +71,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
             !opt.belowMouse && (y = Math.max(y, top));
         }
         tooltip.element.css({
-            left: x < 0 ? 0 : x / BI.pixRatio + BI.pixUnit,
-            top: y < 0 ? 0 : y / BI.pixRatio + BI.pixUnit
+            // 这里直接用px就可以
+            left: x < 0 ? 0 : x + "px",
+            top: y < 0 ? 0 : y + "px"
         });
         tooltip.element.hover(function () {
             self.remove(name);
diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js
index 5b83ff432..b1ae46ba7 100644
--- a/src/core/wrapper/layout.js
+++ b/src/core/wrapper/layout.js
@@ -42,16 +42,16 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     _init4Margin: function () {
         if (this.options.top) {
-            this.element.css("top", BI.isNumber(this.options.top) ? this.options.top / BI.pixRatio + BI.pixUnit : this.options.top);
+            this.element.css("top", BI.isNumber(this.options.top) ? BI.pixFormat(this.options.top) : this.options.top);
         }
         if (this.options.left) {
-            this.element.css("left", BI.isNumber(this.options.left) ? this.options.left / BI.pixRatio + BI.pixUnit : this.options.left);
+            this.element.css("left", BI.isNumber(this.options.left) ? BI.pixFormat(this.options.left) : this.options.left);
         }
         if (this.options.bottom) {
-            this.element.css("bottom", BI.isNumber(this.options.bottom) ? this.options.bottom / BI.pixRatio + BI.pixUnit : this.options.bottom);
+            this.element.css("bottom", BI.isNumber(this.options.bottom) ? BI.pixFormat(this.options.bottom) : this.options.bottom);
         }
         if (this.options.right) {
-            this.element.css("right", BI.isNumber(this.options.right) ? this.options.right / BI.pixRatio + BI.pixUnit : this.options.right);
+            this.element.css("right", BI.isNumber(this.options.right) ? BI.pixFormat(this.options.right) : this.options.right);
         }
     },
 
@@ -289,7 +289,7 @@ BI.Layout = BI.inherit(BI.Widget, {
     },
 
     _optimiseGap: function (gap) {
-        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : gap / BI.pixRatio + BI.pixUnit;
+        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
     },
 
     _optimiseItemLgap: function (item) {
diff --git a/src/core/wrapper/layout/layout.flow.js b/src/core/wrapper/layout/layout.flow.js
index e3c26638d..de14999f7 100644
--- a/src/core/wrapper/layout/layout.flow.js
+++ b/src/core/wrapper/layout/layout.flow.js
@@ -137,16 +137,16 @@ BI.FloatRightLayout = BI.inherit(BI.Layout, {
         var w = BI.FloatRightLayout.superclass._addElement.apply(this, arguments);
         w.element.css({position: "relative", float: "right"});
         if (BI.isNotNull(item.left)) {
-            w.element.css({left: BI.isNumber(item.left) ? item.left / BI.pixRatio + BI.pixUnit : item.left});
+            w.element.css({left: BI.isNumber(item.left) ? BI.pixFormat(item.left) : item.left});
         }
         if (BI.isNotNull(item.right)) {
-            w.element.css({right: BI.isNumber(item.right) ? item.right / BI.pixRatio + BI.pixUnit : item.right});
+            w.element.css({right: BI.isNumber(item.right) ? BI.pixFormat(item.right) : item.right});
         }
         if (BI.isNotNull(item.top)) {
-            w.element.css({top: BI.isNumber(item.top) ? item.top / BI.pixRatio + BI.pixUnit : item.top});
+            w.element.css({top: BI.isNumber(item.top) ? BI.pixFormat(item.top) : item.top});
         }
         if (BI.isNotNull(item.bottom)) {
-            w.element.css({bottom: BI.isNumber(item.bottom) ? item.bottom / BI.pixRatio + BI.pixUnit : item.bottom});
+            w.element.css({bottom: BI.isNumber(item.bottom) ? BI.pixFormat(item.bottom) : item.bottom});
         }
         if (o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item) !== 0) {
             var top = o.vgap / 2 + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item);
diff --git a/src/core/wrapper/layout/layout.inline.js b/src/core/wrapper/layout/layout.inline.js
index 99fa1b96e..661a6bf77 100644
--- a/src/core/wrapper/layout/layout.inline.js
+++ b/src/core/wrapper/layout/layout.inline.js
@@ -47,7 +47,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
             }
         }
         if (columnSize > 0) {
-            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : (columnSize / BI.pixRatio + BI.pixUnit));
+            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.pixFormat(columnSize));
         }
         w.element.css({
             position: "relative",
@@ -69,8 +69,8 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
                 gap += o.hgap + o.lgap + o.rgap + this._optimiseItemLgap(o.items[k]) + this._optimiseItemRgap(o.items[k]) + this._optimiseItemHgap(o.items[k]);
                 length += cz;
             }
-            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : length / BI.pixRatio + BI.pixUnit;
-            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : gap / BI.pixRatio + BI.pixUnit;
+            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.pixFormat(length);
+            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
             if (columnSize === "fill") {
                 w.element.css("min-width", "calc((100% - " + length + " - " + gap + ")" + (fillCount > 1 ? "/" + fillCount : "") + ")");
             }
@@ -86,7 +86,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
         if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
             var top = o.innerVgap + o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item),
                 bottom = o.innerVgap + o.vgap + o.bgap + this._optimiseItemBgap(item) + this._optimiseItemVgap(item);
-            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : (top + bottom) / BI.pixRatio + BI.pixUnit;
+            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.pixFormat(top + bottom);
             w.element.css("height", "calc(100% - " + gap + ")");
         }
         return w;
diff --git a/src/widget/date/calendar/popup.month.js b/src/widget/date/calendar/popup.month.js
index 23d262424..fca6c2a6f 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.SIZE_CONSANTS.LIST_ITEM_HEIGHT - 1,
+                    height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
                     width: 30,
                     value: td,
                     text: td,
diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js
index 7ba55181e..4508f8e50 100644
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@@ -50,13 +50,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                     el: {
                         type: "bi.horizontal_fill",
                         columnSize: [this.constants.iconWidth, "fill"],
-                        height: opts.height - border,
+                        height: BI.pixFormat(opts.height, border),
                         items: [{
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-change-h-font",
-                                width: opts.height - border,
-                                height: opts.height - border,
+                                width: BI.pixFormat(opts.height, border),
+                                height: BI.pixFormat(opts.height, border),
                                 ref: function () {
                                     self.changeIcon = this;
                                 }
@@ -69,8 +69,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                             format: opts.format,
                             allowEdit: opts.allowEdit,
                             watermark: opts.watermark,
-                            iconWidth: opts.height - border,
-                            height: opts.height - border,
+                            iconWidth: BI.pixFormat(opts.height, border),
+                            height: BI.pixFormat(opts.height, border),
                             value: opts.value,
                             ref: function () {
                                 self.trigger = this;
diff --git a/src/widget/dynamicdate/dynamicdate.param.item.js b/src/widget/dynamicdate/dynamicdate.param.item.js
index fed229fa2..26c1ad101 100644
--- a/src/widget/dynamicdate/dynamicdate.param.item.js
+++ b/src/widget/dynamicdate/dynamicdate.param.item.js
@@ -21,7 +21,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.sign_editor",
                     cls: "bi-border bi-focus-shadow bi-border-radius",
-                    height: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 2,
+                    height: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 2),
                     validationChecker: function (v) {
                         return BI.isNaturalNumber(v);
                     },
diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js
index d72c67323..843980eda 100644
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@@ -26,7 +26,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                         cls: "bi-high-light bi-split-top",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,
                             action: function () {
@@ -37,7 +37,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
                         shadow: true,
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         disabled: this._checkTodayValid(),
                         ref: function () {
@@ -52,7 +52,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 176eff1ae..5077d7866 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -50,13 +50,13 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                     el: {
                         type: "bi.horizontal_fill",
                         columnSize: [this.constants.iconWidth, "fill"],
-                        height: opts.height - border,
+                        height: BI.pixFormat(opts.height, border),
                         items: [{
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-change-h-font",
                                 width: this.constants.iconWidth,
-                                height: opts.height - border,
+                                height: BI.pixFormat(opts.height, border),
                                 ref: function () {
                                     self.changeIcon = this;
                                 }
@@ -70,7 +70,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                             watermark: opts.watermark,
                             format: opts.format,
                             iconWidth: this.constants.iconWidth,
-                            height: opts.height - border,
+                            height: BI.pixFormat(opts.height, border),
                             value: opts.value,
                             ref: function () {
                                 self.trigger = this;
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
index a06b3764e..cf57d339e 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@@ -25,7 +25,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -37,7 +37,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         disabled: this._checkTodayValid(),
@@ -53,7 +53,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/editor/editor.search.js b/src/widget/editor/editor.search.js
index b1747849a..fea367c66 100644
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@@ -15,13 +15,12 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         });
     },
     _init: function () {
-        this.options.height -= this.options.simple ? 1 : 2;
         BI.SearchEditor.superclass._init.apply(this, arguments);
         var self = this, o = this.options;
         this.editor = BI.createWidget(o.el, {
             type: "bi.editor",
             simple: o.simple,
-            height: o.height,
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: true,
             hgap: 1,
@@ -45,6 +44,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         });
         BI.createWidget({
             element: this,
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             type: "bi.htape",
             items: [
                 {
diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js
index 02644b044..850ad257c 100644
--- a/src/widget/editor/editor.text.js
+++ b/src/widget/editor/editor.text.js
@@ -26,15 +26,11 @@ BI.TextEditor = BI.inherit(BI.Widget, {
     render: function () {
         var self = this, o = this.options;
         var border = o.simple ? 1 : 2;
-        if (BI.isNumber(o.height)) {
-            this.element.css({ height: o.height - border });
-        }
-        if (BI.isNumber(o.width)) {
-            this.element.css({ width: o.width - border });
-        }
         this.editor = BI.createWidget({
             type: "bi.editor",
             element: this,
+            width: BI.pixFormat(o.width, border),
+            height: BI.pixFormat(o.height, border),
             simple: o.simple,
             hgap: o.hgap,
             vgap: o.vgap,
diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 130165680..739927972 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -60,8 +60,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: c.EDITOR_WIDTH - 2,
-            height: c.EDITOR_HEIGHT - 2,
+            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
+            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);
             }
@@ -88,8 +88,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: c.EDITOR_WIDTH - 2,
-            height: c.EDITOR_HEIGHT - 2,
+            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
+            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);
             }
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
index 7263346b0..6be90346a 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
@@ -21,13 +21,6 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         });
     },
 
-    _init: function () {
-        var o = this.options;
-        BI.isNumeric(o.width) && (o.width -= 2);
-        BI.isNumeric(o.height) && (o.height -= 2);
-        BI.MultiLayerSelectTreeCombo.superclass._init.apply(this, arguments);
-    },
-
     render: function () {
         var self = this, o = this.options;
 
@@ -38,6 +31,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         if (o.allowEdit) {
             return {
                 type: "bi.absolute",
+                width: BI.pixFormat(o.width, 2),
+                height: BI.pixFormat(o.height, 2),
                 cls,
                 items: [
                     {
@@ -59,7 +54,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 },
                 text: o.text,
                 defaultText: o.defaultText,
-                height: o.height,
+                height: BI.pixFormat(o.height, 2),
                 items: o.items,
                 value: o.value,
                 tipType: o.tipType,
@@ -73,6 +68,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
+            width: BI.pixFormat(o.width, 2),
+            height: BI.pixFormat(o.height, 2),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
@@ -136,8 +133,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
                 watermark: o.watermark,
-                // height: o.height - (o.simple ? 1 : 2),
-                height: o.height,
+                height: BI.pixFormat(o.height, 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
@@ -213,8 +209,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             ref: function (_ref) {
                 self.triggerBtn = _ref;
             },
-            width: o.height,
-            height: o.height,
+            width: BI.pixFormat(o.height, 2),
+            height: BI.pixFormat(o.height, 2),
             listeners: [
                 {
                     eventName: BI.TriggerIconButton.EVENT_CHANGE,
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.popup.js b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
index dd29ce6e9..34dce3a58 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.popup.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
@@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSelectTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", o.minHeight - 10);
+        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js
index f35f25c80..d63207f6a 100644
--- a/src/widget/multilayersingletree/multilayersingletree.combo.js
+++ b/src/widget/multilayersingletree/multilayersingletree.combo.js
@@ -23,13 +23,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         });
     },
 
-    _init: function () {
-        var o = this.options;
-        BI.isNumeric(o.width) && (o.width -= 2);
-        BI.isNumeric(o.height) && (o.height -= 2);
-        BI.MultiLayerSingleTreeCombo.superclass._init.apply(this, arguments);
-    },
-
     render: function () {
         var self = this, o = this.options;
 
@@ -40,6 +33,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         if (o.allowEdit) {
             return {
                 type: "bi.absolute",
+                width: BI.pixFormat(o.width, 2),
+                height: BI.pixFormat(o.height, 2),
                 cls,
                 items: [
                     {
@@ -61,7 +56,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 },
                 text: o.text,
                 defaultText: o.defaultText,
-                height: o.height,
+                height: BI.pixFormat(o.height, 2),
                 items: o.items,
                 value: o.value,
                 tipType: o.tipType,
@@ -136,7 +131,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 items: o.items,
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
-                height: o.height,
+                height: BI.pixFormat(o.height, 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
@@ -210,8 +205,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             ref: function (_ref) {
                 self.triggerBtn = _ref;
             },
-            width: o.height,
-            height: o.height,
+            width: BI.pixFormat(o.height, 2),
+            height: BI.pixFormat(o.height, 2),
             listeners: [
                 {
                     eventName: BI.TriggerIconButton.EVENT_CHANGE,
diff --git a/src/widget/multilayersingletree/multilayersingletree.popup.js b/src/widget/multilayersingletree/multilayersingletree.popup.js
index 160c67a3c..630c38237 100644
--- a/src/widget/multilayersingletree/multilayersingletree.popup.js
+++ b/src/widget/multilayersingletree/multilayersingletree.popup.js
@@ -55,7 +55,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSingleTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", o.minHeight - 10);
+        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js
index 836193f96..807bffcdb 100644
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@@ -45,7 +45,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             text: o.text,
             defaultText: o.defaultText,
             masker: {
diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js
index c2a0851c6..16b24855e 100644
--- a/src/widget/multiselect/multiselect.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.combo.nobar.js
@@ -41,7 +41,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             text: o.text,
             defaultText: o.defaultText,
             masker: {
diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js
index eee22c4db..b473b4628 100644
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_insert_trigger",
             allowEdit: o.allowEdit,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             text: o.text,
             watermark: o.watermark,
             defaultText: o.defaultText,
diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js
index bb4a71ac1..ad47d1608 100644
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@@ -41,7 +41,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.multi_select_insert_trigger",
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             text: o.text,
             // adapter: this.popup,
             masker: {
diff --git a/src/widget/multiselect/multiselect.loader.nobar.js b/src/widget/multiselect/multiselect.loader.nobar.js
index d865b6d6b..c8e259cd3 100644
--- a/src/widget/multiselect/multiselect.loader.nobar.js
+++ b/src/widget/multiselect/multiselect.loader.nobar.js
@@ -173,7 +173,7 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
     },
 
     resetHeight: function (h) {
-        this.button_group.element.css({ "max-height": h / BI.pixRatio + BI.pixUnit });
+        this.button_group.element.css({ "max-height": BI.pixFormat(h) });
     },
 
     resetWidth: function () {
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index 1b533525d..83b0cb741 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@@ -27,7 +27,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
             defaultText: o.defaultText,
diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js
index 692505da0..ab3922f13 100644
--- a/src/widget/multitree/multi.tree.insert.combo.js
+++ b/src/widget/multitree/multi.tree.insert.combo.js
@@ -28,7 +28,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
             defaultText: o.defaultText,
diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js
index bf7eaaf78..41a3d15a8 100644
--- a/src/widget/multitree/multi.tree.list.combo.js
+++ b/src/widget/multitree/multi.tree.list.combo.js
@@ -32,7 +32,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             text: o.text,
             defaultText: o.defaultText,
             watermark: o.watermark,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             masker: {
                 offset: {
diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js
index 3e99c6677..0dead38cf 100644
--- a/src/widget/numbereditor/number.editor.js
+++ b/src/widget/numbereditor/number.editor.js
@@ -27,7 +27,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
-            height: o.height - 2,
+            height: BI.pixFormat(o.height, 2),
             simple: o.simple,
             allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
@@ -87,7 +87,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         });
         BI.createWidget({
             type: "bi.htape",
-            height: o.height - 2,
+            height: BI.pixFormat(o.height, 2),
             element: this,
             items: [this.editor, {
                 el: {
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index 9fb76367f..c68de273b 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -36,7 +36,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         BI.NumberInterval.superclass._init.apply(this, arguments);
         this.smallEditor = BI.createWidget({
             type: "bi.number_interval_single_editor",
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: o.allowBlank,
             value: o.min,
@@ -61,7 +61,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.smallTip = BI.createWidget({
             type: "bi.label",
             text: o.numTip,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             invisible: true
         });
         BI.createWidget({
@@ -76,7 +76,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
 
         this.bigEditor = BI.createWidget({
             type: "bi.number_interval_single_editor",
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: o.allowBlank,
             value: o.max,
@@ -99,7 +99,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigTip = BI.createWidget({
             type: "bi.label",
             text: o.numTip,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             invisible: true
         });
         BI.createWidget({
@@ -114,7 +114,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.smallCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
-            height: o.height - (o.simple ? 0 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 0 : 2),
+            width: BI.pixFormat(c.width, c.border),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -133,7 +134,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
-            height: o.height - (o.simple ? 0 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 0 : 2),
+            width: BI.pixFormat(c.width, c.border),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -152,71 +154,83 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.label = BI.createWidget({
             type: "bi.label",
             text: BI.i18nText("BI-Basic_Value"),
-            textHeight: o.height - (o.simple ? 0 : c.border * 2),
-            width: c.width - (o.simple ? 0 : c.border * 2),
-            height: o.height - (o.simple ? 0 : c.border * 2),
+            textHeight: o.height,
+            // width: BI.pixFormat(o.width, o.simple ? 0 : c.border * 2),
+            hgap: 5,
+            height: o.height,
             level: "warning",
             tipType: "warning"
         });
         this.left = BI.createWidget({
-            type: "bi.htape",
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", ""],
             items: [{
                 el: self.smallEditor
             }, {
                 el: self.smallCombo,
-                width: c.width - c.border
             }]
 
         });
         this.right = BI.createWidget({
-            type: "bi.htape",
+            type: "bi.horizontal_fill",
+            columnSize: ["", "fill"],
             items: [{
                 el: self.bigCombo,
-                width: c.width - c.border
             }, {
                 el: self.bigEditor,
                 // BI-23883 间距考虑边框
-                lgap: 1
+                // lgap: 1
             }]
         });
 
-
-        BI.createWidget({
-            element: self,
-            type: "bi.center",
-            hgap: 15,
-            height: o.height,
-            items: [
-                {
-                    type: "bi.absolute",
-                    items: [{
-                        el: self.left,
-                        left: -15,
-                        right: 0,
-                        top: 0,
-                        bottom: 0
-                    }]
-                }, {
-                    type: "bi.absolute",
-                    items: [{
-                        el: self.right,
-                        left: 0,
-                        right: -15,
-                        top: 0,
-                        bottom: 0
-                    }]
-                }
-            ]
-        });
-
         BI.createWidget({
             element: self,
-            type: "bi.horizontal_auto",
-            items: [
-                self.label
-            ]
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
+            items: [{
+                el: self.left
+            }, {
+                el: self.label
+            }, {
+                el: self.right
+            }]
         });
 
+        // BI.createWidget({
+        //     element: self,
+        //     type: "bi.horizontal_auto",
+        //     items: [
+        //         self.label
+        //     ]
+        // });
+
+        // BI.createWidget({
+        //     element: self,
+        //     type: "bi.center",
+        //     hgap: 15,
+        //     height: o.height,
+        //     items: [
+        //         {
+        //             type: "bi.absolute",
+        //             items: [{
+        //                 el: self.left,
+        //                 left: -15,
+        //                 right: 0,
+        //                 top: 0,
+        //                 bottom: 0
+        //             }]
+        //         }, {
+        //             type: "bi.absolute",
+        //             items: [{
+        //                 el: self.right,
+        //                 left: 0,
+        //                 right: -15,
+        //                 top: 0,
+        //                 bottom: 0
+        //             }]
+        //         }
+        //     ]
+        // });
 
         self._setValidEvent(self.bigEditor, c.bigEditor);
         self._setValidEvent(self.smallEditor, c.smallEditor);
diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
index a3def7ccf..e6259e684 100644
--- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
+++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
@@ -35,7 +35,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.search_multi_select_trigger",
             text: o.text,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             // adapter: this.popup,
             masker: {
                 offset: {
diff --git a/src/widget/selecttree/selecttree.combo.js b/src/widget/selecttree/selecttree.combo.js
index c6aca0c62..5f2147bae 100644
--- a/src/widget/selecttree/selecttree.combo.js
+++ b/src/widget/selecttree/selecttree.combo.js
@@ -17,14 +17,12 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
-        BI.isNumeric(o.width) && (o.width -= 2);
         BI.SelectTreeCombo.superclass._init.apply(this, arguments);
 
         this.trigger = BI.createWidget({
             type: "bi.single_tree_trigger",
             text: o.text,
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             items: o.items,
             value: o.value,
             allowClear: o.allowClear,
@@ -43,6 +41,8 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
+            width: BI.pixFormat(o.width, 2),
+            height: BI.pixFormat(o.height, 2),
             container: o.container,
             element: this,
             adjustLength: 2,
diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js
index fac81d8d7..81140cfd0 100644
--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@@ -31,7 +31,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.single_select_trigger",
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             // adapter: this.popup,
             allowNoSelect: o.allowNoSelect,
             allowEdit: o.allowEdit,
diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js
index faa3511be..039283d79 100644
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@@ -32,7 +32,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.single_select_trigger",
             watermark: o.watermark,
-            height: o.height - (o.simple ? 1 : 2),
+            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
             allowNoSelect: o.allowNoSelect,
             allowEdit: o.allowEdit,
             // adapter: this.popup,
diff --git a/src/widget/singleselect/singleselect.list.js b/src/widget/singleselect/singleselect.list.js
index e09ed5f1a..9842eb3ea 100644
--- a/src/widget/singleselect/singleselect.list.js
+++ b/src/widget/singleselect/singleselect.list.js
@@ -120,7 +120,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
 
     resetHeight: function (h) {
         this.list.resetHeight ? this.list.resetHeight(h) :
-            this.list.element.css({"max-height": (h - (this.options.allowNoSelect ? this._constants.itemHeight : 0)) / BI.pixRatio + BI.pixUnit});
+            this.list.element.css({"max-height": BI.pixFormat(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
     },
 
     setNotSelectedValue: function () {
diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js
index a330115b9..db9f83caa 100644
--- a/src/widget/singleslider/singleslider.js
+++ b/src/widget/singleslider/singleslider.js
@@ -91,8 +91,8 @@ BI.SingleSlider = BI.inherit(BI.Single, {
             type: "bi.sign_text_editor",
             cls: "slider-editor-button",
             text: o.unit,
-            width: c.EDITOR_WIDTH - 2,
-            height: c.EDITOR_HEIGHT - 2,
+            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
+            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
             allowBlank: false,
             textAlign: "center",
             validationChecker: function (v) {
diff --git a/src/widget/singleslider/singleslider.label.js b/src/widget/singleslider/singleslider.label.js
index d6b8aa639..8f4e9bbb6 100644
--- a/src/widget/singleslider/singleslider.label.js
+++ b/src/widget/singleslider/singleslider.label.js
@@ -90,7 +90,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
         this.label = BI.createWidget({
             type: "bi.label",
             height: c.HEIGHT,
-            width: c.EDITOR_WIDTH - 2
+            width: BI.pixFormat(c.EDITOR_WIDTH, 2)
         });
 
         this._setVisible(false);
diff --git a/src/widget/singletree/singletree.combo.js b/src/widget/singletree/singletree.combo.js
index c42392db8..2c9319c59 100644
--- a/src/widget/singletree/singletree.combo.js
+++ b/src/widget/singletree/singletree.combo.js
@@ -18,15 +18,13 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
-        BI.isNumeric(o.width) && (o.width -= 2);
         BI.SingleTreeCombo.superclass._init.apply(this, arguments);
 
         this.trigger = BI.createWidget(BI.extend({
             type: "bi.single_tree_trigger",
             text: o.text,
             defaultText: o.defaultText,
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             items: o.items,
             value: o.value,
             allowClear: o.allowClear,
@@ -45,6 +43,8 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
+            width: BI.pixFormat(o.width, 2),
+            height: BI.pixFormat(o.height, 2),
             container: o.container,
             element: this,
             adjustLength: 2,
diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
index ff56fff45..146472c30 100644
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@@ -12,8 +12,6 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
 
     _init: function () {
         var self = this, o = this.options;
-        o.height -= 2;
-        BI.isNumeric(o.width) && (o.width -= 2);
         BI.TextValueDownListCombo.superclass._init.apply(this, arguments);
         this._createValueMap();
 
@@ -24,7 +22,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
             cls: "text-value-down-list-trigger",
-            height: o.height,
+            height: BI.pixFormat(o.height, 2),
             items: o.items,
             text: o.text,
             value: value
@@ -35,7 +33,8 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
             element: this,
             chooseType: BI.Selection.Single,
             adjustLength: 2,
-            height: o.height,
+            width: BI.pixFormat(o.width, 2),
+            height: BI.pixFormat(o.height, 2),
             el: this.trigger,
             value: BI.isNull(value) ? [] : [value],
             items: BI.deepClone(o.items)
diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js
index 866bb513a..1ba03c2d3 100644
--- a/src/widget/time/time.combo.js
+++ b/src/widget/time/time.combo.js
@@ -72,10 +72,10 @@
                         el: {
                             type: "bi.horizontal_fill",
                             columnSize: ["fill", this.constants.iconWidth],
-                            height: opts.height - 2,
+                            height: BI.pixFormat(opts.height, 2),
                             items: [{
                                 type: "bi.time_trigger",
-                                height: opts.height - 2,
+                                height: BI.pixFormat(opts.height, 2),
                                 allowEdit: opts.allowEdit,
                                 watermark: opts.watermark,
                                 format: opts.format,
diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index cf6485d13..c9f456a1b 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -23,7 +23,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: o.height - border,
+            height: BI.pixFormat(o.height, border),
             value: o.value || "",
             watermark: o.watermark
         });
@@ -132,7 +132,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             element: this,
             items: [{
                 el: {
-                    type: "bi.htape",
+                    type: "bi.horizontal_fill",
+                    columnSize: ["", "fill"],
                     cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
@@ -142,12 +143,11 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
                             width: this._const.iconWidth,
-                            height: o.height - border,
+                            height: BI.pixFormat(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
                         },
-                        width: this._const.iconWidth
                     }, this.combo]
                 },
                 top: 0,
@@ -167,12 +167,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
         switch (type) {
             case BI.DynamicYearCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = this.options.height - this.options.simple ? 1 : 2;
-                this.comboWrapper.resize();
                 break;
             default:
-                this.comboWrapper.attr("items")[0].width = 0;
-                this.comboWrapper.resize();
                 this.changeIcon.setVisible(false);
                 break;
         }
diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js
index 7645f3974..6a7c883c6 100644
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@@ -32,7 +32,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -43,7 +43,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                         }]
                     }, {
                         type: "bi.text_button",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
@@ -60,7 +60,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js
index 251b5871c..c0ababb9a 100644
--- a/src/widget/yearmonth/card.static.yearmonth.js
+++ b/src/widget/yearmonth/card.static.yearmonth.js
@@ -19,7 +19,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
                     whiteSpace: "nowrap",
                     once: false,
                     forceSelected: true,
-                    height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT - 1,
+                    height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
                     width: 38,
                     value: td,
                     text: td,
diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js
index a6de2de6f..23b9dfd01 100644
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@@ -22,7 +22,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: o.height - border,
+            height: BI.pixFormat(o.height, border),
             value: o.value || "",
             watermark: o.watermark,
         });
@@ -132,7 +132,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             element: this,
             items: [{
                 el: {
-                    type: "bi.htape",
+                    type: "bi.horizontal_fill",
+                    columnSize: ["", "fill"],
                     cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
@@ -141,13 +142,12 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
-                            width: o.height - border,
-                            height: o.height - border,
+                            width: BI.pixFormat(o.height, border),
+                            height: BI.pixFormat(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
-                        },
-                        width: o.height - border
+                        }
                     }, this.combo]
                 },
                 top: 0,
@@ -167,12 +167,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
         switch (type) {
             case BI.DynamicYearMonthCombo.Dynamic:
                 this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = this.options.height - this.options.simple ? 1 : 2;
-                this.comboWrapper.resize();
                 break;
             default:
-                this.comboWrapper.attr("items")[0].width = 0;
-                this.comboWrapper.resize();
                 this.changeIcon.setVisible(false);
                 break;
         }
diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js
index c0d715efb..f1bcd11a2 100644
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@@ -32,7 +32,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -44,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         disabled: this._checkTodayValid(),
@@ -60,7 +60,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index 9ec93454b..0292ef55b 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -25,7 +25,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: o.height - border,
+            height: BI.pixFormat(o.height, border),
             value: o.value || "",
             watermark: o.watermark,
         });
@@ -135,7 +135,8 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             element: this,
             items: [{
                 el: {
-                    type: "bi.htape",
+                    type: "bi.horizontal_fill",
+                    columnSize: ["", "fill"],
                     cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
                     ref: function () {
                         self.comboWrapper = this;
@@ -145,12 +146,11 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
                             width: this._consts.iconWidth,
-                            height: o.height - border,
+                            height: BI.pixFormat(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
-                        },
-                        width: this._consts.iconWidth
+                        }
                     }, this.combo]
                 },
                 top: 0,
@@ -169,13 +169,9 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
         }
         switch (type) {
             case BI.DynamicYearQuarterCombo.Dynamic:
-                this.changeIcon.setVisible(true);
-                this.comboWrapper.attr("items")[0].width = this.options.height - this.options.simple ? 1 : 2;
                 this.comboWrapper.resize();
                 break;
             default:
-                this.comboWrapper.attr("items")[0].width = 0;
-                this.comboWrapper.resize();
                 this.changeIcon.setVisible(false);
                 break;
         }
diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js
index bf8d7c392..638cebec3 100644
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@@ -27,7 +27,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
                         shadow: true,
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,
@@ -38,7 +38,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         disabled: this._checkTodayValid(),
@@ -55,7 +55,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
                         shadow: true,
-                        textHeight: BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT - 1,
+                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,

From 129819b22e6871b6e154d7ccd3fdb8c2b011940b Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 16:24:29 +0800
Subject: [PATCH 08/97] =?UTF-8?q?feature=EF=BC=9A=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/timeinterval/dateinterval.js       | 51 +++++--------
 src/widget/timeinterval/timeinterval.js       | 51 +++++--------
 src/widget/timeinterval/timeperiods.js        | 73 ++++++-------------
 src/widget/yearinterval/yearinterval.js       | 46 ++++--------
 .../yearmonthinterval/yearmonthinterval.js    | 52 +++++--------
 .../yearquarterinterval.js                    | 47 ++++--------
 template/index.html                           |  1 -
 7 files changed, 103 insertions(+), 218 deletions(-)

diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js
index f6b2176c6..8da68b143 100644
--- a/src/widget/timeinterval/dateinterval.js
+++ b/src/widget/timeinterval/dateinterval.js
@@ -26,43 +26,26 @@ BI.DateInterval = BI.inherit(BI.Single, {
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
-        this.label = BI.createWidget({
-            type: "bi.label",
-            height: o.height,
-            width: this.constants.width,
-            text: "-"
-        });
-        BI.createWidget({
-            element: self,
-            type: "bi.center",
-            height: o.height,
+
+        return {
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
             items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: self.left,
-                    left: this.constants.offset,
-                    right: this.constants.width / 2,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: self.left
             }, {
-                type: "bi.absolute",
-                items: [{
-                    el: self.right,
-                    left: this.constants.width / 2,
-                    right: this.constants.offset,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: {
+                    type: "bi.label",
+                    height: o.height,
+                    hgap: 5,
+                    text: "-",
+                    ref: function (_ref) {
+                        self.label = _ref;
+                    }
+                }
+            }, {
+                el: self.right
             }]
-        });
-        BI.createWidget({
-            type: "bi.horizontal_auto",
-            element: this,
-            items: [
-                self.label
-            ]
-        });
+        };
     },
 
     _createCombo: function (v, watermark) {
diff --git a/src/widget/timeinterval/timeinterval.js b/src/widget/timeinterval/timeinterval.js
index 3910c77e8..00d3b63cb 100644
--- a/src/widget/timeinterval/timeinterval.js
+++ b/src/widget/timeinterval/timeinterval.js
@@ -26,43 +26,26 @@ BI.TimeInterval = BI.inherit(BI.Single, {
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
-        this.label = BI.createWidget({
-            type: "bi.label",
-            height: o.height,
-            width: this.constants.width,
-            text: "-"
-        });
-        BI.createWidget({
-            element: self,
-            type: "bi.center",
-            height: o.height,
+
+        return {
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
             items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: self.left,
-                    left: this.constants.offset,
-                    right: this.constants.width / 2,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: self.left
             }, {
-                type: "bi.absolute",
-                items: [{
-                    el: self.right,
-                    left: this.constants.width / 2,
-                    right: this.constants.offset,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: {
+                    type: "bi.label",
+                    height: o.height,
+                    hgap: 5,
+                    text: "-",
+                    ref: function (_ref) {
+                        self.label = _ref;
+                    }
+                }
+            }, {
+                el: self.right
             }]
-        });
-        BI.createWidget({
-            type: "bi.horizontal_auto",
-            element: this,
-            items: [
-                self.label
-            ]
-        });
+        };
     },
 
     _createCombo: function (v, watermark) {
diff --git a/src/widget/timeinterval/timeperiods.js b/src/widget/timeinterval/timeperiods.js
index 5a0edf56d..4e04533bf 100644
--- a/src/widget/timeinterval/timeperiods.js
+++ b/src/widget/timeinterval/timeperiods.js
@@ -19,63 +19,32 @@
         render: function () {
             var self = this, o = this.options;
 
+
             return {
-                type: "bi.absolute",
-                height: o.height,
+                type: "bi.horizontal_fill",
+                columnSize: ["fill", "", "fill"],
                 items: [{
-                    el: {
-                        type: "bi.horizontal_auto",
-                        items: [{
-                            type: "bi.label",
-                            height: o.height,
-                            width: this.constants.width,
-                            text: "-",
-                            ref: function (_ref) {
-                                self.label = _ref;
-                            }
-                        }]
-                    },
-                    top: 0,
-                    left: 0,
-                    right: 0,
-                    bottom: 0
+                    el: BI.extend({
+                        ref: function (_ref) {
+                            self.left = _ref;
+                        }
+                    }, this._createCombo(o.value.start, o.watermark?.start))
                 }, {
                     el: {
-                        type: "bi.center",
+                        type: "bi.label",
                         height: o.height,
-                        hgap: this.constants.hgap,
-                        items: [{
-                            type: "bi.absolute",
-                            items: [{
-                                el: BI.extend({
-                                    ref: function (_ref) {
-                                        self.left = _ref;
-                                    }
-                                }, this._createCombo(o.value.start, o.watermark?.start)),
-                                left: this.constants.offset,
-                                right: 0,
-                                top: 0,
-                                bottom: 0,
-                            }]
-                        }, {
-                            type: "bi.absolute",
-                            items: [{
-                                el: BI.extend({
-                                    ref: function (_ref) {
-                                        self.right = _ref;
-                                    }
-                                }, this._createCombo(o.value.end, o.watermark?.end)),
-                                left: 0,
-                                right: this.constants.offset,
-                                top: 0,
-                                bottom: 0,
-                            }]
-                        }]
-                    },
-                    top: 0,
-                    left: 0,
-                    right: 0,
-                    bottom: 0
+                        hgap: 5,
+                        text: "-",
+                        ref: function (_ref) {
+                            self.label = _ref;
+                        }
+                    }
+                }, {
+                    el: BI.extend({
+                        ref: function (_ref) {
+                            self.right = _ref;
+                        }
+                    }, this._createCombo(o.value.end, o.watermark?.end))
                 }]
             };
         },
diff --git a/src/widget/yearinterval/yearinterval.js b/src/widget/yearinterval/yearinterval.js
index 9f48d7f5f..56756e60c 100644
--- a/src/widget/yearinterval/yearinterval.js
+++ b/src/widget/yearinterval/yearinterval.js
@@ -26,41 +26,25 @@ BI.YearInterval = BI.inherit(BI.Single, {
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
 
-        return [{
-            type: "bi.center",
-            hgap: 15,
-            height: o.height,
+        return {
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
             items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: self.left,
-                    left: this.constants.offset,
-                    right: 0,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: self.left
             }, {
-                type: "bi.absolute",
-                items: [{
-                    el: self.right,
-                    left: 0,
-                    right: this.constants.offset,
-                    top: 0,
-                    bottom: 0
-                }]
-            }]
-        }, {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.label",
-                height: o.height,
-                width: this.constants.width,
-                text: "-",
-                ref: function (_ref) {
-                    self.label = _ref;
+                el: {
+                    type: "bi.label",
+                    height: o.height,
+                    hgap: 5,
+                    text: "-",
+                    ref: function (_ref) {
+                        self.label = _ref;
+                    }
                 }
+            }, {
+                el: self.right
             }]
-        }]
+        };
     },
 
     _createCombo: function (v, watermark) {
diff --git a/src/widget/yearmonthinterval/yearmonthinterval.js b/src/widget/yearmonthinterval/yearmonthinterval.js
index 85e982e22..d32dbb096 100644
--- a/src/widget/yearmonthinterval/yearmonthinterval.js
+++ b/src/widget/yearmonthinterval/yearmonthinterval.js
@@ -21,44 +21,26 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
-        this.label = BI.createWidget({
-            type: "bi.label",
-            height: o.height,
-            width: this.constants.width,
-            text: "-"
-        });
-        BI.createWidget({
-            element: self,
-            type: "bi.center",
-            hgap: 15,
-            height: o.height,
+        
+        return {
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
             items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: self.left,
-                    left: this.constants.offset,
-                    right: 0,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: self.left
             }, {
-                type: "bi.absolute",
-                items: [{
-                    el: self.right,
-                    left: 0,
-                    right: this.constants.offset,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: {
+                    type: "bi.label",
+                    height: o.height,
+                    hgap: 5,
+                    text: "-",
+                    ref: function (_ref) {
+                        self.label = _ref;
+                    }
+                }
+            }, {
+                el: self.right
             }]
-        });
-        BI.createWidget({
-            type: "bi.horizontal_auto",
-            element: this,
-            items: [
-                self.label
-            ]
-        });
+        };
     },
 
     _createCombo: function (v, watermark) {
diff --git a/src/widget/yearquarterinterval/yearquarterinterval.js b/src/widget/yearquarterinterval/yearquarterinterval.js
index f23134a09..02a0c67d7 100644
--- a/src/widget/yearquarterinterval/yearquarterinterval.js
+++ b/src/widget/yearquarterinterval/yearquarterinterval.js
@@ -26,41 +26,26 @@ BI.YearQuarterInterval = BI.inherit(BI.Single, {
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
 
-        return [{
-            type: "bi.center",
-            hgap: 15,
-            height: o.height,
+
+        return {
+            type: "bi.horizontal_fill",
+            columnSize: ["fill", "", "fill"],
             items: [{
-                type: "bi.absolute",
-                items: [{
-                    el: self.left,
-                    left: this.constants.offset,
-                    right: 0,
-                    top: 0,
-                    bottom: 0
-                }]
+                el: self.left
             }, {
-                type: "bi.absolute",
-                items: [{
-                    el: self.right,
-                    left: 0,
-                    right: this.constants.offset,
-                    top: 0,
-                    bottom: 0
-                }]
-            }]
-        }, {
-            type: "bi.horizontal_auto",
-            items: [{
-                type: "bi.label",
-                height: o.height,
-                width: this.constants.width,
-                text: "-",
-                ref: function (_ref) {
-                    self.label = _ref;
+                el: {
+                    type: "bi.label",
+                    height: o.height,
+                    hgap: 5,
+                    text: "-",
+                    ref: function (_ref) {
+                        self.label = _ref;
+                    }
                 }
+            }, {
+                el: self.right
             }]
-        }]
+        };
     },
 
     _createCombo: function (v, watermark) {
diff --git a/template/index.html b/template/index.html
index 2d98bda7b..bcf5ad41a 100644
--- a/template/index.html
+++ b/template/index.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="en">
 
 <head>

From ce50df3e82e76cbc2525c8dd06384c883dd6589b Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 16:38:14 +0800
Subject: [PATCH 09/97] bugfix

---
 src/widget/timeinterval/dateinterval.js           | 5 ++---
 src/widget/timeinterval/timeinterval.js           | 5 ++---
 src/widget/timeinterval/timeperiods.js            | 2 +-
 src/widget/yearmonthinterval/yearmonthinterval.js | 4 +---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/widget/timeinterval/dateinterval.js b/src/widget/timeinterval/dateinterval.js
index 8da68b143..2da77de8b 100644
--- a/src/widget/timeinterval/dateinterval.js
+++ b/src/widget/timeinterval/dateinterval.js
@@ -19,10 +19,9 @@ BI.DateInterval = BI.inherit(BI.Single, {
             supportDynamic: true,
         });
     },
-    _init: function () {
+    
+    render: function () {
         var self = this, o = this.options;
-        BI.DateInterval.superclass._init.apply(this, arguments);
-
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
diff --git a/src/widget/timeinterval/timeinterval.js b/src/widget/timeinterval/timeinterval.js
index 00d3b63cb..c22c8e14e 100644
--- a/src/widget/timeinterval/timeinterval.js
+++ b/src/widget/timeinterval/timeinterval.js
@@ -19,10 +19,9 @@ BI.TimeInterval = BI.inherit(BI.Single, {
             supportDynamic: true
         });
     },
-    _init: function () {
-        var self = this, o = this.options;
-        BI.TimeInterval.superclass._init.apply(this, arguments);
 
+    render: function () {
+        var self = this, o = this.options;
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);
diff --git a/src/widget/timeinterval/timeperiods.js b/src/widget/timeinterval/timeperiods.js
index 4e04533bf..a8bb9e60b 100644
--- a/src/widget/timeinterval/timeperiods.js
+++ b/src/widget/timeinterval/timeperiods.js
@@ -16,10 +16,10 @@
             extraCls: "bi-time-interval",
             value: {}
         },
+        
         render: function () {
             var self = this, o = this.options;
 
-
             return {
                 type: "bi.horizontal_fill",
                 columnSize: ["fill", "", "fill"],
diff --git a/src/widget/yearmonthinterval/yearmonthinterval.js b/src/widget/yearmonthinterval/yearmonthinterval.js
index d32dbb096..814123f67 100644
--- a/src/widget/yearmonthinterval/yearmonthinterval.js
+++ b/src/widget/yearmonthinterval/yearmonthinterval.js
@@ -14,10 +14,8 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
         height: 24
     },
 
-    _init: function () {
+    render: function () {
         var self = this, o = this.options;
-        BI.YearMonthInterval.superclass._init.apply(this, arguments);
-
         o.value = o.value || {};
         this.left = this._createCombo(o.value.start, o.watermark?.start);
         this.right = this._createCombo(o.value.end, o.watermark?.end);

From 5e8a652ad951e6eac18365d19e3405202a002c0a Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 17:49:11 +0800
Subject: [PATCH 10/97] update

---
 src/core/4.widget.js | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 4f91fd490..058015c32 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -903,14 +903,24 @@
 
     BI.useContext = function (inject) {
         if (BI.Model.target) {
-            var p = BI.Model.target;
+            var vm = BI.Model.target;
             if (inject) {
-                while (p) {
-                    if (p.$$context && inject in p.$$context) {
-                        return p;
+                if (vm.$$computed && inject in vm.$$computed) {
+                    return vm;
+                }
+                if (vm.$$state && inject in vm.$$state) {
+                    return vm;
+                }
+                if (vm.$$model && inject in vm.$$model) {
+                    return vm;
+                }
+                while (vm) {
+                    if (vm.$$context && inject in vm.$$context) {
+                        return vm;
                     }
-                    p = p._parent;
+                    vm = vm._parent;
                 }
+                return null;
             }
         }
         return BI.Model.target;

From 5f19e3fb0e98f29c824cc0ef746a4717894ff536 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 19:13:13 +0800
Subject: [PATCH 11/97] update

---
 examples/useContext.html | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index 56c78b2ce..2e736c377 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -5,8 +5,14 @@
     <!-- <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://fanruan.design/fineui/2.0/fineui.min.js"></script> -->
+    <script src="http://localhost:9001/fineui.js"></script>
 </head>
+<style>
+.my-parent {
+    --css-scale: 1;
+}
+</style>
 <body>
 <div id="wrapper"></div>
 <script>
@@ -14,7 +20,8 @@
     var Model = BI.inherit(BI.Model, {
         state: function () {
             return {
-                expand: false
+                expand: false,
+                cssScale: 2.0
             };
         },
         childContext: ["text"],
@@ -33,6 +40,18 @@
     });
     BI.model("demo.model", Model);
 
+    var oldFormat = BI.pixFormat;
+    BI.pixFormat = function (pix, border) {
+        var context = BI.useContext("cssScale");
+        if (!context) {
+            return oldFormat.apply(this, arguments);
+        }
+        if (!BI.isNumber(pix)) {
+            return pix;
+        }
+        return `calc(var(--css-scale) * ${pix}px - ${border || 0}})`;
+    }
+
     var Child = BI.inherit(BI.Widget, {
         render: function () {
             var label;
@@ -45,6 +64,7 @@
             // });
             return {
                 type: "bi.label",
+                height: 30,
                 ref: function (_ref) {
                     label = _ref;
                 },
@@ -60,6 +80,9 @@
     BI.shortcut("demo.child", Child);
 
     var Widget = BI.inherit(BI.Widget, {
+        props: {
+            baseCls: "my-parent"
+        },
         _store: function () {
             return BI.Models.getModel("demo.model");
         },
@@ -67,6 +90,7 @@
             var child;
             var store = BI.useStore();
             return function () {
+                this.element[0].style.setProperty('--css-scale', store.model.cssScale);
                 return {
                     type: "bi.vertical",
                     vgap: 20,

From ea20dd6f37837d69aaaf239c8740bfef38978b4f Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 19:24:40 +0800
Subject: [PATCH 12/97] =?UTF-8?q?KERNEL-13158:=20=E5=86=99=E4=B8=AA?=
 =?UTF-8?q?=E7=AE=80=E5=8D=95demo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/useContext.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index 2e736c377..e7213e10d 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -49,8 +49,8 @@
         if (!BI.isNumber(pix)) {
             return pix;
         }
-        return `calc(var(--css-scale) * ${pix}px - ${border || 0}})`;
-    }
+        return "calc(var(--css-scale) * " + pix + "px)";
+    };
 
     var Child = BI.inherit(BI.Widget, {
         render: function () {

From 9b579fe9cf2952932551b125268f7d1dc58d7117 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 19:25:15 +0800
Subject: [PATCH 13/97] update

---
 examples/useContext.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index e7213e10d..a82442a72 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -5,8 +5,7 @@
     <!-- <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>
 </head>
 <style>
 .my-parent {

From 2e8c990cba1bd456051fab4bf349a6870fdba0ad Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 19:34:42 +0800
Subject: [PATCH 14/97] auto upgrade version to 2.0.20221019193241

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6bf221ed0..211c4db75 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019101409",
+  "version": "2.0.20221019193241",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From b57c1f9f8b00da266fdd4fade3ff73670f5505de Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 20:24:12 +0800
Subject: [PATCH 15/97] auto upgrade version to 2.0.20221019202245

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 211c4db75..32d8ff4a0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019193241",
+  "version": "2.0.20221019202245",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

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

---
 dist/fix/fix.compact.js  |  4 ++--
 examples/useContext.html | 21 +++++++++++++++++++--
 src/core/4.widget.js     |  7 ++++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js
index df02143b6..6179d484b 100644
--- a/dist/fix/fix.compact.js
+++ b/dist/fix/fix.compact.js
@@ -78,7 +78,7 @@
         }, options);
     };
 
-    function findStore (widget) {
+    BI.Widget.findStore = function findStore (widget) {
         if (target != null) {
             return target;
         }
@@ -110,7 +110,7 @@
             return true;
         }
         if (this._store) {
-            var store = findStore(this.options.context || this._parent || this.options.element || this._context);
+            var store = BI.Widget.findStore(this.options.context || this._parent || this.options.element || this._context);
             if (store) {
                 pushTarget(store);
                 needPop = true;
diff --git a/examples/useContext.html b/examples/useContext.html
index e7213e10d..b3cb40f7f 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -5,12 +5,13 @@
     <!-- <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 {
     --css-scale: 1;
+    font-size: calc(var(--css-scale) * 14px);
 }
 </style>
 <body>
@@ -99,6 +100,22 @@
                         ref: function (_ref) {
                             child = _ref;
                         }
+                    }, {
+                        type: "bi.time_periods",
+                        width: 400,
+                        height: 24,
+                        value: {
+                            start: {
+                                hour: 7,
+                                minute: 3,
+                                second: 16
+                            },
+                            end: {
+                                hour: 21,
+                                minute: 3,
+                                second: 35
+                            }
+                        }
                     }]
                 };
             };
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 058015c32..9910f010f 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -902,8 +902,9 @@
     };
 
     BI.useContext = function (inject) {
-        if (BI.Model.target) {
-            var vm = BI.Model.target;
+        // 通过组件找最近的store
+        var vm = BI.Widget.findStore(BI.Widget.current);
+        if (vm) {
             if (inject) {
                 if (vm.$$computed && inject in vm.$$computed) {
                     return vm;
@@ -923,7 +924,7 @@
                 return null;
             }
         }
-        return BI.Model.target;
+        return vm;
     };
 
     BI.watch = function (vm, watch, handler) {

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

---
 examples/useContext.html | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index a82442a72..4ed6c9661 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -5,11 +5,13 @@
     <!-- <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://fanruan.design/fineui/2.0/fineui.min.js"></script>
+<!--    <script src="http://localhost:9001/fineui.js"></script>-->
 </head>
 <style>
 .my-parent {
     --css-scale: 1;
+    font-size: calc(var(--css-scale) * 14px);
 }
 </style>
 <body>
@@ -98,6 +100,18 @@
                         ref: function (_ref) {
                             child = _ref;
                         }
+                    }, {
+                        type: "bi.dynamic_date_combo",
+                        supportDynamic: false,
+                        width: 200,
+                        value: {
+                            type: 1,
+                            value: {
+                                year: 2012,
+                                month: 3,
+                                day: 15
+                            }
+                        }
                     }]
                 };
             };

From 386ac414f6b7a381e9f919a39ae440575e93c5db Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 21:30:58 +0800
Subject: [PATCH 18/97] auto upgrade version to 2.0.20221019212944

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 32d8ff4a0..7b4828644 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019202245",
+  "version": "2.0.20221019212944",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

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 19/97] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=8BuseContext?=
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);

From 6e3d59d8fbdc7e1a69389deef86af4fcb3b72240 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 22:13:50 +0800
Subject: [PATCH 20/97] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=B8=8BuseContext=EF=BC=8C=E7=AE=80=E5=8D=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/4.widget.js                    | 8 ++------
 src/widget/date/calendar/popup.month.js | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 16d915bac..9910f010f 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -288,18 +288,14 @@
 
         _initElementWidth: function () {
             var o = this.options;
-            if (BI.isArray(o.width)) {
-                this.element.css("width", BI.pixFormat(...o.width));
-            } else if (BI.isWidthOrHeight(o.width)) {
+            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.isArray(o.height)) {
-                this.element.css("height", BI.pixFormat(...o.height));
-            } else if (BI.isWidthOrHeight(o.height)) {
+            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 56d518e36..911f578a1 100644
--- a/src/widget/date/calendar/popup.month.js
+++ b/src/widget/date/calendar/popup.month.js
@@ -49,6 +49,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
     },
 
     _getItems: function(m) {
+        BI.Widget.pushContext(this);
         // 纵向排列月
         var month = [1, 7, 2, 8, 3, 9, 4, 10, 5, 11, 6, 12];
         var items = [];
@@ -67,7 +68,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
                     whiteSpace: "nowrap",
                     once: false,
                     forceSelected: true,
-                    height: [BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1],
+                    height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
                     width: 30,
                     value: td,
                     text: td,
@@ -75,6 +76,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
                 };
             });
         });
+        BI.Widget.popContext();
 
         return items;
     },

From 68b682f021282417a4a6f5630e54645500c2e169 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 19 Oct 2022 22:52:15 +0800
Subject: [PATCH 21/97] auto upgrade version to 2.0.20221019225145

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7b4828644..bdea121f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019212944",
+  "version": "2.0.20221019225145",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 1411131bae5dd813dcdf0e959edaeacef3276bfd Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 19 Oct 2022 23:03:21 +0800
Subject: [PATCH 22/97] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96useCont?=
 =?UTF-8?q?ext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/combination/navigation.js | 3 ++-
 src/core/4.widget.js               | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/base/combination/navigation.js b/src/base/combination/navigation.js
index efbf68404..adc3e5ad4 100644
--- a/src/base/combination/navigation.js
+++ b/src/base/combination/navigation.js
@@ -43,9 +43,10 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 return self.showIndex + v;
             },
             cardCreator: function (v) {
+                BI.Widget.pushContext(self);
                 var card = o.cardCreator(v);
+                BI.Widget.popContext();
                 self.cardMap[v] = card;
-
                 return card;
             },
             afterCardCreated: BI.bind(this.afterCardCreated, this),
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 9910f010f..bca87b9fc 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -903,7 +903,7 @@
 
     BI.useContext = function (inject) {
         // 通过组件找最近的store
-        var vm = BI.Widget.findStore(BI.Widget.current);
+        var vm = BI.Widget.findStore(BI.Widget.current || BI.Widget.context);
         if (vm) {
             if (inject) {
                 if (vm.$$computed && inject in vm.$$computed) {

From e273c9b586f55f5bed38570c6a61625c2184efff Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 20 Oct 2022 00:06:56 +0800
Subject: [PATCH 23/97] auto upgrade version to 2.0.20221020000559

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bdea121f7..2c2632a7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221019225145",
+  "version": "2.0.20221020000559",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 5c6678662849293629c80a453339add569859e4a Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Thu, 20 Oct 2022 10:13:52 +0800
Subject: [PATCH 24/97] =?UTF-8?q?KERNEL-13169=20feat:=20=E6=88=96=E8=AE=B8?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=9A=E8=BF=87setValid=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E7=9A=84=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/editor/editor.js | 5 +++++
 src/widget/editor/editor.text.js | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js
index ac9e779e9..95e863430 100644
--- a/src/base/single/editor/editor.js
+++ b/src/base/single/editor/editor.js
@@ -344,6 +344,11 @@ BI.Editor = BI.inherit(BI.Single, {
         return this.editor.isValid();
     },
 
+    setValid: function (b) {
+        this.editor.setValid(b);
+        this._checkError();
+    },
+
     destroyed: function () {
         BI.Bubbles.remove(this.getName());
     },
diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js
index 850ad257c..c2da87b02 100644
--- a/src/widget/editor/editor.text.js
+++ b/src/widget/editor/editor.text.js
@@ -138,6 +138,10 @@ BI.TextEditor = BI.inherit(BI.Widget, {
         return this.editor.isValid();
     },
 
+    setValid: function (b) {
+        this.editor.setValid(b);
+    },
+
     setValue: function (v) {
         this.editor.setValue(v);
     },

From d587bcef2e812c6c8a235aa1ceb8c898d0c8b702 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Thu, 20 Oct 2022 10:14:28 +0800
Subject: [PATCH 25/97] =?UTF-8?q?=E6=97=A0JIRA:=20fix=20unResize?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/layout/responsive/responsive.flex.horizontal.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/wrapper/layout/responsive/responsive.flex.horizontal.js b/src/core/wrapper/layout/responsive/responsive.flex.horizontal.js
index 70d7ddddb..592d50641 100644
--- a/src/core/wrapper/layout/responsive/responsive.flex.horizontal.js
+++ b/src/core/wrapper/layout/responsive/responsive.flex.horizontal.js
@@ -51,7 +51,7 @@ BI.ResponsiveFlexHorizontalLayout = BI.inherit(BI.FlexHorizontalLayout, {
     },
 
     destroyed: function () {
-        this.unResize();
+        this.unResize?.();
     }
 });
 BI.shortcut("bi.responsive_flex_horizontal", BI.ResponsiveFlexHorizontalLayout);

From cee9c4ba9c661327e2e5627a8199e9de64b43ac0 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Thu, 20 Oct 2022 11:35:56 +0800
Subject: [PATCH 26/97] =?UTF-8?q?BI-115556=20fix:=20=E3=80=906.0.3.4?=
 =?UTF-8?q?=E5=8F=91=E6=95=A3=E3=80=91BI=E5=85=A8=E5=B1=80=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=BA=E9=BB=98=E8=AE=A4=E6=9A=97=E9=BB=91=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E7=BB=91=E5=AE=9A=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=89=8D=E9=9D=A2=E7=9A=84=E5=8B=BE=E9=80=89=E6=A1=86?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E6=B8=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/tree/ztree.less | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index e300e0be4..1eb5896a6 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -67,6 +67,27 @@
       border-left: 1px solid @border-color-dark-gray-line-theme-dark;
     }
   }
+
+  &.bi-checkbox {
+    border: 1px solid @color-bi-border-checkbox-theme-dark;
+
+    &.active {
+      background-color: @color-bi-background-active-checkbox-theme-dark;
+      border-color: @color-bi-border-hover-active-checkbox-theme-dark;
+    }
+
+    &.disabled {
+      background-color: @color-bi-background-disabled-checkbox-theme-dark;
+
+      &.active {
+        border-color: @color-bi-border-disabled-checkbox-theme-dark;
+      }
+    }
+  }
+
+  &.bi-half-button {
+    border: 1px solid @color-bi-border-hover-active-checkbox-theme-dark;
+  }
 }
 
 .ztree li a {

From a8488250268fa878c978494bed48207712381ef4 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 20 Oct 2022 14:17:58 +0800
Subject: [PATCH 27/97] auto upgrade version to 2.0.20221020141659

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2c2632a7d..c550f66c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221020000559",
+  "version": "2.0.20221020141659",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 16ec4f78d13c3692382200d27344d7e333a005af Mon Sep 17 00:00:00 2001
From: Treecat <treecat@fanruan.com>
Date: Thu, 20 Oct 2022 14:24:44 +0800
Subject: [PATCH 28/97] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8Bbutton=E7=9A=84=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/button/buttons/button.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js
index 25296c846..a8da2e32b 100644
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@@ -76,12 +76,10 @@
             var hasBorder = false
             if (BI.isNumber(o.height)) {
                 if (!isVertical(o.iconPosition)) {
-                    if (o.clear || o.block || o.light) {
-                        lineHeight = o.height;
-                    } else {
+                    if (!(o.clear && o.block && o.light)) {
                         hasBorder = true;
-                        lineHeight = o.height;
                     }
+                    lineHeight = o.height;
                 } else {
                     lineHeight = textHeight;
                 }

From 0ed644fa2bd68971ca8d7d32e80bff0204c3f400 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Thu, 20 Oct 2022 17:06:21 +0800
Subject: [PATCH 29/97] =?UTF-8?q?KERNEL-10683=20fix:=20=E6=A0=91=E7=9A=84?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4,=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=AD=89=E6=AF=94=E7=BC=A9=E6=94=BE..?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/button/node/siwtcher.tree.node.js |  6 +-
 src/case/button/treeitem/treeitem.js       |  6 +-
 src/less/case/tree/tree.item.less          | 67 ++++++++++++++++++++++
 webpack/attachments.js                     |  4 ++
 4 files changed, 77 insertions(+), 6 deletions(-)
 create mode 100644 src/less/case/tree/tree.item.less

diff --git a/src/case/button/node/siwtcher.tree.node.js b/src/case/button/node/siwtcher.tree.node.js
index c118518d6..89d055c51 100644
--- a/src/case/button/node/siwtcher.tree.node.js
+++ b/src/case/button/node/siwtcher.tree.node.js
@@ -29,13 +29,13 @@ BI.TreeNodeSwitcher = BI.inherit(BI.NodeButton, {
             return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type1", "tree-expand-icon-type1"];
         } else if (options.layer === 0 && options.isFirstNode) {
             //  第一层，并且是第一个节点
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type2", "tree-solid-expand-icon-type2"] : ["tree-collapse-icon-type2", "tree-expand-icon-type2"];
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type2", "tree-expand-icon-type2"];
         } else if (options.isLastNode) {
             //  最后一个节点
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type4", "tree-solid-expand-icon-type4"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"];
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"];
         } else {
             //  其他情况
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type3", "tree-solid-expand-icon-type3"] : ["tree-collapse-icon-type3", "tree-expand-icon-type3"];
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? ["tree-solid-collapse-icon-type1", "tree-solid-expand-icon-type1"] : ["tree-collapse-icon-type4", "tree-expand-icon-type4"];
         }
     },
 
diff --git a/src/case/button/treeitem/treeitem.js b/src/case/button/treeitem/treeitem.js
index dd7e008f6..4ab512a29 100644
--- a/src/case/button/treeitem/treeitem.js
+++ b/src/case/button/treeitem/treeitem.js
@@ -57,11 +57,11 @@ BI.BasicTreeItem = BI.inherit(BI.NodeButton, {
         if (options.layer === 0 && options.isFirstNode && options.isLastNode) {
             return "";
         } else if (options.layer === 0 && options.isFirstNode) {
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "first-solid-line-conn-background" : "first-line-conn-background";
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-first-solid-line-conn-background" : "first-line-conn-background";
         } else if (options.isLastNode) {
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "last-solid-line-conn-background" : "last-line-conn-background";
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-last-solid-line-conn-background" : "last-line-conn-background";
         } else {
-            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "mid-solid-line-conn-background" : "mid-line-conn-background";
+            return BI.STYLE_CONSTANTS.LINK_LINE_TYPE === "solid" ? "tree-mid-solid-line-conn-background" : "mid-line-conn-background";
         }
     },
 
diff --git a/src/less/case/tree/tree.item.less b/src/less/case/tree/tree.item.less
new file mode 100644
index 000000000..3098f664a
--- /dev/null
+++ b/src/less/case/tree/tree.item.less
@@ -0,0 +1,67 @@
+@import "../../index.less";
+
+.tree-first-solid-line-conn-background, .tree-mid-solid-line-conn-background {
+  &:before {
+    position: absolute;
+    top: 0;
+    left: -1px;
+    width: 50%;
+    height: 100%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
+
+.tree-last-solid-line-conn-background {
+  &:before {
+    position: absolute;
+    top: 0;
+    left: -1px;
+    width: 50%;
+    height: 50%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 1px;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
+
+.bi-theme-dark {
+  .tree-first-solid-line-conn-background, .tree-mid-solid-line-conn-background {
+    &:before {
+      border-right: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+
+    &:after {
+      border-bottom: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+  }
+
+  .tree-last-solid-line-conn-background {
+    &:before {
+      border-right: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+
+    &:after {
+      border-bottom: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+  }
+}
diff --git a/webpack/attachments.js b/webpack/attachments.js
index 94274e1b3..acb30ad2a 100644
--- a/webpack/attachments.js
+++ b/webpack/attachments.js
@@ -31,6 +31,7 @@ const basicAttachmentMap = {
     // 实现好的一些基础实例
     case: sync([
         "src/case/**/*.js",
+        "src/less/case/**/*.less",
     ]),
     widget: sync([
         "src/less/widget/**/*.less",
@@ -90,6 +91,7 @@ const basicAttachmentMap = {
         "src/less/core/**/*.less",
         "src/less/theme/**/*.less",
         "src/less/base/**/*.less",
+        "src/less/case/**/*.less",
         "src/less/widget/**/*.less",
         "src/less/component/**/*.less",
     ]),
@@ -139,6 +141,7 @@ const bundleWithoutNormalize = [].concat(
     basicAttachmentMap.core_without_normalize,
     sync([
         "src/less/base/**/*.less",
+        "src/less/case/**/*.less",
         "src/less/widget/**/*.less",
         "src/less/component/**/*.less",
         "public/less/**/*.less",
@@ -152,6 +155,7 @@ const fineuiWithoutNormalize = [].concat(
     basicAttachmentMap.core_without_normalize,
     sync([
         "src/less/base/**/*.less",
+        "src/less/case/**/*.less",
         "src/less/widget/**/*.less",
         "src/less/component/**/*.less",
         'ui/less/app.less',

From 045a2b6521b2eccf1ced8e2281ff8969de27aa7c Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 20 Oct 2022 18:44:45 +0800
Subject: [PATCH 30/97] auto upgrade version to 2.0.20221020184420

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c550f66c6..5ff7391ba 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221020141659",
+  "version": "2.0.20221020184420",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 2d549c3422fd97f1aedfd02e674e2d744f170e7c Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 21 Oct 2022 12:04:51 +0800
Subject: [PATCH 31/97] auto upgrade version to 2.0.20221021120445

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5ff7391ba..72375009b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221020184420",
+  "version": "2.0.20221021120445",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 6507dd2d34f95103cecf82d3cdf5b6adb0f2aed7 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 21 Oct 2022 13:08:17 +0800
Subject: [PATCH 32/97] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96useCont?=
 =?UTF-8?q?ext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/constant/var.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/constant/var.js b/src/core/constant/var.js
index fc89511f5..cad439772 100644
--- a/src/core/constant/var.js
+++ b/src/core/constant/var.js
@@ -19,8 +19,8 @@ BI._.extend(BI, {
         if (!BI.isNumber(pix)) {
             return pix;
         }
-        if (BI.pixUnit === "px" && BI.pixRatio === 1) {
-            return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit;
+        if (BI.pixUnit === "px") {
+            return (pix - (border || 0)) / BI.pixRatio;
         }
         var length = pix / BI.pixRatio + BI.pixUnit;
         if (border > 0) {

From 8398fae0317d4985c4c82bc0188438c788629ece Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Fri, 21 Oct 2022 13:32:40 +0800
Subject: [PATCH 33/97] =?UTF-8?q?KERNEL-13158:=20=E5=9B=9E=E9=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/constant/var.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/constant/var.js b/src/core/constant/var.js
index cad439772..fc89511f5 100644
--- a/src/core/constant/var.js
+++ b/src/core/constant/var.js
@@ -19,8 +19,8 @@ BI._.extend(BI, {
         if (!BI.isNumber(pix)) {
             return pix;
         }
-        if (BI.pixUnit === "px") {
-            return (pix - (border || 0)) / BI.pixRatio;
+        if (BI.pixUnit === "px" && BI.pixRatio === 1) {
+            return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit;
         }
         var length = pix / BI.pixRatio + BI.pixUnit;
         if (border > 0) {

From 70571d7c64e394d7ce90e0c97a96f9b7ad66bdcc Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 21 Oct 2022 13:34:50 +0800
Subject: [PATCH 34/97] auto upgrade version to 2.0.20221021133442

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 72375009b..b78c14202 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221021120445",
+  "version": "2.0.20221021133442",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 89ca5b379331e68af8356a6ef603764ec493bf87 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 21 Oct 2022 13:54:30 +0800
Subject: [PATCH 35/97] auto upgrade version to 2.0.20221021135419

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b78c14202..3e7accb86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221021133442",
+  "version": "2.0.20221021135419",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 45a20139bf8f57bc8058b618c4a41f9bb428b822 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 14:13:35 +0800
Subject: [PATCH 36/97] =?UTF-8?q?KERNEL-13184=20feat:=20=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E7=94=A8=E7=9A=84=E6=95=B0=E5=80=BC=E6=BB=91=E5=9D=97?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6,=E8=87=AA=E9=80=82=E5=BA=94=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../singleslider/slider/widget.slider.less    |  49 +++---
 src/widget/intervalslider/intervalslider.js   | 144 +++++++++---------
 .../singleslider/button/iconbutton.slider.js  |  20 +--
 src/widget/singleslider/singleslider.js       |  14 +-
 src/widget/singleslider/singleslider.label.js |  23 ++-
 .../singleslider/singleslider.normal.js       |  11 +-
 6 files changed, 135 insertions(+), 126 deletions(-)

diff --git a/src/less/widget/singleslider/slider/widget.slider.less b/src/less/widget/singleslider/slider/widget.slider.less
index dc6f563b4..f842ce791 100644
--- a/src/less/widget/singleslider/slider/widget.slider.less
+++ b/src/less/widget/singleslider/slider/widget.slider.less
@@ -1,41 +1,31 @@
 @import "../../../index.less";
 
 .bi-single-slider-button {
-  & .slider-button {
-    cursor: ew-resize;
-    border-width: 2px;
-    border-style: solid;
-    .border-radius(8px);
-    background-color: @color-bi-background-slider-button;
-    height: 8px;
-    width: 8px;
-    top: 8px;
-    left: -6px;
+  transform: translateX(-50%);
+  cursor: ew-resize;
+  border-width: 2px;
+  border-style: solid;
+  .border-radius(50%);
+  background-color: @color-bi-background-slider-button;
+
+  &:hover, &.hover {
+    background-color: @color-bi-background-hover-slider-button;
+    transform: scale(1.2) translateX(-50%);
+    .box-shadow(0 2px 4px 1px, rgba(0, 35, 11, 20%));
+  }
+
+  &.disabled {
+    border-color: @color-bi-border-disabled-slider-button;
+
     &:hover, &.hover {
-      .border-radius(10px);
-      background-color: @color-bi-background-hover-slider-button;
-      width: 12px;
-      height: 12px;
-      top: 6px;
-      left: -8px;
-      .box-shadow(0 2px 4px 1px,rgba(0, 35, 11, 20%));
-    }
-    &.disabled {
-      border-color: @color-bi-border-disabled-slider-button;
-      &:hover, &.hover {
-        background-color: @color-bi-background-hover-disabled-slider-button;
-        width: 12px;
-        height: 12px;
-        top: 6px;
-        left: -8px;
-      }
+      background-color: @color-bi-background-hover-disabled-slider-button;
     }
   }
+
 }
 
 .bi-theme-dark {
   .bi-single-slider-button {
-    & .slider-button {
       background-color: @color-bi-background-slider-button;
       &:hover, &.hover {
         background-color: @color-bi-background-hover-slider-button-theme-dark;
@@ -45,6 +35,5 @@
           background-color: @color-bi-background-hover-disabled-slider-button-theme-dark;
         }
       }
-    }
   }
-}
\ No newline at end of file
+}
diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 739927972..236968f89 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -122,28 +122,29 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
         this._setVisible(false);
 
         return {
-            type: "bi.absolute",
-            element: this,
-            items: [{
-                el: {
-                    type: "bi.vertical",
-                    items: [{
-                        type: "bi.absolute",
-                        items: [{
-                            el: this.track,
-                            width: "100%",
-                            height: c.TRACK_HEIGHT
-                        }]
-                    }],
-                    hgap: 7,
-                    height: c.TRACK_HEIGHT
-                },
-                top: 23,
-                left: 0,
-                width: "100%"
-            },
+            type: "bi.vertical_fill",
+            rowSize: [30, 30],
+            items: [
                 this._createLabelWrapper(),
-                this._createSliderWrapper()
+                {
+                    type: "bi.absolute",
+                    items: [
+                        {
+                            el: {
+                                type: "bi.horizontal",
+                                horizontalAlign: "stretch",
+                                verticalAlign: "middle",
+                                columnSize: ["fill"],
+                                items: [{
+                                    el: this.track,
+                                }],
+                                hgap: 10,
+                            },
+                            inset: 0
+                        },
+                        this._createSliderWrapper(),
+                    ]
+                }
             ]
         };
     },
@@ -225,14 +226,14 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
                     items: [{
                         el: this.labelOne,
                         top: 0,
-                        left: "0%"
+                        left: 0,
                     }]
                 }, {
                     type: "bi.absolute",
                     items: [{
                         el: this.labelTwo,
                         top: 0,
-                        left: "100%"
+                        right: 0,
                     }]
                 }],
                 rgap: c.EDITOR_R_GAP,
@@ -248,58 +249,62 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
         var c = this._constant;
         return {
             el: {
-                type: "bi.vertical",
-                items: [{
-                    type: "bi.absolute",
-                    items: [{
-                        el: this.sliderOne,
-                        top: 0,
-                        left: "0%"
-                    }]
-                }, {
-                    type: "bi.absolute",
-                    items: [{
-                        el: this.sliderTwo,
-                        top: 0,
-                        left: "100%"
-                    }]
-                }],
-                hgap: c.SLIDER_WIDTH_HALF,
-                height: c.SLIDER_HEIGHT
+                type: "bi.horizontal",
+                horizontalAlign: "stretch",
+                verticalAlign: "middle",
+                items: [
+                    {
+                        type: "bi.absolute",
+                        height: 12,
+                        width: "fill",
+                        items: [
+                            {
+                                el: this.sliderOne,
+                                top: 1,
+                                bottom: 0,
+                                left: 0
+                            }, {
+                                el: this.sliderTwo,
+                                top: 1,
+                                bottom: 0,
+                                left: "100%"
+                            }
+                        ],
+                    }
+                ],
+                hgap: 10,
             },
-            top: 20,
-            left: 0,
-            width: "100%"
+            inset: 0
         };
     },
 
     _createTrackWrapper: function () {
         return BI.createWidget({
-            type: "bi.absolute",
-            items: [{
-                el: {
-                    type: "bi.vertical",
+            type: "bi.horizontal",
+            cls: "track-wrapper",
+            horizontalAlign: "stretch",
+            verticalAlign: "middle",
+            columnSize: ["fill"],
+            scrollx: false,
+            items: [
+                {
+                    type: "bi.absolute",
+                    height: 6,
                     items: [{
-                        type: "bi.absolute",
-                        items: [{
-                            el: this.grayTrack,
-                            top: 0,
-                            left: 0,
-                            width: "100%"
-                        }, {
-                            el: this.blueTrack,
-                            top: 0,
-                            left: 0,
-                            width: "0%"
-                        }]
-                    }],
-                    hgap: 8,
-                    height: 8
-                },
-                top: 8,
-                left: 0,
-                width: "100%"
-            }]
+                        el: this.grayTrack,
+                        top: 0,
+                        left: 0,
+                        bottom: 0,
+                        width: "100%"
+                    }, {
+                        el: this.blueTrack,
+                        top: 0,
+                        left: 0,
+                        bottom: 0,
+                        width: "0%"
+                    }]
+                }
+            ],
         });
     },
 
@@ -551,3 +556,6 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
 });
 BI.IntervalSlider.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.interval_slider", BI.IntervalSlider);
+
+
+console.log(123);
diff --git a/src/widget/singleslider/button/iconbutton.slider.js b/src/widget/singleslider/button/iconbutton.slider.js
index c46fe4a0d..3b3432253 100644
--- a/src/widget/singleslider/button/iconbutton.slider.js
+++ b/src/widget/singleslider/button/iconbutton.slider.js
@@ -4,7 +4,9 @@
 BI.SliderIconButton = BI.inherit(BI.Widget, {
 
     props: {
-        baseCls: "bi-single-slider-button"
+        baseCls: "bi-single-slider-button slider-button bi-high-light-border",
+        height: 8,
+        width: 8,
     },
 
     constants: {
@@ -17,20 +19,8 @@ BI.SliderIconButton = BI.inherit(BI.Widget, {
     render: function () {
         var self = this;
         return {
-            type: "bi.absolute",
-            ref: function () {
-                self.wrapper = this;
-            },
-            items: [{
-                el: {
-                    type: "bi.text_button",
-                    cls: "slider-button bi-high-light-border",
-                    ref: function () {
-                        self.slider = this;
-                    }
-                }
-            }]
+            type: "bi.layout",
         };
     }
 });
-BI.shortcut("bi.single_slider_button", BI.SliderIconButton);
\ No newline at end of file
+BI.shortcut("bi.single_slider_button", BI.SliderIconButton);
diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js
index db9f83caa..15410cb1a 100644
--- a/src/widget/singleslider/singleslider.js
+++ b/src/widget/singleslider/singleslider.js
@@ -55,10 +55,18 @@ BI.SingleSlider = BI.inherit(BI.Single, {
         });
         this._draggable(this.slider);
         var sliderVertical = BI.createWidget({
-            type: "bi.vertical",
+            type: "bi.vertical_adapt",
+            cls: "slider-wrapper",
+            columnSize: ["fill"],
             items: [{
                 type: "bi.absolute",
-                items: [this.slider]
+                items: [
+                    {
+                        el: this.slider,
+                        top: 8,
+                    }
+                ],
+                height: c.SLIDER_HEIGHT
             }],
             hgap: c.SLIDER_WIDTH_HALF,
             height: c.SLIDER_HEIGHT
@@ -145,7 +153,7 @@ BI.SingleSlider = BI.inherit(BI.Single, {
                         type: "bi.horizontal_auto",
                         items: [this.label]
                     }],
-                    height: c.EDITOR_HEIGHT
+                    // height: c.EDITOR_HEIGHT
                 },
                 top: 0,
                 left: 0,
diff --git a/src/widget/singleslider/singleslider.label.js b/src/widget/singleslider/singleslider.label.js
index 8f4e9bbb6..7e8da3019 100644
--- a/src/widget/singleslider/singleslider.label.js
+++ b/src/widget/singleslider/singleslider.label.js
@@ -56,10 +56,17 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
         });
         this._draggable(this.slider);
         var sliderVertical = BI.createWidget({
-            type: "bi.vertical",
+            type: "bi.vertical_adapt",
+            columnSize: ["fill"],
             items: [{
                 type: "bi.absolute",
-                items: [this.slider]
+                items: [
+                    {
+                        el: this.slider,
+                        top: 8,
+                    }
+                ],
+                height: c.SLIDER_HEIGHT
             }],
             hgap: c.SLIDER_WIDTH_HALF,
             height: c.SLIDER_HEIGHT
@@ -171,7 +178,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
             self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
         }, window);
         widget.element.on("mousedown", function (event) {
-            if(!widget.isEnabled()) {
+            if (!widget.isEnabled()) {
                 return;
             }
             defaultSize = this.offsetLeft;
@@ -179,7 +186,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
             mouseMoveTracker.captureMouseMoves(event);
         });
 
-        function optimizeSize (s) {
+        function optimizeSize(s) {
             return BI.clamp(s, 0, self._getGrayTrackLength());
         }
     },
@@ -219,7 +226,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
     },
 
     _setBlueTrack: function (percent) {
-        this.blueTrack.element.css({width: percent + "%"});
+        this.blueTrack.element.css({ width: percent + "%" });
     },
 
     _setLabelPosition: function (percent) {
@@ -227,7 +234,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
     },
 
     _setSliderPosition: function (percent) {
-        this.slider.element.css({left: percent + "%"});
+        this.slider.element.css({ left: percent + "%" });
     },
 
     _setAllPosition: function (percent) {
@@ -256,7 +263,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
 
     _setEnable: function (b) {
         BI.SingleSliderLabel.superclass._setEnable.apply(this, [b]);
-        if(b) {
+        if (b) {
             this.blueTrack.element.removeClass("disabled-blue-track").addClass("blue-track");
         } else {
             this.blueTrack.element.removeClass("blue-track").addClass("disabled-blue-track");
@@ -287,7 +294,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
     setMinAndMax: function (v) {
         var minNumber = BI.parseFloat(v.min);
         var maxNumber = BI.parseFloat(v.max);
-        if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber > minNumber )) {
+        if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber > minNumber)) {
             this.min = minNumber;
             this.max = maxNumber;
         }
diff --git a/src/widget/singleslider/singleslider.normal.js b/src/widget/singleslider/singleslider.normal.js
index 095a5fadf..1f7338530 100644
--- a/src/widget/singleslider/singleslider.normal.js
+++ b/src/widget/singleslider/singleslider.normal.js
@@ -44,10 +44,17 @@ BI.SingleSliderNormal = BI.inherit(BI.Single, {
         this._draggable(this.slider);
 
         var sliderVertical = BI.createWidget({
-            type: "bi.vertical",
+            type: "bi.vertical_adapt",
+            columnSize: ["fill"],
             items: [{
                 type: "bi.absolute",
-                items: [this.slider]
+                items: [
+                    {
+                        el: this.slider,
+                        top: 8,
+                    }
+                ],
+                height: c.SLIDER_HEIGHT
             }],
             hgap: c.SLIDER_WIDTH_HALF,
             height: c.SLIDER_HEIGHT

From 9237219655adb07a83e9fac9825c0c47a7300160 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 14:14:03 +0800
Subject: [PATCH 37/97] =?UTF-8?q?=E6=97=A0JIRA=20=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A0=91=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/multiselecttree/multiselecttree.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/widget/multiselecttree/multiselecttree.js b/src/widget/multiselecttree/multiselecttree.js
index d48d562bf..959c6593b 100644
--- a/src/widget/multiselecttree/multiselecttree.js
+++ b/src/widget/multiselecttree/multiselecttree.js
@@ -100,11 +100,11 @@ BI.MultiSelectTree = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
             element: this,
             items: [{
                 el: this.searcher,
-                height: this._constant.EDITOR_HEIGHT
+                height: ""
             }, {
                 el: this.adapter,
                 height: "fill"

From 4909e1a869afcd3381404a6c4e0b7ad0068627f2 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 15:52:54 +0800
Subject: [PATCH 38/97] =?UTF-8?q?=E6=97=A0jira=20fix:=20console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/intervalslider/intervalslider.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 236968f89..9f1fb51c8 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -556,6 +556,3 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
 });
 BI.IntervalSlider.EVENT_CHANGE = "EVENT_CHANGE";
 BI.shortcut("bi.interval_slider", BI.IntervalSlider);
-
-
-console.log(123);

From a05d7dd422027cc63f1ee1347d99b2804abb350b Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 15:53:48 +0800
Subject: [PATCH 39/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=9A=84=E6=A0=BC=E5=AD=90=E4=B8=8D=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/case/calendar/calendar.date.item.js | 4 ++--
 src/case/calendar/calendar.js           | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/case/calendar/calendar.date.item.js b/src/case/calendar/calendar.date.item.js
index d575b9557..3b2d865a0 100644
--- a/src/case/calendar/calendar.date.item.js
+++ b/src/case/calendar/calendar.date.item.js
@@ -4,8 +4,9 @@
 BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
     props: function() {
         return {
+            baseCls: "bi-calendar-date-item",
             height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT + 8,
-        } 
+        }
     },
 
     render: function () {
@@ -17,7 +18,6 @@ BI.CalendarDateItem = BI.inherit(BI.BasicButton, {
                     type: "bi.text_item",
                     cls: "bi-border-radius bi-list-item-select",
                     textAlign: "center",
-                    whiteSpace: "normal",
                     text: o.text,
                     value: o.value,
                     ref: function () {
diff --git a/src/case/calendar/calendar.js b/src/case/calendar/calendar.js
index 5c5026d8f..bfd76e2b4 100644
--- a/src/case/calendar/calendar.js
+++ b/src/case/calendar/calendar.js
@@ -158,8 +158,6 @@ BI.Calendar = BI.inherit(BI.Widget, {
                 var month = td.lastMonth ? o.month - 1 : (td.nextMonth ? o.month + 1 : o.month);
                 return BI.extend(td, {
                     type: "bi.calendar_date_item",
-                    textAlign: "center",
-                    whiteSpace: "normal",
                     once: false,
                     forceSelected: true,
                     value: o.year + "-" + month + "-" + td.text,

From 2fd27ec6538c97fa67877f2e843c349ebfd89f1d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Fri, 21 Oct 2022 18:14:20 +0800
Subject: [PATCH 40/97] auto upgrade version to 2.0.20221021181414

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e7accb86..d247c3dab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221021135419",
+  "version": "2.0.20221021181414",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 552bb272921da7d87d7a5c9bfb031cad887718f7 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 19:34:43 +0800
Subject: [PATCH 41/97] =?UTF-8?q?=E6=97=A0JIRA=20feat:=20=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E5=86=85=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/editor/editor.textarea.less | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less
index dc0a77a03..24554c425 100644
--- a/src/less/base/single/editor/editor.textarea.less
+++ b/src/less/base/single/editor/editor.textarea.less
@@ -6,10 +6,11 @@
     white-space: pre-wrap;
     word-break: break-all;
     font-size: @font-size-12;
+    font-size: calc(var(--css-scale, @font-size-12) * 1px);
     line-height: 21px;
-    & {
-      border: none;
-    }
+    line-height: calc(var(--css-scale, 21) * 1px);
+
+    border: none;
   }
   & .textarea-watermark{
     max-height: 100%;

From 47ecf338bde5ef54e3d687df2958dce234c243f9 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 21 Oct 2022 19:55:12 +0800
Subject: [PATCH 42/97] =?UTF-8?q?=E6=97=A0JIRA=20feat:=20=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E4=B8=8B=E6=8B=89=E6=A1=86=E5=86=85=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/editor/editor.textarea.less | 4 ++--
 src/less/widget/year/popup.year.less             | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/less/base/single/editor/editor.textarea.less b/src/less/base/single/editor/editor.textarea.less
index 24554c425..e5e8152be 100644
--- a/src/less/base/single/editor/editor.textarea.less
+++ b/src/less/base/single/editor/editor.textarea.less
@@ -6,9 +6,9 @@
     white-space: pre-wrap;
     word-break: break-all;
     font-size: @font-size-12;
-    font-size: calc(var(--css-scale, @font-size-12) * 1px);
+    font-size: calc(var(--css-scale, 1) * @font-size-12);
     line-height: 21px;
-    line-height: calc(var(--css-scale, 21) * 1px);
+    line-height: calc(var(--css-scale, 1) * 21px);
 
     border: none;
   }
diff --git a/src/less/widget/year/popup.year.less b/src/less/widget/year/popup.year.less
index 148f40508..2d9e7e133 100644
--- a/src/less/widget/year/popup.year.less
+++ b/src/less/widget/year/popup.year.less
@@ -2,7 +2,6 @@
 
 .bi-year-popup {
   & .year-popup-navigation {
-    line-height: 30px;
     & > .center-element {
       border-left: 1px solid @color-bi-border-year-popup;
     }
@@ -26,4 +25,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From 91a795f55f3f8139dd608e29cb408eb8020bda81 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Sat, 22 Oct 2022 13:22:36 +0800
Subject: [PATCH 43/97] =?UTF-8?q?=E6=97=A0JIRA=20=E6=B7=BB=E5=8A=A0BI.exec?=
 =?UTF-8?q?WithContext?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/4.widget.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index bca87b9fc..8be3a9058 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -927,6 +927,16 @@
         return vm;
     };
 
+    BI.execWithContext = function (_context, fn) {
+        BI.Widget.pushContext(_context);
+        try {
+            fn();
+        } catch (e) {
+            // nothing
+        }
+        BI.Widget.popContext();
+    };
+
     BI.watch = function (vm, watch, handler) {
         // 必须要保证组件当前环境存在
         if (BI.Widget.current) {

From d99a2b21687a9ce71fc811329cd44a3d6acac5bf Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sat, 22 Oct 2022 13:44:35 +0800
Subject: [PATCH 44/97] auto upgrade version to 2.0.20221022134428

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d247c3dab..99dc9a0bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221021181414",
+  "version": "2.0.20221022134428",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 802d9845763e04611a625c885486a3b9477c6869 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 22 Oct 2022 17:01:22 +0800
Subject: [PATCH 45/97] bugfix

---
 src/case/trigger/trigger.editor.js            |  2 +-
 src/case/trigger/trigger.icon.text.js         | 20 ++++---------------
 src/case/trigger/trigger.text.js              |  5 +++--
 src/case/trigger/trigger.text.small.js        |  2 +-
 .../combo.textvaluedownlist.js                |  2 +-
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js
index 4998ea583..7b2c39e3c 100644
--- a/src/case/trigger/trigger.editor.js
+++ b/src/case/trigger/trigger.editor.js
@@ -67,7 +67,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
                         type: "bi.trigger_icon_button",
                         width: o.triggerWidth || BI.pixFormat(o.height, 2)
                     },
-                    width: o.triggerWidth || BI.pixFormat(o.height, 2)
+                    width: ""
                 }
             ]
         });
diff --git a/src/case/trigger/trigger.icon.text.js b/src/case/trigger/trigger.icon.text.js
index 36d156e13..a102b5d0c 100644
--- a/src/case/trigger/trigger.icon.text.js
+++ b/src/case/trigger/trigger.icon.text.js
@@ -42,7 +42,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
         BI.createWidget({
             element: this,
             type: "bi.horizontal_fill",
-            columnSize: [BI.isEmptyString(o.iconCls) ? 0 : (o.iconWrapperWidth || o.height), "fill", o.triggerWidth || o.height],
+            columnSize: ["", "fill", ""],
             ref: function (_ref) {
                 self.wrapper = _ref;
             },
@@ -50,7 +50,9 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
                 el: {
                     type: "bi.icon_change_button",
                     cls: "icon-combo-trigger-icon",
+                    width: o.triggerWidth || o.height,
                     iconCls: o.iconCls,
+                    invisible: !o.iconCls,
                     ref: function (_ref) {
                         self.icon = _ref;
                     },
@@ -74,21 +76,7 @@ BI.IconTextTrigger = BI.inherit(BI.Trigger, {
     setIcon: function (iconCls) {
         var o = this.options;
         this.icon.setIcon(iconCls);
-        var iconItem = this.wrapper.attr("items")[0];
-        var textItem = this.wrapper.attr("items")[1];
-        if (BI.isNull(iconCls) || BI.isEmptyString(iconCls)) {
-            if (iconItem.width !== 0) {
-                iconItem.width = 0;
-                textItem.lgap = 5;
-                this.wrapper.resize();
-            }
-        } else {
-            if (iconItem.width !== (o.iconWrapperWidth || o.height)) {
-                iconItem.width = (o.iconWrapperWidth || o.height);
-                textItem.lgap = 0;
-                this.wrapper.resize();
-            }
-        }
+        this.icon.setVisible(!!iconCls);
     },
 
     setTextCls: function (cls) {
diff --git a/src/case/trigger/trigger.text.js b/src/case/trigger/trigger.text.js
index fe72fde60..6e7273252 100644
--- a/src/case/trigger/trigger.text.js
+++ b/src/case/trigger/trigger.text.js
@@ -60,7 +60,7 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
 
         return ({
             type: "bi.horizontal_fill",
-            columnSize: ["fill", o.triggerWidth || o.height],
+            columnSize: ["fill", ""],
             items: [
                 {
                     el: label,
@@ -68,6 +68,8 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
                 }, {
                     el: o.allowClear ? {
                         type: "bi.vertical_adapt",
+                        width: o.triggerWidth || o.height,
+                        height: o.height,
                         horizontalAlign: "left",
                         scrollable: false,
                         items: [
@@ -80,7 +82,6 @@ BI.TextTrigger = BI.inherit(BI.Trigger, {
                                     cls: "close-h-font " + (o.allowClear ? "clear-button" : ""),
                                     stopPropagation: true,
                                     width: o.triggerWidth || o.height,
-                                    height: o.height,
                                     invisible: !BI.isNotEmptyString(o.text),
                                     handler: function () {
                                         self.fireEvent(BI.TextTrigger.EVENT_CLEAR);
diff --git a/src/case/trigger/trigger.text.small.js b/src/case/trigger/trigger.text.small.js
index 6fbb04c3c..27c395a69 100644
--- a/src/case/trigger/trigger.text.small.js
+++ b/src/case/trigger/trigger.text.small.js
@@ -43,7 +43,7 @@ BI.SmallTextTrigger = BI.inherit(BI.Trigger, {
                     width: "fill"
                 }, {
                     el: this.trigerButton,
-                    width: o.triggerWidth || o.height
+                    width: ""
                 }
             ]
         });
diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
index 146472c30..2a1e254fd 100644
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@@ -5,7 +5,7 @@
 BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
     _defaultConfig: function (config) {
         return BI.extend(BI.TextValueDownListCombo.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-text-value-down-list-combo " + (config.simple ? "bi-border-bottom" : "bi-border"),
+            baseCls: "bi-text-value-down-list-combo bi-border-radius " + (config.simple ? "bi-border-bottom" : "bi-border"),
             height: 24,
         });
     },

From 96b732a4d056442228ef1f492c44116253509e5f Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sat, 22 Oct 2022 17:24:43 +0800
Subject: [PATCH 46/97] auto upgrade version to 2.0.20221022172437

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 99dc9a0bf..b468a5c37 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221022134428",
+  "version": "2.0.20221022172437",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 3157371f890cbb457e68174dd14c9639a0b8bc93 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 22 Oct 2022 18:07:13 +0800
Subject: [PATCH 47/97] =?UTF-8?q?=E5=A2=9E=E5=8A=A0toPix=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/layer/layer.popup.js                 | 16 ++++++++--------
 src/base/single/1.text.js                     | 14 +++++++-------
 src/base/single/button/buttons/button.icon.js |  2 +-
 src/base/single/button/buttons/button.js      | 10 +++++-----
 src/base/single/html/html.js                  | 14 +++++++-------
 src/base/single/label/abstract.label.js       |  8 ++++----
 src/base/single/label/icon.label.js           |  2 +-
 src/base/single/tip/tip.toast.js              |  4 ++--
 src/base/single/tip/tip.tooltip.js            |  2 +-
 src/case/list/list.select.js                  |  2 +-
 .../tree/treeexpander/tree.expander.popup.js  |  4 ++--
 src/core/4.widget.js                          |  4 ++--
 src/core/constant/var.js                      | 19 ++++++++++++++++---
 src/core/wrapper/layout.js                    | 10 +++++-----
 src/core/wrapper/layout/layout.flow.js        |  8 ++++----
 src/core/wrapper/layout/layout.inline.js      |  8 ++++----
 .../multilayerselecttree.popup.js             |  2 +-
 .../multilayersingletree.popup.js             |  2 +-
 .../multiselect/multiselect.loader.nobar.js   |  2 +-
 src/widget/singleselect/singleselect.list.js  |  2 +-
 20 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js
index 1e768ae2c..88d11ac89 100644
--- a/src/base/layer/layer.popup.js
+++ b/src/base/layer/layer.popup.js
@@ -60,8 +60,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
         }
         this.element.css({
             "z-index": BI.zIndex_popup,
-            "min-width": BI.isNumeric(o.minWidth) ? (BI.pixFormat(o.minWidth)) : o.minWidth,
-            "max-width": BI.isNumeric(o.maxWidth) ? (BI.pixFormat(o.maxWidth)) : o.maxWidth,
+            "min-width": BI.toPix(o.minWidth),
+            "max-width": BI.toPix(o.maxWidth),
         }).bind({ click: fn });
 
         this.element.bind("mousewheel", fn);
@@ -135,11 +135,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
         var o = this.options;
         this.button_group = BI.createWidget(o.el, { type: "bi.button_group", value: o.value });
         this.button_group.element.css({
-            "min-height": BI.isNumeric(o.minHeight) ? (BI.pixFormat(o.minHeight)) : o.minHeight,
-            "padding-top": BI.pixFormat(o.innerVgap),
-            "padding-bottom": BI.pixFormat(o.innerVgap),
-            "padding-left": BI.pixFormat(o.innerHgap),
-            "padding-right": BI.pixFormat(o.innerHgap),
+            "min-height": BI.toPix(o.minHeight),
+            "padding-top": BI.toPix(o.innerVgap),
+            "padding-bottom": BI.toPix(o.innerVgap),
+            "padding-left": BI.toPix(o.innerHgap),
+            "padding-right": BI.toPix(o.innerHgap),
         });
 
         return this.button_group;
@@ -411,7 +411,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
             toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
         var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVgap;
         this.view.resetHeight ? this.view.resetHeight(resetHeight) :
-            this.view.element.css({ "max-height": BI.pixFormat(resetHeight) });
+            this.view.element.css({ "max-height": BI.toPix(resetHeight) });
     },
 
     setValue: function (selectedValues) {
diff --git a/src/base/single/1.text.js b/src/base/single/1.text.js
index 9c4244a9d..03acbc948 100644
--- a/src/base/single/1.text.js
+++ b/src/base/single/1.text.js
@@ -26,32 +26,32 @@
             var self = this, o = this.options;
             if (o.hgap + o.lgap > 0) {
                 this.element.css({
-                    "padding-left": BI.pixFormat(o.hgap + o.lgap),
+                    "padding-left": BI.toPix(o.hgap + o.lgap),
                 });
             }
             if (o.hgap + o.rgap > 0) {
                 this.element.css({
-                    "padding-right": BI.pixFormat(o.hgap + o.rgap),
+                    "padding-right": BI.toPix(o.hgap + o.rgap),
                 });
             }
             if (o.vgap + o.tgap > 0) {
                 this.element.css({
-                    "padding-top": BI.pixFormat(o.vgap + o.tgap),
+                    "padding-top": BI.toPix(o.vgap + o.tgap),
                 });
             }
             if (o.vgap + o.bgap > 0) {
                 this.element.css({
-                    "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
+                    "padding-bottom": BI.toPix(o.vgap + o.bgap),
                 });
             }
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css({ lineHeight: BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height });
+                this.element.css({ lineHeight: BI.toPix(o.height) });
             }
             if (BI.isWidthOrHeight(o.lineHeight)) {
-                this.element.css({ lineHeight: BI.isNumber(o.lineHeight) ? BI.pixFormat(o.lineHeight) : o.lineHeight });
+                this.element.css({ lineHeight: BI.toPix(o.lineHeight) });
             }
             if (BI.isWidthOrHeight(o.maxWidth)) {
-                this.element.css({ maxWidth: BI.isNumber(o.maxWidth) ? BI.pixFormat(o.maxWidth) : o.maxWidth });
+                this.element.css({ maxWidth: BI.toPix(o.maxWidth) });
             }
             this.element.css({
                 textAlign: o.textAlign,
diff --git a/src/base/single/button/buttons/button.icon.js b/src/base/single/button/buttons/button.icon.js
index 045126c38..53cccf058 100644
--- a/src/base/single/button/buttons/button.icon.js
+++ b/src/base/single/button/buttons/button.icon.js
@@ -31,7 +31,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", BI.pixFormat(o.height));
+            this.element.css("lineHeight", BI.toPix(o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js
index a8da2e32b..ca0598ec4 100644
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@@ -98,8 +98,8 @@
                     type: "bi.icon_label",
                     cls: o.loading ? loadingCls : (o.iconCls || o.icon),
                     width: this._const.iconWidth,
-                    height: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
-                    lineHeight: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
+                    height: BI.toPix(lineHeight, hasBorder ? 2 : 0),
+                    lineHeight: BI.toPix(lineHeight, hasBorder ? 2 : 0),
                     // 不设置，自定义按钮无法居中
                     iconWidth: o.iconWidth,
                     iconHeight: o.iconHeight,
@@ -120,8 +120,8 @@
                 whiteSpace: o.whiteSpace,
                 textAlign: o.textAlign,
                 textWidth: textWidth,
-                textHeight: BI.pixFormat(textHeight, hasBorder ? 2 : 0),
-                height: BI.pixFormat(lineHeight, hasBorder ? 2 : 0),
+                textHeight: BI.toPix(textHeight, hasBorder ? 2 : 0),
+                height: BI.toPix(lineHeight, hasBorder ? 2 : 0),
                 value: o.value,
                 title: null,
             });
@@ -163,7 +163,7 @@
             });
 
             if (o.minWidth > 0) {
-                this.element.css({ "min-width": BI.pixFormat(o.minWidth) });
+                this.element.css({ "min-width": BI.toPix(o.minWidth) });
             }
         },
 
diff --git a/src/base/single/html/html.js b/src/base/single/html/html.js
index 84c980427..f6be1ff27 100644
--- a/src/base/single/html/html.js
+++ b/src/base/single/html/html.js
@@ -25,35 +25,35 @@ BI.Html = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (o.hgap + o.lgap > 0) {
             this.element.css({
-                "padding-left": BI.pixFormat(o.hgap + o.lgap),
+                "padding-left": BI.toPix(o.hgap + o.lgap),
             });
         }
         if (o.hgap + o.rgap > 0) {
             this.element.css({
-                "padding-right": BI.pixFormat(o.hgap + o.rgap),
+                "padding-right": BI.toPix(o.hgap + o.rgap),
             });
         }
         if (o.vgap + o.tgap > 0) {
             this.element.css({
-                "padding-top": BI.pixFormat(o.vgap + o.tgap),
+                "padding-top": BI.toPix(o.vgap + o.tgap),
             });
         }
         if (o.vgap + o.bgap > 0) {
             this.element.css({
-                "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
+                "padding-bottom": BI.toPix(o.vgap + o.bgap),
             });
         }
         if (BI.isNumber(o.height)) {
-            this.element.css({ lineHeight: BI.pixFormat(o.height) });
+            this.element.css({ lineHeight: BI.toPix(o.height) });
         }
         if (BI.isNumber(o.lineHeight)) {
-            this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
+            this.element.css({ lineHeight: BI.toPix(o.lineHeight) });
         }
         if (BI.isWidthOrHeight(o.maxWidth)) {
             this.element.css({ maxWidth: o.maxWidth });
         }
         if (BI.isNumber(o.maxWidth)) {
-            this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) })
+            this.element.css({ maxWidth: BI.toPix(o.maxWidth) })
         }
         this.element.css({
             textAlign: o.textAlign,
diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index 19fc0322d..041be7a3e 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -109,7 +109,7 @@
                 }
                 if (BI.isNumber(o.height) && o.height > 0) { // 1.4
                     this.element.css({
-                        "line-height": BI.pixFormat(o.height),
+                        "line-height": BI.toPix(o.height),
                     });
                     json.textAlign = o.textAlign;
                     delete json.maxWidth;
@@ -183,7 +183,7 @@
             }
             if (BI.isNumber(o.height) && o.height > 0) { // 1.8
                 this.element.css({
-                    "line-height": BI.pixFormat(o.height),
+                    "line-height": BI.toPix(o.height),
                 });
                 json.textAlign = o.textAlign;
                 delete json.maxWidth;
@@ -263,7 +263,7 @@
                 if (BI.isNumber(o.height) && o.height > 0) { // 2.3
                     if (o.whiteSpace !== "normal") {
                         this.element.css({
-                            "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
+                            "line-height": BI.toPix(o.height - (o.vgap * 2)),
                         });
                     }
                     delete json.maxWidth;
@@ -325,7 +325,7 @@
             if (BI.isNumber(o.height) && o.height > 0) {
                 if (o.whiteSpace !== "normal") {
                     this.element.css({
-                        "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
+                        "line-height": BI.toPix(o.height - (o.vgap * 2)),
                     });
                 }
                 delete json.maxWidth;
diff --git a/src/base/single/label/icon.label.js b/src/base/single/label/icon.label.js
index 53a400a05..e14b12685 100644
--- a/src/base/single/label/icon.label.js
+++ b/src/base/single/label/icon.label.js
@@ -29,7 +29,7 @@ BI.IconLabel = BI.inherit(BI.Single, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", BI.pixFormat(o.lineHeight || o.height));
+            this.element.css("lineHeight", BI.toPix(o.lineHeight || o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/tip/tip.toast.js b/src/base/single/tip/tip.toast.js
index 18af9e8e7..128eaa093 100644
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@@ -31,8 +31,8 @@ BI.Toast = BI.inherit(BI.Tip, {
         var self = this, o = this.options, c = this._const;
         this.element.css({
             // 这里直接使用px即可
-            minWidth: BI.pixFormat(o.closable ? c.closableMinWidth : c.minWidth),
-            maxWidth: BI.pixFormat(o.closable ? c.closableMaxWidth : c.maxWidth),
+            minWidth: BI.toPix(o.closable ? c.closableMinWidth : c.minWidth),
+            maxWidth: BI.toPix(o.closable ? c.closableMaxWidth : c.maxWidth),
         });
         this.element.addClass("toast-" + o.level);
         function fn(e) {
diff --git a/src/base/single/tip/tip.tooltip.js b/src/base/single/tip/tip.tooltip.js
index aae6d8e86..28aeccf7a 100644
--- a/src/base/single/tip/tip.tooltip.js
+++ b/src/base/single/tip/tip.tooltip.js
@@ -73,7 +73,7 @@ BI.Tooltip = BI.inherit(BI.Tip, {
     },
 
     setWidth: function (width) {
-        this.element.width(BI.pixFormat(width - 2 * this._const.hgap));
+        this.element.width(BI.toPix(width - 2 * this._const.hgap));
     },
 
     setText: function (text) {
diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js
index dfb3d7c1a..11e65ff92 100644
--- a/src/case/list/list.select.js
+++ b/src/case/list/list.select.js
@@ -192,7 +192,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :
-            this.list.element.css({"max-height": BI.pixFormat(h - toolHeight)});
+            this.list.element.css({"max-height": BI.toPix(h - toolHeight)});
     },
 
     setNotSelectedValue: function () {
diff --git a/src/case/tree/treeexpander/tree.expander.popup.js b/src/case/tree/treeexpander/tree.expander.popup.js
index ada979b0e..c8c22794e 100644
--- a/src/case/tree/treeexpander/tree.expander.popup.js
+++ b/src/case/tree/treeexpander/tree.expander.popup.js
@@ -25,8 +25,8 @@
             });
 
             if (o.showLine) {
-                this.popupView.element.css("margin-left", BI.pixFormat(-offset * (o.layer + 1)));
-                this.element.css("margin-left", BI.pixFormat(offset * (o.layer + 1)));
+                this.popupView.element.css("margin-left", BI.toPix(-offset * (o.layer + 1)));
+                this.element.css("margin-left", BI.toPix(offset * (o.layer + 1)));
             }
 
             return {
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index bca87b9fc..44617d076 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -289,14 +289,14 @@
         _initElementWidth: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.width)) {
-                this.element.css("width", BI.isNumber(o.width) ? BI.pixFormat(o.width) : o.width);
+                this.element.css("width", BI.toPix(o.width));
             }
         },
 
         _initElementHeight: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height);
+                this.element.css("height", BI.toPix(o.height));
             }
         },
 
diff --git a/src/core/constant/var.js b/src/core/constant/var.js
index fc89511f5..f0a4e2db8 100644
--- a/src/core/constant/var.js
+++ b/src/core/constant/var.js
@@ -15,12 +15,13 @@ BI._.extend(BI, {
     emptyStr: "",
     pixUnit: "px",
     pixRatio: 1,
-    pixFormat: function (pix, border) {
+    // 一定返回最终的单位
+    toPix: function (pix, border) {
         if (!BI.isNumber(pix)) {
             return pix;
         }
-        if (BI.pixUnit === "px" && BI.pixRatio === 1) {
-            return (pix - (border || 0)) / BI.pixRatio + BI.pixUnit;
+        if (BI.pixUnit === "px") {
+            return (pix / BI.pixRatio - (border || 0)) + BI.pixUnit;
         }
         var length = pix / BI.pixRatio + BI.pixUnit;
         if (border > 0) {
@@ -28,6 +29,18 @@ BI._.extend(BI, {
         }
         return length;
     },
+    pixFormat: function (pix, border) {
+        if (!BI.isNumber(pix)) {
+            return pix;
+        }
+        if (BI.pixUnit === "px") {
+            return pix - (border || 0) * BI.pixRatio;
+        }
+        if (border > 0) {
+            return `calc(${pix / BI.pixRatio + BI.pixUnit} - ${border + "px"})`;
+        }
+        return pix;
+    },
     emptyFn: function () {
     },
     empty: null,
diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js
index b1ae46ba7..6b574d537 100644
--- a/src/core/wrapper/layout.js
+++ b/src/core/wrapper/layout.js
@@ -42,16 +42,16 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     _init4Margin: function () {
         if (this.options.top) {
-            this.element.css("top", BI.isNumber(this.options.top) ? BI.pixFormat(this.options.top) : this.options.top);
+            this.element.css("top", BI.toPix(this.options.top));
         }
         if (this.options.left) {
-            this.element.css("left", BI.isNumber(this.options.left) ? BI.pixFormat(this.options.left) : this.options.left);
+            this.element.css("left", BI.toPix(this.options.left));
         }
         if (this.options.bottom) {
-            this.element.css("bottom", BI.isNumber(this.options.bottom) ? BI.pixFormat(this.options.bottom) : this.options.bottom);
+            this.element.css("bottom", BI.toPix(this.options.bottom));
         }
         if (this.options.right) {
-            this.element.css("right", BI.isNumber(this.options.right) ? BI.pixFormat(this.options.right) : this.options.right);
+            this.element.css("right", BI.toPix(this.options.right));
         }
     },
 
@@ -289,7 +289,7 @@ BI.Layout = BI.inherit(BI.Widget, {
     },
 
     _optimiseGap: function (gap) {
-        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
+        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap);
     },
 
     _optimiseItemLgap: function (item) {
diff --git a/src/core/wrapper/layout/layout.flow.js b/src/core/wrapper/layout/layout.flow.js
index de14999f7..6443b7840 100644
--- a/src/core/wrapper/layout/layout.flow.js
+++ b/src/core/wrapper/layout/layout.flow.js
@@ -137,16 +137,16 @@ BI.FloatRightLayout = BI.inherit(BI.Layout, {
         var w = BI.FloatRightLayout.superclass._addElement.apply(this, arguments);
         w.element.css({position: "relative", float: "right"});
         if (BI.isNotNull(item.left)) {
-            w.element.css({left: BI.isNumber(item.left) ? BI.pixFormat(item.left) : item.left});
+            w.element.css({left: BI.toPix(item.left)});
         }
         if (BI.isNotNull(item.right)) {
-            w.element.css({right: BI.isNumber(item.right) ? BI.pixFormat(item.right) : item.right});
+            w.element.css({right: BI.toPix(item.right)});
         }
         if (BI.isNotNull(item.top)) {
-            w.element.css({top: BI.isNumber(item.top) ? BI.pixFormat(item.top) : item.top});
+            w.element.css({top: BI.toPix(item.top)});
         }
         if (BI.isNotNull(item.bottom)) {
-            w.element.css({bottom: BI.isNumber(item.bottom) ? BI.pixFormat(item.bottom) : item.bottom});
+            w.element.css({bottom: BI.toPix(item.bottom)});
         }
         if (o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item) !== 0) {
             var top = o.vgap / 2 + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item);
diff --git a/src/core/wrapper/layout/layout.inline.js b/src/core/wrapper/layout/layout.inline.js
index 661a6bf77..f3b0e2f22 100644
--- a/src/core/wrapper/layout/layout.inline.js
+++ b/src/core/wrapper/layout/layout.inline.js
@@ -47,7 +47,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
             }
         }
         if (columnSize > 0) {
-            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.pixFormat(columnSize));
+            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.toPix(columnSize));
         }
         w.element.css({
             position: "relative",
@@ -69,8 +69,8 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
                 gap += o.hgap + o.lgap + o.rgap + this._optimiseItemLgap(o.items[k]) + this._optimiseItemRgap(o.items[k]) + this._optimiseItemHgap(o.items[k]);
                 length += cz;
             }
-            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.pixFormat(length);
-            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
+            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.toPix(length);
+            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap);
             if (columnSize === "fill") {
                 w.element.css("min-width", "calc((100% - " + length + " - " + gap + ")" + (fillCount > 1 ? "/" + fillCount : "") + ")");
             }
@@ -86,7 +86,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
         if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
             var top = o.innerVgap + o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item),
                 bottom = o.innerVgap + o.vgap + o.bgap + this._optimiseItemBgap(item) + this._optimiseItemVgap(item);
-            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.pixFormat(top + bottom);
+            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.toPix(top + bottom);
             w.element.css("height", "calc(100% - " + gap + ")");
         }
         return w;
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.popup.js b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
index 34dce3a58..fbe175af0 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.popup.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
@@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSelectTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
+        this.tree.css("min-height", BI.toPix(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multilayersingletree/multilayersingletree.popup.js b/src/widget/multilayersingletree/multilayersingletree.popup.js
index 630c38237..666bdeb88 100644
--- a/src/widget/multilayersingletree/multilayersingletree.popup.js
+++ b/src/widget/multilayersingletree/multilayersingletree.popup.js
@@ -55,7 +55,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSingleTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
+        this.tree.css("min-height", BI.toPix(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multiselect/multiselect.loader.nobar.js b/src/widget/multiselect/multiselect.loader.nobar.js
index c8e259cd3..dde974df8 100644
--- a/src/widget/multiselect/multiselect.loader.nobar.js
+++ b/src/widget/multiselect/multiselect.loader.nobar.js
@@ -173,7 +173,7 @@ BI.MultiSelectNoBarLoader = BI.inherit(BI.Widget, {
     },
 
     resetHeight: function (h) {
-        this.button_group.element.css({ "max-height": BI.pixFormat(h) });
+        this.button_group.element.css({ "max-height": BI.toPix(h) });
     },
 
     resetWidth: function () {
diff --git a/src/widget/singleselect/singleselect.list.js b/src/widget/singleselect/singleselect.list.js
index 9842eb3ea..e60ea267a 100644
--- a/src/widget/singleselect/singleselect.list.js
+++ b/src/widget/singleselect/singleselect.list.js
@@ -120,7 +120,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
 
     resetHeight: function (h) {
         this.list.resetHeight ? this.list.resetHeight(h) :
-            this.list.element.css({"max-height": BI.pixFormat(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
+            this.list.element.css({"max-height": BI.toPix(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
     },
 
     setNotSelectedValue: function () {

From 501657c9cfe83d8470a6eae5aeafee2334ccfb27 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sat, 22 Oct 2022 18:34:38 +0800
Subject: [PATCH 48/97] auto upgrade version to 2.0.20221022183431

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b468a5c37..be2ef018d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221022172437",
+  "version": "2.0.20221022183431",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From d0273e0849e22e1e62b4f6cdc77cd5de03304956 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sat, 22 Oct 2022 20:24:42 +0800
Subject: [PATCH 49/97] auto upgrade version to 2.0.20221022202435

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be2ef018d..20d118ed6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221022183431",
+  "version": "2.0.20221022202435",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 95ec11b82453f9e8a6d73858cce85012a140fce1 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Sat, 22 Oct 2022 21:11:19 +0800
Subject: [PATCH 50/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=5FinitElementHeig?=
 =?UTF-8?q?ht=E5=92=8C=5FinitElementWidth=E6=96=B9=E6=B3=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 1873e0b44..8be3a9058 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -289,14 +289,14 @@
         _initElementWidth: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.width)) {
-                this.element.css("width", BI.toPix(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)) {
-                this.element.css("height", BI.toPix(o.height));
+                this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height);
             }
         },
 

From b7e9838417994e2e54d5b86c47628fff54bfd3b8 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 22 Oct 2022 21:49:43 +0800
Subject: [PATCH 51/97] =?UTF-8?q?toPix=20=E5=92=8C=20pixFormat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/useContext.html                       |  2 ++
 src/base/layer/layer.popup.js                  | 16 ++++++++--------
 src/base/single/1.text.js                      | 14 +++++++-------
 src/base/single/button/buttons/button.icon.js  |  2 +-
 src/base/single/button/buttons/button.js       |  2 +-
 src/base/single/html/html.js                   | 14 +++++++-------
 src/base/single/label/abstract.label.js        |  8 ++++----
 src/base/single/label/icon.label.js            |  2 +-
 src/base/single/tip/tip.toast.js               |  5 ++---
 src/base/single/tip/tip.tooltip.js             |  2 +-
 src/case/colorchooser/colorchooser.js          |  4 ++--
 .../icontextvaluecombo/combo.icontextvalue.js  |  6 +++---
 .../combo.searchtextvalue.js                   |  6 +++---
 .../combo.textvaluecheck.js                    |  6 +++---
 .../combo/textvaluecombo/combo.textvalue.js    |  6 +++---
 src/case/layer/panel.js                        |  4 ++--
 .../linearsegment/button.linear.segment.js     |  2 +-
 src/case/list/list.select.js                   |  2 +-
 src/case/segment/segment.js                    |  2 +-
 .../tree/treeexpander/tree.expander.popup.js   |  4 ++--
 src/case/trigger/trigger.editor.js             |  6 +++---
 src/case/trigger/trigger.text.select.small.js  |  2 +-
 src/core/4.widget.js                           |  4 ++--
 src/core/wrapper/layout.js                     | 10 +++++-----
 src/core/wrapper/layout/layout.flow.js         |  8 ++++----
 src/core/wrapper/layout/layout.inline.js       |  8 ++++----
 src/widget/date/calendar/popup.month.js        |  2 +-
 src/widget/dynamicdate/dynamicdate.combo.js    | 10 +++++-----
 .../dynamicdate/dynamicdate.param.item.js      |  2 +-
 src/widget/dynamicdate/dynamicdate.popup.js    |  6 +++---
 .../dynamicdatetime/dynamicdatetime.combo.js   |  6 +++---
 .../dynamicdatetime/dynamicdatetime.popup.js   |  6 +++---
 src/widget/editor/editor.search.js             |  4 ++--
 src/widget/editor/editor.text.js               |  4 ++--
 src/widget/intervalslider/intervalslider.js    |  8 ++++----
 .../multilayerselecttree.combo.js              | 16 ++++++++--------
 .../multilayerselecttree.popup.js              |  2 +-
 .../multilayersingletree.combo.js              | 12 ++++++------
 .../multilayersingletree.popup.js              |  2 +-
 src/widget/multiselect/multiselect.combo.js    |  2 +-
 .../multiselect/multiselect.combo.nobar.js     |  2 +-
 .../multiselect/multiselect.insert.combo.js    |  2 +-
 .../multiselect.insert.combo.nobar.js          |  2 +-
 src/widget/multitree/multi.tree.combo.js       |  2 +-
 .../multitree/multi.tree.insert.combo.js       |  2 +-
 src/widget/multitree/multi.tree.list.combo.js  |  2 +-
 src/widget/numbereditor/number.editor.js       |  4 ++--
 src/widget/numberinterval/numberinterval.js    | 18 +++++++++---------
 .../multitextvalue.combo.search.js             |  2 +-
 src/widget/selecttree/selecttree.combo.js      |  6 +++---
 src/widget/singleselect/singleselect.combo.js  |  2 +-
 .../singleselect/singleselect.insert.combo.js  |  2 +-
 src/widget/singleselect/singleselect.list.js   |  2 +-
 src/widget/singleslider/singleslider.js        |  4 ++--
 src/widget/singleslider/singleslider.label.js  |  2 +-
 src/widget/singletree/singletree.combo.js      |  6 +++---
 .../combo.textvaluedownlist.js                 |  6 +++---
 src/widget/time/time.combo.js                  |  4 ++--
 src/widget/year/combo.year.js                  |  4 ++--
 src/widget/year/popup.year.js                  |  6 +++---
 src/widget/yearmonth/card.static.yearmonth.js  |  2 +-
 src/widget/yearmonth/combo.yearmonth.js        |  6 +++---
 src/widget/yearmonth/popup.yearmonth.js        |  6 +++---
 src/widget/yearquarter/combo.yearquarter.js    |  4 ++--
 src/widget/yearquarter/popup.yearquarter.js    |  6 +++---
 65 files changed, 167 insertions(+), 166 deletions(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index 00bc3a455..723152250 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -56,6 +56,8 @@
         return "calc(var(--css-scale) * " + pix + "px)";
     };
 
+    BI.toPix = BI.pixFormat;
+
     var Child = BI.inherit(BI.Widget, {
         render: function () {
             var label;
diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js
index 88d11ac89..dbeb7e8fe 100644
--- a/src/base/layer/layer.popup.js
+++ b/src/base/layer/layer.popup.js
@@ -60,8 +60,8 @@ BI.PopupView = BI.inherit(BI.Widget, {
         }
         this.element.css({
             "z-index": BI.zIndex_popup,
-            "min-width": BI.toPix(o.minWidth),
-            "max-width": BI.toPix(o.maxWidth),
+            "min-width": BI.pixFormat(o.minWidth),
+            "max-width": BI.pixFormat(o.maxWidth),
         }).bind({ click: fn });
 
         this.element.bind("mousewheel", fn);
@@ -135,11 +135,11 @@ BI.PopupView = BI.inherit(BI.Widget, {
         var o = this.options;
         this.button_group = BI.createWidget(o.el, { type: "bi.button_group", value: o.value });
         this.button_group.element.css({
-            "min-height": BI.toPix(o.minHeight),
-            "padding-top": BI.toPix(o.innerVgap),
-            "padding-bottom": BI.toPix(o.innerVgap),
-            "padding-left": BI.toPix(o.innerHgap),
-            "padding-right": BI.toPix(o.innerHgap),
+            "min-height": BI.pixFormat(o.minHeight),
+            "padding-top": BI.pixFormat(o.innerVgap),
+            "padding-bottom": BI.pixFormat(o.innerVgap),
+            "padding-left": BI.pixFormat(o.innerHgap),
+            "padding-right": BI.pixFormat(o.innerHgap),
         });
 
         return this.button_group;
@@ -411,7 +411,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
             toolHeight = ((this.tool && this.tool.attr("height")) || 24) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
         var resetHeight = h - tbHeight - tabHeight - toolHeight - 2 * this.options.innerVgap;
         this.view.resetHeight ? this.view.resetHeight(resetHeight) :
-            this.view.element.css({ "max-height": BI.toPix(resetHeight) });
+            this.view.element.css({ "max-height": BI.pixFormat(resetHeight) });
     },
 
     setValue: function (selectedValues) {
diff --git a/src/base/single/1.text.js b/src/base/single/1.text.js
index 03acbc948..f31ebfe43 100644
--- a/src/base/single/1.text.js
+++ b/src/base/single/1.text.js
@@ -26,32 +26,32 @@
             var self = this, o = this.options;
             if (o.hgap + o.lgap > 0) {
                 this.element.css({
-                    "padding-left": BI.toPix(o.hgap + o.lgap),
+                    "padding-left": BI.pixFormat(o.hgap + o.lgap),
                 });
             }
             if (o.hgap + o.rgap > 0) {
                 this.element.css({
-                    "padding-right": BI.toPix(o.hgap + o.rgap),
+                    "padding-right": BI.pixFormat(o.hgap + o.rgap),
                 });
             }
             if (o.vgap + o.tgap > 0) {
                 this.element.css({
-                    "padding-top": BI.toPix(o.vgap + o.tgap),
+                    "padding-top": BI.pixFormat(o.vgap + o.tgap),
                 });
             }
             if (o.vgap + o.bgap > 0) {
                 this.element.css({
-                    "padding-bottom": BI.toPix(o.vgap + o.bgap),
+                    "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
                 });
             }
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css({ lineHeight: BI.toPix(o.height) });
+                this.element.css({ lineHeight: BI.pixFormat(o.height) });
             }
             if (BI.isWidthOrHeight(o.lineHeight)) {
-                this.element.css({ lineHeight: BI.toPix(o.lineHeight) });
+                this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
             }
             if (BI.isWidthOrHeight(o.maxWidth)) {
-                this.element.css({ maxWidth: BI.toPix(o.maxWidth) });
+                this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) });
             }
             this.element.css({
                 textAlign: o.textAlign,
diff --git a/src/base/single/button/buttons/button.icon.js b/src/base/single/button/buttons/button.icon.js
index 53cccf058..045126c38 100644
--- a/src/base/single/button/buttons/button.icon.js
+++ b/src/base/single/button/buttons/button.icon.js
@@ -31,7 +31,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", BI.toPix(o.height));
+            this.element.css("lineHeight", BI.pixFormat(o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/button/buttons/button.js b/src/base/single/button/buttons/button.js
index ca0598ec4..39cfffda3 100644
--- a/src/base/single/button/buttons/button.js
+++ b/src/base/single/button/buttons/button.js
@@ -163,7 +163,7 @@
             });
 
             if (o.minWidth > 0) {
-                this.element.css({ "min-width": BI.toPix(o.minWidth) });
+                this.element.css({ "min-width": BI.pixFormat(o.minWidth) });
             }
         },
 
diff --git a/src/base/single/html/html.js b/src/base/single/html/html.js
index f6be1ff27..84c980427 100644
--- a/src/base/single/html/html.js
+++ b/src/base/single/html/html.js
@@ -25,35 +25,35 @@ BI.Html = BI.inherit(BI.Single, {
         var self = this, o = this.options;
         if (o.hgap + o.lgap > 0) {
             this.element.css({
-                "padding-left": BI.toPix(o.hgap + o.lgap),
+                "padding-left": BI.pixFormat(o.hgap + o.lgap),
             });
         }
         if (o.hgap + o.rgap > 0) {
             this.element.css({
-                "padding-right": BI.toPix(o.hgap + o.rgap),
+                "padding-right": BI.pixFormat(o.hgap + o.rgap),
             });
         }
         if (o.vgap + o.tgap > 0) {
             this.element.css({
-                "padding-top": BI.toPix(o.vgap + o.tgap),
+                "padding-top": BI.pixFormat(o.vgap + o.tgap),
             });
         }
         if (o.vgap + o.bgap > 0) {
             this.element.css({
-                "padding-bottom": BI.toPix(o.vgap + o.bgap),
+                "padding-bottom": BI.pixFormat(o.vgap + o.bgap),
             });
         }
         if (BI.isNumber(o.height)) {
-            this.element.css({ lineHeight: BI.toPix(o.height) });
+            this.element.css({ lineHeight: BI.pixFormat(o.height) });
         }
         if (BI.isNumber(o.lineHeight)) {
-            this.element.css({ lineHeight: BI.toPix(o.lineHeight) });
+            this.element.css({ lineHeight: BI.pixFormat(o.lineHeight) });
         }
         if (BI.isWidthOrHeight(o.maxWidth)) {
             this.element.css({ maxWidth: o.maxWidth });
         }
         if (BI.isNumber(o.maxWidth)) {
-            this.element.css({ maxWidth: BI.toPix(o.maxWidth) })
+            this.element.css({ maxWidth: BI.pixFormat(o.maxWidth) })
         }
         this.element.css({
             textAlign: o.textAlign,
diff --git a/src/base/single/label/abstract.label.js b/src/base/single/label/abstract.label.js
index 041be7a3e..19fc0322d 100644
--- a/src/base/single/label/abstract.label.js
+++ b/src/base/single/label/abstract.label.js
@@ -109,7 +109,7 @@
                 }
                 if (BI.isNumber(o.height) && o.height > 0) { // 1.4
                     this.element.css({
-                        "line-height": BI.toPix(o.height),
+                        "line-height": BI.pixFormat(o.height),
                     });
                     json.textAlign = o.textAlign;
                     delete json.maxWidth;
@@ -183,7 +183,7 @@
             }
             if (BI.isNumber(o.height) && o.height > 0) { // 1.8
                 this.element.css({
-                    "line-height": BI.toPix(o.height),
+                    "line-height": BI.pixFormat(o.height),
                 });
                 json.textAlign = o.textAlign;
                 delete json.maxWidth;
@@ -263,7 +263,7 @@
                 if (BI.isNumber(o.height) && o.height > 0) { // 2.3
                     if (o.whiteSpace !== "normal") {
                         this.element.css({
-                            "line-height": BI.toPix(o.height - (o.vgap * 2)),
+                            "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
                         });
                     }
                     delete json.maxWidth;
@@ -325,7 +325,7 @@
             if (BI.isNumber(o.height) && o.height > 0) {
                 if (o.whiteSpace !== "normal") {
                     this.element.css({
-                        "line-height": BI.toPix(o.height - (o.vgap * 2)),
+                        "line-height": BI.pixFormat(o.height - (o.vgap * 2)),
                     });
                 }
                 delete json.maxWidth;
diff --git a/src/base/single/label/icon.label.js b/src/base/single/label/icon.label.js
index e14b12685..53a400a05 100644
--- a/src/base/single/label/icon.label.js
+++ b/src/base/single/label/icon.label.js
@@ -29,7 +29,7 @@ BI.IconLabel = BI.inherit(BI.Single, {
             height: o.iconHeight,
         });
         if (BI.isNumber(o.height) && o.height > 0 && BI.isNull(o.iconWidth) && BI.isNull(o.iconHeight)) {
-            this.element.css("lineHeight", BI.toPix(o.lineHeight || o.height));
+            this.element.css("lineHeight", BI.pixFormat(o.lineHeight || o.height));
             BI.createWidget({
                 type: "bi.default",
                 element: this,
diff --git a/src/base/single/tip/tip.toast.js b/src/base/single/tip/tip.toast.js
index 128eaa093..e347ae062 100644
--- a/src/base/single/tip/tip.toast.js
+++ b/src/base/single/tip/tip.toast.js
@@ -30,9 +30,8 @@ BI.Toast = BI.inherit(BI.Tip, {
     render: function () {
         var self = this, o = this.options, c = this._const;
         this.element.css({
-            // 这里直接使用px即可
-            minWidth: BI.toPix(o.closable ? c.closableMinWidth : c.minWidth),
-            maxWidth: BI.toPix(o.closable ? c.closableMaxWidth : c.maxWidth),
+            minWidth: BI.pixFormat(o.closable ? c.closableMinWidth : c.minWidth),
+            maxWidth: BI.pixFormat(o.closable ? c.closableMaxWidth : c.maxWidth),
         });
         this.element.addClass("toast-" + o.level);
         function fn(e) {
diff --git a/src/base/single/tip/tip.tooltip.js b/src/base/single/tip/tip.tooltip.js
index 28aeccf7a..aae6d8e86 100644
--- a/src/base/single/tip/tip.tooltip.js
+++ b/src/base/single/tip/tip.tooltip.js
@@ -73,7 +73,7 @@ BI.Tooltip = BI.inherit(BI.Tip, {
     },
 
     setWidth: function (width) {
-        this.element.width(BI.toPix(width - 2 * this._const.hgap));
+        this.element.width(BI.pixFormat(width - 2 * this._const.hgap));
     },
 
     setText: function (text) {
diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js
index e60ee42f9..218ea56b0 100644
--- a/src/case/colorchooser/colorchooser.js
+++ b/src/case/colorchooser/colorchooser.js
@@ -36,8 +36,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
                     self.trigger = _ref;
                 },
                 value: o.value,
-                width: o.el.type ? o.width : BI.pixFormat(o.width, 2),
-                height: o.el.type ? o.height : BI.pixFormat(o.height, 2)
+                width: o.el.type ? o.width : BI.toPix(o.width, 2),
+                height: o.el.type ? o.height : BI.toPix(o.height, 2)
             }, o.el),
             popup: () => ({
                 el: BI.extend({
diff --git a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
index 704c80f14..9a920240a 100644
--- a/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
+++ b/src/case/combo/icontextvaluecombo/combo.icontextvalue.js
@@ -26,7 +26,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
             type: "bi.select_icon_text_trigger",
             cls: "icon-text-value-trigger",
             items: o.items,
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             text: o.text,
             iconCls: o.iconCls,
             value: o.value,
@@ -54,8 +54,8 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
         });
         this.textIconCombo = BI.createWidget({
             type: "bi.combo",
-            height: BI.pixFormat(o.height, 2),
-            width: BI.pixFormat(o.width, 2),
+            height: BI.toPix(o.height, 2),
+            width: BI.toPix(o.width, 2),
             element: this,
             container: o.container,
             direction: o.direction,
diff --git a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
index d394a6017..63f73944a 100644
--- a/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
+++ b/src/case/combo/searchtextvaluecombo/combo.searchtextvalue.js
@@ -28,8 +28,8 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
             cls: (o.simple ? "bi-border-bottom" : "bi-border bi-border-radius") + " bi-focus-shadow",
             container: o.container,
             adjustLength: 2,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
-            width: BI.pixFormat(o.width, 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
+            width: BI.toPix(o.width, 2),
             ref: function () {
                 self.combo = this;
             },
@@ -41,7 +41,7 @@ BI.SearchTextValueCombo = BI.inherit(BI.Widget, {
                     self.trigger = this;
                 },
                 items: o.items,
-                height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+                height: BI.toPix(o.height, o.simple ? 1 : 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
diff --git a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
index 12c300f22..9c5f0d0fc 100644
--- a/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
+++ b/src/case/combo/textvaluecheckcombo/combo.textvaluecheck.js
@@ -27,7 +27,7 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
             type: "bi.select_text_trigger",
             cls: "text-value-trigger",
             items: o.items,
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             text: o.text,
             value: o.value
         });
@@ -50,8 +50,8 @@ BI.TextValueCheckCombo = BI.inherit(BI.Widget, {
             container: o.container,
             direction: o.direction,
             element: this,
-            width: BI.pixFormat(o.width, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.width, 2),
+            height: BI.toPix(o.height, 2),
             adjustLength: 2,
             el: this.trigger,
             popup: {
diff --git a/src/case/combo/textvaluecombo/combo.textvalue.js b/src/case/combo/textvaluecombo/combo.textvalue.js
index 78cb6fc24..1128f4ed8 100644
--- a/src/case/combo/textvaluecombo/combo.textvalue.js
+++ b/src/case/combo/textvaluecombo/combo.textvalue.js
@@ -55,7 +55,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
             ref: ref => this.trigger = ref,
             cls: "text-value-trigger",
             items: o.items,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
             value: o.value,
             title,
@@ -116,8 +116,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
 
         return {
             type: "bi.combo",
-            height: BI.pixFormat(o.height, 2),
-            width: BI.pixFormat(o.width, 2),
+            height: BI.toPix(o.height, 2),
+            width: BI.toPix(o.width, 2),
             ref: ref => this.combo = ref,
             container: o.container,
             direction: o.direction,
diff --git a/src/case/layer/panel.js b/src/case/layer/panel.js
index 45f5cbf79..5c41e35d9 100644
--- a/src/case/layer/panel.js
+++ b/src/case/layer/panel.js
@@ -59,7 +59,7 @@ BI.Panel = BI.inherit(BI.Widget, {
             el: {
                 type: "bi.left_right_vertical_adapt",
                 cls: "panel-title bi-header-background bi-border-bottom",
-                height: BI.pixFormat(o.titleHeight, 1),
+                height: BI.toPix(o.titleHeight, 1),
                 items: {
                     left: [this.text],
                     right: [this.button_group]
@@ -67,7 +67,7 @@ BI.Panel = BI.inherit(BI.Widget, {
                 lhgap: 10,
                 rhgap: 10
             },
-            height: BI.pixFormat(o.titleHeight, 1)
+            height: BI.toPix(o.titleHeight, 1)
         };
     },
 
diff --git a/src/case/linearsegment/button.linear.segment.js b/src/case/linearsegment/button.linear.segment.js
index d6c5abe5d..c9954925c 100644
--- a/src/case/linearsegment/button.linear.segment.js
+++ b/src/case/linearsegment/button.linear.segment.js
@@ -15,7 +15,7 @@ BI.LinearSegmentButton = BI.inherit(BI.BasicButton, {
             type: "bi.label",
             text: o.text,
             height: o.height,
-            textHeight: BI.pixFormat(o.height, 2),
+            textHeight: BI.toPix(o.height, 2),
             value: o.value,
             hgap: o.hgap,
             ref: function () {
diff --git a/src/case/list/list.select.js b/src/case/list/list.select.js
index 11e65ff92..dfb3d7c1a 100644
--- a/src/case/list/list.select.js
+++ b/src/case/list/list.select.js
@@ -192,7 +192,7 @@ BI.SelectList = BI.inherit(BI.Widget, {
     resetHeight: function (h) {
         var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
         this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :
-            this.list.element.css({"max-height": BI.toPix(h - toolHeight)});
+            this.list.element.css({"max-height": BI.pixFormat(h - toolHeight)});
     },
 
     setNotSelectedValue: function () {
diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js
index 55d8d18db..dac7754d1 100644
--- a/src/case/segment/segment.js
+++ b/src/case/segment/segment.js
@@ -22,7 +22,7 @@ BI.Segment = BI.inherit(BI.Widget, {
             value: o.value,
             items: BI.createItems(o.items, {
                 type: "bi.segment_button",
-                height: BI.pixFormat(o.height, 2),
+                height: BI.toPix(o.height, 2),
                 whiteSpace: o.whiteSpace
             }),
             layout: [
diff --git a/src/case/tree/treeexpander/tree.expander.popup.js b/src/case/tree/treeexpander/tree.expander.popup.js
index c8c22794e..ada979b0e 100644
--- a/src/case/tree/treeexpander/tree.expander.popup.js
+++ b/src/case/tree/treeexpander/tree.expander.popup.js
@@ -25,8 +25,8 @@
             });
 
             if (o.showLine) {
-                this.popupView.element.css("margin-left", BI.toPix(-offset * (o.layer + 1)));
-                this.element.css("margin-left", BI.toPix(offset * (o.layer + 1)));
+                this.popupView.element.css("margin-left", BI.pixFormat(-offset * (o.layer + 1)));
+                this.element.css("margin-left", BI.pixFormat(offset * (o.layer + 1)));
             }
 
             return {
diff --git a/src/case/trigger/trigger.editor.js b/src/case/trigger/trigger.editor.js
index 7b2c39e3c..5bdcc8f56 100644
--- a/src/case/trigger/trigger.editor.js
+++ b/src/case/trigger/trigger.editor.js
@@ -24,7 +24,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
         var self = this, o = this.options, c = this._const;
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             value: o.value,
             validationChecker: o.validationChecker,
             quitChecker: o.quitChecker,
@@ -57,7 +57,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
         BI.createWidget({
             element: this,
             type: "bi.horizontal_fill",
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             items: [
                 {
                     el: this.editor,
@@ -65,7 +65,7 @@ BI.EditorTrigger = BI.inherit(BI.Trigger, {
                 }, {
                     el: {
                         type: "bi.trigger_icon_button",
-                        width: o.triggerWidth || BI.pixFormat(o.height, 2)
+                        width: o.triggerWidth || BI.toPix(o.height, 2)
                     },
                     width: ""
                 }
diff --git a/src/case/trigger/trigger.text.select.small.js b/src/case/trigger/trigger.text.select.small.js
index 8e81a7ac7..adbd5603c 100644
--- a/src/case/trigger/trigger.text.select.small.js
+++ b/src/case/trigger/trigger.text.select.small.js
@@ -20,7 +20,7 @@ BI.SmallSelectTextTrigger = BI.inherit(BI.Trigger, {
         this.trigger = BI.createWidget({
             type: "bi.small_text_trigger",
             element: this,
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             text: obj.text,
             cls: obj.cls,
             textHgap: o.textHgap,
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 44617d076..f9e27d296 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -289,14 +289,14 @@
         _initElementWidth: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.width)) {
-                this.element.css("width", BI.toPix(o.width));
+                this.element.css("width", BI.pixFormat(o.width));
             }
         },
 
         _initElementHeight: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css("height", BI.toPix(o.height));
+                this.element.css("height", BI.pixFormat(o.height));
             }
         },
 
diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js
index 6b574d537..8ca284d30 100644
--- a/src/core/wrapper/layout.js
+++ b/src/core/wrapper/layout.js
@@ -42,16 +42,16 @@ BI.Layout = BI.inherit(BI.Widget, {
 
     _init4Margin: function () {
         if (this.options.top) {
-            this.element.css("top", BI.toPix(this.options.top));
+            this.element.css("top", BI.pixFormat(this.options.top));
         }
         if (this.options.left) {
-            this.element.css("left", BI.toPix(this.options.left));
+            this.element.css("left", BI.pixFormat(this.options.left));
         }
         if (this.options.bottom) {
-            this.element.css("bottom", BI.toPix(this.options.bottom));
+            this.element.css("bottom", BI.pixFormat(this.options.bottom));
         }
         if (this.options.right) {
-            this.element.css("right", BI.toPix(this.options.right));
+            this.element.css("right", BI.pixFormat(this.options.right));
         }
     },
 
@@ -289,7 +289,7 @@ BI.Layout = BI.inherit(BI.Widget, {
     },
 
     _optimiseGap: function (gap) {
-        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap);
+        return (gap > 0 && gap < 1) ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
     },
 
     _optimiseItemLgap: function (item) {
diff --git a/src/core/wrapper/layout/layout.flow.js b/src/core/wrapper/layout/layout.flow.js
index 6443b7840..13b9fdb54 100644
--- a/src/core/wrapper/layout/layout.flow.js
+++ b/src/core/wrapper/layout/layout.flow.js
@@ -137,16 +137,16 @@ BI.FloatRightLayout = BI.inherit(BI.Layout, {
         var w = BI.FloatRightLayout.superclass._addElement.apply(this, arguments);
         w.element.css({position: "relative", float: "right"});
         if (BI.isNotNull(item.left)) {
-            w.element.css({left: BI.toPix(item.left)});
+            w.element.css({left: BI.pixFormat(item.left)});
         }
         if (BI.isNotNull(item.right)) {
-            w.element.css({right: BI.toPix(item.right)});
+            w.element.css({right: BI.pixFormat(item.right)});
         }
         if (BI.isNotNull(item.top)) {
-            w.element.css({top: BI.toPix(item.top)});
+            w.element.css({top: BI.pixFormat(item.top)});
         }
         if (BI.isNotNull(item.bottom)) {
-            w.element.css({bottom: BI.toPix(item.bottom)});
+            w.element.css({bottom: BI.pixFormat(item.bottom)});
         }
         if (o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item) !== 0) {
             var top = o.vgap / 2 + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item);
diff --git a/src/core/wrapper/layout/layout.inline.js b/src/core/wrapper/layout/layout.inline.js
index f3b0e2f22..661a6bf77 100644
--- a/src/core/wrapper/layout/layout.inline.js
+++ b/src/core/wrapper/layout/layout.inline.js
@@ -47,7 +47,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
             }
         }
         if (columnSize > 0) {
-            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.toPix(columnSize));
+            w.element.width(columnSize < 1 ? ((columnSize * 100).toFixed(1) + "%") : BI.pixFormat(columnSize));
         }
         w.element.css({
             position: "relative",
@@ -69,8 +69,8 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
                 gap += o.hgap + o.lgap + o.rgap + this._optimiseItemLgap(o.items[k]) + this._optimiseItemRgap(o.items[k]) + this._optimiseItemHgap(o.items[k]);
                 length += cz;
             }
-            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.toPix(length);
-            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.toPix(gap);
+            length = length > 0 && length < 1 ? (length * 100).toFixed(1) + "%" : BI.pixFormat(length);
+            gap = gap > 0 && gap < 1 ? (gap * 100).toFixed(1) + "%" : BI.pixFormat(gap);
             if (columnSize === "fill") {
                 w.element.css("min-width", "calc((100% - " + length + " - " + gap + ")" + (fillCount > 1 ? "/" + fillCount : "") + ")");
             }
@@ -86,7 +86,7 @@ BI.InlineLayout = BI.inherit(BI.Layout, {
         if (o.verticalAlign === BI.VerticalAlign.Stretch && BI.isNull(item.height)) {
             var top = o.innerVgap + o.vgap + o.tgap + this._optimiseItemTgap(item) + this._optimiseItemVgap(item),
                 bottom = o.innerVgap + o.vgap + o.bgap + this._optimiseItemBgap(item) + this._optimiseItemVgap(item);
-            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.toPix(top + bottom);
+            var gap = (top + bottom) > 0 && (top + bottom) < 1 ? ((top + bottom) * 100).toFixed(1) + "%" : BI.pixFormat(top + bottom);
             w.element.css("height", "calc(100% - " + gap + ")");
         }
         return w;
diff --git a/src/widget/date/calendar/popup.month.js b/src/widget/date/calendar/popup.month.js
index 911f578a1..402c6ffc2 100644
--- a/src/widget/date/calendar/popup.month.js
+++ b/src/widget/date/calendar/popup.month.js
@@ -68,7 +68,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.toPix(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
                     width: 30,
                     value: td,
                     text: td,
diff --git a/src/widget/dynamicdate/dynamicdate.combo.js b/src/widget/dynamicdate/dynamicdate.combo.js
index 4508f8e50..3219fb298 100644
--- a/src/widget/dynamicdate/dynamicdate.combo.js
+++ b/src/widget/dynamicdate/dynamicdate.combo.js
@@ -50,13 +50,13 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                     el: {
                         type: "bi.horizontal_fill",
                         columnSize: [this.constants.iconWidth, "fill"],
-                        height: BI.pixFormat(opts.height, border),
+                        height: BI.toPix(opts.height, border),
                         items: [{
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-change-h-font",
-                                width: BI.pixFormat(opts.height, border),
-                                height: BI.pixFormat(opts.height, border),
+                                width: BI.toPix(opts.height, border),
+                                height: BI.toPix(opts.height, border),
                                 ref: function () {
                                     self.changeIcon = this;
                                 }
@@ -69,8 +69,8 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                             format: opts.format,
                             allowEdit: opts.allowEdit,
                             watermark: opts.watermark,
-                            iconWidth: BI.pixFormat(opts.height, border),
-                            height: BI.pixFormat(opts.height, border),
+                            iconWidth: BI.toPix(opts.height, border),
+                            height: BI.toPix(opts.height, border),
                             value: opts.value,
                             ref: function () {
                                 self.trigger = this;
diff --git a/src/widget/dynamicdate/dynamicdate.param.item.js b/src/widget/dynamicdate/dynamicdate.param.item.js
index 26c1ad101..ed8c4dea0 100644
--- a/src/widget/dynamicdate/dynamicdate.param.item.js
+++ b/src/widget/dynamicdate/dynamicdate.param.item.js
@@ -21,7 +21,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                 el: {
                     type: "bi.sign_editor",
                     cls: "bi-border bi-focus-shadow bi-border-radius",
-                    height: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 2),
+                    height: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 2),
                     validationChecker: function (v) {
                         return BI.isNaturalNumber(v);
                     },
diff --git a/src/widget/dynamicdate/dynamicdate.popup.js b/src/widget/dynamicdate/dynamicdate.popup.js
index 843980eda..1f0967e58 100644
--- a/src/widget/dynamicdate/dynamicdate.popup.js
+++ b/src/widget/dynamicdate/dynamicdate.popup.js
@@ -26,7 +26,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                         cls: "bi-high-light bi-split-top",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,
                             action: function () {
@@ -37,7 +37,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
                         shadow: true,
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         disabled: this._checkTodayValid(),
                         ref: function () {
@@ -52,7 +52,7 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 5077d7866..ffb4b6429 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -50,13 +50,13 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                     el: {
                         type: "bi.horizontal_fill",
                         columnSize: [this.constants.iconWidth, "fill"],
-                        height: BI.pixFormat(opts.height, border),
+                        height: BI.toPix(opts.height, border),
                         items: [{
                             el: {
                                 type: "bi.icon_button",
                                 cls: "bi-trigger-icon-button date-change-h-font",
                                 width: this.constants.iconWidth,
-                                height: BI.pixFormat(opts.height, border),
+                                height: BI.toPix(opts.height, border),
                                 ref: function () {
                                     self.changeIcon = this;
                                 }
@@ -70,7 +70,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                             watermark: opts.watermark,
                             format: opts.format,
                             iconWidth: this.constants.iconWidth,
-                            height: BI.pixFormat(opts.height, border),
+                            height: BI.toPix(opts.height, border),
                             value: opts.value,
                             ref: function () {
                                 self.trigger = this;
diff --git a/src/widget/dynamicdatetime/dynamicdatetime.popup.js b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
index cf57d339e..e7858ba35 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.popup.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.popup.js
@@ -25,7 +25,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -37,7 +37,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Multi_Date_Today"),
                         disabled: this._checkTodayValid(),
@@ -53,7 +53,7 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/editor/editor.search.js b/src/widget/editor/editor.search.js
index fea367c66..29e4983eb 100644
--- a/src/widget/editor/editor.search.js
+++ b/src/widget/editor/editor.search.js
@@ -20,7 +20,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget(o.el, {
             type: "bi.editor",
             simple: o.simple,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: true,
             hgap: 1,
@@ -44,7 +44,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
         });
         BI.createWidget({
             element: this,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             type: "bi.htape",
             items: [
                 {
diff --git a/src/widget/editor/editor.text.js b/src/widget/editor/editor.text.js
index c2da87b02..4525a2a7b 100644
--- a/src/widget/editor/editor.text.js
+++ b/src/widget/editor/editor.text.js
@@ -29,8 +29,8 @@ BI.TextEditor = BI.inherit(BI.Widget, {
         this.editor = BI.createWidget({
             type: "bi.editor",
             element: this,
-            width: BI.pixFormat(o.width, border),
-            height: BI.pixFormat(o.height, border),
+            width: BI.toPix(o.width, border),
+            height: BI.toPix(o.height, border),
             simple: o.simple,
             hgap: o.hgap,
             vgap: o.vgap,
diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 9f1fb51c8..0cd8b1a94 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -60,8 +60,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
-            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
+            width: BI.toPixDITOR_WIDTH, 2),
+            height: BI.toPix(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);
             }
@@ -88,8 +88,8 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
-            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
+            width: BI.toPix(c.EDITOR_WIDTH, 2),
+            height: BI.toPix(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);
             }
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.combo.js b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
index 6be90346a..9d334bffd 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.combo.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.combo.js
@@ -31,8 +31,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         if (o.allowEdit) {
             return {
                 type: "bi.absolute",
-                width: BI.pixFormat(o.width, 2),
-                height: BI.pixFormat(o.height, 2),
+                width: BI.toPix(o.width, 2),
+                height: BI.toPix(o.height, 2),
                 cls,
                 items: [
                     {
@@ -54,7 +54,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 },
                 text: o.text,
                 defaultText: o.defaultText,
-                height: BI.pixFormat(o.height, 2),
+                height: BI.toPix(o.height, 2),
                 items: o.items,
                 value: o.value,
                 tipType: o.tipType,
@@ -68,8 +68,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         return {
             type: "bi.combo",
-            width: BI.pixFormat(o.width, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.width, 2),
+            height: BI.toPix(o.height, 2),
             container: o.container,
             destroyWhenHide: o.destroyWhenHide,
             adjustLength: 2,
@@ -133,7 +133,7 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
                 watermark: o.watermark,
-                height: BI.pixFormat(o.height, 2),
+                height: BI.toPix(o.height, 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
@@ -209,8 +209,8 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
             ref: function (_ref) {
                 self.triggerBtn = _ref;
             },
-            width: BI.pixFormat(o.height, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.height, 2),
+            height: BI.toPix(o.height, 2),
             listeners: [
                 {
                     eventName: BI.TriggerIconButton.EVENT_CHANGE,
diff --git a/src/widget/multilayerselecttree/multilayerselecttree.popup.js b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
index fbe175af0..34dce3a58 100644
--- a/src/widget/multilayerselecttree/multilayerselecttree.popup.js
+++ b/src/widget/multilayerselecttree/multilayerselecttree.popup.js
@@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSelectTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", BI.toPix(o.minHeight - 10));
+        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js
index d63207f6a..74876e8d5 100644
--- a/src/widget/multilayersingletree/multilayersingletree.combo.js
+++ b/src/widget/multilayersingletree/multilayersingletree.combo.js
@@ -33,8 +33,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
         if (o.allowEdit) {
             return {
                 type: "bi.absolute",
-                width: BI.pixFormat(o.width, 2),
-                height: BI.pixFormat(o.height, 2),
+                width: BI.toPix(o.width, 2),
+                height: BI.toPix(o.height, 2),
                 cls,
                 items: [
                     {
@@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 },
                 text: o.text,
                 defaultText: o.defaultText,
-                height: BI.pixFormat(o.height, 2),
+                height: BI.toPix(o.height, 2),
                 items: o.items,
                 value: o.value,
                 tipType: o.tipType,
@@ -131,7 +131,7 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
                 items: o.items,
                 itemsCreator: o.itemsCreator,
                 valueFormatter: o.valueFormatter,
-                height: BI.pixFormat(o.height, 2),
+                height: BI.toPix(o.height, 2),
                 text: o.text,
                 defaultText: o.defaultText,
                 value: o.value,
@@ -205,8 +205,8 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
             ref: function (_ref) {
                 self.triggerBtn = _ref;
             },
-            width: BI.pixFormat(o.height, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.height, 2),
+            height: BI.toPix(o.height, 2),
             listeners: [
                 {
                     eventName: BI.TriggerIconButton.EVENT_CHANGE,
diff --git a/src/widget/multilayersingletree/multilayersingletree.popup.js b/src/widget/multilayersingletree/multilayersingletree.popup.js
index 666bdeb88..630c38237 100644
--- a/src/widget/multilayersingletree/multilayersingletree.popup.js
+++ b/src/widget/multilayersingletree/multilayersingletree.popup.js
@@ -55,7 +55,7 @@ BI.MultiLayerSingleTreePopup = BI.inherit(BI.Widget, {
             self.fireEvent(BI.MultiLayerSingleTreePopup.EVENT_CHANGE);
         });
 
-        this.tree.css("min-height", BI.toPix(o.minHeight - 10));
+        this.tree.css("min-height", BI.pixFormat(o.minHeight - 10));
     },
 
     getValue: function () {
diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js
index 807bffcdb..5651fa04f 100644
--- a/src/widget/multiselect/multiselect.combo.js
+++ b/src/widget/multiselect/multiselect.combo.js
@@ -45,7 +45,7 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
             defaultText: o.defaultText,
             masker: {
diff --git a/src/widget/multiselect/multiselect.combo.nobar.js b/src/widget/multiselect/multiselect.combo.nobar.js
index 16b24855e..1734124af 100644
--- a/src/widget/multiselect/multiselect.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.combo.nobar.js
@@ -41,7 +41,7 @@ BI.MultiSelectNoBarCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
             defaultText: o.defaultText,
             masker: {
diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js
index b473b4628..6540e0dc9 100644
--- a/src/widget/multiselect/multiselect.insert.combo.js
+++ b/src/widget/multiselect/multiselect.insert.combo.js
@@ -40,7 +40,7 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_insert_trigger",
             allowEdit: o.allowEdit,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
             watermark: o.watermark,
             defaultText: o.defaultText,
diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js
index ad47d1608..c7ff2109d 100644
--- a/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js
@@ -41,7 +41,7 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.multi_select_insert_trigger",
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             text: o.text,
             // adapter: this.popup,
             masker: {
diff --git a/src/widget/multitree/multi.tree.combo.js b/src/widget/multitree/multi.tree.combo.js
index 83b0cb741..d48e8d6db 100644
--- a/src/widget/multitree/multi.tree.combo.js
+++ b/src/widget/multitree/multi.tree.combo.js
@@ -27,7 +27,7 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
             defaultText: o.defaultText,
diff --git a/src/widget/multitree/multi.tree.insert.combo.js b/src/widget/multitree/multi.tree.insert.combo.js
index ab3922f13..c9ce5545f 100644
--- a/src/widget/multitree/multi.tree.insert.combo.js
+++ b/src/widget/multitree/multi.tree.insert.combo.js
@@ -28,7 +28,7 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.multi_select_trigger",
             allowEdit: o.allowEdit,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             text: o.text,
             defaultText: o.defaultText,
diff --git a/src/widget/multitree/multi.tree.list.combo.js b/src/widget/multitree/multi.tree.list.combo.js
index 41a3d15a8..9b82b8780 100644
--- a/src/widget/multitree/multi.tree.list.combo.js
+++ b/src/widget/multitree/multi.tree.list.combo.js
@@ -32,7 +32,7 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
             text: o.text,
             defaultText: o.defaultText,
             watermark: o.watermark,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             valueFormatter: o.valueFormatter,
             masker: {
                 offset: {
diff --git a/src/widget/numbereditor/number.editor.js b/src/widget/numbereditor/number.editor.js
index 0dead38cf..383560bf8 100644
--- a/src/widget/numbereditor/number.editor.js
+++ b/src/widget/numbereditor/number.editor.js
@@ -27,7 +27,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             simple: o.simple,
             allowBlank: o.allowBlank,
             value: o.valueFormatter(o.value),
@@ -87,7 +87,7 @@ BI.NumberEditor = BI.inherit(BI.Widget, {
         });
         BI.createWidget({
             type: "bi.htape",
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             element: this,
             items: [this.editor, {
                 el: {
diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js
index c68de273b..0c3c488bd 100644
--- a/src/widget/numberinterval/numberinterval.js
+++ b/src/widget/numberinterval/numberinterval.js
@@ -36,7 +36,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         BI.NumberInterval.superclass._init.apply(this, arguments);
         this.smallEditor = BI.createWidget({
             type: "bi.number_interval_single_editor",
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: o.allowBlank,
             value: o.min,
@@ -61,7 +61,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.smallTip = BI.createWidget({
             type: "bi.label",
             text: o.numTip,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             invisible: true
         });
         BI.createWidget({
@@ -76,7 +76,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
 
         this.bigEditor = BI.createWidget({
             type: "bi.number_interval_single_editor",
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             watermark: o.watermark,
             allowBlank: o.allowBlank,
             value: o.max,
@@ -99,7 +99,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigTip = BI.createWidget({
             type: "bi.label",
             text: o.numTip,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             invisible: true
         });
         BI.createWidget({
@@ -114,8 +114,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.smallCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-small-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-right bi-border-corner-right-radius"),
-            height: BI.pixFormat(o.height, o.simple ? 0 : 2),
-            width: BI.pixFormat(c.width, c.border),
+            height: BI.toPix(o.height, o.simple ? 0 : 2),
+            width: BI.toPix(c.width, c.border),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -134,8 +134,8 @@ BI.NumberInterval = BI.inherit(BI.Single, {
         this.bigCombo = BI.createWidget({
             type: "bi.icon_combo",
             cls: "number-interval-big-combo" + (o.simple ? "" : " bi-border-top bi-border-bottom bi-border-left bi-border-corner-left-radius"),
-            height: BI.pixFormat(o.height, o.simple ? 0 : 2),
-            width: BI.pixFormat(c.width, c.border),
+            height: BI.toPix(o.height, o.simple ? 0 : 2),
+            width: BI.toPix(c.width, c.border),
             items: [{
                 text: "(" + BI.i18nText("BI-Less_Than") + ")",
                 iconCls: "less-font",
@@ -155,7 +155,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
             type: "bi.label",
             text: BI.i18nText("BI-Basic_Value"),
             textHeight: o.height,
-            // width: BI.pixFormat(o.width, o.simple ? 0 : c.border * 2),
+            // width: BI.toPix(o.width, o.simple ? 0 : c.border * 2),
             hgap: 5,
             height: o.height,
             level: "warning",
diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
index e6259e684..4fdbf42ee 100644
--- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
+++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
@@ -35,7 +35,7 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.search_multi_select_trigger",
             text: o.text,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             // adapter: this.popup,
             masker: {
                 offset: {
diff --git a/src/widget/selecttree/selecttree.combo.js b/src/widget/selecttree/selecttree.combo.js
index 5f2147bae..5095c120d 100644
--- a/src/widget/selecttree/selecttree.combo.js
+++ b/src/widget/selecttree/selecttree.combo.js
@@ -22,7 +22,7 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget({
             type: "bi.single_tree_trigger",
             text: o.text,
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             items: o.items,
             value: o.value,
             allowClear: o.allowClear,
@@ -41,8 +41,8 @@ BI.SelectTreeCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            width: BI.pixFormat(o.width, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.width, 2),
+            height: BI.toPix(o.height, 2),
             container: o.container,
             element: this,
             adjustLength: 2,
diff --git a/src/widget/singleselect/singleselect.combo.js b/src/widget/singleselect/singleselect.combo.js
index 81140cfd0..cc4d7c261 100644
--- a/src/widget/singleselect/singleselect.combo.js
+++ b/src/widget/singleselect/singleselect.combo.js
@@ -31,7 +31,7 @@ BI.SingleSelectCombo = BI.inherit(BI.Single, {
 
         this.trigger = BI.createWidget({
             type: "bi.single_select_trigger",
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             // adapter: this.popup,
             allowNoSelect: o.allowNoSelect,
             allowEdit: o.allowEdit,
diff --git a/src/widget/singleselect/singleselect.insert.combo.js b/src/widget/singleselect/singleselect.insert.combo.js
index 039283d79..a36bf0bd6 100644
--- a/src/widget/singleselect/singleselect.insert.combo.js
+++ b/src/widget/singleselect/singleselect.insert.combo.js
@@ -32,7 +32,7 @@ BI.SingleSelectInsertCombo = BI.inherit(BI.Single, {
         this.trigger = BI.createWidget({
             type: "bi.single_select_trigger",
             watermark: o.watermark,
-            height: BI.pixFormat(o.height, o.simple ? 1 : 2),
+            height: BI.toPix(o.height, o.simple ? 1 : 2),
             allowNoSelect: o.allowNoSelect,
             allowEdit: o.allowEdit,
             // adapter: this.popup,
diff --git a/src/widget/singleselect/singleselect.list.js b/src/widget/singleselect/singleselect.list.js
index e60ea267a..9842eb3ea 100644
--- a/src/widget/singleselect/singleselect.list.js
+++ b/src/widget/singleselect/singleselect.list.js
@@ -120,7 +120,7 @@ BI.SingleSelectList = BI.inherit(BI.Widget, {
 
     resetHeight: function (h) {
         this.list.resetHeight ? this.list.resetHeight(h) :
-            this.list.element.css({"max-height": BI.toPix(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
+            this.list.element.css({"max-height": BI.pixFormat(h - (this.options.allowNoSelect ? this._constants.itemHeight : 0))});
     },
 
     setNotSelectedValue: function () {
diff --git a/src/widget/singleslider/singleslider.js b/src/widget/singleslider/singleslider.js
index 15410cb1a..8cf77b180 100644
--- a/src/widget/singleslider/singleslider.js
+++ b/src/widget/singleslider/singleslider.js
@@ -99,8 +99,8 @@ BI.SingleSlider = BI.inherit(BI.Single, {
             type: "bi.sign_text_editor",
             cls: "slider-editor-button",
             text: o.unit,
-            width: BI.pixFormat(c.EDITOR_WIDTH, 2),
-            height: BI.pixFormat(c.EDITOR_HEIGHT, 2),
+            width: BI.toPix(c.EDITOR_WIDTH, 2),
+            height: BI.toPix(c.EDITOR_HEIGHT, 2),
             allowBlank: false,
             textAlign: "center",
             validationChecker: function (v) {
diff --git a/src/widget/singleslider/singleslider.label.js b/src/widget/singleslider/singleslider.label.js
index 7e8da3019..c9ec33998 100644
--- a/src/widget/singleslider/singleslider.label.js
+++ b/src/widget/singleslider/singleslider.label.js
@@ -97,7 +97,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Single, {
         this.label = BI.createWidget({
             type: "bi.label",
             height: c.HEIGHT,
-            width: BI.pixFormat(c.EDITOR_WIDTH, 2)
+            width: BI.toPix(c.EDITOR_WIDTH, 2)
         });
 
         this._setVisible(false);
diff --git a/src/widget/singletree/singletree.combo.js b/src/widget/singletree/singletree.combo.js
index 2c9319c59..589c205c6 100644
--- a/src/widget/singletree/singletree.combo.js
+++ b/src/widget/singletree/singletree.combo.js
@@ -24,7 +24,7 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
             type: "bi.single_tree_trigger",
             text: o.text,
             defaultText: o.defaultText,
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             items: o.items,
             value: o.value,
             allowClear: o.allowClear,
@@ -43,8 +43,8 @@ BI.SingleTreeCombo = BI.inherit(BI.Widget, {
 
         this.combo = BI.createWidget({
             type: "bi.combo",
-            width: BI.pixFormat(o.width, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.width, 2),
+            height: BI.toPix(o.height, 2),
             container: o.container,
             element: this,
             adjustLength: 2,
diff --git a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
index 2a1e254fd..9410d9190 100644
--- a/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
+++ b/src/widget/textvaluedownlistcombo/combo.textvaluedownlist.js
@@ -22,7 +22,7 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
         this.trigger = BI.createWidget({
             type: "bi.down_list_select_text_trigger",
             cls: "text-value-down-list-trigger",
-            height: BI.pixFormat(o.height, 2),
+            height: BI.toPix(o.height, 2),
             items: o.items,
             text: o.text,
             value: value
@@ -33,8 +33,8 @@ BI.TextValueDownListCombo = BI.inherit(BI.Widget, {
             element: this,
             chooseType: BI.Selection.Single,
             adjustLength: 2,
-            width: BI.pixFormat(o.width, 2),
-            height: BI.pixFormat(o.height, 2),
+            width: BI.toPix(o.width, 2),
+            height: BI.toPix(o.height, 2),
             el: this.trigger,
             value: BI.isNull(value) ? [] : [value],
             items: BI.deepClone(o.items)
diff --git a/src/widget/time/time.combo.js b/src/widget/time/time.combo.js
index 1ba03c2d3..6f3f8947d 100644
--- a/src/widget/time/time.combo.js
+++ b/src/widget/time/time.combo.js
@@ -72,10 +72,10 @@
                         el: {
                             type: "bi.horizontal_fill",
                             columnSize: ["fill", this.constants.iconWidth],
-                            height: BI.pixFormat(opts.height, 2),
+                            height: BI.toPix(opts.height, 2),
                             items: [{
                                 type: "bi.time_trigger",
-                                height: BI.pixFormat(opts.height, 2),
+                                height: BI.toPix(opts.height, 2),
                                 allowEdit: opts.allowEdit,
                                 watermark: opts.watermark,
                                 format: opts.format,
diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index c9f456a1b..558a6c62a 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -23,7 +23,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: BI.pixFormat(o.height, border),
+            height: BI.toPix(o.height, border),
             value: o.value || "",
             watermark: o.watermark
         });
@@ -143,7 +143,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
                             width: this._const.iconWidth,
-                            height: BI.pixFormat(o.height, border),
+                            height: BI.toPix(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js
index 6a7c883c6..142937aa0 100644
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@@ -32,7 +32,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -43,7 +43,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                         }]
                     }, {
                         type: "bi.text_button",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Year"),
@@ -60,7 +60,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearmonth/card.static.yearmonth.js b/src/widget/yearmonth/card.static.yearmonth.js
index c0ababb9a..6ba4a94bc 100644
--- a/src/widget/yearmonth/card.static.yearmonth.js
+++ b/src/widget/yearmonth/card.static.yearmonth.js
@@ -19,7 +19,7 @@ BI.StaticYearMonthCard = BI.inherit(BI.Widget, {
                     whiteSpace: "nowrap",
                     once: false,
                     forceSelected: true,
-                    height: BI.pixFormat(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
+                    height: BI.toPix(BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, 1),
                     width: 38,
                     value: td,
                     text: td,
diff --git a/src/widget/yearmonth/combo.yearmonth.js b/src/widget/yearmonth/combo.yearmonth.js
index 23b9dfd01..4a85db0f2 100644
--- a/src/widget/yearmonth/combo.yearmonth.js
+++ b/src/widget/yearmonth/combo.yearmonth.js
@@ -22,7 +22,7 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: BI.pixFormat(o.height, border),
+            height: BI.toPix(o.height, border),
             value: o.value || "",
             watermark: o.watermark,
         });
@@ -142,8 +142,8 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
                         el: {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
-                            width: BI.pixFormat(o.height, border),
-                            height: BI.pixFormat(o.height, border),
+                            width: BI.toPix(o.height, border),
+                            height: BI.toPix(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
diff --git a/src/widget/yearmonth/popup.yearmonth.js b/src/widget/yearmonth/popup.yearmonth.js
index f1bcd11a2..1b80214d7 100644
--- a/src/widget/yearmonth/popup.yearmonth.js
+++ b/src/widget/yearmonth/popup.yearmonth.js
@@ -32,7 +32,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     items: [[{
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
@@ -44,7 +44,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Month"),
                         disabled: this._checkTodayValid(),
@@ -60,7 +60,7 @@ BI.DynamicYearMonthPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
diff --git a/src/widget/yearquarter/combo.yearquarter.js b/src/widget/yearquarter/combo.yearquarter.js
index 0292ef55b..455fd9901 100644
--- a/src/widget/yearquarter/combo.yearquarter.js
+++ b/src/widget/yearquarter/combo.yearquarter.js
@@ -25,7 +25,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             simple: o.simple,
             min: o.minDate,
             max: o.maxDate,
-            height: BI.pixFormat(o.height, border),
+            height: BI.toPix(o.height, border),
             value: o.value || "",
             watermark: o.watermark,
         });
@@ -146,7 +146,7 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
                             type: "bi.icon_button",
                             cls: "bi-trigger-icon-button",
                             width: this._consts.iconWidth,
-                            height: BI.pixFormat(o.height, border),
+                            height: BI.toPix(o.height, border),
                             ref: function () {
                                 self.changeIcon = this;
                             }
diff --git a/src/widget/yearquarter/popup.yearquarter.js b/src/widget/yearquarter/popup.yearquarter.js
index 638cebec3..6cfbc519a 100644
--- a/src/widget/yearquarter/popup.yearquarter.js
+++ b/src/widget/yearquarter/popup.yearquarter.js
@@ -27,7 +27,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
                         shadow: true,
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Basic_Clear"),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,
@@ -38,7 +38,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                     }, {
                         type: "bi.text_button",
                         cls: "bi-split-left bi-split-right bi-high-light bi-split-top",
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         shadow: true,
                         text: BI.i18nText("BI-Basic_Current_Quarter"),
                         disabled: this._checkTodayValid(),
@@ -55,7 +55,7 @@ BI.DynamicYearQuarterPopup = BI.inherit(BI.Widget, {
                         type: "bi.text_button",
                         cls: "bi-split-top bi-high-light",
                         shadow: true,
-                        textHeight: BI.pixFormat(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
+                        textHeight: BI.toPix(BI.SIZE_CONSANTS.TOOL_BAR_HEIGHT, 1),
                         text: BI.i18nText("BI-Basic_OK"),
                         listeners: [{
                             eventName: BI.TextButton.EVENT_CHANGE,

From d8bca12898377bbe5a2d3a143079d86a9ca4b0f6 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 22 Oct 2022 21:59:47 +0800
Subject: [PATCH 52/97] bugfix

---
 src/widget/intervalslider/intervalslider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 0cd8b1a94..b712a3db6 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -60,7 +60,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: BI.toPixDITOR_WIDTH, 2),
+            width: BI.toPix(DITOR_WIDTH, 2),
             height: BI.toPix(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);

From 3586eeab05f4cc9b2f6ce24aa5772f5d98c94d61 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 22 Oct 2022 22:00:54 +0800
Subject: [PATCH 53/97] bugfix

---
 src/widget/intervalslider/intervalslider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index b712a3db6..71351dd71 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -60,7 +60,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
             cls: "slider-editor-button",
             text: this.options.unit,
             allowBlank: false,
-            width: BI.toPix(DITOR_WIDTH, 2),
+            width: BI.toPix(c.EDITOR_WIDTH, 2),
             height: BI.toPix(c.EDITOR_HEIGHT, 2),
             validationChecker: function (v) {
                 return self._checkValidation(v);

From adb17ca617e058322fe316c9fbfbb3e3611bc9ae Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sat, 22 Oct 2022 22:24:36 +0800
Subject: [PATCH 54/97] auto upgrade version to 2.0.20221022222430

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20d118ed6..ed3fc28d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221022202435",
+  "version": "2.0.20221022222430",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 9d2264c4803fc2dc66c0ea6c89eaa257a186c96f Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sun, 23 Oct 2022 10:26:46 +0800
Subject: [PATCH 55/97] =?UTF-8?q?=E5=8F=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/constant/var.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/constant/var.js b/src/core/constant/var.js
index f0a4e2db8..f9acb8b30 100644
--- a/src/core/constant/var.js
+++ b/src/core/constant/var.js
@@ -16,7 +16,7 @@ BI._.extend(BI, {
     pixUnit: "px",
     pixRatio: 1,
     // 一定返回最终的单位
-    toPix: function (pix, border) {
+    pixFormat: function (pix, border) {
         if (!BI.isNumber(pix)) {
             return pix;
         }
@@ -29,7 +29,7 @@ BI._.extend(BI, {
         }
         return length;
     },
-    pixFormat: function (pix, border) {
+    toPix: function (pix, border) {
         if (!BI.isNumber(pix)) {
             return pix;
         }

From bf0621754a21b5e6433d803c02df52926abf61f1 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sun, 23 Oct 2022 10:54:37 +0800
Subject: [PATCH 56/97] auto upgrade version to 2.0.20221023105429

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ed3fc28d5..852b35c1b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221022222430",
+  "version": "2.0.20221023105429",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 5a9c3b489a5fc5fa48072d637a0a8a5d614bc1eb Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Sun, 23 Oct 2022 11:26:22 +0800
Subject: [PATCH 57/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/widget/dynamicdatetime/dynamicdatetime.combo.js       | 2 +-
 .../multiselect/search/multiselect.search.insert.pane.js  | 4 ++--
 src/widget/multiselectlist/multiselectlist.insert.js      | 7 ++-----
 .../search/singleselect.search.pane.insert.js             | 7 ++++---
 .../singleselect/search/singleselect.search.pane.js       | 6 +++---
 src/widget/singleselect/singleselectlist.insert.js        | 8 +++-----
 src/widget/year/popup.year.js                             | 4 ++--
 7 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/widget/dynamicdatetime/dynamicdatetime.combo.js b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
index 5077d7866..1006a0f85 100644
--- a/src/widget/dynamicdatetime/dynamicdatetime.combo.js
+++ b/src/widget/dynamicdatetime/dynamicdatetime.combo.js
@@ -8,7 +8,7 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     props: {
-        baseCls: "bi-dynamic-date-combo",
+        baseCls: "bi-dynamic-date--time-combo",
         height: 24,
         minDate: "1900-01-01",
         maxDate: "2099-12-31",
diff --git a/src/widget/multiselect/search/multiselect.search.insert.pane.js b/src/widget/multiselect/search/multiselect.search.insert.pane.js
index e72b64661..d459dc73a 100644
--- a/src/widget/multiselect/search/multiselect.search.insert.pane.js
+++ b/src/widget/multiselect/search/multiselect.search.insert.pane.js
@@ -54,11 +54,11 @@ BI.MultiSelectSearchInsertPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.addNotMatchTip,
-                height: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
             }, {
                 el: this.loader,
             }],
diff --git a/src/widget/multiselectlist/multiselectlist.insert.js b/src/widget/multiselectlist/multiselectlist.insert.js
index cc905c88f..8b6e8785f 100644
--- a/src/widget/multiselectlist/multiselectlist.insert.js
+++ b/src/widget/multiselectlist/multiselectlist.insert.js
@@ -74,7 +74,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
                 ref: function (ref) {
                     self.editor = ref;
                 },
-                height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
             },
             isAutoSearch: false,
             isAutoSync: false,
@@ -83,7 +82,6 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
             },
             adapter: this.adapter,
             popup: this.searcherPane,
-            height: 200,
             masker: false,
             listeners: [{
                 eventName: BI.Searcher.EVENT_START,
@@ -168,14 +166,13 @@ BI.MultiSelectInsertList = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.trigger,
-                height: o.searcherHeight || BI.SIZE_CONSANTS.TRIGGER_HEIGHT,
             }, {
                 el: this.adapter,
-                height: "fill"
             }]
         });
         BI.createWidget({
diff --git a/src/widget/singleselect/search/singleselect.search.pane.insert.js b/src/widget/singleselect/search/singleselect.search.pane.insert.js
index 95fd13cc3..6c1e49af2 100644
--- a/src/widget/singleselect/search/singleselect.search.pane.insert.js
+++ b/src/widget/singleselect/search/singleselect.search.pane.insert.js
@@ -15,7 +15,7 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
 
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectSearchInsertPane.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-select-search-pane bi-card",
+            baseCls: "bi-single-select-search-pane-insert bi-card",
             allowNoSelect: false,
             itemsCreator: BI.emptyFn,
             valueFormatter: BI.emptyFn,
@@ -53,7 +53,8 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 type: "bi.vertical",
@@ -92,4 +93,4 @@ BI.SingleSelectSearchInsertPane = BI.inherit(BI.Widget, {
 
 BI.SingleSelectSearchInsertPane.EVENT_CHANGE = "EVENT_CHANGE";
 
-BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane);
\ No newline at end of file
+BI.shortcut("bi.single_select_search_insert_pane", BI.SingleSelectSearchInsertPane);
diff --git a/src/widget/singleselect/search/singleselect.search.pane.js b/src/widget/singleselect/search/singleselect.search.pane.js
index e5364e261..ea923c5f6 100644
--- a/src/widget/singleselect/search/singleselect.search.pane.js
+++ b/src/widget/singleselect/search/singleselect.search.pane.js
@@ -53,11 +53,11 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
         });
 
         this.resizer = BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.tooltipClick,
-                height: 0
             }, {
                 el: this.loader
             }]
@@ -98,4 +98,4 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
 
 BI.SingleSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
 
-BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane);
\ No newline at end of file
+BI.shortcut("bi.single_select_search_pane", BI.SingleSelectSearchPane);
diff --git a/src/widget/singleselect/singleselectlist.insert.js b/src/widget/singleselect/singleselectlist.insert.js
index f9bce32e6..9e953468c 100644
--- a/src/widget/singleselect/singleselectlist.insert.js
+++ b/src/widget/singleselect/singleselectlist.insert.js
@@ -6,7 +6,7 @@
 BI.SingleSelectInsertList = BI.inherit(BI.Single, {
     _defaultConfig: function () {
         return BI.extend(BI.SingleSelectInsertList.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-insert-list",
+            baseCls: "bi-single-select-insert-list",
             allowNoSelect: false,
             itemsCreator: BI.emptyFn,
             itemWrapper: BI.emptyFn,
@@ -81,7 +81,6 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
             },
             adapter: this.adapter,
             popup: this.searcherPane,
-            height: 200,
             masker: false,
             value: o.value,
             listeners: [{
@@ -124,14 +123,13 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
         });
 
         BI.createWidget({
-            type: "bi.vtape",
+            type: "bi.vertical_fill",
+            rowSize: ["", "fill"],
             element: this,
             items: [{
                 el: this.trigger,
-                height: 24
             }, {
                 el: this.adapter,
-                height: "fill"
             }]
         });
         BI.createWidget({
diff --git a/src/widget/year/popup.year.js b/src/widget/year/popup.year.js
index 6a7c883c6..67d0cfa90 100644
--- a/src/widget/year/popup.year.js
+++ b/src/widget/year/popup.year.js
@@ -11,7 +11,7 @@ BI.DynamicYearPopup = BI.inherit(BI.Widget, {
     },
 
     props: {
-        baseCls: "bi-year-popup",
+        baseCls: "bi-dynamic-year-popup",
         behaviors: {},
         min: "1900-01-01", // 最小日期
         max: "2099-12-31", // 最大日期,
@@ -243,4 +243,4 @@ BI.DynamicYearPopup.BUTTON_CLEAR_EVENT_CHANGE = "BUTTON_CLEAR_EVENT_CHANGE";
 BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE = "BUTTON_lABEL_EVENT_CHANGE";
 BI.DynamicYearPopup.BUTTON_OK_EVENT_CHANGE = "BUTTON_OK_EVENT_CHANGE";
 BI.DynamicYearPopup.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);
\ No newline at end of file
+BI.shortcut("bi.dynamic_year_popup", BI.DynamicYearPopup);

From cbf5ee229588092e2116306ba5cfb2340b8310b0 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Sun, 23 Oct 2022 11:26:34 +0800
Subject: [PATCH 58/97] =?UTF-8?q?Revert=20"=E6=97=A0JIRA=20fix:=20=5FinitE?=
 =?UTF-8?q?lementHeight=E5=92=8C=5FinitElementWidth=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 95ec11b82453f9e8a6d73858cce85012a140fce1.
---
 src/core/4.widget.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index 8be3a9058..1873e0b44 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -289,14 +289,14 @@
         _initElementWidth: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.width)) {
-                this.element.css("width", BI.isNumber(o.width) ? BI.pixFormat(o.width) : o.width);
+                this.element.css("width", BI.toPix(o.width));
             }
         },
 
         _initElementHeight: function () {
             var o = this.options;
             if (BI.isWidthOrHeight(o.height)) {
-                this.element.css("height", BI.isNumber(o.height) ? BI.pixFormat(o.height) : o.height);
+                this.element.css("height", BI.toPix(o.height));
             }
         },
 

From e32469ad0a3e25ba6d726a3929093c038248b5a7 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sun, 23 Oct 2022 13:38:16 +0800
Subject: [PATCH 59/97] ThemeProvider

---
 examples/ThemeProvider.html | 99 +++++++++++++++++++++++++++++++++++++
 src/base/context.js         | 12 +++--
 2 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 examples/ThemeProvider.html

diff --git a/examples/ThemeProvider.html b/examples/ThemeProvider.html
new file mode 100644
index 000000000..7848ee406
--- /dev/null
+++ b/examples/ThemeProvider.html
@@ -0,0 +1,99 @@
+<html>
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <!-- <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>
+</head>
+<body>
+<div id="wrapper"></div>
+<script>
+    var Model = BI.inherit(BI.Model, {
+        state: function () {
+            return {
+                theme: "light"
+            };
+        },
+        childContext: ["theme"],
+
+        actions: {
+            toggle: function () {
+                this.model.theme = this.model.theme === "light" ? "dark" : "light";
+            }
+        }
+    });
+    BI.model("demo.model", Model);
+
+    var Child = BI.inherit(BI.Widget, {
+        render: function () {
+            var label;
+            return {
+                type: "bi.context",
+                context: "theme",
+                watch: function (newValue, oldValue) {
+                    label.setText(newValue);
+                },
+                items: [(context) => {
+                    return {
+                        type: "bi.label",
+                        height: 30,
+                        ref: function (_ref) {
+                            label = _ref;
+                        },
+                        text: context.model.theme
+                    }
+                }]
+                
+            };
+        }
+    });
+    BI.shortcut("demo.child", Child);
+
+    var Widget = BI.inherit(BI.Widget, {
+        props: {
+            baseCls: "my-parent"
+        },
+        _store: function () {
+            return BI.Models.getModel("demo.model");
+        },
+        setup: function () {
+            var child;
+            var store = BI.useStore();
+            return function () {
+                return {
+                    type: "bi.vertical",
+                    vgap: 20,
+                    items: [{
+                        type: "demo.child",
+                        ref: function (_ref) {
+                            child = _ref;
+                        }
+                    }, {
+                        type: "bi.button",
+                        text: "改变主题",
+                        handler: function () {
+                            store.toggle();
+                        }
+                    }]
+                };
+            };
+        }
+    });
+    BI.shortcut("demo.parent", Widget);
+    BI.createWidget({
+        type: "bi.absolute",
+        items: [{
+            el: {
+                type: "demo.parent"
+            },
+            top: 100,
+            left: 100
+        }],
+        element: "#wrapper"
+    });
+</script>
+</body>
+</html>
diff --git a/src/base/context.js b/src/base/context.js
index 67ef704c0..f799812c8 100644
--- a/src/base/context.js
+++ b/src/base/context.js
@@ -15,7 +15,10 @@ BI.Context = BI.inherit(BI.Widget, {
 
     render: function () {
         var self = this, o = this.options;
-        this.context = BI.createWidget(o.items[0] || o.el, {
+        if (o.context) {
+            this.$context = BI.useContext(o.context);
+        }
+        this.context = BI.createWidget((o.items[0] || o.el)(this.$context), {
             element: this,
         });
         this.context.on(BI.Controller.EVENT_CHANGE, function () {
@@ -23,11 +26,10 @@ BI.Context = BI.inherit(BI.Widget, {
         });
     },
 
-    created: function () {
+    __initWatch: function () {
+        BI.Context.superclass.__initWatch.call(this);
         var o = this.options;
-        if (o.context) {
-            BI.watch(o.context, o.watch);
-        }
+        BI.watch(this.$context, o.context, o.watch);
     },
 
     setValue: function (v) {

From f8f0c194b6899b1dac8e956a32e99cc40301413e Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sun, 23 Oct 2022 13:54:39 +0800
Subject: [PATCH 60/97] update

---
 src/base/context.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/base/context.js b/src/base/context.js
index f799812c8..47fdd6c64 100644
--- a/src/base/context.js
+++ b/src/base/context.js
@@ -16,12 +16,12 @@ BI.Context = BI.inherit(BI.Widget, {
     render: function () {
         var self = this, o = this.options;
         if (o.context) {
-            this.$context = BI.useContext(o.context);
+            this.context = BI.useContext(o.context);
         }
-        this.context = BI.createWidget((o.items[0] || o.el)(this.$context), {
+        this.widget = BI.createWidget((o.items[0] || o.el)(this.context), {
             element: this,
         });
-        this.context.on(BI.Controller.EVENT_CHANGE, function () {
+        this.widget.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);
         });
     },
@@ -29,19 +29,19 @@ BI.Context = BI.inherit(BI.Widget, {
     __initWatch: function () {
         BI.Context.superclass.__initWatch.call(this);
         var o = this.options;
-        BI.watch(this.$context, o.context, o.watch);
+        BI.watch(this.context, o.context, o.watch);
     },
 
     setValue: function (v) {
-        this.context.setValue(v);
+        this.widget.setValue(v);
     },
 
     getValue: function () {
-        return this.context.getValue();
+        return this.widget.getValue();
     },
 
     populate: function () {
-        this.context.populate.apply(this, arguments);
+        this.widget.populate.apply(this, arguments);
     },
 });
 BI.shortcut("bi.context", BI.Context);

From 7b4ac8461920112b1c42e0c06472fc48500046cb Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Sun, 23 Oct 2022 14:44:34 +0800
Subject: [PATCH 61/97] auto upgrade version to 2.0.20221023144426

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 852b35c1b..ad3c79333 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221023105429",
+  "version": "2.0.20221023144426",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 38502dd94a2b5b3f1500f5ca0bcfec925e5a60f9 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Sun, 23 Oct 2022 16:08:38 +0800
Subject: [PATCH 62/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?tape=E5=B8=83=E5=B1=80=20NaN=E7=9A=84=E5=9C=BA=E6=99=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/wrapper/layout/layout.tape.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/wrapper/layout/layout.tape.js b/src/core/wrapper/layout/layout.tape.js
index a3fa8bcf0..185af813d 100644
--- a/src/core/wrapper/layout/layout.tape.js
+++ b/src/core/wrapper/layout/layout.tape.js
@@ -92,7 +92,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
                 left: self._optimiseGap(left[i] + self._optimiseItemLgap(item) + self._optimiseItemHgap(item) + o.hgap + o.lgap)
             });
 
-            if (columnSize === "" || columnSize === "fill") {
+            if (BI.isNull(columnSize) || columnSize === "" || columnSize === "fill") {
                 return true;
             }
         });
@@ -110,7 +110,7 @@ BI.HTapeLayout = BI.inherit(BI.Layout, {
                 right: self._optimiseGap(right[i] + self._optimiseItemRgap(item) + self._optimiseItemHgap(item) + o.hgap + o.rgap)
             });
 
-            if (columnSize === "" || columnSize === "fill") {
+            if (BI.isNull(columnSize) || columnSize === "" || columnSize === "fill") {
                 return true;
             }
         });

From 01b22956bbc86a992696c5bd793a77af2e0fc229 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Mon, 24 Oct 2022 10:14:01 +0800
Subject: [PATCH 63/97] auto upgrade version to 2.0.20221024101340

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ad3c79333..4f9c42e73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221023144426",
+  "version": "2.0.20221024101340",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From fe8256f5446f5f84ea6d12b7d95bf557cb84833e Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Mon, 24 Oct 2022 10:54:36 +0800
Subject: [PATCH 64/97] auto upgrade version to 2.0.20221024105424

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4f9c42e73..31e494e29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221024101340",
+  "version": "2.0.20221024105424",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 94fc4e6e5d8f7b9d2efa17a80fe68d32df0dd608 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 24 Oct 2022 11:36:55 +0800
Subject: [PATCH 65/97] =?UTF-8?q?KERNEL-13199=20feat:=20sticky=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E6=94=AF=E6=8C=81=E5=90=8C=E6=97=B6=E5=90=B8=E9=A1=B6?=
 =?UTF-8?q?=E5=92=8C=E5=90=B8=E5=BA=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/sticky/sticky.horizontal.js        | 28 +++++++++++++++----
 .../wrapper/layout/sticky/sticky.vertical.js  | 28 +++++++++++++++----
 2 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/core/wrapper/layout/sticky/sticky.horizontal.js b/src/core/wrapper/layout/sticky/sticky.horizontal.js
index a59dd6edf..afdf955aa 100644
--- a/src/core/wrapper/layout/sticky/sticky.horizontal.js
+++ b/src/core/wrapper/layout/sticky/sticky.horizontal.js
@@ -21,13 +21,29 @@ BI.HorizontalStickyLayout = BI.inherit(BI.FlexHorizontalLayout, {
             }
         }
         if (columnSize !== "fill") {
-            var firstItemFill = o.columnSize[0] === "fill" || o.items[0].width === "fill";
-            w.element.css({
-                position: "sticky",
-                zIndex: 1,
-                left: firstItemFill ? "" : 0,
-                right: firstItemFill ? 0 : ""
+            var fillIndex;
+            BI.count(0, o.items.length - 1, index => {
+                if (BI.isNotNull(fillIndex)) {
+                    return;
+                }
+                if ((o.columnSize[index] === "fill" || o.items[index].width === "fill")) {
+                    fillIndex = index;
+                }
             });
+
+            if (fillIndex > i) {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    left: 0,
+                });
+            } else {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    right: 0
+                });
+            }
         } else {
             w.element.css({
                 overflow: ""
diff --git a/src/core/wrapper/layout/sticky/sticky.vertical.js b/src/core/wrapper/layout/sticky/sticky.vertical.js
index 970d84eef..beb0e9d43 100644
--- a/src/core/wrapper/layout/sticky/sticky.vertical.js
+++ b/src/core/wrapper/layout/sticky/sticky.vertical.js
@@ -21,13 +21,29 @@ BI.VerticalStickyLayout = BI.inherit(BI.FlexVerticalLayout, {
             }
         }
         if (rowSize !== "fill") {
-            var firstItemFill = o.rowSize[0] === "fill" || o.items[0].height === "fill";
-            w.element.css({
-                position: "sticky",
-                zIndex: 1,
-                top: firstItemFill ? "" : 0,
-                bottom: firstItemFill ? 0 : ""
+            var fillIndex;
+            BI.count(0, o.items.length - 1, index => {
+                if (BI.isNotNull(fillIndex)) {
+                    return;
+                }
+                if ((o.rowSize[index] === "fill" || o.items[index].height === "fill")) {
+                    fillIndex = index;
+                }
             });
+
+            if (fillIndex > i) {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    top: 0,
+                });
+            } else {
+                w.element.css({
+                    position: "sticky",
+                    zIndex: 1,
+                    bottom: 0
+                });
+            }
         } else {
             w.element.css({
                 overflow: ""

From 1a9de516c6be2b5f2c4829d4b7607058ee840218 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 24 Oct 2022 11:47:45 +0800
Subject: [PATCH 66/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20hover=E8=BE=B9?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E4=BA=AE=E6=95=88=E6=9E=9C,=E5=9C=A8?=
 =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9disabled=E7=9A=84=E5=9C=BA=E6=99=AF?=
 =?UTF-8?q?=E4=B8=8B,=E6=B2=A1=E5=BF=85=E8=A6=81=E9=AB=98=E4=BA=AE?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/core/utils/common.less | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less
index d4b0d3bcd..7e0d85ff0 100644
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@@ -74,9 +74,10 @@
     border-color: @color-bi-border-highlight;
   }
   // ie下不支持focus-within， 和上面写在一起会导致ie下:hover不生效
-  &:focus-within{
+  &:focus-within {
     border-color: @color-bi-border-highlight;
   }
+
   &.disabled {
     &:hover {
       border-color: @border-color-line;
@@ -84,6 +85,14 @@
   }
 }
 
+.base-disabled {
+  .bi-focus-shadow {
+    &:hover {
+      border-color: @border-color-line;
+    }
+  }
+}
+
 .bi-theme-dark {
   .bi-focus-shadow {
     &.disabled {
@@ -94,6 +103,16 @@
   }
 }
 
+.bi-theme-dark {
+  .base-disabled {
+    .bi-focus-shadow {
+      &:hover {
+        border-color: @border-color-line-theme-dark;
+      }
+    }
+  }
+}
+
 .clearfix {
   .clearfix();
 }
@@ -102,6 +121,7 @@
 .bi-background {
   background-color: @color-bi-background-normal;
   color: @color-bi-text-background;
+
   & .bi-input {
     color: @color-bi-text-background;
   }

From 9eebf989b2c6b01b6915ac1f896ac7a995d55db6 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Mon, 24 Oct 2022 15:12:34 +0800
Subject: [PATCH 67/97] update

---
 examples/useContext.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/examples/useContext.html b/examples/useContext.html
index 723152250..4f91239bd 100644
--- a/examples/useContext.html
+++ b/examples/useContext.html
@@ -56,7 +56,20 @@
         return "calc(var(--css-scale) * " + pix + "px)";
     };
 
-    BI.toPix = BI.pixFormat;
+    var oldPix = BI.toPix;
+    BI.toPix = function (pix, border) {
+        var context = BI.useContext("cssScale");
+        if (!context) {
+            return oldPix.apply(this, arguments);
+        }
+        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)";
+    };
 
     var Child = BI.inherit(BI.Widget, {
         render: function () {

From 2c63ad258e7fbdcda9291552168ebb203d47c0e7 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Mon, 24 Oct 2022 15:34:37 +0800
Subject: [PATCH 68/97] auto upgrade version to 2.0.20221024153423

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 31e494e29..e499e4361 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221024105424",
+  "version": "2.0.20221024153423",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From bcdcb32ba854a6cf2519903560fe4a56869a92cd Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Mon, 24 Oct 2022 16:44:11 +0800
Subject: [PATCH 69/97] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20checkbox=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/input/checkbox.less | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less
index 7141d75a9..9b1d66917 100644
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@@ -9,17 +9,16 @@
     &:after {
       position: absolute;
       display: table;
-      // 百分比会出现像素误差
-      top: 6px;
-      left: 2px;
+      top: 45%;
+      left: 20%;
       border: 2px solid transparent;
       border-top: 0;
       border-left: 0;
-      width: 6px;
-      height: 9px;
+      width: 50%;
+      height: 75%;
       .box-sizing(border-box);
       .transform(rotate(45deg) scale(1) translate(-50%, -50%));
-      @transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s;
+      @transition: all .1s cubic-bezier(.71, -.46, .88, .6), opacity .1s;
       .transition(@transition);
       content: '';
     }

From 17a71ef95aeaa2a9079bba7e4168e49ce528d90e Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Mon, 24 Oct 2022 17:04:48 +0800
Subject: [PATCH 70/97] auto upgrade version to 2.0.20221024170442

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e499e4361..0f143848b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221024153423",
+  "version": "2.0.20221024170442",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 0a1f19347f41e92d5168769dc7f46e68fabfc6f7 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 10:31:16 +0800
Subject: [PATCH 71/97] =?UTF-8?q?KERNEL-13158=20feat:=20radio=E5=92=8C?=
 =?UTF-8?q?=E5=8D=8A=E9=80=89=E5=9B=BE=E6=A0=87=E6=94=AF=E6=8C=81=E7=AD=89?=
 =?UTF-8?q?=E6=AF=94=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/button/button.half.less |  9 +++++----
 src/less/base/single/input/radio.less        | 13 +++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/less/base/single/button/button.half.less b/src/less/base/single/button/button.half.less
index b652328fb..13bb7f996 100644
--- a/src/less/base/single/button/button.half.less
+++ b/src/less/base/single/button/button.half.less
@@ -6,10 +6,11 @@
 
   &:after {
     position: absolute;
-    left: 2px;
-    top: 2px;
-    width: 8px;
-    height: 8px;
+    left: 50%;
+    top: 50%;
+    width: 50%;
+    height: 50%;
+    .transform(translate(-50%, -50%));
     background-color: @color-bi-background-half-button-content;
     content: '';
   }
diff --git a/src/less/base/single/input/radio.less b/src/less/base/single/input/radio.less
index 0a3345e42..a1aaa4071 100644
--- a/src/less/base/single/input/radio.less
+++ b/src/less/base/single/input/radio.less
@@ -2,13 +2,15 @@
 
 .bi-radio {
   & .radio-content, &.radio-content {
-    .border-radius(8px);
+    .border-radius(50%);
     border: 1px solid @color-bi-border-radio;
     .box-sizing(border-box);
     .transition(all .1s);
+
     &:after {
       content: "";
     }
+
     &.hover, &:hover {
       border-color: @color-bi-border-hover-active-radio;
     }
@@ -18,16 +20,15 @@
       border-color:  @color-bi-border-hover-active-radio;
       background-color: @color-bi-background-active-radio;
       &:after {
-        width: 8px;
-        height: 8px;
-        display: table;
+        width: 50%;
+        height: 50%;
         position: absolute;
         top: 50%;
         left: 50%;
-        .border-radius(4px);
+        .border-radius(50%);
         background-color: @color-bi-background-active-radio-content;
         .transform(translate(-50%, -50%));
-        @transition: all .1s cubic-bezier(.71,-.46,.88,.6),opacity .1s;
+        @transition: all .1s cubic-bezier(.71, -.46, .88, .6), opacity .1s;
         .transition(@transition);
       }
     }

From ee17c83ac273f69ace1be1beff621422f61d5975 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 14:03:39 +0800
Subject: [PATCH 72/97] =?UTF-8?q?KERNEL-13158=20feat:=20=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A0=91=E5=92=8C=E5=88=97=E8=A1=A8=E6=A0=91=E7=AD=89=E6=AF=94?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/tree/ztree.less | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 1eb5896a6..97d0e4cbb 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -1,5 +1,10 @@
 @import "../../index.less";
 
+.use-scale(@property, @pix) {
+    @{property} : @pix; //不支持css变量的浏览器
+    @{property} : calc(var(--css-scale, 1) * @pix);
+}
+
 .ztree * {
   padding: 0;
   margin: 0;
@@ -50,7 +55,7 @@
   &:before {
     border-left: 1px solid @border-color-dark-gray-line;
     height: 100%;
-    left: 14px;
+    .use-scale(left, 14px);
     margin-top: 0;
   }
 }
@@ -113,7 +118,8 @@
 }
 
 .ztree.solid li a {
-  height: 30px;
+  //height: 30px;
+  .use-scale(height, 30px);
 }
 
 .ztree li a.curSelectedNode {
@@ -163,7 +169,8 @@
 }
 
 .ztree.solid li span {
-  line-height: 30px;
+  //line-height: 30px;
+  .use-scale(line-height, 30px);
 }
 
 .ztree li span.icon {
@@ -218,8 +225,8 @@
 
 .ztree li span.button.chk {
   position: relative;
-  width: 14px;
-  height: 14px;
+  .use-scale(width, 14px);
+  .use-scale(height, 14px);
   margin: 0 3px 0 0;
   cursor: auto
 }
@@ -302,8 +309,10 @@
 }
 
 .ztree.solid li span.button.switch {
-  width: 30px;
-  height: 30px
+  .use-scale(width, 30px);
+  .use-scale(height, 30px);
+  //width: 30px;
+  //height: 30px;
 }
 
 .ztree li span.button.switch.noline_open {

From d5534e29ab97cf7c0698d4f088a6879e495e5858 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Tue, 25 Oct 2022 14:24:28 +0800
Subject: [PATCH 73/97] auto upgrade version to 2.0.20221025142421

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0f143848b..f3c643a64 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221024170442",
+  "version": "2.0.20221025142421",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 072e36b20e72aae0ef3d5d7e416998db4ee703e5 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 14:43:59 +0800
Subject: [PATCH 74/97] =?UTF-8?q?=E6=97=A0JIRA=20=E5=88=A0=E6=8E=89?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8less?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/tree/ztree.less | 187 +---------------------------------
 1 file changed, 1 insertion(+), 186 deletions(-)

diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 97d0e4cbb..341ab05f5 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -32,7 +32,7 @@
 
 .ztree.solid li ul {
   margin: 0;
-  padding: 0 0 0 24px
+  .use-scale(padding-left, 24px);
 }
 
 // 此处不用2倍图，改用css画虚线
@@ -122,34 +122,6 @@
   .use-scale(height, 30px);
 }
 
-.ztree li a.curSelectedNode {
-}
-
-.ztree li a.curSelectedNode_Edit {
-  padding-top: 0px;
-  background-color: #FFE6B0;
-  color: black;
-  height: 16px;
-  border: 1px #FFB951 solid;
-  opacity: 0.8;
-}
-
-.ztree li a.tmpTargetNode_inner {
-  padding-top: 0px;
-  background-color: #316AC5;
-  color: white;
-  height: 16px;
-  border: 1px #316AC5 solid;
-  opacity: 0.8;
-  filter: alpha(opacity=80)
-}
-
-.ztree li a.tmpTargetNode_prev {
-}
-
-.ztree li a.tmpTargetNode_next {
-}
-
 .ztree li a input.rename {
   height: 14px;
   width: 80px;
@@ -190,10 +162,6 @@
   vertical-align: middle;
   border: 0 none;
   cursor: pointer;
-  outline: none;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-attachment: scroll;
 }
 
 .ztree li span.button.chk {
@@ -231,50 +199,6 @@
   cursor: auto
 }
 
-.ztree li span.button.chk.checkbox_false_disable {
-  background-position: 0 -56px
-}
-
-.ztree li span.button.chk.checkbox_true_disable {
-  background-position: -14px -56px
-}
-
-.ztree li span.button.chk.radio_false_full {
-  background-position: -28px 0
-}
-
-.ztree li span.button.chk.radio_false_full_focus {
-  background-position: -28px -14px
-}
-
-.ztree li span.button.chk.radio_false_part {
-  background-position: -28px -28px
-}
-
-.ztree li span.button.chk.radio_false_part_focus {
-  background-position: -28px -42px
-}
-
-.ztree li span.button.chk.radio_false_disable {
-  background-position: -28px -56px
-}
-
-.ztree li span.button.chk.radio_true_full {
-  background-position: -42px 0
-}
-
-.ztree li span.button.chk.radio_true_full_focus {
-  background-position: -42px -14px;
-}
-
-.ztree li span.button.chk.radio_true_part {
-  background-position: -42px -28px
-}
-
-.ztree li span.button.chk.radio_true_part_focus {
-  background-position: -42px -42px
-}
-
 .ztree li span.button.chk.checkbox_true_full {
   & + a {
     color: @color-bi-text-highlight;
@@ -299,10 +223,6 @@
   }
 }
 
-.ztree li span.button.chk.radio_true_disable {
-  background-position: -42px -56px
-}
-
 .ztree li span.button.switch {
   width: 24px;
   height: 24px
@@ -315,113 +235,8 @@
   //height: 30px;
 }
 
-.ztree li span.button.switch.noline_open {
-  width: 0;
-}
-
-.ztree li span.button.switch.noline_close {
-  width: 0;
-}
-
-.ztree li span.button.noline_open {
-  background-position: -92px -72px
-}
-
-.ztree li span.button.noline_close {
-  background-position: -74px -72px
-}
-
-.ztree li span.button.root_docu {
-  background: none;
-}
-
-.ztree li span.button.noline_docu {
-  background: none;
-  width: 0;
-}
-
-.ztree li span.button.ico_open {
-  margin-right: 2px;
-  background-position: -110px -16px;
-  vertical-align: top;
-}
-
-.ztree li span.button.ico_close {
-  margin-right: 2px;
-  background-position: -110px 0;
-  vertical-align: top;
-}
-
-.ztree li span.button.ico_docu {
-  margin-right: 2px;
-  background-position: -110px -32px;
-  vertical-align: top;
-}
-
-.ztree li span.button.edit {
-  margin-right: 2px;
-  background-position: -110px -48px;
-  vertical-align: top;
-}
-
-.ztree li span.button.remove {
-  margin-right: 2px;
-  background-position: -110px -64px;
-  vertical-align: top;
-}
-
 .ztree li span.button.ico_loading {
   width: 0px;
   margin-right: 2px;
   vertical-align: top;
 }
-
-ul.tmpTargetzTree {
-  background-color: #FFE6B0;
-  opacity: 0.8;
-  filter: alpha(opacity=80)
-}
-
-span.tmpzTreeMove_arrow {
-  width: 16px;
-  height: 16px;
-  display: inline-block;
-  padding: 0;
-  margin: 2px 0 0 1px;
-  border: 0 none;
-  position: absolute;
-  background-color: transparent;
-  background-repeat: no-repeat;
-  background-attachment: scroll;
-  background-position: -110px -80px;
-}
-
-ul.ztree.zTreeDragUL {
-  margin: 0;
-  padding: 0;
-  position: absolute;
-  width: auto;
-  height: auto;
-  overflow: hidden;
-  background-color: #cfcfcf;
-  border: 1px #00B83F dotted;
-  opacity: 0.8;
-  filter: alpha(opacity=80)
-}
-
-.zTreeMask {
-  z-index: 10000;
-  background-color: #cfcfcf;
-  opacity: 0.0;
-  filter: alpha(opacity=0);
-  position: absolute
-}
-
-/* level style*/
-/*.ztree li span.button.level0 {
-	display:none;
-}
-.ztree li ul.level0 {
-	padding:0;
-	background:none;
-}*/

From 2eb1f1cd7ca5ed2dd6a148340dd8a3612b3182f5 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Tue, 25 Oct 2022 15:15:53 +0800
Subject: [PATCH 75/97] =?UTF-8?q?KERNEL-13158:=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E5=BA=94=E8=AF=A5=E5=8F=AF=E4=BB=A5=E6=94=BE?=
 =?UTF-8?q?=E6=8E=89=EF=BC=8C=20=E5=8F=AA=E8=A6=81=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E7=9A=84=E5=85=83=E7=B4=A0=E6=9C=AC=E8=BA=AB=E4=B8=8D=E6=98=AF?=
 =?UTF-8?q?=E4=B8=AA=E6=8C=89=E9=92=AE=E5=95=A5=E7=9A=84=E5=B0=B1=E6=B2=A1?=
 =?UTF-8?q?=E5=95=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E4=B8=80=E8=88=AC=E4=B9=9F?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E8=BF=99=E4=B9=88=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/utils/events/mousemovetracker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/utils/events/mousemovetracker.js b/src/core/utils/events/mousemovetracker.js
index 5bdac5f02..212072ebc 100644
--- a/src/core/utils/events/mousemovetracker.js
+++ b/src/core/utils/events/mousemovetracker.js
@@ -44,7 +44,7 @@
                 this._x = event.clientX;
                 this._y = event.clientY;
             }
-            event.preventDefault ? event.preventDefault() : (event.returnValue = false);
+            // event.preventDefault ? event.preventDefault() : (event.returnValue = false);
         },
 
         releaseMouseMoves: function () {
@@ -104,4 +104,4 @@
             this._onMoveEnd();
         }
     };
-})();
\ No newline at end of file
+})();

From 1dc589873d73645dde99c6b25a8b3228c1f489f9 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Tue, 25 Oct 2022 15:24:26 +0800
Subject: [PATCH 76/97] auto upgrade version to 2.0.20221025152411

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3c643a64..23f06ed89 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221025142421",
+  "version": "2.0.20221025152411",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From fe5478e4844f3725927e2dd6729bac077d91524b Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 17:25:46 +0800
Subject: [PATCH 77/97] =?UTF-8?q?KERNEL-13232=20feat:=20=E5=A4=8D=E9=80=89?=
 =?UTF-8?q?=E6=A0=91=E7=9A=84=E8=BF=9E=E6=8E=A5=E7=BA=BF=E4=B9=8B=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E4=B8=8D=E5=86=8D=E7=94=A8=E5=9B=BE=E7=89=87=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/tree/ztree.less     | 24 ++++++++++++++
 src/less/resource/background.less | 52 ++++++++++++++++++-------------
 2 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index 341ab05f5..f24569bbf 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -190,6 +190,30 @@
   }
 }
 
+.ztree.solid li span.button.bottom_docu {
+  background: none;
+  position: relative;
+
+  &:before {
+    position: absolute;
+    top: 0;
+    left: -1px;
+    width: 50%;
+    height: 50%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 1px;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
 
 .ztree li span.button.chk {
   position: relative;
diff --git a/src/less/resource/background.less b/src/less/resource/background.less
index 8aca40b17..999255654 100644
--- a/src/less/resource/background.less
+++ b/src/less/resource/background.less
@@ -43,6 +43,7 @@
   .ztree li span.button.root_open {
     .image2xPath(@icon-tree-expand-type1-theme-dark);
   }
+
   .ztree.solid li span.button.root_open {
     .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
   }
@@ -60,6 +61,7 @@
   .ztree li span.button.root_close {
     .image2xPath(@icon-tree-collapse-type1-theme-dark);
   }
+
   .ztree.solid li span.button.root_close {
     .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
   }
@@ -70,15 +72,16 @@
 }
 
 .ztree.solid li span.button.roots_open {
-  .image2xPath(@icon-tree-solid-expand-type2);
+  .image2xPath(@icon-tree-solid-expand-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.roots_open {
     .image2xPath(@icon-tree-expand-type2-theme-dark);
   }
+
   .ztree.solid li span.button.roots_open {
-    .image2xPath(@icon-tree-solid-expand-type2-theme-dark);
+    .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
   }
 }
 
@@ -87,15 +90,16 @@
 }
 
 .ztree.solid li span.button.roots_close {
-  .image2xPath(@icon-tree-solid-collapse-type2);
+  .image2xPath(@icon-tree-solid-collapse-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.roots_close {
     .image2xPath(@icon-tree-collapse-type2-theme-dark);
   }
+
   .ztree.solid li span.button.roots_close {
-    .image2xPath(@icon-tree-solid-collapse-type2-theme-dark);
+    .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
   }
 }
 
@@ -104,15 +108,16 @@
 }
 
 .ztree.solid li span.button.center_open {
-  .image2xPath(@icon-tree-solid-expand-type3);
+  .image2xPath(@icon-tree-solid-expand-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.center_open {
     .image2xPath(@icon-tree-expand-type3-theme-dark);
   }
+
   .ztree.solid li span.button.center_open {
-    .image2xPath(@icon-tree-solid-expand-type3-theme-dark);
+    .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
   }
 }
 
@@ -121,15 +126,16 @@
 }
 
 .ztree.solid li span.button.center_close {
-  .image2xPath(@icon-tree-solid-collapse-type3);
+  .image2xPath(@icon-tree-solid-collapse-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.center_close {
     .image2xPath(@icon-tree-collapse-type3-theme-dark);
   }
+
   .ztree.solid li span.button.center_close {
-    .image2xPath(@icon-tree-solid-collapse-type3-theme-dark);
+    .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
   }
 }
 
@@ -138,15 +144,16 @@
 }
 
 .ztree.solid li span.button.bottom_open {
-  .image2xPath(@icon-tree-solid-expand-type4);
+  .image2xPath(@icon-tree-solid-expand-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.bottom_open {
     .image2xPath(@icon-tree-expand-type4-theme-dark);
   }
+
   .ztree.solid li span.button.bottom_open {
-    .image2xPath(@icon-tree-solid-expand-type4-theme-dark);
+    .image2xPath(@icon-tree-solid-expand-type1-theme-dark);
   }
 }
 
@@ -155,15 +162,16 @@
 }
 
 .ztree.solid li span.button.bottom_close {
-  .image2xPath(@icon-tree-solid-collapse-type4);
+  .image2xPath(@icon-tree-solid-collapse-type1);
 }
 
 .bi-theme-dark {
   .ztree li span.button.bottom_close {
     .image2xPath(@icon-tree-collapse-type4-theme-dark);
   }
+
   .ztree.solid li span.button.bottom_close {
-    .image2xPath(@icon-tree-solid-collapse-type4-theme-dark);
+    .image2xPath(@icon-tree-solid-collapse-type1-theme-dark);
   }
 }
 
@@ -179,6 +187,7 @@
   .ztree li span.button.roots_docu {
     .image2xPath(@icon-tree-vertical-line-2-theme-dark);
   }
+
   .ztree.solid li span.button.roots_docu {
     .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark);
   }
@@ -196,6 +205,7 @@
   .ztree li span.button.center_docu {
     .image2xPath(@icon-tree-vertical-line-3-theme-dark);
   }
+
   .ztree.solid li span.button.center_docu {
     .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark);
   }
@@ -205,14 +215,12 @@
   .image2xPath(@icon-tree-vertical-line-4);
 }
 
-.ztree.solid li span.button.bottom_docu {
-  .image2xPath(@icon-tree-solid-vertical-line-4);
-}
 
 .bi-theme-dark {
   .ztree li span.button.bottom_docu {
     .image2xPath(@icon-tree-vertical-line-4-theme-dark);
   }
+
   .ztree.solid li span.button.bottom_docu {
     .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark);
   }
@@ -335,43 +343,43 @@
 }
 
 .auto-color-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-auto-color);
   }
 }
 
 .auto-color-normal-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-auto-color-normal);
   }
 }
 
 .auto-color-normal-disabled-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-auto-color-disabled);
   }
 }
 
 .auto-color-square-normal-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-auto-color-square-normal);
   }
 }
 
 .auto-color-no-square-normal-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-auto-color-no-square-normal);
   }
 }
 
 .trans-color-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-trans-color);
   }
 }
 
 .trans-color-disabled-background {
-  &.hack{
+  &.hack {
     .imagePath(@background-trans-color-disabled);
   }
 }

From ee824ad8d528af7f462ed6500cfac7d34d09b41e Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 17:26:12 +0800
Subject: [PATCH 78/97] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?BI.isWidthOrHeight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/2.base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/2.base.js b/src/core/2.base.js
index cc00f828c..61d9487cc 100644
--- a/src/core/2.base.js
+++ b/src/core/2.base.js
@@ -486,7 +486,7 @@
             if (typeof w === "number") {
                 return w >= 0;
             } else if (typeof w === "string") {
-                return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+px$/.test(w) || /^calc/.test(w);
+                return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)px$/.test(w) || /^calc/.test(w);
             }
         },
 

From c181c9864d292a95a654d52b801427bba741dd96 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Tue, 25 Oct 2022 17:27:15 +0800
Subject: [PATCH 79/97] =?UTF-8?q?=E6=97=A0jira=20fix:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?BI.isWidthOrHeight?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/2.base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/2.base.js b/src/core/2.base.js
index 61d9487cc..d7007de52 100644
--- a/src/core/2.base.js
+++ b/src/core/2.base.js
@@ -486,7 +486,7 @@
             if (typeof w === "number") {
                 return w >= 0;
             } else if (typeof w === "string") {
-                return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)px$/.test(w) || /^calc/.test(w);
+                return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+(\.\d+)?px$/.test(w) || /^calc/.test(w);
             }
         },
 

From 7a880b43468d38101f9ccd5e1af321a5d36883b5 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Tue, 25 Oct 2022 17:54:41 +0800
Subject: [PATCH 80/97] auto upgrade version to 2.0.20221025175433

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 23f06ed89..be12c8a0e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221025152411",
+  "version": "2.0.20221025175433",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 70f6e9a07c873003f64bc526759ee97cad928120 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 26 Oct 2022 11:39:47 +0800
Subject: [PATCH 81/97] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/button/button.half.less | 6 ++++--
 src/less/base/single/input/checkbox.less     | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/less/base/single/button/button.half.less b/src/less/base/single/button/button.half.less
index 13bb7f996..c39b9d033 100644
--- a/src/less/base/single/button/button.half.less
+++ b/src/less/base/single/button/button.half.less
@@ -6,10 +6,12 @@
 
   &:after {
     position: absolute;
+    .border-radius(2px);
+    display: table;
     left: 50%;
     top: 50%;
-    width: 50%;
-    height: 50%;
+    width: 70%;
+    height: 70%;
     .transform(translate(-50%, -50%));
     background-color: @color-bi-background-half-button-content;
     content: '';
diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less
index 9b1d66917..012e38336 100644
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@@ -3,15 +3,17 @@
 .bi-checkbox {
   & .checkbox-content, &.checkbox-content {
     .border-radius(2px);
-    border: 1px solid @color-bi-border-checkbox;
+    border: 2px solid @color-bi-border-checkbox;
     .box-sizing(border-box);
     .transition(all .1s);
+
     &:after {
       position: absolute;
       display: table;
       top: 45%;
       left: 20%;
       border: 2px solid transparent;
+      border: calc(var(--css-scale, 1) * 2px) solid transparent;
       border-top: 0;
       border-left: 0;
       width: 50%;

From cd0ce2d02abbb2c8f9abaf9cbbcb58e90aa03733 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Wed, 26 Oct 2022 11:46:25 +0800
Subject: [PATCH 82/97] =?UTF-8?q?KERNEL-13158:=20=E4=BC=98=E5=8C=96button?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/button/button.basic.js | 31 +++++++++++++++-----------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js
index 77bfd1036..64865de8b 100644
--- a/src/base/single/button/button.basic.js
+++ b/src/base/single/button/button.basic.js
@@ -184,7 +184,7 @@ BI.BasicButton = BI.inherit(BI.Single, {
                     var mouseDown = false;
                     var interval;
                     hand.mousedown(function (e) {
-                        BI.Widget._renderEngine.createElement(document).bind("mouseup." + self.getName(), function (e) {
+                        BI.Widget._renderEngine.createElement(document).bind("mouseup." + self.getName(), function () {
                             interval && clearInterval(interval);
                             interval = null;
                             mouseDown = false;
@@ -193,13 +193,14 @@ BI.BasicButton = BI.inherit(BI.Single, {
                         if (mouseDown === true) {
                             return;
                         }
-                        if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
+                        if (!self.isEnabled() || !self.isValid()) {
+                            return;
+                        }
+                        if (self.isOnce() && self.isSelected()) {
                             return;
                         }
                         interval = setInterval(function () {
-                            if (self.isEnabled()) {
-                                self.doClick();
-                            }
+                            clk(e)
                         }, 180);
                         mouseDown = true;
                         ev(e);
@@ -239,7 +240,10 @@ BI.BasicButton = BI.inherit(BI.Single, {
 
         function clk(e) {
             ev(e);
-            if (!self.isEnabled() || (self.isOnce() && self.isSelected())) {
+            if (!self.isEnabled() || !self.isValid()) {
+                return;
+            }
+            if (self.isOnce() && self.isSelected()) {
                 return;
             }
             if (BI.isKey(o.bubble) || BI.isFunction(o.bubble)) {
@@ -335,16 +339,17 @@ BI.BasicButton = BI.inherit(BI.Single, {
     },
 
     _doClick: function (e) {
-        if (this.isValid()) {
-            var isIntercepted = this.beforeClick(e);
-            // 如果事件已经被消费掉了，就不再触发点击事件
-            if (isIntercepted) {
-                return;
-            }
+        if (!this.isEnabled() || !this.isValid()) {
+            return;
+        }
+        var isIntercepted = this.beforeClick(e);
+        // 如果事件已经被消费掉了，就不再触发点击事件
+        if (isIntercepted) {
+            return;
         }
 
         this._trigger(e);
-        if (this.isValid()) {
+        if (this.isEnabled() && this.isValid()) {
             this.doClick(e);
         }
     },

From 02b37dc07b0351e167c3a12d9983406d4375ffab Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 26 Oct 2022 14:25:29 +0800
Subject: [PATCH 83/97] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/input/checkbox.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less
index 012e38336..155c14441 100644
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@@ -3,7 +3,7 @@
 .bi-checkbox {
   & .checkbox-content, &.checkbox-content {
     .border-radius(2px);
-    border: 2px solid @color-bi-border-checkbox;
+    border: 1px solid @color-bi-border-checkbox;
     .box-sizing(border-box);
     .transition(all .1s);
 

From 3d222ea4162984fe88842c1c7bb6f5f01cd015c7 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 26 Oct 2022 14:29:45 +0800
Subject: [PATCH 84/97] =?UTF-8?q?KERNEL-13193=20style:=20=E8=B0=83?=
 =?UTF-8?q?=E4=B8=80=E4=B8=8Bchecobox=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/single/input/checkbox.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less
index 155c14441..50156c323 100644
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@@ -11,7 +11,7 @@
       position: absolute;
       display: table;
       top: 45%;
-      left: 20%;
+      left: 18%;
       border: 2px solid transparent;
       border: calc(var(--css-scale, 1) * 2px) solid transparent;
       border-top: 0;

From de85e1affe2b86688252443290e811f7d3a5912d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Wed, 26 Oct 2022 15:15:07 +0800
Subject: [PATCH 85/97] auto upgrade version to 2.0.20221026151459

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index be12c8a0e..d383baf9d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221025175433",
+  "version": "2.0.20221026151459",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 128c819e8392bca5cd3c6f9eb0795a24395eac8f Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 26 Oct 2022 15:49:50 +0800
Subject: [PATCH 86/97] =?UTF-8?q?BI-116019=20fix:=20=E3=80=906.0.4?=
 =?UTF-8?q?=E5=86=92=E7=83=9F=E3=80=91=E5=8C=BA=E9=97=B4=E6=BB=91=E5=9D=97?=
 =?UTF-8?q?=E4=B8=8D=E7=BB=91=E5=AE=9A=E5=AD=97=E6=AE=B5=EF=BC=8C=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E6=82=AC=E6=B5=AE=E7=BB=84=E4=BB=B6=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E4=BC=9A=E6=9C=89=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 demo/js/config/widget.js                    |  4 ++--
 src/widget/intervalslider/intervalslider.js | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/demo/js/config/widget.js b/demo/js/config/widget.js
index d2e1b1d5b..e48282492 100644
--- a/demo/js/config/widget.js
+++ b/demo/js/config/widget.js
@@ -192,7 +192,7 @@ Demo.WIDGET_CONFIG = [{
     value: "demo.number_interval"
 }, {
     id: 420,
-    text: "滚动sliders",
+    text: "数值滑块sliders",
     value: "demo.slider"
 }, {
     pId: 4,
@@ -202,4 +202,4 @@ Demo.WIDGET_CONFIG = [{
     pId: 414,
     text: "bi.collapse",
     value: "demo.collapse"
-}];
\ No newline at end of file
+}];
diff --git a/src/widget/intervalslider/intervalslider.js b/src/widget/intervalslider/intervalslider.js
index 71351dd71..59b1e1676 100644
--- a/src/widget/intervalslider/intervalslider.js
+++ b/src/widget/intervalslider/intervalslider.js
@@ -26,7 +26,7 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
 
     beforeMount: function () {
         const { value, min, max } = this.options;
-        this.setMinAndMax({
+        this._setMinAndMax({
             min,
             max,
         });
@@ -260,12 +260,12 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
                         items: [
                             {
                                 el: this.sliderOne,
-                                top: 1,
+                                top: 0,
                                 bottom: 0,
                                 left: 0
                             }, {
                                 el: this.sliderTwo,
-                                top: 1,
+                                top: 0,
                                 bottom: 0,
                                 left: "100%"
                             }
@@ -487,22 +487,23 @@ BI.IntervalSlider = BI.inherit(BI.Single, {
 
     },
 
-    setMinAndMax: function (v) {
+    _setMinAndMax: function (v) {
         var minNumber = BI.parseFloat(v.min);
         var maxNumber = BI.parseFloat(v.max);
-        if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber )) {
+        if ((!isNaN(minNumber)) && (!isNaN(maxNumber)) && (maxNumber >= minNumber)) {
             this.min = minNumber;
             this.max = maxNumber;
             this.valueOne = minNumber;
             this.valueTwo = maxNumber;
             this.precision = this._getPrecision();
-            this.setEnable(true);
-        }
-        if (maxNumber === minNumber) {
-            this.setEnable(false);
         }
     },
 
+    setMinAndMax: function (v) {
+        this._setMinAndMax(v);
+        this.setEnable(v.min <= v.max);
+    },
+
     setValue: function (v) {
         var o = this.options;
         var valueOne = BI.parseFloat(v.min);

From 87ce0200b0b8c3787e06607cdece16dbf91bcfdd Mon Sep 17 00:00:00 2001
From: "Xavier.Meng" <xavier.meng@fanruan.com>
Date: Wed, 26 Oct 2022 15:44:26 +0800
Subject: [PATCH 87/97] =?UTF-8?q?=E6=97=A0JIRA=20refactor(widget/year):=20?=
 =?UTF-8?q?ts=E5=A3=B0=E6=98=8E=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/index.ts                  |  3 +++
 typescript/widget/year/combo.year.ts |  2 ++
 typescript/widget/year/popup.year.ts | 13 +++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 typescript/widget/year/popup.year.ts

diff --git a/typescript/index.ts b/typescript/index.ts
index 3aaca1ead..a1b9831c9 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -145,6 +145,7 @@ import { ArrowTreeGroupNodeCheckbox } from "./case/checkbox/check.arrownode";
 import { NumberInterval } from "./widget/numberinterval/numberinterval";
 import { DynamicYearQuarterCombo } from "./widget/yearquarter/combo.yearquarter";
 import { DynamicYearCombo } from "./widget/year/combo.year";
+import { DynamicYearPopup } from "./widget/year/popup.year";
 import { IntervalSlider } from "./widget/intervalslider/intervalslider";
 import { MultiSelectInsertList } from "./widget/multiselectlist/multiselectlist.insert";
 import { YearMonthInterval } from "./widget/yearmonthinterval/yearmonthinterval";
@@ -350,6 +351,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     NumberInterval: typeof NumberInterval;
     DynamicYearQuarterCombo: typeof DynamicYearQuarterCombo;
     DynamicYearCombo: typeof DynamicYearCombo;
+    DynamicYearPopup: typeof DynamicYearPopup;
     IntervalSlider: typeof IntervalSlider;
     MultiSelectInsertList: typeof MultiSelectInsertList;
     YearMonthInterval: typeof YearMonthInterval;
@@ -546,6 +548,7 @@ export {
     NumberInterval,
     DynamicYearQuarterCombo,
     DynamicYearCombo,
+    DynamicYearPopup,
     IntervalSlider,
     MultiSelectInsertList,
     YearMonthInterval,
diff --git a/typescript/widget/year/combo.year.ts b/typescript/widget/year/combo.year.ts
index 809dc6c69..2bc7394f1 100644
--- a/typescript/widget/year/combo.year.ts
+++ b/typescript/widget/year/combo.year.ts
@@ -2,6 +2,8 @@ import { Widget } from "../../core/widget";
 
 export declare class DynamicYearCombo extends Widget {
     static xtype: string;
+    static Static: 1;
+    static Dynamic: 2;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
 
diff --git a/typescript/widget/year/popup.year.ts b/typescript/widget/year/popup.year.ts
new file mode 100644
index 000000000..16d61dc22
--- /dev/null
+++ b/typescript/widget/year/popup.year.ts
@@ -0,0 +1,13 @@
+import { Widget } from '../../core/widget';
+
+export declare class DynamicYearPopup extends Widget {
+    static xtype: string;
+    static BUTTON_CLEAR_EVENT_CHANGE: string;
+    static BUTTON_lABEL_EVENT_CHANGE: string;
+    static BUTTON_OK_EVENT_CHANGE: string;
+    static EVENT_CHANGE: string;
+
+    setMinDate(minDate?: string): void;
+
+    setMaxDate(maxDate?: string): void;
+}

From 9377b4e02b84daf7e0b6b7bf23227a696075fade Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Wed, 26 Oct 2022 18:41:25 +0800
Subject: [PATCH 88/97] =?UTF-8?q?=20KERNEL-13232=20feat:=20=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A0=91=E7=9A=84=E8=BF=9E=E6=8E=A5=E7=BA=BF=E4=B9=8B?=
 =?UTF-8?q?=E7=B1=BB=E7=9A=84=E4=B8=8D=E5=86=8D=E7=94=A8=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/base/tree/ztree.less     | 63 +++++++++++++++++++++++++++++++
 src/less/case/tree/tree.item.less | 25 +++++++++++-
 src/less/resource/background.less | 20 ----------
 3 files changed, 87 insertions(+), 21 deletions(-)

diff --git a/src/less/base/tree/ztree.less b/src/less/base/tree/ztree.less
index f24569bbf..a75904add 100644
--- a/src/less/base/tree/ztree.less
+++ b/src/less/base/tree/ztree.less
@@ -190,6 +190,56 @@
   }
 }
 
+.ztree.solid li span.button.roots_docu {
+  background: none;
+  position: relative;
+
+  &:before {
+    position: absolute;
+    bottom: 0;
+    left: -1px;
+    width: 50%;
+    height: 50%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
+
+.ztree.solid li span.button.center_docu {
+  background: none;
+  position: relative;
+
+  &:before {
+    position: absolute;
+    top: 0;
+    left: -1px;
+    width: 50%;
+    height: 100%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
+
 .ztree.solid li span.button.bottom_docu {
   background: none;
   position: relative;
@@ -215,6 +265,19 @@
   }
 }
 
+.bi-theme-dark {
+  .ztree.solid li span.button.center_docu, .ztree.solid li span.button.bottom_docu {
+    &:before {
+      border-right: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+
+    &:after {
+      border-bottom: 1px solid @border-color-dark-gray-line-theme-dark;
+    }
+  }
+}
+
+
 .ztree li span.button.chk {
   position: relative;
   .use-scale(width, 14px);
diff --git a/src/less/case/tree/tree.item.less b/src/less/case/tree/tree.item.less
index 3098f664a..2d2d7a9bc 100644
--- a/src/less/case/tree/tree.item.less
+++ b/src/less/case/tree/tree.item.less
@@ -1,6 +1,29 @@
 @import "../../index.less";
 
-.tree-first-solid-line-conn-background, .tree-mid-solid-line-conn-background {
+.tree-first-solid-line-conn-background {
+  &:before {
+    position: absolute;
+    bottom: 0;
+    left: -1px;
+    width: 50%;
+    height: 50%;
+    border-right: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+
+  &:after {
+    position: absolute;
+    top: 0;
+    right: 0;
+    height: 50%;
+    width: 50%;
+    border-bottom: 1px solid @border-color-dark-gray-line;
+    content: '';
+  }
+}
+
+
+.tree-mid-solid-line-conn-background {
   &:before {
     position: absolute;
     top: 0;
diff --git a/src/less/resource/background.less b/src/less/resource/background.less
index 999255654..c204e1653 100644
--- a/src/less/resource/background.less
+++ b/src/less/resource/background.less
@@ -179,36 +179,20 @@
   .image2xPath(@icon-tree-vertical-line-2);
 }
 
-.ztree.solid li span.button.roots_docu {
-  .image2xPath(@icon-tree-solid-vertical-line-2);
-}
-
 .bi-theme-dark {
   .ztree li span.button.roots_docu {
     .image2xPath(@icon-tree-vertical-line-2-theme-dark);
   }
-
-  .ztree.solid li span.button.roots_docu {
-    .image2xPath(@icon-tree-solid-vertical-line-2-theme-dark);
-  }
 }
 
 .ztree li span.button.center_docu {
   .image2xPath(@icon-tree-vertical-line-3);
 }
 
-.ztree.solid li span.button.center_docu {
-  .image2xPath(@icon-tree-solid-vertical-line-3);
-}
-
 .bi-theme-dark {
   .ztree li span.button.center_docu {
     .image2xPath(@icon-tree-vertical-line-3-theme-dark);
   }
-
-  .ztree.solid li span.button.center_docu {
-    .image2xPath(@icon-tree-solid-vertical-line-3-theme-dark);
-  }
 }
 
 .ztree li span.button.bottom_docu {
@@ -220,10 +204,6 @@
   .ztree li span.button.bottom_docu {
     .image2xPath(@icon-tree-vertical-line-4-theme-dark);
   }
-
-  .ztree.solid li span.button.bottom_docu {
-    .image2xPath(@icon-tree-solid-vertical-line-4-theme-dark);
-  }
 }
 
 .ztree li span.button.ico_loading {

From 940e1e4cb77dc8476e2d7691af45b7e0e689c120 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 27 Oct 2022 09:55:24 +0800
Subject: [PATCH 89/97] auto upgrade version to 2.0.20221027095512

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d383baf9d..8a40e7e57 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221026151459",
+  "version": "2.0.20221027095512",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 115d0ccff1ce668e5402432d0780a8bc6c15953d Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 27 Oct 2022 12:16:46 +0800
Subject: [PATCH 90/97] auto upgrade version to 2.0.20221027121605

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a40e7e57..3e177505b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221027095512",
+  "version": "2.0.20221027121605",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From 5945138658019db198ee7a1c7e930e5515788dd1 Mon Sep 17 00:00:00 2001
From: "Xavier.Meng" <xavier.meng@fanruan.com>
Date: Thu, 27 Oct 2022 13:48:31 +0800
Subject: [PATCH 91/97] =?UTF-8?q?=E6=97=A0JIRA=20refactor(=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=8E=A7=E4=BB=B6):=20=E4=BF=AE=E6=94=B9ts=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/widget/datepane/datepane.ts                     | 4 ++--
 typescript/widget/dynamicdate/dynamicdate.combo.ts         | 4 ++--
 typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts | 4 ++--
 typescript/widget/year/combo.year.ts                       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/typescript/widget/datepane/datepane.ts b/typescript/widget/datepane/datepane.ts
index 6e3212bfc..3e62cf149 100644
--- a/typescript/widget/datepane/datepane.ts
+++ b/typescript/widget/datepane/datepane.ts
@@ -4,8 +4,8 @@ export declare class DynamicDatePane extends Widget {
     static xtype: string;
     static EVENT_CHANGE: string;
     static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
-    static Static: 1;
-    static Dynamic: 2;
+    static Static: number;
+    static Dynamic: number;
 
     setMinDate(minDate: string): void;
 
diff --git a/typescript/widget/dynamicdate/dynamicdate.combo.ts b/typescript/widget/dynamicdate/dynamicdate.combo.ts
index 00921782f..305a71c4f 100644
--- a/typescript/widget/dynamicdate/dynamicdate.combo.ts
+++ b/typescript/widget/dynamicdate/dynamicdate.combo.ts
@@ -2,8 +2,8 @@ import { Single } from '../../base/single/single';
 
 export declare class DynamicDateCombo extends Single {
     static xtype: string;
-    static Static: 1;
-    static Dynamic: 2;
+    static Static: number;
+    static Dynamic: number;
 
     static EVENT_KEY_DOWN: string;
     static EVENT_CONFIRM: string;
diff --git a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts
index b4122ead8..268372758 100644
--- a/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts
+++ b/typescript/widget/dynamicdatetime/dynamicdatetime.combo.ts
@@ -11,8 +11,8 @@ export declare class DynamicDateTimeCombo extends Single {
     static EVENT_ERROR: string;
     static EVENT_BEFORE_POPUPVIEW: string;
     static EVENT_BEFORE_YEAR_MONTH_POPUPVIEW: string;
-    static Static: 1;
-    static Dynamic: 2;
+    static Static: number;
+    static Dynamic: number;
     props: {
         minDate?: string;
         maxDate?: string;
diff --git a/typescript/widget/year/combo.year.ts b/typescript/widget/year/combo.year.ts
index 2bc7394f1..605f1700d 100644
--- a/typescript/widget/year/combo.year.ts
+++ b/typescript/widget/year/combo.year.ts
@@ -2,8 +2,8 @@ import { Widget } from "../../core/widget";
 
 export declare class DynamicYearCombo extends Widget {
     static xtype: string;
-    static Static: 1;
-    static Dynamic: 2;
+    static Static: number;
+    static Dynamic: number;
     static EVENT_CONFIRM: string;
     static EVENT_BEFORE_POPUPVIEW: string;
 

From c28a89f40d8aa9bc9235d97f1a2f63583ebc177f Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 27 Oct 2022 14:24:51 +0800
Subject: [PATCH 92/97] auto upgrade version to 2.0.20221027142438

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e177505b..f08a3b639 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221027121605",
+  "version": "2.0.20221027142438",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From e9813d5f97f700579d3cf3f5cd15ed96ffb4d88b Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Thu, 27 Oct 2022 14:49:46 +0800
Subject: [PATCH 93/97] =?UTF-8?q?=E6=97=A0jira=20fix:=20less=E4=B8=AD=20.h?=
 =?UTF-8?q?over-visible=20mixin=E4=B9=9F=E5=A4=84=E7=90=86=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8Bcombo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/less/visual.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/less/visual.less b/src/less/visual.less
index 8e227fb8f..3c7601937 100644
--- a/src/less/visual.less
+++ b/src/less/visual.less
@@ -339,7 +339,7 @@
 }
 
 .hover-visible(@cls) {
-  & .@{cls} {
+  & .@{cls}:not(.bi-combo-popup) {
     visibility: hidden;
   }
   &:hover {

From 65b610d2d67d6746a499291753487c72a3d44aa1 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 27 Oct 2022 15:24:45 +0800
Subject: [PATCH 94/97] auto upgrade version to 2.0.20221027152436

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f08a3b639..f321aad08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221027142438",
+  "version": "2.0.20221027152436",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",

From cae15031747af4bb7be9ad657eb1f7cc8d891068 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Thu, 27 Oct 2022 15:30:42 +0800
Subject: [PATCH 95/97] =?UTF-8?q?KERNEL-13158:=20=E5=8C=85=E8=A3=B9BI.Widg?=
 =?UTF-8?q?et.pushContext()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/combination/group.button.js | 12 +++++++-----
 src/base/combination/navigation.js   | 19 +++++++++----------
 src/base/combination/tab.js          | 17 +++++++++--------
 src/core/4.widget.js                 | 11 +++++++++++
 4 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/base/combination/group.button.js b/src/base/combination/group.button.js
index 184a6d146..02b044b17 100644
--- a/src/base/combination/group.button.js
+++ b/src/base/combination/group.button.js
@@ -42,11 +42,13 @@ BI.ButtonGroup = BI.inherit(BI.Widget, {
     },
 
     _createBtns: function (items) {
-        BI.Widget.pushContext(this);
-        var btns = BI.createWidgets(BI.createItems(items, {
-            type: "bi.text_button",
-        }));
-        BI.Widget.popContext();
+        var btns;
+        BI.Widget.execWithContext(this, function () {
+            btns = BI.createWidgets(BI.createItems(items, {
+                type: "bi.text_button",
+            }));
+        });
+
         return btns;
     },
 
diff --git a/src/base/combination/navigation.js b/src/base/combination/navigation.js
index adc3e5ad4..1b347298e 100644
--- a/src/base/combination/navigation.js
+++ b/src/base/combination/navigation.js
@@ -43,11 +43,10 @@ BI.Navigation = BI.inherit(BI.Widget, {
                 return self.showIndex + v;
             },
             cardCreator: function (v) {
-                BI.Widget.pushContext(self);
-                var card = o.cardCreator(v);
-                BI.Widget.popContext();
-                self.cardMap[v] = card;
-                return card;
+                BI.Widget.execWithContext(self, function () {
+                    self.cardMap[v] = o.cardCreator(v);
+                });
+                return self.cardMap[v];
             },
             afterCardCreated: BI.bind(this.afterCardCreated, this),
             afterCardShow: BI.bind(this.afterCardShow, this),
@@ -104,12 +103,12 @@ BI.Navigation = BI.inherit(BI.Widget, {
     },
 
     _assertCard: function (v) {
+        var self = this, o = this.options;
         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);
+            BI.Widget.execWithContext(self, function () {
+                self.cardMap[v] = o.cardCreator(v);
+            });
+            this.layout.addCardByName(v, this.cardMap[v]);
             this.afterCardCreated(v);
         }
     },
diff --git a/src/base/combination/tab.js b/src/base/combination/tab.js
index 85fca3483..9fe862884 100644
--- a/src/base/combination/tab.js
+++ b/src/base/combination/tab.js
@@ -43,10 +43,11 @@ BI.Tab = BI.inherit(BI.Widget, {
             eventObj: this.tab,
             cardLayout: this.layout,
             cardCreator: function (v) {
-                var card = o.cardCreator.apply(self, arguments);
-                self.cardMap[v] = card;
+                BI.Widget.execWithContext(self, function () {
+                    self.cardMap[v] = o.cardCreator.apply(self, arguments);
+                });
 
-                return card;
+                return self.cardMap[v];
             },
             afterCardShow: function (v) {
                 self._deleteOtherCards(v);
@@ -71,12 +72,12 @@ BI.Tab = BI.inherit(BI.Widget, {
     },
 
     _assertCard: function (v) {
+        var self = this, o = this.options;
         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);
+            BI.Widget.execWithContext(this, function () {
+                self.cardMap[v] = o.cardCreator.apply(self, arguments);
+            });
+            this.layout.addCardByName(v, this.cardMap[v]);
         }
     },
 
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index ab85900ff..ce3747adc 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -857,6 +857,17 @@
         BI.Widget.context = context = contextStack.pop();
     };
 
+    BI.Widget.execWithContext = function (context, execFunc) {
+        BI.Widget.pushContext(context);
+        try {
+            execFunc();
+        } catch (e) {
+            throw e;
+        } finally {
+            BI.Widget.popContext();
+        }
+    };
+
     function pushTarget(_current) {
         if (current) currentStack.push(current);
         BI.Widget.current = current = _current;

From 3e440e09fb18aec0f703a3dfa51a0c5b4323fe63 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Thu, 27 Oct 2022 15:35:23 +0800
Subject: [PATCH 96/97] =?UTF-8?q?KERNEL-13158:=20=E5=8C=85=E8=A3=B9BI.Widg?=
 =?UTF-8?q?et.pushContext()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/4.widget.js | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index ce3747adc..3adf1f5f4 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -938,16 +938,6 @@
         return vm;
     };
 
-    BI.execWithContext = function (_context, fn) {
-        BI.Widget.pushContext(_context);
-        try {
-            fn();
-        } catch (e) {
-            // nothing
-        }
-        BI.Widget.popContext();
-    };
-
     BI.watch = function (vm, watch, handler) {
         // 必须要保证组件当前环境存在
         if (BI.Widget.current) {

From 2154234a0825ebc15604b0f83a8464de8e01d853 Mon Sep 17 00:00:00 2001
From: data <dep@finereport.com>
Date: Thu, 27 Oct 2022 16:06:29 +0800
Subject: [PATCH 97/97] auto upgrade version to 2.0.20221027160615

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f321aad08..b86f38463 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20221027152436",
+  "version": "2.0.20221027160615",
   "description": "fineui",
   "main": "dist/fineui_without_conflict.min.js",
   "types": "dist/lib/index.d.ts",