Browse Source

Pull request #2937: KERNEL-12148 && BI-110020

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '4f8f452e83a043a45c5370b8cac89da42a05a677':
  KERNEL-12148 feat: drawer暂时改用left,right实现
  BI-110020 feat: 【视觉验收】树行高和节点尺寸,更换30高度图
es6
Dailer 2 years ago
parent
commit
e99cb0be07
  1. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_1.png
  2. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_2.png
  3. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_3.png
  4. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_4.png
  5. BIN
      dist/images/2x/icon/dark/tree_solid_collapse_5.png
  6. BIN
      dist/images/2x/icon/dark/tree_solid_expand_1.png
  7. BIN
      dist/images/2x/icon/dark/tree_solid_expand_2.png
  8. BIN
      dist/images/2x/icon/dark/tree_solid_expand_3.png
  9. BIN
      dist/images/2x/icon/dark/tree_solid_expand_4.png
  10. BIN
      dist/images/2x/icon/dark/tree_solid_expand_5.png
  11. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_1.png
  12. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_2.png
  13. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_3.png
  14. BIN
      dist/images/2x/icon/dark/tree_solid_vertical_line_4.png
  15. BIN
      dist/images/2x/icon/tree_solid_collapse_1.png
  16. BIN
      dist/images/2x/icon/tree_solid_collapse_2.png
  17. BIN
      dist/images/2x/icon/tree_solid_collapse_3.png
  18. BIN
      dist/images/2x/icon/tree_solid_collapse_4.png
  19. BIN
      dist/images/2x/icon/tree_solid_collapse_5.png
  20. BIN
      dist/images/2x/icon/tree_solid_expand_1.png
  21. BIN
      dist/images/2x/icon/tree_solid_expand_2.png
  22. BIN
      dist/images/2x/icon/tree_solid_expand_3.png
  23. BIN
      dist/images/2x/icon/tree_solid_expand_4.png
  24. BIN
      dist/images/2x/icon/tree_solid_expand_5.png
  25. BIN
      dist/images/2x/icon/tree_solid_vertical_line_2.png
  26. BIN
      dist/images/2x/icon/tree_solid_vertical_line_3.png
  27. BIN
      dist/images/2x/icon/tree_solid_vertical_line_4.png
  28. BIN
      dist/images/2x/icon/tree_vertical_line_1.png
  29. 23
      src/base/layer/layer.drawer.js
  30. 2
      src/less/base/view/drawer.less

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 371 B

After

Width:  |  Height:  |  Size: 394 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 454 B

After

Width:  |  Height:  |  Size: 473 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 509 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 462 B

After

Width:  |  Height:  |  Size: 476 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 417 B

After

Width:  |  Height:  |  Size: 434 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 330 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

After

Width:  |  Height:  |  Size: 409 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 431 B

After

Width:  |  Height:  |  Size: 466 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 415 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 352 B

After

Width:  |  Height:  |  Size: 376 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 178 B

After

Width:  |  Height:  |  Size: 216 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 233 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 495 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 505 B

After

Width:  |  Height:  |  Size: 581 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 547 B

After

Width:  |  Height:  |  Size: 619 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 515 B

After

Width:  |  Height:  |  Size: 580 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 538 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

After

Width:  |  Height:  |  Size: 392 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 419 B

After

Width:  |  Height:  |  Size: 476 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

After

Width:  |  Height:  |  Size: 513 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 429 B

After

Width:  |  Height:  |  Size: 477 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 381 B

After

Width:  |  Height:  |  Size: 434 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 233 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 255 B

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 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: 216 B

23
src/base/layer/layer.drawer.js

@ -154,22 +154,22 @@ BI.Drawer = BI.inherit(BI.Widget, {
switch (o.placement) { switch (o.placement) {
case "right": case "right":
self.element.css({ self.element.css({
transform: "translateX(-" + size.width + "px)" left: "calc(100% - " + size.width + "px)"
}); });
break; break;
case "left": case "left":
self.element.css({ self.element.css({
transform: "translateX(" + size.width + "px)" right: "calc(100% - " + size.width + "px)"
}); });
break; break;
case "top": case "top":
self.element.css({ self.element.css({
transform: "translateY(" + size.height + "px)" bottom: "calc(100% - " + size.height + "px)"
}); });
break; break;
case "bottom": case "bottom":
self.element.css({ self.element.css({
transform: "translateY(-" + size.height + "px)" top: "calc(100% - " + size.height + "px)"
}); });
break; break;
} }
@ -180,17 +180,26 @@ BI.Drawer = BI.inherit(BI.Widget, {
hide: function (callback) { hide: function (callback) {
var self = this, o = this.options; var self = this, o = this.options;
requestAnimationFrame(function () { requestAnimationFrame(function () {
var size = self._getSuitableSize();
switch (o.placement) { switch (o.placement) {
case "right": case "right":
self.element.css({
left: "100%"
});
break;
case "left": case "left":
self.element.css({ self.element.css({
transform: "translateX(0px)" right: "100%"
}); });
break; break;
case "top": case "top":
self.element.css({
bottom: "100%"
});
break;
case "bottom": case "bottom":
self.element.css({ self.element.css({
transform: "translateY(0px)" top: "100%"
}); });
break; break;
} }
@ -213,7 +222,7 @@ BI.Drawer = BI.inherit(BI.Widget, {
}, },
setZindex: function (zindex) { setZindex: function (zindex) {
this.element.css({"z-index": zindex}); this.element.css({ "z-index": zindex });
}, },
destroyed: function () { destroyed: function () {

2
src/less/base/view/drawer.less

@ -2,5 +2,5 @@
.bi-drawer { .bi-drawer {
.box-shadows(-6px 0 16px -8px #00000014, -9px 0 28px #0000000d, -12px 0 48px 16px #00000008); .box-shadows(-6px 0 16px -8px #00000014, -9px 0 28px #0000000d, -12px 0 48px 16px #00000008);
.transitions(transform .3s cubic-bezier(.23, 1, .32, 1), box-shadow .3s cubic-bezier(.23, 1, .32, 1)); .transitions(inset .3s cubic-bezier(.23, 1, .32, 1), box-shadow .3s cubic-bezier(.23, 1, .32, 1));
} }

Loading…
Cancel
Save