@veltra/sheet 2.3.3 → 2.4.0

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

@@ -1,22 +1,34 @@
+import { buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "../../report/drill.js";
 import { renderReport, resolveFilledColWidths } from "../../report/render/index.js";
 import { fetchTemplateRecords, resolveParamDefaults, resolveTemplateParams } from "../../report/template.js";
 import { computed, ref, shallowRef, watch } from "vue";
+import { cellKey } from "@veltra/sheet-core";
 //#region src/components/report/use-report-viewer.ts
 /**
 * UReportViewer 的 headless 编排：参数提取 → 取数 → renderReport 展开。
 * 不持有 DOM / 网格引用；填充快照经 `filledSnapshot` 交给组件壳应用。
+* 下钻：openMode 'switch' 栈式切换当前层；'dialog' 由组件壳解析目标后嵌套独立查看器。
+* 导出 / 打印始终作用于当前可见层。
 */
 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 drillStack = shallowRef(null);
+	const drillHits = shallowRef(/* @__PURE__ */ new Map());
+	const currentTemplate = computed(() => {
+		const stack = drillStack.value;
+		return stack ? currentDrillLayer(stack).template : props.template;
+	});
+	const drillDepth = computed(() => (drillStack.value?.length ?? 1) - 1);
+	const canDrillBack = computed(() => drillDepth.value > 0);
+	const params = computed(() => resolveTemplateParams(currentTemplate.value));
 	const values = shallowRef({});
 	let fetchSeq = 0;
 	async function refresh() {
 		const current = ++fetchSeq;
-		const template = props.template;
+		const template = currentTemplate.value;
 		loading.value = true;
 		error.value = null;
 		const result = await fetchTemplateRecords(props.connector, template, values.value);
@@ -29,15 +41,81 @@ function useReportViewer(props) {
 		}
 		filledSnapshot.value = renderReport(template, result.data);
 		filledColWidths.value = template.colWidths?.length ? resolveFilledColWidths(template, result.data, template.colWidths) : void 0;
+		drillHits.value = props.resolveTemplate ? buildDrillHitMap(template, result.data) : /* @__PURE__ */ new Map();
+	}
+	/** 切层共有收尾：清填充结果与命中索引，写入新层参数并重新取数 */
+	function transitionTo(layerParams) {
+		filledSnapshot.value = null;
+		filledColWidths.value = void 0;
+		drillHits.value = /* @__PURE__ */ new Map();
+		values.value = layerParams;
+		return refresh();
+	}
+	async function resolveDrillTarget(config, record) {
+		const resolve = props.resolveTemplate;
+		if (!resolve) return null;
+		let target;
+		try {
+			target = await resolve(config.target);
+		} catch (err) {
+			error.value = {
+				code: "DRILL_RESOLVE_FAILED",
+				message: err instanceof Error ? err.message : String(err)
+			};
+			return null;
+		}
+		if (!target) {
+			error.value = {
+				code: "DRILL_RESOLVE_FAILED",
+				message: `下钻目标模板解析失败：${config.target}`
+			};
+			return null;
+		}
+		error.value = null;
+		return {
+			template: target,
+			params: {
+				...resolveParamDefaults(resolveTemplateParams(target)),
+				...resolveDrillParams(config, record)
+			}
+		};
+	}
+	async function drillInto(config, record) {
+		const next = await resolveDrillTarget(config, record);
+		if (!next) return;
+		const base = drillStack.value ?? createDrillStack({
+			template: props.template,
+			params: values.value
+		});
+		drillStack.value = pushDrillLayer(base, {
+			template: next.template,
+			params: next.params
+		}, values.value);
+		await transitionTo(next.params);
+	}
+	async function drillBack() {
+		const stack = drillStack.value;
+		if (!stack || stack.length <= 1) return;
+		const next = popDrillLayer(stack);
+		drillStack.value = next;
+		await transitionTo({ ...currentDrillLayer(next).params });
+	}
+	function resolveDrillHit(addr) {
+		return drillHits.value.get(cellKey(addr)) ?? null;
 	}
 	function setValues(next) {
 		values.value = next;
 		refresh();
 	}
 	watch(() => props.template, () => {
+		drillStack.value = null;
+		drillHits.value = /* @__PURE__ */ new Map();
 		filledSnapshot.value = null;
 		filledColWidths.value = void 0;
-		values.value = resolveParamDefaults(params.value);
+		values.value = {
+			...resolveParamDefaults(params.value),
+			...props.initialValues
+		};
 		refresh();
 	}, { immediate: true });
 	return {
@@ -47,6 +125,13 @@ function useReportViewer(props) {
 		error,
 		filledSnapshot,
 		filledColWidths,
+		currentTemplate,
+		drillDepth,
+		canDrillBack,
+		resolveDrillHit,
+		resolveDrillTarget,
+		drillInto,
+		drillBack,
 		refresh,
 		setValues
 	};

package/dist/components/sheet/insert-image.js

@@ -18,7 +18,7 @@ const EXT_TO_TYPE = {
 	svg: "svg",
 	webp: "webp"
 };
-/** MIME → hucre 图片类型；MIME 为空时回落扩展名 */
+/** MIME → sheet-core 图片类型（core/image 的 SheetImageType）；MIME 为空时回落扩展名 */
 function resolveImageType(file) {
 	const mime = file.type.trim().toLowerCase();
 	if (mime && MIME_TO_TYPE[mime]) return MIME_TO_TYPE[mime];

package/dist/components/sheet/popups/import.worker.js

@@ -3,10 +3,9 @@ self.onmessage = (e) => {
 	const { buffer } = e.data;
 	(async () => {
 		try {
-			const [{ readXlsx }, { buildWorkbookFromHucre, XLSX_READ_OPTIONS }] = await Promise.all([import("hucre/xlsx"), import("@veltra/sheet-core/core/io/import")]);
-			const hucreWb = await readXlsx(new Uint8Array(buffer), XLSX_READ_OPTIONS);
+			const { importXlsx } = await import("@veltra/sheet-core/core/io/import");
 			let lastPercent = -1;
-			const wb = buildWorkbookFromHucre(hucreWb, (done, total) => {
+			const wb = await importXlsx(new Uint8Array(buffer), (done, total) => {
 				const percent = total > 0 ? Math.floor(done / total * 10) : 10;
 				if (percent !== lastPercent || done === total) {
 					lastPercent = percent;

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

@@ -78,8 +78,8 @@ function useSheetState(props, emit, hooks) {
 		];
 	}
 	/**
-	* 工作簿内容被结构性替换后同步（如导入 xlsx 的 replaceWorkbook）：
-	* replaceWorkbook 未必触发 active-sheet-change（同 index），需显式同步 tabs、
+	* 工作簿内容被结构性替换后同步（如导入 xlsx 的 replaceWorkbookWithSnapshots）：
+	* 整簿替换未必触发 active-sheet-change（同 index），需显式同步 tabs、
 	* 重绑 sheet 事件并重建网格。
 	*/
 	function syncFromWorkbook() {

package/dist/index.d.ts

@@ -4,18 +4,20 @@ import _sfc_main from "./components/report/report-designer.js";
 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 { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField, DatasetRecords, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, ReportAggregate, ReportBinding, ReportDrillConfig, ReportExpand, ReportPreset, ReportSort, ReportTemplateListItem } from "./report/types.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";
+import { ReportColWidthEntry, exportFilledReportXlsx } from "./report/export-xlsx.js";
 import { mapFilledColWidths } from "./report/render/builder.js";
 import { renderReport, resolveFilledColWidths } from "./report/render/index.js";
 import { ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, QueryResult, Result, createHttpConnector, resolvePortOnTypeChange } from "./report/connector.js";
 import { IncompatibleTemplateVersionError, REPORT_TEMPLATE_VERSION, ReportDatasetDef, ReportTemplate, assertCompatibleTemplateVersion, createReportTemplate, fetchTemplateRecords, getBoundDatasetIds, getTemplateDatasets, resolveParamDefaults, resolveTemplateParams } from "./report/template.js";
 import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./report/filter-bar.js";
+import { DrillHit, DrillStack, DrillStackLayer, ResolveReportTemplate, buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "./report/drill.js";
+import { ReportPrintOptions, buildFilledReportPrintHtml } from "./report/print.js";
 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, 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 };
+export { type ConditionalEvalContext, ConditionalOperator, ConditionalRule, ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, DatasetCatalogItem, DatasetField, DatasetRecords, DrillHit, DrillStack, DrillStackLayer, IncompatibleTemplateVersionError, InferParentOptions, ListParentCandidateOptions, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, QueryResult, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, ReportAggregate, ReportBinding, ReportColWidthEntry, ReportDatasetDef, type ReportDesignerEmits, type ReportDesignerExposed, type ReportDesignerProps, ReportDrillConfig, ReportExpand, ReportPreset, ReportPrintOptions, ReportSort, ReportTemplate, ReportTemplateListItem, type ReportViewerExposed, type ReportViewerProps, ResolveReportTemplate, 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, buildDrillHitMap, buildFilledReportPrintHtml, buildParamDefs, createDrillStack, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, currentDrillLayer, 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, popDrillLayer, prefersGroupParent, presetBindingPatch, presetStillApplies, pushDrillLayer, registerTool, renderReport, resolveBoundDatasetParams, resolveDrillParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };

package/dist/index.js

@@ -2,9 +2,11 @@ import { defaultToolRegistry, registerTool, unregisterTool } from "./tools/regis
 import "./tools/builtin.js";
 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 { exportFilledReportXlsx } from "./report/export-xlsx.js";
+import { buildFilledReportPrintHtml } from "./report/print.js";
 import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./report/filter-bar.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 { buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "./report/drill.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 +15,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, 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 };
+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, buildDrillHitMap, buildFilledReportPrintHtml, buildParamDefs, createDrillStack, createHttpConnector, createReportBinding, createReportTemplate, createSheetContext, currentDrillLayer, 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, popDrillLayer, prefersGroupParent, presetBindingPatch, presetStillApplies, pushDrillLayer, registerTool, renderReport, resolveBoundDatasetParams, resolveDrillParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };

package/dist/report/drill.d.ts

@@ -0,0 +1,48 @@
+import { DatasetRecords, ParamValues, ReportDrillConfig } from "./types.js";
+import { ReportTemplate } from "./template.js";
+import { SheetSnapshot } from "@veltra/sheet-core";
+//#region src/report/drill.d.ts
+/**
+ * 宿主模板解析契约：按下钻 target 引用取回目标模板（允许同步/异步）。
+ * 失败抛错——查看器提示可读错误并停留当前报；设计器配置对话框据此解析目标模板查询参数。
+ */
+type ResolveReportTemplate = (ref: string) => ReportTemplate | Promise<ReportTemplate>;
+/**
+ * 按下钻映射从该格对应记录取值，生成详情报 Filter Bar 参数值。
+ * 记录缺字段（值为 `undefined`）时跳过对应参数，由详情报回退默认值；空映射返回空参数。
+ */
+declare function resolveDrillParams(config: ReportDrillConfig, record: Record<string, unknown>): ParamValues;
+/** 下钻栈层：一张报表模板 + 当时 Filter Bar 参数值（回退时据此恢复并重新取数） */
+interface DrillStackLayer {
+  template: ReportTemplate;
+  params: ParamValues;
+}
+/**
+ * 下钻栈：自根（初始报表）到顶的层序列，至少一层。
+ * 只经下方纯函数做不可变更新（返回新栈），便于组件层直接挂响应式。
+ */
+type DrillStack = DrillStackLayer[];
+/** 以初始报表为根层创建下钻栈 */
+declare function createDrillStack(root: DrillStackLayer): DrillStack;
+/**
+ * 压入详情报新层并使其成为当前层；`currentParams` 把当前层参数定格为离开时的值
+ * （缺省保留原值）。指向自身或成环不做检测，照常压栈，靠 pop 逐级退出。
+ */
+declare function pushDrillLayer(stack: DrillStack, next: DrillStackLayer, currentParams?: ParamValues): DrillStack;
+/** 弹出当前层返回上一层；仅剩根层时原样返回（查看器始终保留一张报表） */
+declare function popDrillLayer(stack: DrillStack): DrillStack;
+/** 当前层（栈顶） */
+declare function currentDrillLayer(stack: DrillStack): DrillStackLayer;
+/** 下钻命中：物理格对应的下钻配置与该格记录 */
+interface DrillHit {
+  config: ReportDrillConfig;
+  record: Record<string, unknown>;
+}
+/**
+ * 构建填充报表的物理格 → 下钻命中索引（每次成功取数后重建）。
+ * 仅含配了下钻的绑定格落点（含分组/汇总格与展开后的实例格，合并跨度内每格都命中）；
+ * 记录由 `resolvePlacementContext` 解析：list 明细取源数据行，分组/汇总取分组上下文。
+ */
+declare function buildDrillHitMap(template: SheetSnapshot, data: DatasetRecords): Map<number, DrillHit>;
+//#endregion
+export { DrillHit, DrillStack, DrillStackLayer, ResolveReportTemplate, buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams };

package/dist/report/drill.js

@@ -0,0 +1,78 @@
+import { buildTemplateIndex } from "./render/template-index.js";
+import { computeExpansionLayout } from "./render/coordinate.js";
+import { AggregateIndex, resolvePlacementContext } from "./render/aggregate.js";
+import { cellKey } from "@veltra/sheet-core";
+//#region src/report/drill.ts
+/**
+* 按下钻映射从该格对应记录取值，生成详情报 Filter Bar 参数值。
+* 记录缺字段（值为 `undefined`）时跳过对应参数，由详情报回退默认值；空映射返回空参数。
+*/
+function resolveDrillParams(config, record) {
+	const values = {};
+	for (const [field, paramId] of Object.entries(config.mapping)) {
+		const value = record[field];
+		if (value === void 0) continue;
+		values[paramId] = value;
+	}
+	return values;
+}
+/** 以初始报表为根层创建下钻栈 */
+function createDrillStack(root) {
+	return [{
+		template: root.template,
+		params: { ...root.params }
+	}];
+}
+/**
+* 压入详情报新层并使其成为当前层；`currentParams` 把当前层参数定格为离开时的值
+* （缺省保留原值）。指向自身或成环不做检测，照常压栈，靠 pop 逐级退出。
+*/
+function pushDrillLayer(stack, next, currentParams) {
+	const top = stack[stack.length - 1];
+	const layers = currentParams ? [...stack.slice(0, -1), {
+		template: top.template,
+		params: { ...currentParams }
+	}] : [...stack];
+	layers.push({
+		template: next.template,
+		params: { ...next.params }
+	});
+	return layers;
+}
+/** 弹出当前层返回上一层；仅剩根层时原样返回（查看器始终保留一张报表） */
+function popDrillLayer(stack) {
+	if (stack.length <= 1) return stack;
+	return stack.slice(0, -1);
+}
+/** 当前层（栈顶） */
+function currentDrillLayer(stack) {
+	return stack[stack.length - 1];
+}
+/**
+* 构建填充报表的物理格 → 下钻命中索引（每次成功取数后重建）。
+* 仅含配了下钻的绑定格落点（含分组/汇总格与展开后的实例格，合并跨度内每格都命中）；
+* 记录由 `resolvePlacementContext` 解析：list 明细取源数据行，分组/汇总取分组上下文。
+*/
+function buildDrillHitMap(template, data) {
+	const hits = /* @__PURE__ */ new Map();
+	const index = buildTemplateIndex(template);
+	const layout = computeExpansionLayout(index, data);
+	const aggregateIndex = new AggregateIndex(data);
+	for (const placement of layout.placements) {
+		const config = placement.binding?.drill;
+		if (!config) continue;
+		const record = resolvePlacementContext(placement, index, data, aggregateIndex);
+		if (!record) continue;
+		const hit = {
+			config,
+			record
+		};
+		for (let row = placement.physical.start.row; row <= placement.physical.end.row; row++) for (let col = placement.physical.start.col; col <= placement.physical.end.col; col++) hits.set(cellKey({
+			row,
+			col
+		}), hit);
+	}
+	return hits;
+}
+//#endregion
+export { buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams };

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

@@ -1,17 +1,13 @@
 import { Sheet } from "@veltra/sheet-core";
-import { ColumnDef } from "hucre";
 //#region src/report/export-xlsx.d.ts
 /** 列宽条目：模型列索引 → 像素宽（与 SheetSnapshot.colWidths 同构） */
 type ReportColWidthEntry = readonly [number, number];
-/** VTable 像素列宽 → Excel 字符宽度（近似换算） */
-declare function pxToExcelColWidth(px: number): number;
-/** 从列宽条目构建 hucre ColumnDef */
-declare function buildColumnDefs(colWidths: ReadonlyArray<ReportColWidthEntry>): ColumnDef[];
 /**
- * 将已填充的 Sheet（Filled Report）导出为保真 XLSX（合并 / 样式 / 行高 / 列宽）。
+ * 将已填充的 Sheet（Filled Report）导出为保真 XLSX（合并 / 样式 / 行高 / 列宽 / 浮动图）。
+ * 组装与序列化委托 sheet-core `exportSheetXlsx`（与 `exportWorkbookXlsx` 同一套单表逻辑）；
  * 条件样式颜色已在 renderReport 展开阶段打平进 StylePool（ADR-0001 决策 2）。
  * 列宽取自 sheet 模型（`getColWidths`）。
  */
 declare function exportFilledReportXlsx(sheet: Sheet): Promise<Uint8Array>;
 //#endregion
-export { ReportColWidthEntry, buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth };
+export { ReportColWidthEntry, exportFilledReportXlsx };

package/dist/report/export-xlsx.js

@@ -1,92 +1,13 @@
-import { rangeToHucre, styleToHucre } from "@veltra/sheet-core/core/io/export";
-import { writeXlsx } from "hucre/xlsx";
+import { exportSheetXlsx } from "@veltra/sheet-core/core/io/export";
 //#region src/report/export-xlsx.ts
-/** 像素 → Excel points */
-function pxToPt(px) {
-	return px * .75;
-}
-/** VTable 像素列宽 → Excel 字符宽度（近似换算） */
-function pxToExcelColWidth(px) {
-	return Math.max(1, Math.round((px - 5) / 7));
-}
-/** 从列宽条目构建 hucre ColumnDef */
-function buildColumnDefs(colWidths) {
-	if (colWidths.length === 0) return [];
-	const maxCol = Math.max(...colWidths.map(([col]) => col));
-	const columns = Array.from({ length: maxCol + 1 }, () => ({}));
-	for (const [col, width] of colWidths) columns[col] = { width: pxToExcelColWidth(width) };
-	return columns;
-}
 /**
-* 将已填充的 Sheet（Filled Report）导出为保真 XLSX（合并 / 样式 / 行高 / 列宽）。
+* 将已填充的 Sheet（Filled Report）导出为保真 XLSX（合并 / 样式 / 行高 / 列宽 / 浮动图）。
+* 组装与序列化委托 sheet-core `exportSheetXlsx`（与 `exportWorkbookXlsx` 同一套单表逻辑）；
 * 条件样式颜色已在 renderReport 展开阶段打平进 StylePool（ADR-0001 决策 2）。
 * 列宽取自 sheet 模型（`getColWidths`）。
 */
-async function exportFilledReportXlsx(sheet) {
-	const widths = [...sheet.getColWidths()];
-	let maxRow = -1;
-	let maxCol = -1;
-	for (const [addr] of sheet.store.entries()) {
-		if (addr.row > maxRow) maxRow = addr.row;
-		if (addr.col > maxCol) maxCol = addr.col;
-	}
-	for (const [row] of sheet.getRowHeights()) if (row > maxRow) maxRow = row;
-	for (const [col] of widths) if (col > maxCol) maxCol = col;
-	const rows = maxRow < 0 ? [] : Array.from({ length: maxRow + 1 }, () => Array.from({ length: maxCol + 1 }, () => null));
-	const cells = /* @__PURE__ */ new Map();
-	for (const [addr, data] of sheet.store.entries()) {
-		const row = rows[addr.row];
-		const key = `${addr.row},${addr.col}`;
-		const cell = {};
-		const style = sheet.getEffectiveStyle(addr);
-		if (style) cell.style = styleToHucre(style);
-		if (data.f != null && data.f !== "") {
-			cell.formula = data.f;
-			if (data.v != null) cell.formulaResult = data.v;
-			row[addr.col] = data.v ?? null;
-			cells.set(key, cell);
-			continue;
-		}
-		if (data.t === "e") {
-			cell.value = data.v;
-			cell.type = "error";
-			row[addr.col] = null;
-			cells.set(key, cell);
-			continue;
-		}
-		if (data.t === "d") {
-			cell.value = data.v;
-			cell.type = "number";
-			cell.style = {
-				...cell.style,
-				numFmt: "yyyy-mm-dd"
-			};
-			row[addr.col] = null;
-			cells.set(key, cell);
-			continue;
-		}
-		row[addr.col] = data.v ?? null;
-		if (Object.keys(cell).length > 0) cells.set(key, cell);
-	}
-	const writeSheet = {
-		name: sheet.name || "报表",
-		rows,
-		...cells.size > 0 ? { cells } : {},
-		...sheet.merges.size > 0 ? { merges: sheet.merges.getMerges().map((range) => rangeToHucre(range)) } : {},
-		...widths.length > 0 ? { columns: buildColumnDefs(widths) } : {}
-	};
-	const frozen = sheet.frozen;
-	if (frozen.rows > 0 || frozen.cols > 0) writeSheet.freezePane = {
-		rows: frozen.rows,
-		columns: frozen.cols
-	};
-	const rowDefs = /* @__PURE__ */ new Map();
-	for (const [row, height] of sheet.getRowHeights()) rowDefs.set(row, { height: pxToPt(height) });
-	if (rowDefs.size > 0) writeSheet.rowDefs = rowDefs;
-	return writeXlsx({
-		sheets: [writeSheet],
-		activeSheet: 0
-	});
+function exportFilledReportXlsx(sheet) {
+	return exportSheetXlsx(sheet, { fallbackName: "报表" });
 }
 //#endregion
-export { buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth };
+export { exportFilledReportXlsx };

package/dist/report/index.d.ts

@@ -1,12 +1,14 @@
-import { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField, DatasetRecords, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, ReportAggregate, ReportBinding, ReportExpand, ReportPreset, ReportSort } from "./types.js";
+import { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField, DatasetRecords, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, ReportAggregate, ReportBinding, ReportDrillConfig, ReportExpand, ReportPreset, ReportSort, ReportTemplateListItem } from "./types.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 "./binding.js";
 import { ConditionalEvalContext, evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./rules/evaluate.js";
 import "./rules/index.js";
 import { buildParamDefs, extractParamIds, resolveBoundDatasetParams } from "./params.js";
-import { ReportColWidthEntry, buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth } from "./export-xlsx.js";
+import { ReportColWidthEntry, exportFilledReportXlsx } from "./export-xlsx.js";
 import { mapFilledColWidths } from "./render/builder.js";
 import { renderReport, resolveFilledColWidths } from "./render/index.js";
 import { ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, QueryResult, Result, createHttpConnector, resolvePortOnTypeChange } from "./connector.js";
 import { IncompatibleTemplateVersionError, REPORT_TEMPLATE_VERSION, ReportDatasetDef, ReportTemplate, assertCompatibleTemplateVersion, createReportTemplate, fetchTemplateRecords, getBoundDatasetIds, getTemplateDatasets, resolveParamDefaults, resolveTemplateParams } from "./template.js";
 import { parseDateRangeValue, patchParamValues, resolveNumberParamValue } from "./filter-bar.js";
-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, ReportExpand, ReportPreset, ReportSort, ReportTemplate, Result, applyReportPreset, assertCompatibleTemplateVersion, buildColumnDefs, buildParamDefs, createHttpConnector, createReportBinding, createReportTemplate, 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, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber };
+import { DrillHit, DrillStack, DrillStackLayer, ResolveReportTemplate, buildDrillHitMap, createDrillStack, currentDrillLayer, popDrillLayer, pushDrillLayer, resolveDrillParams } from "./drill.js";
+import { ReportPrintOptions, buildFilledReportPrintHtml } from "./print.js";
+export { type ConditionalEvalContext, ConditionalOperator, ConditionalRule, ConnectionType, ConnectorError, CreateHttpConnectorOptions, DEFAULT_CONNECTION_PORTS, DataConnection, DataConnector, DatasetCatalogItem, DatasetField, DatasetRecords, DrillHit, DrillStack, DrillStackLayer, IncompatibleTemplateVersionError, InferParentOptions, ListParentCandidateOptions, ParamValues, QueryParamDef, QueryParamOption, QueryParamType, QueryResult, REPORT_META_NAMESPACE, REPORT_TEMPLATE_VERSION, ReportAggregate, ReportBinding, ReportColWidthEntry, ReportDatasetDef, ReportDrillConfig, ReportExpand, ReportPreset, ReportPrintOptions, ReportSort, ReportTemplate, ReportTemplateListItem, ResolveReportTemplate, Result, applyReportPreset, assertCompatibleTemplateVersion, buildDrillHitMap, buildFilledReportPrintHtml, buildParamDefs, createDrillStack, createHttpConnector, createReportBinding, createReportTemplate, currentDrillLayer, 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, popDrillLayer, prefersGroupParent, presetBindingPatch, presetStillApplies, pushDrillLayer, renderReport, resolveBoundDatasetParams, resolveDrillParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber };

package/dist/report/print.d.ts

@@ -0,0 +1,23 @@
+import { Sheet } from "@veltra/sheet-core";
+//#region src/report/print.d.ts
+/** 报表打印选项 */
+interface ReportPrintOptions {
+  /** 打印文档标题（打印对话框标题 / 另存 PDF 文件名）；缺省取 sheet 名，再回落「报表」 */
+  title?: string;
+  /** 纸张方向（@page size），默认 portrait */
+  orientation?: 'portrait' | 'landscape';
+}
+/**
+ * 将已填充的 Sheet（Filled Report）构建为打印专用 HTML 文档（纯 TS、headless、无 DOM）。
+ *
+ * 路线说明：网格渲染层是 canvas + 虚拟滚动（视口外不绘制），无法直接 window.print；
+ * 这里从模型单一事实源（与 exportFilledReportXlsx 同一读取路径）重建 `<table>`——
+ * 矢量文字清晰、浏览器原生分页、合并格天然映射 rowspan/colspan。
+ *
+ * 保真范围：值 / 合并 / 有效样式（fill + border + font + align/wrap，条件样式已在
+ * 展开阶段打平进 StylePool）/ 行高 / 列宽 / 浮动图（data URL 内嵌，跨页被裁剪属预期）。
+ * 与 Excel 默认一致：不打印屏幕网格线（仅模型显式边框）。
+ */
+declare function buildFilledReportPrintHtml(sheet: Sheet, options?: ReportPrintOptions): string;
+//#endregion
+export { ReportPrintOptions, buildFilledReportPrintHtml };