Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

es6
Tangjinxia 3 years ago
parent
commit
dc2c0abb86
  1. 2
      dist/2.0/fineui.css
  2. 4
      dist/2.0/fineui.ie.min.js
  3. 2
      dist/2.0/fineui.ie.min.js.map
  4. 39
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.js.map
  6. 2
      dist/2.0/fineui.min.css
  7. 4
      dist/2.0/fineui.min.js
  8. 2
      dist/2.0/fineui.min.js.map
  9. 2
      dist/2.0/fineui.modern.min.css
  10. 2
      dist/2.0/fineui.modern.min.js
  11. 2
      dist/2.0/fineui_without_normalize.css
  12. 2
      dist/2.0/fineui_without_normalize.min.css
  13. 2
      dist/core.css
  14. 39
      dist/core.js
  15. 2
      dist/core.js.map
  16. 2
      dist/demo.css
  17. 39
      dist/demo.js
  18. 2
      dist/demo.js.map
  19. 2
      dist/fineui.css
  20. 4
      dist/fineui.ie.min.js
  21. 2
      dist/fineui.ie.min.js.map
  22. 39
      dist/fineui.js
  23. 2
      dist/fineui.js.map
  24. 2
      dist/fineui.min.css
  25. 4
      dist/fineui.min.js
  26. 2
      dist/fineui.min.js.map
  27. 2
      dist/fineui.modern.min.css
  28. 2
      dist/fineui.modern.min.js
  29. 2
      dist/fineui.proxy.css
  30. 39
      dist/fineui.proxy.js
  31. 2
      dist/fineui.proxy.js.map
  32. 2
      dist/fineui.proxy.min.css
  33. 4
      dist/fineui.proxy.min.js
  34. 2
      dist/fineui.proxy.min.js.map
  35. 39
      dist/fineui_without_jquery_polyfill.js
  36. 2
      dist/fineui_without_jquery_polyfill.js.map
  37. 2
      dist/fineui_without_normalize.min.css
  38. 2
      dist/font.css
  39. 2
      dist/resource.css
  40. 2
      dist/utils.js
  41. 2
      dist/utils.min.js
  42. 2
      package.json
  43. 6
      src/base/collection/collection.js
  44. 55
      src/base/grid/grid.js
  45. 2
      src/base/single/editor/editor.multifile.js
  46. 1
      src/widget/dynamicdate/dynamicdate.card.js

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

39
dist/2.0/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27677,26 +27677,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -27707,8 +27701,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -27726,7 +27720,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -27737,7 +27731,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -32208,7 +32202,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -48780,7 +48774,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/2.0/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.modern.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.modern.min.js vendored

@ -1,2 +1,2 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t(t.s=1450)}({1192:function(e,n,t){},1450:function(e,n,t){t(1192),t(1451),t(1452),t(1453),t(1454),e.exports=t(1455)},1451:function(e,n,t){},1452:function(e,n,t){},1453:function(e,n,t){},1454:function(e,n,t){},1455:function(e,n,t){}});

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

39
dist/core.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27677,26 +27677,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -27707,8 +27701,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -27726,7 +27720,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -27737,7 +27731,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -32208,7 +32202,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -48780,7 +48774,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/core.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

39
dist/demo.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27677,26 +27677,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -27707,8 +27701,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -27726,7 +27720,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -27737,7 +27731,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -32208,7 +32202,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -48780,7 +48774,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/demo.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored

File diff suppressed because one or more lines are too long

39
dist/fineui.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -27677,26 +27677,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -27707,8 +27701,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -27726,7 +27720,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -27737,7 +27731,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -32208,7 +32202,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -48780,7 +48774,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/fineui.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.modern.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.modern.min.js vendored

@ -1,2 +1,2 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
!function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t(t.s=1441)}({1192:function(e,n,t){},1441:function(e,n,t){t(1192),t(1442),t(1443),t(1444),t(1445),e.exports=t(1446)},1442:function(e,n,t){},1443:function(e,n,t){},1444:function(e,n,t){},1445:function(e,n,t){},1446:function(e,n,t){}});

2
dist/fineui.proxy.css vendored

File diff suppressed because one or more lines are too long

39
dist/fineui.proxy.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -25138,26 +25138,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -25168,8 +25162,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -25187,7 +25181,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -25198,7 +25192,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -29669,7 +29663,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -46241,7 +46235,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/fineui.proxy.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.proxy.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.js.map vendored

File diff suppressed because one or more lines are too long

39
dist/fineui_without_jquery_polyfill.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -24763,26 +24763,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -24793,8 +24787,8 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
this._debounceRelease();
this._calculateChildrenToRender();
@ -24812,7 +24806,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -24823,7 +24817,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);
@ -29294,7 +29288,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",
@ -45866,7 +45860,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

2
dist/fineui_without_jquery_polyfill.js.map vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

2
dist/utils.js vendored

