Browse Source

Merge pull request #974 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '1c2cac1a6b845d793c06c8aaa3000b2a48a77054':
  高度调整
  BI-44244 适配树的高度
  BI-44244 列表高度
  无JIRA任务 combo destroy的时候没有删除resizers
es6
guy 5 years ago
parent
commit
8663346634
  1. 3
      demo/js/case/list/demo.select_list.js
  2. 2
      demo/js/core/abstract/combination/demo.combo.js
  3. 5
      demo/js/core/layout/demo.absolute.js
  4. 3
      demo/js/widget/basewidget/demo.items.js
  5. BIN
      dist/images/1x/icon/dark/tree_collapse_1.png
  6. BIN
      dist/images/1x/icon/dark/tree_collapse_2.png
  7. BIN
      dist/images/1x/icon/dark/tree_collapse_3.png
  8. BIN
      dist/images/1x/icon/dark/tree_collapse_4.png
  9. BIN
      dist/images/1x/icon/dark/tree_expand_1.png
  10. BIN
      dist/images/1x/icon/dark/tree_expand_2.png
  11. BIN
      dist/images/1x/icon/dark/tree_expand_3.png
  12. BIN
      dist/images/1x/icon/dark/tree_expand_4.png
  13. BIN
      dist/images/1x/icon/dark/tree_vertical_line_1.png
  14. BIN
      dist/images/1x/icon/dark/tree_vertical_line_2.png
  15. BIN
      dist/images/1x/icon/dark/tree_vertical_line_3.png
  16. BIN
      dist/images/1x/icon/dark/tree_vertical_line_4.png
  17. BIN
      dist/images/1x/icon/dark/tree_vertical_line_5.png
  18. BIN
      dist/images/1x/icon/tree_collapse_1.png
  19. BIN
      dist/images/1x/icon/tree_collapse_2.png
  20. BIN
      dist/images/1x/icon/tree_collapse_3.png
  21. BIN
      dist/images/1x/icon/tree_collapse_4.png
  22. BIN
      dist/images/1x/icon/tree_expand_1.png
  23. BIN
      dist/images/1x/icon/tree_expand_2.png
  24. BIN
      dist/images/1x/icon/tree_expand_3.png
  25. BIN
      dist/images/1x/icon/tree_expand_4.png
  26. BIN
      dist/images/1x/icon/tree_vertical_line_1.png
  27. BIN
      dist/images/1x/icon/tree_vertical_line_2.png
  28. BIN
      dist/images/1x/icon/tree_vertical_line_3.png
  29. BIN
      dist/images/1x/icon/tree_vertical_line_4.png
  30. BIN
      dist/images/1x/icon/tree_vertical_line_5.png
  31. BIN
      dist/images/2x/icon/dark/tree_collapse_1.png
  32. BIN
      dist/images/2x/icon/dark/tree_collapse_2.png
  33. BIN
      dist/images/2x/icon/dark/tree_collapse_3.png
  34. BIN
      dist/images/2x/icon/dark/tree_collapse_4.png
  35. BIN
      dist/images/2x/icon/dark/tree_expand_1.png
  36. BIN
      dist/images/2x/icon/dark/tree_expand_2.png
  37. BIN
      dist/images/2x/icon/dark/tree_expand_3.png
  38. BIN
      dist/images/2x/icon/dark/tree_expand_4.png
  39. BIN
      dist/images/2x/icon/dark/tree_vertical_line_1.png
  40. BIN
      dist/images/2x/icon/dark/tree_vertical_line_2.png
  41. BIN
      dist/images/2x/icon/dark/tree_vertical_line_3.png
  42. BIN
      dist/images/2x/icon/dark/tree_vertical_line_4.png
  43. BIN
      dist/images/2x/icon/dark/tree_vertical_line_5.png
  44. BIN
      dist/images/2x/icon/tree_collapse_1.png
  45. BIN
      dist/images/2x/icon/tree_collapse_2.png
  46. BIN
      dist/images/2x/icon/tree_collapse_3.png
  47. BIN
      dist/images/2x/icon/tree_collapse_4.png
  48. BIN
      dist/images/2x/icon/tree_expand_1.png
  49. BIN
      dist/images/2x/icon/tree_expand_2.png
  50. BIN
      dist/images/2x/icon/tree_expand_3.png
  51. BIN
      dist/images/2x/icon/tree_expand_4.png
  52. BIN
      dist/images/2x/icon/tree_vertical_line_1.png
  53. BIN
      dist/images/2x/icon/tree_vertical_line_2.png
  54. BIN
      dist/images/2x/icon/tree_vertical_line_3.png
  55. BIN
      dist/images/2x/icon/tree_vertical_line_4.png
  56. BIN
      dist/images/2x/icon/tree_vertical_line_5.png
  57. 4
      public/css/background.css
  58. 3
      src/base/combination/combo.js
  59. 3
      src/base/combination/searcher.js
  60. 4
      src/case/button/node/node.arrow.js
  61. 2
      src/case/button/node/node.first.plus.js
  62. 2
      src/case/button/node/node.icon.arrow.js
  63. 2
      src/case/button/node/node.last.plus.js
  64. 2
      src/case/button/node/node.mid.plus.js
  65. 2
      src/case/button/node/node.multilayer.icon.arrow.js
  66. 2
      src/case/button/node/node.plus.js
  67. 10
      src/case/button/treeitem/item.first.treeleaf.js
  68. 2
      src/case/button/treeitem/item.icon.treeleaf.js
  69. 10
      src/case/button/treeitem/item.last.treeleaf.js
  70. 10
      src/case/button/treeitem/item.mid.treeleaf.js
  71. 2
      src/case/button/treeitem/item.multilayer.icon.treeleaf.js
  72. 2
      src/case/button/treeitem/item.treetextleaf.js
  73. 4
      src/case/calendar/calendar.js
  74. 4
      src/case/calendar/calendar.year.js
  75. 4
      src/case/checkbox/check.first.treenode.js
  76. 4
      src/case/checkbox/check.last.treenode.js
  77. 4
      src/case/checkbox/check.mid.treenode.js
  78. 4
      src/case/checkbox/check.treenode.js
  79. 4
      src/case/combo/iconcombo/popup.iconcombo.js
  80. 2
      src/case/combo/icontextvaluecombo/combo.icontextvalue.js
  81. 4
      src/case/combo/icontextvaluecombo/popup.icontextvalue.js
  82. 2
      src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js
  83. 2
      src/case/combo/textvaluecombo/combo.textvalue.js
  84. 2
      src/case/combo/textvaluecombo/combo.textvaluesmall.js
  85. 4
      src/case/combo/textvaluecombo/popup.textvalue.js
  86. 4
      src/css/base/colorchooser/colorpicker/editor.css
  87. 10
      src/css/base/tree/ztree.css
  88. 4
      src/css/resource/background.css
  89. 10
      src/less/base/tree/ztree.less
  90. 4
      src/less/resource/background.less
  91. 2
      src/widget/datetime/datetime.combo.js
  92. 4
      src/widget/datetime/datetime.popup.js
  93. 2
      src/widget/downlist/item.downlist.js
  94. 2
      src/widget/downlist/popup.downlist.js
  95. 4
      src/widget/dynamicdate/dynamicdate.popup.js
  96. 4
      src/widget/dynamicdatetime/dynamicdatetime.popup.js
  97. 4
      src/widget/month/popup.month.js
  98. 2
      src/widget/multilayerdownlist/popup.downlist.js
  99. 6
      src/widget/multilayerselecttree/node/node.first.plus.js
  100. 6
      src/widget/multilayerselecttree/node/node.last.plus.js
  101. Some files were not shown because too many files have changed in this diff Show More

