@veltra/sheet 2.0.1 → 2.1.1

package/dist/vue/use-sheet-tabs-bar.js

@@ -0,0 +1,90 @@
+import { nextTick, onBeforeUnmount, onMounted, shallowRef, watch } from "vue";
+import { applyWheelHorizontalScroll, computeOverflowNavState, scrollElementIntoView, scrollViewportByStep } from "@veltra/utils";
+//#region src/vue/use-sheet-tabs-bar.ts
+/**
+* Sheet 底部标签栏溢出滚动（滚动几何/滚轮转横滚/元素滚入视野共享
+* @veltra/utils overflow-nav，见 #17；此处保留事件绑定与 watch 差异）：
+* - showNav / canPrev / canNext
+* - 箭头按视口宽度 ~80% 步进
+* - 活动 tab 滚入视野
+* - 纵向滚轮转横滚；触控板横滑不拦截
+* - 原生 ResizeObserver（不引入 @veltra/compositions peer）
+*/
+function useSheetTabsBar(options) {
+	const { viewportRef, listRef, sheetList, activeIndex } = options;
+	const showNav = shallowRef(false);
+	const canPrev = shallowRef(false);
+	const canNext = shallowRef(false);
+	let resizeObserver;
+	const updateNavState = () => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		const state = computeOverflowNavState(vp);
+		showNav.value = state.overflowing;
+		canPrev.value = state.canPrev;
+		canNext.value = state.canNext;
+	};
+	const scrollByStep = (dir) => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		scrollViewportByStep(vp, dir);
+	};
+	const ensureActiveVisible = () => {
+		const vp = viewportRef.value;
+		const list = listRef.value;
+		if (!vp || !list) return;
+		const index = activeIndex.value;
+		if (index < 0) return;
+		const el = list.children[index];
+		if (!el) return;
+		scrollElementIntoView(vp, el);
+	};
+	/** 鼠标滚轮（纵向）驱动水平滚动；触控板横滑（已有 deltaX）不拦截 */
+	const handleWheel = (e) => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		applyWheelHorizontalScroll(e, vp, showNav.value);
+	};
+	watch(activeIndex, async () => {
+		await nextTick();
+		ensureActiveVisible();
+		updateNavState();
+	});
+	watch(sheetList, async () => {
+		await nextTick();
+		updateNavState();
+		ensureActiveVisible();
+	}, { deep: false });
+	onMounted(() => {
+		const vp = viewportRef.value;
+		const list = listRef.value;
+		if (vp) {
+			vp.addEventListener("wheel", handleWheel, { passive: false });
+			vp.addEventListener("scroll", updateNavState, { passive: true });
+		}
+		if (typeof ResizeObserver !== "undefined") {
+			resizeObserver = new ResizeObserver(() => updateNavState());
+			if (vp) resizeObserver.observe(vp);
+			if (list) resizeObserver.observe(list);
+		}
+		updateNavState();
+		nextTick(ensureActiveVisible);
+	});
+	onBeforeUnmount(() => {
+		const vp = viewportRef.value;
+		if (vp) {
+			vp.removeEventListener("wheel", handleWheel);
+			vp.removeEventListener("scroll", updateNavState);
+		}
+		resizeObserver?.disconnect();
+		resizeObserver = void 0;
+	});
+	return {
+		showNav,
+		canPrev,
+		canNext,
+		scrollByStep
+	};
+}
+//#endregion
+export { useSheetTabsBar };

package/dist/vue/use-tool-groups.js

@@ -0,0 +1,42 @@
+import { defaultToolRegistry } from "../tools/registry.js";
+import { computed } from "vue";
+//#region src/vue/use-tool-groups.ts
+/**
+* 内置组稳定顺序：history ｜ cell ｜ text ｜ edit ｜ insert ｜ file。
+* 未列出的自定义组按注册先后排在已知组之后。
+*/
+const BUILTIN_GROUP_ORDER = [
+	"history",
+	"cell",
+	"text",
+	"edit",
+	"insert",
+	"file"
+];
+/**
+* 工具栏分组视图模型：工具的 visible/disabled/active 是 (ctx) => boolean 纯函数，
+* 依赖 stateTick 版本号（选区 / 历史 / 单元格 / 合并 / 冻结 / 注册表变化时 bump）触发重算。
+*/
+function useToolGroups(context, stateTick) {
+	return computed(() => {
+		stateTick.value;
+		const groups = defaultToolRegistry.getGroups().map((group) => ({
+			name: group.name,
+			tools: group.tools.map((tool) => ({
+				tool,
+				visible: tool.visible?.(context) ?? true,
+				disabled: tool.disabled?.(context) ?? false,
+				active: tool.active?.(context) ?? false
+			})).filter((item) => item.visible)
+		})).filter((group) => group.tools.length > 0);
+		const orderIndex = new Map(BUILTIN_GROUP_ORDER.map((name, index) => [name, index]));
+		return groups.sort((a, b) => {
+			const ai = orderIndex.get(a.name) ?? BUILTIN_GROUP_ORDER.length;
+			const bi = orderIndex.get(b.name) ?? BUILTIN_GROUP_ORDER.length;
+			if (ai !== bi) return ai - bi;
+			return 0;
+		});
+	});
+}
+//#endregion
+export { useToolGroups };

