From 7c85f7fe9ff120830f6c844b40b6e9dddbe5a8b1 Mon Sep 17 00:00:00 2001
From: yeuimu <2197651308@qq.com>
Date: Fri, 28 Aug 2026 17:11:36 +0800
Subject: [PATCH] fix(admin): config dialog lists all same-category sibling
 links (incl. configured); drop merge tip text

---
 apps/admin/src/views/goods/GoodsView.vue                    | 3 ++-
 apps/admin/src/views/goods/components/GoodsConfigDialog.vue | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/admin/src/views/goods/GoodsView.vue b/apps/admin/src/views/goods/GoodsView.vue
index 85a1274..b38bcc8 100644
--- a/apps/admin/src/views/goods/GoodsView.vue
+++ b/apps/admin/src/views/goods/GoodsView.vue
@@ -387,7 +387,8 @@ function collectSiblings(ogNode: any): any[] {
   const result: any[] = []
   function traverse(nodes: any[]) {
     for (const n of nodes) {
-      if (n.isOG && n.parentId === ogNode.parentId && String(n.rawId) !== String(ogNode.rawId) && !n.configuredCount) result.push(n)
+      // 同分类下的全部其他链接（含已配置的，勾选归族操作幂等）
+      if (n.isOG && n.parentId === ogNode.parentId && String(n.rawId) !== String(ogNode.rawId)) result.push(n)
       if (n.children?.length) traverse(n.children)
     }
   }
diff --git a/apps/admin/src/views/goods/components/GoodsConfigDialog.vue b/apps/admin/src/views/goods/components/GoodsConfigDialog.vue
index ece9c43..ece36eb 100644
--- a/apps/admin/src/views/goods/components/GoodsConfigDialog.vue
+++ b/apps/admin/src/views/goods/components/GoodsConfigDialog.vue
@@ -126,7 +126,6 @@ async function handleSubmit() {
       </el-form-item>
       <el-form-item v-if="siblings.length" label="合并同名">
         <div class="config-merge-box">
-          <div class="config-merge-tip">勾选同分类下同名（不同工厂/仓库）原产品，与当前链接归入同一族：尺码/包装并集 + 价格矩阵。</div>
           <el-checkbox-group v-model="checkedIds">
             <el-checkbox v-for="s in siblings" :key="s.rawId" :value="String(s.rawId)">
               {{ s.goodName }}<template v-if="s.goodPrice"> · ¥{{ s.goodPrice }}</template>
@@ -150,6 +149,5 @@ async function handleSubmit() {
 .config-og-name { font-weight: 600; font-size: 14px; }
 .config-og-meta { color: #909399; font-size: 12px; margin-top: 2px; }
 .config-merge-box { width: 100%; }
-.config-merge-tip { color: #909399; font-size: 12px; margin-bottom: 8px; line-height: 1.5; }
-.config-merge-box .el-checkbox-group { display: flex; flex-direction: column; align-items: flex-start; max-height: 160px; overflow-y: auto; }
+.config-merge-box .el-checkbox-group { display: flex; flex-direction: column; align-items: flex-start; max-height: 200px; overflow-y: auto; }
 </style>