From f7c9c9a3417a17d1b5a97b9c4376f5b6a8baeebb Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 8 Mar 2022 14:27:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feature=EF=BC=9A=20disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/4.widget.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 2d5c3d8da..f01b0bfa7 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -570,12 +570,12 @@ throw new Error("组件：组件名已存在，不能进行添加"); } widget._setParent && widget._setParent(this); - // if(!this.isEnabled()){ - // widget._setEnable(false); - // } - // if(!this.isValid()){ - // widget._setValid(false); - // } + if (!this.options.disabled) { + widget.options && (widget.options.disabled = false); + } + if (!this.options.invalid) { + widget.options && (widget.options.invalid = false); + } widget.on(BI.Events.DESTROY, function () { BI.remove(self._children, this); }); From f02a4d2e702bf7bbb3f52dc4dadd3d60a09d39ec Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 10 Mar 2022 10:29:42 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feature=EF=BC=9A=20disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/4.widget.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index f01b0bfa7..bddc7caba 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -570,11 +570,11 @@ throw new Error("组件：组件名已存在，不能进行添加"); } widget._setParent && widget._setParent(this); - if (!this.options.disabled) { - widget.options && (widget.options.disabled = false); + if (this.options.disabled) { + widget.options && (widget.options.disabled = true); } - if (!this.options.invalid) { - widget.options && (widget.options.invalid = false); + if (this.options.invalid) { + widget.options && (widget.options.invalid = true); } widget.on(BI.Events.DESTROY, function () { BI.remove(self._children, this); From f73da9c5ee4344bdf5e30067887ec5a56871becb Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 10 Mar 2022 13:46:20 +0800 Subject: [PATCH 3/5] chore: bugfix --- src/less/base/tree/tree.expander.less | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index 371e39eec..76a77a655 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -13,6 +13,9 @@ } .bi-theme-dark { + .bi-tree-expander-popup.line:before { + border-left: 1px dashed @color-bi-border-tree-expander-popup-line-theme-dark; + } .bi-tree-expander-popup.line.solid:before { border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark; } From e283eeff82c449c21fe016b1d5f82fd2032a5cae Mon Sep 17 00:00:00 2001 From: data Date: Thu, 10 Mar 2022 13:53:49 +0800 Subject: [PATCH 4/5] auto upgrade version to 2.0.20220310135341 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9341362e9..449763d6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220309184345", + "version": "2.0.20220310135341", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 6073ed20f3c21f1e4780793eeca70bc6d20bf58e Mon Sep 17 00:00:00 2001 From: data Date: Thu, 10 Mar 2022 14:03:47 +0800 Subject: [PATCH 5/5] auto upgrade version to 2.0.20220310140337 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 449763d6e..e6824771b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220310135341", + "version": "2.0.20220310140337", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",