@veltra/sheet 2.1.1 → 2.3.0

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

@@ -0,0 +1,382 @@
+import { REPORT_META_NAMESPACE, applyReportPreset, createReportBinding, formatCellAddress, inferDropPreset, inferParentsForPreset, isColGroupBinding, isHorizontalExpandBinding, isRowGroupBinding, isVerticalExpandBinding, listColParentCandidates, listRowParentCandidates, prefersGroupParent, presetStillApplies } from "../../report/binding.js";
+import { buildParamDefs } from "../../report/params.js";
+import { assertCompatibleTemplateVersion, createReportTemplate, getTemplateDatasets, resolveParamDefaults } from "../../report/template.js";
+import { createBindingBadgeRenderer, createBindingBadgeStyleResolver } from "./binding-badge.js";
+import { computed, onScopeDispose, ref, watch } from "vue";
+import { Workbook } from "@veltra/sheet-core";
+//#region src/components/report/use-report-designer.ts
+/**
+* UReportDesigner 的 headless 编排：连接 / 数据集状态、绑定写 Cell Meta、
+* 角色徽章渲染 hook、`getTemplate()` 模板吐出。不持有 DOM / 网格引用。
+*/
+function useReportDesigner(options) {
+	const { props, connections } = options;
+	/** 设计态工作簿：宿主可注入（USheet / UReportViewer 先例），缺省内部自建 */
+	const internalWorkbook = new Workbook();
+	const workbook = computed(() => props.workbook ?? internalWorkbook);
+	const datasets = ref([]);
+	/** meta 变更计数：boundKeys 等派生状态的响应式触发（绑定经命令系统写入后由模型发 meta-change） */
+	const metaTick = ref(0);
+	const parentPick = ref(null);
+	const offMeta = workbook.value.activeSheet.on("meta-change", () => {
+		metaTick.value++;
+	});
+	onScopeDispose(offMeta);
+	/** 稳定选区地址引用（值未变时不替换对象，避免触发下游 watcher） */
+	const activeCell = ref(null);
+	function syncActiveCell() {
+		const next = workbook.value.activeSheet.getSelection().activeCell ?? null;
+		const prev = activeCell.value;
+		if (!next) {
+			activeCell.value = null;
+			return;
+		}
+		if (prev && prev.row === next.row && prev.col === next.col) return;
+		activeCell.value = {
+			row: next.row,
+			col: next.col
+		};
+	}
+	const offSelection = workbook.value.activeSheet.on("selection-change", syncActiveCell);
+	onScopeDispose(offSelection);
+	syncActiveCell();
+	const selectionLabel = computed(() => activeCell.value ? formatCellAddress(activeCell.value) : "—");
+	const catalog = computed(() => datasets.value.map((dataset) => ({
+		id: dataset.id,
+		label: dataset.label,
+		fields: (dataset.fields ?? []).map((field) => ({
+			...field,
+			label: dataset.fieldOverrides?.[field.name]?.label ?? field.label
+		}))
+	})));
+	/** 字段 label 的 O(1) 查找表（徽章 hook 性能契约） */
+	const fieldLabelMap = computed(() => {
+		const map = /* @__PURE__ */ new Map();
+		for (const dataset of catalog.value) for (const field of dataset.fields) map.set(`${dataset.id}:${field.name}`, field.label);
+		return map;
+	});
+	function resolveFieldLabel(datasetId, fieldName) {
+		return fieldLabelMap.value.get(`${datasetId}:${fieldName}`) ?? fieldName;
+	}
+	const boundKeys = computed(() => {
+		metaTick.value;
+		const keys = /* @__PURE__ */ new Set();
+		for (const [, namespace, payload] of workbook.value.activeSheet.entriesCellMeta()) {
+			if (namespace !== "report") continue;
+			const binding = payload;
+			keys.add(`${binding.dataset}:${binding.field}`);
+		}
+		return keys;
+	});
+	function getBindingAt(addr) {
+		return workbook.value.activeSheet.getCellMeta(addr, REPORT_META_NAMESPACE);
+	}
+	function bindField(datasetId, fieldName, addr) {
+		const dataset = catalog.value.find((item) => item.id === datasetId);
+		if (!dataset) return;
+		const field = dataset.fields.find((item) => item.name === fieldName);
+		const target = addr ?? workbook.value.activeSheet.getSelection().activeCell;
+		if (!target) return;
+		const preset = inferDropPreset(target, field?.type ?? "string", getBindingAt);
+		let binding = createReportBinding(dataset, fieldName);
+		binding = applyReportPreset(binding, preset);
+		const parents = inferParentsForPreset(target, preset, getBindingAt);
+		if (parents.rowParent) binding.rowParent = parents.rowParent;
+		if (parents.colParent) binding.colParent = parents.colParent;
+		workbook.value.activeSheet.setCellMeta(target, REPORT_META_NAMESPACE, binding);
+	}
+	const activeBinding = computed(() => {
+		metaTick.value;
+		const cell = activeCell.value;
+		if (!cell) return void 0;
+		return getBindingAt(cell);
+	});
+	const activeFieldType = computed(() => {
+		const binding = activeBinding.value;
+		if (!binding) return "number";
+		return (catalog.value.find((item) => item.id === binding.dataset)?.fields.find((item) => item.name === binding.field))?.type ?? "number";
+	});
+	const activeDatasetFields = computed(() => {
+		const binding = activeBinding.value;
+		if (!binding) return [];
+		return catalog.value.find((item) => item.id === binding.dataset)?.fields ?? [];
+	});
+	const resolvedRowParentLabel = computed(() => {
+		metaTick.value;
+		const binding = activeBinding.value;
+		if (!binding?.rowParent) return "—";
+		return formatCellAddress(binding.rowParent);
+	});
+	const resolvedColParentLabel = computed(() => {
+		metaTick.value;
+		const binding = activeBinding.value;
+		if (!binding?.colParent) return "—";
+		return formatCellAddress(binding.colParent);
+	});
+	const rowParentCandidates = computed(() => {
+		metaTick.value;
+		const binding = activeBinding.value;
+		if (!binding) return [];
+		return listRowParentCandidates(binding, bindingEntries.value, { preferGroup: prefersGroupParent(binding) });
+	});
+	const colParentCandidates = computed(() => {
+		metaTick.value;
+		const binding = activeBinding.value;
+		if (!binding) return [];
+		return listColParentCandidates(binding, bindingEntries.value, { preferGroup: prefersGroupParent(binding) });
+	});
+	const bindingEntries = computed(() => {
+		metaTick.value;
+		const entries = [];
+		for (const [addr, namespace, payload] of workbook.value.activeSheet.entriesCellMeta()) {
+			if (namespace !== "report") continue;
+			entries.push({
+				addr,
+				binding: payload
+			});
+		}
+		return entries;
+	});
+	function parentNeedsCorrection(addr) {
+		if (!addr) return true;
+		const parent = getBindingAt(addr);
+		return !parent || parent.aggregate === "list";
+	}
+	function patchActiveBinding(patch) {
+		const cell = activeCell.value;
+		const binding = activeBinding.value;
+		if (!cell || !binding) return;
+		const next = {
+			...binding,
+			...patch
+		};
+		if ("rowParent" in patch && patch.rowParent === void 0) delete next.rowParent;
+		if ("colParent" in patch && patch.colParent === void 0) delete next.colParent;
+		if (("aggregate" in patch || "expand" in patch) && !("preset" in patch) && !presetStillApplies(next)) delete next.preset;
+		if (patch.preset === "subtotal") {
+			const inferred = inferParentsForPreset(cell, "subtotal", getBindingAt);
+			if (parentNeedsCorrection(next.rowParent)) if (inferred.rowParent) next.rowParent = inferred.rowParent;
+			else delete next.rowParent;
+			if (parentNeedsCorrection(next.colParent)) if (inferred.colParent) next.colParent = inferred.colParent;
+			else delete next.colParent;
+		}
+		workbook.value.activeSheet.setCellMeta(cell, REPORT_META_NAMESPACE, next);
+	}
+	function startParentPick(mode) {
+		const cell = activeCell.value;
+		if (!cell || !activeBinding.value) return;
+		parentPick.value = {
+			mode,
+			source: {
+				row: cell.row,
+				col: cell.col
+			}
+		};
+	}
+	function cancelParentPick() {
+		parentPick.value = null;
+	}
+	function isValidParentTarget(mode, source, target) {
+		if (!target) return false;
+		if (target.dataset !== source.dataset) return false;
+		const groupOnly = prefersGroupParent(source);
+		if (mode === "row") return groupOnly ? isRowGroupBinding(target) : isVerticalExpandBinding(target);
+		return groupOnly ? isColGroupBinding(target) : isHorizontalExpandBinding(target);
+	}
+	function pickParentAt(target) {
+		const pick = parentPick.value;
+		if (!pick) return;
+		if (target.row === pick.source.row && target.col === pick.source.col) return;
+		const sourceBinding = getBindingAt(pick.source);
+		if (!sourceBinding) {
+			parentPick.value = null;
+			return;
+		}
+		const targetBinding = getBindingAt(target);
+		if (!isValidParentTarget(pick.mode, sourceBinding, targetBinding)) {
+			workbook.value.activeSheet.selectCell(pick.source);
+			return;
+		}
+		const patch = pick.mode === "row" ? { rowParent: { ...target } } : { colParent: { ...target } };
+		const next = {
+			...sourceBinding,
+			...patch
+		};
+		workbook.value.activeSheet.setCellMeta(pick.source, REPORT_META_NAMESPACE, next);
+		parentPick.value = null;
+		workbook.value.activeSheet.selectCell(pick.source);
+	}
+	function clearParent(mode) {
+		if (mode === "row") patchActiveBinding({ rowParent: void 0 });
+		else patchActiveBinding({ colParent: void 0 });
+	}
+	function removeActiveBinding() {
+		const cell = activeCell.value;
+		if (!cell) return;
+		workbook.value.activeSheet.clearCellMeta(cell, REPORT_META_NAMESPACE);
+	}
+	function addConnection(connection) {
+		connections.value = [...connections.value, connection];
+	}
+	function updateConnection(connection) {
+		connections.value = connections.value.map((item) => item.id === connection.id ? connection : item);
+	}
+	function removeConnection(connectionId) {
+		connections.value = connections.value.filter((item) => item.id !== connectionId);
+		datasets.value = datasets.value.filter((dataset) => dataset.connectionId !== connectionId);
+	}
+	let datasetSeq = 0;
+	function addDataset(connectionId) {
+		const dataset = {
+			id: `dataset-${Date.now()}-${datasetSeq++}`,
+			label: "新数据集",
+			connectionId,
+			sql: ""
+		};
+		datasets.value = [...datasets.value, dataset];
+		return dataset;
+	}
+	function updateDataset(datasetId, patch) {
+		datasets.value = datasets.value.map((item) => item.id === datasetId ? {
+			...item,
+			...patch
+		} : item);
+	}
+	function removeDataset(datasetId) {
+		datasets.value = datasets.value.filter((item) => item.id !== datasetId);
+	}
+	function resolveDatasetConnection(dataset) {
+		return connections.value.find((item) => item.id === dataset.connectionId);
+	}
+	function datasetNotFound() {
+		return {
+			ok: false,
+			error: {
+				code: "DATASET_NOT_FOUND",
+				message: "数据集不存在"
+			}
+		};
+	}
+	function connectionNotFound() {
+		return {
+			ok: false,
+			error: {
+				code: "CONNECTION_NOT_FOUND",
+				message: "数据集所属连接不存在"
+			}
+		};
+	}
+	function testConnection(connection) {
+		return props.connector.test(connection);
+	}
+	async function describeDataset(datasetId) {
+		const dataset = datasets.value.find((item) => item.id === datasetId);
+		if (!dataset) return datasetNotFound();
+		const connection = resolveDatasetConnection(dataset);
+		if (!connection) return connectionNotFound();
+		const sql = dataset.sql;
+		const result = await props.connector.describe(connection, sql);
+		if (result.ok) {
+			const current = datasets.value.find((item) => item.id === datasetId);
+			if (current && current.sql === sql) updateDataset(datasetId, { fields: result.data });
+		}
+		return result;
+	}
+	async function previewDataset(datasetId) {
+		const dataset = datasets.value.find((item) => item.id === datasetId);
+		if (!dataset) return datasetNotFound();
+		const connection = resolveDatasetConnection(dataset);
+		if (!connection) return connectionNotFound();
+		const values = resolveParamDefaults(buildParamDefs(dataset.sql, dataset.paramOverrides));
+		return props.connector.query(connection, dataset.sql, values);
+	}
+	const resolveCellStyle = createBindingBadgeStyleResolver(getBindingAt);
+	const resolveCellRenderer = createBindingBadgeRenderer(getBindingAt, resolveFieldLabel);
+	function getTemplate() {
+		const resolved = datasets.value.flatMap((dataset) => {
+			const connection = resolveDatasetConnection(dataset);
+			if (!connection) return [];
+			return [{
+				id: dataset.id,
+				label: dataset.label,
+				connection: { ...connection },
+				sql: dataset.sql,
+				...dataset.paramOverrides ? { paramOverrides: dataset.paramOverrides } : {},
+				...dataset.fieldOverrides ? { fieldOverrides: dataset.fieldOverrides } : {}
+			}];
+		});
+		return createReportTemplate(workbook.value.activeSheet.snapshot(), resolved);
+	}
+	/**
+	* 载入既有 Report Template 继续设计（`template` prop）：
+	* 快照恢复网格绑定（restore + restoreContent 与查看器同路径）；
+	* 内嵌数据集定义还原为设计态（connectionId 引用），内嵌连接按 id 合并进
+	* v-model 连接列表（仅缺省追加，宿主列表是单一事实源）；
+	* describe 恢复字段缓存（字段面板数据源），业务错误忽略（字段留空，可在数据中枢重试）。
+	*/
+	function loadTemplate(template) {
+		assertCompatibleTemplateVersion(template);
+		const sheet = workbook.value.activeSheet;
+		sheet.restore(template);
+		sheet.restoreContent(template);
+		sheet.history.clear();
+		syncActiveCell();
+		const defs = getTemplateDatasets(template);
+		datasets.value = defs.map((def) => ({
+			id: def.id,
+			label: def.label,
+			connectionId: def.connection.id,
+			sql: def.sql,
+			...def.paramOverrides ? { paramOverrides: def.paramOverrides } : {},
+			...def.fieldOverrides ? { fieldOverrides: def.fieldOverrides } : {}
+		}));
+		const missing = defs.map((def) => def.connection).filter((connection) => !connections.value.some((item) => item.id === connection.id));
+		if (missing.length > 0) connections.value = [...connections.value, ...missing.map((connection) => ({ ...connection }))];
+		for (const dataset of datasets.value) if (dataset.sql.trim()) describeDataset(dataset.id);
+	}
+	watch(() => props.template, (template) => {
+		if (template) loadTemplate(template);
+	}, { immediate: true });
+	return {
+		workbook,
+		connections,
+		datasets,
+		catalog,
+		boundKeys,
+		activeCell,
+		selectionLabel,
+		activeBinding,
+		activeFieldType,
+		activeDatasetFields,
+		resolvedRowParentLabel,
+		resolvedColParentLabel,
+		parentPick,
+		rowParentCandidates,
+		colParentCandidates,
+		bindingEntries,
+		metaTick,
+		getBindingAt,
+		resolveFieldLabel,
+		bindField,
+		patchActiveBinding,
+		startParentPick,
+		cancelParentPick,
+		pickParentAt,
+		clearParent,
+		removeActiveBinding,
+		resolveCellStyle,
+		resolveCellRenderer,
+		getTemplate,
+		addConnection,
+		updateConnection,
+		removeConnection,
+		addDataset,
+		updateDataset,
+		removeDataset,
+		testConnection,
+		describeDataset,
+		previewDataset
+	};
+}
+//#endregion
+export { useReportDesigner };

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

