Browse Source

merge

master
windy 7 years ago
parent
commit
66711a55a9
  1. 74
      bi/base.js
  2. 25
      bi/core.js
  3. 5
      bi/widget.js
  4. 74
      docs/base.js
  5. 25
      docs/core.js
  6. 5
      docs/widget.js
  7. 35
      src/base/table/table.grid.js
  8. 39
      src/base/table/table.grid.quick.js
  9. 18
      src/core/base.js
  10. 7
      src/core/widget.js
  11. 5
      src/widget/adaptivearrangement/adaptivearrangement.js

74
bi/base.js

@ -30103,6 +30103,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
this.contextLayout.attr("items", items); this.contextLayout.attr("items", items);
this.contextLayout.resize(); this.contextLayout.resize();
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid._populate(this.header[0]); this.topLeftGrid._populate(this.header[0]);
this.topRightGrid._populate(this.header[1]); this.topRightGrid._populate(this.header[1]);
this.bottomLeftGrid._populate(this.items[0]); this.bottomLeftGrid._populate(this.items[0]);
@ -30329,7 +30364,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
_populateTable: function () { _populateTable: function () {
var self = this, o = this.options; var self = this, o = this.options;
var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = []; var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
summaryColumnSizeArray = [];
var freezeColLength = this._getFreezeColLength(); var freezeColLength = this._getFreezeColLength();
BI.each(o.columnSize, function (i, size) { BI.each(o.columnSize, function (i, size) {
if (o.isNeedFreeze === true && o.freezeCols.contains(i)) { if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@ -30420,6 +30456,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
} }
}); });
}); });
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid.populate(leftHeader); this.topLeftGrid.populate(leftHeader);
this.topRightGrid.populate(rightHeader); this.topRightGrid.populate(rightHeader);
this.bottomLeftGrid.populate(leftItems); this.bottomLeftGrid.populate(leftItems);

25
bi/core.js

