@veltra/sheet 2.2.0 → 2.3.0

package/src/components/report/style-designer.scss

@@ -62,6 +62,22 @@
     min-width: 0;
   }
 
+  @include m.e(pick-hint) {
+    position: absolute;
+    left: 50%;
+    bottom: fn.use-var(gap, small);
+    z-index: 17;
+    transform: translateX(-50%);
+    padding: 4px fn.use-var(gap, small);
+    border-radius: fn.use-var(radius, default);
+    background: color-mix(in srgb, fn.use-var(bg-color, top) 92%, transparent);
+    border: 1px dashed fn.use-var(color, primary);
+    font-size: fn.use-var(font-size-main, small);
+    color: fn.use-var(text-color, second);
+    pointer-events: none;
+    white-space: nowrap;
+  }
+
   /* 数据中枢 drawer 面板宽度（class 经 $attrs 落到 .u-drawer 面板；须压过 .u-drawer.is-right 的 320px） */
   @include m.e(hub-drawer) {
     &.u-drawer {
@@ -123,7 +139,7 @@
   }
 }
 
-/* Action Pill：选中绑定格上方的悬浮编辑卡（角色 / 聚合 / 条件样式 / 排序 / 清除绑定） */
+/* Action Pill：选中绑定格上方的悬浮编辑卡（预设 + 互补的展开/聚合 / 条件样式 / 排序 / 清除绑定） */
 @include m.b(report-float-panel) {
   position: absolute;
   z-index: 18;
@@ -223,7 +239,7 @@
   }
 
   @include m.e(parent-select) {
-    width: 88px;
+    width: 180px;
     flex: none;
   }
 
@@ -244,11 +260,12 @@
 @include m.b(report-rules-dialog) {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 10px;
 
   @include m.e(hint) {
     margin: 0;
     font-size: 12px;
+    line-height: 1.5;
     color: fn.use-var(text-color, second);
   }
 
@@ -278,17 +295,18 @@
   display: flex;
   align-items: flex-start;
   gap: 8px;
-  padding: 10px;
+  padding: 10px 10px 10px 6px;
   border: fn.use-var(border-muted);
   border-radius: 8px;
-  background: fn.use-var(bg-color, top);
+  background: fn.use-var(bg-color, middle);
 
   @include m.e(handle) {
     flex: none;
-    width: 20px;
-    margin-top: 4px;
-    color: fn.use-var(text-color, second);
-    font-size: 16px;
+    width: 16px;
+    margin-top: 6px;
+    color: fn.use-var(text-color, placeholder);
+    font-size: 12px;
+    letter-spacing: -1px;
     line-height: 1;
     cursor: grab;
     user-select: none;
@@ -307,32 +325,33 @@
     gap: 8px;
   }
 
-  @include m.e(meta) {
+  @include m.e(when) {
     display: flex;
     align-items: center;
-    gap: 8px;
+    gap: 6px;
     flex-wrap: wrap;
   }
 
-  @include m.e(field-select) {
-    width: 120px;
-    flex: none;
+  @include m.e(then) {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex-wrap: wrap;
   }
 
-  @include m.e(scope-select) {
-    width: 72px;
+  @include m.e(lead) {
     flex: none;
+    font-size: 12px;
+    color: fn.use-var(text-color, second);
   }
 
-  @include m.e(condition) {
-    display: grid;
-    grid-template-columns: 72px minmax(0, 1fr) auto;
-    align-items: center;
-    gap: 8px;
+  @include m.e(field-select) {
+    width: 128px;
+    flex: none;
   }
 
   @include m.e(operator) {
-    width: 72px;
+    width: 96px;
     flex: none;
   }
 
@@ -345,12 +364,12 @@
   }
 
   @include m.e(scalar-input) {
-    width: 112px;
+    width: 120px;
     flex: none;
   }
 
   @include m.e(between-input) {
-    width: 96px;
+    width: 88px;
     flex: none;
   }
 
@@ -359,18 +378,6 @@
     color: fn.use-var(text-color, second);
   }
 
-  @include m.e(style) {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    flex-wrap: wrap;
-  }
-
-  @include m.e(style-label) {
-    font-size: 12px;
-    color: fn.use-var(text-color, second);
-  }
-
   @include m.e(toggle) {
     min-width: 28px;
     padding-inline: 6px;
@@ -378,14 +385,11 @@
 
   @include m.e(preview) {
     flex: none;
-    margin-top: 2px;
   }
 
-  @include m.e(actions) {
+  @include m.e(remove) {
     flex: none;
-    display: flex;
-    flex-direction: column;
-    gap: 2px;
+    margin-top: 2px;
   }
 }
 

package/src/components/report/use-report-designer.ts

@@ -8,13 +8,16 @@ import {
   applyReportPreset,
   createReportBinding,
   formatCellAddress,
-  inferColParentCandidate,
   inferDropPreset,
-  inferRowParentCandidate,
+  inferParentsForPreset,
+  isColGroupBinding,
   isHorizontalExpandBinding,
+  isRowGroupBinding,
   isVerticalExpandBinding,
   listColParentCandidates,
-  listRowParentCandidates
+  listRowParentCandidates,
+  prefersGroupParent,
+  presetStillApplies
 } from '../../report/binding'
 import type { DataConnection, QueryResult, Result } from '../../report/connector'
 import { buildParamDefs } from '../../report/params'
@@ -227,10 +230,9 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
     let binding = createReportBinding(dataset, fieldName)
     binding = applyReportPreset(binding, preset)
 
-    const rowParent = inferRowParentCandidate(target, getBindingAt)
-    if (rowParent) binding.rowParent = rowParent
-    const colParent = inferColParentCandidate(target, getBindingAt)
-    if (colParent) binding.colParent = colParent
+    const parents = inferParentsForPreset(target, preset, getBindingAt)
+    if (parents.rowParent) binding.rowParent = parents.rowParent
+    if (parents.colParent) binding.colParent = parents.colParent
 
     workbook.value.activeSheet.setCellMeta(target, REPORT_META_NAMESPACE, binding)
   }
@@ -276,14 +278,18 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
     metaTick.value
     const binding = activeBinding.value
     if (!binding) return []
-    return listRowParentCandidates(binding, bindingEntries.value)
+    return listRowParentCandidates(binding, bindingEntries.value, {
+      preferGroup: prefersGroupParent(binding)
+    })
   })
 
   const colParentCandidates = computed((): CellAddress[] => {
     metaTick.value
     const binding = activeBinding.value
     if (!binding) return []
-    return listColParentCandidates(binding, bindingEntries.value)
+    return listColParentCandidates(binding, bindingEntries.value, {
+      preferGroup: prefersGroupParent(binding)
+    })
   })
 
   const bindingEntries = computed((): TopologyBindingEntry[] => {
@@ -296,6 +302,12 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
     return entries
   })
 
+  function parentNeedsCorrection(addr: CellAddress | undefined): boolean {
+    if (!addr) return true
+    const parent = getBindingAt(addr)
+    return !parent || parent.aggregate === 'list'
+  }
+
   function patchActiveBinding(patch: Partial<ReportBinding>): void {
     const cell = activeCell.value
     const binding = activeBinding.value
@@ -304,7 +316,25 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
     const next: ReportBinding = { ...binding, ...patch }
     if ('rowParent' in patch && patch.rowParent === undefined) delete next.rowParent
     if ('colParent' in patch && patch.colParent === undefined) delete next.colParent
-    if (('aggregate' in patch || 'expand' in patch) && !('preset' in patch)) delete next.preset
+    if (
+      ('aggregate' in patch || 'expand' in patch) &&
+      !('preset' in patch) &&
+      !presetStillApplies(next)
+    ) {
+      delete next.preset
+    }
+
+    if (patch.preset === 'subtotal') {
+      const inferred = inferParentsForPreset(cell, 'subtotal', getBindingAt)
+      if (parentNeedsCorrection(next.rowParent)) {
+        if (inferred.rowParent) next.rowParent = inferred.rowParent
+        else delete next.rowParent
+      }
+      if (parentNeedsCorrection(next.colParent)) {
+        if (inferred.colParent) next.colParent = inferred.colParent
+        else delete next.colParent
+      }
+    }
 
     workbook.value.activeSheet.setCellMeta(cell, REPORT_META_NAMESPACE, next)
   }
@@ -319,17 +349,36 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
     parentPick.value = null
   }
 
+  function isValidParentTarget(
+    mode: ParentPickMode,
+    source: ReportBinding,
+    target: ReportBinding | undefined
+  ): boolean {
+    if (!target) return false
+    if (target.dataset !== source.dataset) return false
+    const groupOnly = prefersGroupParent(source)
+    if (mode === 'row') {
+      return groupOnly ? isRowGroupBinding(target) : isVerticalExpandBinding(target)
+    }
+    return groupOnly ? isColGroupBinding(target) : isHorizontalExpandBinding(target)
+  }
+
   function pickParentAt(target: CellAddress): void {
     const pick = parentPick.value
     if (!pick) return
     if (target.row === pick.source.row && target.col === pick.source.col) return
 
     const sourceBinding = getBindingAt(pick.source)
+    if (!sourceBinding) {
+      parentPick.value = null
+      return
+    }
+
     const targetBinding = getBindingAt(target)
-    if (!sourceBinding || !targetBinding) return
-    if (targetBinding.dataset !== sourceBinding.dataset) return
-    if (pick.mode === 'row' && !isVerticalExpandBinding(targetBinding)) return
-    if (pick.mode === 'col' && !isHorizontalExpandBinding(targetBinding)) return
+    if (!isValidParentTarget(pick.mode, sourceBinding, targetBinding)) {
+      workbook.value.activeSheet.selectCell(pick.source)
+      return
+    }
 
     const patch = pick.mode === 'row' ? { rowParent: { ...target } } : { colParent: { ...target } }
     const next: ReportBinding = { ...sourceBinding, ...patch }

package/src/components/report/use-report-viewer.ts

@@ -2,7 +2,8 @@ import type { SheetSnapshot } from '@veltra/sheet-core'
 import { computed, ref, shallowRef, watch, type ComputedRef, type Ref, type ShallowRef } from 'vue'
 
 import type { ConnectorError } from '../../report/connector'
-import { renderReport } from '../../report/render'
+import type { ReportColWidthEntry } from '../../report/export-xlsx'
+import { renderReport, resolveFilledColWidths } from '../../report/render'
 import {
   fetchTemplateRecords,
   resolveParamDefaults,
@@ -22,6 +23,8 @@ export interface UseReportViewerReturn {
   error: ShallowRef<ConnectorError | null>
   /** 最近一次成功展开渲染的 Filled Report 快照（组件壳据此替换网格内容） */
   filledSnapshot: ShallowRef<SheetSnapshot | null>
+  /** 展开后物理列宽（由模板 colWidths 映射；无模板列宽时为 undefined） */
+  filledColWidths: ShallowRef<ReadonlyArray<ReportColWidthEntry> | undefined>
   /** 重新取数并展开渲染 */
   refresh: () => Promise<void>
   /** Filter Bar 改值：写入新参数值并重新取数 */
@@ -36,6 +39,7 @@ export function useReportViewer(props: ReportViewerProps): UseReportViewerReturn
   const loading = ref(false)
   const error = shallowRef<ConnectorError | null>(null)
   const filledSnapshot = shallowRef<SheetSnapshot | null>(null)
+  const filledColWidths = shallowRef<ReadonlyArray<ReportColWidthEntry> | undefined>(undefined)
 
   const params = computed(() => resolveTemplateParams(props.template))
   // 初始值由下方 immediate watch 播种（参数默认值）
@@ -54,9 +58,13 @@ export function useReportViewer(props: ReportViewerProps): UseReportViewerReturn
     loading.value = false
     if (!result.ok) {
       error.value = result.error
+      filledColWidths.value = undefined
       return
     }
     filledSnapshot.value = renderReport(template, result.data)
+    filledColWidths.value = template.colWidths?.length
+      ? resolveFilledColWidths(template, result.data, template.colWidths)
+      : undefined
   }
 
   function setValues(next: ParamValues): void {
@@ -69,11 +77,12 @@ export function useReportViewer(props: ReportViewerProps): UseReportViewerReturn
     () => props.template,
     () => {
       filledSnapshot.value = null
+      filledColWidths.value = undefined
       values.value = resolveParamDefaults(params.value)
       void refresh()
     },
     { immediate: true }
   )
 
-  return { params, values, loading, error, filledSnapshot, refresh, setValues }
+  return { params, values, loading, error, filledSnapshot, filledColWidths, refresh, setValues }
 }

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

@@ -26,7 +26,7 @@ const fillColor = ref('')
 // 打开时初始化为活动格当前填充色
 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 ?? ''
 })
 
@@ -34,6 +34,6 @@ onMounted(() => {
 function applyFillColor(color: string): void {
   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)
     ]