3
demo/js/case/list/demo.select_list.js

@ -18,7 +18,8 @@ Demo.Func = BI.inherit(BI.Widget, {
}
},
items: BI.createItems(BI.deepClone(Demo.CONSTANTS.SIMPLE_ITEMS), {
type: "bi.multi_select_item"
type: "bi.multi_select_item",
height: 30
})
});
}

2
demo/js/core/abstract/combination/demo.combo.js

@ -152,7 +152,7 @@ Demo.Func = BI.inherit(BI.Widget, {
type: "bi.button_group",
items: BI.createItems(BI.deepClone(this.years), {
type: "bi.single_select_radio_item",
height: 25,
height: 30,
handler: function (v) {
}

5
demo/js/core/layout/demo.absolute.js

@ -5,15 +5,16 @@ Demo.AbsoluteLayout = BI.inherit(BI.Widget, {
render: function () {
return {
type: "bi.absolute",
scrollx: true,
items: [{
el: {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
width: 800,
height: 200
},
left: 100,
right: 100,
top: 100
}]
};

3
demo/js/widget/basewidget/demo.items.js

@ -16,9 +16,11 @@ Demo.Items = BI.inherit(BI.Widget, {
text: "单选item"
}, {
type: "bi.single_select_item",
height: 30,
text: "单选项"
}, {
type: "bi.single_select_radio_item",
height: 30,
text: "单选项"
}, {
type: "bi.label",
@ -26,6 +28,7 @@ Demo.Items = BI.inherit(BI.Widget, {
text: "复选item"
}, {
type: "bi.multi_select_item",
height: 30,
text: "复选项"
}, {
type: "bi.switch",

BIN
dist/images/1x/icon/dark/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 210 B

BIN
dist/images/1x/icon/dark/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 B

After

Width:  |  Height:  |  Size: 247 B

BIN
dist/images/1x/icon/dark/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 257 B

BIN
dist/images/1x/icon/dark/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 236 B

After

Width:  |  Height:  |  Size: 244 B

BIN
dist/images/1x/icon/dark/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 171 B

After

Width:  |  Height:  |  Size: 188 B

BIN
dist/images/1x/icon/dark/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

After

Width:  |  Height:  |  Size: 218 B

BIN
dist/images/1x/icon/dark/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 227 B

After

Width:  |  Height:  |  Size: 230 B

BIN
dist/images/1x/icon/dark/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 217 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 166 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 153 B

BIN
dist/images/1x/icon/dark/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 147 B

BIN
dist/images/1x/icon/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 209 B

BIN
dist/images/1x/icon/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 243 B

BIN
dist/images/1x/icon/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 253 B

BIN
dist/images/1x/icon/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 239 B

BIN
dist/images/1x/icon/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 188 B

BIN
dist/images/1x/icon/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 214 B

BIN
dist/images/1x/icon/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 226 B

BIN
dist/images/1x/icon/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 204 B

After

Width:  |  Height:  |  Size: 214 B

BIN
dist/images/1x/icon/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 102 B

After

Width:  |  Height:  |  Size: 102 B

BIN
dist/images/1x/icon/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 B

After

Width:  |  Height:  |  Size: 154 B

BIN
dist/images/1x/icon/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 162 B

After

Width:  |  Height:  |  Size: 171 B

BIN
dist/images/1x/icon/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

After

Width:  |  Height:  |  Size: 153 B

BIN
dist/images/1x/icon/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

After

Width:  |  Height:  |  Size: 147 B

BIN
dist/images/2x/icon/dark/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 311 B

BIN
dist/images/2x/icon/dark/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 370 B

BIN
dist/images/2x/icon/dark/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 338 B

After

Width:  |  Height:  |  Size: 394 B

BIN
dist/images/2x/icon/dark/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 366 B

BIN
dist/images/2x/icon/dark/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 285 B

BIN
dist/images/2x/icon/dark/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 349 B

BIN
dist/images/2x/icon/dark/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 374 B

BIN
dist/images/2x/icon/dark/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 345 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 124 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 265 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 238 B

After

Width:  |  Height:  |  Size: 287 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 243 B

BIN
dist/images/2x/icon/dark/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 238 B

BIN
dist/images/2x/icon/tree_collapse_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 309 B

BIN
dist/images/2x/icon/tree_collapse_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 372 B

BIN
dist/images/2x/icon/tree_collapse_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 344 B

After

Width:  |  Height:  |  Size: 397 B

BIN
dist/images/2x/icon/tree_collapse_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

After

Width:  |  Height:  |  Size: 372 B

BIN
dist/images/2x/icon/tree_expand_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 283 B

BIN
dist/images/2x/icon/tree_expand_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 345 B

BIN
dist/images/2x/icon/tree_expand_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 371 B

BIN
dist/images/2x/icon/tree_expand_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 341 B

BIN
dist/images/2x/icon/tree_vertical_line_1.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 117 B

After

Width:  |  Height:  |  Size: 124 B

BIN
dist/images/2x/icon/tree_vertical_line_2.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 241 B

BIN
dist/images/2x/icon/tree_vertical_line_3.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 242 B

After

Width:  |  Height:  |  Size: 286 B

BIN
dist/images/2x/icon/tree_vertical_line_4.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 211 B

After

Width:  |  Height:  |  Size: 242 B

BIN
dist/images/2x/icon/tree_vertical_line_5.png vendored

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 238 B

4
public/css/background.css

@ -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 1px 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 0 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 1px 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 0 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;

3
src/base/combination/combo.js

@ -505,14 +505,13 @@ BI.Combo = BI.inherit(BI.Widget, {
this._toggle();
},
destroy: function () {
destroyed: function () {
BI.Widget._renderEngine.createElement(document).unbind("mousedown." + this.getName())
.unbind("mousewheel." + this.getName())
.unbind("mouseenter." + this.getName())
.unbind("mousemove." + this.getName())
.unbind("mouseleave." + this.getName());
BI.Resizers.remove(this.getName());
BI.Combo.superclass.destroy.apply(this, arguments);
}
});
BI.Combo.EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";

3
src/base/combination/searcher.js

@ -295,9 +295,8 @@ BI.Searcher = BI.inherit(BI.Widget, {
this.popupView && this.popupView.empty();
},
destroy: function () {
destroyed: function () {
BI.Maskers.remove(this.getName());
BI.Searcher.superclass.destroy.apply(this, arguments);
}
});
BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE";

4
src/case/button/node/node.arrow.js

@ -12,7 +12,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24
height: 30
});
},
_init: function () {
@ -65,7 +65,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
BI.ArrowNode.superclass.doClick.apply(this, arguments);
this.checkbox.setSelected(this.isOpened());
},
setText: function (text) {
BI.ArrowNode.superclass.setText.apply(this, arguments);
this.text.setText(text);

2
src/case/button/node/node.first.plus.js

@ -15,7 +15,7 @@ BI.FirstPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24
height: 30
});
},
_init: function () {

2
src/case/button/node/node.icon.arrow.js

@ -17,7 +17,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24,
height: 30,
iconHeight: 12,
iconWidth: 12,
iconCls: ""

2
src/case/button/node/node.last.plus.js

@ -15,7 +15,7 @@ BI.LastPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24
height: 30
});
},
_init: function () {

2
src/case/button/node/node.mid.plus.js

@ -15,7 +15,7 @@ BI.MidPlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24
height: 30
});
},
_init: function () {

2
src/case/button/node/node.multilayer.icon.arrow.js

@ -7,7 +7,7 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24,
height: 30,
iconHeight: 16,
iconWidth: 16,
iconCls: ""

2
src/case/button/node/node.plus.js

@ -15,7 +15,7 @@ BI.PlusGroupNode = BI.inherit(BI.NodeButton, {
id: "",
pId: "",
open: false,
height: 24
height: 30
});
},
_init: function () {

10
src/case/button/treeitem/item.first.treeleaf.js

@ -13,7 +13,7 @@ BI.FirstTreeLeafItem = BI.inherit(BI.BasicButton, {
id: "",
pId: "",
layer: 0,
height: 24
height: 30
});
},
_init: function () {
@ -42,19 +42,19 @@ 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: 12,
width: 16,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 12,
width: 16,
height: o.height
}
}), {
width: 24,
width: 30,
el: {
type: "bi.layout",
cls: "first-line-conn-background",
width: 24,
width: 30,
height: o.height
}
}, {

2
src/case/button/treeitem/item.icon.treeleaf.js

@ -5,7 +5,7 @@ BI.IconTreeLeafItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
height: 24,
height: 30,
iconWidth: 16,
iconHeight: 16,
iconCls: ""

10
src/case/button/treeitem/item.last.treeleaf.js

@ -13,7 +13,7 @@ BI.LastTreeLeafItem = BI.inherit(BI.BasicButton, {
id: "",
pId: "",
layer: 0,
height: 24
height: 30
});
},
_init: function () {
@ -42,19 +42,19 @@ 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: 12,
width: 16,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 12,
width: 16,
height: o.height
}
}), {
width: 24,
width: 30,
el: {
type: "bi.layout",
cls: "last-line-conn-background",
width: 24,
width: 30,
height: o.height
}
}, {

10
src/case/button/treeitem/item.mid.treeleaf.js

@ -13,7 +13,7 @@ BI.MidTreeLeafItem = BI.inherit(BI.BasicButton, {
id: "",
pId: "",
layer: 0,
height: 24
height: 30
});
},
_init: function () {
@ -42,19 +42,19 @@ 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: 12,
width: 16,
el: {
type: "bi.layout",
cls: (o.pNode && o.pNode.isLastNode) ? "" : "base-line-conn-background",
width: 12,
width: 16,
height: o.height
}
}), {
width: 24,
width: 30,
el: {
type: "bi.layout",
cls: "mid-line-conn-background",
width: 24,
width: 30,
height: o.height
}
}, {

2
src/case/button/treeitem/item.multilayer.icon.treeleaf.js

@ -7,7 +7,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
return BI.extend(BI.MultiLayerIconTreeLeafItem.superclass._defaultConfig.apply(this, arguments), {
extraCls: "bi-multilayer-icon-tree-leaf-item bi-list-item-active",
layer: 0,
height: 24,
height: 30,
iconCls: "",
iconHeight: 16,
iconWidth: 16

2
src/case/button/treeitem/item.treetextleaf.js

@ -10,7 +10,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
extraCls: "bi-tree-text-leaf-item bi-list-item-active",
id: "",
pId: "",
height: 24,
height: 30,
hgap: 0,
lgap: 0,
rgap: 0

4
src/case/calendar/calendar.js

@ -112,7 +112,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
height: 30,
value: o.year + "-" + month + "-" + td.text,
disabled: td.lastMonth || td.nextMonth || td.disabled,
lgap: 5,
@ -129,7 +129,7 @@ BI.Calendar = BI.inherit(BI.Widget, {
columns: 7,
rows: 6,
columnSize: [1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7, 1 / 7],
rowSize: 24,
rowSize: 30,
vgap: 10
}))]
});