package/dist/vue/use-tool-popup.js

@@ -0,0 +1,123 @@
+import { defaultToolRegistry } from "../tools/registry.js";
+import { onBeforeUnmount, onMounted, shallowRef } from "vue";
+//#region src/vue/use-tool-popup.ts
+/**
+* 面板打开期间的写入是否合并为一个 undo 单元（关闭时提交）：
+* 填充颜色 / 边框 / 字体颜色 / 字号参与事务；查找（每次替换独立 undo）、
+* 导出（下载侧效应，无模型写入）不参与。导入无弹层，不经此路径。
+*/
+function joinsTransaction(tool) {
+	return tool.popup === "fill-color" || tool.popup === "border" || tool.popup === "font-color" || tool.popup === "font-size";
+}
+/**
+* 弹层型工具编排（填充颜色 / 边框 / 查找 / 插入图片 / 导出）：
+* - popupTool：当前打开的弹层工具（null = 未打开）
+* - popupAnchor：触发按钮元素（面板定位参照，见 sheet.vue 的 left 计算）
+* - 打开 / 关闭时的事务包裹（面板期间写入合并为一个 undo 单元，关闭时提交）
+* - 点击面板外关闭（面板内 @click.stop 不冒泡到 window）
+* - Ctrl/Cmd+F 开合查找条（与工具按钮同一 toggle 逻辑）
+* 导入在 sheet.vue 特殊处理（直接系统文件选择），不经弹层。
+*/
+function useToolPopup(context, rootEl) {
+	/** 当前打开的弹层工具（null = 未打开） */
+	const popupTool = shallowRef(null);
+	/** 触发按钮元素（打开时的 currentTarget；用于面板 left 对齐按钮） */
+	const popupAnchor = shallowRef(null);
+	/** 延迟打开定时器（#23：组件卸载后不再执行 openPopup） */
+	let openTimer = null;
+	function openPopup(tool, anchor) {
+		closePopup();
+		popupTool.value = tool;
+		popupAnchor.value = anchor ?? null;
+		if (joinsTransaction(tool)) context.beginTransaction();
+	}
+	/**
+	* 延迟到本次点击事件流结束后打开（setTimeout 宏任务，避开冒泡到 window 时
+	* onWindowClick 误关——queueMicrotask 会在事件传播中途的 microtask checkpoint
+	* 执行，面板会被同一 click 关闭）。保存 timer id，卸载/提前关闭时取消。
+	*/
+	function scheduleOpen(tool, anchor) {
+		if (openTimer !== null) clearTimeout(openTimer);
+		openTimer = setTimeout(() => {
+			openTimer = null;
+			openPopup(tool, anchor);
+		}, 0);
+	}
+	/** 关闭弹层并提交面板期间的事务（无写入则空事务，不入历史） */
+	function closePopup() {
+		if (openTimer !== null) {
+			clearTimeout(openTimer);
+			openTimer = null;
+		}
+		const tool = popupTool.value;
+		if (!tool) return;
+		popupTool.value = null;
+		popupAnchor.value = null;
+		if (!joinsTransaction(tool)) return;
+		try {
+			context.commit();
+		} catch {
+			context.rollback();
+		}
+	}
+	function handleToolClick(tool, event) {
+		if (tool.disabled?.(context)) return;
+		if (tool.popup) {
+			if (popupTool.value?.id === tool.id) {
+				closePopup();
+				return;
+			}
+			scheduleOpen(tool, event?.currentTarget instanceof HTMLElement ? event.currentTarget : null);
+			return;
+		}
+		tool.onClick(context);
+	}
+	/**
+	* 点击面板外任意处关闭。面板内部 @click.stop 不冒泡到 window；
+	* 触发按钮本身的点击由 handleToolClick 同步处理（打开/关闭 toggle），
+	* 冒泡到达这里时 popupTool 已更新，不会误关。
+	*/
+	function onWindowClick() {
+		if (!popupTool.value) return;
+		closePopup();
+	}
+	/** Ctrl/Cmd+F 打开 / 关闭查找条（与工具按钮同一 toggle 逻辑） */
+	function onGlobalKeydown(event) {
+		if (!(event.metaKey || event.ctrlKey) || event.key.toLowerCase() !== "f") return;
+		const root = rootEl.value;
+		if (root) {
+			const target = event.target instanceof Node ? event.target : null;
+			const active = document.activeElement instanceof Node ? document.activeElement : null;
+			if (!(target !== null && root.contains(target) || active !== null && root.contains(active)) && popupTool.value === null) return;
+		}
+		event.preventDefault();
+		const findTool = defaultToolRegistry.get("find");
+		if (!findTool) return;
+		if (popupTool.value?.id === findTool.id) {
+			closePopup();
+			return;
+		}
+		scheduleOpen(findTool);
+	}
+	onMounted(() => {
+		window.addEventListener("click", onWindowClick);
+		window.addEventListener("keydown", onGlobalKeydown);
+	});
+	onBeforeUnmount(() => {
+		if (openTimer !== null) {
+			clearTimeout(openTimer);
+			openTimer = null;
+		}
+		closePopup();
+		window.removeEventListener("click", onWindowClick);
+		window.removeEventListener("keydown", onGlobalKeydown);
+	});
+	return {
+		popupTool,
+		popupAnchor,
+		closePopup,
+		handleToolClick
+	};
+}
+//#endregion
+export { useToolPopup };

