diff --git a/frontend/chunk-budget.json b/frontend/chunk-budget.json new file mode 100644 index 0000000..4589d9a --- /dev/null +++ b/frontend/chunk-budget.json @@ -0,0 +1,10 @@ +{ + "_what": "构建产物体积预算(scripts/ui/chunkbudget.mjs 的来源 C · 阶段 24 登记)", + "budget": 1500000, + "_unit": "字节,十进制 kB(kB = 1000 B),与 vite 控制台 / chunkSizeWarningLimit / 阶段 15 基线同一把尺", + "_why": "1 500 kB = 阶段 15 基线单块峰值 1 275.93 kB(当时块名 ui-*.js)之上留 17.5 % 余量:够一次正常功能增量,不够一次无声的重依赖引入。这个数字与 chunkbudget.mjs 的兜底值 FALLBACK_KB 相同 ⇒ 登记它不放宽也不收紧判定,只是把「上限是谁说的」从脚本里的常数换成可评审、可 diff 的项目文件。", + "_scope": "全局上限,逐文件判定;未启用 name/type 作用域(要用时按 rollup 的形状写数组即可,脚本已支持)", + "_observed": "2026-11-09 09:18 产物实测最大块 assets/WarningOutlined-BEwHRRI6.js = 1 217 164 B = 1 217.16 kB,余量 282.84 kB(23.2 %);vite 的 chunkSizeWarningLimit 仍是 1 200 kB,那条 (!) Some chunks are larger 照旧常驻,本文件不是用来捂警告的", + "_rules": "越界先查成分(node scripts/ui/chunkinfo.mjs),不许调大这个数字把警告捂住;确需调整必须在 docs/UI规范.md §13.11 说明依据与改前改后同尺读数", + "_reviewed": "阶段 24(2026-11-09)" +} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 75ec1b5..05d4f4e 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,7 +8,8 @@ "name": "nex-animation-studio", "version": "1.0.0", "dependencies": { - "@ant-design/icons": "^6.3.4", + "@ant-design/cssinjs": "1.24.0", + "@ant-design/icons": "^5.6.1", "@tailwindcss/vite": "^4.3.3", "@vitejs/plugin-react": "^5.2.0", "antd": "^5.29.3", @@ -28,12 +29,12 @@ } }, "node_modules/@ant-design/colors": { - "version": "8.0.1", - "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-8.0.1.tgz", - "integrity": "sha512-foPVl0+SWIslGUtD/xBr1p9U4AKzPhNYEseXYRRo5QSzGACYZrQbe11AYJbYfAWnWSpGBx6JjBmSeugUsD9vqQ==", + "version": "7.2.1", + "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-7.2.1.tgz", + "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==", "license": "MIT", "dependencies": { - "@ant-design/fast-color": "^3.0.0" + "@ant-design/fast-color": "^2.0.6" } }, "node_modules/@ant-design/cssinjs": { @@ -71,24 +72,28 @@ } }, "node_modules/@ant-design/fast-color": { - "version": "3.0.1", - "resolved": "https://registry.npmmirror.com/@ant-design/fast-color/-/fast-color-3.0.1.tgz", - "integrity": "sha512-esKJegpW4nckh0o6kV3Tkb7NPIZYbPnnFxmQDUmL08ukXZAvV85TZBr70eGuke/CIArLaP6aw8lt9KILjnWuOw==", + "version": "2.0.6", + "resolved": "https://registry.npmmirror.com/@ant-design/fast-color/-/fast-color-2.0.6.tgz", + "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==", "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.24.7" + }, "engines": { "node": ">=8.x" } }, "node_modules/@ant-design/icons": { - "version": "6.3.4", - "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-6.3.4.tgz", - "integrity": "sha512-kDoUlppczVyCUTFthF6cHmPzMBYqNZQhu9j6EyIX/YIdM9j9CZNZoJUjzVw7/1v1VO8WwVMmPp15r/uwIAS0AQ==", + "version": "5.6.1", + "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.6.1.tgz", + "integrity": "sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==", "license": "MIT", "dependencies": { - "@ant-design/colors": "^8.0.1", - "@ant-design/icons-svg": "^4.6.0", - "@rc-component/util": "^1.11.0", - "clsx": "^2.1.1" + "@ant-design/colors": "^7.0.0", + "@ant-design/icons-svg": "^4.4.0", + "@babel/runtime": "^7.24.8", + "classnames": "^2.2.6", + "rc-util": "^5.31.1" }, "engines": { "node": ">=8" @@ -504,18 +509,6 @@ "react-dom": ">=16.9.0" } }, - "node_modules/@rc-component/color-picker/node_modules/@ant-design/fast-color": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/@ant-design/fast-color/-/fast-color-2.0.6.tgz", - "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.24.7" - }, - "engines": { - "node": ">=8.x" - } - }, "node_modules/@rc-component/context": { "version": "1.4.0", "resolved": "https://registry.npmmirror.com/@rc-component/context/-/context-1.4.0.tgz", @@ -635,20 +628,6 @@ "react-dom": ">=16.9.0" } }, - "node_modules/@rc-component/util": { - "version": "1.14.0", - "resolved": "https://registry.npmmirror.com/@rc-component/util/-/util-1.14.0.tgz", - "integrity": "sha512-qFpkGBCiyN3NNAU+FOnZdcdz7A/rXCg3JdQk+bujUKAExZgRqzf2yy1f4YN63Lwctic5FcK9rgjQ6aWbykqwEw==", - "license": "MIT", - "dependencies": { - "is-mobile": "^5.0.0", - "react-is": "^19.2.7" - }, - "peerDependencies": { - "react": ">=18.0.0", - "react-dom": ">=18.0.0" - } - }, "node_modules/@remix-run/router": { "version": "1.23.4", "resolved": "https://registry.npmmirror.com/@remix-run/router/-/router-1.23.4.tgz", @@ -1570,47 +1549,6 @@ "react-dom": ">=16.9.0" } }, - "node_modules/antd/node_modules/@ant-design/colors": { - "version": "7.2.1", - "resolved": "https://registry.npmmirror.com/@ant-design/colors/-/colors-7.2.1.tgz", - "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==", - "license": "MIT", - "dependencies": { - "@ant-design/fast-color": "^2.0.6" - } - }, - "node_modules/antd/node_modules/@ant-design/fast-color": { - "version": "2.0.6", - "resolved": "https://registry.npmmirror.com/@ant-design/fast-color/-/fast-color-2.0.6.tgz", - "integrity": "sha512-y2217gk4NqL35giHl72o6Zzqji9O7vHh9YmhUVkPtAOpoTCH4uWxo/pr4VE8t0+ChEPs0qo4eJRC5Q1eXWo3vA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.24.7" - }, - "engines": { - "node": ">=8.x" - } - }, - "node_modules/antd/node_modules/@ant-design/icons": { - "version": "5.6.1", - "resolved": "https://registry.npmmirror.com/@ant-design/icons/-/icons-5.6.1.tgz", - "integrity": "sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==", - "license": "MIT", - "dependencies": { - "@ant-design/colors": "^7.0.0", - "@ant-design/icons-svg": "^4.4.0", - "@babel/runtime": "^7.24.8", - "classnames": "^2.2.6", - "rc-util": "^5.31.1" - }, - "engines": { - "node": ">=8" - }, - "peerDependencies": { - "react": ">=16.0.0", - "react-dom": ">=16.0.0" - } - }, "node_modules/baseline-browser-mapping": { "version": "2.11.34", "resolved": "https://registry.npmmirror.com/baseline-browser-mapping/-/baseline-browser-mapping-2.11.34.tgz", @@ -1824,12 +1762,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, - "node_modules/is-mobile": { - "version": "5.0.0", - "resolved": "https://registry.npmmirror.com/is-mobile/-/is-mobile-5.0.0.tgz", - "integrity": "sha512-Tz/yndySvLAEXh+Uk8liFCxOwVH6YutuR74utvOcu7I9Di+DwM0mtdPVZNaVvvBUM2OXxne/NhOs1zAO7riusQ==", - "license": "MIT" - }, "node_modules/jiti": { "version": "2.7.0", "resolved": "https://registry.npmmirror.com/jiti/-/jiti-2.7.0.tgz", @@ -2873,12 +2805,6 @@ "react": "^18.3.1" } }, - "node_modules/react-is": { - "version": "19.3.1", - "resolved": "https://registry.npmmirror.com/react-is/-/react-is-19.3.1.tgz", - "integrity": "sha512-RRieF6IyxQBkcK6pP8xOHprLTPW6QjRkbGdImtqNme+/hYVwCZkLQLdlZGOhUqXwkS9IEynaGvPJtv6XB/cz0Q==", - "license": "MIT" - }, "node_modules/react-refresh": { "version": "0.18.0", "resolved": "https://registry.npmmirror.com/react-refresh/-/react-refresh-0.18.0.tgz", diff --git a/frontend/package.json b/frontend/package.json index 5225487..4a2e8a4 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -11,7 +11,7 @@ }, "dependencies": { "@ant-design/cssinjs": "1.24.0", - "@ant-design/icons": "^6.3.4", + "@ant-design/icons": "^5.6.1", "@tailwindcss/vite": "^4.3.3", "@vitejs/plugin-react": "^5.2.0", "antd": "^5.29.3", diff --git a/frontend/public/help/asset-management.png b/frontend/public/help/asset-management.png index 03b9ed8..3d38c36 100644 Binary files a/frontend/public/help/asset-management.png and b/frontend/public/help/asset-management.png differ diff --git a/frontend/public/help/dashboard.png b/frontend/public/help/dashboard.png index 4f3f63c..77c48dc 100644 Binary files a/frontend/public/help/dashboard.png and b/frontend/public/help/dashboard.png differ diff --git a/frontend/public/help/delivery.png b/frontend/public/help/delivery.png index 0f719e3..85e5133 100644 Binary files a/frontend/public/help/delivery.png and b/frontend/public/help/delivery.png differ diff --git a/frontend/public/help/dispatch.png b/frontend/public/help/dispatch.png index 3063b89..739ba18 100644 Binary files a/frontend/public/help/dispatch.png and b/frontend/public/help/dispatch.png differ diff --git a/frontend/public/help/model-center.png b/frontend/public/help/model-center.png index 8ad16ff..6198e13 100644 Binary files a/frontend/public/help/model-center.png and b/frontend/public/help/model-center.png differ diff --git a/frontend/public/help/overview.png b/frontend/public/help/overview.png index b1fd864..07d28c3 100644 Binary files a/frontend/public/help/overview.png and b/frontend/public/help/overview.png differ diff --git a/frontend/public/help/review.png b/frontend/public/help/review.png index 1cb9a8c..1966120 100644 Binary files a/frontend/public/help/review.png and b/frontend/public/help/review.png differ diff --git a/frontend/public/help/scene-assets.png b/frontend/public/help/scene-assets.png index 98dce82..068e17d 100644 Binary files a/frontend/public/help/scene-assets.png and b/frontend/public/help/scene-assets.png differ diff --git a/frontend/public/help/storyboard-inspector.png b/frontend/public/help/storyboard-inspector.png index ce1ec53..f4f27ce 100644 Binary files a/frontend/public/help/storyboard-inspector.png and b/frontend/public/help/storyboard-inspector.png differ diff --git a/frontend/public/help/storyboard.png b/frontend/public/help/storyboard.png index 839abcd..08a901d 100644 Binary files a/frontend/public/help/storyboard.png and b/frontend/public/help/storyboard.png differ diff --git a/frontend/public/help/timeline.png b/frontend/public/help/timeline.png index 36cf3cb..626a369 100644 Binary files a/frontend/public/help/timeline.png and b/frontend/public/help/timeline.png differ diff --git a/frontend/public/help/voice-assets.png b/frontend/public/help/voice-assets.png index 5bf82d6..7e80e85 100644 Binary files a/frontend/public/help/voice-assets.png and b/frontend/public/help/voice-assets.png differ diff --git a/frontend/src/app/App.tsx b/frontend/src/app/App.tsx index d904da8..a7739b7 100644 --- a/frontend/src/app/App.tsx +++ b/frontend/src/app/App.tsx @@ -178,7 +178,7 @@ export default function App() { return ( setBriefOpen((v) => !v)} briefOpen={briefOpen} + onOpenBrief={() => setBriefOpen((v) => !v)} onBriefOpenChange={setBriefOpen} briefOpen={briefOpen} narrow={narrow} navOpen={navOpen} onToggleNav={() => setNavOpen((v) => !v)} /> {/* <768 不渲染常驻侧栏:窄屏的导航入口只有顶栏那颗汉堡(点开左边的抽屉)。 diff --git a/frontend/src/app/layout/ActivityCenter.tsx b/frontend/src/app/layout/ActivityCenter.tsx index 644237b..f2ac6e1 100644 --- a/frontend/src/app/layout/ActivityCenter.tsx +++ b/frontend/src/app/layout/ActivityCenter.tsx @@ -13,7 +13,8 @@ * 全站自动刷新开关也落在这块面板上——它是「刷新策略」的唯一入口。 * * 为什么不放进侧栏或者做成一张页:这不是一个功能模块,是常驻的运行状态, - * 和顶栏已有的「在线/离线」是同一族信息(AppHeader 右侧那段)。 + * 和顶栏那条「后端离线」告警是同一族信息(AppHeader 右侧只剩故障才出现的那一颗; + * 健康态的「在线」2026-11-08 已撤——运行状态由这一颗唯一代言,§13.7)。 * 数据由 stores/activity 单例轮询供给(有活 3 秒、空闲 15 秒), * 这里只读 store,不再发第二份请求。 */ diff --git a/frontend/src/app/layout/AppHeader.tsx b/frontend/src/app/layout/AppHeader.tsx index 5a37d46..b310e7e 100644 --- a/frontend/src/app/layout/AppHeader.tsx +++ b/frontend/src/app/layout/AppHeader.tsx @@ -24,13 +24,15 @@ import ActivityCenter from './ActivityCenter' import PipelineConsole from './PipelineConsole' import UserMenu from './UserMenu' -export function AppHeader({ projectId, collapsed, onCollapse, onOpenBrief, briefOpen, +export function AppHeader({ projectId, collapsed, onCollapse, onOpenBrief, onBriefOpenChange, briefOpen, narrow, navOpen, onToggleNav }: { projectId: string collapsed: boolean onCollapse: (next: boolean) => void /** 展开/收起右侧「项目概况」抽屉(项目层唯一入口,实现在 app/App.tsx) */ onOpenBrief: () => void + /** 只展开、不取反:悬停展开走这条(点按仍走上面那颗 toggle),见 PipelineConsole 的悬停注释 */ + onBriefOpenChange: (open: boolean) => void briefOpen: boolean /** * <768:这一档外壳里没有常驻侧栏,这颗汉堡是导航的**唯一**入口, @@ -45,7 +47,6 @@ export function AppHeader({ projectId, collapsed, onCollapse, onOpenBrief, brief }) { const screens = Grid.useBreakpoint() const isLight = useAppliedTheme() === 'light' - const health = useSystemStore((s) => s.health) const error = useSystemStore((s) => s.error) const offline = !!error /* 侧栏收起时折叠按钮是唯一的展开入口,此时不许再隐任何东西。 @@ -118,18 +119,33 @@ export function AppHeader({ projectId, collapsed, onCollapse, onOpenBrief, brief 以前跟着 wide(=折叠或 ≥lg)走,900~991 这段整块没有,手机上就再也够不到归档/删除。 窄档由它自己的断点隐件换:轨道与状态 + )} - {!offline && health && ( - - 在线} className="max-lg:hidden" /> - - )} + {/* 顶栏只报「出事」,不报「一切正常」(2026-11-08 · 用户第 1 条「header 上不显示在线状态」): + 健康态那颗绿点在屏幕上的每一秒都在,读者第二秒就学会跳过它——它唯一携带的信息 + 是「今天没亮过」,而那正好是下面这条离线告警会说的话。撤掉它,顶栏少一处 + 永远不变的装饰,故障可见性一点没减:连不上后端仍然出现红色 Badge + 原因(title)。 + 「平台此刻在干什么」不由这里说,归旁边的 ActivityCenter(§13.7:顶栏唯一进度源)。 + 断点口径沿用原样:文字 <1280 隐、整颗 <1024 隐——窄档本来就没有这块像素。 */} {offline && ( - 后端离线} className="max-lg:hidden" /> + {/* 多包这一层 span 不是装饰:antd 的 Badge 不转发 ref,Tooltip 里的 + rc-resize-observer 拿不到宿主节点就退回 findDOMNode,React 每挂载一次 + 就往 console 打一条 deprecation 警告。实测(reports/ui_evidence/nex-p22/ + headerofflinegeo.py + headerstatus.py):断掉 /health 重新载入, + 四档视口各一条,一共 5 条——响的正好是「后端已经出事」那条分支, + 等于在最该看日志的时候先脏一次控制台。 + 换法只换宿主元素,不换盒子:max-lg:hidden 从 Badge 挪到这一层, + 隐藏的还是同一块(1440 / 1200 文字 56px、1000 只剩 6px 状态点、 + 430 整颗不渲染,改前后逐字段一致)。 + React 19 会把 findDOMNode 直接删掉,这颗告警是全站唯一一处 + `Tooltip` 直接吃非 DOM 子件的地方(grep -A2 ' + 后端离线} /> + )} {/* 平台动态(跑模型的任务在做什么)不跟着 md 让位: diff --git a/frontend/src/app/layout/PipelineConsole.tsx b/frontend/src/app/layout/PipelineConsole.tsx index 90075bd..f4c15da 100644 --- a/frontend/src/app/layout/PipelineConsole.tsx +++ b/frontend/src/app/layout/PipelineConsole.tsx @@ -31,7 +31,7 @@ * 不要改成 margin-inline:auto:那居中的是「品牌右缘↔工具左缘」空档的中点, * 工具区比品牌区宽约 140px,整块会偏左 70px。 */ -import { useEffect, useRef, useState } from 'react' +import { useEffect, useId, useRef, useState } from 'react' import { Tooltip, Typography } from 'antd' import { Button, Tag, type TagTone } from '../../components/ui' import { IconChevronDown } from '../../components/icons' @@ -80,16 +80,20 @@ const SEG_BG: Record = { pending: 'var(--ant-color-fill)' } -export function PipelineConsole({ projectId, onOpenBrief, briefOpen }: { +export function PipelineConsole({ projectId, onOpenBrief, onBriefOpenChange, briefOpen }: { projectId: string - /** 展开/收起「项目概况」抽屉(入口只有这一颗) */ + /** 点按:展开/收起「项目概况」抽屉(入口只有这一颗) */ onOpenBrief: () => void + /** 悬停:只负责展开,不取反。两个动词分开是因为 toggle 读到的是渲染时快照, + * 悬停计时器响的那一刻 prop 很可能还是旧值——先点后悬会把刚点开的抽屉再顶回去。 */ + onBriefOpenChange?: (open: boolean) => void briefOpen?: boolean }) { const project = useProjectStore((s) => s.project) const workflow = useProjectStore((s) => s.workflow) - /* 认「加载成功的那份数据自己的 id」,不认路由号 */ - const proj = projectId && project?.id === Number(projectId) ? project : null + const loadedId = useProjectStore((s) => s.loadedId) + /* 认「加载成功的那份数据自己的 id」,不认路由号:口径见 stores/project.ts 的 loadedId */ + const proj = projectId && loadedId === Number(projectId) ? project : null if (!projectId) return null const list = proj ? workflow || [] : [] @@ -135,6 +139,27 @@ export function PipelineConsole({ projectId, onOpenBrief, briefOpen }: { + ' · 已完成 ' + pipeDone + '/' + pipeTotal + ' 个节点' + (pipeCurrent ? (allDone ? ' · ' : ' · 当前节点:') + pipeCurrent.label : '') + /* ── 可访问名称(2026-11-10 · 阶段 35 · T-1 / T1-N2)────────────────────────── + 改前:这颗胶囊没有 `aria-label`,可读名称由「可见内容 + `title`」拼出来, + 而 `title` 整条是 `summary`(《项目名》流程进度 83% · 已完成 10/12 个节点 + · 当前节点:X)再缀一句「(悬停或点击展开项目概况)」。 + VoiceOver 每次 ⌥→ 到这一站都要 6–8 s 才念完,且「悬停 / 点击」是**鼠标 + 隐喻**——键盘用户听到的动词是他手上没有的设备。 + (登记:`docs/NEX-对照与例外.md` §6 行 T1-N2;阶段 11 只除掉了名称里的 + 鼠标隐喻依赖,长度这条当时明确「下一轮再动」。) + 改后:名称 = **它是什么 + 做到哪了**(`aria-label`,≈20 字,含项目身份), + 长明细 `summary` 移到 `aria-describedby`(sr-only 节点承载)。 + 为什么这样切:读屏的 name 每次进站必念,description 是「想知道再问」的 + 第二通道(`aria-describedby` 在 NVDA/VoiceOver 都可单独重念,且能按 + 语音档位跳过),明细因此**一条都没丢**,只是不再霸占每一站的头一句。 + `title` 收成「展开项目概况」——它现在是给鼠标看的一句提示, + 不再参与名称(有 `aria-label` 时 title 只可能落进 description, + 而我们把 description 显式给了 summary,所以这里写什么都不会污染名称)。 + 不动的东西:视觉一个字没改(aria/sr-only 不产生版面)、悬停展开与点按取反、 + 名字的三条抵达通道(hover Tooltip / focus-visible / 触屏靠抽屉标题)。 */ + const nameId = 'nex-console-' + useId().replace(/[^a-zA-Z0-9_-]/g, '') + const name = '项目概况:' + projectTitle + ',流程进度 ' + pipePct + '%' + /* 完整项目名的三条抵达通道(阶段 8.5 · 第 2 项): · Hover:指针悬停在名字上 ⇒ antd Tooltip; · Focus:键盘 Tab 到这颗胶囊 ⇒ 同一个 Tooltip(`:focus-visible` 才给, @@ -167,14 +192,109 @@ export function PipelineConsole({ projectId, onOpenBrief, briefOpen }: { try { return window.matchMedia('(hover: hover)').matches } catch { return true } } const showNameTip = () => { if (canHover() && nameTruncated()) setNameTip(true) } + + /* + * ── 悬停展开(2026-11-08 · 用户第 3 条原话「项目首页的节点展开改成按钮的 hover」)───── + * 症状:这颗胶囊是「项目概况」的唯一入口,可它只认点按。要读一眼节点明细、 + * 或者从七站里跳一站,都得先点一下、看完再点回来收起;而它右端那颗下箭头 + * 画的本来就是「这儿能展开」,鼠标停在上面却什么都不发生。 + * 做法:**悬停 = 展开**(单向),**点按 = 展开/收起**(原有语义一个字没改)。 + * · intent delay 300 ms:这颗胶囊最宽 520px、坐在顶栏正中,是从品牌块走到 + * 右侧工具区的必经之路。0 延迟会让「路过」变成「打开一扇挡住整页的抽屉」。 + * 取 300 ms 的依据是实测边界,不是手感猜测(playwright 真浏览器 + 页内计时, + * `reports/ui_evidence/nex-p11/hoverbrief.py`):真实停留 126 ms、243 ms 不开, + * 412 ms 以上必开;「进入胶囊 → 抽屉类名生效」端到端实测 409–429 ms + * (= 300 ms 计时器 + 抽屉自己挂载约 110–130 ms,读者感知的上限就是半秒)。 + * 一次横扫顶栏落在 250 ms 以下,一次「停下来看」落在 400 ms 以上,300 在两者之间。 + * · `@media (hover: hover)`(复用上面那颗 `canHover()`):触屏没有真正的悬停, + * 手指按下去先 pointerover 再 click——不收口的话每次点项目名都会先被悬停通道 + * 抢先展开,然后再被 click 的 toggle 收回去,抽屉看起来「闪一下就没了」。 + * 与 Tooltip 用同一个判据、同一个理由,不新造第二把尺子。 + * · **移出不自动关**:抽屉里是项目身份、指标、七站跳转和归档/删除,不是只读提示。 + * 胶囊在页面正中、抽屉贴在右缘,中间隔着一条遮罩——鼠标还没走到抽屉, + * 「离开即收起」就会先把门关上;要做就得给收起也加宽限并监听抽屉自己的 + * pointerenter,那是在一条已验证的模态通道上叠两套计时器。 + * 收起的出口一条没动(都是抽屉原有的)。实测过它们各自真实接住点击的是谁: + * 抽屉展开时遮罩盖住整页,`(胶囊中心)` 的 `elementFromPoint` 命中 + * `div.ant-drawer-mask`——鼠标在那颗坐标按下去落的是遮罩(`maskClosable`), + * 视觉结果与「再点一次胶囊」相同,机制不同;「再点胶囊」这条出口真正走得通的是 + * 键盘(Shift+Tab 回到胶囊按 Enter/Space 取反)。Esc 的口径是**焦点在抽屉内才有效** + * (阶段 11 复测:焦点退回胶囊后连按两次 Esc,open 仍是 true——antd 把抽屉的 keydown + * 绑在抽屉自己身上,焦点在门外收不到);点按与悬停两条进入路径实测都会把焦点送进 + * .ant-drawer,所以「按 Esc 能收」对用户实际走得通的每条路径都成立。 + * · **键盘不被悬停通道打扰**:焦点移动不自动展开(实测:只 focus 不 mouseenter ⇒ + * open 仍为 false;开合由 Enter/Space 说,`aria-expanded` 已经如实报状态)。 + * 展开后焦点会进抽屉根节点 `.ant-drawer`——这是抽屉固有的开合行为,不是悬停引入的 + * (对照实测:键盘 Enter 打开、全程没有 mouseenter,焦点同样落在 `.ant-drawer`)。 + * 这一条与阶段 9 在总览页给的「hover 永远不是唯一入口」同一口径。 + * 不影响的东西:Header 56 高、胶囊内部排版与断点隐件、Tooltip 的三条名称通道、 + * footercheck 的 `button.nex-console`(playwright 的 click 是「移动即点」, + * 落在计时器响之前,展开由 click 负责;即使悬停通道后到,`onBriefOpenChange(true)` + * 是绝对值,不会把刚点开的抽屉关掉)。 + */ + const HOVER_OPEN_MS = 300 + const hoverTimer = useRef() + /* 悬停通道的保险(阶段 11 实测)。 + 症状:遮罩盖住整页,包括胶囊自己。收起抽屉(Esc / 遮罩 / ✕)的一瞬间,遮罩从 + **静止的指针**下面消失,浏览器会向胶囊补发一次 mouseover + mouseenter + —— 于是「Esc 收起 → 半秒后它自己又开了」。 + 实测时间线(1440 · 指针停在胶囊上,`reports/ui_evidence/nex-p11/hoverfix.json`): + 1255ms drawer-open=false → 1646ms btn:mouseover + btn:mouseenter + → 2123ms drawer-open=true (= 补发的进入事件 + 300ms 计时器 + 挂载约 120ms) + 阶段 10 之前没有这条通道,收起就是收起;这条是悬停展开带出来的新缺陷。 + 判据:**指针真的动过**才算意图。补发的那一束里只有 mouseover/mouseenter, + 没有 mousemove(同一条实测日志里 1646ms 只有两枚事件);而人把指针移到 + 胶囊上、或在胶囊里挪一下,必然带 mousemove。所以: + · 收起(open→close)⇒ 悬停卸膛; + · 胶囊上的 mousemove ⇒ 重新上膛并起 300ms 计时(这一次才算一次悬停); + · 正常路径不变:mouseenter 起表、mousemove 不打断已经在一起的计时 + (阶段 11 定 300ms 用的就是「进入后停留」这条口径,hoverbrief.py 按它验收, + 改成「静止 300ms」会让 126/243/412ms 那组实测边界失效)。 + 点按开关、遮罩、✕、Esc 四条出口的语义一个字没改;改的只有「收起之后 + 悬停不立刻反悔」。 */ + const hoverArmed = useRef(true) + const prevBriefOpen = useRef(briefOpen) + useEffect(() => { + if (prevBriefOpen.current && !briefOpen) hoverArmed.current = false + prevBriefOpen.current = briefOpen + }, [briefOpen]) + const cancelHoverOpen = () => { + if (hoverTimer.current !== undefined) { + window.clearTimeout(hoverTimer.current) + hoverTimer.current = undefined + } + } + useEffect(() => cancelHoverOpen, []) /* 键盘档收口:Enter/Space 点开概况抽屉时,身后的提示同步收回(桌面档悬停由 mouseleave 负责,不依赖这条)。触屏档在 canHover() 那一步就已经不会弹了。 */ useEffect(() => { if (briefOpen) setNameTip(false) }, [briefOpen]) + /* 悬停计时的两个挂点:进入胶囊起表,离开或点按立刻撤表。 + 撤表是必需的——移开后不撤,300 ms 后人已经走到抽屉里了,背后又会被顶开一次。 */ + const hoverOpenStart = () => { + cancelHoverOpen() + if (!hoverArmed.current || briefOpen || !onBriefOpenChange || !canHover()) return + hoverTimer.current = window.setTimeout(() => { + hoverTimer.current = undefined + onBriefOpenChange(true) + }, HOVER_OPEN_MS) + } + + /* 胶囊内的真实移动:收起之后靠它重新上膛(见上面那段判据)。 + 已上膛时它一个字都不做 —— 停留计时由 mouseenter 负责,mousemove 不许把它重置。 */ + const hoverMove = () => { + if (hoverArmed.current) return + hoverArmed.current = true + hoverOpenStart() + } + return ( - ) } diff --git a/frontend/src/app/layout/ProjectBriefDrawer.tsx b/frontend/src/app/layout/ProjectBriefDrawer.tsx index 2ba0e41..bbf1b25 100644 --- a/frontend/src/app/layout/ProjectBriefDrawer.tsx +++ b/frontend/src/app/layout/ProjectBriefDrawer.tsx @@ -66,8 +66,9 @@ export function ProjectBriefDrawer({ open, onClose, projectId }: { const project = useProjectStore((s) => s.project) const workflow = useProjectStore((s) => s.workflow) const stats = useProjectStore((s) => s.stats) - /* 认「加载成功的那份数据自己的 id」,不认路由号:项目 404 时 store 里还留着上一个 */ - const proj = projectId && project?.id === Number(projectId) ? project : null + const loadedId = useProjectStore((s) => s.loadedId) + /* 认「加载成功的那份数据自己的 id」,不认路由号:口径见 stores/project.ts 的 loadedId */ + const proj = projectId && loadedId === Number(projectId) ? project : null const st = stats || {} const isArchived = proj?.status === 'archived' const curSlug = slugOf(projectModules.find((m) => pathOf(m, projectId) === location.pathname) || projectModules[0]) @@ -98,7 +99,7 @@ export function ProjectBriefDrawer({ open, onClose, projectId }: { const nextStep = workflow.find((s: any) => s.state === 'active' || s.state === 'failed') return ( - s.applied) as ThemeMode return ( diff --git a/frontend/src/components/forms/MultiSelect.tsx b/frontend/src/components/forms/MultiSelect.tsx index efcd3e1..f148272 100644 --- a/frontend/src/components/forms/MultiSelect.tsx +++ b/frontend/src/components/forms/MultiSelect.tsx @@ -1,6 +1,7 @@ import { useMemo } from 'react' import { Select as AntSelect } from 'antd' import { sameValue, toOptions, type OptionLike } from './options' +import { markFieldControl, useFieldControlId } from '../ui/fieldId' /** * 全站统一「多选下拉」:antd Select 的 multiple 模式。 @@ -20,13 +21,15 @@ export type MultiSelectProps = { size?: 'sm' | 'md' ariaLabel?: string className?: string + /** 写下来就用它,没写时由宿主 `Field` 生成(T1-N6) */ + id?: string /** 一个都不选等于「不限制」的下拉(筛选场景),保留「全部」语义提示 */ title?: string } export function MultiSelect({ value, onChange, options, disabled, placeholder = '未选择', searchThreshold = 3, - size, ariaLabel, className, title + size, ariaLabel, className, title, id }: MultiSelectProps) { const picked = useMemo(() => (Array.isArray(value) ? value : []), [value]) const opts = useMemo(() => toOptions(options), [options]) @@ -37,6 +40,7 @@ export function MultiSelect({ return ( ) } + +markFieldControl(MultiSelect) diff --git a/frontend/src/components/forms/SecretInput.tsx b/frontend/src/components/forms/SecretInput.tsx index 6a93c08..96ae705 100644 --- a/frontend/src/components/forms/SecretInput.tsx +++ b/frontend/src/components/forms/SecretInput.tsx @@ -3,6 +3,7 @@ import { Input } from 'antd' import * as api from '../../api/client' import { domInput, passRef } from '../../lib/ref' import { IconEye, IconEyeOff } from '../icons' +import { markFieldControl, useFieldControlId } from '../ui/fieldId' /** * 全站统一的「密码 / 密钥」输入框:Ant Design 5 Input.Password。 @@ -94,22 +95,40 @@ export const SecretInput = forwardRef passRef(outerRef, domInput(h))} - id={id} + id={useFieldControlId(id)} value={value} placeholder={placeholder} autoComplete={autocomplete} maxLength={maxLength} disabled={disabled} visibilityToggle={{ visible: shown, onVisibleChange: (next: boolean) => void toggle(next) }} - /* 眼睛这颗是**点得着的控件本体**(antd 把 className 与 onMouseDown clone 到 - iconRender 返回的那只图标上),默认图标自带的英文字形码 `eye` / `eye-invisible` - 就是它对辅助技术的全部名字(2026-11-08 · S-2)。名字直接复用旁边那句 - 已经写好的中文 hint,三态口径与 title 完全一致;图标换成登记表里的同一只 - EyeOutlined / EyeInvisibleOutlined,svg、尺寸、类名、手感一字不变。 */ - iconRender={(visible) => visible - ? - : } - title={hint} + /* 眼睛这颗是**点得着的控件本体**,所以它必须是一个真按钮 + (2026-11-08 · S-2 换中文名 → 2026-11-10 · 阶段 35 · T-1 / T1-N4 + T1-N5)。 + + 改前两处缺陷: + · T1-N4:antd 的 `iconRender` 只被 clone 上一份 `className` 与三个事件, + 返回的是 ``——读屏里它是一张**图片**, + Tab 到不了、也没有「当前是明文还是密文」这个状态位; + · T1-N5:`title={hint}` 挂在 `Input.Password` 上,antd 把它原样转给 `` + 本体(`antd/es/input/Password.js` 的 `restProps`),于是密码框自己的可访问 + 名称被眼睛的提示词占用,VoiceOver 念「显示密码 编辑框」,真正的字段标签 + 「新密码」反而到不了耳朵里(取证 `reports/ui_evidence/nex-p11/vo/logs/axsrc.json`)。 + + 改后:` + )} aria-describedby={failed ? `${id || 'secret'}-hint` : undefined} onChange={(e) => onChange?.(e.target.value)} {...(rest as any)} @@ -118,3 +137,5 @@ export const SecretInput = forwardRef ) }) + +markFieldControl(SecretInput) diff --git a/frontend/src/components/forms/Select.tsx b/frontend/src/components/forms/Select.tsx index 4498fc8..5cd9ddb 100644 --- a/frontend/src/components/forms/Select.tsx +++ b/frontend/src/components/forms/Select.tsx @@ -1,6 +1,7 @@ import { useMemo } from 'react' import { Select as AntSelect } from 'antd' import { sameValue, toOptions, type OptionLike } from './options' +import { markFieldControl, useFieldControlId } from '../ui/fieldId' /** * 全站统一下拉控件:Ant Design 5 Select 的唯一封装。 @@ -58,9 +59,12 @@ export function Select({ // 类型宽容:把外部值折成选项里真实存在的那個 value(number/string 都认) const hit = aimed === null || aimed === undefined ? undefined : opts.find((o) => sameValue(o.value, aimed)) const shown = aimed === null || aimed === undefined ? undefined : (hit ? hit.value : aimed) + /* id 落在真正可聚焦的那颗 `` 上(rc-select 把它交给 Selector/Input), + 宿主 `Field` 的 `