fix: 兼容vue2.7

dewfall123 · Jul 12, 2022 · e70f4a0 · e70f4a0
1 parent c908056
commit e70f4a0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ahooks-vue",
-  "version": "0.13.1",
+  "version": "0.13.3",
   "description": "ahooks-vue",
   "types": "dist/src/index.d.ts",
   "repository": "https://github.com/dewfall123/ahooks-vue.git",

diff --git a/src/utils/lifeCircle.ts b/src/utils/lifeCircle.ts
@@ -1,10 +1,16 @@
 import { getCurrentInstance, onMounted } from 'vue-demi';
 
 export function safeOnMounted(hook: () => any) {
-  let instance = getCurrentInstance();
-  // @ts-ignore
-  instance = instance?.proxy || instance;
-  if (instance?.isMounted || (instance as any)._isMounted) {
+  const instance = getCurrentInstance();
+
+  // fix 兼容vue2.7
+  if (
+    // @ts-ignore
+    instance?.proxy?._isMounted ||
+    instance?.isMounted ||
+    // @ts-ignore
+    instance._isMounted
+  ) {
     hook();
   } else {
     onMounted(hook);