Merge remote-tracking branch 'origin/master'

1 year ago · f659c9f1bd
2 changed files with 2 additions and 0 deletions
--- a/packages/fineui/src/base/single/button/button.basic.js
+++ b/packages/fineui/src/base/single/button/button.basic.js
@ -193,6 +193,7 @@ export class BasicButton extends Single {
                                    trigger: "",
                                    // bubble的提示不需要一直存在在界面上
                                    destroyWhenHide: true,
                                    hideWhenAnotherComboOpen: true,
                                    ref: _ref => {
                                        this.combo = _ref;
                                    },
--- a/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js
+++ b/packages/fineui/src/case/combo/bubblecombo/combo.bubble.js
@ -27,6 +27,7 @@ export class BubbleCombo extends Widget {
            destroyWhenHide: false,
            hideWhenClickOutside: true,
            hideWhenBlur: true,
            hideWhenAnotherComboOpen: false,
            isNeedAdjustHeight: true, // 是否需要高度调整
            isNeedAdjustWidth: true,
            stopPropagation: false,