diff --git a/web/public/cloud/admin-user-copy-page-editor.css b/web/public/cloud/admin-user-copy-page-editor.css index b24c62ca..3351cc59 100644 --- a/web/public/cloud/admin-user-copy-page-editor.css +++ b/web/public/cloud/admin-user-copy-page-editor.css @@ -55,6 +55,7 @@ } .user-copy-page-editor-header, +.user-copy-page-editor-tabs, .user-copy-page-editor-controls, .user-copy-page-editor-footer { flex: 0 0 auto; @@ -95,6 +96,35 @@ cursor: pointer; } +.user-copy-page-editor-tabs { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 8px; + padding: 10px 22px; +} + +.user-copy-page-editor-tabs button { + min-width: 0; + min-height: 42px; + border: 1px solid transparent; + border-radius: 10px; + background: transparent; + color: #637986; + font: 700 13px/1.2 system-ui, sans-serif; + cursor: pointer; +} + +.user-copy-page-editor-tabs button:hover { + background: #eef6f7; + color: #176b73; +} + +.user-copy-page-editor-tabs button[aria-selected="true"] { + border-color: #a9d8dc; + background: #e5f5f6; + color: #0b747c; +} + .user-copy-page-editor-controls { display: grid; grid-template-columns: 1fr 1fr; @@ -259,4 +289,9 @@ .user-copy-page-editor-controls { grid-template-columns: 1fr; } + + .user-copy-page-editor-tabs { + padding-right: 16px; + padding-left: 16px; + } } diff --git a/web/public/cloud/admin-user-copy-page-editor.js b/web/public/cloud/admin-user-copy-page-editor.js index 3f0d611e..323cd767 100644 --- a/web/public/cloud/admin-user-copy-page-editor.js +++ b/web/public/cloud/admin-user-copy-page-editor.js @@ -16,7 +16,11 @@ }); var state = { bindings: new Map(), - workspace: null, + activeTab: 'page', + workspaces: { + page: null, + shared: null, + }, locale: bootstrap.runtime_locale === 'zh-CN' ? '' : String(bootstrap.runtime_locale || ''), query: '', @@ -24,6 +28,15 @@ previousFocus: null, }; + function sharedGroupsForPage(page) { + var groups = new Set(['common.shared']); + if (/^(cloud|user)\./.test(page)) groups.add('shell.user'); + if (/^(auth|legal|public)\./.test(page)) groups.add('shell.public'); + return groups; + } + + var sharedGroups = sharedGroupsForPage(String(bootstrap.page)); + function element(tag, className, text) { var node = document.createElement(tag); if (className) node.className = className; @@ -60,7 +73,7 @@ var header = element('header', 'user-copy-page-editor-header'); var heading = element('div'); - var title = element('h2', '', '编辑当前页面译文'); + var title = element('h2', '', '编辑页面译文'); title.id = 'user-copy-page-editor-title'; heading.append(title, element('p', '', '这里只保存草稿,统一发布仍在后台翻译中心完成。')); var close = element('button', 'user-copy-page-editor-close', '×'); @@ -68,6 +81,23 @@ close.setAttribute('aria-label', '关闭页面译文编辑器'); header.append(heading, close); + var tabs = element('div', 'user-copy-page-editor-tabs'); + tabs.setAttribute('role', 'tablist'); + tabs.setAttribute('aria-label', '译文编辑范围'); + var pageTab = element('button', '', '当前页面正文'); + pageTab.id = 'user-copy-page-editor-tab-page'; + pageTab.type = 'button'; + pageTab.dataset.userCopyEditorTab = 'page'; + pageTab.setAttribute('role', 'tab'); + pageTab.setAttribute('aria-controls', 'user-copy-page-editor-panel'); + var sharedTab = element('button', '', '公共框架'); + sharedTab.id = 'user-copy-page-editor-tab-shared'; + sharedTab.type = 'button'; + sharedTab.dataset.userCopyEditorTab = 'shared'; + sharedTab.setAttribute('role', 'tab'); + sharedTab.setAttribute('aria-controls', 'user-copy-page-editor-panel'); + tabs.append(pageTab, sharedTab); + var controls = element('div', 'user-copy-page-editor-controls'); var localeLabel = element('label', '', '目标语言'); var localeSelect = element('select'); @@ -85,13 +115,35 @@ feedback.setAttribute('role', 'status'); feedback.setAttribute('aria-live', 'polite'); var list = element('div', 'user-copy-page-editor-list'); + list.id = 'user-copy-page-editor-panel'; + list.setAttribute('role', 'tabpanel'); var footer = element('footer', 'user-copy-page-editor-footer'); var adminLink = element('a', '', '前往后台翻译中心发布'); adminLink.href = '/admin/user-copy'; footer.append(adminLink); - drawer.append(header, controls, feedback, list, footer); + drawer.append(header, tabs, controls, feedback, list, footer); document.body.append(launch, backdrop, drawer); + function activeWorkspace() { + return state.workspaces[state.activeTab]; + } + + function tabLabel(tab) { + return tab === 'shared' ? '公共框架' : '当前页面正文'; + } + + function updateTabUi() { + [pageTab, sharedTab].forEach(function (button) { + var selected = button.dataset.userCopyEditorTab === state.activeTab; + button.setAttribute('aria-selected', selected ? 'true' : 'false'); + button.tabIndex = selected ? 0 : -1; + }); + var activeTab = state.activeTab === 'shared' ? sharedTab : pageTab; + list.setAttribute('aria-labelledby', activeTab.id); + searchLabel.textContent = state.activeTab === 'shared' + ? '搜索公共框架文案' : '搜索当前页面正文'; + } + function inform(message, kind) { feedback.textContent = String(message || ''); feedback.dataset.kind = kind || ''; @@ -127,11 +179,16 @@ } function visibleEntries() { - var entries = state.workspace && Array.isArray(state.workspace.entries) - ? state.workspace.entries : []; + 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; @@ -140,8 +197,9 @@ function renderLocales() { localeSelect.replaceChildren(); - var locales = state.workspace && Array.isArray(state.workspace.locales) - ? state.workspace.locales : []; + var workspace = activeWorkspace(); + var locales = workspace && Array.isArray(workspace.locales) + ? workspace.locales : []; locales.forEach(function (locale) { if (!locale || locale.id === 'zh-CN') return; var option = element('option', '', locale.label || locale.id); @@ -154,6 +212,7 @@ } function renderEntry(entry) { + var workspace = activeWorkspace(); var card = element('article', 'user-copy-page-editor-entry'); card.dataset.copyKey = entry.key; var meta = element('div', 'user-copy-page-editor-entry-meta'); @@ -176,7 +235,7 @@ textarea.value = textFor(entry); textarea.id = 'user-copy-page-editor-' + String(entry.key).replace(/[^a-z0-9_-]/g, '-'); draftLabel.htmlFor = textarea.id; - textarea.readOnly = state.writeLocked || state.workspace.write_ready !== true; + textarea.readOnly = state.writeLocked || !workspace || workspace.write_ready !== true; card.append(meta, sourceLabel, source, publishedLabel, published, draftLabel, textarea); if (Array.isArray(entry.parameters) && entry.parameters.length) { @@ -192,7 +251,7 @@ var save = element('button', 'user-copy-page-editor-save', '保存草稿'); save.type = 'button'; save.dataset.userCopySave = entry.key; - save.disabled = state.writeLocked || state.workspace.write_ready !== true; + save.disabled = state.writeLocked || !workspace || workspace.write_ready !== true; save.addEventListener('click', function () { saveDraft(entry, textarea, save); }); card.append(save); return card; @@ -204,39 +263,70 @@ entries.forEach(function (entry) { list.append(renderEntry(entry)); }); if (entries.length === 0) { list.append(element('p', 'user-copy-page-editor-empty', - '当前筛选条件下没有可编辑的页面正文文案。')); + state.activeTab === 'shared' + ? '当前页面没有已绑定的公共框架文案。' + : '当前页面没有可编辑的正文文案。')); } } - function applyWorkspace(workspace) { + function applyWorkspace(channel, workspace) { if (!workspace || workspace.schema !== 1 - || !workspace.authoring || workspace.authoring.channel !== 'page' + || !workspace.authoring || workspace.authoring.channel !== channel || !workspace.selected || workspace.selected.page !== bootstrap.page) { throw new Error('页面译文目录响应无效。'); } - state.workspace = workspace; + state.workspaces[channel] = workspace; + if (channel !== state.activeTab) return; state.locale = String(workspace.selected.locale || ''); renderLocales(); renderEntries(); } - async function loadWorkspace(requestedLocale) { + async function loadWorkspace(channel, requestedLocale) { + if (channel !== 'page' && channel !== 'shared') { + throw new Error('页面译文编辑范围无效。'); + } collectBindings(); var query = new URLSearchParams(); - query.set('channel', 'page'); + query.set('channel', channel); query.set('page', bootstrap.page); if (requestedLocale && requestedLocale !== 'zh-CN') { query.set('locale', requestedLocale); } - inform('正在读取当前页面译文…', 'info'); + if (channel === state.activeTab) { + inform('正在读取' + tabLabel(channel) + '译文…', 'info'); + } var result = await transport.read('/admin/user-copy/entries?' + query.toString()); - applyWorkspace(result && result.workspace); - inform(state.workspace.write_ready === true - ? '页面译文已加载。' : state.workspace.write_block_reason, 'info'); + applyWorkspace(channel, result && result.workspace); + if (channel === state.activeTab) { + var workspace = activeWorkspace(); + inform(workspace.write_ready === true + ? tabLabel(channel) + '译文已加载。' : workspace.write_block_reason, 'info'); + } + } + + function switchTab(tab) { + if (tab !== 'page' && tab !== 'shared') return; + state.activeTab = tab; + updateTabUi(); + var workspace = activeWorkspace(); + if (workspace + && String(workspace.selected && workspace.selected.locale || '') === state.locale) { + renderLocales(); + renderEntries(); + inform(tabLabel(tab) + '译文已加载。', 'info'); + return; + } + loadWorkspace(tab, state.locale).catch(function (error) { + if (tab === state.activeTab) { + inform(error && error.message ? error.message : '页面译文读取失败。', 'error'); + } + }); } async function saveDraft(entry, textarea, button) { - if (state.writeLocked || !state.workspace || state.workspace.write_ready !== true) return; + var workspace = activeWorkspace(); + if (state.writeLocked || !workspace || workspace.write_ready !== true) return; var text = textarea.value; if (!text.trim()) { inform('目标语言草稿不能为空。', 'error'); @@ -264,7 +354,7 @@ return; } if (error && error.status === 409) { - try { await loadWorkspace(state.locale); } + try { await loadWorkspace(state.activeTab, state.locale); } catch (readError) { inform(readError.message || '最新草稿读取失败。', 'error'); return; } inform('草稿已被其他管理员修改,已加载最新版本。', 'error'); return; @@ -286,7 +376,7 @@ return; } try { - await loadWorkspace(state.locale); + await loadWorkspace(state.activeTab, state.locale); if (saved && saved.validation_state !== 'valid') { var errors = Array.isArray(saved.validation_errors) ? saved.validation_errors : []; @@ -308,7 +398,7 @@ drawer.hidden = false; document.body.classList.add('user-copy-page-editor-open'); close.focus(); - loadWorkspace(state.locale).catch(function (error) { + loadWorkspace(state.activeTab, state.locale).catch(function (error) { inform(error && error.message ? error.message : '页面译文读取失败。', 'error'); }); } @@ -326,8 +416,23 @@ launch.addEventListener('click', openEditor); close.addEventListener('click', closeEditor); backdrop.addEventListener('click', closeEditor); + [pageTab, sharedTab].forEach(function (button) { + button.addEventListener('click', function () { + switchTab(button.dataset.userCopyEditorTab); + }); + }); + tabs.addEventListener('keydown', function (event) { + if (event.key !== 'ArrowLeft' && event.key !== 'ArrowRight') return; + event.preventDefault(); + var tab = state.activeTab === 'page' ? 'shared' : 'page'; + switchTab(tab); + (tab === 'shared' ? sharedTab : pageTab).focus(); + }); localeSelect.addEventListener('change', function () { - loadWorkspace(localeSelect.value).catch(function (error) { + state.locale = localeSelect.value; + state.workspaces.page = null; + state.workspaces.shared = null; + loadWorkspace(state.activeTab, state.locale).catch(function (error) { inform(error && error.message ? error.message : '目标语言读取失败。', 'error'); }); }); @@ -355,4 +460,5 @@ event.preventDefault(); first.focus(); } }); + updateTabUi(); }()); diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 7b320656..e3df1777 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='2026110706' scope='global'} +{assign var=venix_asset_version value='2026110707' scope='global'} diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index e6b06e63..580a07b1 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='2026110706'") + && str_contains($assets, "venix_asset_version value='2026110707'") && 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/UserCopyPageEditorContractTest.php b/web/tests/UserCopyPageEditorContractTest.php index cd80177d..b3bb5484 100644 --- a/web/tests/UserCopyPageEditorContractTest.php +++ b/web/tests/UserCopyPageEditorContractTest.php @@ -49,17 +49,49 @@ $assert(str_contains($head, '{if $user_copy_editor_enabled|default:false}') && substr_count($bootstrap, 'user-copy-editor-bootstrap') === 1, 'Editor assets are not isolated behind the server-side authoring capability.'); -$assert(str_contains($javascript, "query.set('channel', 'page')") +$assert(str_contains($javascript, "activeTab: 'page'") + && str_contains($javascript, 'workspaces: {') + && str_contains($javascript, 'page: null') + && str_contains($javascript, 'shared: null') + && str_contains($javascript, "query.set('channel', channel)") && str_contains($javascript, "query.set('page', bootstrap.page)") && 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'") + && str_contains($javascript, "entry.editor_surface !== 'shared'") + && str_contains($javascript, + "sharedGroups.has(String(entry.editor_group || ''))") && str_contains($javascript, "'/admin/user-copy/entries/'") && str_contains($javascript, "+ '/draft'") && str_contains($javascript, "method: 'PUT'") && str_contains($javascript, 'draft_version:') && str_contains($javascript, 'hidden: false') && substr_count($javascript, 'transport.mutate(') === 1, - 'The page editor does not use the constrained page workspace and draft-only mutation.'); + 'The page editor does not use constrained page/shared workspaces and draft-only mutation.'); +$assert(str_contains($javascript, "new Set(['common.shared'])") + && str_contains($javascript, '/^(cloud|user)\\./') + && str_contains($javascript, "groups.add('shell.user')") + && str_contains($javascript, '/^(auth|legal|public)\\./') + && str_contains($javascript, "groups.add('shell.public')"), + 'The page editor does not select the appropriate shared shell groups.'); +$assert(str_contains($javascript, "tabs.setAttribute('role', 'tablist')") + && substr_count($javascript, "setAttribute('role', 'tab')") === 2 + && str_contains($javascript, "list.setAttribute('role', 'tabpanel')") + && str_contains($javascript, "setAttribute('aria-selected'") + && 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)') + && str_contains($javascript, 'workspace.authoring.channel !== channel') + && str_contains($javascript, + 'workspace.selected.page !== bootstrap.page') + && str_contains($javascript, 'state.workspaces[channel] = workspace') + && str_contains($javascript, 'if (channel !== state.activeTab) return;') + && substr_count( + $javascript, + 'loadWorkspace(state.activeTab, state.locale)' + ) >= 3, + 'Inactive-tab responses can render directly or active-tab refresh was lost.'); $assert(str_contains($javascript, "locale: bootstrap.runtime_locale === 'zh-CN'") && str_contains($javascript, @@ -95,6 +127,10 @@ $assert(str_contains($javascript, 'scrollIntoView') && str_contains($javascript, "event.key !== 'Tab'") && str_contains($stylesheet, '.is-user-copy-page-highlight') && str_contains($stylesheet, 'outline: 3px solid') + && str_contains($stylesheet, '.user-copy-page-editor-tabs') + && str_contains($stylesheet, + 'grid-template-columns: repeat(2, minmax(0, 1fr))') + && str_contains($stylesheet, 'button[aria-selected="true"]') && str_contains($stylesheet, '@media (max-width: 640px)') && str_contains($stylesheet, 'width: 100%;'), 'The editor lacks non-layout highlighting, focus handling or mobile full width.');