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..b2e5b0c85 100644 --- a/src/less/base/tree/tree.expander.less +++ b/src/less/base/tree/tree.expander.less @@ -1,22 +1,28 @@ @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 { - 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; } } 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({