Repository navigation
Commit 5d59e33
committed
fix(components): 碎片归组候选改用 feed 地形组
控制方裁决(未决项①成立,派单缺陷在控制方):前一条把 `containerGroups` 当候选集
⇒ 移组后碎片会被塞进「笔记容器组」,而碎片的自动归组走的是 feed ⇒ 静默的语义错位。
Rust 侧决定性证据(本单元独立复核,逐行读过):
- `commands_groups.rs:36` 逐字「列出笔记组(含组内笔记数;terrain 可选过滤 container/feed)」;
`:43-46` 白名单校验 `if t != "container" && t != "feed" { return Err(...) }` ⇒ feed 是一等地形。
- `commands_fragments.rs:344-366` `resolve_feed_topic_group`:碎片自动归组建的就是 feed 组
(`:355 terrain: "feed".to_string()`、`:349 find_topic_group(domain_tag, "feed")`、
`:361` 理由逐字「碎片 DomainTag 自动归组」)。
- 反向对照:`FeedFragmentList.tsx:109` 的「目标=笔记容器组」是 `promote_fragment_to_note`
(升为笔记)的去向语义 —— 另一件事,不能当本命令的先例(该注释**未改动**)。
返工内容:
1. feed 清单加载搬进 `FragmentGroupAction.tsx` 自己:
`invoke<NoteGroup[]>("list_note_groups", { terrain: "feed" })`(后端真源过滤)
+ 客户端再收一次口径 `list.filter((g) => g.terrain === "feed")`(防口径漂移混入容器组)。
2. 父层去掉 `groups` / `onNeedGroups` 两个 prop ⇒ `FeedFragmentList.tsx` **300 → 299**(净变化 −1)。
3. 头注里「本件不自建第二套加载器…两套加载器就是两套口径」那段改写:该理由只在**同一 terrain**
上成立;这里是**两个不同 terrain 的两个不同查询**(container=笔记去向 / feed=碎片归组),
不构成「两套口径」。改写后逐字写出上面三条 Rust 证据(含行号)。
4. 清单加载失败也走父层 `setErr`(可见行,不静默);`groups` 留 null ⇒ 可再点一次重试。
5. 「当前组」标签:组名查不到时**如实报 id**(`当前组 #N`),不许把「碎片还在容器组里」谎报成
「当前未归组」。
判据(新增 V7–V9):
- `FeedFragmentList.test.tsx` 9 用例(件数不变,断言加强):
V7 正控 = feed 组 11 出现在候选 + 查询载荷逐字 `{ terrain: "feed" }`;
🔴 V7 负控 = fixture 的 `terrain: "container"` 组(id 9)**不得出现**在候选里
(桩在 feed 查询上**故意多回一个容器组**,把客户端第二次收口的牙摆出来);
另有「当前组 #9 / 当前未归组」两条如实性断言。
- `countLines()`:`FeedFragmentList.tsx` **299** · `FragmentGroupAction.tsx` **155** ·
`FeedFragmentList.test.tsx` **299** ⇒ 全部 ≤300。
- 冻结键持平:宿主 nativeButton 6、边框 5、越界圆角 0、阴影 0、弱化灰 1、字号越界 8、三红 1、
`<Surface>` 1;新件六棘轮全 0、原生 button 0。
门禁(串行):line-limits --full exit 0(0 / 121 / 121)· docs-check exit 0(扫描 281 /
检查 181 + ✅ docs-check 通过)· check-command-registry exit 0(定义 311 / 注册 311 / 重复 0)·
tsc --noEmit exit 0 · 守卫族 12 件 122 用例全绿 · 落点两件 29/29 绿。1 parent 5f66281 commit 5d59e33
3 files changed
Lines changed: 75 additions & 44 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
35 | 38 | | |
36 | 39 | | |
37 | 40 | | |
| |||
47 | 50 | | |
48 | 51 | | |
49 | 52 | | |
50 | | - | |
| 53 | + | |
| 54 | + | |
51 | 55 | | |
52 | 56 | | |
53 | 57 | | |
| |||
206 | 210 | | |
207 | 211 | | |
208 | 212 | | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
216 | 216 | | |
217 | | - | |
| 217 | + | |
218 | 218 | | |
219 | 219 | | |
220 | 220 | | |
221 | | - | |
222 | | - | |
| 221 | + | |
223 | 222 | | |
224 | 223 | | |
225 | 224 | | |
226 | | - | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
227 | 228 | | |
228 | 229 | | |
229 | 230 | | |
230 | | - | |
| 231 | + | |
231 | 232 | | |
232 | | - | |
| 233 | + | |
233 | 234 | | |
234 | | - | |
| 235 | + | |
235 | 236 | | |
236 | 237 | | |
237 | 238 | | |
| |||
240 | 241 | | |
241 | 242 | | |
242 | 243 | | |
243 | | - | |
244 | | - | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
245 | 247 | | |
246 | | - | |
| 248 | + | |
247 | 249 | | |
| 250 | + | |
248 | 251 | | |
249 | 252 | | |
250 | 253 | | |
| |||
254 | 257 | | |
255 | 258 | | |
256 | 259 | | |
257 | | - | |
| 260 | + | |
258 | 261 | | |
259 | 262 | | |
260 | 263 | | |
261 | 264 | | |
262 | 265 | | |
263 | 266 | | |
264 | 267 | | |
265 | | - | |
| 268 | + | |
266 | 269 | | |
267 | 270 | | |
268 | 271 | | |
269 | 272 | | |
270 | 273 | | |
271 | 274 | | |
272 | 275 | | |
273 | | - | |
| 276 | + | |
274 | 277 | | |
275 | 278 | | |
276 | 279 | | |
| |||
280 | 283 | | |
281 | 284 | | |
282 | 285 | | |
283 | | - | |
| 286 | + | |
284 | 287 | | |
285 | 288 | | |
286 | | - | |
287 | 289 | | |
288 | 290 | | |
289 | 291 | | |
290 | 292 | | |
291 | 293 | | |
292 | 294 | | |
293 | | - | |
294 | | - | |
| 295 | + | |
| 296 | + | |
295 | 297 | | |
296 | 298 | | |
297 | 299 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
233 | 233 | | |
234 | 234 | | |
235 | 235 | | |
236 | | - | |
237 | | - | |
| 236 | + | |
238 | 237 | | |
239 | 238 | | |
240 | 239 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
11 | | - | |
12 | | - | |
13 | | - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
14 | 28 | | |
15 | | - | |
16 | | - | |
| 29 | + | |
| 30 | + | |
17 | 31 | | |
18 | | - | |
| 32 | + | |
| 33 | + | |
19 | 34 | | |
20 | 35 | | |
21 | 36 | | |
| |||
28 | 43 | | |
29 | 44 | | |
30 | 45 | | |
31 | | - | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | 46 | | |
36 | 47 | | |
37 | 48 | | |
| |||
43 | 54 | | |
44 | 55 | | |
45 | 56 | | |
46 | | - | |
| 57 | + | |
47 | 58 | | |
48 | 59 | | |
49 | 60 | | |
50 | | - | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
51 | 65 | | |
52 | 66 | | |
53 | | - | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
54 | 81 | | |
55 | | - | |
56 | | - | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
57 | 85 | | |
58 | 86 | | |
59 | 87 | | |
| |||
89 | 117 | | |
90 | 118 | | |
91 | 119 | | |
92 | | - | |
| 120 | + | |
93 | 121 | | |
94 | 122 | | |
95 | 123 | | |
| |||
116 | 144 | | |
117 | 145 | | |
118 | 146 | | |
119 | | - | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
120 | 150 | | |
121 | 151 | | |
122 | 152 | | |
| |||
0 commit comments