From 5456e3dff795645b32e8c895fb4b8c99ac90ef91 Mon Sep 17 00:00:00 2001
From: Moonofweisheng <1780903673@qq.com>
Date: Thu, 28 Nov 2024 12:36:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20Coll?=
 =?UTF-8?q?apse=20v-model=E7=BB=91=E5=AE=9A=E6=95=B0=E6=8D=AE=E5=8F=98?=
 =?UTF-8?q?=E5=8C=96=E6=97=B6=E6=9C=AA=E6=9B=B4=E6=96=B0=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Closes: #741
---
 .../wd-collapse-item/wd-collapse-item.vue     |  9 ++++++++-
 .../components/wd-collapse/wd-collapse.vue    | 19 +++----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/uni_modules/wot-design-uni/components/wd-collapse-item/wd-collapse-item.vue b/src/uni_modules/wot-design-uni/components/wd-collapse-item/wd-collapse-item.vue
index a1b5e3a51..0826aec44 100644
--- a/src/uni_modules/wot-design-uni/components/wd-collapse-item/wd-collapse-item.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-collapse-item/wd-collapse-item.vue
@@ -31,7 +31,7 @@ export default {
 
 <script lang="ts" setup>
 import wdIcon from '../wd-icon/wd-icon.vue'
-import { computed, getCurrentInstance, onMounted, ref, type CSSProperties } from 'vue'
+import { computed, getCurrentInstance, onMounted, ref, watch, type CSSProperties } from 'vue'
 import { addUnit, getRect, isArray, isDef, isPromise, isString, objToStyle, requestAnimationFrame, uuid } from '../common/util'
 import { useParent } from '../composables/useParent'
 import { COLLAPSE_KEY } from '../wd-collapse/types'
@@ -80,6 +80,13 @@ const isSelected = computed(() => {
   return (isString(modelValue) && modelValue === name) || (isArray(modelValue) && modelValue.indexOf(name as string) >= 0)
 })
 
+watch(
+  () => isSelected.value,
+  (newVal) => {
+    updateExpand(newVal)
+  }
+)
+
 onMounted(() => {
   updateExpand(isSelected.value)
 })
diff --git a/src/uni_modules/wot-design-uni/components/wd-collapse/wd-collapse.vue b/src/uni_modules/wot-design-uni/components/wd-collapse/wd-collapse.vue
index 8f0b1c843..d39130d0a 100644
--- a/src/uni_modules/wot-design-uni/components/wd-collapse/wd-collapse.vue
+++ b/src/uni_modules/wot-design-uni/components/wd-collapse/wd-collapse.vue
@@ -69,7 +69,7 @@ watch(
       console.error('value must be Array')
     }
   },
-  { deep: true, immediate: true }
+  { deep: true }
 )
 
 watch(
@@ -94,22 +94,10 @@ function updateChange(activeNames: string | string[] | boolean) {
   })
 }
 
-// 更新全部自组件展开状态
-const updateChildren = async () => {
-  for (const item of children) {
-    try {
-      await item.$.exposed!.updateExpand()
-    } catch (error) {
-      console.warn(`更新折叠面板状态失败: ${error}`)
-    }
-  }
-}
-
-async function toggle(name: string, expanded: boolean) {
+function toggle(name: string, expanded: boolean) {
   const { accordion, modelValue } = props
   if (accordion) {
     updateChange(name === modelValue ? '' : name)
-    await updateChildren()
   } else if (expanded) {
     updateChange((modelValue as string[]).concat(name))
   } else {
@@ -121,7 +109,7 @@ async function toggle(name: string, expanded: boolean) {
  * 切换所有面板展开状态，传 true 为全部展开，false 为全部收起，不传参为全部切换
  * @param options 面板状态
  */
-const toggleAll = async (options: CollapseToggleAllOptions = {}) => {
+const toggleAll = (options: CollapseToggleAllOptions = {}) => {
   if (props.accordion) {
     return
   }
@@ -141,7 +129,6 @@ const toggleAll = async (options: CollapseToggleAllOptions = {}) => {
     }
   })
   updateChange(names)
-  await updateChildren()
 }
 
 /**