From c38f45b695a814b44693dd437e7e301437d622eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Thu, 24 Mar 2022 18:03:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?REPORT-63368=20=E4=BF=AE=E5=A4=8D=E6=A0=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=B1=95=E5=BC=80=E5=90=8E=E5=B7=A6=E8=BE=B9?= =?UTF-8?q?=E7=BA=BF=E5=AF=B9=E4=B8=8D=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/button/node/node.first.plus.js | 2 +- src/case/button/node/node.last.plus.js | 2 +- src/case/button/node/node.mid.plus.js | 2 +- src/less/base/tree/tree.expander.less | 6 ++++-- src/less/resource/background.less | 1 + src/widget/selecttree/nodes/node.first.plus.js | 2 +- src/widget/selecttree/nodes/node.last.plus.js | 2 +- src/widget/selecttree/nodes/node.mid.plus.js | 2 +- 8 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/case/button/node/node.first.plus.js b/src/case/button/node/node.first.plus.js index 3489f2a32..989cdec0b 100644 --- a/src/case/button/node/node.first.plus.js +++ b/src/case/button/node/node.first.plus.js @@ -50,7 +50,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.last.plus.js b/src/case/button/node/node.last.plus.js index b7bedc519..c1a949e3b 100644 --- a/src/case/button/node/node.last.plus.js +++ b/src/case/button/node/node.last.plus.js @@ -50,7 +50,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/case/button/node/node.mid.plus.js b/src/case/button/node/node.mid.plus.js index 6286db826..839565114 100644 --- a/src/case/button/node/node.mid.plus.js +++ b/src/case/button/node/node.mid.plus.js @@ -50,7 +50,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT / 2, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index 76a77a655..b75f0205b 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -1,10 +1,12 @@ @import "../../index"; +@import "../../image"; +@import "../../lib/icon"; .bi-tree-expander-popup.line:before { position: absolute; content: ""; - border-left: 1px dashed @color-bi-border-tree-expander-popup-line; height: 100%; - left: 11px; + width: 24px; + .imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y); } .bi-tree-expander-popup.line.solid:before { diff --git a/src/less/resource/background.less b/src/less/resource/background.less index 28fd5f1c0..4e1c6a51e 100644 --- a/src/less/resource/background.less +++ b/src/less/resource/background.less @@ -1,6 +1,7 @@ @import "../image"; @import "../lib/icon"; @import "../lib/background"; +@import "../base/tree/tree.expander.less"; .bi-display-tree { & .ztree li span.button.switch.center_open { diff --git a/src/widget/selecttree/nodes/node.first.plus.js b/src/widget/selecttree/nodes/node.first.plus.js index f975ea00e..f8f23c2b5 100644 --- a/src/widget/selecttree/nodes/node.first.plus.js +++ b/src/widget/selecttree/nodes/node.first.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/widget/selecttree/nodes/node.last.plus.js b/src/widget/selecttree/nodes/node.last.plus.js index 0cab47f4b..2c4cca80c 100644 --- a/src/widget/selecttree/nodes/node.last.plus.js +++ b/src/widget/selecttree/nodes/node.last.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ diff --git a/src/widget/selecttree/nodes/node.mid.plus.js b/src/widget/selecttree/nodes/node.mid.plus.js index b2ec407d0..289136242 100644 --- a/src/widget/selecttree/nodes/node.mid.plus.js +++ b/src/widget/selecttree/nodes/node.mid.plus.js @@ -49,7 +49,7 @@ BI.SelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, { }); var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left); var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { - width: 24, + width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT, el: this.checkbox }, this.text); BI.createWidget(BI.extend({ From d6df26431a04ec0ef9d8c4cca6d6df417e2918d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=95=AC=E5=B3=A5?= Date: Tue, 29 Mar 2022 10:08:50 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-63368=20=E6=A0=91=E7=BB=84=E4=BB=B6s?= =?UTF-8?q?olid=20line=E5=92=8Cdark=E9=A3=8E=E6=A0=BC=E7=BA=BF=E4=B8=8D?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/tree/tree.expander.less | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/less/base/tree/tree.expander.less b/src/less/base/tree/tree.expander.less index b75f0205b..b2e5b0c85 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -10,15 +10,19 @@ } .bi-tree-expander-popup.line.solid:before { - border-left: 1px solid @color-bi-border-tree-expander-popup-line; - left: 15px; + .imagePath(@icon-tree-solid-vertical-line-1, 0, 0, repeat-y); + width: 24px; + left:4px; } .bi-theme-dark { .bi-tree-expander-popup.line:before { - border-left: 1px dashed @color-bi-border-tree-expander-popup-line-theme-dark; + width: 24px; + .imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y); } .bi-tree-expander-popup.line.solid:before { - border-left: 1px solid @color-bi-border-tree-expander-popup-line-theme-dark; + .imagePath(@icon-tree-solid-vertical-line-1-theme-dark, 0, 0, repeat-y); + width: 24px; + left:4px; } }