diff --git a/components/trigger/Popup.vue b/components/trigger/Popup.vue index 701227e6f..6471b068d 100644 --- a/components/trigger/Popup.vue +++ b/components/trigger/Popup.vue @@ -98,7 +98,7 @@ export default { return `${this.$props.prefixCls} ${this.$props.popupClassName} ${currentAlignClassName}` }, getPopupElement () { - const { $props: props, $slots, $listeners } = this + const { $props: props, $slots, $listeners, getTransitionName } = this const { align, visible, prefixCls, animation } = props const { mouseenter, mouseleave } = $listeners this.currentAlignClassName = this.currentAlignClassName || props.getClassNameFromAlign(align) @@ -129,6 +129,7 @@ export default { }), } let opacity = '1' + const transitionName = getTransitionName() const transitionEvent = { beforeEnter: (el) => { opacity = el.style.opacity @@ -138,10 +139,10 @@ export default { }, enter: (el, done) => { el.style.opacity = opacity - animate(el, 'zoom-big-enter', done) + animate(el, `${transitionName}-enter`, done) }, leave: (el, done) => { - animate(el, 'zoom-big-leave', done) + animate(el, `${transitionName}-leave`, done) }, afterLeave: (el) => { if (this.destroyPopupOnHide) { diff --git a/components/trigger/Transition.vue b/components/trigger/Transition.vue deleted file mode 100644 index 9b32f1314..000000000 --- a/components/trigger/Transition.vue +++ /dev/null @@ -1,16 +0,0 @@ - diff --git a/examples/dialog.vue b/examples/dialog.vue deleted file mode 100644 index 63e70c3d4..000000000 --- a/examples/dialog.vue +++ /dev/null @@ -1,29 +0,0 @@ - - diff --git a/examples/rate.vue b/examples/rate.vue deleted file mode 100644 index fa48d073d..000000000 --- a/examples/rate.vue +++ /dev/null @@ -1,70 +0,0 @@ - - diff --git a/examples/routes.js b/examples/routes.js index 6c08b5a26..70c886a5e 100644 --- a/examples/routes.js +++ b/examples/routes.js @@ -3,7 +3,7 @@ const AsyncComp = () => { const com = pathnameArr[1] || 'button' const demo = pathnameArr[2] || 'index' return { - component: import(`../components/tag/demo/${demo}.vue`), + component: import(`../components/tooltip/demo/${demo}.vue`), } } export default [