package/dist/vue/use-toolbar-scroll.js

@@ -0,0 +1,72 @@
+import { onBeforeUnmount, onMounted, shallowRef, watch } from "vue";
+import { applyWheelHorizontalScroll, computeOverflowNavState, scrollViewportByStep } from "@veltra/utils";
+//#region src/vue/use-toolbar-scroll.ts
+/**
+* 工具栏溢出滚动（滚动几何/滚轮转横滚共享 @veltra/utils overflow-nav，见 #17；
+* 无活动项跟随）：
+* - 内容超出视口宽度时显示左右箭头（showNav / canPrev / canNext）
+* - 箭头按视口宽度 ~80% 步进
+* - 纵向滚轮转横滚；触控板横滑不拦截
+* - 原生 ResizeObserver（不引入 @veltra/compositions peer）
+*/
+function useToolbarScroll(options) {
+	const { viewportRef, listRef, content } = options;
+	const showNav = shallowRef(false);
+	const canPrev = shallowRef(false);
+	const canNext = shallowRef(false);
+	let resizeObserver;
+	const updateNavState = () => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		const state = computeOverflowNavState(vp);
+		showNav.value = state.overflowing;
+		canPrev.value = state.canPrev;
+		canNext.value = state.canNext;
+	};
+	const scrollByStep = (dir) => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		scrollViewportByStep(vp, dir);
+	};
+	/** 鼠标滚轮（纵向）驱动水平滚动；触控板横滑（已有 deltaX）不拦截 */
+	const handleWheel = (e) => {
+		const vp = viewportRef.value;
+		if (!vp) return;
+		applyWheelHorizontalScroll(e, vp, showNav.value);
+	};
+	watch(content, async () => {
+		await Promise.resolve();
+		updateNavState();
+	}, { deep: false });
+	onMounted(() => {
+		const vp = viewportRef.value;
+		if (vp) {
+			vp.addEventListener("wheel", handleWheel, { passive: false });
+			vp.addEventListener("scroll", updateNavState, { passive: true });
+		}
+		if (typeof ResizeObserver !== "undefined") {
+			resizeObserver = new ResizeObserver(() => updateNavState());
+			if (vp) resizeObserver.observe(vp);
+			const list = listRef.value;
+			if (list) resizeObserver.observe(list);
+		}
+		updateNavState();
+	});
+	onBeforeUnmount(() => {
+		const vp = viewportRef.value;
+		if (vp) {
+			vp.removeEventListener("wheel", handleWheel);
+			vp.removeEventListener("scroll", updateNavState);
+		}
+		resizeObserver?.disconnect();
+		resizeObserver = void 0;
+	});
+	return {
+		showNav,
+		canPrev,
+		canNext,
+		scrollByStep
+	};
+}
+//#endregion
+export { useToolbarScroll };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.0.1",
+  "version": "2.1.1",
   "files": [
     "dist",
     "src"
@@ -25,14 +25,19 @@
     }
   },
   "dependencies": {
-    "@visactor/vtable": "^1.26.5",
-    "@visactor/vtable-editors": "^1.26.5"
+    "hucre": "^1.0.0"
   },
   "peerDependencies": {
     "@cat-kit/core": ">=1.1.8",
-    "@veltra/desktop": "1.4.0",
-    "@veltra/styles": "1.4.0",
-    "@veltra/utils": "1.4.0",
-    "vue": ">=3.5.40"
+    "@cat-kit/fe": ">=1.1.8",
+    "@veltra/desktop": "^1.5.0",
+    "@veltra/icons": "^1.5.0",
+    "@veltra/sheet-core": "^2.1.1",
+    "@veltra/styles": "^1.5.0",
+    "@veltra/utils": "^1.5.0",
+    "vue": ">=3.5.41"
+  },
+  "devDependencies": {
+    "@visactor/vtable": "^1.26.6"
   }
 }

