From bb7e287448f3371603a8b0af60ebb37880f58464 Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 18:29:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?BI-139664=20fix:=E6=BB=91=E5=9D=97=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../widget/intervalslider/intervalslider.js | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/fineui/src/widget/intervalslider/intervalslider.js b/packages/fineui/src/widget/intervalslider/intervalslider.js index f3a1c4aff..afd1919f3 100644 --- a/packages/fineui/src/widget/intervalslider/intervalslider.js +++ b/packages/fineui/src/widget/intervalslider/intervalslider.js @@ -59,6 +59,10 @@ export class IntervalSlider extends Single { this.populate(); } + getConstant() { + return CONSTANTS; + } + render() { const o = this.options; this.enable = false; @@ -85,7 +89,7 @@ export class IntervalSlider extends Single { text: unit, allowBlank: false, textAlign: lAlign, - width: BI.isNull(editorWidth) ? BI.toPix(CONSTANTS.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2), + width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2), height: toPix(CONSTANTS.EDITOR_HEIGHT, 2), validationChecker: v => this._checkValidation(v), }); @@ -115,7 +119,7 @@ export class IntervalSlider extends Single { text: unit, allowBlank: false, textAlign: rAlign, - width: BI.isNull(editorWidth) ? BI.toPix(CONSTANTS.EDITOR_WIDTH, 2) : BI.toPix(editorWidth, 2), + width: isNull(editorWidth) ? toPix(CONSTANTS.EDITOR_WIDTH, 2) : toPix(editorWidth, 2), height: toPix(CONSTANTS.EDITOR_HEIGHT, 2), validationChecker: v => this._checkValidation(v), }); @@ -384,18 +388,27 @@ export class IntervalSlider extends Single { } } + // 别删，历史原因，定时调度不能用 parentElement.children 函数 + _getElementFirstChild() { + return parentElement.children()[0] + } + _resetLabelPosition(needReverse) { const { lAlign, rAlign } = this.options; + this.labelOne.element.css({ left: needReverse ? "unset" : "0%", right: needReverse ? "0%" : "unset", }); - this.labelOne.element.children()[0] && (this.labelOne.element.children()[0].style.textAlign = needReverse ? rAlign : lAlign); + this._getElementFirstChild(this.labelOne.element) + ?.labelOneChild.css({ textAlign: needReverse ? rAlign : lAlign }); + this.labelTwo.element.css({ - left: needReverse ? "0%" : "unset", - right: needReverse ? "unset" : "0%", + left: needReverse ? "0%" : "unset", + right: needReverse ? "unset" : "0%", }); - this.labelTwo.element.children()[0] && (this.labelTwo.element.children()[0].style.textAlign = needReverse ? lAlign : rAlign); + this._getElementFirstChild(this.labelTwo.element) + ?.css({ textAlign: needReverse ? lAlign : rAlign }); } _setSliderOnePosition(percent) { From 59a94237536078fe2fe3e168cbe3df7c3042fd76 Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 18:31:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?BI-139664=20fix:=E6=BB=91=E5=9D=97=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/widget/intervalslider/intervalslider.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/widget/intervalslider/intervalslider.js b/packages/fineui/src/widget/intervalslider/intervalslider.js index afd1919f3..413fa78ad 100644 --- a/packages/fineui/src/widget/intervalslider/intervalslider.js +++ b/packages/fineui/src/widget/intervalslider/intervalslider.js @@ -388,8 +388,8 @@ export class IntervalSlider extends Single { } } - // 别删，历史原因，定时调度不能用 parentElement.children 函数 - _getElementFirstChild() { + // 别删，历史原因，定时调度不能用 element.children 函数 + _getElementFirstChild(parentElement) { return parentElement.children()[0] } From d1357ed07e4ca1480e5c6d065762dc5ca8c77f93 Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 18:48:37 +0800 Subject: [PATCH 3/6] =?UTF-8?q?BI-139664=20fix:=E6=BB=91=E5=9D=97=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/widget/intervalslider/intervalslider.js | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/fineui/src/widget/intervalslider/intervalslider.js b/packages/fineui/src/widget/intervalslider/intervalslider.js index 413fa78ad..63c1af7b8 100644 --- a/packages/fineui/src/widget/intervalslider/intervalslider.js +++ b/packages/fineui/src/widget/intervalslider/intervalslider.js @@ -388,27 +388,18 @@ export class IntervalSlider extends Single { } } - // 别删，历史原因，定时调度不能用 element.children 函数 - _getElementFirstChild(parentElement) { - return parentElement.children()[0] - } - _resetLabelPosition(needReverse) { const { lAlign, rAlign } = this.options; - this.labelOne.element.css({ left: needReverse ? "unset" : "0%", right: needReverse ? "0%" : "unset", }); - this._getElementFirstChild(this.labelOne.element) - ?.labelOneChild.css({ textAlign: needReverse ? rAlign : lAlign }); - + this.labelOne.element.children()[0] && (this.labelOne.element.children()[0].style.textAlign = needReverse ? rAlign : lAlign); this.labelTwo.element.css({ - left: needReverse ? "0%" : "unset", - right: needReverse ? "unset" : "0%", + left: needReverse ? "0%" : "unset", + right: needReverse ? "unset" : "0%", }); - this._getElementFirstChild(this.labelTwo.element) - ?.css({ textAlign: needReverse ? lAlign : rAlign }); + this.labelTwo.element.children()[0] && (this.labelTwo.element.children()[0].style.textAlign = needReverse ? lAlign : rAlign); } _setSliderOnePosition(percent) { From c9f21b2950aa2b6196d7ceb89944c4efddaf54ed Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 20:28:28 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=97=A0jira=20fix:bind?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/widget/singleslider/button/editor.sign.text.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/widget/singleslider/button/editor.sign.text.js b/packages/fineui/src/widget/singleslider/button/editor.sign.text.js index da7c44cb9..7c9608307 100644 --- a/packages/fineui/src/widget/singleslider/button/editor.sign.text.js +++ b/packages/fineui/src/widget/singleslider/button/editor.sign.text.js @@ -106,17 +106,18 @@ export class SignTextEditor extends Widget { _checkText() { const o = this.options; nextTick( - bind(() => { + () => { if (this.editor.getValue() === "") { this.text.setValue(o.watermark || ""); this.text.element.addClass("bi-water-mark"); } else { let v = this.editor.getValue(); v = isEmpty(v) || v === o.text ? o.text : v + o.text; + console.log(v) this.text.setValue(v); this.text.element.removeClass("bi-water-mark"); } - }, this) + } ); } From ade902d4e67b2ba064aa773df8fb584e66b0e4ff Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 22:28:50 +0800 Subject: [PATCH 5/6] =?UTF-8?q?BI-137647=20fix:=E5=8D=95=E9=80=89=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/less/base/single/input/radio.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/fineui/src/less/base/single/input/radio.less b/packages/fineui/src/less/base/single/input/radio.less index a1aaa4071..52e569874 100644 --- a/packages/fineui/src/less/base/single/input/radio.less +++ b/packages/fineui/src/less/base/single/input/radio.less @@ -15,6 +15,9 @@ border-color: @color-bi-border-hover-active-radio; } } + .bi-radio-icon { + background-color: @color-bi-background-active-radio-content; + } &.active { & .radio-content, &.radio-content { border-color: @color-bi-border-hover-active-radio; From 91d175508d2476d24faa0a2777778c4abfcb9a2c Mon Sep 17 00:00:00 2001 From: treecat <2184452844@qq.com> Date: Sun, 3 Dec 2023 22:36:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=97=A0jira=20chore:=20console.log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fineui/src/widget/singleslider/button/editor.sign.text.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/fineui/src/widget/singleslider/button/editor.sign.text.js b/packages/fineui/src/widget/singleslider/button/editor.sign.text.js index 7c9608307..c03ba34bc 100644 --- a/packages/fineui/src/widget/singleslider/button/editor.sign.text.js +++ b/packages/fineui/src/widget/singleslider/button/editor.sign.text.js @@ -113,7 +113,6 @@ export class SignTextEditor extends Widget { } else { let v = this.editor.getValue(); v = isEmpty(v) || v === o.text ? o.text : v + o.text; - console.log(v) this.text.setValue(v); this.text.element.removeClass("bi-water-mark"); }