Browse Source

Pull request #2605: REPORT-63368 修复树组件展开后左边线对不齐问题

Merge in VISUAL/fineui from ~AEOLUS.ZHANG/fineui:feature-fixbug to master

* commit 'd6df26431a04ec0ef9d8c4cca6d6df417e2918d8':
  REPORT-63368 树组件solid line和dark风格线不对齐修复
  REPORT-63368 修复树组件展开后左边线对不齐问题
es6
Aeolus.Zhang 3 years ago
parent
commit
07f325de19
  1. 2
      src/case/button/node/node.first.plus.js
  2. 2
      src/case/button/node/node.last.plus.js
  3. 2
      src/case/button/node/node.mid.plus.js
  4. 18
      src/less/base/tree/tree.expander.less
  5. 1
      src/less/resource/background.less
  6. 2
      src/widget/selecttree/nodes/node.first.plus.js
  7. 2
      src/widget/selecttree/nodes/node.last.plus.js
  8. 2
      src/widget/selecttree/nodes/node.mid.plus.js

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 24, width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 24, width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(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 el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

18
src/less/base/tree/tree.expander.less

@ -1,22 +1,28 @@
@import "../../index"; @import "../../index";
@import "../../image";
@import "../../lib/icon";
.bi-tree-expander-popup.line:before { .bi-tree-expander-popup.line:before {
position: absolute; position: absolute;
content: ""; content: "";
border-left: 1px dashed @color-bi-border-tree-expander-popup-line;
height: 100%; height: 100%;
left: 11px; width: 24px;
.imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y);
} }
.bi-tree-expander-popup.line.solid:before { .bi-tree-expander-popup.line.solid:before {
border-left: 1px solid @color-bi-border-tree-expander-popup-line; .imagePath(@icon-tree-solid-vertical-line-1, 0, 0, repeat-y);
left: 15px; width: 24px;
left:4px;
} }
.bi-theme-dark { .bi-theme-dark {
.bi-tree-expander-popup.line:before { .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 { .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;
} }
} }

1
src/less/resource/background.less

@ -1,6 +1,7 @@
@import "../image"; @import "../image";
@import "../lib/icon"; @import "../lib/icon";
@import "../lib/background"; @import "../lib/background";
@import "../base/tree/tree.expander.less";
.bi-display-tree { .bi-display-tree {
& .ztree li span.button.switch.center_open { & .ztree li span.button.switch.center_open {

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 24, width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 24, width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

2
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 type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, { var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, {
width: 24, width: BI.SIZE_CONSANTS.LIST_ITEM_HEIGHT,
el: this.checkbox el: this.checkbox
}, this.text); }, this.text);
BI.createWidget(BI.extend({ BI.createWidget(BI.extend({

Loading…
Cancel
Save