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

merge

es6
windy 7 years ago
parent
edd304900e ffbf2d9378
commit
a61bada409
8 changed files with 317 additions and 313 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. 109
      dist/base.js
  2. 111
      dist/bundle.js
  3. 90
      dist/bundle.min.js
  4. 2
      dist/core.js
  5. 111
      dist/fineui.js
  6. 96
      dist/fineui.min.js
  7. 109
      src/base/table/table.js
  8. 2
      src/core/widget.js

109
dist/base.js vendored
Unescape View File

@ -32204,6 +32204,7 @@ BI.Table = BI.inherit(BI.Widget, {
_initFreezeScroll: function () { _initFreezeScroll: function () {
var self = this, o = this.options; var self = this, o = this.options;
scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element); scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element);
// scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element); // scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element);
function scroll (scrollElement, scrollTopElement, otherElement) { function scroll (scrollElement, scrollTopElement, otherElement) {
@ -32283,6 +32284,7 @@ BI.Table = BI.inherit(BI.Widget, {
createOneEl(i, j); createOneEl(i, j);
} }
}); });
function mergeRow (i, j) { function mergeRow (i, j) {
var height = (preCol[j].attr("height") | 0) + rowSize + 1; var height = (preCol[j].attr("height") | 0) + rowSize + 1;
preCol[j].attr("height", height).css("height", height); preCol[j].attr("height", height).css("height", height);
@ -32921,21 +32923,21 @@ BI.Table = BI.inherit(BI.Widget, {
if (o.isNeedFreeze === true) { if (o.isNeedFreeze === true) {
if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) { if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) {
if (!BI.any(this.bottomLeftBodyTds, function (i, tds) { if (!BI.any(this.bottomLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomLeftBodyTds[0], function (i, item) { BI.each(this.bottomLeftBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) { if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) {
@ -32945,21 +32947,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.bottomRightBodyTds, function (i, tds) { if (!BI.any(this.bottomRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomRightBodyTds[0], function (i, item) { BI.each(this.bottomRightBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomRightBodyTds[0]) - 1) { if (i == BI.size(self.bottomRightBodyTds[0]) - 1) {
@ -32971,21 +32973,21 @@ BI.Table = BI.inherit(BI.Widget, {
return columnSize; return columnSize;
} }
if (!BI.any(this.topLeftBodyTds, function (i, tds) { if (!BI.any(this.topLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) { BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) { if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) {
@ -32995,21 +32997,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.topRightBodyTds, function (i, tds) { if (!BI.any(this.topRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) { BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) { if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) {
@ -33318,7 +33320,7 @@ BI.Table = BI.inherit(BI.Widget, {
return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight];
} }
return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight]; return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight];
} }
return [this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollBottomRight.element[0].scrollHeight];
}, },
@ -33418,15 +33420,14 @@ BI.Table = BI.inherit(BI.Widget, {
body: this.bodyItems, body: this.bodyItems,
footer: this.footerItems footer: this.footerItems
}; };
}, },
_empty: function () { _empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy(); this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy(); BI.each(this.partitions && this.partitions._children, function (name, child) {
this.topRight && this.topRight.destroy(); child && child.destroy();
this.bottomLeft && this.bottomLeft.destroy(); });
this.bottomRight && this.bottomRight.destroy();
}, },
populate: function (items, header) { populate: function (items, header) {

111
dist/bundle.js vendored
Unescape View File

@ -12516,7 +12516,7 @@ BI.Widget = BI.inherit(BI.OB, {
} }
}, },
_render: function(){ _render: function () {
this.beforeCreate && this.beforeCreate(); this.beforeCreate && this.beforeCreate();
this._initElement(); this._initElement();
this._initEffects(); this._initEffects();
@ -58198,6 +58198,7 @@ BI.Table = BI.inherit(BI.Widget, {
_initFreezeScroll: function () { _initFreezeScroll: function () {
var self = this, o = this.options; var self = this, o = this.options;
scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element); scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element);
// scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element); // scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element);
function scroll (scrollElement, scrollTopElement, otherElement) { function scroll (scrollElement, scrollTopElement, otherElement) {
@ -58277,6 +58278,7 @@ BI.Table = BI.inherit(BI.Widget, {
createOneEl(i, j); createOneEl(i, j);
} }
}); });
function mergeRow (i, j) { function mergeRow (i, j) {
var height = (preCol[j].attr("height") | 0) + rowSize + 1; var height = (preCol[j].attr("height") | 0) + rowSize + 1;
preCol[j].attr("height", height).css("height", height); preCol[j].attr("height", height).css("height", height);
@ -58915,21 +58917,21 @@ BI.Table = BI.inherit(BI.Widget, {
if (o.isNeedFreeze === true) { if (o.isNeedFreeze === true) {
if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) { if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) {
if (!BI.any(this.bottomLeftBodyTds, function (i, tds) { if (!BI.any(this.bottomLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomLeftBodyTds[0], function (i, item) { BI.each(this.bottomLeftBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) { if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) {
@ -58939,21 +58941,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.bottomRightBodyTds, function (i, tds) { if (!BI.any(this.bottomRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomRightBodyTds[0], function (i, item) { BI.each(this.bottomRightBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomRightBodyTds[0]) - 1) { if (i == BI.size(self.bottomRightBodyTds[0]) - 1) {
@ -58965,21 +58967,21 @@ BI.Table = BI.inherit(BI.Widget, {
return columnSize; return columnSize;
} }
if (!BI.any(this.topLeftBodyTds, function (i, tds) { if (!BI.any(this.topLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) { BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) { if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) {
@ -58989,21 +58991,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.topRightBodyTds, function (i, tds) { if (!BI.any(this.topRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) { BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) { if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) {
@ -59312,7 +59314,7 @@ BI.Table = BI.inherit(BI.Widget, {
return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight];
} }
return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight]; return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight];
} }
return [this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollBottomRight.element[0].scrollHeight];
}, },
@ -59412,15 +59414,14 @@ BI.Table = BI.inherit(BI.Widget, {
body: this.bodyItems, body: this.bodyItems,
footer: this.footerItems footer: this.footerItems
}; };
}, },
_empty: function () { _empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy(); this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy(); BI.each(this.partitions && this.partitions._children, function (name, child) {
this.topRight && this.topRight.destroy(); child && child.destroy();
this.bottomLeft && this.bottomLeft.destroy(); });
this.bottomRight && this.bottomRight.destroy();
}, },
populate: function (items, header) { populate: function (items, header) {

90
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.js vendored
Unescape View File

@ -12516,7 +12516,7 @@ BI.Widget = BI.inherit(BI.OB, {
} }
}, },
_render: function(){ _render: function () {
this.beforeCreate && this.beforeCreate(); this.beforeCreate && this.beforeCreate();
this._initElement(); this._initElement();
this._initEffects(); this._initEffects();

111
dist/fineui.js vendored
Unescape View File

@ -12717,7 +12717,7 @@ BI.Widget = BI.inherit(BI.OB, {
} }
}, },
_render: function(){ _render: function () {
this.beforeCreate && this.beforeCreate(); this.beforeCreate && this.beforeCreate();
this._initElement(); this._initElement();
this._initEffects(); this._initEffects();
@ -59952,6 +59952,7 @@ BI.Table = BI.inherit(BI.Widget, {
_initFreezeScroll: function () { _initFreezeScroll: function () {
var self = this, o = this.options; var self = this, o = this.options;
scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element); scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element);
// scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element); // scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element);
function scroll (scrollElement, scrollTopElement, otherElement) { function scroll (scrollElement, scrollTopElement, otherElement) {
@ -60031,6 +60032,7 @@ BI.Table = BI.inherit(BI.Widget, {
createOneEl(i, j); createOneEl(i, j);
} }
}); });
function mergeRow (i, j) { function mergeRow (i, j) {
var height = (preCol[j].attr("height") | 0) + rowSize + 1; var height = (preCol[j].attr("height") | 0) + rowSize + 1;
preCol[j].attr("height", height).css("height", height); preCol[j].attr("height", height).css("height", height);
@ -60669,21 +60671,21 @@ BI.Table = BI.inherit(BI.Widget, {
if (o.isNeedFreeze === true) { if (o.isNeedFreeze === true) {
if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) { if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) {
if (!BI.any(this.bottomLeftBodyTds, function (i, tds) { if (!BI.any(this.bottomLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomLeftBodyTds[0], function (i, item) { BI.each(this.bottomLeftBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) { if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) {
@ -60693,21 +60695,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.bottomRightBodyTds, function (i, tds) { if (!BI.any(this.bottomRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomRightBodyTds[0], function (i, item) { BI.each(this.bottomRightBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomRightBodyTds[0]) - 1) { if (i == BI.size(self.bottomRightBodyTds[0]) - 1) {
@ -60719,21 +60721,21 @@ BI.Table = BI.inherit(BI.Widget, {
return columnSize; return columnSize;
} }
if (!BI.any(this.topLeftBodyTds, function (i, tds) { if (!BI.any(this.topLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) { BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) { if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) {
@ -60743,21 +60745,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.topRightBodyTds, function (i, tds) { if (!BI.any(this.topRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) { BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) { if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) {
@ -61066,7 +61068,7 @@ BI.Table = BI.inherit(BI.Widget, {
return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight];
} }
return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight]; return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight];
} }
return [this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollBottomRight.element[0].scrollHeight];
}, },
@ -61166,15 +61168,14 @@ BI.Table = BI.inherit(BI.Widget, {
body: this.bodyItems, body: this.bodyItems,
footer: this.footerItems footer: this.footerItems
}; };
}, },
_empty: function () { _empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy(); this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy(); BI.each(this.partitions && this.partitions._children, function (name, child) {
this.topRight && this.topRight.destroy(); child && child.destroy();
this.bottomLeft && this.bottomLeft.destroy(); });
this.bottomRight && this.bottomRight.destroy();
}, },
populate: function (items, header) { populate: function (items, header) {

96
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

109
src/base/table/table.js
Unescape View File

@ -363,6 +363,7 @@ BI.Table = BI.inherit(BI.Widget, {
_initFreezeScroll: function () { _initFreezeScroll: function () {
var self = this, o = this.options; var self = this, o = this.options;
scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element); scroll(this.scrollBottomRight.element, this.scrollTopRight.element, this.scrollBottomLeft.element);
// scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element); // scroll(this.scrollBottomLeft.element, this.scrollTopLeft.element, this.scrollBottomRight.element);
function scroll (scrollElement, scrollTopElement, otherElement) { function scroll (scrollElement, scrollTopElement, otherElement) {
@ -442,6 +443,7 @@ BI.Table = BI.inherit(BI.Widget, {
createOneEl(i, j); createOneEl(i, j);
} }
}); });
function mergeRow (i, j) { function mergeRow (i, j) {
var height = (preCol[j].attr("height") | 0) + rowSize + 1; var height = (preCol[j].attr("height") | 0) + rowSize + 1;
preCol[j].attr("height", height).css("height", height); preCol[j].attr("height", height).css("height", height);
@ -1080,21 +1082,21 @@ BI.Table = BI.inherit(BI.Widget, {
if (o.isNeedFreeze === true) { if (o.isNeedFreeze === true) {
if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) { if (BI.size(this.bottomLeftBodyTds) > 0 || BI.size(this.bottomRightBodyTds) > 0) {
if (!BI.any(this.bottomLeftBodyTds, function (i, tds) { if (!BI.any(this.bottomLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomLeftBodyTds[0], function (i, item) { BI.each(this.bottomLeftBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) { if (i == BI.size(self.bottomLeftBodyTds[0]) - 1) {
@ -1104,21 +1106,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.bottomRightBodyTds, function (i, tds) { if (!BI.any(this.bottomRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.bottomRightBodyTds[0], function (i, item) { BI.each(this.bottomRightBodyTds[0], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.bottomRightBodyTds[0]) - 1) { if (i == BI.size(self.bottomRightBodyTds[0]) - 1) {
@ -1130,21 +1132,21 @@ BI.Table = BI.inherit(BI.Widget, {
return columnSize; return columnSize;
} }
if (!BI.any(this.topLeftBodyTds, function (i, tds) { if (!BI.any(this.topLeftBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) { BI.each(this.topLeftBodyTds[BI.size(this.topLeftBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) { if (i == BI.size(self.topLeftBodyTds[BI.size(self.topLeftBodyTds) - 1]) - 1) {
@ -1154,21 +1156,21 @@ BI.Table = BI.inherit(BI.Widget, {
}); });
} }
if (!BI.any(this.topRightBodyTds, function (i, tds) { if (!BI.any(this.topRightBodyTds, function (i, tds) {
if (!BI.any(tds, function (i, item) { if (!BI.any(tds, function (i, item) {
if (item.__mergeCols.length > 1) { if (item.__mergeCols.length > 1) {
return true;
}
})) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true; return true;
} }
})) { })) {
BI.each(tds, function (i, item) {
var width = item.width() / item.__mergeCols.length;
if (i == BI.size(tds) - 1) {
width++;
}
columnSize.push(width);
});
return true;
}
})) {
BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) { BI.each(this.topRightBodyTds[BI.size(this.topRightBodyTds) - 1], function (i, item) {
var width = item.width() / item.__mergeCols.length; var width = item.width() / item.__mergeCols.length;
if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) { if (i == BI.size(self.topRightBodyTds[BI.size(self.topRightBodyTds) - 1]) - 1) {
@ -1477,7 +1479,7 @@ BI.Table = BI.inherit(BI.Widget, {
return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollTopRight.element[0].scrollHeight, this.scrollBottomRight.element[0].scrollHeight];
} }
return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight]; return [this.scrollTopLeft.element[0].scrollHeight, this.scrollBottomLeft.element[0].scrollHeight];
} }
return [this.scrollBottomRight.element[0].scrollHeight]; return [this.scrollBottomRight.element[0].scrollHeight];
}, },
@ -1577,15 +1579,14 @@ BI.Table = BI.inherit(BI.Widget, {
body: this.bodyItems, body: this.bodyItems,
footer: this.footerItems footer: this.footerItems
}; };
}, },
_empty: function () { _empty: function () {
this.scrollBottomRight && this.scrollBottomRight.destroy(); this.scrollBottomRight && this.scrollBottomRight.destroy();
this.topLeft && this.topLeft.destroy(); BI.each(this.partitions && this.partitions._children, function (name, child) {
this.topRight && this.topRight.destroy(); child && child.destroy();
this.bottomLeft && this.bottomLeft.destroy(); });
this.bottomRight && this.bottomRight.destroy();
}, },
populate: function (items, header) { populate: function (items, header) {

2
src/core/widget.js
Unescape View File

@ -59,7 +59,7 @@ BI.Widget = BI.inherit(BI.OB, {
} }
}, },
_render: function(){ _render: function () {
this.beforeCreate && this.beforeCreate(); this.beforeCreate && this.beforeCreate();
this._initElement(); this._initElement();
this._initEffects(); this._initEffects();

Write Preview
Loading…
Cancel
Save