diff --git a/src/count-down/index.js b/src/count-down/index.js index b6eb9dd1d..233ef554e 100644 --- a/src/count-down/index.js +++ b/src/count-down/index.js @@ -63,7 +63,7 @@ export default createComponent({ } }, - beforeDestroy() { + beforeUnmount() { this.pause(); }, diff --git a/src/count-down/test/index.spec.js b/src/count-down/test/index.spec.js index 1f0376509..53abbf532 100644 --- a/src/count-down/test/index.spec.js +++ b/src/count-down/test/index.spec.js @@ -174,7 +174,7 @@ test('incomplate format prop', () => { expect(wrapper).toMatchSnapshot(); }); -test('pause when destroyed', () => { +test('pause when unmounted', () => { const wrapper = mount(CountDown); expect(wrapper.vm.counting).toBeTruthy(); wrapper.destroy(); diff --git a/src/field/index.js b/src/field/index.js index 8379fc39d..7cfe9809b 100644 --- a/src/field/index.js +++ b/src/field/index.js @@ -117,7 +117,7 @@ export default createComponent({ } }, - beforeDestroy() { + beforeUnmount() { if (this.vanForm) { this.vanForm.removeField(this); } diff --git a/src/image/index.js b/src/image/index.js index 2e4da9c89..822eabcda 100644 --- a/src/image/index.js +++ b/src/image/index.js @@ -77,7 +77,7 @@ export default createComponent({ } }, - beforeDestroy() { + beforeUnmount() { const { $Lazyload } = this; if ($Lazyload) { diff --git a/src/mixins/bind-event.ts b/src/mixins/bind-event.ts index 5a54365c8..fae5de458 100644 --- a/src/mixins/bind-event.ts +++ b/src/mixins/bind-event.ts @@ -28,6 +28,6 @@ export function BindEventMixin(handler: BindEventHandler) { mounted: bind, activated: bind, deactivated: unbind, - beforeDestroy: unbind, + beforeUnmount: unbind, }; } diff --git a/src/mixins/click-outside.js b/src/mixins/click-outside.js index 534d026f9..6b0a84ac7 100644 --- a/src/mixins/click-outside.js +++ b/src/mixins/click-outside.js @@ -25,7 +25,7 @@ export const ClickOutsideMixin = (config) => ({ on(document, config.event, this.clickOutsideHandler); }, - beforeDestroy() { + beforeUnmount() { off(document, config.event, this.clickOutsideHandler); }, }); diff --git a/src/mixins/popup/index.js b/src/mixins/popup/index.js index a84bb3641..803161d37 100644 --- a/src/mixins/popup/index.js +++ b/src/mixins/popup/index.js @@ -83,7 +83,7 @@ export function PopupMixin(options = {}) { } }, - beforeDestroy() { + beforeUnmount() { if (this.opened) { this.removeLock(); } diff --git a/src/picker/PickerColumn.js b/src/picker/PickerColumn.js index 195c0c3d1..31bdda38f 100644 --- a/src/picker/PickerColumn.js +++ b/src/picker/PickerColumn.js @@ -66,7 +66,7 @@ export default createComponent({ this.bindTouchEvent(this.$el); }, - destroyed() { + unmounted() { const { children } = this.$parent; if (children) { diff --git a/src/toast/Toast.js b/src/toast/Toast.js index f0955ec68..84b9513d5 100644 --- a/src/toast/Toast.js +++ b/src/toast/Toast.js @@ -50,7 +50,7 @@ export default createComponent({ this.toggleClickable(); }, - destroyed() { + unmounted() { this.toggleClickable(); },