From 02441565a0477495d9913e3257590cd2fbd2698f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Wed, 9 Sep 2026 18:32:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin-vue):=20=E7=BC=96=E8=BE=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90=E5=B7=B2=E6=8E=88?=
 =?UTF-8?q?=E6=9D=83=E5=9B=9E=E6=98=BE=E5=A4=B1=E6=95=88=E2=80=94=E2=80=94?=
 =?UTF-8?q?=E6=A0=91=E6=95=B0=E6=8D=AE=E5=B0=B1=E7=BB=AA=E5=90=8E=20await?=
 =?UTF-8?q?=20nextTick=20=E5=86=8D=20setCheckedKeys=EF=BC=88el-tree=20stor?=
 =?UTF-8?q?e=20=E5=BC=82=E6=AD=A5=E5=90=8C=E6=AD=A5=20props.data=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A7=E5=AE=9E=E7=8E=B0=E4=BD=9C=E7=94=A8=E5=9C=A8=E7=A9=BA?=
 =?UTF-8?q?=20store=20=E4=B8=8A=E5=8B=BE=E9=80=89=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=EF=BC=89=EF=BC=8C=E8=A1=A5=E6=BA=90=E7=A0=81=E6=96=AD=E8=A8=80?=
 =?UTF-8?q?=E9=98=B2=E5=9B=9E=E5=BD=92=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/account/UserMenuAuthTree.vue           |  7 +++++--
 .../tests/align-user-menu-auth-app.test.ts           | 12 ++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue
index 76d4b472..da41f7db 100644
--- a/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue
+++ b/admin-frontend-vue/src/pages/account/UserMenuAuthTree.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, nextTick, onMounted, ref, watch } from 'vue'
 import type { MenuOptionNode } from './user-menu-auth'
 import { compactDirectGrantIds } from './user-menu-auth'
 import { fetchGrantableMenus } from './user-menu-auth-api'
@@ -43,8 +43,11 @@ async function load(): Promise<void> {
   try {
     data.value = await fetchGrantableMenus()
     loaded.value = true
-    applyChecked()
     emit('load', true)
+    // el-tree 的 store 通过异步 watch 同步 props.data，setCheckedKeys 必须等树
+    // 渲染完成后再应用已勾选 id，否则作用在空 store 上导致已授权不回显。
+    await nextTick()
+    applyChecked()
   } catch {
     loaded.value = false
     emit('load', false)
diff --git a/admin-frontend-vue/tests/align-user-menu-auth-app.test.ts b/admin-frontend-vue/tests/align-user-menu-auth-app.test.ts
index c5548009..b507ea03 100644
--- a/admin-frontend-vue/tests/align-user-menu-auth-app.test.ts
+++ b/admin-frontend-vue/tests/align-user-menu-auth-app.test.ts
@@ -36,3 +36,15 @@ test('align_user_menu_auth_both_types_fetch_and_submit_source', () => {
   const auth = readSource('src/pages/account/user-menu-auth.ts')
   assert.match(auth, /type: string/, '授权节点携带 type')
 })
+
+test('align_user_menu_auth_echo_waits_tree_render', () => {
+  // 验收反馈：编辑用户时已授权菜单无回显——load() 在 data 赋值后同步 setCheckedKeys，
+  // el-tree 的 store 异步同步 props.data，勾选作用在空 store 上丢失。
+  // 修复：data 就绪后先 await nextTick() 再 applyChecked()。
+  const tree = readSource('src/pages/account/UserMenuAuthTree.vue')
+  const loadBlock = tree.slice(tree.indexOf('async function load'), tree.indexOf('catch {', tree.indexOf('async function load')))
+  assert.match(loadBlock, /await nextTick\(\).*applyChecked\(\)/s, '树数据就绪后等渲染完成再应用已勾选 id')
+  assert.ok(loadBlock.indexOf('await nextTick') < loadBlock.indexOf('applyChecked()'), 'nextTick 先于 applyChecked')
+  assert.match(tree, /watch\(/, 'checked 变化时仍兜底回显')
+  assert.match(tree, /if \(loaded\.value\) applyChecked\(\)/, '兜底回显仅在树加载完成后')
+})