@ -1,4 +1,4 @@
/*! time: 2021-9-21 9:00:58 */
/*! time: 2021-9-22 16:40:29 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
package.json

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20210921090233",
"version": "2.0.20210922164155",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

6
src/base/collection/collection.js

@ -279,15 +279,15 @@ BI.CollectionView = BI.inherit(BI.Widget, {
if (o.items.length > 0) {
this.container.setWidth(this._width);
this.container.setHeight(this._height);
this._debounceRelease();
this._calculateChildrenToRender();
// 元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._debounceRelease();
this._calculateChildrenToRender();
}
},

55
src/base/grid/grid.js

@ -74,20 +74,17 @@ BI.GridView = BI.inherit(BI.Widget, {
_calculateSizeAndPositionData: function () {
var o = this.options;
this.columnCount = 0;
this.rowCount = 0;
if (BI.isNumber(o.columnCount)) {
this.columnCount = o.columnCount;
} else if (o.items.length > 0) {
this.columnCount = o.items[0].length;
this.options.columnCount = o.items[0].length;
}
if (BI.isNumber(o.rowCount)) {
this.rowCount = o.rowCount;
} else {
this.rowCount = o.items.length;
this.options.rowCount = o.items.length;
}
this._columnSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.columnCount, o.columnWidthGetter, o.estimatedColumnSize);
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(this.rowCount, o.rowHeightGetter, o.estimatedRowSize);
this._columnSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(o.columnCount, o.columnWidthGetter, o.estimatedColumnSize);
this._rowSizeAndPositionManager = new BI.ScalingCellSizeAndPositionManager(o.rowCount, o.rowHeightGetter, o.estimatedRowSize);
},
_getOverscanIndices: function (cellCount, overscanCellsCount, startIndex, stopIndex) {
@ -119,9 +116,9 @@ BI.GridView = BI.inherit(BI.Widget, {
this._renderedRowStartIndex = visibleRowIndices.start;
this._renderedRowStopIndex = visibleRowIndices.stop;
var overscanColumnIndices = this._getOverscanIndices(this.columnCount, overscanColumnCount, this._renderedColumnStartIndex, this._renderedColumnStopIndex);
var overscanColumnIndices = this._getOverscanIndices(o.columnCount, overscanColumnCount, this._renderedColumnStartIndex, this._renderedColumnStopIndex);
var overscanRowIndices = this._getOverscanIndices(this.rowCount, overscanRowCount, this._renderedRowStartIndex, this._renderedRowStopIndex);
var overscanRowIndices = this._getOverscanIndices(o.rowCount, overscanRowCount, this._renderedRowStartIndex, this._renderedRowStopIndex);
var columnStartIndex = overscanColumnIndices.overscanStartIndex;
var columnStopIndex = overscanColumnIndices.overscanStopIndex;
@ -239,26 +236,20 @@ BI.GridView = BI.inherit(BI.Widget, {
}
},
/**
* 获取真实的可滚动的最大宽度
* 对于grid_view如果没有全部渲染过this._columnSizeAndPositionManager.getTotalSize获取的宽度是不准确的
* 因此在调用setScrollLeft等函数时会造成没法移动到最右端(预估可移动距离太短)
*/
// _getRealMaxScrollLeft: function () {
// var o = this.options;
// var totalWidth = 0;
// BI.count(0, this.columnCount, function (index) {
// totalWidth += o.columnWidthGetter(index);
// });
// return Math.max(0, totalWidth - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
// },
_getMaxScrollLeft: function () {
return Math.max(0, this._columnSizeAndPositionManager.getTotalSize() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerWidth() - this.options.width + (this.options.overflowX ? BI.DOM.getScrollWidth() : 0));
},
_getMaxScrollTop: function () {
return Math.max(0, this._rowSizeAndPositionManager.getTotalSize() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
return Math.max(0, this._getContainerHeight() - this.options.height + (this.options.overflowY ? BI.DOM.getScrollWidth() : 0));
},
_getContainerWidth: function () {
return this.options.columnCount * this.options.estimatedColumnSize;
},
_getContainerHeight: function () {
return this.options.rowCount * this.options.estimatedRowSize;
},
_populate: function (items) {
@ -269,17 +260,17 @@ BI.GridView = BI.inherit(BI.Widget, {
this._calculateSizeAndPositionData();
}
if (o.items.length > 0) {
this.container.setWidth(this.columnCount * o.estimatedColumnSize);
this.container.setHeight(this.rowCount * o.estimatedRowSize);
this._debounceRelease();
this._calculateChildrenToRender();
this.container.setWidth(this._getContainerWidth());
this.container.setHeight(this._getContainerHeight());
// 元素未挂载时不能设置scrollTop
try {
this.element.scrollTop(o.scrollTop);
this.element.scrollLeft(o.scrollLeft);
} catch (e) {
}
this._debounceRelease();
this._calculateChildrenToRender();
}
},
@ -288,7 +279,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollLeft = scrollLeft || 0;
this.options.scrollLeft = BI.clamp(scrollLeft || 0, 0, this._getMaxScrollLeft());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollLeft(this.options.scrollLeft);
@ -299,7 +290,7 @@ BI.GridView = BI.inherit(BI.Widget, {
return;
}
this._scrollLock = true;
this.options.scrollTop = scrollTop || 0;
this.options.scrollTop = BI.clamp(scrollTop || 0, 0, this._getMaxScrollTop());
this._debounceRelease();
this._calculateChildrenToRender();
this.element.scrollTop(this.options.scrollTop);

2
src/base/single/editor/editor.multifile.js

@ -19,7 +19,7 @@ BI.MultifileEditor = BI.inherit(BI.Widget, {
},
render: function () {
BI.MultifileEditor.superclass._init.apply(this, arguments);
var self = this, o = this.options;
this.file = BI.createWidget({
type: "bi.file",
cls: "multifile-editor",

1
src/widget/dynamicdate/dynamicdate.card.js

@ -14,7 +14,6 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
type: "bi.label",
text: BI.i18nText("BI-Multi_Date_Relative_Current_Time"),
textAlign: "left",
height: 12,
lgap: 10
},
tgap: 10,

Loading…
Cancel
Save