Browse Source

Merge pull request #228 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit '5ec35ab05831f6b4f0e569635e7ef585da39766d':
  getFreezeColLength
es6
windy 7 years ago
parent
commit
6ded75ad68
  1. 9
      bi/base.js
  2. 3
      bi/case.js
  3. 2
      demo/js/core/layout/demo.htape.js
  4. 9
      dist/base.js
  5. 12
      dist/bundle.js
  6. 46
      dist/bundle.min.js
  7. 3
      dist/case.js
  8. 2
      dist/demo.js
  9. 3
      src/base/table/table.collection.js
  10. 3
      src/base/table/table.grid.js
  11. 3
      src/base/table/table.resizable.js
  12. 3
      src/case/table/table.adaptive.js

9
bi/base.js

@ -30307,7 +30307,8 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -31114,7 +31115,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -33980,7 +33982,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.freezeCols.length;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeColumnSize: function () {

3
bi/case.js

@ -9543,7 +9543,8 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze === true ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_digest: function () {

2
demo/js/core/layout/demo.htape.js

@ -19,7 +19,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}, {
width: 200,
el : {
type : 'bi.multi_select_insert_list',
type : 'bi.label',
text : '2',
cls: "layout-bg2"
}

9
dist/base.js vendored

@ -30307,7 +30307,8 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -31114,7 +31115,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -33980,7 +33982,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.freezeCols.length;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeColumnSize: function () {

12
dist/bundle.js vendored

@ -56050,7 +56050,8 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -56857,7 +56858,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {
@ -59723,7 +59725,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.freezeCols.length;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeColumnSize: function () {
@ -71934,7 +71937,8 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze === true ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_digest: function () {

46
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

3
dist/case.js vendored

@ -9543,7 +9543,8 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze === true ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_digest: function () {

2
dist/demo.js vendored

@ -7739,7 +7739,7 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}, {
width: 200,
el : {
type : 'bi.multi_select_insert_list',
type : 'bi.label',
text : '2',
cls: "layout-bg2"
}

3
src/base/table/table.collection.js

@ -170,7 +170,8 @@ BI.CollectionTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {

3
src/base/table/table.grid.js

@ -173,7 +173,8 @@ BI.GridTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeHeaderHeight: function () {

3
src/base/table/table.resizable.js

@ -181,7 +181,8 @@ BI.ResizableTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.freezeCols.length;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_getFreezeColumnSize: function () {

3
src/case/table/table.adaptive.js

@ -95,7 +95,8 @@ BI.AdaptiveTable = BI.inherit(BI.Widget, {
},
_getFreezeColLength: function () {
return this.options.isNeedFreeze === true ? this.options.freezeCols.length : 0;
var o = this.options;
return o.isNeedFreeze === true ? BI.clamp(o.freezeCols.length, 0, o.columnSize.length) : 0;
},
_digest: function () {

Loading…
Cancel
Save