Peach: Local-first video metadata scraper and media manager.
fix(web): 保留列表详情往返的分页位置
longmeidao727e2bd0d34b
diff --git a/frontend/e2e/catalog-list.test.ts b/frontend/e2e/catalog-list.test.tsindex 132a7c41a..fbd5cb8ef 100644--- a/frontend/e2e/catalog-list.test.ts+++ b/frontend/e2e/catalog-list.test.ts@@ -43,10 +43,20 @@ describe('馆藏卡片与列表', () => {await page.reload({ waitUntil: 'load' });await page.locator('[data-catalog-table] [data-catalog-row]').first().waitFor();assert.equal(await page.getByRole('radio', { name: '列表', exact: true }).isChecked(), true);+ const pageSize = page.getByRole('button', { name: /每页显示数量/ });+ await pageSize.scrollIntoViewIfNeeded();+ await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));+ await pageSize.click();+ await page.getByRole('option', { name: '每页 10 部', exact: true }).click();+ await page.waitForFunction(() => document.querySelectorAll('[data-catalog-row]').length === 10);+ await page.getByRole('button', { name: '下一页', exact: true }).click();+ await page.waitForFunction(() => document.querySelectorAll('[data-catalog-row]').length === 2);await page.locator('#grid [data-list-open]').first().click();await page.waitForURL(/\/(?:assets|works)\//);await page.goBack();await page.locator('[data-catalog-table] [data-catalog-row]').first().waitFor();+ await page.waitForFunction(() => document.querySelectorAll('[data-catalog-row]').length === 2);+ assert.equal(await page.getByRole('button', { name: '第 2 页', exact: true }).getAttribute('aria-current'), 'page');await choose('卡片');await page.locator('[data-catalog-view-mode="cards"] [data-media-card]').first().waitFor();assert.equal(await page.locator('#grid [data-media-card]').count(), count);diff --git a/frontend/src/react/catalog-grid/catalog-list-page.tsx b/frontend/src/react/catalog-grid/catalog-list-page.tsxindex 49328c730..3702e34f9 100644--- a/frontend/src/react/catalog-grid/catalog-list-page.tsx+++ b/frontend/src/react/catalog-grid/catalog-list-page.tsx@@ -35,7 +35,11 @@ const positions = new Map<string, ListState>();/** 服务端对完整筛选结果排序、分页;选择集及批量栏归现有馆藏控制器。 */export function CatalogListPage(props: CatalogGridProps) {const params = catalogParams(props.filters || {}, false);- const scope = `${props.mode}:${props.listScope || props.entityKey || ''}:${params}`;+ const [scope] = useState(() => {+ const position = new URLSearchParams(params);+ if (!new URLSearchParams(location.search).has('seed')) position.delete('seed');+ return `${props.mode}:${props.listScope || props.entityKey || ''}:${position}`;+ });const [state, setState] = useState<ListState>(() => positions.get(scope) || {sorting: [], pagination: { pageIndex: 0, pageSize: 20 },});@@ -44,7 +48,7 @@ export function CatalogListPage(props: CatalogGridProps) {const offset = pagination.pageIndex * pagination.pageSize;const sort = sorting[0];const result = useQuery({- queryKey: ['catalog-grid', 'table', scope, props.revision, pagination, sorting],+ queryKey: ['catalog-grid', 'table', scope, params, props.revision, pagination, sorting],placeholderData: keepPreviousData,queryFn: async ({ signal }): Promise<MediaPage> => {const options = { limit: pagination.pageSize, sort: sort?.id, dir: sort ? sort.desc ? 'desc' : 'asc' : undefined };diff --git a/frontend/src/react/entity-page/entity-page-view.tsx b/frontend/src/react/entity-page/entity-page-view.tsxindex 4093826b7..e02b52834 100644--- a/frontend/src/react/entity-page/entity-page-view.tsx+++ b/frontend/src/react/entity-page/entity-page-view.tsx@@ -404,7 +404,8 @@ function EntityLoaded(props: EntityPageProps & { entity: EntityPageData }) {: worksEmpty ? <WorksEmpty filtered={filtered} onShowAll={showAll} />: (<EntityBodyPage kind={kind} name={name} view={view} roster={rosterProps} items={items.data ?? null}- revision={itemsRevision} fetchPage={fetchPage} listScope={JSON.stringify(itemsQuery.queryKey.slice(0, -1))}+ revision={itemsRevision} fetchPage={fetchPage}+ listScope={JSON.stringify([kind, name, filters, props.jav, filters.sort === 'seed' ? props.seed : ''])}photos={photos} photoSize={props.photoSize}photoLayout={props.photoLayout} helpers={props.card.helpers} actions={bodyActions} layout={layout}selectMode={props.selectMode} selected={props.selected} seekSeconds={props.seekSeconds}diff --git a/web/dist/peach-app.js b/web/dist/peach-app.jsindex eef8a18eb..8c74c8033 100644--- a/web/dist/peach-app.js+++ b/web/dist/peach-app.js@@ -52899,7 +52899,10 @@ var qwe = _L({}], gR = /* @__PURE__ */ new Map();function Ywe(e) {- let t = lD(e.filters || {}, !1), n = `${e.mode}:${e.listScope || e.entityKey || ""}:${t}`, [r, i] = (0, S.useState)(() => gR.get(n) || {+ let t = lD(e.filters || {}, !1), [n] = (0, S.useState)(() => {+ let n = new URLSearchParams(t);+ return new URLSearchParams(location.search).has("seed") || n.delete("seed"), `${e.mode}:${e.listScope || e.entityKey || ""}:${n}`;+ }), [r, i] = (0, S.useState)(() => gR.get(n) || {sorting: [],pagination: {pageIndex: 0,@@ -52914,6 +52917,7 @@ function Ywe(e) {"catalog-grid","table",n,+ t,e.revision,o,a@@ -60174,7 +60178,13 @@ function Qke(e) {items: M.data ?? null,revision: N,fetchPage: ee,- listScope: JSON.stringify(j.queryKey.slice(0, -1)),+ listScope: JSON.stringify([+ t,+ n,+ i,+ e.jav,+ i.sort === "seed" ? e.seed : ""+ ]),photos: se,photoSize: e.photoSize,photoLayout: e.photoLayout,