feat(0.5.1): 业务逻辑审查 9 条 P0 全修 + 自绘安装器 + 现场反馈四项
## 算分正确性（6 份只读审查 → 收敛成 5 个病根，均先复现失败再修） - 「人工名次」与「自动名次回写」互斥：原来同一份成绩**发布两次分数不同** （团体报名项 dual 通道 10/8/6 → 25/18/14），现在连发多次逐字节一致 - 删小项时在同一事务作废旧流水并推榜：原来分数**永久残留**在总榜、任何重算都打不到 - 规则包导入整体事务化：原来中途失败会清空名次表且补不回（奖牌全丢）； 另加守卫「compare=none 的小项不得配 basis=result/aggregate」 - 末位归零只抹真正落在末位的那一档：原来跨末位的并列组会被整组抹 0 （7 人三人并列第 5 时第 5、6 名的分也一起没了） - 模板「分值表档位超出录取名次」现在拒绝保存：原来静默截断成 0 分 ## 现场反馈（主人实测报的） - 已发布成绩可改：行内「修改本条」+ 成绩格/状态格可点（退回草稿→改→重新发布本组）， 与「作废」语义分开；取消路径不产生任何副作用 - 单位积分明细补「运动员 / 来源」列，并显示「已修订 ×N（时间·原因）」： 管理端、大屏覆盖层、xlsx 备注列三处同源 - 单位奖牌榜改为按奖牌独立排名（金→银→铜→单位编码），与积分榜解耦 - 历史孤儿积分流水清理（迁移 0022，只动 result/record_bonus，人工调整分不受影响） ## 新功能 - 团体项目聚合口径二选一：平均（默认）/ 总和（迁移 0023，通道编辑器可切） ## 安装器 - 自绘五页安装界面：无边框、自绘标题栏、DPI 自适应（4K@200% 实测）、 安装/卸载逻辑复用 electron-builder 宏不变；默认「为所有用户安装」并自动放行防火墙 19540 - 构建期校验：安装器素材里的版本号必须与 VERSION 一致，否则构建失败 自检：服务端 14 包 ×2 / 前端 vue-tsc + build + 742 例 ×2 / Console 20 文件 + 68 例 ×2，全绿。 端到端对拍：修前 vs 修后，纯团体 / 双计 / 普通个人三形态**逐字节一致**，仅出 bug 的双通道形态按要求改变。
This commit is contained in:
AskaEth committed
1 parent
78b14efaa9
commit
877ff15823
181 files changed
+8747
-371
No files matched your search
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onUnmounted, ref, watch } from 'vue'
|
||||
import { breakdownAthleteName, breakdownRevisionLine, breakdownSourceTag } from '@/shared'
|
||||
import { useScoreboard } from '../useScoreboard'
|
||||
import AnimatedNumber from './AnimatedNumber.vue'
|
||||
|
||||
@@ -31,6 +32,8 @@ onUnmounted(() => window.clearInterval(timer))
|
||||
|
||||
const items = computed(() => detail.value?.detail?.items ?? [])
|
||||
const totalPoints = computed(() => detail.value?.detail?.totalPoints ?? 0)
|
||||
/** 团体项目 / 人工调整的流水没有运动员，退回单位名（见 breakdownAthleteName）。 */
|
||||
const teamName = computed(() => detail.value?.detail?.teamName ?? '')
|
||||
const autoClose = computed(() => (detail.value?.autoCloseSeconds ?? 0) > 0)
|
||||
</script>
|
||||
|
||||
@@ -55,6 +58,7 @@ const autoClose = computed(() => (detail.value?.autoCloseSeconds ?? 0) > 0)
|
||||
<div v-else class="table">
|
||||
<div class="row head-row">
|
||||
<span class="col-name">项目 / 组别</span>
|
||||
<span class="col-athlete">运动员</span>
|
||||
<span class="col-rank">名次</span>
|
||||
<span class="col-result">成绩</span>
|
||||
<span class="col-points">积分</span>
|
||||
@@ -63,10 +67,20 @@ const autoClose = computed(() => (detail.value?.autoCloseSeconds ?? 0) > 0)
|
||||
<span class="col-name">
|
||||
{{ item.eventName ?? '人工调整' }}
|
||||
<em v-if="item.categoryName">{{ item.categoryName }}</em>
|
||||
<!-- 普通成绩不打来源标签：这一列绝大多数行都是成绩，打出来只是噪声（见 breakdownSourceTag）。 -->
|
||||
<em v-if="breakdownSourceTag(item)" class="col-source">{{ breakdownSourceTag(item) }}</em>
|
||||
</span>
|
||||
<span class="col-athlete">{{ breakdownAthleteName(item, teamName) }}</span>
|
||||
<span class="col-rank">{{ item.rank ?? '—' }}</span>
|
||||
<span class="col-result">{{ item.resultText ?? '—' }}</span>
|
||||
<span class="col-points">{{ item.points }}</span>
|
||||
<!--
|
||||
修订痕迹占满一整行、只在这一分确实被改过时才出现：大屏不能悬停，观众要一眼看到
|
||||
「这几分是后来改过的」。没改过的行连这一行元素都没有，行高与改造前完全一致。
|
||||
-->
|
||||
<span v-if="breakdownRevisionLine(item)" class="col-revision">
|
||||
{{ breakdownRevisionLine(item) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -142,7 +156,10 @@ h2 {
|
||||
}
|
||||
.row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 110px 160px 130px;
|
||||
/* 覆盖层是 16:9 屏幕右侧的一半：五列都要在 960px 内读得清，姓名列给得最宽。
|
||||
后四列按内容定宽（名次只有一位数、积分两三位），省下来的宽度全给「项目 / 组别」——
|
||||
破纪录加分那一行还要在项目名后面挤下一个来源标签（见 .col-source）。 */
|
||||
grid-template-columns: minmax(0, 1fr) 190px 76px 140px 96px;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding: 14px 8px;
|
||||
@@ -160,6 +177,14 @@ h2 {
|
||||
text-align: right;
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
/* 项目名 / 运动员名（团体项目退回单位名）可能很长：省略号收尾，不把名次成绩挤出行外。 */
|
||||
.col-name,
|
||||
.col-athlete {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.col-points {
|
||||
color: var(--gold);
|
||||
font-weight: 700;
|
||||
@@ -170,6 +195,25 @@ h2 {
|
||||
font-size: 20px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
/* 破纪录加分 / 人工调整这类「非普通成绩」的来源标签：跟在项目名后面，不单占一列。 */
|
||||
.col-name em.col-source {
|
||||
padding: 2px 10px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid var(--primary-line);
|
||||
font-size: 19px;
|
||||
color: var(--primary-text);
|
||||
}
|
||||
/* 修订痕迹：整行小字，比正文矮一号、颜色更淡，不跟成绩抢注意力。 */
|
||||
.col-revision {
|
||||
grid-column: 1 / -1;
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
font-size: 20px;
|
||||
letter-spacing: 1px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
.empty {
|
||||
flex: 1;
|
||||
display: grid;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onUnmounted, ref, watch } from 'vue'
|
||||
import { medalBoardRows } from '@/shared'
|
||||
import { useScoreboard } from '../useScoreboard'
|
||||
import { DEFAULT_ROTATE_SECONDS } from '../guards'
|
||||
|
||||
@@ -12,8 +13,8 @@ interface TickerItem {
|
||||
|
||||
const { standings, latestResults, announceText, detail, settings } = useScoreboard()
|
||||
|
||||
// 与单位奖牌榜页同一口径：按服务端名次（总分优先）取前 3，不在前端按金→银→铜重排。
|
||||
const topMedals = computed(() => standings.value.slice(0, 3))
|
||||
// 与单位奖牌榜页同一口径：按服务端的奖牌榜顺序（金→银→铜）取前 3，不在前端自己重排。
|
||||
const topMedals = computed(() => medalBoardRows(standings.value).slice(0, 3))
|
||||
|
||||
const latestGroup = computed(() => latestResults.value[0] ?? null)
|
||||
|
||||
@@ -61,7 +62,7 @@ onUnmounted(() => window.clearInterval(timer))
|
||||
<div v-if="current" :key="current.key" class="item">
|
||||
<template v-if="current.key === 'medals'">
|
||||
<div v-for="row in topMedals" :key="row.teamId" class="chip">
|
||||
<span class="chip-rank">{{ row.rank }}</span>
|
||||
<span class="chip-rank">{{ row.medalRank }}</span>
|
||||
<span class="chip-name">{{ row.shortName ?? row.teamName }}</span>
|
||||
<span class="chip-stat gold">金 {{ row.gold }}</span>
|
||||
<span class="chip-stat silver">银 {{ row.silver }}</span>
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue'
|
||||
import { medalBoardRows } from '@/shared'
|
||||
import { BOARD_AVAILABLE_PX, fitRowFont } from '../../fitFont'
|
||||
import { useScoreboard } from '../../useScoreboard'
|
||||
import PageFrame from '../PageFrame.vue'
|
||||
@@ -7,8 +8,9 @@ import TeamLogo from '../TeamLogo.vue'
|
||||
|
||||
const { standings } = useScoreboard()
|
||||
|
||||
// 排序与名次都取服务端口径（总分优先），前端不再按金→银→铜重排，否则名次会与总积分榜打架。
|
||||
const rows = computed(() => standings.value)
|
||||
// 顺序与名次都取服务端的奖牌榜口径（金→银→铜→单位编码，与总积分榜解耦）。
|
||||
// 前端不按金/银/铜重排、也不拿总榜 rank 当奖牌榜名次，否则会和导出件打架。
|
||||
const rows = computed(() => medalBoardRows(standings.value))
|
||||
|
||||
const rowFont = computed(() => fitRowFont(rows.value.length, BOARD_AVAILABLE_PX))
|
||||
</script>
|
||||
@@ -25,7 +27,7 @@ const rowFont = computed(() => fitRowFont(rows.value.length, BOARD_AVAILABLE_PX)
|
||||
<span class="total">合计</span>
|
||||
</div>
|
||||
<div v-for="row in rows" :key="row.teamId" class="row">
|
||||
<span class="rank" :class="`top-${Math.min(row.rank, 4)}`">{{ row.rank }}</span>
|
||||
<span class="rank" :class="`top-${Math.min(row.medalRank, 4)}`">{{ row.medalRank }}</span>
|
||||
<span class="name">
|
||||
<TeamLogo :path="row.logoPath" />
|
||||
<span class="team-name">{{ row.teamName }}</span>
|
||||
|
||||
@@ -194,9 +194,12 @@ export function parseStandingRow(source: unknown): StandingRow {
|
||||
const gold = num(rec.gold)
|
||||
const silver = num(rec.silver)
|
||||
const bronze = num(rec.bronze)
|
||||
const rank = num(rec.rank)
|
||||
return {
|
||||
...parseTeamRef(rec),
|
||||
rank: num(rec.rank),
|
||||
rank,
|
||||
// 单位奖牌榜名次独立于总积分榜（金→银→铜）；旧服务端不下发它，退回总榜名次（旧行为）。
|
||||
medalRank: num(rec.medalRank, rank),
|
||||
gold,
|
||||
silver,
|
||||
bronze,
|
||||
@@ -542,6 +545,11 @@ export function parseBreakdownItem(source: unknown): BreakdownItem {
|
||||
resultText: strOrNull(rec.resultText),
|
||||
points: num(rec.points),
|
||||
createdAt: str(rec.createdAt),
|
||||
// 修订痕迹：老服务端不下发，一律解析成 null（= 追不出来），界面据此不显示角标。
|
||||
revisionCount: numOrNull(rec.revisionCount),
|
||||
lastRevisionAt: strOrNull(rec.lastRevisionAt),
|
||||
lastRevisionReason: strOrNull(rec.lastRevisionReason),
|
||||
lastRevisedBy: strOrNull(rec.lastRevisedBy),
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+16
-1
@@ -70,7 +70,7 @@ const STANDING_SEEDS: readonly StandingSeed[] = [
|
||||
]
|
||||
|
||||
function buildStandings(): StandingRow[] {
|
||||
return MOCK_TEAMS.map((item, index) => {
|
||||
const rows: StandingRow[] = MOCK_TEAMS.map((item, index) => {
|
||||
const seed = STANDING_SEEDS[index] ?? STANDING_SEEDS[STANDING_SEEDS.length - 1]
|
||||
const row = seed ?? { rank: index + 1, totalPoints: 0, gold: 0, silver: 0, bronze: 0, rankChange: null }
|
||||
return {
|
||||
@@ -81,6 +81,7 @@ function buildStandings(): StandingRow[] {
|
||||
color: item.color,
|
||||
logoPath: item.logoPath,
|
||||
rank: row.rank,
|
||||
medalRank: 0,
|
||||
gold: row.gold,
|
||||
silver: row.silver,
|
||||
bronze: row.bronze,
|
||||
@@ -89,6 +90,20 @@ function buildStandings(): StandingRow[] {
|
||||
rankChange: row.rankChange,
|
||||
}
|
||||
})
|
||||
|
||||
// 单位奖牌榜的名次独立于总积分榜（金 → 银 → 铜 → 单位编码）；示例数据照服务端同一口径算，
|
||||
// 数组顺序仍保持积分榜顺序（服务端就是这么下发的：rank 管顺序，medalRank 单独带）。
|
||||
const medalRank = new Map<number, number>()
|
||||
;[...rows]
|
||||
.sort(
|
||||
(a, b) =>
|
||||
b.gold - a.gold ||
|
||||
b.silver - a.silver ||
|
||||
b.bronze - a.bronze ||
|
||||
a.teamCode.localeCompare(b.teamCode),
|
||||
)
|
||||
.forEach((row, index) => medalRank.set(row.teamId, index + 1))
|
||||
return rows.map((row) => ({ ...row, medalRank: medalRank.get(row.teamId) ?? row.rank }))
|
||||
}
|
||||
|
||||
function buildEvents(): Event[] {
|
||||
|
||||
@@ -0,0 +1,174 @@
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { parse } from 'vue/compiler-sfc'
|
||||
import { breakdownAthleteName, breakdownRevisionLine, breakdownSourceTag, type BreakdownItem } from '@/shared'
|
||||
|
||||
/**
|
||||
* 大屏积分明细覆盖层的「运动员」列。
|
||||
*
|
||||
* 现场裁判长的原话：推到大屏的明细只有项目 / 名次 / 成绩 / 积分，看不出「谁在哪个项目拿了多少分」，
|
||||
* 这种明细说服不了观众单位名字为什么升上去。数据（athleteName）服务端一直有，是覆盖层漏了这一列。
|
||||
*
|
||||
* 项目没有 jsdom 与组件测试工具，这里沿用仓库既有做法：`.vue` 模板用源码契约断言
|
||||
* （列头顺序、每个格子绑了什么），文案内容交给 `breakdownAthleteName` 这个纯函数用例守。
|
||||
*/
|
||||
|
||||
const OVERLAY_SOURCE = readFileSync(new URL('../components/DetailOverlay.vue', import.meta.url), 'utf8')
|
||||
|
||||
/** 取模板里以某个固定串开头、到下一个 </div> 为止的片段（这些行里没有嵌套 div）。 */
|
||||
function block(startPattern: RegExp): string {
|
||||
const found = startPattern.exec(OVERLAY_SOURCE)
|
||||
assert.ok(found !== null, `模板里应有 ${startPattern}`)
|
||||
const rest = OVERLAY_SOURCE.slice(found.index)
|
||||
const end = rest.indexOf('</div>')
|
||||
assert.ok(end > 0, '行片段应以 </div> 结束')
|
||||
return rest.slice(0, end)
|
||||
}
|
||||
|
||||
interface Cell {
|
||||
cls: string
|
||||
inner: string
|
||||
}
|
||||
|
||||
function cellsOf(fragment: string): Cell[] {
|
||||
return [...fragment.matchAll(/<span class="(col-[a-z]+)">([\s\S]*?)<\/span>/g)].map((match) => ({
|
||||
cls: match[1] ?? '',
|
||||
inner: (match[2] ?? '').replace(/\s+/g, ' ').trim(),
|
||||
}))
|
||||
}
|
||||
|
||||
const HEAD_ROW = block(/<div class="row head-row">/)
|
||||
const BODY_ROW = block(/<div v-for="item in items" :key="item\.ledgerId" class="row">/)
|
||||
|
||||
function styleText(source: string): string {
|
||||
const { descriptor } = parse(source, { filename: 'style.vue' })
|
||||
return descriptor.styles[0]?.content ?? ''
|
||||
}
|
||||
|
||||
function cssRule(style: string, selector: string): string {
|
||||
const escaped = selector.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
|
||||
const match = new RegExp(`${escaped}\\s*\\{([^}]*)\\}`).exec(style)
|
||||
assert.ok(match !== null, `样式里应存在 ${selector} 规则`)
|
||||
return match[1] ?? ''
|
||||
}
|
||||
|
||||
function item(over: Partial<BreakdownItem> = {}): BreakdownItem {
|
||||
return {
|
||||
ledgerId: 1,
|
||||
sourceType: 'result',
|
||||
eventId: 1,
|
||||
eventCode: 'M100',
|
||||
eventName: '100米跑',
|
||||
categoryName: '男子',
|
||||
athleteId: 7,
|
||||
athleteName: '张伟',
|
||||
rank: 1,
|
||||
resultText: '11.58',
|
||||
points: 10,
|
||||
createdAt: '2026-09-13 10:00:00',
|
||||
revisionCount: null,
|
||||
lastRevisionAt: null,
|
||||
lastRevisionReason: null,
|
||||
lastRevisedBy: null,
|
||||
...over,
|
||||
}
|
||||
}
|
||||
|
||||
test('列头按「项目/组别 · 运动员 · 名次 · 成绩 · 积分」排列，运动员插在项目与名次之间', () => {
|
||||
const labels = [...HEAD_ROW.matchAll(/<span class="col-[a-z]+">([^<]*)<\/span>/g)].map((match) =>
|
||||
(match[1] ?? '').trim(),
|
||||
)
|
||||
assert.deepEqual(labels, ['项目 / 组别', '运动员', '名次', '成绩', '积分'])
|
||||
})
|
||||
|
||||
test('明细行渲染运动员格，绑定的是团队共用的降级函数', () => {
|
||||
const cells = cellsOf(BODY_ROW)
|
||||
assert.deepEqual(
|
||||
cells.map((cell) => cell.cls),
|
||||
['col-name', 'col-athlete', 'col-rank', 'col-result', 'col-points'],
|
||||
)
|
||||
assert.equal(cells[1]?.inner, '{{ breakdownAthleteName(item, teamName) }}')
|
||||
})
|
||||
|
||||
test('项目 / 名次 / 成绩 / 积分四列原样保留（是加列不是改列）', () => {
|
||||
const cells = cellsOf(BODY_ROW)
|
||||
assert.match(cells[0]?.inner ?? '', /item\.eventName \?\? '人工调整'/)
|
||||
assert.equal(cells[2]?.inner, "{{ item.rank ?? '—' }}")
|
||||
assert.equal(cells[3]?.inner, "{{ item.resultText ?? '—' }}")
|
||||
assert.equal(cells[4]?.inner, '{{ item.points }}')
|
||||
})
|
||||
|
||||
test('个人流水那一行大屏上看得见是谁：运动员格是姓名，四个老格子照旧', () => {
|
||||
const row = item()
|
||||
const rendered = [
|
||||
row.eventName ?? '人工调整',
|
||||
breakdownAthleteName(row, '第一分公司'),
|
||||
row.rank ?? '—',
|
||||
row.resultText ?? '—',
|
||||
row.points,
|
||||
]
|
||||
assert.deepEqual(rendered, ['100米跑', '张伟', 1, '11.58', 10])
|
||||
})
|
||||
|
||||
test('团体项目流水没有运动员名：降级成单位名，不出现空白格或 null', () => {
|
||||
const row = item({ athleteName: null, athleteId: null, sourceType: 'result' })
|
||||
const cell = breakdownAthleteName(row, '第一分公司')
|
||||
assert.equal(cell, '第一分公司')
|
||||
assert.doesNotMatch(cell, /null|undefined/)
|
||||
})
|
||||
|
||||
test('覆盖层是 16:9 右半屏：五列加间距放得下，姓名列留得够宽', () => {
|
||||
const row = cssRule(styleText(OVERLAY_SOURCE), '.row')
|
||||
const tracks = /grid-template-columns:\s*([^;]+);/.exec(row)
|
||||
assert.ok(tracks !== null, '.row 应声明 grid-template-columns')
|
||||
const parts = (tracks[1] ?? '').trim().split(/\s+(?![^(]*\))/)
|
||||
assert.equal(parts.length, 5, '五列：项目/组别、运动员、名次、成绩、积分')
|
||||
|
||||
const gap = Number(/gap:\s*(\d+)px/.exec(row)?.[1] ?? 0)
|
||||
const fixed = parts.reduce((sum, part) => sum + Number(/(\d+)px/.exec(part)?.[1] ?? 0), 0)
|
||||
// 1920 宽的 16:9 屏幕：覆盖层占右半边 960px，减去左右内边距 44px×2。
|
||||
const available = 960 - 44 * 2
|
||||
assert.ok(fixed + gap * (parts.length - 1) <= available, `五列 ${fixed}px + 间距会挤出右半屏`)
|
||||
|
||||
const nameTrack = /minmax\(0,\s*1fr\)/.test(parts[0] ?? '')
|
||||
assert.ok(nameTrack, '项目 / 组别列应可伸缩')
|
||||
const athleteWidth = Number(/(\d+)px/.exec(parts[1] ?? '')?.[1] ?? 0)
|
||||
assert.ok(athleteWidth >= 180, '运动员列至少 180px，单位名才不至于只剩几个字')
|
||||
|
||||
const athlete = cssRule(styleText(OVERLAY_SOURCE), '.col-athlete')
|
||||
assert.match(athlete, /text-overflow:\s*ellipsis/, '长姓名 / 单位名要省略号收尾')
|
||||
assert.match(athlete, /white-space:\s*nowrap/)
|
||||
})
|
||||
|
||||
/**
|
||||
* 「这几分怎么来的、有没有被改过」——大屏不能悬停，所以：
|
||||
* - 非普通成绩（破纪录加分）在项目名后面打一个来源小标签；
|
||||
* - 被改过的成绩多一行整行小字 `10:42 已修订（成绩录入笔误）`。
|
||||
*
|
||||
* 两处都只在需要时才渲染（v-if），没改过的行连元素都没有 —— 大屏行高与加这一行之前完全一致。
|
||||
*/
|
||||
test('来源标签只在非普通成绩时渲染，普通成绩不打（行高与列宽都不受影响）', () => {
|
||||
assert.match(BODY_ROW, /v-if="breakdownSourceTag\(item\)"/)
|
||||
assert.match(BODY_ROW, /<em v-if="breakdownSourceTag\(item\)" class="col-source">/)
|
||||
assert.equal(breakdownSourceTag(item()), '')
|
||||
// 大屏标签用短词：项目名后面那一行放不下「破纪录加分」五个字。
|
||||
assert.equal(breakdownSourceTag(item({ sourceType: 'record_bonus' })), '破纪录')
|
||||
})
|
||||
|
||||
test('修订小字占满一整行（grid-column: 1 / -1），不与五列抢宽度', () => {
|
||||
assert.match(BODY_ROW, /v-if="breakdownRevisionLine\(item\)"/)
|
||||
assert.match(BODY_ROW, /class="col-revision"/)
|
||||
assert.match(BODY_ROW, /\{\{ breakdownRevisionLine\(item\) \}\}/)
|
||||
const css = cssRule(styleText(OVERLAY_SOURCE), '.col-revision')
|
||||
assert.match(css, /grid-column:\s*1\s*\/\s*-1/, '修订小字要横跨整行，不能挤第六列')
|
||||
})
|
||||
|
||||
test('没改过的成绩不渲染小字，渲染出来的也只有一行短句', () => {
|
||||
assert.equal(breakdownRevisionLine(item()), '')
|
||||
const line = breakdownRevisionLine(
|
||||
item({ revisionCount: 1, lastRevisionAt: '2026-09-13 10:42:00', lastRevisionReason: '成绩录入笔误' }),
|
||||
)
|
||||
assert.doesNotMatch(line, /null|undefined|NaN|×1/)
|
||||
assert.ok(line.length <= 30, `大屏一行小字要短：${line}`)
|
||||
})
|
||||
@@ -1,7 +1,8 @@
|
||||
import { test } from 'node:test'
|
||||
import assert from 'node:assert/strict'
|
||||
import { readFileSync } from 'node:fs'
|
||||
import { parseAthleteStandings, parseStandingRows } from '../guards'
|
||||
import { breakdownRevisionBadge, breakdownRevisionLine } from '@/shared'
|
||||
import { parseAthleteStandings, parseStandingRows, parseTeamBreakdown } from '../guards'
|
||||
|
||||
/**
|
||||
* REST 兜底也要过 guards（P2 C39）。
|
||||
@@ -42,8 +43,73 @@ test('单位榜 REST 数据同样过 guards', () => {
|
||||
assert.equal(rows[0]?.rankChange, null)
|
||||
})
|
||||
|
||||
test('奖牌榜名次 medalRank 原样收下；旧服务端缺它时退回总榜 rank', () => {
|
||||
const withField = parseStandingRows([{ teamId: 1, rank: 4, medalRank: 1, gold: 2 }])
|
||||
assert.equal(withField[0]?.medalRank, 1)
|
||||
|
||||
// 旧服务端 / 老缓存里没有 medalRank：那时奖牌榜与积分榜同序，退回 rank 才是对的，不能给 0。
|
||||
const legacy = parseStandingRows([{ teamId: 1, rank: 4, gold: 2 }])
|
||||
assert.equal(legacy[0]?.medalRank, 4)
|
||||
})
|
||||
|
||||
test('loadRest 的两条路都走 guards，不再把裸值塞进 ref', () => {
|
||||
assert.match(USE_SCOREBOARD_SOURCE, /applyStandings\(parseStandingRows\(standingsResult\.value\)\)/)
|
||||
assert.match(USE_SCOREBOARD_SOURCE, /athletes\.value = parseAthleteStandings\(athletesResult\.value\)/)
|
||||
assert.doesNotMatch(USE_SCOREBOARD_SOURCE, /athletes\.value = athletesResult\.value/)
|
||||
})
|
||||
|
||||
/**
|
||||
* 修订痕迹也要过 guards：大屏是无人值守的，服务端（尤其升级前的老版本）不下发这几个字段时
|
||||
* 必须解析成 null（= 追不出来），绝不能让 undefined 漏进模板变成「已修订 ×undefined」。
|
||||
*/
|
||||
test('明细行的修订痕迹缺字段时收成 null，不显示角标', () => {
|
||||
const items = parseTeamBreakdown({
|
||||
teamId: 1,
|
||||
teamCode: 'A',
|
||||
teamName: '第一分公司',
|
||||
totalPoints: 10,
|
||||
items: [{ ledgerId: 1, sourceType: 'result', eventName: '100米跑', points: 10, createdAt: '' }],
|
||||
})?.items
|
||||
|
||||
const row = items?.[0]
|
||||
assert.equal(row?.revisionCount, null)
|
||||
assert.equal(row?.lastRevisionAt, null)
|
||||
assert.equal(row?.lastRevisionReason, null)
|
||||
assert.equal(row?.lastRevisedBy, null)
|
||||
assert.ok(row !== undefined)
|
||||
assert.equal(breakdownRevisionBadge(row), '')
|
||||
assert.equal(breakdownRevisionLine(row), '')
|
||||
})
|
||||
|
||||
test('明细行的修订痕迹在位时原样收下并渲染成小字', () => {
|
||||
const row = parseTeamBreakdown({
|
||||
teamId: 1,
|
||||
teamCode: 'A',
|
||||
teamName: '第一分公司',
|
||||
totalPoints: 10,
|
||||
items: [
|
||||
{
|
||||
ledgerId: 1,
|
||||
sourceType: 'result',
|
||||
eventName: '100米跑',
|
||||
points: 10,
|
||||
createdAt: '',
|
||||
revisionCount: 2,
|
||||
lastRevisionAt: '2026-09-13 02:42:00',
|
||||
lastRevisionReason: '成绩录入笔误',
|
||||
lastRevisedBy: '张三',
|
||||
},
|
||||
],
|
||||
})?.items[0]
|
||||
|
||||
assert.equal(row?.revisionCount, 2)
|
||||
assert.equal(breakdownRevisionBadge(row), '已修订 ×2')
|
||||
assert.match(breakdownRevisionLine(row), /^(\d{2}:\d{2} )?已修订 ×2（成绩录入笔误）$/)
|
||||
// 脏值（字符串 / 负数）不算「改过」，宁可不说也不能误报。
|
||||
const dirty = parseTeamBreakdown({
|
||||
teamId: 1, teamCode: 'A', teamName: 'A', totalPoints: 0,
|
||||
items: [{ ledgerId: 1, points: 0, revisionCount: 'x' }],
|
||||
})?.items[0]
|
||||
assert.ok(dirty !== undefined)
|
||||
assert.equal(breakdownRevisionBadge(dirty), '')
|
||||
})
|
||||
Reference in new issue
Block a user