fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Revert "BI-44244 适配树的高度" 

This reverts commit cf821cac08.
es6
windy 5 years ago
parent
b64256e058
commit
78863c26f5
20 changed files with 32 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      public/css/background.css
  2. 4
      src/case/button/treeitem/item.first.treeleaf.js
  3. 4
      src/case/button/treeitem/item.last.treeleaf.js
  4. 4
      src/case/button/treeitem/item.mid.treeleaf.js
  5. 4
      src/css/base/colorchooser/colorpicker/editor.css
  6. 6
      src/css/base/tree/ztree.css
  7. 4
      src/css/resource/background.css
  8. 6
      src/less/base/tree/ztree.less
  9. 4
      src/less/resource/background.less
  10. 2
      src/widget/multilayerselecttree/node/node.first.plus.js
  11. 2
      src/widget/multilayerselecttree/node/node.last.plus.js
  12. 2
      src/widget/multilayerselecttree/node/node.mid.plus.js
  13. 2
      src/widget/multilayerselecttree/node/node.plus.js
  14. 2
      src/widget/multilayersingletree/node/node.first.plus.js
  15. 2
      src/widget/multilayersingletree/node/node.last.plus.js
  16. 2
      src/widget/multilayersingletree/node/node.mid.plus.js
  17. 2
      src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
  18. 2
      src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
  19. 2
      src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
  20. 4
      ui/css/background.css

4
public/css/background.css
Unescape View File

@ -17,10 +17,10 @@
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_4.png') no-repeat center center;
}
.ztree li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('http://fine-design-storage.oss-cn-shanghai.aliyuncs.com/fineui/2.0/images/2x/icon/check_box_normal.png') no-repeat center center;

4
src/case/button/treeitem/item.first.treeleaf.js
Unescape View File

@ -42,11 +42,11 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
width: 16,
width: 15,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
}
}), {

4
src/case/button/treeitem/item.last.treeleaf.js
Unescape View File

@ -42,11 +42,11 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
width: 16,
width: 15,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
}
}), {

4
src/case/button/treeitem/item.mid.treeleaf.js
Unescape View File

@ -42,11 +42,11 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
});
var type = BI.LogicFactory.createLogicTypeByDirection(BI.Direction.Left);
var items = BI.LogicFactory.createLogicItemsByDirection(BI.Direction.Left, ((o.layer === 0) ? "" : {
width: 16,
width: 15,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
}
}), {

4
src/css/base/colorchooser/colorpicker/editor.css
Unescape View File

@ -17,10 +17,10 @@
background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center;
}
.ztree li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('images/2x/icon/check_box_normal.png') no-repeat center center;

6
src/css/base/tree/ztree.css
Unescape View File

@ -17,7 +17,7 @@
}
.ztree li ul {
margin: 0;
padding: 0 0 0 22px;
padding: 0 0 0 18px;
}
.ztree li a {
padding: 1px 3px 0 0;
@ -137,8 +137,8 @@
background-position: -42px -56px;
}
.ztree li span.button.switch {
width: 30px;
height: 30px;
width: 25px;
height: 25px;
}
.ztree li span.button.noline_open {
background-position: -92px -72px;

4
src/css/resource/background.css
Unescape View File

@ -17,10 +17,10 @@
background: url('images/1x/icon/tree_vertical_line_4.png') no-repeat center center;
}
.ztree li ul.line {
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('images/2x/icon/check_box_normal.png') no-repeat center center;

6
src/less/base/tree/ztree.less
Unescape View File

@ -22,7 +22,7 @@
.ztree li ul {
margin: 0;
padding: 0 0 0 22px
padding: 0 0 0 18px
}
.ztree li a {
@ -181,8 +181,8 @@
}
.ztree li span.button.switch {
width: 30px;
height: 30px
width: 25px;
height: 25px
}
.ztree li span.button.noline_open {

4
src/less/resource/background.less
Unescape View File

@ -29,12 +29,12 @@
}
.ztree li ul.line {
.imagePath(@icon-tree-vertical-line-1, 0, 0, repeat-y);
.imagePath(@icon-tree-vertical-line-1, 0, 1px, repeat-y);
}
.bi-theme-dark {
.ztree li ul.line {
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 0, repeat-y);
.imagePath(@icon-tree-vertical-line-1-theme-dark, 0, 1px, repeat-y);
}
}

2
src/widget/multilayerselecttree/node/node.first.plus.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayerselecttree/node/node.last.plus.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayerselecttree/node/node.mid.plus.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSelectTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayerselecttree/node/node.plus.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSelectTreePlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/node/node.first.plus.js
Unescape View File

@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/node/node.last.plus.js
Unescape View File

@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/node/node.mid.plus.js
Unescape View File

@ -36,7 +36,7 @@ BI.MultiLayerSingleTreeMidPlusGroupNode = BI.inherit(BI.NodeButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/treeitem/item.first.treeleaf.js
Unescape View File

@ -57,7 +57,7 @@ BI.MultiLayerSingleTreeFirstTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/treeitem/item.last.treeleaf.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeLastTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

2
src/widget/multilayersingletree/treeitem/item.mid.treeleaf.js
Unescape View File

@ -56,7 +56,7 @@ BI.MultiLayerSingleTreeMidTreeLeafItem = BI.inherit(BI.BasicButton, {
items.push({
type: "bi.layout",
cls: BI.contains(needBlankLayers, index) ? "" : "base-line-conn-background",
width: 16,
width: 15,
height: o.height
});
});

4
ui/css/background.css
Unescape View File

@ -17,10 +17,10 @@
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_4.png') no-repeat center center;
}
.ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/tree_vertical_line_1.png') repeat-y 1px 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
background: url('resources?path=/com/fr/web/ui/images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('resources?path=/com/fr/web/ui/images/2x/icon/check_box_normal.png') no-repeat center center;

Write Preview
Loading…
Cancel
Save