From 84f993260a39a760255af8d4f1b5ccceb2b8913f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=94=E9=A6=99=E4=B8=B8=E5=AD=90?= <15518898337@163.com>
Date: Mon, 24 Aug 2026 21:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=B5=84=E6=BA=90=E6=8E=92?=
 =?UTF-8?q?=E5=88=97=E8=83=B6=E5=9B=8A=E5=88=86=E6=AE=B5=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将依赖与类型恢复为同一胶囊内的左右分段按钮。

保留按依赖与按类型的无障碍名称并恢复可见短文案。

新增真实 DOM 结构回归，防止后续合并再次拆散按钮组。
---
 .../src/view/project-development/index.tsx    | 42 +++++++++++--------
 .../appSurface/project-development.suite.ts   | 11 +++++
 2 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/apps/ai-game-creator-shell/src/view/project-development/index.tsx b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
index 4b7f2b93f..8ad09a897 100644
--- a/apps/ai-game-creator-shell/src/view/project-development/index.tsx
+++ b/apps/ai-game-creator-shell/src/view/project-development/index.tsx
@@ -3984,15 +3984,6 @@ export default function ProjectDevelopmentView({
                         : `管理未完成编辑 (${pendingResourceEdits.length})`}
                     </button>
                   ) : null}
-                  <button
-                    type="button"
-                    className={sortMode === 'dependency' ? 'is-active' : ''}
-                    aria-pressed={sortMode === 'dependency'}
-                    onClick={() => showResourceSortMode('dependency')}
-                  >
-                    <FolderTree size={15} aria-hidden="true" />
-                    按依赖
-                  </button>
                   <span
                     className="game-resource-reorder-status"
                     role="status"
@@ -4000,15 +3991,32 @@ export default function ProjectDevelopmentView({
                   >
                     {resourceLayoutSaving ? '保存中' : resourceLayoutNotice}
                   </span>
-                  <button
-                    type="button"
-                    className={sortMode === 'type' ? 'is-active' : ''}
-                    aria-pressed={sortMode === 'type'}
-                    onClick={() => showResourceSortMode('type')}
+                  <div
+                    className="game-workbench-tabs game-resource-sort-tabs"
+                    role="group"
+                    aria-label="资源排列方式"
                   >
-                    <ListFilter size={15} aria-hidden="true" />
-                    按类型
-                  </button>
+                    <button
+                      type="button"
+                      className={sortMode === 'dependency' ? 'is-active' : ''}
+                      aria-label="按依赖"
+                      aria-pressed={sortMode === 'dependency'}
+                      onClick={() => showResourceSortMode('dependency')}
+                    >
+                      <FolderTree size={15} aria-hidden="true" />
+                      依赖
+                    </button>
+                    <button
+                      type="button"
+                      className={sortMode === 'type' ? 'is-active' : ''}
+                      aria-label="按类型"
+                      aria-pressed={sortMode === 'type'}
+                      onClick={() => showResourceSortMode('type')}
+                    >
+                      <ListFilter size={15} aria-hidden="true" />
+                      类型
+                    </button>
+                  </div>
                 </>
               ) : null}
             </div>
diff --git a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
index 75b65c8cc..3b42f2e96 100644
--- a/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
+++ b/apps/ai-game-creator-shell/tests/appSurface/project-development.suite.ts
@@ -2123,6 +2123,17 @@ export function registerProjectWorkbenchFoundationTests() {
     expect(screen.queryByText('不应显示的项目标题')).toBeNull();
     expect(screen.queryByRole('button', { name: '回首页' })).toBeNull();
     expect(screen.queryByRole('button', { name: '项目组' })).toBeNull();
+    const resourceSortControl = screen.getByRole('group', {
+      name: '资源排列方式',
+    });
+    expect(
+      Array.from(resourceSortControl.children).map((child) => child.tagName),
+    ).toEqual(['BUTTON', 'BUTTON']);
+    expect(
+      within(resourceSortControl)
+        .getAllByRole('button')
+        .map((button) => button.textContent?.trim()),
+    ).toEqual(['依赖', '类型']);
     expect(screen.getByText('仅完成计划')).not.toBeNull();
     expect(
       screen.getByText('美术资源计划已完成，尚未生成或登记图片'),
-- 
2.52.0