From 88e668820c0b0fd5df125bacabd1f0dbe151c1bb Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 19 May 2022 14:23:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?JSY-17849=20fix:=20=E3=80=90=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3=E3=80=91=E6=95=B0=E6=8D=AE=E5=9B=9E=E5=A1=AB=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E9=81=93=E4=BA=91=E8=A1=A8=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E5=A1=AB-=E5=9B=9E=E5=A1=AB?= =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E6=9C=89=E4=BF=9D=E7=95=99=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/multilayerselecttree/multilayerselecttree.combo.less | 2 +- .../widget/multilayersingletree/multilayersingletree.combo.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less index 4ac60cf49..d1c5771dc 100644 --- a/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less +++ b/src/less/widget/multilayerselecttree/multilayerselecttree.combo.less @@ -7,7 +7,7 @@ border-color: @border-color-negative; } - .bi-trigger .select-text-label { + .bi-trigger .select-text-label, .tip-text-style { color: @color-bi-text-error-text-trigger; } } diff --git a/src/less/widget/multilayersingletree/multilayersingletree.combo.less b/src/less/widget/multilayersingletree/multilayersingletree.combo.less index 6a1390230..15df50877 100644 --- a/src/less/widget/multilayersingletree/multilayersingletree.combo.less +++ b/src/less/widget/multilayersingletree/multilayersingletree.combo.less @@ -6,7 +6,7 @@ border-color: @border-color-negative; } - .bi-trigger .select-text-label { + .bi-trigger .select-text-label, .tip-text-style { color: @color-bi-text-error-text-trigger; } } From b95bc8c344a7cd4f522cd536d04e2c048f406393 Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 19 May 2022 14:45:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?JSY-17849=20fix:=20=E3=80=90=E8=BF=AD?= =?UTF-8?q?=E4=BB=A3=E3=80=91=E6=95=B0=E6=8D=AE=E5=9B=9E=E5=A1=AB=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E9=81=93=E4=BA=91=E8=A1=A8=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=9B=9E=E5=A1=AB-=E5=9B=9E=E5=A1=AB?= =?UTF-8?q?=E8=A1=A8=E6=B2=A1=E6=9C=89=E4=BF=9D=E7=95=99=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../multilayersingletree.combo.js | 32 ------------------- 1 file changed, 32 deletions(-) diff --git a/src/widget/multilayersingletree/multilayersingletree.combo.js b/src/widget/multilayersingletree/multilayersingletree.combo.js index 2060eeaa6..f98501baa 100644 --- a/src/widget/multilayersingletree/multilayersingletree.combo.js +++ b/src/widget/multilayersingletree/multilayersingletree.combo.js @@ -34,38 +34,6 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, { var self = this, o = this.options; return (o.itemsCreator === BI.emptyFn) ? this._getSyncConfig() : this._getAsyncConfig(); - - return this._shouldWrapper() ? combo : { - type: "bi.absolute", - height: o.height, - items: [{ - el: combo, - left: 0, - right: 0, - top: 0, - bottom: 0 - }, { - el: { - type: "bi.trigger_icon_button", - cls: "trigger-icon-button", - ref: function (_ref) { - self.triggerBtn = _ref; - }, - width: o.height, - height: o.height, - handler: function () { - if (self.combo.isViewVisible()) { - self.combo.hideView(); - } else { - self.combo.showView(); - } - } - }, - right: 0, - bottom: 0, - top: 0 - }] - }; }, _shouldWrapper: function () {