From 5c6678662849293629c80a453339add569859e4a Mon Sep 17 00:00:00 2001 From: zsmj Date: Thu, 20 Oct 2022 10:13:52 +0800 Subject: [PATCH 1/3] =?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 Date: Thu, 20 Oct 2022 10:14:28 +0800 Subject: [PATCH 2/3] =?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 Date: Thu, 20 Oct 2022 11:35:56 +0800 Subject: [PATCH 3/3] =?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 {