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

Merge pull request #66 in FUI/fineui from ~GUY/fineui:master to master 

* commit 'f1bf2f312352a7b27abea6e83c7758d19070007d':
  selectlist的setEnable对全选无效
  add
  add
  add
  wartermark
es6
guy 8 years ago
parent
5ed6c2b68a f1bf2f3123
commit
390e691879
17 changed files with 854 additions and 560 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. 90
      bi/base.js
  2. 6
      bi/case.js
  3. 25
      bi/core.js
  4. 5
      bi/widget.js
  5. 90
      docs/base.js
  6. 6
      docs/case.js
  7. 25
      docs/core.js
  8. 5
      docs/widget.js
  9. 6
      src/base/formula/formulaeditor.js
  10. 10
      src/base/single/editor/editor.js
  11. 35
      src/base/table/table.grid.js
  12. 39
      src/base/table/table.grid.quick.js
  13. 1
      src/case/editor/editor.sign.initial.js
  14. 5
      src/case/list/list.select.js
  15. 18
      src/core/base.js
  16. 7
      src/core/widget.js
  17. 5
      src/widget/adaptivearrangement/adaptivearrangement.js

90
bi/base.js
Unescape View File

@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -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);

6
bi/case.js
Unescape View File

@ -7146,6 +7146,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
}, },
setState: function (v) { setState: function (v) {
var o = this.options;
this._showHint(); this._showHint();
v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")"; v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
this.text.setValue(v); this.text.setValue(v);
@ -8790,6 +8791,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () {
BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments);
},
resetHeight: function (h) { resetHeight: function (h) {
var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0); var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
this.list.resetHeight ? this.list.resetHeight(h - toolHeight) : this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

25
bi/core.js
Unescape View File

@ -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
Unescape View File

@ -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;

90
docs/base.js
Unescape View File

@ -14351,15 +14351,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -18111,7 +18111,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -18149,13 +18149,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },
@ -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);

6
docs/case.js
Unescape View File

@ -7146,6 +7146,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
}, },
setState: function (v) { setState: function (v) {
var o = this.options;
this._showHint(); this._showHint();
v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")"; v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
this.text.setValue(v); this.text.setValue(v);
@ -8790,6 +8791,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () {
BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments);
},
resetHeight: function (h) { resetHeight: function (h) {
var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0); var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
this.list.resetHeight ? this.list.resetHeight(h - toolHeight) : this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

25
docs/core.js
Unescape View File

@ -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
Unescape View File

@ -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;

6
src/base/formula/formulaeditor.js
Unescape View File

@ -90,15 +90,15 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && BI.isEmptyString(this.editor.getValue()) && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
} }
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },

10
src/base/single/editor/editor.js
Unescape View File

@ -204,7 +204,7 @@ BI.Editor = BI.inherit(BI.Single, {
_checkWaterMark: function () { _checkWaterMark: function () {
var o = this.options; var o = this.options;
if (!this.disabledWarterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) { if (!this.disabledWaterMark && this.editor.getValue() === "" && BI.isKey(o.watermark)) {
this.watermark && this.watermark.visible(); this.watermark && this.watermark.visible();
} else { } else {
this.watermark && this.watermark.invisible(); this.watermark && this.watermark.invisible();
@ -242,13 +242,13 @@ BI.Editor = BI.inherit(BI.Single, {
this._checkError(); this._checkError();
}, },
disableWarterMark: function () { disableWaterMark: function () {
this.disabledWarterMark = true; this.disabledWaterMark = true;
this._checkWaterMark(); this._checkWaterMark();
}, },
enableWarterMark: function () { enableWaterMark: function () {
this.disabledWarterMark = false; this.disabledWaterMark = false;
this._checkWaterMark(); this._checkWaterMark();
}, },

35
src/base/table/table.grid.js
Unescape View File

@ -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
Unescape View File

@ -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);

1
src/case/editor/editor.sign.initial.js
Unescape View File

@ -242,6 +242,7 @@ BI.SignInitialEditor = BI.inherit(BI.Widget, {
}, },
setState: function (v) { setState: function (v) {
var o = this.options;
this._showHint(); this._showHint();
v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")"; v = (BI.isEmpty(v) || v == o.text) ? o.text : v + "(" + o.text + ")";
this.text.setValue(v); this.text.setValue(v);

5
src/case/list/list.select.js
Unescape View File

@ -158,6 +158,11 @@ BI.SelectList = BI.inherit(BI.Widget, {
this._checkAllSelected(); this._checkAllSelected();
}, },
_setEnable: function () {
BI.SelectList.superclass._setEnable.apply(this, arguments);
this.toolbar.setEnable(arguments);
},
resetHeight: function (h) { resetHeight: function (h) {
var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0); var toolHeight = ( this.toolbar.element.outerHeight() || 25) * ( this.toolbar.isVisible() ? 1 : 0);
this.list.resetHeight ? this.list.resetHeight(h - toolHeight) : this.list.resetHeight ? this.list.resetHeight(h - toolHeight) :

18
src/core/base.js
Unescape View File

@ -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
Unescape View File

@ -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
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save