From 7ebcfd8fdaa22d2e46abdda036cbb171c638a945 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Fri, 20 Aug 2021 16:28:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?CHART-19948=20fix:=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=97=B6=E6=98=BE=E7=A4=BA=E5=8D=8A=E9=80=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/toolbar/toolbar.multiselect.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/case/toolbar/toolbar.multiselect.js b/src/case/toolbar/toolbar.multiselect.js index b8698119d..08b18a495 100644 --- a/src/case/toolbar/toolbar.multiselect.js +++ b/src/case/toolbar/toolbar.multiselect.js @@ -90,6 +90,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { _setSelected: function (v) { this.checkbox.setSelected(!!v); + this.setHalfSelected(!v); }, // 自己手动控制选中 From 5cd0ac1f89b7f18f21f75c8d050a34eaacb33fe6 Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 23 Aug 2021 17:11:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?CHART-19948=20fix:=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E6=97=B6=E6=98=BE=E7=A4=BA=E5=8D=8A=E9=80=89?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/toolbar/toolbar.multiselect.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/case/toolbar/toolbar.multiselect.js b/src/case/toolbar/toolbar.multiselect.js index 08b18a495..c10ba6cb1 100644 --- a/src/case/toolbar/toolbar.multiselect.js +++ b/src/case/toolbar/toolbar.multiselect.js @@ -90,7 +90,6 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { _setSelected: function (v) { this.checkbox.setSelected(!!v); - this.setHalfSelected(!v); }, // 自己手动控制选中 @@ -131,7 +130,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, { setValue: function (selectedValues) { BI.MultiSelectBar.superclass.setValue.apply(this, arguments); var isAllChecked = this.options.isAllCheckedBySelectedValue.apply(this, arguments); - this._setSelected(isAllChecked); + this.setSelected(isAllChecked); !isAllChecked && this.setHalfSelected(this.options.isHalfCheckedBySelectedValue.apply(this, arguments)); }, From bd9fe547068c10fda1ff50956d1a6f573a22291f Mon Sep 17 00:00:00 2001 From: Tangjinxia <1119518763@qq.com> Date: Mon, 23 Aug 2021 17:12:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?BI-92646=20fix:=E9=80=89=E8=89=B2=E6=8E=A7?= =?UTF-8?q?=E4=BB=B6=E8=89=B2=E5=80=BC=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/colorchooser/colorchooser.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index ff10a642a..4eb14fdce 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -19,7 +19,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { _init: function () { var self = this, o = this.options; BI.ColorChooser.superclass._init.apply(this, arguments); - o.value = o.value || ""; + o.value = (o.value || "").toLowerCase(); this.combo = BI.createWidget({ type: "bi.combo", element: this, @@ -91,7 +91,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { }, setValue: function (color) { - this.combo.setValue(color || ""); + this.combo.setValue((color || "").toLowerCase()); }, getValue: function () {