4
src/case/calendar/calendar.year.js

@ -67,7 +67,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
whiteSpace: "normal",
once: false,
forceSelected: true,
height: 24,
height: 30,
width: 45,
value: td.text,
disabled: td.disabled
@ -83,7 +83,7 @@ BI.YearCalendar = BI.inherit(BI.Widget, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 24
rowSize: 30
})), {
type: "bi.center_adapt",
vgap: 1

4
src/case/checkbox/check.first.treenode.js

@ -7,8 +7,8 @@ BI.FirstTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.FirstTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type2",
iconWidth: 24,
iconHeight: 24
iconWidth: 30,
iconHeight: 30
});
},

4
src/case/checkbox/check.last.treenode.js

@ -7,8 +7,8 @@ BI.LastTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend(BI.LastTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type4",
iconWidth: 24,
iconHeight: 24
iconWidth: 30,
iconHeight: 30
});
},

4
src/case/checkbox/check.mid.treenode.js

@ -7,8 +7,8 @@ BI.MidTreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.MidTreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type3",
iconWidth: 24,
iconHeight: 24
iconWidth: 30,
iconHeight: 30
});
},

4
src/case/checkbox/check.treenode.js

@ -7,8 +7,8 @@ BI.TreeNodeCheckbox = BI.inherit(BI.IconButton, {
_defaultConfig: function () {
return BI.extend( BI.TreeNodeCheckbox.superclass._defaultConfig.apply(this, arguments), {
extraCls: "tree-collapse-icon-type1",
iconWidth: 24,
iconHeight: 24
iconWidth: 30,
iconHeight: 30
});
},

4
src/case/combo/iconcombo/popup.iconcombo.js

@ -19,7 +19,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
type: "bi.button_group",
items: BI.createItems(o.items, {
type: "bi.single_select_icon_text_item",
height: 24
height: 30
}),
chooseType: o.chooseType,
layouts: [{
@ -47,7 +47,7 @@ BI.IconComboPopup = BI.inherit(BI.Pane, {
BI.IconComboPopup.superclass.populate.apply(this, arguments);
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24
height: 30
});
this.popup.populate(items);
},

2
src/case/combo/icontextvaluecombo/combo.icontextvalue.js

@ -57,7 +57,7 @@ BI.IconTextValueCombo = BI.inherit(BI.Widget, {
el: this.trigger,
popup: {
el: this.popup,
maxHeight: 240
maxHeight: 300
}
});
if (BI.isKey(o.value)) {

4
src/case/combo/icontextvaluecombo/popup.icontextvalue.js

@ -15,7 +15,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
type: "bi.button_group",
items: BI.createItems(o.items, {
type: "bi.single_select_icon_text_item",
height: 24,
height: 30,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth,
iconWrapperWidth: o.iconWrapperWidth
@ -54,7 +54,7 @@ BI.IconTextValueComboPopup = BI.inherit(BI.Pane, {
var o = this.options;
items = BI.createItems(items, {
type: "bi.single_select_icon_text_item",
height: 24,
height: 30,
iconWrapperWidth: o.iconWrapperWidth,
iconHeight: o.iconHeight,
iconWidth: o.iconWidth

2
src/case/combo/textvaluecheckcombo/popup.textvaluecheck.js

@ -39,7 +39,7 @@ BI.TextValueCheckComboPopup = BI.inherit(BI.Pane, {
return BI.extend({
type: "bi.single_select_item",
cls: "bi-list-item",
height: 24
height: 30
}, item);
});
},

2
src/case/combo/textvaluecombo/combo.textvalue.js

@ -52,7 +52,7 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
el: this.trigger,
popup: {
el: this.popup,
maxHeight: 240
maxHeight: 300
}
});
if(BI.isKey(o.value)) {

2
src/case/combo/textvaluecombo/combo.textvaluesmall.js

@ -45,7 +45,7 @@ BI.SmallTextValueCombo = BI.inherit(BI.Widget, {
el: this.trigger,
popup: {
el: this.popup,
maxHeight: 240
maxHeight: 300
}
});
},

4
src/case/combo/textvaluecombo/popup.textvalue.js

@ -14,7 +14,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
items: BI.createItems(o.items, {
type: "bi.single_select_item",
textAlign: o.textAlign,
height: 24
height: 30
}),
chooseType: o.chooseType,
layouts: [{
@ -43,7 +43,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
BI.TextValueComboPopup.superclass.populate.apply(this, arguments);
items = BI.createItems(items, {
type: "bi.single_select_item",
height: 24
height: 30
});
this.popup.populate(items);
},

4
src/css/base/colorchooser/colorpicker/editor.css

@ -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 1px 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('images/2x/icon/check_box_normal.png') no-repeat center center;

10
src/css/base/tree/ztree.css

@ -17,13 +17,13 @@
}
.ztree li ul {
margin: 0;
padding: 0 0 0 18px;
padding: 0 0 0 22px;
}
.ztree li a {
padding: 1px 3px 0 0;
margin: 0;
cursor: pointer;
height: 24px;
height: 30px;
background-color: transparent;
text-decoration: none;
vertical-align: top;
@ -65,7 +65,7 @@
*border: 0px;
}
.ztree li span {
line-height: 24px;
line-height: 30px;
margin-right: 2px;
}
.ztree li span.button {
@ -137,8 +137,8 @@
background-position: -42px -56px;
}
.ztree li span.button.switch {
width: 25px;
height: 25px;
width: 30px;
height: 30px;
}
.ztree li span.button.noline_open {
background-position: -92px -72px;

4
src/css/resource/background.css

@ -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 1px 0;
background: url('images/1x/icon/tree_vertical_line_1.png') repeat-y 0 0;
}
.bi-theme-dark .ztree li ul.line {
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 1px 0;
background: url('images/1x/icon/dark/tree_vertical_line_1.png') repeat-y 0 0;
}
.ztree li span.button.chk.checkbox_false_full {
background: url('images/2x/icon/check_box_normal.png') no-repeat center center;

10
src/less/base/tree/ztree.less

@ -22,14 +22,14 @@
.ztree li ul {
margin: 0;
padding: 0 0 0 18px
padding: 0 0 0 22px
}
.ztree li a {
padding: 1px 3px 0 0;
margin: 0;
cursor: pointer;
height: 24px;
height: 30px;
background-color: transparent;
text-decoration: none;
vertical-align: top;
@ -82,7 +82,7 @@
}
.ztree li span {
line-height: 24px;
line-height: 30px;
margin-right: 2px
}
@ -181,8 +181,8 @@
}
.ztree li span.button.switch {
width: 25px;
height: 25px
width: 30px;
height: 30px
}
.ztree li span.button.noline_open {

4
src/less/resource/background.less

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

2
src/widget/datetime/datetime.combo.js

@ -4,7 +4,7 @@
BI.DateTimeCombo = BI.inherit(BI.Single, {
constants: {
popupHeight: 290,
popupWidth: 270,
popupWidth: 310,
comboAdjustHeight: 1,
border: 1
},

4
src/widget/datetime/datetime.popup.js

@ -5,8 +5,8 @@ BI.DateTimePopup = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.DateTimePopup.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-date-time-popup",
width: 268,
height: 374
width: 310,
height: 410
});
},
_init: function () {

2
src/widget/downlist/item.downlist.js

@ -4,7 +4,7 @@ BI.DownListItem = BI.inherit(BI.BasicButton, {
return BI.extend(conf, {
baseCls: "bi-down-list-item bi-list-item-active",
cls: "",
height: 24,
height: 30,
logic: {
dynamic: true
},

2
src/widget/downlist/popup.downlist.js

@ -6,7 +6,7 @@
BI.DownListPopup = BI.inherit(BI.Pane, {
constants: {
nextIcon: "pull-right-e-font",
height: 24,
height: 30,
iconHeight: 12,
iconWidth: 12,
hgap: 0,

4
src/widget/dynamicdate/dynamicdate.popup.js

@ -6,8 +6,8 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-popup",
width: 248,
height: 344
width: 290,
height: 380
},
_init: function () {

4
src/widget/dynamicdatetime/dynamicdatetime.popup.js

@ -6,8 +6,8 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
props: {
baseCls: "bi-dynamic-date-time-popup",
width: 248,
height: 385
width: 290,
height: 421
},
_init: function () {

4
src/widget/month/popup.month.js

@ -36,7 +36,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
whiteSpace: "nowrap",
once: false,
forceSelected: true,
height: 23,
height: 30,
width: 38,
value: td,
text: td
@ -55,7 +55,7 @@ BI.MonthPopup = BI.inherit(BI.Widget, {
columns: 2,
rows: 6,
columnSize: [1 / 2, 1 / 2],
rowSize: 25
rowSize: 30
})), {
type: "bi.center_adapt",
vgap: 1,

2
src/widget/multilayerdownlist/popup.downlist.js

@ -6,7 +6,7 @@
BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
constants: {
nextIcon: "pull-right-e-font",
height: 25,
height: 30,
iconHeight: 12,
iconWidth: 12,
hgap: 0,

6
src/widget/multilayerselecttree/node/node.first.plus.js

@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 24
height: 30
});
},
_init: function () {
@ -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: 12,
width: 16,
height: o.height
});
});
@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeFirstPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 12),
columnSize: BI.makeArray(o.layer, 15),
items: [items]
});
},

6
src/widget/multilayerselecttree/node/node.last.plus.js

@ -15,7 +15,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
pId: "",
readonly: true,
open: false,
height: 24
height: 30
});
},
_init: function () {
@ -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: 12,
width: 16,
height: o.height
});
});
@ -64,7 +64,7 @@ BI.MultiLayerSelectTreeLastPlusGroupNode = BI.inherit(BI.NodeButton, {
BI.createWidget({
type: "bi.td",
element: this,
columnSize: BI.makeArray(o.layer, 12),
columnSize: BI.makeArray(o.layer, 15),
items: [items]
});
},

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save