@veltra/sheet 2.3.3 → 2.3.4

package/dist/components/report/binding-badge.js

@@ -46,21 +46,33 @@ function createBindingBadgeStyleResolver(getBindingAt) {
 	};
 }
 /**
+* 单元格对齐 → 徽章容器 flex 布局映射（纯函数，便于单测）：
+* `horizontal` left / 缺省 → 主轴起点；`vertical` middle / 缺省 → 交叉轴居中。
+*/
+function badgeLayoutProps(align) {
+	return {
+		justifyContent: align?.horizontal === "center" ? "center" : align?.horizontal === "right" ? "flex-end" : "flex-start",
+		alignItems: align?.vertical === "top" ? "flex-start" : align?.vertical === "bottom" ? "flex-end" : "center"
+	};
+}
+/**
 * 绑定格富渲染徽章（ADR-0004 `resolveCellRenderer` 首个消费者）：
-* 绑定单元格渲染为左对齐徽章（强调色聚合标签 + 中性色字段标签），
+* 绑定单元格渲染为徽章布局（强调色聚合标签 + 中性色字段标签），
+* 布局跟随单元格水平 / 垂直对齐（经 `resolveAlign` 读有效样式）；
 * 未绑定格返回 `undefined` 回落默认渲染。
 */
-function createBindingBadgeRenderer(getBindingAt, resolveLabel) {
+function createBindingBadgeRenderer(getBindingAt, resolveLabel, resolveAlign) {
 	return (addr) => {
 		const binding = getBindingAt(addr);
 		if (!binding) return void 0;
 		const { fg } = resolveBadgeColor(binding);
 		const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel);
+		const { justifyContent, alignItems } = badgeLayoutProps(resolveAlign?.(addr));
 		const rootContainer = new CustomLayout.Container({
 			display: "flex",
 			flexDirection: "row",
-			justifyContent: "flex-start",
-			alignItems: "center"
+			justifyContent,
+			alignItems
 		});
 		const tagEl = new CustomLayout.Tag({
 			text: tag,
@@ -97,4 +109,4 @@ function createBindingBadgeRenderer(getBindingAt, resolveLabel) {
 	};
 }
 //#endregion
-export { REPORT_PRESET_BADGE_COLORS, createBindingBadgeRenderer, createBindingBadgeStyleResolver };
+export { REPORT_PRESET_BADGE_COLORS, badgeLayoutProps, createBindingBadgeRenderer, createBindingBadgeStyleResolver };

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

@@ -295,7 +295,7 @@ function useReportDesigner(options) {
 		return props.connector.query(connection, dataset.sql, values);
 	}
 	const resolveCellStyle = createBindingBadgeStyleResolver(getBindingAt);
-	const resolveCellRenderer = createBindingBadgeRenderer(getBindingAt, resolveFieldLabel);
+	const resolveCellRenderer = createBindingBadgeRenderer(getBindingAt, resolveFieldLabel, (addr) => workbook.value.activeSheet.getEffectiveStyle(addr)?.align);
 	function getTemplate() {
 		const resolved = datasets.value.flatMap((dataset) => {
 			const connection = resolveDatasetConnection(dataset);

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

@@ -8,7 +8,7 @@ import { ConditionalOperator, ConditionalRule, DatasetCatalogItem, DatasetField,
 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";
@@ -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, 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, 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, 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, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };

package/dist/index.js

@@ -2,7 +2,7 @@ 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 { 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 { evaluateCondition, evaluateConditionalStyle, resolveRuleCompareValue, toComparableNumber } from "./report/rules/evaluate.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, 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, 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, registerTool, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber, unregisterTool };

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

@@ -3,10 +3,10 @@ import { InferParentOptions, ListParentCandidateOptions, REPORT_META_NAMESPACE,
 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 };
+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, 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, renderReport, resolveBoundDatasetParams, resolveFilledColWidths, resolveNumberParamValue, resolveParamDefaults, resolvePortOnTypeChange, resolveRuleCompareValue, resolveTemplateParams, setBindingCatalog, toComparableNumber };

package/dist/tools/download.js

@@ -2,7 +2,7 @@ import { saveBlob } from "@cat-kit/fe";
 import { exportSheetCsv, exportWorkbookXlsx } from "@veltra/sheet-core/core/io/export";
 //#region src/tools/download.ts
 /**
-* 大工作簿的 XLSX 导出（hucre 序列化 + ZIP 压缩为秒级同步重活）移入 Web Worker：
+* 大工作簿的 XLSX 导出（sheet-core 序列化 + ZIP 压缩为秒级同步重活）移入 Web Worker：
 * 主线程只采集快照（结构化克隆友好的纯数据，行高随 SheetSnapshot.rowHeights
 * 携带），序列化与压缩在 worker 线程进行。worker 不可用（极端环境 / 打包产物
 * 缺文件）回退主线程导出——与导入侧 parseXlsxAsync 同一模式。
@@ -48,7 +48,7 @@ async function exportWorkbookXlsxAsync(workbook) {
 /**
 * 导出当前工作簿为 .xlsx（无 workbook 时空操作）。
 * 下载动作复用 @cat-kit/fe 的 saveBlob（#28：不再自研 Object URL + a.click）。
-* hucre 1.0 起 writeXlsx 会校验 sheet 名（Excel 非法字符 / 超长 / 保留名）并抛
+* 导出侧 sheet-core 的 writeXlsx 会校验 sheet 名（Excel 非法字符 / 超长 / 保留名）并抛
 * InvalidArgumentError——失败经返回的 Promise 传播，调用方（导出面板）负责提示。
 */
 async function exportWorkbookFile(ctx) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "homepage": "https://github.com/cabinet-fe/ultra-ui#readme",
   "bugs": {
     "url": "https://github.com/cabinet-fe/ultra-ui/issues"
@@ -33,16 +33,13 @@
       "import": "./dist/*"
     }
   },
-  "dependencies": {
-    "hucre": "^1.1.0"
-  },
   "peerDependencies": {
     "@cat-kit/core": ">=1.1.8",
     "@cat-kit/fe": ">=1.1.8",
     "@veltra/compositions": "^1.6.4",
     "@veltra/desktop": "^1.6.4",
     "@veltra/icons": "^1.5.0",
-    "@veltra/sheet-core": "^2.3.3",
+    "@veltra/sheet-core": "^2.3.4",
     "@veltra/styles": "^1.6.4",
     "@veltra/utils": "^1.6.4",
     "vue": ">=3.5.41"

package/src/components/report/__test__/binding-badge.test.ts

@@ -0,0 +1,92 @@
+import { Sheet } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import { describe, expect, it } from 'vitest'
+
+import { REPORT_META_NAMESPACE, createReportBinding } from '../../../report/binding'
+import type { DatasetCatalogItem, ReportBinding } from '../../../report/types'
+import { badgeLayoutProps, createBindingBadgeRenderer } from '../binding-badge'
+
+// ---- 内联 fixtures ----
+
+const ORDERS_DATASET: DatasetCatalogItem = {
+  id: 'orders',
+  label: '销售明细',
+  fields: [
+    { name: 'customer', label: '客户', type: 'string' },
+    { name: 'amount', label: '金额', type: 'number' }
+  ]
+}
+
+const ADDR = { row: 1, col: 3 }
+
+function bindingMap(entries: Array<{ addr: CellAddress; binding: ReportBinding }>) {
+  const map = new Map<string, ReportBinding>()
+  for (const { addr, binding } of entries) map.set(`${addr.row},${addr.col}`, binding)
+  return (addr: CellAddress) => map.get(`${addr.row},${addr.col}`)
+}
+
+describe('badgeLayoutProps（单元格对齐 → 徽章容器 flex 映射）', () => {
+  it('缺省对齐 → 主轴起点 + 交叉轴居中（向后兼容）', () => {
+    expect(badgeLayoutProps(undefined)).toEqual({
+      justifyContent: 'flex-start',
+      alignItems: 'center'
+    })
+    expect(badgeLayoutProps({})).toEqual({ justifyContent: 'flex-start', alignItems: 'center' })
+  })
+
+  it('horizontal center / right / left → justifyContent', () => {
+    expect(badgeLayoutProps({ horizontal: 'center' }).justifyContent).toBe('center')
+    expect(badgeLayoutProps({ horizontal: 'right' }).justifyContent).toBe('flex-end')
+    expect(badgeLayoutProps({ horizontal: 'left' }).justifyContent).toBe('flex-start')
+  })
+
+  it('vertical bottom / top / middle → alignItems', () => {
+    expect(badgeLayoutProps({ vertical: 'bottom' }).alignItems).toBe('flex-end')
+    expect(badgeLayoutProps({ vertical: 'top' }).alignItems).toBe('flex-start')
+    expect(badgeLayoutProps({ vertical: 'middle' }).alignItems).toBe('center')
+  })
+})
+
+describe('createBindingBadgeRenderer', () => {
+  it('未绑定格返回 undefined 回落默认渲染', () => {
+    const renderer = createBindingBadgeRenderer(bindingMap([]))
+    expect(renderer(ADDR, undefined)).toBeUndefined()
+  })
+
+  it('绑定格不传 resolveAlign 保持左对齐徽章（向后兼容）', () => {
+    const binding = createReportBinding(ORDERS_DATASET, 'amount')
+    const renderer = createBindingBadgeRenderer(bindingMap([{ addr: ADDR, binding }]))
+    const layout = renderer(ADDR, undefined)
+    expect(layout?.renderDefault).toBe(false)
+    expect(layout?.rootContainer.attribute.justifyContent).toBe('flex-start')
+    expect(layout?.rootContainer.attribute.alignItems).toBe('center')
+  })
+
+  it('绑定格容器跟随 resolveAlign 的水平 / 垂直对齐', () => {
+    const binding = createReportBinding(ORDERS_DATASET, 'amount')
+    const renderer = createBindingBadgeRenderer(
+      bindingMap([{ addr: ADDR, binding }]),
+      undefined,
+      () => ({ horizontal: 'center', vertical: 'bottom' })
+    )
+    const layout = renderer(ADDR, undefined)
+    expect(layout?.rootContainer.attribute.justifyContent).toBe('center')
+    expect(layout?.rootContainer.attribute.alignItems).toBe('flex-end')
+  })
+
+  it('接线冒烟：经 Sheet.getEffectiveStyle 读取有效样式对齐（含行默认样式叠加）', () => {
+    const sheet = new Sheet()
+    sheet.setCellMeta(ADDR, REPORT_META_NAMESPACE, createReportBinding(ORDERS_DATASET, 'amount'))
+    sheet.setCellStyle({ start: ADDR, end: ADDR }, { align: { horizontal: 'center' } })
+    sheet.setRowStyle(ADDR.row, { align: { vertical: 'bottom' } })
+
+    const renderer = createBindingBadgeRenderer(
+      (addr) => sheet.getCellMeta<ReportBinding>(addr, REPORT_META_NAMESPACE),
+      undefined,
+      (addr) => sheet.getEffectiveStyle(addr)?.align
+    )
+    const layout = renderer(ADDR, undefined)
+    expect(layout?.rootContainer.attribute.justifyContent).toBe('center')
+    expect(layout?.rootContainer.attribute.alignItems).toBe('flex-end')
+  })
+})

package/src/components/report/binding-badge.ts

@@ -1,4 +1,4 @@
-import type { CellAddress } from '@veltra/sheet-core'
+import type { CellAddress, CellAlign } from '@veltra/sheet-core'
 import {
   CustomLayout,
   type ResolveCellRenderer,
@@ -51,14 +51,38 @@ export function createBindingBadgeStyleResolver(
   }
 }
 
+/** 徽章容器 flex 布局属性（`flexDirection: 'row'` 下主轴 = 水平） */
+interface BadgeLayoutProps {
+  justifyContent: 'flex-start' | 'center' | 'flex-end'
+  alignItems: 'flex-start' | 'center' | 'flex-end'
+}
+
+/**
+ * 单元格对齐 → 徽章容器 flex 布局映射（纯函数，便于单测）：
+ * `horizontal` left / 缺省 → 主轴起点；`vertical` middle / 缺省 → 交叉轴居中。
+ */
+export function badgeLayoutProps(align: CellAlign | undefined): BadgeLayoutProps {
+  const justifyContent =
+    align?.horizontal === 'center'
+      ? 'center'
+      : align?.horizontal === 'right'
+        ? 'flex-end'
+        : 'flex-start'
+  const alignItems =
+    align?.vertical === 'top' ? 'flex-start' : align?.vertical === 'bottom' ? 'flex-end' : 'center'
+  return { justifyContent, alignItems }
+}
+
 /**
  * 绑定格富渲染徽章（ADR-0004 `resolveCellRenderer` 首个消费者）：
- * 绑定单元格渲染为左对齐徽章（强调色聚合标签 + 中性色字段标签），
+ * 绑定单元格渲染为徽章布局（强调色聚合标签 + 中性色字段标签），
+ * 布局跟随单元格水平 / 垂直对齐（经 `resolveAlign` 读有效样式）；
  * 未绑定格返回 `undefined` 回落默认渲染。
  */
 export function createBindingBadgeRenderer(
   getBindingAt: (addr: CellAddress) => ReportBinding | undefined,
-  resolveLabel?: (datasetId: string, fieldName: string) => string
+  resolveLabel?: (datasetId: string, fieldName: string) => string,
+  resolveAlign?: (addr: CellAddress) => CellAlign | undefined
 ): ResolveCellRenderer {
   return (addr) => {
     const binding = getBindingAt(addr)
@@ -66,12 +90,13 @@ export function createBindingBadgeRenderer(
 
     const { fg } = resolveBadgeColor(binding)
     const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel)
+    const { justifyContent, alignItems } = badgeLayoutProps(resolveAlign?.(addr))
 
     const rootContainer = new CustomLayout.Container({
       display: 'flex',
       flexDirection: 'row',
-      justifyContent: 'flex-start',
-      alignItems: 'center'
+      justifyContent,
+      alignItems
     })
     // VTable 布局层 Tag 组件（vrender-components）与其 INode 声明存在结构性类型偏差，
     // 运行时完全兼容（VTable 官方 customLayout 徽章用法即如此），此处仅收敛类型

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

@@ -483,7 +483,13 @@ export function useReportDesigner(options: UseReportDesignerOptions): UseReportD
   // ---- 渲染与模板 ----
 
   const resolveCellStyle = createBindingBadgeStyleResolver(getBindingAt)
-  const resolveCellRenderer = createBindingBadgeRenderer(getBindingAt, resolveFieldLabel)
+  // 对齐访问器：hook 为长生命周期闭包而 activeSheet 可变（template 载入 / 宿主换 workbook），
+  // 每次调用动态取当前 sheet 的有效样式（getEffectiveStyle 为 O(1) 列→行→格叠加）
+  const resolveCellRenderer = createBindingBadgeRenderer(
+    getBindingAt,
+    resolveFieldLabel,
+    (addr) => workbook.value.activeSheet.getEffectiveStyle(addr)?.align
+  )
 
   function getTemplate(): ReportTemplate {
     const resolved: ReportDatasetDef[] = datasets.value.flatMap((dataset) => {

package/src/components/sheet/insert-image.ts

@@ -24,7 +24,7 @@ const EXT_TO_TYPE: Record<string, SheetImageType> = {
   webp: 'webp'
 }
 
-/** MIME → hucre 图片类型；MIME 为空时回落扩展名 */
+/** MIME → sheet-core 图片类型（core/image 的 SheetImageType）；MIME 为空时回落扩展名 */
 export function resolveImageType(file: File): SheetImageType | undefined {
   const mime = file.type.trim().toLowerCase()
   if (mime && MIME_TO_TYPE[mime]) return MIME_TO_TYPE[mime]

package/src/components/sheet/popups/export-popup.vue

@@ -30,7 +30,7 @@ const cls = bem('sheet')
 function exportXlsx(): void {
   emit('close')
   // 大工作簿序列化在 worker 中进行（数秒）：给常驻反馈，失败（如 sheet 名含
-  // Excel 非法字符，hucre 1.0 写入校验抛 InvalidArgumentError）明确报错，
+  // Excel 非法字符，sheet-core 写入校验抛 InvalidArgumentError）明确报错，
   // 绝不静默失败
   const loading = message({ message: '正在导出…', duration: 0 })
   exportWorkbookFile(props.context)

package/src/components/sheet/popups/import.worker.ts

@@ -1,15 +1,16 @@
 /// <reference lib="webworker" />
 /**
- * XLSX 解析 Worker：hucre 解析 + 模型构建（大文件 3~4s 同步重活）
+ * XLSX 解析 Worker：xlsx 解析 + 模型构建（大文件 3~4s 同步重活）
  * 移到独立线程，主线程保持空闲（loading 动画正常、交互不冻结）。
  *
  * 协议：主线程 postMessage({ buffer: ArrayBuffer }) → worker 返回
- * - { type: 'progress', done, total }（模型分片构建进度，readXlsx 同步解析段无进度）
+ * - { type: 'progress', done, total }（模型分片构建进度，xlsx 解析段无进度）
  * - { type: 'done', ok: true, sheets: [{ name, snapshot }], activeIndex }（快照为
  *   纯数据，可结构化克隆）；失败 { type: 'done', ok: false, error }。
  *
- * 名字唯一化与活动表对齐由 buildWorkbookFromHucre 完成（worker 内），主线程
- * 直接把快照替换进目标（无 undo 历史——替换语义由确认后的 replaceWorkbook 负责）。
+ * 解析与构建经 sheet-core importXlsx 完成（hucre 仅由 sheet-core 依赖）；
+ * 名字唯一化与活动表对齐在 worker 内完成，主线程直接把快照替换进目标
+ * （无 undo 历史——替换语义由确认后的 replaceWorkbookWithSnapshots 负责）。
  *
  * 注意：必须用**运行时动态 import**——worker 顶层静态 import 在 vite dev 的
  * worker 上下文中会因模块图加载顺序导致 `Workbook is not defined`（实测）。
@@ -30,15 +31,11 @@ self.onmessage = (e: MessageEvent<{ buffer: ArrayBuffer }>): void => {
   const { buffer } = e.data
   void (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')
       // 分片构建：按 10% 粒度回报进度（避免 196 条/秒的消息风暴与文字跳变过快；
       // 模型构建段约 1s，10 次更新肉眼可见数字推进）
       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/src/components/sheet/use-sheet-state.ts

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

package/src/report/__test__/export-xlsx.test.ts

@@ -1,10 +1,9 @@
 import { Sheet } from '@veltra/sheet-core'
-import { buildWorkbookFromHucre, XLSX_READ_OPTIONS } from '@veltra/sheet-core/core/io/import'
-import { readXlsx } from 'hucre/xlsx'
+import { importXlsx } from '@veltra/sheet-core/core/io/import'
 import { describe, expect, it } from 'vitest'
 
 import { REPORT_META_NAMESPACE, createReportBinding } from '../binding'
-import { buildColumnDefs, exportFilledReportXlsx, pxToExcelColWidth } from '../export-xlsx'
+import { exportFilledReportXlsx } from '../export-xlsx'
 import { renderReport } from '../render'
 import type { DatasetCatalogItem } from '../types'
 
@@ -69,8 +68,7 @@ describe('exportFilledReportXlsx', () => {
     expect(buffer[0]).toBe(0x50)
     expect(buffer[1]).toBe(0x4b)
 
-    const hucreWb = await readXlsx(buffer, XLSX_READ_OPTIONS)
-    const workbook = buildWorkbookFromHucre(hucreWb)
+    const workbook = await importXlsx(buffer)
     const sheet = workbook.getSheets()[0]!
 
     // 展开值保真（分组头 + 明细值）
@@ -96,23 +94,3 @@ describe('exportFilledReportXlsx', () => {
     expect(headerStyle?.fill?.color).toBe('#E8EEF7')
   })
 })
-
-describe('buildColumnDefs / pxToExcelColWidth', () => {
-  it('像素列宽换算为 Excel 字符宽度并写入对应列', () => {
-    expect(pxToExcelColWidth(120)).toBe(16)
-    expect(pxToExcelColWidth(0)).toBe(1)
-
-    const columns = buildColumnDefs([
-      [0, 120],
-      [2, 145]
-    ])
-    expect(columns).toHaveLength(3)
-    expect(columns[0]).toEqual({ width: 16 })
-    expect(columns[1]).toEqual({})
-    expect(columns[2]).toEqual({ width: 20 })
-  })
-
-  it('空列宽不产生 columns 定义', () => {
-    expect(buildColumnDefs([])).toEqual([])
-  })
-})

package/src/report/__test__/render.test.ts

@@ -325,6 +325,32 @@ describe('renderReport', () => {
     expect(firstAmount?.s).toBe(styleId)
   })
 
+  it('模板格对齐样式直通 Filled Report 快照（静态格与绑定扩展格）', () => {
+    const sheet = new Sheet()
+    seedGroupDetailTemplate(sheet)
+    // 静态表头格（resolveStatic 路径）
+    sheet.setCellStyle(
+      { start: { row: 0, col: 0 }, end: { row: 0, col: 0 } },
+      { align: { horizontal: 'right' } }
+    )
+    // 绑定明细格（resolveCell 路径，样式随扩展实例复制）
+    sheet.setCellStyle(
+      { start: { row: 1, col: 3 }, end: { row: 1, col: 3 } },
+      { align: { horizontal: 'center' } }
+    )
+
+    const filled = renderReport(sheet.snapshot(), MOCK_DATA_RECORDS)
+    const header = filled.cells.find((c) => c.row === 0 && c.col === 0)
+    expect(filled.styles[(header!.s ?? 1) - 1]?.align?.horizontal).toBe('right')
+
+    const firstAmount = filled.cells.find((c) => c.row === 1 && c.col === 3)
+    expect(firstAmount?.s).toBeDefined()
+    expect(filled.styles[(firstAmount!.s ?? 1) - 1]?.align?.horizontal).toBe('center')
+    // 展开带后续实例同样携带对齐
+    const secondAmount = filled.cells.find((c) => c.row === 2 && c.col === 3)
+    expect(filled.styles[(secondAmount!.s ?? 1) - 1]?.align?.horizontal).toBe('center')
+  })
+
   it('subtotal 支持 avg / count 聚合', () => {
     const sheet = new Sheet()
     seedGroupDetailTemplate(sheet)

package/src/report/export-xlsx.ts

@@ -1,113 +1,15 @@
 import type { Sheet } from '@veltra/sheet-core'
-import { rangeToHucre, styleToHucre } from '@veltra/sheet-core/core/io/export'
-import type { Cell, CellValue, ColumnDef, RowDef, WriteSheet } from 'hucre'
-import { writeXlsx } from 'hucre/xlsx'
+import { exportSheetXlsx } from '@veltra/sheet-core/core/io/export'
 
 /** 列宽条目：模型列索引 → 像素宽（与 SheetSnapshot.colWidths 同构） */
 export type ReportColWidthEntry = readonly [number, number]
 
-/** 像素 → Excel points */
-function pxToPt(px: number): number {
-  return px * 0.75
-}
-
-/** VTable 像素列宽 → Excel 字符宽度（近似换算） */
-export function pxToExcelColWidth(px: number): number {
-  return Math.max(1, Math.round((px - 5) / 7))
-}
-
-/** 从列宽条目构建 hucre ColumnDef */
-export function buildColumnDefs(colWidths: ReadonlyArray<ReportColWidthEntry>): ColumnDef[] {
-  if (colWidths.length === 0) return []
-  const maxCol = Math.max(...colWidths.map(([col]) => col))
-  const columns: ColumnDef[] = 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`）。
  */
-export async function exportFilledReportXlsx(sheet: Sheet): Promise<Uint8Array> {
-  const widths: ReportColWidthEntry[] = [...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 as CellValue)
-        )
-  const cells = new Map<string, Partial<Cell>>()
-
-  for (const [addr, data] of sheet.store.entries()) {
-    const row = rows[addr.row]!
-    const key = `${addr.row},${addr.col}`
-    const cell: Partial<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 as CellValue
-      row[addr.col] = (data.v as CellValue) ?? null
-      cells.set(key, cell)
-      continue
-    }
-    if (data.t === 'e') {
-      cell.value = data.v as string
-      cell.type = 'error'
-      row[addr.col] = null
-      cells.set(key, cell)
-      continue
-    }
-    if (data.t === 'd') {
-      cell.value = data.v as number
-      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 as CellValue) ?? null
-    if (Object.keys(cell).length > 0) cells.set(key, cell)
-  }
-
-  const writeSheet: 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 = new Map<number, RowDef>()
-  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 })
+export function exportFilledReportXlsx(sheet: Sheet): Promise<Uint8Array> {
+  return exportSheetXlsx(sheet, { fallbackName: '报表' })
 }

package/src/tools/__test__/builtin.test.ts

@@ -122,7 +122,7 @@ describe('内置工具（dogfood 扩展机制）', () => {
     }
   })
 
-  it('导出 xlsx：sheet 名含 Excel 非法字符时 reject（hucre 1.0 写入校验，错误传播给调用方）', async () => {
+  it('导出 xlsx：sheet 名含 Excel 非法字符时 reject（sheet-core 写入校验，错误传播给调用方）', async () => {
     const workbook = new Workbook()
     workbook.renameSheet('Sheet1', 'a:b')
     const ctx = createSheetContext(workbook.activeSheet, workbook)

package/src/tools/download.ts

@@ -6,7 +6,7 @@ import type { SheetContext } from './context'
 import type { ExportWorkerPayload, ExportWorkerResponse } from './export.worker'
 
 /**
- * 大工作簿的 XLSX 导出（hucre 序列化 + ZIP 压缩为秒级同步重活）移入 Web Worker：
+ * 大工作簿的 XLSX 导出（sheet-core 序列化 + ZIP 压缩为秒级同步重活）移入 Web Worker：
  * 主线程只采集快照（结构化克隆友好的纯数据，行高随 SheetSnapshot.rowHeights
  * 携带），序列化与压缩在 worker 线程进行。worker 不可用（极端环境 / 打包产物
  * 缺文件）回退主线程导出——与导入侧 parseXlsxAsync 同一模式。
@@ -55,7 +55,7 @@ async function exportWorkbookXlsxAsync(workbook: Workbook): Promise<Uint8Array>
 /**
  * 导出当前工作簿为 .xlsx（无 workbook 时空操作）。
  * 下载动作复用 @cat-kit/fe 的 saveBlob（#28：不再自研 Object URL + a.click）。
- * hucre 1.0 起 writeXlsx 会校验 sheet 名（Excel 非法字符 / 超长 / 保留名）并抛
+ * 导出侧 sheet-core 的 writeXlsx 会校验 sheet 名（Excel 非法字符 / 超长 / 保留名）并抛
  * InvalidArgumentError——失败经返回的 Promise 传播，调用方（导出面板）负责提示。
  */
 export async function exportWorkbookFile(ctx: SheetContext): Promise<void> {

package/src/tools/export.worker.ts

@@ -1,6 +1,6 @@
 /// <reference lib="webworker" />
 /**
- * XLSX 导出 Worker：exportWorkbookXlsx（模型 → hucre 序列化 + ZIP 压缩，
+ * XLSX 导出 Worker：sheet-core exportWorkbookXlsx（模型序列化 + ZIP 压缩，
  * 大工作簿为秒级同步重活）移到独立线程，主线程保持空闲。
  *
  * 协议：主线程 postMessage({ sheets: [{ name, snapshot }], activeIndex }）
@@ -36,7 +36,7 @@ self.onmessage = (e: MessageEvent<ExportWorkerPayload>): void => {
       for (let i = 0; i < sheets.length; i++) {
         const { name, snapshot } = sheets[i]!
         // 首个 sheet 复用 Workbook 自带的默认表：先改名对齐（空名/重名保持原名，
-        // 导出侧 hucre 1.0 会校验表名合法性）
+        // 导出侧 sheet-core 的 writeXlsx 会校验表名合法性）
         const sheet = i === 0 ? wb.activeSheet : wb.addSheet(name)
         if (i === 0 && sheet.name !== name) wb.renameSheet(sheet.name, name)
         sheet.restore(snapshot)