@@ -0,0 +1,55 @@
+import { renderReport, resolveFilledColWidths } from "../../report/render/index.js";
+import { fetchTemplateRecords, resolveParamDefaults, resolveTemplateParams } from "../../report/template.js";
+import { computed, ref, shallowRef, watch } from "vue";
+//#region src/components/report/use-report-viewer.ts
+/**
+* UReportViewer 的 headless 编排：参数提取 → 取数 → renderReport 展开。
+* 不持有 DOM / 网格引用；填充快照经 `filledSnapshot` 交给组件壳应用。
+*/
+function useReportViewer(props) {
+	const loading = ref(false);
+	const error = shallowRef(null);
+	const filledSnapshot = shallowRef(null);
+	const filledColWidths = shallowRef(void 0);
+	const params = computed(() => resolveTemplateParams(props.template));
+	const values = shallowRef({});
+	let fetchSeq = 0;
+	async function refresh() {
+		const current = ++fetchSeq;
+		const template = props.template;
+		loading.value = true;
+		error.value = null;
+		const result = await fetchTemplateRecords(props.connector, template, values.value);
+		if (current !== fetchSeq) return;
+		loading.value = false;
+		if (!result.ok) {
+			error.value = result.error;
+			filledColWidths.value = void 0;
+			return;
+		}
+		filledSnapshot.value = renderReport(template, result.data);
+		filledColWidths.value = template.colWidths?.length ? resolveFilledColWidths(template, result.data, template.colWidths) : void 0;
+	}
+	function setValues(next) {
+		values.value = next;
+		refresh();
+	}
+	watch(() => props.template, () => {
+		filledSnapshot.value = null;
+		filledColWidths.value = void 0;
+		values.value = resolveParamDefaults(params.value);
+		refresh();
+	}, { immediate: true });
+	return {
+		params,
+		values,
+		loading,
+		error,
+		filledSnapshot,
+		filledColWidths,
+		refresh,
+		setValues
+	};
+}
+//#endregion
+export { useReportViewer };