package/src/env.d.ts

@@ -8,3 +8,14 @@ declare module '*.scss' {}
 
 // 跨包样式副作用子路径（veltra-dev → src/* 无扩展名，TS 不做扩展探测）
 declare module '@veltra/desktop/components/*/style' {}
+
+// 供 lint typeCheck 识别 import.meta.env（worker 的 dev/prod URL 分支），无需安装 vite
+interface ImportMetaEnv {
+  readonly DEV: boolean
+  readonly PROD: boolean
+  readonly MODE: string
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv
+}

package/src/index.ts

@@ -1,17 +1,206 @@
 // 内置工具注册（undo/redo/合并/取消合并）：随包入口完成，
-// 与 core/command 的 default-registry 同构；深导入 core 子路径的无头场景不涉及
+// 与 sheet-core command 的 default-registry 同构；深导入 sheet-core 子路径的
+// 无头场景不涉及
 import './tools/builtin'
 
-export * from './core/address'
-export * from './core/cell-store'
-export * from './core/fill'
-export * from './core/merge-manager'
-export * from './core/selection'
-export * from './core/sheet'
-export * from './core/workbook'
-export * from './core/command'
-export * from './core/formula'
-export * from './grid/sheet-grid'
-export * from './tools'
-export * from './types'
-export * from './vue'
+// 数据模型 / 渲染内核（原 src/core、src/grid）已迁至 @veltra/sheet-core，
+// 下方 core/grid 来源的导出全部为其主入口白名单的 re-export（公开 API 不变）。
+// 聚合导出为**公开 API 白名单**：仅测试引用的内部符号（如 rangeContainsRange、
+// mergeCellStyle、shiftFormulaRefs、io 转换函数、grid 样式映射、normalizeStyle、
+// ToolRegistry 类等，见 #31）不在此导出，测试一律深导入 @veltra/sheet-core 子路径。
+// 类成员方法（Sheet.setCell / setCellStyles、CellStore.setCellValue 等）随类整体
+// 导出，属内部实现细节，见 packages/sheet/AGENTS.md「核心语义」注。
+
+export {
+  cellKey,
+  colIndexToName,
+  colNameToIndex,
+  parseAddress,
+  formatAddress,
+  createRange,
+  parseRange,
+  formatRange,
+  rangesEqual,
+  rangesIntersect,
+  rangeContainsAddress,
+  boundingBox,
+  iterateRange,
+  type CellAddress,
+  type CellRange
+} from '@veltra/sheet-core'
+
+export {
+  NUMERIC_TEXT_RE,
+  normalizeInputValue,
+  inferCellType,
+  isEmptyCellData,
+  cellDataEqual,
+  CellStore,
+  type CellType,
+  type CellValue,
+  type CellData,
+  type CellSnapshotItem
+} from '@veltra/sheet-core'
+
+export {
+  computeFillTargetRange,
+  generateFill,
+  type FillDirection,
+  type GenerateFillOptions
+} from '@veltra/sheet-core'
+
+export {
+  findAll,
+  findNext,
+  findNextFrom,
+  findPrev,
+  findPrevFrom,
+  type FindOptions,
+  type FindMatch
+} from '@veltra/sheet-core'
+
+export {
+  MergeManager,
+  type MergedCellKind,
+  type CellInfo,
+  type MergeResult
+} from '@veltra/sheet-core'
+
+export { SelectionModel, type SelectionState } from '@veltra/sheet-core'
+
+export { Sheet, type FrozenState, type SheetSnapshot, type SheetEvents } from '@veltra/sheet-core'
+
+export {
+  createImageId,
+  cloneImageAnchor,
+  cloneSheetImage,
+  type SheetImageType,
+  type SheetImageAnchor,
+  type SheetImage,
+  type ImageInput
+} from '@veltra/sheet-core'
+
+export {
+  BORDER_SIDES,
+  BORDER_STYLE_WIDTH,
+  BORDER_EDGE_DEFAULTS,
+  FONT_STYLE_KEYS,
+  ALIGN_STYLE_KEYS,
+  type BorderLineStyle,
+  type BorderSide,
+  type BorderEdge,
+  type HorizontalAlign,
+  type VerticalAlign,
+  type CellFont,
+  type CellAlign,
+  type CellStyle,
+  type StyleId,
+  type CellStylePatch
+} from '@veltra/sheet-core'
+
+export { StylePool } from '@veltra/sheet-core'
+
+export {
+  buildBorderPresetItems,
+  type BorderPreset,
+  type BorderPresetItem
+} from '@veltra/sheet-core'
+
+export { Workbook, type WorkbookEvents } from '@veltra/sheet-core'
+
+export {
+  HistoryManager,
+  type HistoryState,
+  type PatchDirection,
+  type CellPatch,
+  type MergePatch,
+  type StructureChange,
+  type StructurePatch,
+  type SnapshotPatch,
+  type ImagePatch,
+  type Patch,
+  type Mutation,
+  type CommandResult,
+  type CommandContext,
+  type Command,
+  type SetCellValueItem,
+  type SetCellValueParams,
+  SetCellValueCommand,
+  type SetCellFormulaParams,
+  SetCellFormulaCommand,
+  type SetCellStyleItem,
+  type SetCellStyleParams,
+  SetCellStyleCommand,
+  type InsertCellsParams,
+  InsertCellsCommand,
+  type MergeCellsParams,
+  MergeCellsCommand,
+  type UnmergeCellsParams,
+  UnmergeCellsCommand,
+  type InsertImageParams,
+  InsertImageCommand,
+  type RemoveImageParams,
+  RemoveImageCommand,
+  type ImageUpdateFields,
+  type UpdateImageParams,
+  UpdateImageCommand,
+  defaultCommandRegistry
+} from '@veltra/sheet-core'
+
+export {
+  FORMULA_ERROR_CODES,
+  formulaError,
+  isFormulaError,
+  isFormulaErrorCode,
+  type FormulaErrorCode,
+  type FormulaError,
+  type BinaryOperator,
+  type AstNode,
+  type AstReference,
+  collectReferences,
+  FormulaParseError,
+  tokenizeFormula,
+  type FormulaOperator,
+  type FormulaToken,
+  parseFormula,
+  type ScalarValue,
+  type EvalValue,
+  type FormulaEvalContext,
+  coerceToNumber,
+  coerceToText,
+  coerceToBoolean,
+  evaluateAst,
+  registerFormulaFunction,
+  listFormulaFunctions,
+  invokeFormulaFunction,
+  type FormulaFunctionMeta,
+  type FormulaFunction,
+  type FormulaDependency,
+  type FormulaNode,
+  DependencyGraph
+} from '@veltra/sheet-core'
+
+export { exportWorkbookXlsx, exportSheetCsv } from '@veltra/sheet-core'
+export { importXlsx, importCsv, replaceWorkbook } from '@veltra/sheet-core'
+
+export {
+  SheetGrid,
+  type SheetGridOptions,
+  type SheetGridContextMenuKind,
+  type SheetGridContextMenuInfo
+} from '@veltra/sheet-core'
+
+export { createSheetContext, type SheetContext } from './tools/context'
+
+export {
+  defaultToolRegistry,
+  registerTool,
+  unregisterTool,
+  type SheetToolPopupType,
+  type SheetTool,
+  type SheetToolGroup
+} from './tools/registry'
+
+export { type SheetProps, type SheetEmits, type _SheetExposed, type SheetExposed } from './types'
+
+export { default as USheet } from './vue/sheet.vue'