From 0447af590942bc2dabf175896ab408d94774b610 Mon Sep 17 00:00:00 2001
From: nieyuyao <nieyuyao0826@hotmail.com>
Date: Wed, 4 Oct 2023 15:17:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8nextTick=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3vue2=E4=B8=8Bref=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TreeDrop.vue   | 12 +++++++++---
 src/components/TreeSearch.vue | 14 +++++++++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/components/TreeDrop.vue b/src/components/TreeDrop.vue
index bf6d34f..55e29c6 100644
--- a/src/components/TreeDrop.vue
+++ b/src/components/TreeDrop.vue
@@ -33,7 +33,7 @@
           ref="treeSearchRef"
           v-model="treeSearchValue"
           v-bind="$attrs"
-          @set-data="handleSetData"
+          @set-data="isVue2 ? handleSetDataV2 : handleSetData"
           @checked-change="handleCheckedChange"
           @selected-change="handleSelectedChange"
         >
@@ -56,7 +56,8 @@ import {
   watch,
   nextTick,
   PropType,
-  withCtx
+  withCtx,
+  isVue2
 } from 'vue-demi'
 import CTreeSearch from './TreeSearch.vue'
 import { TreeNode } from '../store'
@@ -424,6 +425,9 @@ export default defineComponent({
         }
       }
     }
+    function handleSetDataV2() {
+      nextTick(handleSetData)
+    }
     onMounted(() => {
       document.addEventListener('click', handleDocumentClick)
       if (props.transfer) {
@@ -475,7 +479,9 @@ export default defineComponent({
       handleClear,
       handleCheckedChange,
       handleSelectedChange,
-      handleSetData
+      handleSetData,
+      isVue2,
+      handleSetDataV2
     }
   }
 })
diff --git a/src/components/TreeSearch.vue b/src/components/TreeSearch.vue
index 65608f0..459894e 100644
--- a/src/components/TreeSearch.vue
+++ b/src/components/TreeSearch.vue
@@ -35,7 +35,7 @@
         ref="treeRef"
         v-bind="$attrs"
         v-model="treeModelValue"
-        @set-data="onSetData"
+        @set-data="isVue2 ? onSetDataV2 : onSetData"
         @checked-change="checkedChange"
       >
         <template v-for="(_, slot) in $slots" :name="slot" v-slot="scope">
@@ -61,7 +61,9 @@ import {
   Ref,
   computed,
   onMounted,
-  PropType
+  PropType,
+  isVue2,
+nextTick
 } from 'vue-demi'
 import CTree from './Tree.vue'
 import { ApiType } from '../const'
@@ -372,6 +374,10 @@ export default defineComponent({
       emit('set-data')
       handleSetData()
     }
+
+    function onSetDataV2() {
+      nextTick(onSetData)
+    }
     onMounted(() => {
       if (checkable.value && !checkedCount.value) {
         handleSetData()
@@ -421,7 +427,9 @@ export default defineComponent({
       checkedChange,
       onSetData,
       clearKeyword,
-      search
+      search,
+      isVue2,
+      onSetDataV2
     }
   }
 })

From 53a624334ea03930eed092a19dc77760ee451b1a Mon Sep 17 00:00:00 2001
From: nieyuyao <nieyuyao0826@hotmail.com>
Date: Sat, 7 Oct 2023 17:55:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20isVue2=E5=88=A4=E6=96=AD=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=B0=E8=B0=83=E7=94=A8=E5=87=BD=E6=95=B0=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TreeDrop.vue   | 12 +++++-------
 src/components/TreeSearch.vue |  9 ++-------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/components/TreeDrop.vue b/src/components/TreeDrop.vue
index 55e29c6..eafe79c 100644
--- a/src/components/TreeDrop.vue
+++ b/src/components/TreeDrop.vue
@@ -33,7 +33,7 @@
           ref="treeSearchRef"
           v-model="treeSearchValue"
           v-bind="$attrs"
-          @set-data="isVue2 ? handleSetDataV2 : handleSetData"
+          @set-data="handleSetData"
           @checked-change="handleCheckedChange"
           @selected-change="handleSelectedChange"
         >
@@ -400,8 +400,7 @@ export default defineComponent({
       dropdownVisible.value = false
     }
 
-    /** 处理树数据更新 */
-    function handleSetData(): void {
+    function onSetData() {
       const treeRef = treeSearchRef.value.$refs.treeRef
       slotProps.checkedNodes = treeSearchRef.value.getCheckedNodes()
       slotProps.checkedKeys = treeSearchRef.value.getCheckedKeys()
@@ -425,8 +424,9 @@ export default defineComponent({
         }
       }
     }
-    function handleSetDataV2() {
-      nextTick(handleSetData)
+    /** 处理树数据更新 */
+    function handleSetData(): void {
+      isVue2 ? nextTick(onSetData) : onSetData()
     }
     onMounted(() => {
       document.addEventListener('click', handleDocumentClick)
@@ -480,8 +480,6 @@ export default defineComponent({
       handleCheckedChange,
       handleSelectedChange,
       handleSetData,
-      isVue2,
-      handleSetDataV2
     }
   }
 })
diff --git a/src/components/TreeSearch.vue b/src/components/TreeSearch.vue
index 459894e..e5aa937 100644
--- a/src/components/TreeSearch.vue
+++ b/src/components/TreeSearch.vue
@@ -35,7 +35,7 @@
         ref="treeRef"
         v-bind="$attrs"
         v-model="treeModelValue"
-        @set-data="isVue2 ? onSetDataV2 : onSetData"
+        @set-data="onSetData"
         @checked-change="checkedChange"
       >
         <template v-for="(_, slot) in $slots" :name="slot" v-slot="scope">
@@ -372,12 +372,9 @@ export default defineComponent({
 
     function onSetData() {
       emit('set-data')
-      handleSetData()
+      isVue2 ?  nextTick(handleSetData) : handleSetData()
     }
 
-    function onSetDataV2() {
-      nextTick(onSetData)
-    }
     onMounted(() => {
       if (checkable.value && !checkedCount.value) {
         handleSetData()
@@ -428,8 +425,6 @@ export default defineComponent({
       onSetData,
       clearKeyword,
       search,
-      isVue2,
-      onSetDataV2
     }
   }
 })