package/dist/{vue → components/sheet}/formula-bar.js

@@ -5,7 +5,7 @@ import { formatAddress, formatRange, parseRange } from "@veltra/sheet-core/core/
 import { computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, nextTick, normalizeClass, onBeforeUnmount, onMounted, openBlock, ref, shallowRef, unref, useTemplateRef, vModelText, watch, withDirectives, withModifiers } from "vue";
 import { message } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/formula-bar.vue
+//#region src/components/sheet/formula-bar.vue
 const _hoisted_1 = ["disabled", "readonly"];
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "UFormulaBar",

package/dist/{vue → components/sheet}/formula-suggest-list.js

@@ -1,7 +1,7 @@
 import { Fragment, computed, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, nextTick, normalizeClass, openBlock, renderList, toDisplayString, unref, watch, withCtx, withModifiers } from "vue";
 import { UScroll } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/formula-suggest-list.vue
+//#region src/components/sheet/formula-suggest-list.vue
 const _hoisted_1 = [
 	"aria-selected",
 	"onMousedown",

package/dist/{vue → components/sheet}/import-file.js

@@ -1,7 +1,7 @@
 import { message, messageConfirm } from "@veltra/desktop";
 import { nextFrame } from "@veltra/utils";
 import { importCsv, importXlsx, replaceWorkbookWithSnapshots } from "@veltra/sheet-core/core/io/import";
-//#region src/vue/import-file.ts
+//#region src/components/sheet/import-file.ts
 /** 导入文件 accept（工具栏直接选文件） */
 const IMPORT_FILE_ACCEPT = ".xlsx,.csv";
 /**

package/dist/{vue → components/sheet}/insert-count-menu-item.js

@@ -1,7 +1,7 @@
 import { createElementBlock, createElementVNode, createVNode, defineComponent, inject, normalizeClass, openBlock, ref, toDisplayString, unref, withKeys, withModifiers } from "vue";
 import { ContextmenuRootDIKey, UNumberInput } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/insert-count-menu-item.vue
+//#region src/components/sheet/insert-count-menu-item.vue
 const _hoisted_1 = ["onKeydownCapture"];
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "USheetInsertCountMenuItem",

package/dist/{vue → components/sheet}/insert-image.js

@@ -1,5 +1,5 @@
 import { message } from "@veltra/desktop";
-//#region src/vue/insert-image.ts
+//#region src/components/sheet/insert-image.ts
 /** 文件选择 accept（工具栏弹层与右键菜单共用；不用裸 image/*） */
 const INSERT_IMAGE_ACCEPT = ".png,.jpg,.jpeg,.gif,.svg,.webp";
 const MIME_TO_TYPE = {

package/dist/{vue → components/sheet}/popup-helpers.js

@@ -1,5 +1,5 @@
 import { BORDER_STYLE_WIDTH } from "@veltra/sheet-core/core/style/types";
-//#region src/vue/popup-helpers.ts
+//#region src/components/sheet/popup-helpers.ts
 /** 当前选区（ranges[0] 优先；无区域选区时用活动格单格） */
 function currentRange(context) {
 	const { activeCell, ranges } = context.getSelection();

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

@@ -5,7 +5,7 @@ import { UPalette } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
 import { buildBorderPresetItems } from "@veltra/sheet-core/core/style/border-presets";
 import { BORDER_STYLE_WIDTH } from "@veltra/sheet-core/core/style/types";
-//#region src/vue/popups/border-popup.vue
+//#region src/components/sheet/popups/border-popup.vue
 const _hoisted_1 = ["title", "onClick"];
 const _hoisted_2 = ["title", "onClick"];
 const _sfc_main = /*@__PURE__*/ defineComponent({
@@ -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/{vue → components/sheet}/popups/border-preset-glyph.js

@@ -1,6 +1,6 @@
 import { computed, createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, unref } from "vue";
 import { bem } from "@veltra/utils";
-//#region src/vue/popups/border-preset-glyph.vue
+//#region src/components/sheet/popups/border-preset-glyph.vue
 const _hoisted_1 = ["stroke"];
 const _hoisted_2 = ["stroke"];
 const _hoisted_3 = ["stroke"];

package/dist/{vue → components/sheet}/popups/export-popup.js

@@ -1,8 +1,8 @@
-import { exportSheetCsvFile, exportWorkbookFile } from "../../tools/download.js";
+import { exportSheetCsvFile, exportWorkbookFile } from "../../../tools/download.js";
 import { createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, unref } from "vue";
 import { message } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/popups/export-popup.vue
+//#region src/components/sheet/popups/export-popup.vue
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "USheetExportPopup",
 	__name: "export-popup",

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

@@ -1,7 +1,7 @@
 import { currentRange } from "../popup-helpers.js";
 import { createBlock, defineComponent, onMounted, openBlock, ref, unref } from "vue";
 import { UPalette } from "@veltra/desktop";
-//#region src/vue/popups/fill-color-popup.vue
+//#region src/components/sheet/popups/fill-color-popup.vue
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "USheetFillColorPopup",
 	__name: "fill-color-popup",
@@ -16,14 +16,14 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const fillColor = ref("");
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
-			const style = active ? props.context.getCellStyle(active) : void 0;
+			const style = active ? props.context.getEffectiveStyle(active) : void 0;
 			fillColor.value = style?.fill?.color ?? "";
 		});
 		/** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
 		function applyFillColor(color) {
 			const range = currentRange(props.context);
 			if (!range) return;
-			props.context.setCellStyle(range, color ? { fill: { color } } : { fill: {} });
+			props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} });
 		}
 		return (_ctx, _cache) => {
 			return openBlock(), createBlock(unref(UPalette), {

package/dist/{vue → components/sheet}/popups/find-popup.js

@@ -2,7 +2,7 @@ import { useFindReplace } from "../use-find-replace.js";
 import { Fragment, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, isRef, normalizeClass, openBlock, toDisplayString, unref, vModelCheckbox, vModelSelect, withDirectives } from "vue";
 import { UInput } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/popups/find-popup.vue
+//#region src/components/sheet/popups/find-popup.vue
 const _hoisted_1 = ["disabled"];
 const _hoisted_2 = ["disabled"];
 const _hoisted_3 = ["disabled"];

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

@@ -1,7 +1,7 @@
 import { currentRange } from "../popup-helpers.js";
 import { createBlock, defineComponent, onMounted, openBlock, ref, unref } from "vue";
 import { UPalette } from "@veltra/desktop";
-//#region src/vue/popups/font-color-popup.vue
+//#region src/components/sheet/popups/font-color-popup.vue
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "USheetFontColorPopup",
 	__name: "font-color-popup",
@@ -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/{vue → components/sheet}/popups/font-size-popup.js

@@ -2,7 +2,7 @@ import { currentRange } from "../popup-helpers.js";
 import { Fragment, createCommentVNode, createElementBlock, createElementVNode, createVNode, defineComponent, normalizeClass, onMounted, openBlock, ref, renderList, toDisplayString, unref, withCtx } from "vue";
 import { UScroll } from "@veltra/desktop";
 import { bem } from "@veltra/utils";
-//#region src/vue/popups/font-size-popup.vue
+//#region src/components/sheet/popups/font-size-popup.vue
 const _hoisted_1 = ["onClick"];
 const _sfc_main = /*@__PURE__*/ defineComponent({
 	name: "USheetFontSizePopup",
@@ -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/{vue → components/sheet}/popups/import.worker.d.ts

@@ -1,5 +1,5 @@
 import { SheetSnapshot } from "@veltra/sheet-core/core/sheet";
-//#region src/vue/popups/import.worker.d.ts
+//#region src/components/sheet/popups/import.worker.d.ts
 type ImportWorkerResponse = {
   type: 'progress';
   done: number;