diff --git a/web/app/Controllers/Admin/UserCopyController.php b/web/app/Controllers/Admin/UserCopyController.php index e2105133..acb1480a 100644 --- a/web/app/Controllers/Admin/UserCopyController.php +++ b/web/app/Controllers/Admin/UserCopyController.php @@ -17,9 +17,10 @@ final class UserCopyController extends AdminController $error = ''; $status = 200; try { - $workspace = $this->service()->workspace( - $request->getQueryParams() - ); + $query = $request->getQueryParams(); + $query = is_array($query) ? $query : []; + $query['channel'] = 'advanced'; + $workspace = $this->service()->workspace($query); } catch (\Throwable $exception) { error_log('User copy administrator page failed: ' . get_class($exception)); diff --git a/web/public/cloud/admin-user-copy.css b/web/public/cloud/admin-user-copy.css index 258af282..7482f0b0 100644 --- a/web/public/cloud/admin-user-copy.css +++ b/web/public/cloud/admin-user-copy.css @@ -19,12 +19,13 @@ .user-copy-search i { color: #8da0aa; font-size: 18px; } .user-copy-search input { width: 100%; border: 0; outline: 0; color: var(--copy-ink); background: transparent; font-size: 13px; } .user-copy-filters .form-select { min-width: 142px; } -.user-copy-toast-filter { min-height: 38px; padding: 0 11px; border: 1px solid var(--copy-line); border-radius: 9px; display: inline-flex; align-items: center; gap: 7px; color: #526d7a; font-size: 12px; font-weight: 700; cursor: pointer; } .user-copy-list { display: grid; gap: 12px; } .user-copy-entry { padding: 18px; border: 1px solid var(--copy-line); border-radius: 12px; background: #fff; } .user-copy-entry-meta { margin-bottom: 14px; display: flex; align-items: center; gap: 8px; flex-wrap: wrap; } .user-copy-entry-meta code { color: #1b5368; font-size: 12px; font-weight: 700; } .user-copy-entry-meta > span { padding: 4px 8px; border-radius: 999px; font-size: 10px; font-weight: 750; } +.user-copy-surface { color: #0e777d; background: #e4f6f5; } +.user-copy-group { color: #675487; background: #f0ebf7; } .user-copy-kind { color: #687f8b; background: #edf2f4; } .user-copy-state.is-published { color: #168058; background: #e5f7ef; } .user-copy-state.is-draft { color: #8b6717; background: #fff4d7; } diff --git a/web/public/cloud/admin-user-copy.js b/web/public/cloud/admin-user-copy.js index 7d1d8891..2061eef2 100644 --- a/web/public/cloud/admin-user-copy.js +++ b/web/public/cloud/admin-user-copy.js @@ -14,11 +14,11 @@ var transport = window.VenixAdminRequestRuntime ? window.VenixAdminRequestRuntime.create() : null; var feedback = document.getElementById('user-copy-feedback'); - var pageSelect = document.getElementById('user-copy-page'); + var groupSelect = document.getElementById('user-copy-group'); var localeSelect = document.getElementById('user-copy-locale'); var search = document.getElementById('user-copy-search'); var stateFilter = document.getElementById('user-copy-state'); - var toastOnly = document.getElementById('user-copy-toast-only'); + var surfaceFilter = document.getElementById('user-copy-surface'); var list = document.getElementById('user-copy-list'); var empty = document.getElementById('user-copy-empty'); var preview = document.getElementById('user-copy-preview'); @@ -68,6 +68,15 @@ return entry.kind === 'toast_title' || entry.kind === 'toast_body'; } + function surfaceLabel(surface) { + return { + dialog: '弹窗与确认', + feedback: '反馈与状态', + task: '任务中心', + accessibility: '无障碍与字段', + }[surface] || String(surface || '高级文案'); + } + function fillSelect(select, options, selected) { select.replaceChildren(); (options || []).forEach(function (option) { @@ -93,7 +102,8 @@ var term = search.value.trim().toLowerCase(); var state = stateFilter.value; return (workspace.entries || []).filter(function (entry) { - if (toastOnly.checked && !isToast(entry)) return false; + if (surfaceFilter.value + && entry.editor_surface !== surfaceFilter.value) return false; if (state && (entry.hidden ? 'hidden' : entry.state) !== state) return false; if (!term) return true; return String(entry.key).toLowerCase().indexOf(term) !== -1 @@ -104,6 +114,10 @@ function meta(entry) { var row = element('div', 'user-copy-entry-meta'); row.append(element('code', '', entry.key)); + row.append(element('span', 'user-copy-surface', surfaceLabel(entry.editor_surface))); + if (!groupSelect.value && entry.editor_group) { + row.append(element('span', 'user-copy-group', entry.editor_group)); + } row.append(element('span', 'user-copy-kind', entry.kind)); var status = element('span', 'user-copy-state ' + stateClass(entry), stateLabel(entry)); row.append(status); @@ -288,7 +302,6 @@ var result = await transport.mutate(endpoint, { method: 'PUT', body: { - page: pageSelect.value, locale: localeSelect.value, text: text, hidden: Boolean(hideInput && hideInput.checked), @@ -377,8 +390,12 @@ if (!transport) return; inform('正在读取译文目录…'); try { - var result = await transport.read('/admin/user-copy/entries?page=' - + encodeURIComponent(pageSelect.value) + '&locale=' + encodeURIComponent(localeSelect.value)); + var query = new URLSearchParams(); + query.set('channel', 'advanced'); + query.set('locale', localeSelect.value); + if (groupSelect.value) query.set('group', groupSelect.value); + var result = await transport.read('/admin/user-copy/entries?' + + query.toString()); if (!result || !result.workspace || result.workspace.schema !== 1) { throw new Error('译文目录响应无效。'); } @@ -396,19 +413,23 @@ function updateUrl() { if (!window.history || !window.history.replaceState) return; var query = new URLSearchParams(window.location.search); - query.set('page', pageSelect.value); + query.delete('page'); + query.delete('channel'); + if (groupSelect.value) query.set('group', groupSelect.value); + else query.delete('group'); query.set('locale', localeSelect.value); window.history.replaceState(window.history.state, '', window.location.pathname + '?' + query.toString()); } - fillSelect(pageSelect, workspace.pages, workspace.selected.page); + fillSelect(groupSelect, [{ id: '', label: '全部文案分组' }] + .concat(workspace.groups || []), workspace.authoring.group); fillSelect(localeSelect, workspace.locales, workspace.selected.locale); renderCoverage(workspace.coverage); renderEntries(); - [search, stateFilter, toastOnly].forEach(function (control) { + [search, stateFilter, surfaceFilter].forEach(function (control) { control.addEventListener(control === search ? 'input' : 'change', renderEntries); }); - pageSelect.addEventListener('change', loadWorkspace); + groupSelect.addEventListener('change', loadWorkspace); localeSelect.addEventListener('change', loadWorkspace); document.getElementById('user-copy-preview-close').addEventListener('click', closeDrawers); document.getElementById('user-copy-history-close').addEventListener('click', closeDrawers); diff --git a/web/resources/views/venix/admin/user_copy.tpl b/web/resources/views/venix/admin/user_copy.tpl index 17544d56..fc4a2429 100644 --- a/web/resources/views/venix/admin/user_copy.tpl +++ b/web/resources/views/venix/admin/user_copy.tpl @@ -9,7 +9,7 @@

Interface copy

用户界面译文

-

中文源文案由代码定义且只读;目标语言先保存草稿,发布后才会进入用户页面。

+

这里管理弹窗、反馈、任务和无障碍文案;页面正文由用户页面内的翻译编辑入口管理。

{else}
- +
- 预览只在隔离区域渲染纯文本,不会载入用户页面脚本,也不会触发实例、账单或账户操作。 + 同步、发布和回滚仍在后台统一执行;安全预览只渲染纯文本,不会触发实例、账单或账户操作。
-
页面词条0
+
高级词条0
已发布0
仅有草稿0
待翻译0
@@ -54,7 +54,7 @@
- +
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 751d7b7f..deb16028 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='2026110702' scope='global'} +{assign var=venix_asset_version value='2026110703' scope='global'} diff --git a/web/tests/CloudAssetVersionContractTest.php b/web/tests/CloudAssetVersionContractTest.php index 8143d91a..3d10c87e 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='2026110702'") + && str_contains($assets, "venix_asset_version value='2026110703'") && 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/UserCopyAdminUiContractTest.php b/web/tests/UserCopyAdminUiContractTest.php index e8c006bb..d7fa417b 100644 --- a/web/tests/UserCopyAdminUiContractTest.php +++ b/web/tests/UserCopyAdminUiContractTest.php @@ -36,8 +36,9 @@ foreach (['index', 'entries', 'history', 'synchronize', 'draft', 'publish', 'rol $assert(str_contains($controller, 'UserCopyAdminService::fromApplication()') && str_contains($controller, 'AdminPermission::isSuperAdmin()') + && str_contains($controller, "\$query['channel'] = 'advanced';") && str_contains($controller, "'private, no-store'"), - 'Controller lost its service seam, write guard or private caching contract.'); + 'Controller lost its service seam, advanced workspace or private caching contract.'); $assert(!str_contains($controller, 'UserCopyPublicationStore') && !str_contains($controller, 'Capsule::') && !str_contains($controller, 'DB::'), @@ -59,17 +60,20 @@ $assert(str_contains($sidebar, 'href="/admin/user-copy"') && str_contains($sidebar, '用户界面译文'), 'Administrator navigation does not expose user-copy management.'); foreach ([ - 'id="user-copy-page"', + 'id="user-copy-group"', 'id="user-copy-locale"', + 'id="user-copy-surface"', 'id="user-copy-progress-bar"', '发布历史', - 'id="user-copy-toast-only"', 'id="user-copy-synchronize"', 'sandbox=""', ] as $contract) { $assert(str_contains($template, $contract), 'Administrator user-copy template is missing: ' . $contract); } +$assert(!str_contains($template, 'id="user-copy-page"') + && !str_contains($template, 'id="user-copy-toast-only"'), + 'Administrator editor still exposes the retired page or Toast-only filter.'); $assert(str_contains($template . $javascript, '中文源文案(只读)') && str_contains($template . $javascript, '目标语言草稿'), 'Source copy is not read-only or target drafts are missing.'); @@ -98,6 +102,22 @@ $assert(str_contains($javascript, "'/admin/user-copy/entries/'") && str_contains($javascript, "'/admin/user-copy/publications/'") && str_contains($javascript, 'mutationMayHaveApplied'), '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, + 'entry.editor_surface !== surfaceFilter.value') + && str_contains($javascript, + "groupSelect.addEventListener('change', loadWorkspace)") + && str_contains($javascript, + '[search, stateFilter, surfaceFilter]'), + 'Advanced group or surface filtering is not wired to the administrator workspace.'); +$writeStart = strpos($javascript, 'async function writeEntry('); +$writeEnd = strpos($javascript, 'async function publishLocale(', $writeStart); +$writeBody = substr($javascript, $writeStart, $writeEnd - $writeStart); +$assert(!str_contains($writeBody, 'page:') + && str_contains($writeBody, 'locale: localeSelect.value') + && str_contains($writeBody, 'draft_version:'), + 'Draft writes still depend on the retired page selector or lost version locking.'); $assert(str_contains($javascript, 'validation_state') && str_contains($javascript, 'user-copy-validation-error') && str_contains($javascript, '存在无效或过期草稿'),