@veltra/sheet 2.2.0 → 2.3.1

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

@@ -13,17 +13,18 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		*/
 		const props = __props;
 		/** 填充颜色（'' = 无填充） */
-		const fillColor = ref("");
+		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) {
+			fillColor.value = color;
 			const range = currentRange(props.context);
 			if (!range) return;
-			props.context.setCellStyle(range, color ? { fill: { color } } : { fill: {} });
+			props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} });
 		}
 		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 };

package/dist/report/binding.d.ts

@@ -1,4 +1,4 @@
-import { DatasetCatalogItem, ReportBinding, ReportPreset } from "./types.js";
+import { DatasetCatalogItem, ReportAggregate, ReportBinding, ReportPreset } from "./types.js";
 import { CellAddress } from "@veltra/sheet-core";
 //#region src/report/binding.d.ts
 declare function setBindingCatalog(catalog: DatasetCatalogItem[]): void;
@@ -13,24 +13,55 @@ declare function applyReportPreset(binding: ReportBinding, preset: ReportPreset,
 }): ReportBinding;
 declare function isVerticalExpandBinding(binding: ReportBinding): boolean;
 declare function isHorizontalExpandBinding(binding: ReportBinding): boolean;
+declare function isRowGroupBinding(binding: ReportBinding): boolean;
+declare function isColGroupBinding(binding: ReportBinding): boolean;
+declare function isReductionAggregate(aggregate: ReportAggregate): boolean;
+/** 小计 / 汇总 / 交叉格的父格候选只列分组头 */
+declare function prefersGroupParent(binding: ReportBinding): boolean;
+/** 当前 expand / aggregate 是否仍属于已写入的预设族（同族内改聚合不掉到「自定义」） */
+declare function presetStillApplies(binding: ReportBinding): boolean;
+type GetBindingAt = (addr: CellAddress) => ReportBinding | undefined;
+interface InferParentOptions {
+  /** 小计落格：必须优先分组头，禁止把同列/同行明细当成父格 */
+  preferGroup?: boolean;
+}
 /** 指定模板行是否含纵向扩展绑定（展开带行） */
-declare function isExpansionBandRow(row: number, getBindingAt: (addr: CellAddress) => ReportBinding | undefined, scanCols?: number): boolean;
-/** 落格时推断预设：默认明细；数值字段且位于展开带正下方相邻行 → 小计 */
-declare function inferDropPreset(addr: CellAddress, fieldType: DatasetCatalogItem['fields'][number]['type'], getBindingAt: (addr: CellAddress) => ReportBinding | undefined): ReportPreset;
+declare function isExpansionBandRow(row: number, getBindingAt: GetBindingAt, scanCols?: number): boolean;
+/** 指定模板列是否含横向扩展绑定（展开带列） */
+declare function isExpansionBandCol(col: number, getBindingAt: GetBindingAt, scanRows?: number): boolean;
+/** 落格时推断预设：默认明细；数值字段且位于展开带正下方或正右相邻 → 小计 */
+declare function inferDropPreset(addr: CellAddress, fieldType: DatasetCatalogItem['fields'][number]['type'], getBindingAt: GetBindingAt): ReportPreset;
+interface ListParentCandidateOptions {
+  preferGroup?: boolean;
+}
 /** 同数据集纵向扩展绑定格（行方向父格下拉候选） */
 declare function listRowParentCandidates(binding: ReportBinding, entries: ReadonlyArray<{
   addr: CellAddress;
   binding: ReportBinding;
-}>): CellAddress[];
+}>, options?: ListParentCandidateOptions): CellAddress[];
 /** 同数据集横向扩展绑定格（列方向父格下拉候选） */
 declare function listColParentCandidates(binding: ReportBinding, entries: ReadonlyArray<{
   addr: CellAddress;
   binding: ReportBinding;
-}>): CellAddress[];
-/** 同列向上找最近的纵向扩展绑定，作为 rowParent 候选 */
-declare function inferRowParentCandidate(addr: CellAddress, getBindingAt: (addr: CellAddress) => ReportBinding | undefined): CellAddress | null;
-/** 同行向左找最近的横向扩展绑定，作为 colParent 候选 */
-declare function inferColParentCandidate(addr: CellAddress, getBindingAt: (addr: CellAddress) => ReportBinding | undefined): CellAddress | null;
+}>, options?: ListParentCandidateOptions): CellAddress[];
+/**
+ * 行方向父格推断：
+ * 1. 同行向左：先找分组头，否则最近纵向扩展格
+ * 2. 上方各行整行扫描：每行先找分组头，再退回任意纵向扩展格
+ * 小计（preferGroup）禁止把明细当成父格
+ */
+declare function inferRowParentCandidate(addr: CellAddress, getBindingAt: GetBindingAt, options?: InferParentOptions): CellAddress | null;
+/**
+ * 列方向父格推断（与行方向对称）：
+ * 1. 同列向上：先找列分组头，否则最近横向扩展格
+ * 2. 左侧各列整列扫描：每列先找列分组头
+ * 列小计（preferGroup）禁止把交叉格/明细当成列父格
+ */
+declare function inferColParentCandidate(addr: CellAddress, getBindingAt: GetBindingAt, options?: InferParentOptions): CellAddress | null;
+/**
+ * 按预设写入落格父格：明细/分组/交叉双方向推断；小计按「下方行小计 / 右侧列小计」只挂对应轴。
+ */
+declare function inferParentsForPreset(addr: CellAddress, preset: ReportPreset, getBindingAt: GetBindingAt): Pick<ReportBinding, 'rowParent' | 'colParent'>;
 /** 从绑定字段推断预设；不匹配任何预设时返回 null（自定义） */
 declare function inferReportPreset(binding: ReportBinding): ReportPreset | null;
 /** 默认明细 + 纵向扩展 */
