Browse Source

Merge pull request #76113 in DEC/fineui from release/11.0 to bugfix/11.0

* commit '55b36bbe3fd3bafdc0d56c5be2c3619c32ec67b9':
  无JIRA 同步
  无JIRA 同步
  无JIRA 同步
research/test
superman 2 years ago
parent
commit
c02e1e96e4
  1. 5
      bi.lessconfig.json
  2. 4
      src/case/combo/textvaluecombo/combo.textvalue.js

5
bi.lessconfig.json

@ -27,7 +27,6 @@
"@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
"@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
"@color-bi-background-disabled-active-checkbox-content-theme-dark": "#606479",
"@color-bi-text-header-background": "#647185",
"@color-bi-background-tooltip-success": "#2E3A4D",
"@color-bi-border-tooltip-success": "#2E3A4D",
"@color-bi-background-toast-success": "#FFFFFF",
@ -38,5 +37,7 @@
"@color-bi-color-toast-warning": "#FAAA39",
"@color-bi-color-toast-error": "#E65251",
"@color-bi-color-toast-normal": "#2C60DB",
"@color-bi-color-toast-text": "#000A19"
"@color-bi-color-toast-text": "#000A19",
"@color-bi-text-header-background": "rgba(9, 30, 64, 0.9)",
"@color-bi-text-header-background-theme-dark": "rgba(255, 255, 255, 0.9)"
}

4
src/case/combo/textvaluecombo/combo.textvalue.js

@ -18,8 +18,8 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
_init: function () {
var self = this, o = this.options;
BI.isNumeric(o.width) && (o.width -= 2);
BI.isNumeric(o.height) && (o.height -= 2);
BI.isNumeric(o.width) && (o.width -= (o.simple ? 0 : 2));
BI.isNumeric(o.height) && (o.height -= (o.simple ? 1 : 2));
o.value = BI.isFunction(o.value) ? this.__watch(o.value, function (context, newValue) {
self.setValue(newValue);
}) : o.value;

Loading…
Cancel
Save