diff --git a/packages/components/dialog/src/use-dialog.ts b/packages/components/dialog/src/use-dialog.ts index a3d7b0ea24..79fa4b67a5 100644 --- a/packages/components/dialog/src/use-dialog.ts +++ b/packages/components/dialog/src/use-dialog.ts @@ -148,10 +148,10 @@ export const useDialog = ( closed.value = false open() rendered.value = true // enables lazy rendering - emit('open') zIndex.value = props.zIndex ? zIndex.value++ : nextZIndex() // this.$el.addEventListener('scroll', this.updatePopper) nextTick(() => { + emit('open') if (targetRef.value) { targetRef.value.scrollTop = 0 } diff --git a/packages/components/drawer/__tests__/drawer.test.ts b/packages/components/drawer/__tests__/drawer.test.ts index 0c94b0f092..6b52168fcc 100644 --- a/packages/components/drawer/__tests__/drawer.test.ts +++ b/packages/components/drawer/__tests__/drawer.test.ts @@ -355,6 +355,7 @@ describe('Drawer', () => { vm.visible = true await nextTick() + await nextTick() expect(open).toHaveBeenCalled() drawer.afterEnter() expect(opened).toHaveBeenCalled()