diff --git a/src/case/combo/bubblecombo/popup.bubble.js b/src/case/combo/bubblecombo/popup.bubble.js index dade95184..7eb70b26d 100644 --- a/src/case/combo/bubblecombo/popup.bubble.js +++ b/src/case/combo/bubblecombo/popup.bubble.js @@ -8,12 +8,12 @@ BI.BubblePopupView = BI.inherit(BI.PopupView, { _defaultConfig: function () { var config = BI.BubblePopupView.superclass._defaultConfig.apply(this, arguments); return BI.extend(config, { - baseCls: config.baseCls + " bi-bubble-popup-view bi-zoom-big-leave bi-zoom-big-leave-active", + baseCls: config.baseCls + " bi-bubble-popup-view bi-zoom-big-enter bi-zoom-big-enter-active", minWidth: 220, maxWidth: 300, minHeight: 90 }); - } + }, }); BI.shortcut("bi.bubble_popup_view", BI.BubblePopupView); @@ -102,7 +102,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, { props: function () { return { - baseCls: "bi-text-bubble-bar-popup-view bi-bubble-popup-view", + baseCls: "bi-text-bubble-bar-popup-view", text: "", buttons: [{ level: "ignore", @@ -155,7 +155,7 @@ BI.TextBubblePopupBarView = BI.inherit(BI.Widget, { populate: function (v) { this.text.setText(v || this.options.text); - } + }, }); BI.TextBubblePopupBarView.EVENT_CHANGE = "EVENT_CLICK_TOOLBAR_BUTTON"; BI.shortcut("bi.text_bubble_bar_popup_view", BI.TextBubblePopupBarView); diff --git a/src/less/base/combo/combo.bubble.less b/src/less/base/combo/combo.bubble.less index c5be6bc9b..4a77badf7 100644 --- a/src/less/base/combo/combo.bubble.less +++ b/src/less/base/combo/combo.bubble.less @@ -32,77 +32,16 @@ } } -.bi-combo-popup.bi-bubble-popup-view { - &.bi-zoom-big-leave{ - .zoom-big-motion-enter(); - } - &.bi-zoom-big-leave-active{ - .zoom-big-motion-enter-active(); - } -} - -.bi-popup-view[data-popper-placement^='top'] { - > .bi-bubble-arrow { - bottom: -10px; - > .bubble-arrow { - bottom: 6px; - } - } -} -.bi-popup-view[data-popper-placement^='bottom'] { - > .bi-bubble-arrow { - top: -10px; - > .bubble-arrow { - top: 6px; - } - } -} -.bi-popup-view[data-popper-placement^='left'] { - > .bi-bubble-arrow { - right: -10px; - > .bubble-arrow { - right: 6px; - } - } -} -.bi-popup-view[data-popper-placement^='right'] { - > .bi-bubble-arrow { - left: -10px; - > .bubble-arrow { - left: 6px; - } - } -} - -.bi-bubble-arrow { - width: 10px; - height: 10px; - overflow: hidden; - .bubble-arrow { - width: 10px; - height: 10px; - position: absolute; - &:before { - width: 10px; - height: 10px; - position: absolute; - content: ""; - background: @color-bi-background-default; - top: 0; - left: 0; - transition: transform 0.2s ease-out 0s, visibility 0.2s ease-out 0s; - visibility: visible; - transform: translateX(0px) rotate(-135deg); - transform-origin: center center; - .box-shadow(3px 3px 10px 0,rgba(0,0,0,6%)); - } - } -} +// .bi-combo-popup .bi-bubble-popup-view { +// &.bi-zoom-big-leave{ +// .zoom-big-motion-enter(); +// } +// &.bi-zoom-big-leave-active{ +// .zoom-big-motion-enter-active(); +// } +// } .bi-theme-dark { - .bubble-arrow:before { - background: @color-bi-background-default-theme-dark; - } .bi-bubble-combo { & .bubble-combo-triangle-left, & .bubble-combo-triangle-right, & .bubble-combo-triangle-top, & .bubble-combo-triangle-bottom { &:before { diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index 43f2c0c84..d88bf8ffc 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -1,6 +1,5 @@ @import "../../index"; -/**********BI.BIListView*************/ .bi-popup-view { position: fixed !important; overflow-y: visible !important; @@ -28,7 +27,68 @@ } } +.bi-popup-view[data-popper-placement^='top'] { + > .bi-bubble-arrow { + bottom: -10px; + > .bubble-arrow { + bottom: 6px; + } + } +} +.bi-popup-view[data-popper-placement^='bottom'] { + > .bi-bubble-arrow { + top: -10px; + > .bubble-arrow { + top: 6px; + } + } +} +.bi-popup-view[data-popper-placement^='left'] { + > .bi-bubble-arrow { + right: -10px; + > .bubble-arrow { + right: 6px; + } + } +} +.bi-popup-view[data-popper-placement^='right'] { + > .bi-bubble-arrow { + left: -10px; + > .bubble-arrow { + left: 6px; + } + } +} + +.bi-bubble-arrow { + width: 10px; + height: 10px; + overflow: hidden; + .bubble-arrow { + width: 10px; + height: 10px; + position: absolute; + &:before { + width: 10px; + height: 10px; + position: absolute; + content: ""; + background: @color-bi-background-default; + top: 0; + left: 0; + transition: transform 0.2s ease-out 0s, visibility 0.2s ease-out 0s; + visibility: visible; + transform: translateX(0px) rotate(-135deg); + transform-origin: center center; + .box-shadow(3px 3px 10px 0,rgba(0,0,0,6%)); + } + } +} + .bi-theme-dark { + .bubble-arrow:before { + background: @color-bi-background-default-theme-dark; + } .bi-popup-view { & .list-view-toolbar { & > .center-element {