@veltra/sheet 2.2.0 → 2.3.1

package/src/components/sheet/__test__/sheet-component.test.ts

@@ -258,6 +258,43 @@ describe('USheet 组件', () => {
     expect(gridAfter).not.toBe(gridBefore)
   })
 
+  it('showRowHeader/showColHeader 为 false 时隐藏行号与列头', async () => {
+    const workbook = createWorkbook()
+    const exposed: { value: SheetExposed | undefined } = { value: undefined }
+    mount(
+      () => ({ workbook, rows: 8, cols: 4, showRowHeader: false, showColHeader: false }),
+      exposed
+    )
+    await nextTick()
+
+    workbook.activeSheet.setCellValue({ row: 0, col: 0 }, 'A1')
+    await nextTick()
+    const table = exposed.value!.getGrid()!.getTable()
+    expect(table.options.showHeader).toBe(false)
+    expect(table.options.rowSeriesNumber).toBeUndefined()
+    expect(table.columnHeaderLevelCount).toBe(0)
+    expect(table.rowCount).toBe(8)
+    expect(table.getCellValue(0, 0)).toBe('A1')
+  })
+
+  it('删除行后渲染行数跟随模型收缩（不被 props.rows 撑回）', async () => {
+    const workbook = createWorkbook()
+    const exposed: { value: SheetExposed | undefined } = { value: undefined }
+    mount(() => ({ workbook, rows: 10, cols: 6 }), exposed)
+    await nextTick()
+
+    const sheet = exposed.value!.getActiveSheet()
+    expect(sheet.rows).toBe(10)
+    expect(exposed.value!.getGrid()!.getTable().rowCount).toBe(11) // 列头 + 10
+
+    sheet.deleteRows(0, 2)
+    await nextTick()
+    await nextTick()
+
+    expect(sheet.rows).toBe(8)
+    expect(exposed.value!.getGrid()!.getTable().rowCount).toBe(9) // 列头 + 8
+  })
+
   it('resolveCellStyle prop 传入 SheetGrid 视口渲染', async () => {
     const workbook = createWorkbook()
     const sheet = workbook.activeSheet

package/src/components/sheet/__test__/sheet-context-menu.test.ts

@@ -36,8 +36,9 @@ describe('sheet-context-menu helpers', () => {
     expect(isColInSelection(ranges, 6)).toBe(false)
   })
 
-  it('resolveRenderSize = max(props, sheet)', () => {
-    expect(resolveRenderSize(100, 26, 120, 10)).toEqual({ rows: 120, cols: 26 })
+  it('resolveRenderSize：模型已声明时以模型为准（可低于 props）', () => {
+    expect(resolveRenderSize(100, 26, 120, 10)).toEqual({ rows: 120, cols: 10 })
+    expect(resolveRenderSize(100, 26, 29, 26)).toEqual({ rows: 29, cols: 26 })
     expect(resolveRenderSize(undefined, undefined, 0, 0)).toEqual({ rows: 100, cols: 26 })
   })
 })

package/src/components/sheet/popups/border-popup.vue

@@ -40,7 +40,8 @@ import { buildBorderPresetItems } from '@veltra/sheet-core/core/style/border-pre
 import {
   BORDER_STYLE_WIDTH,
   type BorderEdge,
-  type BorderLineStyle
+  type BorderLineStyle,
+  type CellStylePatch
 } from '@veltra/sheet-core/core/style/types'
 import { bem } from '@veltra/utils'
 import { ref } from 'vue'
@@ -63,6 +64,7 @@ defineOptions({ name: 'USheetBorderPopup' })
  * 预设补丁由 core/style/border-presets 生成（含邻居格共享边同步，对齐
  * Excel「写入时同步、最近设置生效」）；面板打开期间的写入由
  * use-tool-popup 事务包裹为一个 undo 单元。
+ * 整行/整列选区下，均匀预设（all/none/单侧）走 applyStyle → 行列默认样式。
  */
 const props = defineProps<{
   /** 工具上下文（写入走命令系统，天然可撤销） */
@@ -75,7 +77,27 @@ const cls = bem('sheet')
 const borderLineStyle = ref<BorderLineStyle>('thin')
 const borderColor = ref('#000000')
 
-/** 应用边框预设：一次 executeCommand（items 批量，含邻居同步补丁）= 一个 undo 单元 */
+/** 均匀边框补丁（可写进行/列默认样式）；outer/inner 几何相关 → null */
+function uniformBorderPatch(preset: BorderPresetId, edge: BorderEdge): CellStylePatch | null {
+  switch (preset) {
+    case 'all':
+      return { border: { top: edge, right: edge, bottom: edge, left: edge } }
+    case 'none':
+      return { border: { top: null, right: null, bottom: null, left: null } }
+    case 'top':
+      return { border: { top: edge } }
+    case 'bottom':
+      return { border: { bottom: edge } }
+    case 'left':
+      return { border: { left: edge } }
+    case 'right':
+      return { border: { right: edge } }
+    default:
+      return null
+  }
+}
+
+/** 应用边框预设：整行/整列均匀预设走 applyStyle；其余逐格批量（含邻居同步） */
 function applyBorderPreset(preset: BorderPresetId): void {
   const range = currentRange(props.context)
   if (!range) return
@@ -84,8 +106,14 @@ function applyBorderPreset(preset: BorderPresetId): void {
     width: BORDER_STYLE_WIDTH[borderLineStyle.value],
     color: borderColor.value
   }
+  const target = props.context.resolveStyleTarget(range)
+  const uniform = target !== 'cell' ? uniformBorderPatch(preset, edge) : null
+  if (uniform) {
+    props.context.applyStyle(range, uniform)
+    return
+  }
   const items: SetCellStyleItem[] = buildBorderPresetItems(range, preset, edge, (addr) =>
-    props.context.getCellStyle(addr)
+    props.context.getEffectiveStyle(addr)
   ).map(({ addr, patch }) => ({ addr, partial: patch }))
   if (items.length === 0) return
   props.context.executeCommand('sheet.command.set-cell-style', { items })

package/src/components/sheet/popups/fill-color-popup.vue

@@ -21,19 +21,20 @@ const props = defineProps<{
 }>()
 
 /** 填充颜色（'' = 无填充） */
-const fillColor = ref('')
+const fillColor = ref<string>()
 
 // 打开时初始化为活动格当前填充色
 onMounted(() => {
   const active = props.context.getSelection().activeCell
-  const style = active ? props.context.getCellStyle(active) : undefined
+  const style = active ? props.context.getEffectiveStyle(active) : undefined
   fillColor.value = style?.fill?.color ?? ''
 })
 
 /** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
-function applyFillColor(color: string): void {
+function applyFillColor(color?: string): void {
+  fillColor.value = color
   const range = currentRange(props.context)
   if (!range) return
-  props.context.setCellStyle(range, color ? { fill: { color } } : { fill: {} })
+  props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} })
 }
 </script>

package/src/components/sheet/popups/font-color-popup.vue

@@ -26,7 +26,7 @@ const fontColor = ref('')
 // 打开时初始化为活动格当前字体色
 onMounted(() => {
   const active = props.context.getSelection().activeCell
-  const style = active ? props.context.getCellStyle(active) : undefined
+  const style = active ? props.context.getEffectiveStyle(active) : undefined
   fontColor.value = style?.font?.color ?? ''
 })
 
@@ -34,6 +34,6 @@ onMounted(() => {
 function applyFontColor(color: string): void {
   const range = currentRange(props.context)
   if (!range) return
-  props.context.setCellStyle(range, color ? { font: { color } } : { font: { color: null } })
+  props.context.applyStyle(range, color ? { font: { color } } : { font: { color: null } })
 }
 </script>

package/src/components/sheet/popups/font-size-popup.vue

@@ -39,7 +39,7 @@ const currentSize = ref<number | undefined>(undefined)
 
 onMounted(() => {
   const active = props.context.getSelection().activeCell
-  const style = active ? props.context.getCellStyle(active) : undefined
+  const style = active ? props.context.getEffectiveStyle(active) : undefined
   currentSize.value = style?.font?.size
 })
 
@@ -47,6 +47,6 @@ function applyFontSize(size: number): void {
   const range = currentRange(props.context)
   if (!range) return
   currentSize.value = size
-  props.context.setCellStyle(range, { font: { size } })
+  props.context.applyStyle(range, { font: { size } })
 }
 </script>

package/src/components/sheet/sheet-context-menu.ts

@@ -39,14 +39,20 @@ export function wholeColRange(col: number, rowCount: number): CellRange {
   return createRange({ row: 0, col }, { row: Math.max(rowCount - 1, 0), col })
 }
 
-/** 渲染尺寸 = max(props, sheet.rows/cols)，与 SheetGrid 一致 */
+/**
+ * 渲染尺寸：模型已声明时以模型为准（删行可低于 props）；未声明时回落 props。
+ * 与 SheetGrid / useSheetGrid 一致——避免 ensureTableSize(props) 把删行结果撑回。
+ */
 export function resolveRenderSize(
   propsRows: number | undefined,
   propsCols: number | undefined,
   sheetRows: number,
   sheetCols: number
 ): { rows: number; cols: number } {
-  return { rows: Math.max(propsRows ?? 100, sheetRows), cols: Math.max(propsCols ?? 26, sheetCols) }
+  return {
+    rows: sheetRows > 0 ? sheetRows : (propsRows ?? 100),
+    cols: sheetCols > 0 ? sheetCols : (propsCols ?? 26)
+  }
 }
 
 function insertCountRender(options: {

package/src/components/sheet/sheet.vue

@@ -103,6 +103,8 @@ const props = withDefaults(defineProps<SheetProps>(), {
   showToolbar: true,
   showFormulaBar: true,
   showTabs: true,
+  showRowHeader: true,
+  showColHeader: true,
   readonly: false
 })
 

package/src/components/sheet/use-sheet-grid.ts

@@ -109,12 +109,16 @@ export function useSheetGrid(options: UseSheetGridOptions) {
     const el = document.createElement('div')
     el.className = 'u-sheet__grid-instance'
     host.appendChild(el)
+    // 模型已声明尺寸时传入模型值，避免删行后被 props 经 ensureTableSize 撑回
+    const { rows, cols } = resolveRenderSize(props.rows, props.cols, sheet.rows, sheet.cols)
     const grid = new SheetGrid({
       container: el,
       sheet,
-      rows: props.rows,
-      cols: props.cols,
+      rows,
+      cols,
       readonly: props.readonly,
+      showRowHeader: props.showRowHeader,
+      showColHeader: props.showColHeader,
       resolveDisplayValue: props.resolveDisplayValue,
       resolveCellStyle: props.resolveCellStyle,
       resolveCellRenderer: props.resolveCellRenderer,
@@ -237,7 +241,17 @@ export function useSheetGrid(options: UseSheetGridOptions) {
 
   onMounted(activateGrid)
 
-  watch(() => [props.rows, props.cols, props.readonly], rebuildGrid)
+  // props 尺寸显式增大时先扩张模型，再重建（删行缩小不走这条路径）
+  watch(
+    () =>
+      [props.rows, props.cols, props.readonly, props.showRowHeader, props.showColHeader] as const,
+    ([nextRows, nextCols]) => {
+      const sheet = getActiveSheet()
+      if (nextRows != null) sheet.ensureTableSize(nextRows, 0)
+      if (nextCols != null) sheet.ensureTableSize(0, nextCols)
+      rebuildGrid()
+    }
+  )
 
   onBeforeUnmount(() => {
     invalidateAll()

package/src/components/sheet/use-sheet-state.ts

@@ -5,6 +5,7 @@ import { computed, onBeforeUnmount, onMounted, ref, shallowRef, watch } from 'vu
 import { createSheetContext } from '../../tools/context'
 import { defaultToolRegistry } from '../../tools/registry'
 import type { SheetProps } from '../../types'
+import { resolveRenderSize } from './sheet-context-menu'
 
 /**
  * useSheetState 与宿主组件的协作钩子。
@@ -44,10 +45,14 @@ export function useSheetState(props: SheetProps, emit: Emit, hooks: SheetStateHo
     () => sheetList.value[activeIndex.value] ?? workbook.value.activeSheet
   )
 
-  /** 工具上下文：动态解析活动 sheet 与当前工作簿，tab 切换 / workbook prop 切换后自动指向最新值 */
+  /** 工具上下文：动态解析活动 sheet / 工作簿 / 渲染尺寸，tab 切换后自动指向最新值 */
   const context = createSheetContext(
     () => activeSheet.value,
-    () => workbook.value
+    () => workbook.value,
+    {
+      resolveGridSize: () =>
+        resolveRenderSize(props.rows, props.cols, activeSheet.value.rows, activeSheet.value.cols)
+    }
   )
 
   /** 工具栏状态版本号：visible/disabled/active 是 (ctx) => boolean 纯函数，状态源变化时 bump 触发重算 */
@@ -80,7 +85,7 @@ export function useSheetState(props: SheetProps, emit: Emit, hooks: SheetStateHo
       // 整表内容替换（导入 / undo/redo 回放）：restore 静默不发 cell-change，
       // 状态源需 bump（grid 层自行订阅 content-reset 全量刷新，此处不重建）
       sheet.on('content-reset', scheduleBump),
-      // 行列插入/删除 → 重建网格（渲染行列数 = max(props, sheet.rows/cols)，
+      // 行列插入/删除 → 重建网格（渲染行列数跟随模型 sheet.rows/cols，
       // 数据/选区/冻结/行高随重建恢复；低频操作直接重建）
       sheet.on('structure-change', hooks.rebuildGrid)
     ]

package/src/report/__test__/binding.test.ts

@@ -6,11 +6,15 @@ import {
   createReportBinding,
   formatBindingPlaceholder,
   formatCellAddress,
+  inferColParentCandidate,
   inferDropPreset,
+  inferParentsForPreset,
   inferReportPreset,
+  inferRowParentCandidate,
   isExpansionBandRow,
   parseCellAddress,
   presetBindingPatch,
+  presetStillApplies,
   setBindingCatalog
 } from '../binding'
 import type { DatasetCatalogItem, ReportBinding } from '../types'
@@ -180,7 +184,32 @@ describe('report binding', () => {
         expand: 'none',
         rowParent: { row: 1, col: 0 }
       })
-    ).toBeNull()
+    ).toBe('subtotal')
+
+    expect(
+      inferReportPreset({
+        dataset: 'orders',
+        field: 'amount',
+        aggregate: 'sum',
+        expand: 'none',
+        colParent: { row: 0, col: 1 }
+      })
+    ).toBe('subtotal')
+  })
+
+  it('presetStillApplies 同族内改聚合仍成立', () => {
+    const subtotal: ReportBinding = {
+      dataset: 'orders',
+      field: 'amount',
+      preset: 'subtotal',
+      aggregate: 'avg',
+      expand: 'none',
+      rowParent: { row: 1, col: 0 }
+    }
+    expect(presetStillApplies(subtotal)).toBe(true)
+
+    const broken = { ...subtotal, aggregate: 'list' as const, expand: 'down' as const }
+    expect(presetStillApplies(broken)).toBe(false)
   })
 
   it('inferDropPreset / isExpansionBandRow 落格推断', () => {
@@ -200,6 +229,79 @@ describe('report binding', () => {
     expect(inferDropPreset({ row: 2, col: 0 }, 'string', getBindingAt)).toBe('detail')
   })
 
+  it('inferDropPreset：数值字段落在横向展开带正右相邻列也推断为小计', () => {
+    const colGroup = createReportBinding(ORDERS_DATASET, 'region')
+    colGroup.aggregate = 'group'
+    colGroup.expand = 'right'
+
+    const getBindingAt = (addr: CellAddress) => {
+      if (addr.row === 0 && addr.col === 1) return colGroup
+      return undefined
+    }
+
+    expect(inferDropPreset({ row: 0, col: 2 }, 'number', getBindingAt)).toBe('subtotal')
+    expect(inferDropPreset({ row: 0, col: 2 }, 'string', getBindingAt)).toBe('detail')
+  })
+
+  it('inferRowParentCandidate：同行向左优先分组头', () => {
+    const group = createReportBinding(ORDERS_DATASET, 'customer')
+    group.aggregate = 'group'
+    group.expand = 'down'
+    const detail = createReportBinding(ORDERS_DATASET, 'orderNo')
+
+    const getBindingAt = (addr: CellAddress) => {
+      if (addr.row === 1 && addr.col === 0) return group
+      if (addr.row === 1 && addr.col === 1) return detail
+      return undefined
+    }
+
+    expect(inferRowParentCandidate({ row: 1, col: 2 }, getBindingAt)).toEqual({ row: 1, col: 0 })
+  })
+
+  it('inferRowParentCandidate：下方跨列小计推到行分组头而不是同列 list', () => {
+    const group = createReportBinding(ORDERS_DATASET, 'customer')
+    group.aggregate = 'group'
+    group.expand = 'down'
+    const detail = createReportBinding(ORDERS_DATASET, 'amount')
+
+    const getBindingAt = (addr: CellAddress) => {
+      if (addr.row === 1 && addr.col === 0) return group
+      if (addr.row === 1 && addr.col === 2) return detail
+      return undefined
+    }
+
+    expect(
+      inferRowParentCandidate({ row: 2, col: 2 }, getBindingAt, { preferGroup: true })
+    ).toEqual({ row: 1, col: 0 })
+    expect(inferParentsForPreset({ row: 2, col: 2 }, 'subtotal', getBindingAt)).toEqual({
+      rowParent: { row: 1, col: 0 }
+    })
+  })
+
+  it('inferColParentCandidate：右侧列小计同列向上推到列分组头', () => {
+    const colGroup = createReportBinding(ORDERS_DATASET, 'region')
+    colGroup.aggregate = 'group'
+    colGroup.expand = 'right'
+    const cross = createReportBinding(ORDERS_DATASET, 'amount')
+    cross.preset = 'cross'
+    cross.aggregate = 'sum'
+    cross.expand = 'none'
+    cross.colParent = { row: 0, col: 1 }
+
+    const getBindingAt = (addr: CellAddress) => {
+      if (addr.row === 0 && addr.col === 1) return colGroup
+      if (addr.row === 1 && addr.col === 1) return cross
+      return undefined
+    }
+
+    expect(
+      inferColParentCandidate({ row: 2, col: 1 }, getBindingAt, { preferGroup: true })
+    ).toEqual({ row: 0, col: 1 })
+    expect(inferParentsForPreset({ row: 2, col: 1 }, 'subtotal', getBindingAt)).toEqual({
+      colParent: { row: 0, col: 1 }
+    })
+  })
+
   it('formatCellAddress / parseCellAddress 支持多字母列互逆', () => {
     const single = { row: 2, col: 1 }
     expect(formatCellAddress(single)).toBe('B3')

package/src/report/__test__/connector.test.ts

@@ -84,6 +84,27 @@ describe('createHttpConnector', () => {
     expect(calls[0]!.body).toEqual({ connection: CONNECTION, sql: SQL })
   })
 
+  it('describe：服务端返回 label 时保留中文显示名', async () => {
+    stubFetch(async () => ({
+      ok: true,
+      fields: [
+        { name: 'customer', label: '客户名称', type: 'string' },
+        { name: 'amount', label: '金额', type: 'number' }
+      ]
+    }))
+    const connector = createHttpConnector({ endpoint: ENDPOINT })
+
+    const result = await connector.describe(CONNECTION, SQL)
+
+    expect(result).toEqual({
+      ok: true,
+      data: [
+        { name: 'customer', label: '客户名称', type: 'string' },
+        { name: 'amount', label: '金额', type: 'number' }
+      ]
+    })
+  })
+
   it('query：POST {endpoint}/query，请求体 { connection, sql, values }，返回 fields + rows', async () => {
     const calls = stubFetch(async () => ({
       ok: true,

package/src/report/__test__/export-xlsx.test.ts

@@ -60,10 +60,10 @@ function buildFilledSheet(): Sheet {
 
 describe('exportFilledReportXlsx', () => {
   it('导出保真 XLSX：值 / 表头样式 / 条件样式打平后随快照导出', async () => {
-    const buffer = await exportFilledReportXlsx(buildFilledSheet(), [
-      [0, 120],
-      [1, 140]
-    ])
+    const filled = buildFilledSheet()
+    filled.setColWidth(0, 120)
+    filled.setColWidth(1, 140)
+    const buffer = await exportFilledReportXlsx(filled)
 
     // 合法 ZIP（xlsx）字节
     expect(buffer[0]).toBe(0x50)

package/src/report/__test__/render.test.ts

@@ -725,4 +725,106 @@ describe('renderReport', () => {
       ])
     )
   })
+
+  it('跨列行小计按组求和，不是全表合计', () => {
+    const sheet = new Sheet()
+    sheet.setCells([{ addr: { row: 0, col: 0 }, data: { v: '客户' } }])
+    const groupParent = { row: 1, col: 0 }
+
+    const customerGroup = createReportBinding(ORDERS_DATASET, 'customer')
+    customerGroup.preset = 'groupHeader'
+    customerGroup.aggregate = 'group'
+    customerGroup.expand = 'down'
+    sheet.setCellMeta(groupParent, REPORT_META_NAMESPACE, customerGroup)
+
+    const orderNo = createReportBinding(ORDERS_DATASET, 'orderNo')
+    orderNo.rowParent = groupParent
+    sheet.setCellMeta({ row: 1, col: 1 }, REPORT_META_NAMESPACE, orderNo)
+
+    const amount = createReportBinding(ORDERS_DATASET, 'amount')
+    amount.rowParent = groupParent
+    sheet.setCellMeta({ row: 1, col: 2 }, REPORT_META_NAMESPACE, amount)
+
+    const subtotal = createReportBinding(ORDERS_DATASET, 'amount')
+    subtotal.preset = 'subtotal'
+    subtotal.aggregate = 'sum'
+    subtotal.expand = 'none'
+    subtotal.rowParent = groupParent
+    sheet.setCellMeta({ row: 2, col: 2 }, REPORT_META_NAMESPACE, subtotal)
+
+    const filled = renderReport(sheet.snapshot(), MOCK_DATA_RECORDS)
+    expect(cellValue(filled, 5, 2)).toBe(630)
+    expect(cellValue(filled, 10, 2)).toBe(1050)
+    expect(cellValue(filled, 5, 2)).not.toBe(4180)
+  })
+
+  it('跨列行小计误挂明细时仍按分组祖先过滤', () => {
+    const sheet = new Sheet()
+    sheet.setCells([{ addr: { row: 0, col: 0 }, data: { v: '客户' } }])
+    const groupParent = { row: 1, col: 0 }
+    const listAddr = { row: 1, col: 2 }
+
+    const customerGroup = createReportBinding(ORDERS_DATASET, 'customer')
+    customerGroup.preset = 'groupHeader'
+    customerGroup.aggregate = 'group'
+    customerGroup.expand = 'down'
+    sheet.setCellMeta(groupParent, REPORT_META_NAMESPACE, customerGroup)
+
+    const amount = createReportBinding(ORDERS_DATASET, 'amount')
+    amount.rowParent = groupParent
+    sheet.setCellMeta(listAddr, REPORT_META_NAMESPACE, amount)
+
+    const subtotal = createReportBinding(ORDERS_DATASET, 'amount')
+    subtotal.preset = 'subtotal'
+    subtotal.aggregate = 'sum'
+    subtotal.expand = 'none'
+    subtotal.rowParent = listAddr
+    sheet.setCellMeta({ row: 2, col: 2 }, REPORT_META_NAMESPACE, subtotal)
+
+    const filled = renderReport(sheet.snapshot(), MOCK_DATA_RECORDS)
+    expect(cellValue(filled, 5, 2)).toBe(630)
+    expect(cellValue(filled, 10, 2)).toBe(1050)
+  })
+
+  it('交叉列小计仅 colParent 时按列分组求和，不是全表合计', () => {
+    const sheet = new Sheet()
+    const colGroupAddr = { row: 0, col: 1 }
+    const rowGroupAddr = { row: 1, col: 0 }
+
+    const categoryGroup = createReportBinding(SALES_MATRIX_DATASET, 'category')
+    categoryGroup.preset = 'groupHeader'
+    categoryGroup.aggregate = 'group'
+    categoryGroup.expand = 'right'
+    sheet.setCellMeta(colGroupAddr, REPORT_META_NAMESPACE, categoryGroup)
+
+    const regionGroup = createReportBinding(SALES_MATRIX_DATASET, 'region')
+    regionGroup.preset = 'groupHeader'
+    regionGroup.aggregate = 'group'
+    regionGroup.expand = 'down'
+    sheet.setCellMeta(rowGroupAddr, REPORT_META_NAMESPACE, regionGroup)
+
+    const cross = createReportBinding(SALES_MATRIX_DATASET, 'amount')
+    cross.preset = 'cross'
+    cross.aggregate = 'sum'
+    cross.expand = 'none'
+    cross.rowParent = rowGroupAddr
+    cross.colParent = colGroupAddr
+    sheet.setCellMeta({ row: 1, col: 1 }, REPORT_META_NAMESPACE, cross)
+
+    const colSubtotal = createReportBinding(SALES_MATRIX_DATASET, 'amount')
+    colSubtotal.preset = 'subtotal'
+    colSubtotal.aggregate = 'sum'
+    colSubtotal.expand = 'none'
+    colSubtotal.colParent = colGroupAddr
+    sheet.setCellMeta({ row: 2, col: 1 }, REPORT_META_NAMESPACE, colSubtotal)
+
+    const filled = renderReport(sheet.snapshot(), { 'sales-matrix': SALES_MATRIX_ROWS })
+    const officeTotal = SALES_MATRIX_ROWS.filter((row) => row.category === '办公设备').reduce(
+      (sum, row) => sum + (row.amount as number),
+      0
+    )
+    const grandTotal = SALES_MATRIX_ROWS.reduce((sum, row) => sum + (row.amount as number), 0)
+    expect(cellValue(filled, 5, 1)).toBe(officeTotal)
+    expect(cellValue(filled, 5, 1)).not.toBe(grandTotal)
+  })
 })

package/src/report/__test__/template.test.ts

@@ -105,6 +105,17 @@ describe('ReportTemplate version', () => {
     expect(template.version).toBe(REPORT_TEMPLATE_VERSION)
   })
 
+  it('createReportTemplate 继承 snapshot.colWidths', () => {
+    const sheet = new Sheet()
+    sheet.setColWidth(0, 120)
+    sheet.setColWidth(2, 90)
+    const template = createReportTemplate(sheet.snapshot(), [ORDERS_DATASET])
+    expect(template.colWidths).toEqual([
+      [0, 120],
+      [2, 90]
+    ])
+  })
+
   it('version 缺失时 assertCompatibleTemplateVersion 抛可读错误', () => {
     const sheet = new Sheet()
     const template = sheet.snapshot() as ReportTemplate