From 6a0eb8cf63dd17c863735d5cc59918a9966dabcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com>
Date: Sat, 5 Sep 2026 21:36:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(admin):=20=E8=8F=9C=E5=8D=95=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=8E=BB=E6=8E=89=E4=B8=8A=E7=A7=BB/=E4=B8=8B?=
 =?UTF-8?q?=E7=A7=BB=EF=BC=8C=E6=8E=92=E5=BA=8F=E6=94=B9=E7=94=B1=20sort?=
 =?UTF-8?q?=5Forder=20=E7=BB=B4=E6=8A=A4=EF=BC=88=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=B7=B2=E6=B7=98=E6=B1=B0=E5=8D=B3=E6=97=B6=E5=BA=94=E5=BA=8F?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/account/MenusPage.vue           | 23 +------------------
 admin-frontend-vue/tests/task-252.test.ts     |  8 ++++---
 admin-frontend-vue/tests/task-58.test.ts      |  6 +++--
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/admin-frontend-vue/src/pages/account/MenusPage.vue b/admin-frontend-vue/src/pages/account/MenusPage.vue
index 07c1874c..a301b8fb 100644
--- a/admin-frontend-vue/src/pages/account/MenusPage.vue
+++ b/admin-frontend-vue/src/pages/account/MenusPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { createMenu, deleteMenu, loadMenuManageTree, reorderMenus, updateMenu } from './menu-manage-api'
+import { createMenu, deleteMenu, loadMenuManageTree, updateMenu } from './menu-manage-api'
 import {
   createMenuForm,
   flattenMenuNodes,
@@ -10,7 +10,6 @@ import {
   menuParentChangeReason,
   menuTypeLabel,
   nextSiblingSort,
-  siblingOrderAfterMove,
   validateMenuManageForm,
   type MenuManageForm,
   type MenuManageNode,
@@ -108,20 +107,6 @@ async function removeMenu(node: MenuManageNode) {
   }
 }
 
-/** 同级上移/下移并提交排序；到达边界则忽略。 */
-async function moveMenuRow(node: MenuManageNode, dir: -1 | 1) {
-  const flat = flattenMenuNodes(rows.value)
-  const group = flat.filter((n) => (n.parentId ?? null) === (node.parentId ?? null)).map((n) => n.id)
-  const ordered = siblingOrderAfterMove(group, node.id, dir)
-  if (ordered.join(',') === group.join(',')) return
-  try {
-    await reorderMenus(ordered)
-    await loadMenus()
-  } catch (error) {
-    ElMessage.error(error instanceof Error ? error.message : '排序保存失败')
-  }
-}
-
 onMounted(loadMenus)
 </script>
 
@@ -150,12 +135,6 @@ onMounted(loadMenus)
         </el-table-column>
         <el-table-column prop="createdAt" label="创建时间" min-width="150" />
         <el-table-column prop="sortOrder" label="排序" width="90" />
-        <el-table-column label="移动" width="130">
-          <template #default="{ row }">
-            <el-button link type="primary" @click="moveMenuRow(row, -1)">上移</el-button>
-            <el-button link type="primary" @click="moveMenuRow(row, 1)">下移</el-button>
-          </template>
-        </el-table-column>
         <el-table-column label="操作" width="160" fixed="right">
           <template #default="{ row }">
             <el-button link type="primary" @click="openEdit(row)">编辑</el-button>
diff --git a/admin-frontend-vue/tests/task-252.test.ts b/admin-frontend-vue/tests/task-252.test.ts
index 0f45340e..0be7cb12 100644
--- a/admin-frontend-vue/tests/task-252.test.ts
+++ b/admin-frontend-vue/tests/task-252.test.ts
@@ -62,9 +62,11 @@ test('test_task_252_menus_list_invalid_input_rejected', () => {
 })
 
 test('test_task_252_menus_list_dependency_failure_returns_actionable_message', () => {
-  // 依赖：排序提交走 /column/reorder，失败有「排序保存失败」提示。
+  // 依赖：排序能力收敛到 sort_order 字段（列表/编辑弹窗维护），页面不再提供上移/下移即时排序。
   const api = readSource('src/pages/account/menu-manage-api.ts')
-  assert.match(api, /column\/reorder/, '排序走 column/reorder')
+  assert.match(api, /column\/reorder/, 'adapter 仍支持 column/reorder')
   const page = readSource('src/pages/account/MenusPage.vue')
-  assert.match(page, /排序保存失败/, '排序失败提示“排序保存失败”')
+  assert.equal(/上移|下移/.test(page), false, '页面无上移/下移')
+  assert.match(page, /menuForm\.sortOrder/, '编辑弹窗维护 sort_order')
+  assert.equal(/moveMenuRow/.test(page), false, '无 moveMenuRow 残码')
 })
diff --git a/admin-frontend-vue/tests/task-58.test.ts b/admin-frontend-vue/tests/task-58.test.ts
index 5e3add8c..a499c1e3 100644
--- a/admin-frontend-vue/tests/task-58.test.ts
+++ b/admin-frontend-vue/tests/task-58.test.ts
@@ -45,12 +45,14 @@ test('test_task_058_menu_sort_invalid_input_rejected', () => {
 })
 
 test('test_task_058_menu_sort_dependency_failure_returns_actionable_message', () => {
-  // 依赖失败/排序走 adapter：POST /column/reorder 提交 ordered_ids，页面不内联请求。
+  // 依赖失败：排序走 adapter（POST /column/reorder 提交 ordered_ids），页面不内联请求；
+  // 页面上移/下移已按产品决策移除，排序改由 sort_order 字段维护。
   const api = readSource('src/pages/account/menu-manage-api.ts')
   assert.match(api, /reorderMenus|reorderColumns/)
   assert.match(api, /column\/reorder/)
   assert.match(api, /ordered_ids|orderedIds/)
   const page = readSource('src/pages/account/MenusPage.vue')
-  assert.match(page, /siblingOrderAfterMove|reorderMenus|reorderColumns/)
+  assert.equal(/上移|下移/.test(page), false, '菜单页不再提供上移/下移按钮')
   assert.equal(/http\.post/.test(page), false, '页面不内联排序请求')
+  assert.match(page, /sortOrder/, '排序通过 sort_order 字段维护')
 })