diff --git a/components/_util/transition.tsx b/components/_util/transition.tsx index 2a118849e..cf8177af2 100644 --- a/components/_util/transition.tsx +++ b/components/_util/transition.tsx @@ -29,7 +29,7 @@ export const getTransitionProps = (transitionName: string, opt: TransitionProps enterActiveClass: `${transitionName}-enter ${transitionName}-enter-prepare`, enterToClass: `${transitionName}-enter ${transitionName}-enter-active`, leaveFromClass: ` ${transitionName}-leave`, - leaveActiveClass: `${transitionName}-leave ${transitionName}-leave-active`, + leaveActiveClass: `${transitionName}-leave`, leaveToClass: `${transitionName}-leave ${transitionName}-leave-active`, ...opt, } diff --git a/components/vc-trigger/Popup/PopupInner.tsx b/components/vc-trigger/Popup/PopupInner.tsx index a9b4697ba..4f618b3c1 100644 --- a/components/vc-trigger/Popup/PopupInner.tsx +++ b/components/vc-trigger/Popup/PopupInner.tsx @@ -115,9 +115,9 @@ export default defineComponent({ }; watch( - [toRef(motion.value, 'name'), status], + [motion, status], () => { - if (!motion.value.name && status.value === 'motion') { + if (!motion.value && status.value === 'motion') { goNextStatus(); } },