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. 9
      dist/base.js
  2. 11
      dist/bundle.js
  3. 90
      dist/bundle.min.js
  4. 2
      dist/core.js
  5. 11
      dist/fineui.js
  6. 96
      dist/fineui.min.js
  7. 9
      src/base/table/table.js
  8. 2
      src/core/widget.js

9
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);
@ -33423,10 +33425,9 @@ BI.Table = BI.inherit(BI.Widget, {
_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) {

11
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);
@ -59417,10 +59419,9 @@ BI.Table = BI.inherit(BI.Widget, {
_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();

11
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);
@ -61171,10 +61173,9 @@ BI.Table = BI.inherit(BI.Widget, {
_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

9
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);
@ -1582,10 +1584,9 @@ BI.Table = BI.inherit(BI.Widget, {
_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