diff --git a/CHANGELOG.md b/CHANGELOG.md index b6c3681..6128a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,12 @@ > `0.1.12`),由 `scripts/version.py` 从 git **算出来**;开发交付的独立说明写入本文件“开发快照”章节,并打 `snapshot/vX.Y.Z` 注释标签 ⇒ 每次开发交付均可追溯, > 但"发布版本"仍然只能由人定(CI 不会自动升版本、不会打 tag)。 +## 开发快照 snapshot/v0.1.47 - 2026-10-24 + +### Changed + +- 区域统计按部门视图默认只展开到一级部门,二级及以下初始收起;保留手动逐级展开、直属人员、既有统计口径及按区域/按人视图。 + ## 开发快照 snapshot/v0.1.46 - 2026-10-21 ### Added diff --git a/web/src/QADepartmentStatistics.test.tsx b/web/src/QADepartmentStatistics.test.tsx index 0e1e25b..b609343 100644 --- a/web/src/QADepartmentStatistics.test.tsx +++ b/web/src/QADepartmentStatistics.test.tsx @@ -41,14 +41,21 @@ it('hides direct people together with collapsed departments without changing bra expect(html).not.toContain('data-person-key=') expect(html).toContain('data-total-people="3"') }) -it('makes a deep leaf with direct people expandable but initially collapsed', () => { +it('defaults to first-level departments and keeps deeper leaves manually expandable without changing metrics', () => { const data = parseDepartmentStatistics(departmentStatisticsFixture, { period: 'all' }).snapshot! const child = data.rows.find((d) => d.id === 'child')! data.rows.push({ ...child, id: 'deep', parent_id: 'child', name: 'Deep Fixture' }) for (const p of data.people) p.department_ids = p.department_ids.map((id) => (id === 'child' ? 'deep' : id)) const initial = renderToStaticMarkup() - expect(initial).toContain('展开部门 Deep Fixture') + expect(initial).toContain('data-department-id="root"') + expect(initial).toContain('data-department-id="child"') + expect(initial).not.toContain('data-department-id="deep"') expect(initial).not.toContain('data-parent-department="deep"') + const parentOpened = renderToStaticMarkup() + expect(parentOpened).toContain('展开部门 Deep Fixture') + expect(parentOpened).not.toContain('data-parent-department="deep"') + expect(initial).toContain('data-total-people="3"') + expect(parentOpened).toContain('data-total-people="3"') const expanded = renderToStaticMarkup() expect(expanded).toContain('data-parent-department="deep"') }) diff --git a/web/src/QADepartmentStatistics.tsx b/web/src/QADepartmentStatistics.tsx index 98224a6..a1d5688 100644 --- a/web/src/QADepartmentStatistics.tsx +++ b/web/src/QADepartmentStatistics.tsx @@ -28,7 +28,7 @@ export function defaultStatisticsCollapsed(data: DepartmentStatisticsSnapshot): const direct = new Set(data.people.flatMap((p) => p.department_ids)) return new Set( departmentTree(data.rows, new Set()) - .filter((r) => r.depth >= 2 && (r.hasChildren || direct.has(r.department.id))) + .filter((r) => r.depth >= 1 && (r.hasChildren || direct.has(r.department.id))) .map((r) => r.department.id) ) }