Browse Source

Merge pull request #3766 in VISUAL/fineui from DEC/fineui:release/11.0 to master

* commit 'b7cc0b4d5ade45c96b10b1a3fd2a9a1c2eb58863':
  BI-148470 refactor: 增加popup
  BI-157020 fix: 深色模式下clear的按钮带有背景色
master
Aeolus.Zhang-张敬峥 2 weeks ago
parent
commit
b3b96840b3
  1. 4
      packages/fineui/src/less/base/single/button/button.less
  2. 2
      packages/fineui/src/widget/multilayerdownlist/combo.downlist.js

4
packages/fineui/src/less/base/single/button/button.less

@ -580,6 +580,10 @@ body .bi-button, #body .bi-button {
.bi-button { .bi-button {
background-color: @color-bi-background-button-theme-dark; background-color: @color-bi-background-button-theme-dark;
&.clear {
background-color: transparent;
}
&.button-ignore { &.button-ignore {
background-color: @color-bi-background-ignore-button-theme-dark; background-color: @color-bi-background-ignore-button-theme-dark;

2
packages/fineui/src/widget/multilayerdownlist/combo.downlist.js

@ -23,6 +23,7 @@ export class MultiLayerDownListCombo extends Widget {
container: null, container: null,
stopPropagation: false, stopPropagation: false,
el: {}, el: {},
popup: {},
}); });
} }
@ -65,6 +66,7 @@ export class MultiLayerDownListCombo extends Widget {
el: this.popupview, el: this.popupview,
stopPropagation: o.stopPropagation, stopPropagation: o.stopPropagation,
maxHeight: 1000, maxHeight: 1000,
...o.popup,
}, },
}); });

Loading…
Cancel
Save