@ -2940,10 +2940,7 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isIE9Below: function () { getIEVersion: function () {
if (!BI.isIE()) {
return false;
}
var version = 0; var version = 0;
var agent = navigator.userAgent.toLowerCase(); var agent = navigator.userAgent.toLowerCase();
var v1 = agent.match(/(?:msie\s([\w.]+))/); var v1 = agent.match(/(?:msie\s([\w.]+))/);
@ -2957,7 +2954,18 @@ if (!window.BI) {
} else { } else {
version = 0; version = 0;
} }
return version < 9; return version;
},
isIE9Below: function () {
if (!BI.isIE()) {
return false;
}
return this.getIEVersion() < 9;
},
isIE9: function () {
return this.getIEVersion() === 9;
}, },
isEdge: function () { isEdge: function () {
@ -4672,6 +4680,13 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
attr: function (key, value) { attr: function (key, value) {
var self = this;
if (BI.isPlainObject(key)) {
BI.each(key, function (k, v) {
self.attr(k, v);
})
return;
}
if (BI.isNotNull(value)) { if (BI.isNotNull(value)) {
return this.options[key] = value; return this.options[key] = value;
} }

5
bi/widget.js

@ -629,7 +629,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
clearInterval(self._scrollInterval); clearInterval(self._scrollInterval);
self._scrollInterval = null; self._scrollInterval = null;
} }
var count = 0;
self._scrollInterval = setInterval(function () { self._scrollInterval = setInterval(function () {
count++;
if (count <= 3) {
return;
}
var offset = self._getScrollOffset(); var offset = self._getScrollOffset();
var t = offset.top + map[direction][0] * 40; var t = offset.top + map[direction][0] * 40;
var l = offset.left + map[direction][1] * 40; var l = offset.left + map[direction][1] * 40;

74
docs/base.js

@ -30103,6 +30103,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
this.contextLayout.attr("items", items); this.contextLayout.attr("items", items);
this.contextLayout.resize(); this.contextLayout.resize();
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid._populate(this.header[0]); this.topLeftGrid._populate(this.header[0]);
this.topRightGrid._populate(this.header[1]); this.topRightGrid._populate(this.header[1]);
this.bottomLeftGrid._populate(this.items[0]); this.bottomLeftGrid._populate(this.items[0]);
@ -30329,7 +30364,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
_populateTable: function () { _populateTable: function () {
var self = this, o = this.options; var self = this, o = this.options;
var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = []; var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
summaryColumnSizeArray = [];
var freezeColLength = this._getFreezeColLength(); var freezeColLength = this._getFreezeColLength();
BI.each(o.columnSize, function (i, size) { BI.each(o.columnSize, function (i, size) {
if (o.isNeedFreeze === true && o.freezeCols.contains(i)) { if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@ -30420,6 +30456,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
} }
}); });
}); });
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid.populate(leftHeader); this.topLeftGrid.populate(leftHeader);
this.topRightGrid.populate(rightHeader); this.topRightGrid.populate(rightHeader);
this.bottomLeftGrid.populate(leftItems); this.bottomLeftGrid.populate(leftItems);

25
docs/core.js

@ -14082,10 +14082,7 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isIE9Below: function () { getIEVersion: function () {
if (!BI.isIE()) {
return false;
}
var version = 0; var version = 0;
var agent = navigator.userAgent.toLowerCase(); var agent = navigator.userAgent.toLowerCase();
var v1 = agent.match(/(?:msie\s([\w.]+))/); var v1 = agent.match(/(?:msie\s([\w.]+))/);
@ -14099,7 +14096,18 @@ if (!window.BI) {
} else { } else {
version = 0; version = 0;
} }
return version < 9; return version;
},
isIE9Below: function () {
if (!BI.isIE()) {
return false;
}
return this.getIEVersion() < 9;
},
isIE9: function () {
return this.getIEVersion() === 9;
}, },
isEdge: function () { isEdge: function () {
@ -14668,6 +14676,13 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
attr: function (key, value) { attr: function (key, value) {
var self = this;
if (BI.isPlainObject(key)) {
BI.each(key, function (k, v) {
self.attr(k, v);
})
return;
}
if (BI.isNotNull(value)) { if (BI.isNotNull(value)) {
return this.options[key] = value; return this.options[key] = value;
} }

5
docs/widget.js

@ -629,7 +629,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
clearInterval(self._scrollInterval); clearInterval(self._scrollInterval);
self._scrollInterval = null; self._scrollInterval = null;
} }
var count = 0;
self._scrollInterval = setInterval(function () { self._scrollInterval = setInterval(function () {
count++;
if (count <= 3) {
return;
}
var offset = self._getScrollOffset(); var offset = self._getScrollOffset();
var t = offset.top + map[direction][0] * 40; var t = offset.top + map[direction][0] * 40;
var l = offset.left + map[direction][1] * 40; var l = offset.left + map[direction][1] * 40;

35
src/base/table/table.grid.js

@ -362,6 +362,41 @@ BI.GridTable = BI.inherit(BI.Widget, {
this.contextLayout.attr("items", items); this.contextLayout.attr("items", items);
this.contextLayout.resize(); this.contextLayout.resize();
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, tlw, tlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, blw, blh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, trw, trh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, brw, brh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid._populate(this.header[0]); this.topLeftGrid._populate(this.header[0]);
this.topRightGrid._populate(this.header[1]); this.topRightGrid._populate(this.header[1]);
this.bottomLeftGrid._populate(this.items[0]); this.bottomLeftGrid._populate(this.items[0]);

39
src/base/table/table.grid.quick.js

@ -116,7 +116,8 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
_populateTable: function () { _populateTable: function () {
var self = this, o = this.options; var self = this, o = this.options;
var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0, summaryColumnSizeArray = []; var regionSize = this.getRegionSize(), totalLeftColumnSize = 0, totalRightColumnSize = 0, totalColumnSize = 0,
summaryColumnSizeArray = [];
var freezeColLength = this._getFreezeColLength(); var freezeColLength = this._getFreezeColLength();
BI.each(o.columnSize, function (i, size) { BI.each(o.columnSize, function (i, size) {
if (o.isNeedFreeze === true && o.freezeCols.contains(i)) { if (o.isNeedFreeze === true && o.freezeCols.contains(i)) {
@ -207,6 +208,42 @@ BI.QuickGridTable = BI.inherit(BI.GridTable, {
} }
}); });
}); });
this.topLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.topRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomLeftGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
this.bottomRightGrid.attr({
overscanColumnCount: 0,
overscanRowCount: 0
});
function overscan(grid, w, h, rSize, cSize) {
var rCount = h / rSize;
var cCount = w / cSize;
if (cCount * (120 / rSize) >= 60 || rCount * (120 / cSize) >= 60) {
grid.attr("overscanRowCount", 100);
grid.attr("overscanColumnCount", 100);
}
}
if (freezeColLength > 0) {
overscan(this.topLeftGrid, otlw, otlh, o.headerRowSize, totalLeftColumnSize / freezeColLength);
overscan(this.bottomLeftGrid, oblw, oblh, o.rowSize, totalLeftColumnSize / freezeColLength);
}
if (o.columnSize.length - freezeColLength > 0) {
overscan(this.topRight, otrw, otrh, o.headerRowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
overscan(this.bottomRightGrid, obrw, obrh, o.rowSize, totalRightColumnSize / (o.columnSize.length - freezeColLength));
}
this.topLeftGrid.populate(leftHeader); this.topLeftGrid.populate(leftHeader);
this.topRightGrid.populate(rightHeader); this.topRightGrid.populate(rightHeader);
this.bottomLeftGrid.populate(leftItems); this.bottomLeftGrid.populate(leftItems);

18
src/core/base.js

@ -1048,10 +1048,7 @@ if (!window.BI) {
return /(msie|trident)/i.test(navigator.userAgent.toLowerCase()); return /(msie|trident)/i.test(navigator.userAgent.toLowerCase());
}, },
isIE9Below: function () { getIEVersion: function () {
if (!BI.isIE()) {
return false;
}
var version = 0; var version = 0;
var agent = navigator.userAgent.toLowerCase(); var agent = navigator.userAgent.toLowerCase();
var v1 = agent.match(/(?:msie\s([\w.]+))/); var v1 = agent.match(/(?:msie\s([\w.]+))/);
@ -1065,7 +1062,18 @@ if (!window.BI) {
} else { } else {
version = 0; version = 0;
} }
return version < 9; return version;
},
isIE9Below: function () {
if (!BI.isIE()) {
return false;
}
return this.getIEVersion() < 9;
},
isIE9: function () {
return this.getIEVersion() === 9;
}, },
isEdge: function () { isEdge: function () {

7
src/core/widget.js

@ -343,6 +343,13 @@ BI.Widget = BI.inherit(BI.OB, {
}, },
attr: function (key, value) { attr: function (key, value) {
var self = this;
if (BI.isPlainObject(key)) {
BI.each(key, function (k, v) {
self.attr(k, v);
})
return;
}
if (BI.isNotNull(value)) { if (BI.isNotNull(value)) {
return this.options[key] = value; return this.options[key] = value;
} }

5
src/widget/adaptivearrangement/adaptivearrangement.js

@ -210,7 +210,12 @@ BI.AdaptiveArrangement = BI.inherit(BI.Widget, {
clearInterval(self._scrollInterval); clearInterval(self._scrollInterval);
self._scrollInterval = null; self._scrollInterval = null;
} }
var count = 0;
self._scrollInterval = setInterval(function () { self._scrollInterval = setInterval(function () {
count++;
if (count <= 3) {
return;
}
var offset = self._getScrollOffset(); var offset = self._getScrollOffset();
var t = offset.top + map[direction][0] * 40; var t = offset.top + map[direction][0] * 40;
var l = offset.left + map[direction][1] * 40; var l = offset.left + map[direction][1] * 40;

Loading…
Cancel
Save