Browse Source

Pull request #1505: BI-59128 & BI-72808 style:单值滑块错误语句提示文本,fix:IE11,文本组件下拉选项面板被分组表遮挡,显示不清

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit 'ca740ca88af864b32db1f7481b4562a0e1a7eff2':
  BI-59128 style:不允许小数时修改错误提示文案
  BI-72808 fix:IE11下popup由于fixed被遮挡
  BI-72808 fix:IE11,文本组件下拉选项面板被分组表遮挡,显示不清
  BI-59128 style:单值滑块错误语句提示文本
es6
Claire.Tang 4 years ago
parent
commit
a90d1e1c4a
  1. 6
      src/less/base/view/popupview.less
  2. 2
      src/widget/downlist/combo.downlist.js
  3. 7
      src/widget/singleslider/singleslider.js

6
src/less/base/view/popupview.less

@ -43,3 +43,9 @@
.box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80));
}
}
.hack {
.bi-popup-view {
position: -ms-page !important;
}
}

2
src/widget/downlist/combo.downlist.js

@ -4,7 +4,7 @@
BI.DownListCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () {
return BI.extend(BI.DownListCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-down-list-combo",
baseCls: "bi-down-list-combo" + (BI.isIE() ? " hack" : ""),
height: 24,
items: [],
adjustLength: 0,

7
src/widget/singleslider/singleslider.js

@ -315,14 +315,19 @@ BI.SingleSlider = BI.inherit(BI.Single, {
this.min = 0;
this.max = 0;
this._setBlueTrack(0);
},
populate: function () {
var o = this.options;
if (!isNaN(this.min) && !isNaN(this.max)) {
this._setVisible(true);
this.enable = true;
if (o.digit) {
this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Number_Between", this.min, this.max));
} else {
this.label.setErrorText(BI.i18nText("BI-Basic_Please_Enter_Integer_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));

Loading…
Cancel
Save