Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~young/fineui

dist/base.js

@@ -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 () {

dist/bundle.js

@@ -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));

dist/config.js

@@ -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}的值"
 };

dist/fineui.js

@@ -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));

dist/widget.js

@@ -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));

src/base/table/table.grid.js

@@ -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 () {