@veltra/sheet 2.2.0 → 2.3.0

package/dist/components/report/report-viewer.js

@@ -1,16 +1,14 @@
 import _sfc_main$1 from "../sheet/sheet.js";
 import { exportFilledReportXlsx } from "../../report/export-xlsx.js";
-import { applyGridColWidths, readGridColWidths } from "./designer/col-widths.js";
+import { applyGridColWidths, applySheetColWidths } from "./designer/col-widths.js";
 import _sfc_main$2 from "./filter-bar.js";
+import { previewGridSize } from "./preview-grid-size.js";
 import { useReportViewer } from "./use-report-viewer.js";
 import { computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, nextTick, normalizeClass, openBlock, toDisplayString, unref, useTemplateRef, watch } from "vue";
 import { bem } from "@veltra/utils";
 import { saveBlob } from "@cat-kit/fe";
 import { Workbook } from "@veltra/sheet-core";
 //#region src/components/report/report-viewer.vue
-const MIN_RENDER_ROWS = 50;
-const MIN_RENDER_COLS = 10;
-/** 取数未完成时拒绝导出的可读错误 */
 const EXPORT_NOT_READY_MESSAGE = "报表数据尚未就绪，请等待取数完成后再导出";
 const EXPORT_LOADING_MESSAGE = "报表数据加载中，请稍后再导出";
 /** 查看器工作簿：宿主可注入（同 USheet `workbook?` 先例），缺省内部自建；模板 / 填充结果都 restore 进活动 sheet 只读展示 */
