Skip to content

fix(token-stats): render model composition as SVG solid pie #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cocofhu merged 1 commit into from
Jul 31, 2026
+145 −28
Merged

fix(token-stats): render model composition as SVG solid pie #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 66 additions & 15 deletions web/src/components/board/token-stats/TokenModelComposition.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ const i18n = () =>
messages: { 'zh-CN': { ...common, ...pages } },
})

describe('TokenModelComposition solid pie (g1.1/g1.2/g1.3)', () => {
it('renders solid pie without inset donut hole (g1.1)', () => {
describe('TokenModelComposition SVG solid pie (g1/g2)', () => {
it('renders svg/path solid pie without conic-gradient or rounded-full (g1.1/g1.2/g2.1)', () => {
const wrapper = mount(TokenModelComposition, {
props: {
models: [{ modelKey: '未知/未分桶', name: '未知/未分桶', total: 1056, unknown: true }],
Expand All @@ -24,15 +24,20 @@ describe('TokenModelComposition solid pie (g1.1/g1.2/g1.3)', () => {
})
const pie = wrapper.find('[data-testid="token-model-pie"]')
expect(pie.exists()).toBe(true)
const style = (pie.element as HTMLElement).style
expect(style.background).toMatch(/conic-gradient/i)
// Demo alignment: solid pie — no inset box-shadow hole
expect(style.boxShadow).toBe('')
expect(pie.find('svg').exists()).toBe(true)
const paths = pie.findAll('path')
expect(paths.length).toBeGreaterThanOrEqual(1)
// Solid pie: path starts from center (M cx cy L …), not a donut ring
expect(paths[0]!.attributes('d')).toMatch(/^M\s+55\s+55\s+L/)
expect(wrapper.html()).not.toMatch(/conic-gradient/i)
expect(wrapper.html()).not.toMatch(/rounded-full/)
expect(wrapper.html()).not.toMatch(/inset\s+0\s+0\s+0\s+28px/)
// No inner hole circle masking the center
expect(pie.findAll('circle').length).toBe(0)
wrapper.unmount()
})

it('unknown-only bucket: 100% solid unknown color #71717A (g1.2)', () => {
it('unknown-only near-full circle: solid #71717A path + legend 100% (g1.2/g2.2)', () => {
const unknown = { modelKey: '未知/未分桶', name: '未知/未分桶', total: 1056240000, unknown: true }
expect(colorForModel(unknown, 0)).toBe('#71717A')

Expand All @@ -41,16 +46,43 @@ describe('TokenModelComposition solid pie (g1.1/g1.2/g1.3)', () => {
global: { plugins: [i18n()] },
})
const pie = wrapper.find('[data-testid="token-model-pie"]')
expect((pie.element as HTMLElement).style.background).toContain('#71717A')
const path = pie.find('path')
expect(path.exists()).toBe(true)
expect(path.attributes('fill')).toBe('#71717A')
// Full circle uses two semicircle arcs (Demo describeSlice)
expect(path.attributes('d')).toMatch(/A\s+55\s+55\s+0\s+1\s+1/)
const legend = wrapper.find('[data-testid="token-model-legend"]')
expect(legend.text()).toContain('未知/未分桶')
expect(legend.text()).toContain('100%')
expect(legend.text()).toContain('1056.24M')
// Single-color full circle is expected data presentation, not a style defect
wrapper.unmount()
})

it('multi-bucket: solid sectors keep unknown #71717A and other #A1A1AA (g1.3/g2.1)', () => {
it('thin wedge + dominant bucket: circular solid sectors (g2.2 attach-like)', () => {
const models = [
{ modelKey: 'cursor-grok', name: 'cursor-grok-4.5-high-fast', total: 50090000, filled: true },
{ modelKey: '未知/未分桶', name: '未知/未分桶', total: 1059710000, unknown: true },
]
const wrapper = mount(TokenModelComposition, {
props: { models },
global: { plugins: [i18n()] },
})
const pie = wrapper.find('[data-testid="token-model-pie"]')
const paths = pie.findAll('[data-testid="token-model-pie-slice"]')
expect(paths.length).toBe(2)
expect(paths.every((p) => p.attributes('d')?.startsWith('M 55 55'))).toBe(true)
expect(paths[0]!.attributes('fill')).toBe(colorForModel(models[0]!, 0))
expect(paths[1]!.attributes('fill')).toBe('#71717A')
const legend = wrapper.find('[data-testid="token-model-legend"]').text()
expect(legend).toContain('4.5%')
expect(legend).toContain('95.5%')
expect(legend).toContain('50.09M')
expect(legend).toContain('1059.71M')
expect(wrapper.html()).not.toMatch(/conic-gradient/i)
wrapper.unmount()
})

it('multi-bucket: svg sectors keep unknown #71717A and other #A1A1AA (g1.3/g2.1/g2.2)', () => {
const models = [
{ modelKey: 'claude-sonnet-4', name: 'claude-sonnet-4', total: 600, filled: true },
{ modelKey: '未知/未分桶', name: '未知/未分桶', total: 300, unknown: true },
Expand All @@ -64,15 +96,34 @@ describe('TokenModelComposition solid pie (g1.1/g1.2/g1.3)', () => {
global: { plugins: [i18n()] },
})
const pie = wrapper.find('[data-testid="token-model-pie"]')
const bg = (pie.element as HTMLElement).style.background
expect(bg).toMatch(/conic-gradient/i)
expect(bg).toContain('#71717A')
expect(bg).toContain('#A1A1AA')
expect((pie.element as HTMLElement).style.boxShadow).toBe('')
const paths = pie.findAll('path')
expect(paths.length).toBe(3)
const fills = paths.map((p) => p.attributes('fill'))
expect(fills).toContain('#71717A')
expect(fills).toContain('#A1A1AA')
expect(pie.findAll('circle').length).toBe(0)
const legend = wrapper.find('[data-testid="token-model-legend"]').text()
expect(legend).toContain('未知/未分桶')
expect(legend).toContain('other')
expect(legend).toContain('claude-sonnet-4')
// Layout: square swatches in legend, left pie + right legend grid
expect(wrapper.find('[data-testid="token-model-composition"]').classes()).toContain('sm:grid-cols-[120px_1fr]')
const swatch = wrapper.find('[data-testid="token-model-legend"] span.h-2\\.5')
expect(swatch.exists()).toBe(true)
wrapper.unmount()
})

it('empty models: elevated circle placeholder, no square conic block (g2.2)', () => {
const wrapper = mount(TokenModelComposition, {
props: { models: [] },
global: { plugins: [i18n()] },
})
const pie = wrapper.find('[data-testid="token-model-pie"]')
expect(pie.find('svg').exists()).toBe(true)
expect(pie.findAll('path').length).toBe(0)
expect(pie.find('circle').exists()).toBe(true)
expect(wrapper.html()).not.toMatch(/conic-gradient/i)
expect(wrapper.find('[data-testid="token-model-legend"]').text()).toMatch(/./)
wrapper.unmount()
})
})
92 changes: 79 additions & 13 deletions web/src/components/board/token-stats/TokenModelComposition.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ const props = defineProps<{

const { t } = useI18n()

const SIZE = 110
const CX = SIZE / 2
const CY = SIZE / 2
const R = SIZE / 2

const total = computed(() => props.models.reduce((s, m) => s + (m.total || 0), 0))

const rows = computed(() => {
Expand All @@ -22,30 +27,91 @@ const rows = computed(() => {
}))
})

const pieStops = computed(() => {
let acc = 0
function polar(cx: number, cy: number, r: number, angleDeg: number) {
const rad = ((angleDeg - 90) * Math.PI) / 180
return { x: cx + r * Math.cos(rad), y: cy + r * Math.sin(rad) }
}

/** Solid pie slice from center (Demo / StatsPieChart-aligned). Full circle = two semicircles. */
function describeSlice(cx: number, cy: number, r: number, startDeg: number, endDeg: number): string {
if (endDeg - startDeg >= 359.999) {
const mid = polar(cx, cy, r, startDeg + 180)
const end = polar(cx, cy, r, startDeg + 360)
const start = polar(cx, cy, r, startDeg)
return [
`M ${cx} ${cy}`,
`L ${start.x} ${start.y}`,
`A ${r} ${r} 0 1 1 ${mid.x} ${mid.y}`,
`A ${r} ${r} 0 1 1 ${end.x} ${end.y}`,
'Z',
].join(' ')
}
const start = polar(cx, cy, r, startDeg)
const end = polar(cx, cy, r, endDeg)
const large = endDeg - startDeg > 180 ? 1 : 0
return [
`M ${cx} ${cy}`,
`L ${start.x} ${start.y}`,
`A ${r} ${r} 0 ${large} 1 ${end.x} ${end.y}`,
'Z',
].join(' ')
}

const slices = computed(() => {
const sum = total.value
if (sum <= 0) return 'rgb(var(--c-elevated)) 0% 100%'
return rows.value
.map((r) => {
const start = acc
acc += (r.total / sum) * 100
return `${r.color} ${start.toFixed(2)}% ${acc.toFixed(2)}%`
if (sum <= 0) return [] as { key: string; d: string; color: string }[]
let angle = 0
const out: { key: string; d: string; color: string }[] = []
rows.value.forEach((r, i) => {
const sweep = ((r.total || 0) / sum) * 360
if (sweep <= 0) return
out.push({
key: `${r.modelKey || r.name}-${i}`,
d: describeSlice(CX, CY, R, angle, angle + sweep),
color: r.color,
})
.join(', ')
angle += sweep
})
return out
})
</script>

<template>
<div data-testid="token-model-composition" class="grid gap-3 sm:grid-cols-[120px_1fr] sm:items-center">
<!-- Solid pie (Demo-aligned): no inset hole / donut ring -->
<!-- SVG solid pie: path geometry ignores global border-radius:0 (Demo「修复后」) -->
<div
class="mx-auto h-[110px] w-[110px] rounded-full"
class="mx-auto h-[110px] w-[110px]"
data-testid="token-model-pie"
:style="{ background: `conic-gradient(${pieStops})` }"
role="img"
:aria-label="t('pages.board.tokenStats.modelCompositionTitle')"
/>
>
<svg
v-if="slices.length"
class="block h-full w-full"
:viewBox="`0 0 ${SIZE} ${SIZE}`"
width="110"
height="110"
aria-hidden="true"
>
<path
v-for="s in slices"
:key="s.key"
:d="s.d"
:fill="s.color"
data-testid="token-model-pie-slice"
/>
</svg>
<svg
v-else
class="block h-full w-full"
:viewBox="`0 0 ${SIZE} ${SIZE}`"
width="110"
height="110"
aria-hidden="true"
>
<circle :cx="CX" :cy="CY" :r="R" fill="rgb(var(--c-elevated))" />
</svg>
</div>
<ul class="m-0 grid list-none gap-1.5 p-0" data-testid="token-model-legend">
<li
v-for="(r, i) in rows"
Expand Down
Loading