caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

es6
guy 7 years ago
parent
4e4066bedd
commit
c26e8ccf94
6 changed files with 164 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      bi/widget.js
  2. 50
      dist/bundle.js
  3. 24
      dist/bundle.min.js
  4. 50
      dist/widget.js
  5. 11
      src/widget/adaptivearrangement/adaptivearrangement.js
  6. 39
      src/widget/arrangement/arrangement.js

50
bi/widget.js
Unescape View File

@ -612,7 +612,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
left: [0, -1], left: [0, -1],
right: [0, 1] right: [0, 1]
}; };
var clientSize = this.element.bounds(); var clientWidth = this.arrangement.getClientWidth();
var clientHeight = this.arrangement.getClientHeight();
function scrollTo(direction, callback) { function scrollTo(direction, callback) {
if (direction === "") { if (direction === "") {
@ -667,7 +668,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("top", cb) scrollTo("top", cb)
} }
//向下滚 //向下滚
else if (isBorderScroll && p.top >= clientSize.height - 30 && p.top <= clientSize.height) { else if (isBorderScroll && p.top >= clientHeight - 30 && p.top <= clientHeight) {
scrollTo("bottom", cb) scrollTo("bottom", cb)
} }
//向左滚 //向左滚
@ -675,20 +676,20 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("left", cb) scrollTo("left", cb)
} }
//向右滚 //向右滚
else if (isBorderScroll && p.left >= clientSize.width - 30 && p.left <= clientSize.width) { else if (isBorderScroll && p.left >= clientWidth - 30 && p.left <= clientWidth) {
scrollTo("right", cb) scrollTo("right", cb)
} else { } else {
if (isOverflowScroll === true) { if (isOverflowScroll === true) {
if (p.top < 0) { if (p.top < 0) {
scrollTo("top", cb); scrollTo("top", cb);
} }
else if (p.top > clientSize.height) { else if (p.top > clientHeight) {
scrollTo("bottom", cb); scrollTo("bottom", cb);
} }
else if (p.left < 0) { else if (p.left < 0) {
scrollTo("left", cb); scrollTo("left", cb);
} }
else if (p.left > clientSize.width) { else if (p.left > clientWidth) {
scrollTo("right", cb); scrollTo("right", cb);
} else { } else {
scrollTo("", cb); scrollTo("", cb);
@ -1071,12 +1072,30 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) { _applyRegion: function (regions) {
var self = this, o = this.options; var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) { BI.each(regions || this.regions, function (i, region) {
region.el.element.css({ if (region.el._left !== region.left) {
left: region.left, region.el.element.css({
top: region.top, left: region.left
width: region.width, });
height: region.height region.el._left = region.left;
}); }
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.left;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
}); });
this._applyContainer(); this._applyContainer();
this.ratio = this.getLayoutRatio(); this.ratio = this.getLayoutRatio();
@ -1112,7 +1131,14 @@ BI.Arrangement = BI.inherit(BI.Widget, {
//先掩藏后显示能够明确滚动条是否出现 //先掩藏后显示能够明确滚动条是否出现
this.scrollContainer.element.css("overflow", "hidden"); this.scrollContainer.element.css("overflow", "hidden");
var occupied = this._getRegionOccupied(); var occupied = this._getRegionOccupied();
this.container.element.width(occupied.left + occupied.width).height(occupied.top + occupied.height); if (this.container._width !== occupied.left + occupied.width) {
this.container.element.width(occupied.left + occupied.width);
this.container._width = occupied.left + occupied.width;
}
if (this.container._height !== occupied.top + occupied.height) {
this.container.element.height(occupied.top + occupied.height);
this.container._height = occupied.top + occupied.height;
}
this.scrollContainer.element.css("overflow", "auto"); this.scrollContainer.element.css("overflow", "auto");
return occupied; return occupied;
}, },

50
dist/bundle.js vendored
Unescape View File

@ -79139,7 +79139,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
left: [0, -1], left: [0, -1],
right: [0, 1] right: [0, 1]
}; };
var clientSize = this.element.bounds(); var clientWidth = this.arrangement.getClientWidth();
var clientHeight = this.arrangement.getClientHeight();
function scrollTo(direction, callback) { function scrollTo(direction, callback) {
if (direction === "") { if (direction === "") {
@ -79194,7 +79195,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("top", cb) scrollTo("top", cb)
} }
//向下滚 //向下滚
else if (isBorderScroll && p.top >= clientSize.height - 30 && p.top <= clientSize.height) { else if (isBorderScroll && p.top >= clientHeight - 30 && p.top <= clientHeight) {
scrollTo("bottom", cb) scrollTo("bottom", cb)
} }
//向左滚 //向左滚
@ -79202,20 +79203,20 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("left", cb) scrollTo("left", cb)
} }
//向右滚 //向右滚
else if (isBorderScroll && p.left >= clientSize.width - 30 && p.left <= clientSize.width) { else if (isBorderScroll && p.left >= clientWidth - 30 && p.left <= clientWidth) {
scrollTo("right", cb) scrollTo("right", cb)
} else { } else {
if (isOverflowScroll === true) { if (isOverflowScroll === true) {
if (p.top < 0) { if (p.top < 0) {
scrollTo("top", cb); scrollTo("top", cb);
} }
else if (p.top > clientSize.height) { else if (p.top > clientHeight) {
scrollTo("bottom", cb); scrollTo("bottom", cb);
} }
else if (p.left < 0) { else if (p.left < 0) {
scrollTo("left", cb); scrollTo("left", cb);
} }
else if (p.left > clientSize.width) { else if (p.left > clientWidth) {
scrollTo("right", cb); scrollTo("right", cb);
} else { } else {
scrollTo("", cb); scrollTo("", cb);
@ -79598,12 +79599,30 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) { _applyRegion: function (regions) {
var self = this, o = this.options; var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) { BI.each(regions || this.regions, function (i, region) {
region.el.element.css({ if (region.el._left !== region.left) {
left: region.left, region.el.element.css({
top: region.top, left: region.left
width: region.width, });
height: region.height region.el._left = region.left;
}); }
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.left;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
}); });
this._applyContainer(); this._applyContainer();
this.ratio = this.getLayoutRatio(); this.ratio = this.getLayoutRatio();
@ -79639,7 +79658,14 @@ BI.Arrangement = BI.inherit(BI.Widget, {
//先掩藏后显示能够明确滚动条是否出现 //先掩藏后显示能够明确滚动条是否出现
this.scrollContainer.element.css("overflow", "hidden"); this.scrollContainer.element.css("overflow", "hidden");
var occupied = this._getRegionOccupied(); var occupied = this._getRegionOccupied();
this.container.element.width(occupied.left + occupied.width).height(occupied.top + occupied.height); if (this.container._width !== occupied.left + occupied.width) {
this.container.element.width(occupied.left + occupied.width);
this.container._width = occupied.left + occupied.width;
}
if (this.container._height !== occupied.top + occupied.height) {
this.container.element.height(occupied.top + occupied.height);
this.container._height = occupied.top + occupied.height;
}
this.scrollContainer.element.css("overflow", "auto"); this.scrollContainer.element.css("overflow", "auto");
return occupied; return occupied;
}, },

24
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

50
dist/widget.js vendored
Unescape View File

@ -612,7 +612,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
left: [0, -1], left: [0, -1],
right: [0, 1] right: [0, 1]
}; };
var clientSize = this.element.bounds(); var clientWidth = this.arrangement.getClientWidth();
var clientHeight = this.arrangement.getClientHeight();
function scrollTo(direction, callback) { function scrollTo(direction, callback) {
if (direction === "") { if (direction === "") {
@ -667,7 +668,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("top", cb) scrollTo("top", cb)
} }
//向下滚 //向下滚
else if (isBorderScroll && p.top >= clientSize.height - 30 && p.top <= clientSize.height) { else if (isBorderScroll && p.top >= clientHeight - 30 && p.top <= clientHeight) {
scrollTo("bottom", cb) scrollTo("bottom", cb)
} }
//向左滚 //向左滚
@ -675,20 +676,20 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("left", cb) scrollTo("left", cb)
} }
//向右滚 //向右滚
else if (isBorderScroll && p.left >= clientSize.width - 30 && p.left <= clientSize.width) { else if (isBorderScroll && p.left >= clientWidth - 30 && p.left <= clientWidth) {
scrollTo("right", cb) scrollTo("right", cb)
} else { } else {
if (isOverflowScroll === true) { if (isOverflowScroll === true) {
if (p.top < 0) { if (p.top < 0) {
scrollTo("top", cb); scrollTo("top", cb);
} }
else if (p.top > clientSize.height) { else if (p.top > clientHeight) {
scrollTo("bottom", cb); scrollTo("bottom", cb);
} }
else if (p.left < 0) { else if (p.left < 0) {
scrollTo("left", cb); scrollTo("left", cb);
} }
else if (p.left > clientSize.width) { else if (p.left > clientWidth) {
scrollTo("right", cb); scrollTo("right", cb);
} else { } else {
scrollTo("", cb); scrollTo("", cb);
@ -1071,12 +1072,30 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) { _applyRegion: function (regions) {
var self = this, o = this.options; var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) { BI.each(regions || this.regions, function (i, region) {
region.el.element.css({ if (region.el._left !== region.left) {
left: region.left, region.el.element.css({
top: region.top, left: region.left
width: region.width, });
height: region.height region.el._left = region.left;
}); }
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.left;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
}); });
this._applyContainer(); this._applyContainer();
this.ratio = this.getLayoutRatio(); this.ratio = this.getLayoutRatio();
@ -1112,7 +1131,14 @@ BI.Arrangement = BI.inherit(BI.Widget, {
//先掩藏后显示能够明确滚动条是否出现 //先掩藏后显示能够明确滚动条是否出现
this.scrollContainer.element.css("overflow", "hidden"); this.scrollContainer.element.css("overflow", "hidden");
var occupied = this._getRegionOccupied(); var occupied = this._getRegionOccupied();
this.container.element.width(occupied.left + occupied.width).height(occupied.top + occupied.height); if (this.container._width !== occupied.left + occupied.width) {
this.container.element.width(occupied.left + occupied.width);
this.container._width = occupied.left + occupied.width;
}
if (this.container._height !== occupied.top + occupied.height) {
this.container.element.height(occupied.top + occupied.height);
this.container._height = occupied.top + occupied.height;
}
this.scrollContainer.element.css("overflow", "auto"); this.scrollContainer.element.css("overflow", "auto");
return occupied; return occupied;
}, },

11
src/widget/adaptivearrangement/adaptivearrangement.js
Unescape View File

@ -193,7 +193,8 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
left: [0, -1], left: [0, -1],
right: [0, 1] right: [0, 1]
}; };
var clientSize = this.element.bounds(); var clientWidth = this.arrangement.getClientWidth();
var clientHeight = this.arrangement.getClientHeight();
function scrollTo(direction, callback) { function scrollTo(direction, callback) {
if (direction === "") { if (direction === "") {
@ -248,7 +249,7 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("top", cb) scrollTo("top", cb)
} }
//向下滚 //向下滚
else if (isBorderScroll && p.top >= clientSize.height - 30 && p.top <= clientSize.height) { else if (isBorderScroll && p.top >= clientHeight - 30 && p.top <= clientHeight) {
scrollTo("bottom", cb) scrollTo("bottom", cb)
} }
//向左滚 //向左滚
@ -256,20 +257,20 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
scrollTo("left", cb) scrollTo("left", cb)
} }
//向右滚 //向右滚
else if (isBorderScroll && p.left >= clientSize.width - 30 && p.left <= clientSize.width) { else if (isBorderScroll && p.left >= clientWidth - 30 && p.left <= clientWidth) {
scrollTo("right", cb) scrollTo("right", cb)
} else { } else {
if (isOverflowScroll === true) { if (isOverflowScroll === true) {
if (p.top < 0) { if (p.top < 0) {
scrollTo("top", cb); scrollTo("top", cb);
} }
else if (p.top > clientSize.height) { else if (p.top > clientHeight) {
scrollTo("bottom", cb); scrollTo("bottom", cb);
} }
else if (p.left < 0) { else if (p.left < 0) {
scrollTo("left", cb); scrollTo("left", cb);
} }
else if (p.left > clientSize.width) { else if (p.left > clientWidth) {
scrollTo("right", cb); scrollTo("right", cb);
} else { } else {
scrollTo("", cb); scrollTo("", cb);

39
src/widget/arrangement/arrangement.js
Unescape View File

@ -272,12 +272,30 @@ BI.Arrangement = BI.inherit(BI.Widget, {
_applyRegion: function (regions) { _applyRegion: function (regions) {
var self = this, o = this.options; var self = this, o = this.options;
BI.each(regions || this.regions, function (i, region) { BI.each(regions || this.regions, function (i, region) {
region.el.element.css({ if (region.el._left !== region.left) {
left: region.left, region.el.element.css({
top: region.top, left: region.left
width: region.width, });
height: region.height region.el._left = region.left;
}); }
if (region.el._top !== region.top) {
region.el.element.css({
top: region.top
});
region.el._top = region.top;
}
if (region.el._width !== region.width) {
region.el.element.css({
width: region.width
});
region.el._width = region.left;
}
if (region.el._height !== region.height) {
region.el.element.css({
height: region.height
});
region.el._height = region.height;
}
}); });
this._applyContainer(); this._applyContainer();
this.ratio = this.getLayoutRatio(); this.ratio = this.getLayoutRatio();
@ -313,7 +331,14 @@ BI.Arrangement = BI.inherit(BI.Widget, {
//先掩藏后显示能够明确滚动条是否出现 //先掩藏后显示能够明确滚动条是否出现
this.scrollContainer.element.css("overflow", "hidden"); this.scrollContainer.element.css("overflow", "hidden");
var occupied = this._getRegionOccupied(); var occupied = this._getRegionOccupied();
this.container.element.width(occupied.left + occupied.width).height(occupied.top + occupied.height); if (this.container._width !== occupied.left + occupied.width) {
this.container.element.width(occupied.left + occupied.width);
this.container._width = occupied.left + occupied.width;
}
if (this.container._height !== occupied.top + occupied.height) {
this.container.element.height(occupied.top + occupied.height);
this.container._height = occupied.top + occupied.height;
}
this.scrollContainer.element.css("overflow", "auto"); this.scrollContainer.element.css("overflow", "auto");
return occupied; return occupied;
}, },

Write Preview
Loading…
Cancel
Save