@@ -26,43 +24,56 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 	setup(__props, { expose: __expose }) {
 		const props = __props;
 		const cls = bem("report-viewer");
-		/** 网格最小渲染尺寸（与 playground 预览态一致）；Filled Report 超出时按快照尺寸放大 */
+		/** 取数未完成时拒绝导出的可读错误 */
 		const internalWorkbook = new Workbook();
 		const workbook = computed(() => props.workbook ?? internalWorkbook);
 		const sheetRef = useTemplateRef("sheetRef");
-		const { params, values, loading, error, filledSnapshot, refresh, setValues } = useReportViewer(props);
-		const renderRows = computed(() => Math.max(MIN_RENDER_ROWS, filledSnapshot.value?.rows ?? 0, props.template.rows));
-		const renderCols = computed(() => Math.max(MIN_RENDER_COLS, filledSnapshot.value?.cols ?? 0, props.template.cols));
-		function exportColIndexes() {
-			return Array.from({ length: renderCols.value }, (_, col) => col);
-		}
-		/** 将宿主传入的列宽写入 VTable 运行时（sheet-core 列宽未进快照） */
+		const { params, values, loading, error, filledSnapshot, filledColWidths, refresh, setValues } = useReportViewer(props);
+		const renderSize = computed(() => {
+			const filled = filledSnapshot.value;
+			if (filled) return previewGridSize(filled, "filled");
+			return previewGridSize(props.template, "template");
+		});
+		/** 宿主显式传入优先；否则取数完成后用展开映射列宽；再回落模板设计态列宽 */
+		const effectiveColWidths = computed(() => {
+			if (props.colWidths?.length) return props.colWidths;
+			if (filledColWidths.value?.length) return filledColWidths.value;
+			return props.template.colWidths;
+		});
+		/** 将运行时列宽写入模型与 VTable（模型为单一事实源；grid 构造/content-reset 也会回放） */
 		function applyRuntimeColWidths() {
-			if (!props.colWidths?.length) return;
-			applyGridColWidths(sheetRef.value?.getGrid(), props.colWidths);
+			if (!effectiveColWidths.value?.length) return;
+			const sheet = workbook.value.activeSheet;
+			applySheetColWidths(sheet, effectiveColWidths.value);
+			applyGridColWidths(sheetRef.value?.getGrid(), effectiveColWidths.value);
 		}
 		/**
-		* restore 负责尺寸/冻结/行高/选区（静默），restoreContent 发 content-reset
+		* restore 负责尺寸/冻结/行高/列宽/选区（静默），restoreContent 发 content-reset
 		* 触发网格全量刷新（grid 层订阅直刷，无需手动 flush）；history.clear 使填充不进 undo
 		*/
-		function applySnapshot(snapshot) {
+		function applySnapshot(snapshot, mode) {
+			const size = previewGridSize(snapshot, mode);
+			const trimmed = {
+				...snapshot,
+				rows: size.rows,
+				cols: size.cols
+			};
 			const sheet = workbook.value.activeSheet;
-			sheet.restore(snapshot);
-			sheet.restoreContent(snapshot);
+			sheet.restore(trimmed);
+			sheet.restoreContent(trimmed);
 			sheet.history.clear();
 			nextTick(applyRuntimeColWidths);
 		}
-		watch(() => props.template, applySnapshot, { immediate: true });
+		watch(() => props.template, (template) => applySnapshot(template, "template"), { immediate: true });
 		watch(filledSnapshot, (filled) => {
-			if (filled) applySnapshot(filled);
+			if (filled) applySnapshot(filled, "filled");
 		});
-		watch(() => props.colWidths, applyRuntimeColWidths);
+		watch(effectiveColWidths, applyRuntimeColWidths);
 		async function exportXlsx() {
 			if (loading.value) throw new Error(EXPORT_LOADING_MESSAGE);
 			if (!filledSnapshot.value) throw new Error(EXPORT_NOT_READY_MESSAGE);
 			const sheet = workbook.value.activeSheet;
-			const colWidths = readGridColWidths(sheetRef.value?.getGrid(), exportColIndexes()) ?? [];
-			const buffer = await exportFilledReportXlsx(sheet, colWidths);
+			const buffer = await exportFilledReportXlsx(sheet);
 			saveBlob(new Blob([buffer], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" }), `${sheet.name || "报表"}.xlsx`);
 		}
 		__expose({
@@ -92,11 +103,13 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				ref: sheetRef,
 				class: normalizeClass(unref(cls).e("sheet")),
 				workbook: workbook.value,
-				rows: renderRows.value,
-				cols: renderCols.value,
+				rows: renderSize.value.rows,
+				cols: renderSize.value.cols,
 				"show-toolbar": false,
 				"show-formula-bar": false,
 				"show-tabs": false,
+				"show-row-header": false,
+				"show-col-header": false,
 				readonly: ""
 			}, null, 8, [
 				"class",

package/dist/components/report/style2.css

@@ -166,6 +166,21 @@
   min-height: 0;
   min-width: 0;
 }
+.u-report-designer__pick-hint {
+  position: absolute;
+  left: 50%;
+  bottom: var(--u-gap-small);
+  z-index: 17;
+  transform: translateX(-50%);
+  padding: 4px var(--u-gap-small);
+  border-radius: var(--u-radius-default);
+  background: color-mix(in srgb, var(--u-bg-color-top) 92%, transparent);
+  border: 1px dashed var(--u-color-primary);
+  font-size: var(--u-font-size-main-small);
+  color: var(--u-text-color-second);
+  pointer-events: none;
+  white-space: nowrap;
+}
 .u-report-designer {
   /* 数据中枢 drawer 面板宽度（class 经 $attrs 落到 .u-drawer 面板；须压过 .u-drawer.is-right 的 320px） */
 }
@@ -222,7 +237,7 @@
   white-space: nowrap;
 }
 
-/* Action Pill：选中绑定格上方的悬浮编辑卡（角色 / 聚合 / 条件样式 / 排序 / 清除绑定） */
+/* Action Pill：选中绑定格上方的悬浮编辑卡（预设 + 互补的展开/聚合 / 条件样式 / 排序 / 清除绑定） */
 .u-report-float-panel {
   position: absolute;
   z-index: 18;
@@ -308,7 +323,7 @@
   flex-wrap: wrap;
 }
 .u-report-float-panel__parent-select {
-  width: 88px;
+  width: 180px;
   flex: none;
 }
 .u-report-float-panel__select--expand {
@@ -326,11 +341,12 @@
 .u-report-rules-dialog {
   display: flex;
   flex-direction: column;
-  gap: 12px;
+  gap: 10px;
 }
 .u-report-rules-dialog__hint {
   margin: 0;
   font-size: 12px;
+  line-height: 1.5;
   color: var(--u-text-color-second);
 }
 .u-report-rules-dialog__list {
@@ -356,17 +372,18 @@
   display: flex;
   align-items: flex-start;
   gap: 8px;
-  padding: 10px;
+  padding: 10px 10px 10px 6px;
   border: var(--u-border-muted);
   border-radius: 8px;
-  background: var(--u-bg-color-top);
+  background: var(--u-bg-color-middle);
 }
 .u-report-rule-row__handle {
   flex: none;
-  width: 20px;
-  margin-top: 4px;
-  color: var(--u-text-color-second);
-  font-size: 16px;
+  width: 16px;
+  margin-top: 6px;
+  color: var(--u-text-color-placeholder);
+  font-size: 12px;
+  letter-spacing: -1px;
   line-height: 1;
   cursor: grab;
   user-select: none;
@@ -382,28 +399,29 @@
   flex-direction: column;
   gap: 8px;
 }
-.u-report-rule-row__meta {
+.u-report-rule-row__when {
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 6px;
   flex-wrap: wrap;
 }
-.u-report-rule-row__field-select {
-  width: 120px;
-  flex: none;
+.u-report-rule-row__then {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
 }
-.u-report-rule-row__scope-select {
-  width: 72px;
+.u-report-rule-row__lead {
   flex: none;
+  font-size: 12px;
+  color: var(--u-text-color-second);
 }
-.u-report-rule-row__condition {
-  display: grid;
-  grid-template-columns: 72px minmax(0, 1fr) auto;
-  align-items: center;
-  gap: 8px;
+.u-report-rule-row__field-select {
+  width: 128px;
+  flex: none;
 }
 .u-report-rule-row__operator {
-  width: 72px;
+  width: 96px;
   flex: none;
 }
 .u-report-rule-row__value {
@@ -414,40 +432,27 @@
   min-width: 0;
 }
 .u-report-rule-row__scalar-input {
-  width: 112px;
+  width: 120px;
   flex: none;
 }
 .u-report-rule-row__between-input {
-  width: 96px;
+  width: 88px;
   flex: none;
 }
 .u-report-rule-row__between-sep {
   font-size: 12px;
   color: var(--u-text-color-second);
 }
-.u-report-rule-row__style {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  flex-wrap: wrap;
-}
-.u-report-rule-row__style-label {
-  font-size: 12px;
-  color: var(--u-text-color-second);
-}
 .u-report-rule-row__toggle {
   min-width: 28px;
   padding-inline: 6px;
 }
 .u-report-rule-row__preview {
   flex: none;
-  margin-top: 2px;
 }
-.u-report-rule-row__actions {
+.u-report-rule-row__remove {
   flex: none;
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
+  margin-top: 2px;
 }
 
 .u-report-rule-preview {

package/dist/components/report/use-report-designer.js

@@ -1,4 +1,4 @@
-import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatCellAddress, inferColParentCandidate, inferDropPreset, inferRowParentCandidate, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates } from "../../report/binding.js";
+import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatCellAddress, inferDropPreset, inferParentsForPreset, isColGroupBinding, isHorizontalExpandBinding, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, prefersGroupParent, presetStillApplies } from "../../report/binding.js";
 import { buildParamDefs } from "../../report/params.js";
 import { assertCompatibleTemplateVersion, createReportTemplate, getTemplateDatasets, resolveParamDefaults } from "../../report/template.js";
 import { createBindingBadgeRenderer, createBindingBadgeStyleResolver } from "./binding-badge.js";
@@ -80,10 +80,9 @@ function useReportDesigner(options) {
 		const preset = inferDropPreset(target, field?.type ?? "string", getBindingAt);
 		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);
 	}
 	const activeBinding = computed(() => {
@@ -118,13 +117,13 @@ function useReportDesigner(options) {
 		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(() => {
 		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(() => {
 		metaTick.value;
@@ -138,6 +137,11 @@ function useReportDesigner(options) {
 		}
 		return entries;
 	});
+	function parentNeedsCorrection(addr) {
+		if (!addr) return true;
+		const parent = getBindingAt(addr);
+		return !parent || parent.aggregate === "list";
+	}
 	function patchActiveBinding(patch) {
 		const cell = activeCell.value;
 		const binding = activeBinding.value;
@@ -148,7 +152,14 @@ function useReportDesigner(options) {
 		};
 		if ("rowParent" in patch && patch.rowParent === void 0) delete next.rowParent;
 		if ("colParent" in patch && patch.colParent === void 0) 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);
 	}
 	function startParentPick(mode) {
@@ -165,16 +176,27 @@ function useReportDesigner(options) {
 	function cancelParentPick() {
 		parentPick.value = null;
 	}
+	function isValidParentTarget(mode, source, target) {
+		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) {
 		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 = {
 			...sourceBinding,

package/dist/components/report/use-report-viewer.js

@@ -1,4 +1,4 @@
-import { renderReport } from "../../report/render/index.js";
+import { renderReport, resolveFilledColWidths } from "../../report/render/index.js";
 import { fetchTemplateRecords, resolveParamDefaults, resolveTemplateParams } from "../../report/template.js";
 import { computed, ref, shallowRef, watch } from "vue";
 //#region src/components/report/use-report-viewer.ts
@@ -10,6 +10,7 @@ function useReportViewer(props) {
 	const loading = ref(false);
 	const error = shallowRef(null);
 	const filledSnapshot = shallowRef(null);
+	const filledColWidths = shallowRef(void 0);
 	const params = computed(() => resolveTemplateParams(props.template));
 	const values = shallowRef({});
 	let fetchSeq = 0;
@@ -23,9 +24,11 @@ function useReportViewer(props) {
 		loading.value = false;
 		if (!result.ok) {
 			error.value = result.error;
+			filledColWidths.value = void 0;
 			return;
 		}
 		filledSnapshot.value = renderReport(template, result.data);
+		filledColWidths.value = template.colWidths?.length ? resolveFilledColWidths(template, result.data, template.colWidths) : void 0;
 	}
 	function setValues(next) {
 		values.value = next;
@@ -33,6 +36,7 @@ function useReportViewer(props) {
 	}
 	watch(() => props.template, () => {
 		filledSnapshot.value = null;
+		filledColWidths.value = void 0;
 		values.value = resolveParamDefaults(params.value);
 		refresh();
 	}, { immediate: true });
@@ -42,6 +46,7 @@ function useReportViewer(props) {
 		loading,
 		error,
 		filledSnapshot,
+		filledColWidths,
 		refresh,
 		setValues
 	};

package/dist/components/sheet/popups/border-popup.js

@@ -18,13 +18,36 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		* 预设补丁由 core/style/border-presets 生成（含邻居格共享边同步，对齐
 		* Excel「写入时同步、最近设置生效」）；面板打开期间的写入由
 		* use-tool-popup 事务包裹为一个 undo 单元。
+		* 整行/整列选区下，均匀预设（all/none/单侧）走 applyStyle → 行列默认样式。
 		*/
 		const props = __props;
 		const cls = bem("sheet");
 		/** 当前线型 / 颜色 */
 		const borderLineStyle = ref("thin");
 		const borderColor = ref("#000000");
-		/** 应用边框预设：一次 executeCommand（items 批量，含邻居同步补丁）= 一个 undo 单元 */
+		/** 均匀边框补丁（可写进行/列默认样式）；outer/inner 几何相关 → null */
+		function uniformBorderPatch(preset, edge) {
+			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) {
 			const range = currentRange(props.context);
 			if (!range) return;
@@ -33,7 +56,12 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 				width: BORDER_STYLE_WIDTH[borderLineStyle.value],
 				color: borderColor.value
 			};
-			const items = buildBorderPresetItems(range, preset, edge, (addr) => props.context.getCellStyle(addr)).map(({ addr, patch }) => ({
+			const uniform = props.context.resolveStyleTarget(range) !== "cell" ? uniformBorderPatch(preset, edge) : null;
+			if (uniform) {
+				props.context.applyStyle(range, uniform);
+				return;
+			}
+			const items = buildBorderPresetItems(range, preset, edge, (addr) => props.context.getEffectiveStyle(addr)).map(({ addr, patch }) => ({
 				addr,
 				partial: patch
 			}));

package/dist/components/sheet/popups/fill-color-popup.js

@@ -16,14 +16,14 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const fillColor = ref("");
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
-			const style = active ? props.context.getCellStyle(active) : void 0;
+			const style = active ? props.context.getEffectiveStyle(active) : void 0;
 			fillColor.value = style?.fill?.color ?? "";
 		});
 		/** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
 		function applyFillColor(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: {} });
 		}
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(UPalette), {

package/dist/components/sheet/popups/font-color-popup.js

@@ -16,14 +16,14 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const fontColor = ref("");
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
-			const style = active ? props.context.getCellStyle(active) : void 0;
+			const style = active ? props.context.getEffectiveStyle(active) : void 0;
 			fontColor.value = style?.font?.color ?? "";
 		});
 		/** 字体颜色变化（'' = 清除 color） */
 		function applyFontColor(color) {
 			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 } });
 		}
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(UPalette), {

package/dist/components/sheet/popups/font-size-popup.js

@@ -32,14 +32,14 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const currentSize = ref(void 0);
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
-			const style = active ? props.context.getCellStyle(active) : void 0;
+			const style = active ? props.context.getEffectiveStyle(active) : void 0;
 			currentSize.value = style?.font?.size;
 		});
 		function applyFontSize(size) {
 			const range = currentRange(props.context);
 			if (!range) return;
 			currentSize.value = size;
-			props.context.setCellStyle(range, { font: { size } });
+			props.context.applyStyle(range, { font: { size } });
 		}
 		return (_ctx, _cache) => {
 			return openBlock(), createElementBlock(Fragment, null, [createCommentVNode(" 下拉排列：每行一个字号；滚动用 desktop UScroll（自定义滚动条） "), createVNode(unref(UScroll), {

package/dist/components/sheet/sheet-context-menu.js

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

package/dist/components/sheet/sheet.js

@@ -39,6 +39,14 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			type: Boolean,
 			default: true
 		},
+		showRowHeader: {
+			type: Boolean,
+			default: true
+		},
+		showColHeader: {
+			type: Boolean,
+			default: true
+		},
 		readonly: {
 			type: Boolean,
 			default: false

package/dist/components/sheet/use-sheet-grid.js

@@ -57,12 +57,15 @@ function useSheetGrid(options) {
 		const el = document.createElement("div");
 		el.className = "u-sheet__grid-instance";
 		host.appendChild(el);
+		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,
@@ -172,8 +175,15 @@ function useSheetGrid(options) {
 	watch(() => [
 		props.rows,
 		props.cols,
-		props.readonly
-	], rebuildGrid);
+		props.readonly,
+		props.showRowHeader,
+		props.showColHeader
+	], ([nextRows, nextCols]) => {
+		const sheet = getActiveSheet();
+		if (nextRows != null) sheet.ensureTableSize(nextRows, 0);
+		if (nextCols != null) sheet.ensureTableSize(0, nextCols);
+		rebuildGrid();
+	});
 	onBeforeUnmount(() => {
 		invalidateAll();
 	});

package/dist/components/sheet/use-sheet-state.js

@@ -1,5 +1,6 @@
 import { defaultToolRegistry } from "../../tools/registry.js";
 import { createSheetContext } from "../../tools/context.js";
+import { resolveRenderSize } from "./sheet-context-menu.js";
 import { computed, onBeforeUnmount, onMounted, ref, shallowRef, watch } from "vue";
 import { Workbook } from "@veltra/sheet-core/core/workbook";
 //#region src/components/sheet/use-sheet-state.ts
@@ -19,8 +20,8 @@ function useSheetState(props, emit, hooks) {
 	/** sheet 列表（tabs 渲染；由 sheets-change 同步） */
 	const sheetList = shallowRef(workbook.value.getSheets());
 	const activeSheet = computed(() => sheetList.value[activeIndex.value] ?? workbook.value.activeSheet);
-	/** 工具上下文：动态解析活动 sheet 与当前工作簿，tab 切换 / workbook prop 切换后自动指向最新值 */
-	const context = createSheetContext(() => activeSheet.value, () => workbook.value);
+	/** 工具上下文：动态解析活动 sheet / 工作簿 / 渲染尺寸，tab 切换后自动指向最新值 */
+	const context = createSheetContext(() => activeSheet.value, () => workbook.value, { resolveGridSize: () => resolveRenderSize(props.rows, props.cols, activeSheet.value.rows, activeSheet.value.cols) });
 	/** 工具栏状态版本号：visible/disabled/active 是 (ctx) => boolean 纯函数，状态源变化时 bump 触发重算 */
 	const stateTick = ref(0);
 	const bump = () => {

package/dist/index.d.ts

@@ -5,7 +5,7 @@ import { SheetContext, createSheetContext } from "./tools/context.js";
 import { SheetTool, SheetToolGroup, SheetToolPopupType, defaultToolRegistry, registerTool, unregisterTool } from "./tools/registry.js";
 import { SheetEmits, SheetExposed, SheetProps, _SheetExposed } from "./types/sheet.js";
 import { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField, DatasetRecords, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, ReportAggregate, ReportBinding, ReportExpand, ReportPreset, ReportSort } from "./report/types.js";
-import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatCellAddress, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, presetBindingPatch, setBindingCatalog } from "./report/binding.js";
+import { InferParentOptions, ListParentCandidateOptions, REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, prefersGroupParent, presetBindingPatch, presetStillApplies, setBindingCatalog } from "./report/binding.js";
 import { ConditionalEvalContext, evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./report/rules/evaluate.js";
 import { buildParamDefs, extractParamIds, resolveBoundDatasetParams } from "./report/params.js";
 import { ReportColWidthEntry, buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth } from "./report/export-xlsx.js";
@@ -18,4 +18,4 @@ import "./report/index.js";
 import { ReportViewerExposed, ReportViewerProps, _ReportViewerExposed } from "./types/report-viewer.js";
 import { ReportDesignerEmits, ReportDesignerExposed, ReportDesignerProps, _ReportDesignerExposed } from "./types/report-designer.js";
 import "./types/index.js";
-export { type ConditionalEvalContext, ConditionalOperator, ConditionalRule, ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, DatasetCatalogItem, DatasetField, DatasetRecords, IncompatibleTemplateVersionError, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, QueryResult, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, ReportAggregate, ReportBinding, ReportColWidthEntry, ReportDatasetDef, type ReportDesignerEmits, type ReportDesignerExposed, type ReportDesignerProps, ReportExpand, ReportPreset, ReportSort, ReportTemplate, type ReportViewerExposed, type ReportViewerProps, Result, type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, type _ReportDesignerExposed, type _ReportViewerExposed, type _SheetExposed, applyReportPreset, assertCompatibleTemplateVersion, buildColumnDefs, buildParamDefs, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatCellAddress, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, presetBindingPatch, pxToExcelColWidth, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };
+export { type ConditionalEvalContext, ConditionalOperator, ConditionalRule, ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, DatasetCatalogItem, DatasetField, DatasetRecords, IncompatibleTemplateVersionError, InferParentOptions, ListParentCandidateOptions, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, QueryResult, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, ReportAggregate, ReportBinding, ReportColWidthEntry, ReportDatasetDef, type ReportDesignerEmits, type ReportDesignerExposed, type ReportDesignerProps, ReportExpand, ReportPreset, ReportSort, ReportTemplate, type ReportViewerExposed, type ReportViewerProps, Result, type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, type _ReportDesignerExposed, type _ReportViewerExposed, type _SheetExposed, applyReportPreset, assertCompatibleTemplateVersion, buildColumnDefs, buildParamDefs, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, prefersGroupParent, presetBindingPatch, presetStillApplies, pxToExcelColWidth, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };

package/dist/index.js

@@ -4,7 +4,7 @@ import { createSheetContext } from "./tools/context.js";
 import _sfc_main$2 from "./components/sheet/sheet.js";
 import { buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth } from "./report/export-xlsx.js";
 import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./report/filter-bar.js";
-import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatCellAddress, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, presetBindingPatch, setBindingCatalog } from "./report/binding.js";
+import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, prefersGroupParent, presetBindingPatch, presetStillApplies, setBindingCatalog } from "./report/binding.js";
 import { evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./report/rules/evaluate.js";
 import { mapFilledColWidths } from "./report/render/builder.js";
 import { renderReport, resolveFilledColWidths } from "./report/render/index.js";
@@ -13,4 +13,4 @@ import { IncompatibleTemplateVersionError, REPORT_TEMPLATE_VERSION, assertCompat
 import _sfc_main$1 from "./components/report/report-viewer.js";
 import { DEFAULT_CONNECTION_PORTS, createHttpConnector, resolvePortOnTypeChange } from "./report/connector.js";
 import _sfc_main from "./components/report/report-designer.js";
-export { DEFAULT_CONNECTION_PORTS, IncompatibleTemplateVersionError, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, applyReportPreset, assertCompatibleTemplateVersion, buildColumnDefs, buildParamDefs, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatCellAddress, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, presetBindingPatch, pxToExcelColWidth, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };
+export { DEFAULT_CONNECTION_PORTS, IncompatibleTemplateVersionError, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, _sfc_main as UReportDesigner, _sfc_main$1 as UReportViewer, _sfc_main$2 as USheet, applyReportPreset, assertCompatibleTemplateVersion, buildColumnDefs, buildParamDefs, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, defaultToolRegistry, evaluateCondition, evaluateConditionalStyle, exportFilledReportXlsx, extractParamIds, fetchTemplateRecords, formatBindingPlaceholder, formatBindingPlaceholderParts, formatCellAddress, formatParentCandidateLabel, getBoundDatasetIds, getTemplateDatasets, inferColParentCandidate, inferDropPreset, inferParentsForPreset, inferReportPreset, inferRowParentCandidate, isColGroupBinding, isExpansionBandCol, isExpansionBandRow, isHorizontalExpandBinding, isReductionAggregate, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, mapFilledColWidths, parseCellAddress, parseDateRangeValue, patchParamValues, prefersGroupParent, presetBindingPatch, presetStillApplies, pxToExcelColWidth, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };