@veltra/sheet 2.2.0 → 2.3.0

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