From 86c6326994f8795d5a216688cbfd6c599ea563ad Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 5 Aug 2021 15:46:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20width?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=AF=E6=8C=81=20calc?= 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 3aa8a155b..7430f464c 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -500,7 +500,7 @@ if (!_global.BI) { if (typeof w === "number") { return w >= 0; } else if (typeof w === "string") { - return /^\d{1,3}(\.\d)?%$/.exec(w) || w == "auto" || /^\d+px$/.exec(w); + return /^\d{1,3}(\.\d)?%$/.test(w) || w == "auto" || /^\d+px$/.test(w) || /^calc/.test(w); } }, From ee5c6e0e27853cb44260a6ba38ad5233c21c1eb5 Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 5 Aug 2021 15:50:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=97=A0JIRA=20=E8=A7=84=E8=8C=83?= 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 7430f464c..16a4a9f70 100644 --- a/src/core/2.base.js +++ b/src/core/2.base.js @@ -500,7 +500,7 @@ if (!_global.BI) { 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+px$/.test(w) || /^calc/.test(w); } }, From 051f3200bfd2c83836cab9f3af2bd92915057c43 Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 5 Aug 2021 16:28:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=97=A0JIRA=20bubble=5Fcombo=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0logic=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/combo/bubblecombo/combo.bubble.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/case/combo/bubblecombo/combo.bubble.js b/src/case/combo/bubblecombo/combo.bubble.js index b610cf021..dcf6f62e0 100644 --- a/src/case/combo/bubblecombo/combo.bubble.js +++ b/src/case/combo/bubblecombo/combo.bubble.js @@ -36,6 +36,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, { element: this, trigger: o.trigger, toggle: o.toggle, + logic: o.logic, container: o.container, direction: o.direction, isDefaultInit: o.isDefaultInit, From 4319606580627ccef9ceaaf94340837fb454bcca Mon Sep 17 00:00:00 2001 From: dailer Date: Thu, 5 Aug 2021 18:33:06 +0800 Subject: [PATCH 4/4] update changelog --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 9e23a72dc..d9159329c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,6 @@ # 更新日志 2.0(2021-07) +- width属性支持calc() - 修改了颜色选择器交互 - 新增bi.horizontal_fill、bi.vertical_fill布局 - 增加module定义插件版本号