diff --git a/web/app/Services/UserCopy/UserCopyWorkspaceReader.php b/web/app/Services/UserCopy/UserCopyWorkspaceReader.php index b279fead..7de86add 100644 --- a/web/app/Services/UserCopy/UserCopyWorkspaceReader.php +++ b/web/app/Services/UserCopy/UserCopyWorkspaceReader.php @@ -45,6 +45,7 @@ final class UserCopyWorkspaceReader $selectedGroup = $authoring['selected_group']; $entryRows = $authoring['entry_rows']; $manifestByKey = $authoring['metadata_by_key']; + $catalogQuery = $this->catalogQuery($query); $localeRows = $this->database->table('ui_copy_locales') ->whereNull('source_claim') @@ -134,7 +135,7 @@ final class UserCopyWorkspaceReader } } - $entries = []; + $catalogEntries = []; $coverage = [ 'total' => count($entryRows), 'published' => 0, @@ -142,8 +143,6 @@ final class UserCopyWorkspaceReader 'missing' => 0, 'percent' => 0, ]; - $term = isset($query['q']) && is_string($query['q']) - ? mb_strtolower(trim($query['q'])) : ''; foreach ($entriesByKey as $copyKey => $entry) { $draft = $drafts[(int) $entry->id] ?? null; $published = $publishedItems[(int) $entry->id] ?? null; @@ -153,14 +152,6 @@ final class UserCopyWorkspaceReader : ($draft !== null ? 'draft' : 'untranslated'); $coverage[$state === 'untranslated' ? 'missing' : $state]++; - if ($term !== '' - && !str_contains(mb_strtolower($copyKey), $term) - && !str_contains( - mb_strtolower((string) $entry->source_text_zh), - $term - )) { - continue; - } $contract = json_decode( (string) $entry->placeholder_contract_json, true @@ -170,7 +161,7 @@ final class UserCopyWorkspaceReader $hidden = $draft !== null ? (string) $draft->visibility === 'hidden' : (($published['visibility'] ?? 'visible') === 'hidden'); - $entries[] = [ + $catalogEntries[] = [ 'key' => $copyKey, 'scope' => (string) $entry->scope, 'page' => (string) $entry->page_key, @@ -205,6 +196,56 @@ final class UserCopyWorkspaceReader ); } + $filteredEntries = array_values(array_filter( + $catalogEntries, + static function (array $entry) use ($catalogQuery): bool { + if ($catalogQuery['surface'] !== '' + && $entry['editor_surface'] !== $catalogQuery['surface']) { + return false; + } + $effectiveState = $entry['hidden'] === true + ? 'hidden' : $entry['state']; + if ($catalogQuery['state'] !== '' + && $effectiveState !== $catalogQuery['state']) { + return false; + } + if ($catalogQuery['term'] === '') { + return true; + } + return str_contains( + mb_strtolower((string) $entry['key']), + $catalogQuery['term'] + ) || str_contains( + mb_strtolower((string) $entry['source']), + $catalogQuery['term'] + ); + } + )); + usort( + $filteredEntries, + static fn (array $left, array $right): int => strcmp( + (string) $left['key'], + (string) $right['key'] + ) + ); + $filteredTotal = count($filteredEntries); + $totalPages = max( + 1, + (int) ceil($filteredTotal / $catalogQuery['per_page']) + ); + $entries = array_slice( + $filteredEntries, + ($catalogQuery['page'] - 1) * $catalogQuery['per_page'], + $catalogQuery['per_page'] + ); + $pagination = [ + 'page' => $catalogQuery['page'], + 'per_page' => $catalogQuery['per_page'], + 'total' => $filteredTotal, + 'total_pages' => $totalPages, + 'has_more' => $catalogQuery['page'] < $totalPages, + ]; + $writeReady = $projectionReady && $selectedLocaleRow !== null && (int) $selectedLocaleRow->enabled === 1; @@ -237,12 +278,102 @@ final class UserCopyWorkspaceReader 'coverage' => $coverage, 'publication_readiness' => $publicationReadiness, 'entries' => $entries, + 'pagination' => $pagination, 'current_generation' => $currentGeneration, 'write_ready' => $writeReady, 'write_block_reason' => $writeBlockReason, ]; } + /** + * @param array $query + * @return array{ + * page:int, + * per_page:int, + * term:string, + * surface:string, + * state:string + * } + */ + private function catalogQuery(array $query): array + { + $page = $this->positiveQueryInteger($query, 'catalog_page', 1); + $perPage = $this->positiveQueryInteger($query, 'per_page', 50); + if ($perPage > 100) { + throw new UserCopyAdminException('per_page 参数无效。'); + } + + $term = ''; + if (array_key_exists('q', $query)) { + if (!is_string($query['q'])) { + throw new UserCopyAdminException('文案搜索条件无效。'); + } + $term = mb_strtolower(trim($query['q'])); + } + + return [ + 'page' => $page, + 'per_page' => $perPage, + 'term' => $term, + 'surface' => $this->enumQuery( + $query, + 'surface', + ['page', 'shared', 'dialog', 'feedback', 'task', + 'accessibility'], + '文案类型无效。' + ), + 'state' => $this->enumQuery( + $query, + 'state', + ['published', 'draft', 'untranslated', 'hidden'], + '文案状态无效。' + ), + ]; + } + + /** @param array $query */ + private function positiveQueryInteger( + array $query, + string $name, + int $default + ): int { + if (!array_key_exists($name, $query) || $query[$name] === '') { + return $default; + } + $value = $query[$name]; + if ((!is_int($value) && !is_string($value)) + || preg_match('/\A[1-9][0-9]{0,8}\z/D', (string) $value) !== 1) { + throw new UserCopyAdminException($name . ' 参数无效。'); + } + return (int) $value; + } + + /** + * @param array $query + * @param list $allowed + */ + private function enumQuery( + array $query, + string $name, + array $allowed, + string $message + ): string { + if (!array_key_exists($name, $query) || $query[$name] === '') { + return ''; + } + if (!is_string($query[$name])) { + throw new UserCopyAdminException($message); + } + $value = trim($query[$name]); + if ($value === '') { + return ''; + } + if (!in_array($value, $allowed, true)) { + throw new UserCopyAdminException($message); + } + return $value; + } + /** * Publication readiness is locale-wide and deliberately independent of * the currently selected authoring channel, group and search term. diff --git a/web/public/cloud/admin-user-copy-page-editor.css b/web/public/cloud/admin-user-copy-page-editor.css index 3351cc59..03493d8e 100644 --- a/web/public/cloud/admin-user-copy-page-editor.css +++ b/web/public/cloud/admin-user-copy-page-editor.css @@ -178,6 +178,38 @@ padding: 0 22px 22px; } +.user-copy-page-editor-list[aria-busy="true"] { + opacity: .72; +} + +.user-copy-page-editor-catalog-footer { + flex: 0 0 auto; + padding: 12px 22px; + border-top: 1px solid #dce6ea; + background: #fff; + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; +} + +.user-copy-page-editor-catalog-footer p { + margin: 0; + color: #718795; + font-size: 12px; +} + +.user-copy-page-editor-catalog-footer button { + min-height: 36px; + padding: 0 13px; + border: 1px solid #bcd1d8; + border-radius: 9px; + background: #fff; + color: #1e5f68; + font-weight: 700; + cursor: pointer; +} + .user-copy-page-editor-entry { margin-top: 14px; padding: 16px; diff --git a/web/public/cloud/admin-user-copy-page-editor.js b/web/public/cloud/admin-user-copy-page-editor.js index 5f6d2aab..23306c3c 100644 --- a/web/public/cloud/admin-user-copy-page-editor.js +++ b/web/public/cloud/admin-user-copy-page-editor.js @@ -21,11 +21,16 @@ page: null, shared: null, }, + reads: { + page: { controller: null, serial: 0 }, + shared: { controller: null, serial: 0 }, + }, draftBuffer: new Map(), dirtyKeys: new Set(), locale: bootstrap.runtime_locale === 'zh-CN' ? '' : String(bootstrap.runtime_locale || ''), query: '', + searchTimer: null, writeLocked: false, previousFocus: null, }; @@ -119,11 +124,18 @@ var list = element('div', 'user-copy-page-editor-list'); list.id = 'user-copy-page-editor-panel'; list.setAttribute('role', 'tabpanel'); + list.setAttribute('aria-busy', 'false'); + var catalogFooter = element('div', 'user-copy-page-editor-catalog-footer'); + var catalogStatus = element('p', '', '尚未读取译文目录'); + var loadMore = element('button', '', '加载更多'); + loadMore.type = 'button'; + loadMore.hidden = true; + catalogFooter.append(catalogStatus, loadMore); var footer = element('footer', 'user-copy-page-editor-footer'); var adminLink = element('a', '', '前往后台翻译中心发布'); adminLink.href = '/admin/user-copy'; footer.append(adminLink); - drawer.append(header, tabs, controls, feedback, list, footer); + drawer.append(header, tabs, controls, feedback, list, catalogFooter, footer); document.body.append(launch, backdrop, drawer); function activeWorkspace() { @@ -232,19 +244,43 @@ var workspace = activeWorkspace(); var entries = workspace && Array.isArray(workspace.entries) ? workspace.entries : []; - var query = state.query.trim().toLowerCase(); return entries.filter(function (entry) { if (!state.bindings.has(String(entry.key || ''))) return false; if (state.activeTab === 'page' && entry.editor_surface !== 'page') return false; if (state.activeTab === 'shared' && (entry.editor_surface !== 'shared' || !sharedGroups.has(String(entry.editor_group || '')))) return false; - if (!query) return true; - return String(entry.key || '').toLowerCase().indexOf(query) !== -1 - || String(entry.source || '').toLowerCase().indexOf(query) !== -1; + return true; }); } + function paginationFor(workspace) { + var entries = workspace && Array.isArray(workspace.entries) + ? workspace.entries : []; + var pagination = workspace && workspace.pagination + && typeof workspace.pagination === 'object' + ? workspace.pagination : {}; + return { + page: Math.max(1, Number(pagination.page) || 1), + perPage: Math.max(1, Number(pagination.per_page) || 100), + total: Math.max(0, Number(pagination.total) || entries.length), + hasMore: pagination.has_more === true, + }; + } + + function renderPagination() { + var workspace = activeWorkspace(); + var entries = workspace && Array.isArray(workspace.entries) + ? workspace.entries : []; + var pagination = paginationFor(workspace); + var visible = visibleEntries().length; + catalogStatus.textContent = '当前页面显示 ' + String(visible) + + ' 项 · 已读取目录 ' + String(entries.length) + ' / ' + + String(pagination.total) + ' 项'; + loadMore.hidden = !pagination.hasMore; + loadMore.disabled = list.getAttribute('aria-busy') === 'true'; + } + function renderLocales() { localeSelect.replaceChildren(); var workspace = activeWorkspace(); @@ -321,14 +357,36 @@ ? '当前页面没有已绑定的公共框架文案。' : '当前页面没有可编辑的正文文案。')); } + renderPagination(); + } + + function mergeEntries(current, incoming) { + var merged = new Map(); + (current || []).forEach(function (entry) { + merged.set(String(entry.key || ''), entry); + }); + (incoming || []).forEach(function (entry) { + merged.set(String(entry.key || ''), entry); + }); + return Array.from(merged.values()).sort(function (left, right) { + return String(left.key || '').localeCompare(String(right.key || '')); + }); } - function applyWorkspace(channel, workspace) { + function applyWorkspace(channel, workspace, append, query) { if (!workspace || workspace.schema !== 1 || !workspace.authoring || workspace.authoring.channel !== channel || !workspace.selected || workspace.selected.page !== bootstrap.page) { throw new Error('页面译文目录响应无效。'); } + var current = state.workspaces[channel]; + if (append && current + && String(current.selected && current.selected.locale || '') + === String(workspace.selected.locale || '') + && String(current.catalog_query || '') === String(query || '')) { + workspace.entries = mergeEntries(current.entries, workspace.entries); + } + workspace.catalog_query = String(query || ''); state.workspaces[channel] = workspace; if (channel !== state.activeTab) return; state.locale = String(workspace.selected.locale || ''); @@ -336,36 +394,105 @@ renderEntries(); } - async function loadWorkspace(channel, requestedLocale) { + function isCancelledRead(error) { + return Boolean(error && (error.name === 'AbortError' + || error.code === 'cancelled')); + } + + function abortRead(channel) { + var read = state.reads[channel]; + if (!read) return; + read.serial += 1; + if (read.controller) read.controller.abort('superseded'); + read.controller = null; + } + + function abortAllReads() { + abortRead('page'); + abortRead('shared'); + } + + function clearSearchTimer() { + if (state.searchTimer === null) return; + clearTimeout(state.searchTimer); + state.searchTimer = null; + } + + async function loadWorkspace(channel, requestedLocale, options) { if (channel !== 'page' && channel !== 'shared') { throw new Error('页面译文编辑范围无效。'); } + options = options && typeof options === 'object' ? options : {}; + var append = options.append === true; + var current = state.workspaces[channel]; + var currentPagination = paginationFor(current); + var catalogPage = append ? currentPagination.page + 1 : 1; + var requestedQuery = String(state.query || '').trim(); collectBindings(); var query = new URLSearchParams(); query.set('channel', channel); query.set('page', bootstrap.page); + query.set('catalog_page', String(catalogPage)); + query.set('per_page', '100'); + if (requestedQuery) query.set('q', requestedQuery); if (requestedLocale && requestedLocale !== 'zh-CN') { query.set('locale', requestedLocale); } + abortRead(channel); + var read = state.reads[channel]; + var serial = read.serial; + var controller = new AbortController(); + read.controller = controller; if (channel === state.activeTab) { - inform('正在读取' + tabLabel(channel) + '译文…', 'info'); + list.setAttribute('aria-busy', 'true'); + loadMore.disabled = true; + inform((append ? '正在加载更多' : '正在读取') + + tabLabel(channel) + '译文…', 'info'); } - var result = await transport.read('/admin/user-copy/entries?' + query.toString()); - applyWorkspace(channel, result && result.workspace); - if (channel === state.activeTab) { - var workspace = activeWorkspace(); - inform(workspace.write_ready === true - ? tabLabel(channel) + '译文已加载。' : workspace.write_block_reason, 'info'); + try { + var result = await transport.read( + '/admin/user-copy/entries?' + query.toString(), + { signal: controller.signal } + ); + if (read.serial !== serial || read.controller !== controller + || requestedQuery !== String(state.query || '').trim()) return; + var workspace = result && result.workspace; + if (requestedLocale && requestedLocale !== 'zh-CN' + && String(workspace && workspace.selected + && workspace.selected.locale || '') !== requestedLocale) { + throw new Error('页面译文目录语言不匹配。'); + } + applyWorkspace(channel, workspace, append, requestedQuery); + if (channel === state.activeTab) { + workspace = activeWorkspace(); + inform(workspace.write_ready === true + ? tabLabel(channel) + '译文已加载。' + : workspace.write_block_reason, 'info'); + } + } catch (error) { + if (isCancelledRead(error) || read.serial !== serial + || requestedQuery !== String(state.query || '').trim()) return; + throw error; + } finally { + if (read.serial === serial && read.controller === controller) { + read.controller = null; + if (channel === state.activeTab) { + list.setAttribute('aria-busy', 'false'); + renderPagination(); + } + } } } function switchTab(tab) { if (tab !== 'page' && tab !== 'shared') return; + clearSearchTimer(); state.activeTab = tab; updateTabUi(); var workspace = activeWorkspace(); if (workspace - && String(workspace.selected && workspace.selected.locale || '') === state.locale) { + && String(workspace.selected && workspace.selected.locale || '') === state.locale + && String(workspace.catalog_query || '') === String(state.query || '').trim()) { renderLocales(); renderEntries(); inform(tabLabel(tab) + '译文已加载。', 'info'); @@ -465,6 +592,8 @@ return false; } discardAllDrafts(); + abortAllReads(); + clearSearchTimer(); drawer.hidden = true; backdrop.hidden = true; document.body.classList.remove('user-copy-page-editor-open'); @@ -499,6 +628,8 @@ return; } discardLocaleDrafts(previousLocale); + abortAllReads(); + clearSearchTimer(); state.locale = nextLocale; state.workspaces.page = null; state.workspaces.shared = null; @@ -508,7 +639,27 @@ }); search.addEventListener('input', function () { state.query = search.value; - renderEntries(); + abortRead(state.activeTab); + if (state.searchTimer !== null) clearTimeout(state.searchTimer); + state.searchTimer = setTimeout(function () { + state.searchTimer = null; + state.workspaces[state.activeTab] = null; + loadWorkspace(state.activeTab, state.locale).catch(function (error) { + if (!isCancelledRead(error)) { + inform(error && error.message + ? error.message : '页面译文搜索失败。', 'error'); + } + }); + }, 250); + }); + loadMore.addEventListener('click', function () { + loadWorkspace(state.activeTab, state.locale, { append: true }) + .catch(function (error) { + if (!isCancelledRead(error)) { + inform(error && error.message + ? error.message : '更多页面译文读取失败。', 'error'); + } + }); }); document.addEventListener('keydown', function (event) { if (drawer.hidden) return; diff --git a/web/public/cloud/admin-user-copy.css b/web/public/cloud/admin-user-copy.css index 68bddf42..2703d9c6 100644 --- a/web/public/cloud/admin-user-copy.css +++ b/web/public/cloud/admin-user-copy.css @@ -56,6 +56,11 @@ .user-copy-validation-error { margin: 7px 0 0; color: #a04450; font-size: 11px; line-height: 1.55; } .user-copy-entry-actions { margin-top: 13px; display: flex; justify-content: flex-end; gap: 8px; flex-wrap: wrap; } .user-copy-empty { margin: 0; padding: 48px 12px; color: var(--copy-muted); text-align: center; } +.user-copy-catalog[aria-busy="true"] .user-copy-list { opacity: .58; } +.user-copy-list { transition: opacity .16s ease; } +.user-copy-pagination { margin-top: 16px; padding-top: 14px; border-top: 1px solid var(--copy-line); display: flex; justify-content: space-between; align-items: center; gap: 12px; } +.user-copy-pagination p { margin: 0; color: var(--copy-muted); font-size: 12px; } +.user-copy-pagination .btn { min-width: 112px; } .user-copy-preview,.user-copy-history { width: min(520px, 100vw); height: 100vh; padding: 22px; position: fixed; z-index: 1061; top: 0; right: 0; background: #fff; box-shadow: -18px 0 50px rgba(22, 49, 64, .16); overflow-y: auto; } .user-copy-preview[hidden],.user-copy-history[hidden],.user-copy-backdrop[hidden] { display: none; } .user-copy-preview > header,.user-copy-history > header { margin-bottom: 18px; padding-bottom: 15px; border-bottom: 1px solid var(--copy-line); display: flex; justify-content: space-between; align-items: center; gap: 16px; } @@ -92,5 +97,7 @@ body.user-copy-drawer-open { overflow: hidden; } .user-copy-filters,.user-copy-search,.user-copy-filters label,.user-copy-filters .form-select { width: 100%; min-width: 0; } .user-copy-entry { padding: 14px; } .user-copy-entry-actions > .btn { flex: 1 1 calc(50% - 8px); } + .user-copy-pagination { align-items: stretch; flex-direction: column; } + .user-copy-pagination .btn { width: 100%; } .user-copy-preview,.user-copy-history { padding: 17px; } } diff --git a/web/public/cloud/admin-user-copy.js b/web/public/cloud/admin-user-copy.js index fb16effe..f40e0301 100644 --- a/web/public/cloud/admin-user-copy.js +++ b/web/public/cloud/admin-user-copy.js @@ -19,8 +19,11 @@ var search = document.getElementById('user-copy-search'); var stateFilter = document.getElementById('user-copy-state'); var surfaceFilter = document.getElementById('user-copy-surface'); + var catalog = document.getElementById('user-copy-catalog'); var list = document.getElementById('user-copy-list'); var empty = document.getElementById('user-copy-empty'); + var paginationStatus = document.getElementById('user-copy-pagination-status'); + var loadMoreButton = document.getElementById('user-copy-load-more'); var preview = document.getElementById('user-copy-preview'); var previewFrame = document.getElementById('user-copy-preview-frame'); var history = document.getElementById('user-copy-history'); @@ -35,6 +38,12 @@ var uncertain = false; var draftBuffer = new Map(); var dirtyKeys = new Set(); + var catalogPerPage = 25; + var catalogBusy = false; + var activeReadController = null; + var requestSerial = 0; + var appliedFilterSignature = ''; + var searchTimer = null; function element(tag, className, text) { var node = document.createElement(tag); @@ -208,20 +217,67 @@ readinessErrors.hidden = readinessErrors.children.length === 0; } - function visibleEntries() { - var term = search.value.trim().toLowerCase(); - var state = stateFilter.value; - return (workspace.entries || []).filter(function (entry) { - var buffered = draftFor(entry, localeSelect.value); - if (surfaceFilter.value - && entry.editor_surface !== surfaceFilter.value) return false; - if (state && (buffered.hidden ? 'hidden' : entry.state) !== state) return false; - if (!term) return true; - return String(entry.key).toLowerCase().indexOf(term) !== -1 - || String(entry.source).toLowerCase().indexOf(term) !== -1; + function filterSignature() { + return JSON.stringify({ + locale: localeSelect.value, + group: groupSelect.value, + q: search.value.trim(), + surface: surfaceFilter.value, + state: stateFilter.value, }); } + function catalogPagination() { + var entries = Array.isArray(workspace.entries) ? workspace.entries : []; + var value = workspace.pagination && typeof workspace.pagination === 'object' + ? workspace.pagination : {}; + var page = Math.max(1, Number(value.page) || 1); + var perPage = Math.max(1, Number(value.per_page) || catalogPerPage); + var total = Math.max(entries.length, Number(value.total) || entries.length); + var totalPages = Math.max(1, Number(value.total_pages) + || Math.ceil(total / perPage) || 1); + return { + page: page, + perPage: perPage, + total: total, + totalPages: totalPages, + hasMore: value.has_more === true, + }; + } + + function mergeEntriesByCopyKey(currentEntries, nextEntries) { + var merged = []; + var positions = new Map(); + (currentEntries || []).concat(nextEntries || []).forEach(function (entry) { + var key = String(entry && entry.key || ''); + if (!key) return; + if (positions.has(key)) { + merged[positions.get(key)] = entry; + return; + } + positions.set(key, merged.length); + merged.push(entry); + }); + return merged; + } + + function setCatalogBusy(busy) { + catalogBusy = busy; + catalog.setAttribute('aria-busy', busy ? 'true' : 'false'); + if (loadMoreButton) loadMoreButton.disabled = busy; + } + + function renderPagination() { + var pagination = catalogPagination(); + var shown = Array.isArray(workspace.entries) ? workspace.entries.length : 0; + paginationStatus.textContent = '已显示 ' + String(shown) + + ' / 共 ' + String(pagination.total) + ' 条'; + var filtersCurrent = filterSignature() === appliedFilterSignature; + loadMoreButton.hidden = !pagination.hasMore + || pagination.page >= pagination.totalPages || !filtersCurrent; + loadMoreButton.disabled = catalogBusy; + } + function meta(entry, buffered) { var row = element('div', 'user-copy-entry-meta'); row.append(element('code', '', entry.key)); @@ -315,10 +371,11 @@ } function renderEntries() { - var entries = visibleEntries(); + var entries = Array.isArray(workspace.entries) ? workspace.entries : []; list.replaceChildren(); entries.forEach(function (entry) { list.append(renderEntry(entry)); }); empty.hidden = entries.length !== 0; + renderPagination(); updatePublishButton(); if (historyOpenButton) historyOpenButton.disabled = !localeSelect.value; } @@ -438,7 +495,7 @@ }, }); clearBufferedDraft(locale, entry.key); - await loadWorkspace(); + await loadWorkspace({ page: 1, append: false }); var saved = result && result.entry ? result.entry : null; if (saved && saved.validation_state !== 'valid') { var errors = Array.isArray(saved.validation_errors) @@ -520,33 +577,101 @@ inform(error && error.message ? error.message : '译文操作失败。', 'error'); } - async function loadWorkspace() { + function workspaceQuery(page) { + var query = new URLSearchParams(); + query.set('channel', 'advanced'); + query.set('locale', localeSelect.value); + query.set('catalog_page', String(page)); + query.set('per_page', String(catalogPerPage)); + if (groupSelect.value) query.set('group', groupSelect.value); + if (search.value.trim()) query.set('q', search.value.trim()); + if (surfaceFilter.value) query.set('surface', surfaceFilter.value); + if (stateFilter.value) query.set('state', stateFilter.value); + return query; + } + + async function loadWorkspace(options) { if (!transport) return; - inform('正在读取译文目录…'); + var request = options && typeof options === 'object' ? options : {}; + var page = Math.max(1, Number(request.page) || 1); + var append = request.append === true && page > 1; + var signature = filterSignature(); + if (activeReadController) activeReadController.abort('superseded'); + var controller = new window.AbortController(); + activeReadController = controller; + var serial = ++requestSerial; + setCatalogBusy(true); + inform(append ? '正在加载更多动态文案…' : '正在读取动态文案目录…'); try { - var query = new URLSearchParams(); - query.set('channel', 'advanced'); - query.set('locale', localeSelect.value); - if (groupSelect.value) query.set('group', groupSelect.value); + var query = workspaceQuery(page); var result = await transport.read('/admin/user-copy/entries?' - + query.toString()); + + query.toString(), { signal: controller.signal }); + if (controller.signal.aborted || serial !== requestSerial + || signature !== filterSignature()) return; if (!result || !result.workspace || result.workspace.schema !== 1) { throw new Error('译文目录响应无效。'); } - workspace = result.workspace; + var nextWorkspace = result.workspace; + var nextPagination = nextWorkspace.pagination || {}; + if (Number(nextPagination.page) && Number(nextPagination.page) !== page) { + throw new Error('译文目录分页响应无效。'); + } + var previousEntries = append && Array.isArray(workspace.entries) + ? workspace.entries : []; + nextWorkspace.entries = append + ? mergeEntriesByCopyKey(previousEntries, nextWorkspace.entries) + : mergeEntriesByCopyKey([], nextWorkspace.entries); + workspace = nextWorkspace; + appliedFilterSignature = signature; fillSelect(groupSelect, [{ id: '', label: '全部文案分组' }] .concat(workspace.groups || []), workspace.authoring.group); updateUrl(); renderCoverage(workspace.coverage); renderPublicationReadiness(workspace.publication_readiness); renderEntries(); - inform(workspace.write_ready ? '译文目录已更新。' + inform(workspace.write_ready + ? (append ? '更多动态文案已加载。' : '动态文案目录已更新。') : workspace.write_block_reason, workspace.write_ready ? 'success' : ''); } catch (error) { - inform(error.message || '译文目录读取失败。', 'error'); + if (controller.signal.aborted || serial !== requestSerial + || signature !== filterSignature()) return; + inform(error.message || '动态文案目录读取失败。', 'error'); + } finally { + if (serial !== requestSerial || signature !== filterSignature()) return; + if (activeReadController === controller) activeReadController = null; + setCatalogBusy(false); + renderPagination(); } } + function clearSearchTimer() { + if (searchTimer === null) return; + window.clearTimeout(searchTimer); + searchTimer = null; + } + + function reloadFirstPage() { + clearSearchTimer(); + return loadWorkspace({ page: 1, append: false }); + } + + function scheduleSearchReload() { + clearSearchTimer(); + if (activeReadController) activeReadController.abort('filter_changed'); + renderPagination(); + searchTimer = window.setTimeout(function () { + searchTimer = null; + loadWorkspace({ page: 1, append: false }); + }, 250); + } + + function loadMore() { + if (catalogBusy || filterSignature() !== appliedFilterSignature) return; + var pagination = catalogPagination(); + if (!pagination.hasMore || pagination.page >= pagination.totalPages) return; + loadWorkspace({ page: pagination.page + 1, append: true }); + } + function changeLocale() { var previousLocale = String(workspace.selected.locale || ''); var nextLocale = localeSelect.value; @@ -557,7 +682,7 @@ return; } discardLocaleDrafts(previousLocale); - loadWorkspace(); + reloadFirstPage(); } function updateUrl() { @@ -574,14 +699,17 @@ fillSelect(groupSelect, [{ id: '', label: '全部文案分组' }] .concat(workspace.groups || []), workspace.authoring.group); fillSelect(localeSelect, workspace.locales, workspace.selected.locale); + appliedFilterSignature = filterSignature(); renderCoverage(workspace.coverage); renderPublicationReadiness(workspace.publication_readiness); renderEntries(); - [search, stateFilter, surfaceFilter].forEach(function (control) { - control.addEventListener(control === search ? 'input' : 'change', renderEntries); + search.addEventListener('input', scheduleSearchReload); + [stateFilter, surfaceFilter].forEach(function (control) { + control.addEventListener('change', reloadFirstPage); }); - groupSelect.addEventListener('change', loadWorkspace); + groupSelect.addEventListener('change', reloadFirstPage); localeSelect.addEventListener('change', changeLocale); + if (loadMoreButton) loadMoreButton.addEventListener('click', loadMore); document.getElementById('user-copy-preview-close').addEventListener('click', closeDrawers); document.getElementById('user-copy-history-close').addEventListener('click', closeDrawers); if (historyOpenButton) historyOpenButton.addEventListener('click', openHistory); @@ -596,4 +724,5 @@ event.preventDefault(); event.returnValue = ''; }); + loadWorkspace({ page: 1, append: false }); }()); diff --git a/web/resources/views/venix/admin/user_copy.tpl b/web/resources/views/venix/admin/user_copy.tpl index c51de4aa..100e146e 100644 --- a/web/resources/views/venix/admin/user_copy.tpl +++ b/web/resources/views/venix/admin/user_copy.tpl @@ -62,7 +62,8 @@ -
+

动态文案目录

这里只显示当前筛选范围;发布检查始终覆盖目标语言的全部草稿。修改中文内容需要回到源码 Manifest。

@@ -74,6 +75,10 @@
+
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 9e29762e..3f8b77ee 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110709' scope='global'} +{assign var=venix_asset_version value='2026110710' scope='global'} diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index 37b3ed52..42634f83 100644 --- a/web/tests/CloudAssetVersionContractTest.php +++ b/web/tests/CloudAssetVersionContractTest.php @@ -15,7 +15,7 @@ $assert = static function (bool $condition, string $message): void { }; $assert(is_string($assets) - && str_contains($assets, "venix_asset_version value='2026110709'") + && str_contains($assets, "venix_asset_version value='2026110710'") && is_string($cloudShell) && str_contains($cloudShell, '/cloud/app.js?v={$venix_asset_version}'), 'The cloud application entry must use the shared Venix asset version.'); diff --git a/web/tests/UserCopyAdminServiceTest.php b/web/tests/UserCopyAdminServiceTest.php index 3d5b6f70..cfc51797 100644 --- a/web/tests/UserCopyAdminServiceTest.php +++ b/web/tests/UserCopyAdminServiceTest.php @@ -417,6 +417,13 @@ try { 'first_errors' => [], ] && count($workspace['entries']) === 5 + && $workspace['pagination'] === [ + 'page' => 1, + 'per_page' => 50, + 'total' => 5, + 'total_pages' => 1, + 'has_more' => false, + ] && $workspace['write_ready'] === true && $workspace['current_generation'] === $first['generation'], 'Administrator workspace omitted selection, coverage or current generation.'); @@ -542,6 +549,127 @@ try { ] && count($allWorkspace['entries']) === 5, 'All-copy authoring channel did not return the complete projection.'); + + $pagedWorkspace = $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'catalog_page' => 2, + 'per_page' => 2, + ]); + $assert($pagedWorkspace['selected']['page'] === 'test.page' + && array_column($pagedWorkspace['entries'], 'key') === [ + 'test.shared', 'test.title', + ] + && $pagedWorkspace['pagination'] === [ + 'page' => 2, + 'per_page' => 2, + 'total' => 5, + 'total_pages' => 3, + 'has_more' => true, + ] + && $pagedWorkspace['groups'] === $allWorkspace['groups'] + && $pagedWorkspace['coverage'] === $allWorkspace['coverage'] + && $pagedWorkspace['publication_readiness'] + === $allWorkspace['publication_readiness'] + && $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'catalog_page' => 2, + 'per_page' => 2, + ])['entries'] === $pagedWorkspace['entries'], + 'Catalog pagination conflicted with the authoring page or ordering.'); + $pastEndWorkspace = $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'catalog_page' => 4, + 'per_page' => 2, + ]); + $assert($pastEndWorkspace['entries'] === [] + && $pastEndWorkspace['pagination'] === [ + 'page' => 4, + 'per_page' => 2, + 'total' => 5, + 'total_pages' => 3, + 'has_more' => false, + ] + && $pastEndWorkspace['coverage'] === $allWorkspace['coverage'], + 'A catalog page past the end changed metadata or repeated rows.'); + + $hiddenWorkspace = $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'q' => 'TEST.HELP', + 'surface' => 'page', + 'state' => 'hidden', + ]); + $assert(array_column($hiddenWorkspace['entries'], 'key') === [ + 'test.help', + ] + && $hiddenWorkspace['entries'][0]['state'] === 'published' + && $hiddenWorkspace['entries'][0]['hidden'] === true + && $hiddenWorkspace['pagination']['total'] === 1 + && $hiddenWorkspace['groups'] === $allWorkspace['groups'] + && $hiddenWorkspace['coverage'] === $allWorkspace['coverage'] + && $hiddenWorkspace['publication_readiness'] + === $allWorkspace['publication_readiness'], + 'Hidden state did not take priority over published state.'); + $hiddenExcludedFromPublished = $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'q' => 'test.help', + 'surface' => 'page', + 'state' => 'published', + ]); + $assert($hiddenExcludedFromPublished['entries'] === [] + && $hiddenExcludedFromPublished['pagination'] === [ + 'page' => 1, + 'per_page' => 50, + 'total' => 0, + 'total_pages' => 1, + 'has_more' => false, + ] + && $hiddenExcludedFromPublished['coverage'] === $allWorkspace['coverage'], + 'Published filter also returned a hidden entry.'); + $combinedWorkspace = $service->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'q' => 'test.', + 'surface' => 'page', + 'state' => 'published', + 'catalog_page' => 2, + 'per_page' => 1, + ]); + $assert(array_column($combinedWorkspace['entries'], 'key') === [ + 'test.title', + ] + && $combinedWorkspace['pagination'] === [ + 'page' => 2, + 'per_page' => 1, + 'total' => 2, + 'total_pages' => 2, + 'has_more' => false, + ] + && $combinedWorkspace['groups'] === $allWorkspace['groups'] + && $combinedWorkspace['coverage'] === $allWorkspace['coverage'] + && $combinedWorkspace['publication_readiness'] + === $allWorkspace['publication_readiness'] + && $workspaceReader->workspace([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + 'q' => 'test.', + 'surface' => 'page', + 'state' => 'published', + 'catalog_page' => 2, + 'per_page' => 1, + ]) === $combinedWorkspace, + 'Combined filters, pagination or reader-service parity drifted.'); foreach ([ ['page' => 'test.page', 'locale' => 'en'], [ @@ -592,6 +720,27 @@ try { 422, 'Unknown authoring group was accepted.' ); + foreach ([ + ['catalog_page' => 0], + ['catalog_page' => 1.5], + ['per_page' => 0], + ['per_page' => 101], + ['surface' => 'unknown'], + ['surface' => ['page']], + ['state' => 'unknown'], + ['state' => ['published']], + ['q' => ['test']], + ] as $invalidCatalogQuery) { + $reject( + static fn () => $service->workspace(array_merge([ + 'page' => 'test.page', + 'locale' => 'en', + 'channel' => 'all', + ], $invalidCatalogQuery)), + 422, + 'Invalid catalog filter or pagination input was accepted.' + ); + } $database->table('ui_copy_drafts') ->where('id', (int) $validCount['id']) diff --git a/web/tests/UserCopyAdminUiContractTest.php b/web/tests/UserCopyAdminUiContractTest.php index 5c316657..bd4e873a 100644 --- a/web/tests/UserCopyAdminUiContractTest.php +++ b/web/tests/UserCopyAdminUiContractTest.php @@ -66,6 +66,10 @@ foreach ([ 'id="user-copy-progress-bar"', 'id="user-copy-readiness"', 'id="user-copy-readiness-errors"', + 'id="user-copy-catalog"', + 'aria-busy="false"', + 'id="user-copy-pagination-status"', + 'id="user-copy-load-more"', '发布历史', 'id="user-copy-synchronize"', 'sandbox=""', @@ -106,17 +110,24 @@ $assert(str_contains($javascript, "'/admin/user-copy/entries/'") 'Draft, publish, rollback or uncertain mutation handling is incomplete.'); $assert(str_contains($javascript, "query.set('channel', 'advanced')") && str_contains($javascript, "query.set('group', groupSelect.value)") + && str_contains($javascript, "query.set('q', search.value.trim())") + && str_contains($javascript, "query.set('surface', surfaceFilter.value)") + && str_contains($javascript, "query.set('state', stateFilter.value)") + && str_contains($javascript, "query.set('catalog_page', String(page))") + && str_contains($javascript, "query.set('per_page', String(catalogPerPage))") && str_contains($javascript, - 'entry.editor_surface !== surfaceFilter.value') + "groupSelect.addEventListener('change', reloadFirstPage)") && str_contains($javascript, - "groupSelect.addEventListener('change', loadWorkspace)") + "localeSelect.addEventListener('change', changeLocale)") && str_contains($javascript, - '[search, stateFilter, surfaceFilter]'), - 'Advanced group or surface filtering is not wired to the administrator workspace.'); + "search.addEventListener('input', scheduleSearchReload)") + && str_contains($javascript, '[stateFilter, surfaceFilter]'), + 'Server-backed dynamic-copy filters or page-one resets are incomplete.'); $writeStart = strpos($javascript, 'async function writeEntry('); $writeEnd = strpos($javascript, 'async function publishLocale(', $writeStart); $writeBody = substr($javascript, $writeStart, $writeEnd - $writeStart); -$assert(!str_contains($writeBody, 'page:') +$assert(!str_contains($writeBody, 'page: workspace.selected.page') + && !str_contains($writeBody, 'page: entry.page') && str_contains($writeBody, 'var locale = localeSelect.value') && str_contains($writeBody, 'locale: locale') && str_contains($writeBody, 'draft_version:'), @@ -138,6 +149,9 @@ $assert(str_contains($writeBody, 'var locale = localeSelect.value') && strpos($writeBody, 'clearBufferedDraft(locale, entry.key)') < strpos($writeBody, '} catch (error)'), 'The administrator clears buffered input before confirmation or on failure.'); +$assert(str_contains($writeBody, + 'await loadWorkspace({ page: 1, append: false })'), + 'A confirmed draft save does not reload the first catalog page.'); $assert(str_contains($javascript, 'function changeLocale()') && str_contains($javascript, 'hasDirtyLocale(previousLocale)') && str_contains($javascript, 'discardLocaleDrafts(previousLocale)') @@ -159,12 +173,57 @@ $assert(str_contains($javascript, 'function renderPublicationReadiness(') && str_contains($javascript, '整语种仍有阻断项') && !str_contains($javascript, 'var invalidDraft = (workspace.entries'), 'Locale-wide publication readiness is not independent of visible entries.'); +$assert(str_contains($javascript, 'var requestSerial = 0') + && str_contains($javascript, 'function filterSignature()') + && str_contains($javascript, 'new window.AbortController()') + && str_contains($javascript, + "activeReadController.abort('superseded')") + && str_contains($javascript, + '{ signal: controller.signal }') + && str_contains($javascript, 'controller.signal.aborted') + && str_contains($javascript, 'serial !== requestSerial') + && str_contains($javascript, 'signature !== filterSignature()') + && substr_count($javascript, 'signal: controller.signal') === 1, + 'Catalog reads lack abort, request-generation or filter-signature guards.'); +$loadStart = strpos($javascript, 'async function loadWorkspace('); +$loadEnd = strpos($javascript, 'function clearSearchTimer(', $loadStart); +$loadBody = substr($javascript, $loadStart, $loadEnd - $loadStart); +$responseGuard = strpos( + $loadBody, + 'if (controller.signal.aborted || serial !== requestSerial' +); +$workspaceAssignment = strpos($loadBody, 'workspace = nextWorkspace;'); +$assert($responseGuard !== false + && $workspaceAssignment !== false + && $responseGuard < $workspaceAssignment + && substr_count($loadBody, 'signature !== filterSignature()') >= 3, + 'A stale or aborted catalog response can overwrite the current workspace.'); +$assert(str_contains($javascript, 'function scheduleSearchReload()') + && str_contains($javascript, 'window.setTimeout(function ()') + && str_contains($javascript, '}, 250);'), + 'Catalog search is not debounced by 250 milliseconds.'); +$assert(str_contains($javascript, 'function mergeEntriesByCopyKey(') + && str_contains($javascript, 'positions.has(key)') + && str_contains($javascript, 'function loadMore()') + && str_contains($javascript, 'pagination.page + 1') + && str_contains($javascript, 'pagination.hasMore') + && str_contains($javascript, '已显示 ') + && str_contains($javascript, 'appliedFilterSignature'), + 'Catalog pagination does not append unique copy keys or report progress.'); +$mergeStart = strpos($javascript, 'function mergeEntriesByCopyKey('); +$mergeEnd = strpos($javascript, 'function setCatalogBusy(', $mergeStart); +$mergeBody = substr($javascript, $mergeStart, $mergeEnd - $mergeStart); +$assert(!str_contains($mergeBody, 'draftBuffer.clear()') + && !str_contains($mergeBody, 'dirtyKeys.clear()'), + 'Loading another catalog page discards browser-only draft input.'); $assert(str_contains($javascript, 'validation_state') && str_contains($javascript, 'user-copy-validation-error') && str_contains($javascript, '源文案已变化'), 'Invalid or stale drafts are not visible before locale publication.'); $assert(str_contains($css, '@media (max-width: 575.98px)') - && str_contains($css, '.user-copy-entry-columns'), + && str_contains($css, '.user-copy-entry-columns') + && str_contains($css, '.user-copy-pagination') + && str_contains($css, '[aria-busy="true"]'), 'Administrator user-copy page lacks responsive layout contracts.'); echo "User copy administrator UI contracts passed.\n"; diff --git a/web/tests/UserCopyPageEditorContractTest.php b/web/tests/UserCopyPageEditorContractTest.php index 6f6d5584..d6ddf652 100644 --- a/web/tests/UserCopyPageEditorContractTest.php +++ b/web/tests/UserCopyPageEditorContractTest.php @@ -55,6 +55,9 @@ $assert(str_contains($javascript, "activeTab: 'page'") && str_contains($javascript, 'shared: null') && str_contains($javascript, "query.set('channel', channel)") && str_contains($javascript, "query.set('page', bootstrap.page)") + && str_contains($javascript, "query.set('catalog_page', String(catalogPage))") + && str_contains($javascript, "query.set('per_page', '100')") + && str_contains($javascript, "query.set('q', requestedQuery)") && str_contains($javascript, "document.querySelectorAll('[data-user-copy-key]')") && str_contains($javascript, "state.bindings.has(String(entry.key || ''))") && str_contains($javascript, "entry.editor_surface !== 'page'") @@ -68,6 +71,32 @@ $assert(str_contains($javascript, "activeTab: 'page'") && str_contains($javascript, 'hidden: false') && substr_count($javascript, 'transport.mutate(') === 1, 'The page editor does not use constrained page/shared workspaces and draft-only mutation.'); +$assert(str_contains($javascript, 'reads: {') + && str_contains($javascript, 'new AbortController()') + && str_contains($javascript, '{ signal: controller.signal }') + && str_contains($javascript, 'read.serial !== serial') + && str_contains($javascript, 'read.controller !== controller') + && str_contains($javascript, + "requestedQuery !== String(state.query || '').trim()") + && str_contains($javascript, 'function abortAllReads()') + && str_contains($javascript, 'abortAllReads();') + && str_contains($javascript, "error.name === 'AbortError'") + && str_contains($javascript, "error.code === 'cancelled'"), + 'Page-editor reads are not protected from stale or cancelled responses.'); +$assert(str_contains($javascript, 'function mergeEntries(') + && str_contains($javascript, "loadMore.addEventListener('click'") + && str_contains($javascript, '{ append: true }') + && str_contains($javascript, 'pagination.has_more === true') + && str_contains($javascript, "list.setAttribute('aria-busy', 'true')") + && str_contains($javascript, 'merged.set(String(entry.key') + && str_contains($stylesheet, '.user-copy-page-editor-catalog-footer'), + 'Page-editor pagination or de-duplicated load-more behavior is missing.'); +$assert(str_contains($javascript, 'state.searchTimer = setTimeout(') + && str_contains($javascript, '}, 250);') + && str_contains($javascript, 'abortRead(state.activeTab)') + && str_contains($javascript, 'workspace.catalog_query') + && !str_contains($javascript, "var query = state.query.trim().toLowerCase()"), + 'Page-editor search is not debounced and delegated to the complete server catalog.'); $assert(str_contains($javascript, "new Set(['common.shared'])") && str_contains($javascript, '/^(cloud|user)\\./') && str_contains($javascript, "groups.add('shell.user')") @@ -81,7 +110,8 @@ $assert(str_contains($javascript, "tabs.setAttribute('role', 'tablist')") && str_contains($javascript, '当前页面正文') && str_contains($javascript, '公共框架'), 'The page editor does not expose an accessible page/shared tab interface.'); -$assert(str_contains($javascript, 'function applyWorkspace(channel, workspace)') +$assert(str_contains($javascript, + 'function applyWorkspace(channel, workspace, append, query)') && str_contains($javascript, 'workspace.authoring.channel !== channel') && str_contains($javascript, 'workspace.selected.page !== bootstrap.page')