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

Merge pull request #387 in FUI/fineui from ~LEI.WANG/fineui:master to master 

* commit '37b50f2ded65909eca72ed5e3a6b31137eefa10a':
  BI-20265 滚动表格位置的同时，需要同时修正滚动条的位置，否则会出现二者不统一的问题
es6
guy 7 years ago
parent
c80989a6d9 37b50f2ded
commit
446a201978
11 changed files with 95 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      dist/_fineui.min.js
  2. 3
      dist/base.js
  3. 5
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 52
      dist/bundle.min.js
  6. 3
      dist/config.js
  7. 5
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 50
      dist/fineui.min.js
  10. 2
      dist/widget.js
  11. 3
      src/base/table/table.grid.js

50
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.js vendored
Unescape View File

@ -31357,16 +31357,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
setVerticalScroll: function (scrollTop) {
this.bottomLeftGrid.setScrollTop(scrollTop);
this.bottomRightGrid.setScrollTop(scrollTop);
this._populateScrollbar();
},
setLeftHorizontalScroll: function (scrollLeft) {
this.topLeftGrid.setScrollLeft(scrollLeft);
this.bottomLeftGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
setRightHorizontalScroll: function (scrollLeft) {
this.topRightGrid.setScrollLeft(scrollLeft);
this.bottomRightGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
getVerticalScroll: function () {

5
dist/bundle.js vendored
Unescape View File

@ -67123,16 +67123,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
setVerticalScroll: function (scrollTop) {
this.bottomLeftGrid.setScrollTop(scrollTop);
this.bottomRightGrid.setScrollTop(scrollTop);
this._populateScrollbar();
},
setLeftHorizontalScroll: function (scrollLeft) {
this.topLeftGrid.setScrollLeft(scrollLeft);
this.bottomLeftGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
setRightHorizontalScroll: function (scrollLeft) {
this.topRightGrid.setScrollLeft(scrollLeft);
this.bottomRightGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
getVerticalScroll: function () {
@ -106745,7 +106748,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
if (!isNaN(this.min) && !isNaN(this.max)) {
this._setVisible(true);
this.enable = true;
this.label.setErrorText(BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"));
this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max));
if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) {
this.label.setValue(this.value);
this._setAllPosition(this._getPercentByValue(this.value));

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

52
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/config.js vendored
Unescape View File

@ -159,5 +159,6 @@ BI.i18n = {
"BI-Microsoft_YaHei": "微软雅黑",
"BI-Apple_Light": "苹方-light",
"BI-Font_Family": "字体",
"BI-Basic_Please_Input_Content": "请输入内容"
"BI-Basic_Please_Input_Content": "请输入内容",
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值"
};

5
dist/fineui.js vendored
Unescape View File

@ -67366,16 +67366,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
setVerticalScroll: function (scrollTop) {
this.bottomLeftGrid.setScrollTop(scrollTop);
this.bottomRightGrid.setScrollTop(scrollTop);
this._populateScrollbar();
},
setLeftHorizontalScroll: function (scrollLeft) {
this.topLeftGrid.setScrollLeft(scrollLeft);
this.bottomLeftGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
setRightHorizontalScroll: function (scrollLeft) {
this.topRightGrid.setScrollLeft(scrollLeft);
this.bottomRightGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
getVerticalScroll: function () {
@ -106988,7 +106991,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
if (!isNaN(this.min) && !isNaN(this.max)) {
this._setVisible(true);
this.enable = true;
this.label.setErrorText(BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"));
this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max));
if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) {
this.label.setValue(this.value);
this._setAllPosition(this._getPercentByValue(this.value));

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

50
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/widget.js vendored
Unescape View File

@ -19276,7 +19276,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
if (!isNaN(this.min) && !isNaN(this.max)) {
this._setVisible(true);
this.enable = true;
this.label.setErrorText(BI.i18nText("BI-Please_Enter") + this.min + "-" + this.max + BI.i18nText("BI-Basic_De") + BI.i18nText("BI-Basic_Number"));
this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max));
if (BI.isNumeric(this.value) || BI.isNotEmptyString(this.value)) {
this.label.setValue(this.value);
this._setAllPosition(this._getPercentByValue(this.value));

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

@ -399,16 +399,19 @@ BI.GridTable = BI.inherit(BI.Widget, {
setVerticalScroll: function (scrollTop) {
this.bottomLeftGrid.setScrollTop(scrollTop);
this.bottomRightGrid.setScrollTop(scrollTop);
this._populateScrollbar();
},
setLeftHorizontalScroll: function (scrollLeft) {
this.topLeftGrid.setScrollLeft(scrollLeft);
this.bottomLeftGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
setRightHorizontalScroll: function (scrollLeft) {
this.topRightGrid.setScrollLeft(scrollLeft);
this.bottomRightGrid.setScrollLeft(scrollLeft);
this._populateScrollbar();
},
getVerticalScroll: function () {

Write Preview
Loading…
Cancel
Save