Browse Source

Merge pull request #186353 in DEC/fineui from final/11.0 to persist/11.0

* commit '834b817f1b6cbc8b5ae5a59fd5b4b343b14e94e8':
  BI-113239 fix:bilessconfig同步final11.0
  同步代码 去掉默认覆盖font图标的颜色的规则
  同步代码 fix: 修复text_value_combo 下拉框未创建时setValue场景
research/test
superman 2 years ago
parent
commit
93ade7d77e
  1. 10
      bi.lessconfig.json
  2. 1
      src/case/combo/textvaluecombo/combo.textvalue.js
  3. 9
      src/less/base/single/button/item.singleselect.icontext.less

10
bi.lessconfig.json

@ -22,6 +22,9 @@
"@color-bi-border-radio": "rgba(9, 30, 64, 0.37)",
"@color-bi-border-disabled-radio": "rgba(9, 30, 64, 0.19)",
"@color-bi-background-active-radio-content": "#2C60DB",
"@color-bi-border-checkbox-theme-dark": "rgba(255, 255, 255, 0.37)",
"@color-bi-border-hover-active-radio-theme-dark": "#3869DC",
"@color-bi-background-active-radio-content-theme-dark": "#3869DC",
"@color-bi-background-disabled-active-radio-content": "#FFFFFF",
"@color-bi-background-disabled-active-radio-content-theme-dark": "#606479",
"@color-bi-background-disabled-active-checkbox-content": "#FFFFFF",
@ -39,6 +42,9 @@
"@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)",
"@font-down-triangle": "e70b",
"@font-date": "e733"
"@font-date": "e733",
"@font-trigger-triangle": "e924",
"@font-solid-bottom": "e905",
"@font-solid-right": "e906",
"@font-dot": "e762"
}

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

@ -76,7 +76,6 @@ BI.TextValueCombo = BI.inherit(BI.Widget, {
type: "bi.text_value_combo_popup",
ref: ref => this.popup = ref,
chooseType: o.chooseType,
value: o.value,
items: o.items,
listeners: [
{

9
src/less/base/single/button/item.singleselect.icontext.less

@ -1,9 +0,0 @@
@import "../../../index.less";
.bi-single-select-icon-text-item{
&:active, &.active {
& .b-font:before {
color: @color-bi-text-active-single-select-icon-text-item;
}
}
}
Loading…
Cancel
Save