@@ -39,7 +70,14 @@ declare function createReportBinding(dataset: DatasetCatalogItem, fieldName: str
 declare function formatCellAddress(addr: CellAddress): string;
 /** A1 标签 → 设计地址；非法输入返回 null */
 declare function parseCellAddress(label: string): CellAddress | null;
+/** Binding Placeholder 分段文案（聚合标签 + 字段标签），供徽章分色渲染等场景使用 */
+declare function formatBindingPlaceholderParts(binding: ReportBinding, resolveLabel?: (datasetId: string, fieldName: string) => string): {
+  tag: string;
+  label: string;
+};
 /** Binding Placeholder 中文可读文案（如「分组 · 客户」） */
 declare function formatBindingPlaceholder(binding: ReportBinding, resolveLabel?: (datasetId: string, fieldName: string) => string): string;
+/** 父格下拉候选文案（如「分组 · 客户 (A2)」） */
+declare function formatParentCandidateLabel(addr: CellAddress, binding: ReportBinding, resolveLabel?: (datasetId: string, fieldName: string) => string): string;
 //#endregion
-export { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatCellAddress, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, presetBindingPatch, setBindingCatalog };
+export { 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 };

package/dist/report/binding.js

@@ -65,10 +65,34 @@ function isVerticalExpandBinding(binding) {
 	return binding.expand === "down" && (binding.aggregate === "group" || binding.aggregate === "list");
 }
 function isHorizontalExpandBinding(binding) {
+	return binding.expand === "right" && (binding.aggregate === "group" || binding.aggregate === "list");
+}
+function isRowGroupBinding(binding) {
+	return binding.expand === "down" && binding.aggregate === "group";
+}
+function isColGroupBinding(binding) {
 	return binding.expand === "right" && binding.aggregate === "group";
 }
+function isReductionAggregate(aggregate) {
+	return aggregate === "sum" || aggregate === "avg" || aggregate === "count" || aggregate === "max" || aggregate === "min";
+}
+/** 小计 / 汇总 / 交叉格的父格候选只列分组头 */
+function prefersGroupParent(binding) {
+	if (binding.preset === "subtotal" || binding.preset === "grandTotal" || binding.preset === "cross") return true;
+	return binding.expand === "none" && isReductionAggregate(binding.aggregate);
+}
+/** 当前 expand / aggregate 是否仍属于已写入的预设族（同族内改聚合不掉到「自定义」） */
+function presetStillApplies(binding) {
+	const preset = binding.preset;
+	if (!preset) return false;
+	if (preset === "groupHeader") return binding.aggregate === "group" && (binding.expand === "down" || binding.expand === "right");
+	if (preset === "detail") return binding.aggregate === "list" && (binding.expand === "down" || binding.expand === "right");
+	return binding.expand === "none" && isReductionAggregate(binding.aggregate);
+}
+const DEFAULT_SCAN_COLS = 64;
+const DEFAULT_SCAN_ROWS = 64;
 /** 指定模板行是否含纵向扩展绑定（展开带行） */
-function isExpansionBandRow(row, getBindingAt, scanCols = 64) {
+function isExpansionBandRow(row, getBindingAt, scanCols = DEFAULT_SCAN_COLS) {
 	for (let col = 0; col < scanCols; col++) {
 		const binding = getBindingAt({
 			row,
@@ -78,65 +102,186 @@ function isExpansionBandRow(row, getBindingAt, scanCols = 64) {
 	}
 	return false;
 }
-/** 落格时推断预设：默认明细；数值字段且位于展开带正下方相邻行 → 小计 */
+/** 指定模板列是否含横向扩展绑定（展开带列） */
+function isExpansionBandCol(col, getBindingAt, scanRows = DEFAULT_SCAN_ROWS) {
+	for (let row = 0; row < scanRows; row++) {
+		const binding = getBindingAt({
+			row,
+			col
+		});
+		if (binding && isHorizontalExpandBinding(binding)) return true;
+	}
+	return false;
+}
+/** 落格时推断预设：默认明细；数值字段且位于展开带正下方或正右相邻 → 小计 */
 function inferDropPreset(addr, fieldType, getBindingAt) {
-	if (fieldType === "number" && addr.row > 0 && isExpansionBandRow(addr.row - 1, getBindingAt)) return "subtotal";
+	if (fieldType !== "number") return "detail";
+	if (addr.row > 0 && isExpansionBandRow(addr.row - 1, getBindingAt)) return "subtotal";
+	if (addr.col > 0 && isExpansionBandCol(addr.col - 1, getBindingAt)) return "subtotal";
 	return "detail";
 }
 /** 同数据集纵向扩展绑定格（行方向父格下拉候选） */
-function listRowParentCandidates(binding, entries) {
+function listRowParentCandidates(binding, entries, options) {
+	const preferGroup = options?.preferGroup === true;
 	const candidates = [];
 	for (const entry of entries) {
 		if (entry.binding.dataset !== binding.dataset) continue;
-		if (!isVerticalExpandBinding(entry.binding)) continue;
+		if (preferGroup) {
+			if (!isRowGroupBinding(entry.binding)) continue;
+		} else if (!isVerticalExpandBinding(entry.binding)) continue;
 		candidates.push(entry.addr);
 	}
 	return candidates;
 }
 /** 同数据集横向扩展绑定格（列方向父格下拉候选） */
-function listColParentCandidates(binding, entries) {
+function listColParentCandidates(binding, entries, options) {
+	const preferGroup = options?.preferGroup === true;
 	const candidates = [];
 	for (const entry of entries) {
 		if (entry.binding.dataset !== binding.dataset) continue;
-		if (!isHorizontalExpandBinding(entry.binding)) continue;
+		if (preferGroup) {
+			if (!isColGroupBinding(entry.binding)) continue;
+		} else if (!isHorizontalExpandBinding(entry.binding)) continue;
 		candidates.push(entry.addr);
 	}
 	return candidates;
 }
-/** 同列向上找最近的纵向扩展绑定，作为 rowParent 候选 */
-function inferRowParentCandidate(addr, getBindingAt) {
-	for (let row = addr.row - 1; row >= 0; row--) {
+function betterHit(current, next) {
+	if (!current) return true;
+	if (next.distance !== current.distance) return next.distance < current.distance;
+	return next.addr.col + next.addr.row < current.addr.col + current.addr.row;
+}
+function pickExpandHit(hits, preferGroup) {
+	let group = null;
+	let expand = null;
+	for (const hit of hits) {
+		if (hit.group && betterHit(group, hit)) group = hit;
+		if (betterHit(expand, hit)) expand = hit;
+	}
+	if (preferGroup) return group?.addr ?? null;
+	return group?.addr ?? expand?.addr ?? null;
+}
+function scanVerticalOnRow(row, originCol, colStart, colEnd, getBindingAt) {
+	const hits = [];
+	for (let col = colStart; col < colEnd; col++) {
 		const binding = getBindingAt({
 			row,
-			col: addr.col
+			col
+		});
+		if (!binding || !isVerticalExpandBinding(binding)) continue;
+		hits.push({
+			addr: {
+				row,
+				col
+			},
+			group: isRowGroupBinding(binding),
+			distance: Math.abs(col - originCol)
 		});
-		if (binding && isVerticalExpandBinding(binding)) return {
-			row,
-			col: addr.col
-		};
 	}
-	return null;
+	return hits;
 }
-/** 同行向左找最近的横向扩展绑定，作为 colParent 候选 */
-function inferColParentCandidate(addr, getBindingAt) {
-	for (let col = addr.col - 1; col >= 0; col--) {
+function scanHorizontalOnCol(col, originRow, rowStart, rowEnd, getBindingAt) {
+	const hits = [];
+	for (let row = rowStart; row < rowEnd; row++) {
 		const binding = getBindingAt({
-			row: addr.row,
+			row,
 			col
 		});
-		if (binding && isHorizontalExpandBinding(binding)) return {
-			row: addr.row,
-			col
-		};
+		if (!binding || !isHorizontalExpandBinding(binding)) continue;
+		hits.push({
+			addr: {
+				row,
+				col
+			},
+			group: isColGroupBinding(binding),
+			distance: Math.abs(row - originRow)
+		});
+	}
+	return hits;
+}
+/**
+* 行方向父格推断：
+* 1. 同行向左：先找分组头，否则最近纵向扩展格
+* 2. 上方各行整行扫描：每行先找分组头，再退回任意纵向扩展格
+* 小计（preferGroup）禁止把明细当成父格
+*/
+function inferRowParentCandidate(addr, getBindingAt, options) {
+	const preferGroup = options?.preferGroup === true;
+	const sameRow = pickExpandHit(scanVerticalOnRow(addr.row, addr.col, 0, addr.col, getBindingAt), preferGroup);
+	if (sameRow) return sameRow;
+	for (let row = addr.row - 1; row >= 0; row--) {
+		const found = pickExpandHit(scanVerticalOnRow(row, addr.col, 0, DEFAULT_SCAN_COLS, getBindingAt), preferGroup);
+		if (found) return found;
+	}
+	return null;
+}
+/**
+* 列方向父格推断（与行方向对称）：
+* 1. 同列向上：先找列分组头，否则最近横向扩展格
+* 2. 左侧各列整列扫描：每列先找列分组头
+* 列小计（preferGroup）禁止把交叉格/明细当成列父格
+*/
+function inferColParentCandidate(addr, getBindingAt, options) {
+	const preferGroup = options?.preferGroup === true;
+	const sameCol = pickExpandHit(scanHorizontalOnCol(addr.col, addr.row, 0, addr.row, getBindingAt), preferGroup);
+	if (sameCol) return sameCol;
+	for (let col = addr.col - 1; col >= 0; col--) {
+		const found = pickExpandHit(scanHorizontalOnCol(col, addr.row, 0, DEFAULT_SCAN_ROWS, getBindingAt), preferGroup);
+		if (found) return found;
 	}
 	return null;
 }
+function suggestsColumnSubtotal(above) {
+	if (!above) return false;
+	return isHorizontalExpandBinding(above) || !!above.colParent || above.preset === "cross";
+}
+function suggestsRowSubtotal(left) {
+	if (!left) return false;
+	return isVerticalExpandBinding(left) || !!left.rowParent || left.preset === "cross";
+}
+/**
+* 按预设写入落格父格：明细/分组/交叉双方向推断；小计按「下方行小计 / 右侧列小计」只挂对应轴。
+*/
+function inferParentsForPreset(addr, preset, getBindingAt) {
+	if (preset === "grandTotal") return {};
+	const preferGroup = preset === "subtotal" || preset === "cross";
+	const rowParent = inferRowParentCandidate(addr, getBindingAt, { preferGroup }) ?? void 0;
+	const colParent = inferColParentCandidate(addr, getBindingAt, { preferGroup }) ?? void 0;
+	if (preset !== "subtotal") return {
+		...rowParent ? { rowParent } : {},
+		...colParent ? { colParent } : {}
+	};
+	const above = addr.row > 0 ? getBindingAt({
+		row: addr.row - 1,
+		col: addr.col
+	}) : void 0;
+	const left = addr.col > 0 ? getBindingAt({
+		row: addr.row,
+		col: addr.col - 1
+	}) : void 0;
+	const belowBand = addr.row > 0 && isExpansionBandRow(addr.row - 1, getBindingAt);
+	const rightOfBand = addr.col > 0 && isExpansionBandCol(addr.col - 1, getBindingAt);
+	const columnSubtotal = suggestsColumnSubtotal(above) || rightOfBand && !suggestsRowSubtotal(left);
+	const rowSubtotal = suggestsRowSubtotal(left) || belowBand && !columnSubtotal;
+	const result = {};
+	if (rowSubtotal && rowParent) result.rowParent = rowParent;
+	if (columnSubtotal && colParent) result.colParent = colParent;
+	if (!rowSubtotal && !columnSubtotal) if (belowBand && rowParent) result.rowParent = rowParent;
+	else if (rightOfBand && colParent) result.colParent = colParent;
+	else {
+		if (rowParent) result.rowParent = rowParent;
+		if (colParent) result.colParent = colParent;
+	}
+	return result;
+}
 /** 从绑定字段推断预设；不匹配任何预设时返回 null（自定义） */
 function inferReportPreset(binding) {
 	if (binding.preset) return binding.preset;
-	if (binding.expand === "none" && binding.aggregate === "sum" && binding.rowParent && binding.colParent) return "cross";
-	if (binding.expand === "none" && binding.aggregate === "sum" && !binding.rowParent && !binding.colParent) return "grandTotal";
-	if (binding.expand === "none" && binding.aggregate === "sum" && binding.rowParent && !binding.colParent) return "subtotal";
+	if (binding.expand === "none" && isReductionAggregate(binding.aggregate)) {
+		if (binding.rowParent && binding.colParent) return "cross";
+		if (binding.rowParent || binding.colParent) return "subtotal";
+		return "grandTotal";
+	}
 	if (binding.aggregate === "group" && (binding.expand === "down" || binding.expand === "right")) return "groupHeader";
 	if (binding.aggregate === "list" && (binding.expand === "down" || binding.expand === "right")) return "detail";
 	return null;
@@ -167,9 +312,21 @@ function resolveFieldLabel(datasetId, fieldName, resolveLabel) {
 	if (override) return override;
 	return (bindingCatalog.find((d) => d.id === datasetId)?.fields.find((f) => f.name === fieldName))?.label ?? fieldName;
 }
+/** Binding Placeholder 分段文案（聚合标签 + 字段标签），供徽章分色渲染等场景使用 */
+function formatBindingPlaceholderParts(binding, resolveLabel) {
+	return {
+		tag: AGGREGATE_PLACEHOLDER_TAG[binding.aggregate],
+		label: resolveFieldLabel(binding.dataset, binding.field, resolveLabel)
+	};
+}
 /** Binding Placeholder 中文可读文案（如「分组 · 客户」） */
 function formatBindingPlaceholder(binding, resolveLabel) {
-	return `${AGGREGATE_PLACEHOLDER_TAG[binding.aggregate]} · ${resolveFieldLabel(binding.dataset, binding.field, resolveLabel)}`;
+	const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel);
+	return `${tag} · ${label}`;
+}
+/** 父格下拉候选文案（如「分组 · 客户 (A2)」） */
+function formatParentCandidateLabel(addr, binding, resolveLabel) {
+	return `${formatBindingPlaceholder(binding, resolveLabel)} (${formatCellAddress(addr)})`;
 }
 //#endregion
-export { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatBindingPlaceholder, formatCellAddress, inferColParentCandidate, inferDropPreset, inferReportPreset, inferRowParentCandidate, isExpansionBandRow, isHorizontalExpandBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, parseCellAddress, presetBindingPatch, setBindingCatalog };
+export { 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 };

package/dist/report/connector.js

@@ -43,7 +43,7 @@ function toConnectorError(value) {
 function normalizeField(field) {
 	return {
 		name: field.name,
-		label: field.name,
+		label: field.label ?? field.name,
 		type: field.type ?? "string"
 	};
 }

package/dist/report/export-xlsx.d.ts

@@ -1,7 +1,7 @@
 import { Sheet } from "@veltra/sheet-core";
 import { ColumnDef } from "hucre";
 //#region src/report/export-xlsx.d.ts
-/** 列宽条目：模型列索引 → 像素宽（sheet-core 列宽未进 SheetSnapshot，导出时由调用方显式传入） */
+/** 列宽条目：模型列索引 → 像素宽（与 SheetSnapshot.colWidths 同构） */
 type ReportColWidthEntry = readonly [number, number];
 /** VTable 像素列宽 → Excel 字符宽度（近似换算） */
 declare function pxToExcelColWidth(px: number): number;
@@ -10,10 +10,8 @@ declare function buildColumnDefs(colWidths: ReadonlyArray<ReportColWidthEntry>):
 /**
  * 将已填充的 Sheet（Filled Report）导出为保真 XLSX（合并 / 样式 / 行高 / 列宽）。
  * 条件样式颜色已在 renderReport 展开阶段打平进 StylePool（ADR-0001 决策 2）。
- *
- * 与 `exportWorkbookXlsx`（sheet-core）的差异：列宽未进 SheetSnapshot，
- * 只能经 VTable 运行时读取，故这里接收显式列宽并写入 columns 定义。
+ * 列宽取自 sheet 模型（`getColWidths`）。
  */
-declare function exportFilledReportXlsx(sheet: Sheet, colWidths: ReadonlyArray<ReportColWidthEntry>): Promise<Uint8Array>;
+declare function exportFilledReportXlsx(sheet: Sheet): Promise<Uint8Array>;
 //#endregion
 export { ReportColWidthEntry, buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth };