@veltra/sheet 2.1.1 → 2.3.0

package/src/{vue → components/sheet}/__test__/formula-bar.test.ts

@@ -1,10 +1,12 @@
+import { parseRange } from '@veltra/sheet-core/core/address'
 import { Workbook } from '@veltra/sheet-core/core/workbook'
-import { ListTable } from '@visactor/vtable'
 import { afterEach, describe, expect, it } from 'vitest'
 import { createApp, h, nextTick, type App } from 'vue'
 
-import { USheet } from '../../index'
-import type { SheetExposed } from '../../types'
+import { USheet } from '../../../index'
+import { createSheetContext } from '../../../tools/context'
+import type { SheetExposed } from '../../../types'
+import UFormulaBar from '../formula-bar.vue'
 
 const apps: App[] = []
 const containers: HTMLElement[] = []
@@ -32,6 +34,26 @@ function mount(
   return { app, el }
 }
 
+function mountFormulaBar(sheet: Workbook['activeSheet']) {
+  const el = document.createElement('div')
+  document.body.appendChild(el)
+  containers.push(el)
+  const exposed: { value: InstanceType<typeof UFormulaBar> | undefined } = { value: undefined }
+  const app = createApp({
+    render: () =>
+      h(UFormulaBar, {
+        sheet,
+        context: createSheetContext(sheet),
+        ref: (value: unknown) => {
+          exposed.value = value as InstanceType<typeof UFormulaBar> | undefined
+        }
+      })
+  })
+  app.mount(el)
+  apps.push(app)
+  return { el, exposed }
+}
+
 function createWorkbook() {
   const workbook = new Workbook()
   workbook.addSheet('Sheet2')
@@ -397,15 +419,16 @@ describe('USheet 公式栏：函数补全与引用选择', () => {
     expect(sheet.getCellData({ row: 2, col: 0 })).toBeUndefined()
     expect(input.value).toBe('=SUM(')
 
-    // 与 grid 选区测试同路径：selectCells 设视觉选区 + fire SELECTED_CELL
-    const table = exposed.value!.getGrid()!.getTable()
-    table.selectCells([{ start: { col: 1, row: 1 }, end: { col: 2, row: 2 } }])
-    table.fireListeners(ListTable.EVENT_TYPE.SELECTED_CELL, { col: 2, row: 2 })
+    // 网格选区拦截 → handleRefSelect 路径（VTable 时序见 sheet-core selection-debug）
+    const { el: barEl, exposed: barExposed } = mountFormulaBar(sheet)
     await nextTick()
-    expect(input.value).toBe('=SUM(A1:B2')
-    expect(input.selectionStart).toBe('=SUM(A1:B2'.length)
-    // intercept 不写模型选区
-    expect(sheet.getSelection().activeCell).toEqual({ row: 2, col: 0 })
+    setFxText(barEl, '=SUM(')
+    await nextTick()
+    barExposed.value!.handleRefSelect(parseRange('A1:B2'))
+    await nextTick()
+    const barInput = fxInput(barEl)
+    expect(barInput.value).toBe('=SUM(A1:B2')
+    expect(barInput.selectionStart).toBe('=SUM(A1:B2'.length)
 
     // 非引用选择场景失焦提交
     setFxText(el, 'plain')
@@ -436,19 +459,15 @@ describe('USheet 公式栏：函数补全与引用选择', () => {
   })
 
   it('连续引用选择：=A1+ 后再插入 B1', async () => {
-    const workbook = new Workbook()
-    const sheet = workbook.activeSheet
-    const exposed: { value: SheetExposed | undefined } = { value: undefined }
-    const { el } = mount(() => ({ workbook, rows: 20, cols: 8 }), exposed)
+    const sheet = new Workbook().activeSheet
+    const { el, exposed } = mountFormulaBar(sheet)
     await nextTick()
     sheet.selectCell({ row: 2, col: 0 })
     await nextTick()
 
     setFxText(el, '=A1+')
     await nextTick()
-    const table = exposed.value!.getGrid()!.getTable()
-    table.selectCells([{ start: { col: 2, row: 1 }, end: { col: 2, row: 1 } }])
-    table.fireListeners(ListTable.EVENT_TYPE.SELECTED_CELL, { col: 2, row: 1 })
+    exposed.value!.handleRefSelect(parseRange('B1'))
     await nextTick()
     expect(fxInput(el).value).toBe('=A1+B1')
   })

package/src/{vue → components/sheet}/__test__/insert-image-popup.test.ts

@@ -2,7 +2,7 @@ import { Sheet } from '@veltra/sheet-core/core/sheet'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { createApp, h, type App } from 'vue'
 
-import { createSheetContext } from '../../tools/context'
+import { createSheetContext } from '../../../tools/context'
 import USheetInsertImagePopup from '../popups/insert-image-popup.vue'
 
 const mocks = vi.hoisted(() => {

package/src/{vue → components/sheet}/__test__/insert-image.test.ts

@@ -1,7 +1,7 @@
 import { Sheet } from '@veltra/sheet-core/core/sheet'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-import { createSheetContext } from '../../tools/context'
+import { createSheetContext } from '../../../tools/context'
 import {
   INSERT_IMAGE_ACCEPT,
   insertImageFromFile,

package/src/{vue → components/sheet}/__test__/sheet-component.test.ts

@@ -2,9 +2,9 @@ import { Workbook } from '@veltra/sheet-core/core/workbook'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { createApp, h, nextTick, ref, type App } from 'vue'
 
-import { USheet } from '../../index'
-import { registerTool, unregisterTool } from '../../tools/registry'
-import type { SheetExposed } from '../../types'
+import { USheet } from '../../../index'
+import { registerTool, unregisterTool } from '../../../tools/registry'
+import type { SheetExposed } from '../../../types'
 
 const apps: App[] = []
 const containers: HTMLElement[] = []
@@ -258,6 +258,80 @@ 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
+    const exposed: { value: SheetExposed | undefined } = { value: undefined }
+    mount(
+      () => ({
+        workbook,
+        rows: 10,
+        cols: 6,
+        resolveCellStyle: (
+          addr: { row: number; col: number },
+          baseStyle?: { fill?: { color: string } }
+        ) => {
+          if (addr.row === 1 && addr.col === 1) {
+            return { ...baseStyle, fill: { color: '#FFE0E0' } }
+          }
+          return baseStyle
+        }
+      }),
+      exposed
+    )
+    await nextTick()
+
+    const addr = { row: 1, col: 1 }
+    sheet.setCellStyle({ start: addr, end: addr }, { fill: { color: '#CCCCCC' } })
+    await nextTick()
+
+    const table = exposed.value?.getGrid()?.getTable()
+    expect(table).toBeDefined()
+    const column = table!.getBodyColumnDefine(2, 2) as {
+      style?: (arg: { row: number; col: number; table: unknown }) => Record<string, unknown>
+    }
+    const rendered = column.style!({ row: 2, col: 2, table })
+    expect(rendered.bgColor).toBe('#FFE0E0')
+    expect(sheet.getCellStyle(addr)?.fill?.color).toBe('#CCCCCC')
+  })
+
   it('workbook prop 变更：tabs 与 grid 切到新工作簿', async () => {
     const workbook1 = createWorkbook()
     const workbook2 = new Workbook()

package/src/{vue → components/sheet}/__test__/sheet-context-menu.test.ts

@@ -2,7 +2,7 @@ import { createRange } from '@veltra/sheet-core/core/address'
 import { Sheet } from '@veltra/sheet-core/core/sheet'
 import { describe, expect, it } from 'vitest'
 
-import { createSheetContext } from '../../tools/context'
+import { createSheetContext } from '../../../tools/context'
 import {
   buildBodyMenus,
   buildColHeaderMenus,
@@ -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/{vue → components/sheet}/formula-bar.vue

@@ -86,7 +86,7 @@ import {
   watch
 } from 'vue'
 
-import type { SheetContext } from '../tools/context'
+import type { SheetContext } from '../../tools/context'
 import UFormulaSuggestList from './formula-suggest-list.vue'
 import { insertRefText, isRefSelectContext } from './use-formula-ref-select'
 import {

package/src/{vue → components/sheet}/insert-image.ts

@@ -1,7 +1,7 @@
 import { message } from '@veltra/desktop'
 import type { SheetImageType } from '@veltra/sheet-core/core/image'
 
-import type { SheetContext } from '../tools/context'
+import type { SheetContext } from '../../tools/context'
 
 /** 文件选择 accept（工具栏弹层与右键菜单共用；不用裸 image/*） */
 export const INSERT_IMAGE_ACCEPT = '.png,.jpg,.jpeg,.gif,.svg,.webp'

package/src/{vue → components/sheet}/popup-helpers.ts

@@ -2,7 +2,7 @@ import type { CellRange } from '@veltra/sheet-core/core/address'
 import type { BorderPreset } from '@veltra/sheet-core/core/style/border-presets'
 import { BORDER_STYLE_WIDTH, type BorderLineStyle } from '@veltra/sheet-core/core/style/types'
 
-import type { SheetContext } from '../tools/context'
+import type { SheetContext } from '../../tools/context'
 
 /** 当前选区（ranges[0] 优先；无区域选区时用活动格单格） */
 export function currentRange(context: SheetContext): CellRange | null {

package/src/{vue → components/sheet}/popups/border-popup.vue

@@ -40,12 +40,13 @@ 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'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import {
   BORDER_LINE_STYLES,
   BORDER_LINE_TITLES,
@@ -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/{vue → components/sheet}/popups/export-popup.vue

@@ -13,8 +13,8 @@
 import { message } from '@veltra/desktop'
 import { bem } from '@veltra/utils'
 
-import type { SheetContext } from '../../tools/context'
-import { exportSheetCsvFile, exportWorkbookFile } from '../../tools/download'
+import type { SheetContext } from '../../../tools/context'
+import { exportSheetCsvFile, exportWorkbookFile } from '../../../tools/download'
 
 defineOptions({ name: 'USheetExportPopup' })
 

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

@@ -6,7 +6,7 @@
 import { UPalette } from '@veltra/desktop'
 import { onMounted, ref } from 'vue'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import { currentRange } from '../popup-helpers'
 
 defineOptions({ name: 'USheetFillColorPopup' })
@@ -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/{vue → components/sheet}/popups/find-popup.vue

@@ -72,7 +72,7 @@ import { UInput } from '@veltra/desktop'
 import type { Sheet } from '@veltra/sheet-core/core/sheet'
 import { bem } from '@veltra/utils'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import { useFindReplace } from '../use-find-replace'
 
 defineOptions({ name: 'USheetFindPopup' })

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

@@ -6,7 +6,7 @@
 import { UPalette } from '@veltra/desktop'
 import { onMounted, ref } from 'vue'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import { currentRange } from '../popup-helpers'
 
 defineOptions({ name: 'USheetFontColorPopup' })
@@ -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/{vue → components/sheet}/popups/font-size-popup.vue

@@ -20,7 +20,7 @@ import { UScroll } from '@veltra/desktop'
 import { bem } from '@veltra/utils'
 import { onMounted, ref } from 'vue'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import { currentRange } from '../popup-helpers'
 
 defineOptions({ name: 'USheetFontSizePopup' })
@@ -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/{vue → components/sheet}/popups/insert-image-popup.vue

@@ -15,7 +15,7 @@
 import { UFilePicker } from '@veltra/desktop'
 import { bem } from '@veltra/utils'
 
-import type { SheetContext } from '../../tools/context'
+import type { SheetContext } from '../../../tools/context'
 import { INSERT_IMAGE_ACCEPT, insertImageFromFile } from '../insert-image'
 
 defineOptions({ name: 'USheetInsertImagePopup' })

package/src/{vue → components/sheet}/sheet-context-menu.ts

@@ -2,8 +2,8 @@ import type { ContextmenuItem } from '@veltra/desktop'
 import { createRange, type CellAddress, type CellRange } from '@veltra/sheet-core/core/address'
 import { defineComponent, h } from 'vue'
 
-import type { SheetContext } from '../tools/context'
-import { defaultToolRegistry } from '../tools/registry'
+import type { SheetContext } from '../../tools/context'
+import { defaultToolRegistry } from '../../tools/registry'
 import InsertCountMenuItem from './insert-count-menu-item.vue'
 import { pickAndInsertImage } from './insert-image'
 
@@ -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/{vue → components/sheet}/sheet-toolbar.vue

@@ -61,8 +61,8 @@ import { ArrowLeft, ArrowRight } from '@veltra/icons/normal'
 import { bem } from '@veltra/utils'
 import { toRef, useTemplateRef } from 'vue'
 
-import type { SheetTool } from '../tools/registry'
-import type { ToolGroupView } from '../use-tool-groups'
+import type { SheetTool } from '../../tools/registry'
+import type { ToolGroupView } from './use-tool-groups'
 import { useToolbarScroll } from './use-toolbar-scroll'
 
 defineOptions({ name: 'USheetToolbar' })

package/src/{vue → components/sheet}/sheet.vue

@@ -77,8 +77,8 @@ import { UDropdown } from '@veltra/desktop'
 import { bem } from '@veltra/utils'
 import { computed, ref, useTemplateRef, watch } from 'vue'
 
-import type { SheetTool } from '../tools/registry'
-import type { SheetEmits, SheetProps, _SheetExposed } from '../types'
+import type { SheetTool } from '../../tools/registry'
+import type { SheetEmits, SheetProps, _SheetExposed } from '../../types'
 import UFormulaBar from './formula-bar.vue'
 import { pickAndImportFile } from './import-file'
 import USheetBorderPopup from './popups/border-popup.vue'
@@ -102,7 +102,10 @@ const props = withDefaults(defineProps<SheetProps>(), {
   cols: 26,
   showToolbar: true,
   showFormulaBar: true,
-  showTabs: true
+  showTabs: true,
+  showRowHeader: true,
+  showColHeader: true,
+  readonly: false
 })
 
 const emit = defineEmits<SheetEmits>()

package/src/{vue → components/sheet}/use-find-replace.ts

@@ -14,7 +14,7 @@ import {
 import type { Sheet } from '@veltra/sheet-core/core/sheet'
 import { computed, ref, shallowRef, watch } from 'vue'
 
-import type { SheetContext } from '../tools/context'
+import type { SheetContext } from '../../tools/context'
 
 interface UseFindReplaceOptions {
   /** 目标 sheet（弹层存活期间固定；tab 切换会关闭并销毁弹层） */

package/src/{vue → components/sheet}/use-sheet-grid.ts

@@ -4,8 +4,8 @@ import type { Sheet } from '@veltra/sheet-core/core/sheet'
 import { SheetGrid, type SheetGridContextMenuInfo } from '@veltra/sheet-core/grid/sheet-grid'
 import { onBeforeUnmount, onMounted, watch } from 'vue'
 
-import type { SheetContext } from '../tools/context'
-import type { SheetProps } from '../types'
+import type { SheetContext } from '../../tools/context'
+import type { SheetProps } from '../../types'
 import {
   buildBodyMenus,
   buildColHeaderMenus,
@@ -109,11 +109,19 @@ 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,
       onContextMenu: handleContextMenu,
       onEditStart: (addr) => formulaBarRef.value?.mirrorGridEdit(addr),
       onEditEnd: (addr) => formulaBarRef.value?.exitMirror(addr),
@@ -233,7 +241,17 @@ export function useSheetGrid(options: UseSheetGridOptions) {
 
   onMounted(activateGrid)
 
-  watch(() => [props.rows, props.cols], 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/{vue → components/sheet}/use-sheet-state.ts

@@ -2,9 +2,10 @@ import type { Sheet } from '@veltra/sheet-core/core/sheet'
 import { Workbook } from '@veltra/sheet-core/core/workbook'
 import { computed, onBeforeUnmount, onMounted, ref, shallowRef, watch } from 'vue'
 
-import { createSheetContext } from '../tools/context'
-import { defaultToolRegistry } from '../tools/registry'
-import type { SheetProps } from '../types'
+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/{vue → components/sheet}/use-tool-groups.ts

@@ -1,7 +1,7 @@
 import { computed, type ComputedRef, type Ref } from 'vue'
 
-import type { SheetContext } from '../tools/context'
-import { defaultToolRegistry, type SheetTool } from '../tools/registry'
+import type { SheetContext } from '../../tools/context'
+import { defaultToolRegistry, type SheetTool } from '../../tools/registry'
 
 /** 工具栏按钮视图模型 */
 export interface ToolGroupItem {

package/src/{vue → components/sheet}/use-tool-popup.ts

@@ -1,7 +1,7 @@
 import { onBeforeUnmount, onMounted, shallowRef } from 'vue'
 
-import type { SheetContext } from '../tools/context'
-import { defaultToolRegistry, type SheetTool } from '../tools/registry'
+import type { SheetContext } from '../../tools/context'
+import { defaultToolRegistry, type SheetTool } from '../../tools/registry'
 
 /** 模板 ref 只读形态 */
 type ElRef = { readonly value: HTMLElement | null | undefined }