@veltra/sheet 2.5.8 → 2.6.0

package/dist/components/sheet/formula-bar.js

@@ -14,7 +14,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 	__name: "formula-bar",
 	props: {
 		sheet: {},
-		context: {}
+		context: {},
+		setSelectionAnchor: { type: Function }
 	},
 	setup(__props, { expose: __expose }) {
 		/**
@@ -233,6 +234,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			mirrorAddr = null;
 			editing.value = true;
 			editAddr = selection.value.activeCell;
+			if (editAddr) props.setSelectionAnchor?.(editAddr);
 			syncFxCursor();
 			scheduleAutosize();
 		}
@@ -290,6 +292,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			editing.value = false;
 			editAddr = null;
 			suppressBlurCommit = false;
+			props.setSelectionAnchor?.(null);
 			closeSuggest();
 			if (addr) {
 				props.context.setCellValue(addr, fxDraft.value);
@@ -303,6 +306,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			editing.value = false;
 			editAddr = null;
 			suppressBlurCommit = false;
+			props.setSelectionAnchor?.(null);
 			closeSuggest();
 			refreshFx();
 		}
@@ -394,6 +398,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			fxDraft.value = text;
 			fxCursor.value = cursor;
 			suppressBlurCommit = false;
+			props.setSelectionAnchor?.(addr);
 			closeSuggest();
 			nextTick(() => {
 				const el = fxRef.value;

package/dist/components/sheet/sheet-context-menu.js

@@ -4,6 +4,8 @@ import _sfc_main from "./insert-count-menu-item.js";
 import { createRange } from "@veltra/sheet-core/core/address.js";
 import { defineComponent, h } from "vue";
 const INSERT_COUNT_MAX = 1e3;
+/** 行高/列宽数值项输入上限（下限复用门面 MIN_ROW_COL_SIZE，对齐引擎 resize 最小值） */
+const AXIS_SIZE_MAX = 1e3;
 /** 选区覆盖行/列数 → 插入默认 N（min 1 / max 1000） */
 function defaultInsertCount(range, axis) {
 	if (!range) return 1;
@@ -71,11 +73,33 @@ function insertCountRender(options) {
 		max: INSERT_COUNT_MAX
 	});
 }
+/**
+* 行高/列宽菜单项：内嵌数值输入，确认经门面批量应用到选区覆盖行/列。
+* readonly 时降级为禁用文本项——render 内嵌组件自带点击路径，disabled 拦不住。
+*/
+function axisSizeMenuItem(options) {
+	if (options.disabled) return {
+		label: options.label,
+		disabled: true
+	};
+	return {
+		label: options.label,
+		keepOpen: true,
+		render: menuNumberRender({
+			prefix: options.label,
+			suffix: "像素",
+			defaultValue: options.defaultValue,
+			min: 20,
+			max: AXIS_SIZE_MAX,
+			onConfirm: options.onConfirm
+		})
+	};
+}
 function primaryRange(ctx) {
 	return ctx.getSelection().ranges[0] ?? null;
 }
-/** 行号右键菜单：插入×2 / 删除 / divider / 冻结 / 取消冻结 */
-function buildRowHeaderMenus(ctx) {
+/** 行号右键菜单：插入×2 / 删除 / 行高 / divider / 冻结 / 取消冻结 */
+function buildRowHeaderMenus(ctx, options) {
 	const range = primaryRange(ctx);
 	const startRow = range?.start.row ?? 0;
 	const endRow = range?.end.row ?? startRow;
@@ -108,6 +132,12 @@ function buildRowHeaderMenus(ctx) {
 			label: "删除行",
 			callback: () => ctx.deleteRows(startRow, deleteCount)
 		},
+		axisSizeMenuItem({
+			label: "行高",
+			disabled: options?.readonly === true,
+			defaultValue: ctx.getRowHeight(startRow) ?? 28,
+			onConfirm: (n) => ctx.setRowHeightBySelection(n)
+		}),
 		{ divider: true },
 		{
 			label: freezeActive ? "✓ 冻结到当前行" : "冻结到当前行",
@@ -120,8 +150,8 @@ function buildRowHeaderMenus(ctx) {
 		}
 	];
 }
-/** 列头右键菜单：插入×2 / 删除 / divider / 冻结 / 取消冻结 */
-function buildColHeaderMenus(ctx) {
+/** 列头右键菜单：插入×2 / 删除 / 列宽 / divider / 冻结 / 取消冻结 */
+function buildColHeaderMenus(ctx, options) {
 	const range = primaryRange(ctx);
 	const startCol = range?.start.col ?? 0;
 	const endCol = range?.end.col ?? startCol;
@@ -154,6 +184,12 @@ function buildColHeaderMenus(ctx) {
 			label: "删除列",
 			callback: () => ctx.deleteCols(startCol, deleteCount)
 		},
+		axisSizeMenuItem({
+			label: "列宽",
+			disabled: options?.readonly === true,
+			defaultValue: ctx.getColWidth(startCol) ?? 80,
+			onConfirm: (n) => ctx.setColWidthBySelection(n)
+		}),
 		{ divider: true },
 		{
 			label: freezeActive ? "✓ 冻结到当前列" : "冻结到当前列",
@@ -249,4 +285,4 @@ function ensureContextMenuSelection(ctx, info, renderSize) {
 	}
 }
 //#endregion
-export { INSERT_COUNT_MAX, applyNumFmtToSelection, buildBodyMenus, buildColHeaderMenus, buildRowHeaderMenus, defaultInsertCount, ensureContextMenuSelection, isColInSelection, isRowInSelection, resolveRenderSize, wholeColRange, wholeRowRange };
+export { AXIS_SIZE_MAX, INSERT_COUNT_MAX, applyNumFmtToSelection, buildBodyMenus, buildColHeaderMenus, buildRowHeaderMenus, defaultInsertCount, ensureContextMenuSelection, isColInSelection, isRowInSelection, resolveRenderSize, wholeColRange, wholeRowRange };

package/dist/components/sheet/sheet.js

@@ -28,6 +28,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		resolveDisplayValue: {},
 		resolveCellStyle: {},
 		resolveCellRenderer: {},
+		header: {},
+		editors: {},
 		showToolbar: {
 			type: Boolean,
 			default: true
@@ -64,7 +66,8 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			onBeforeSheetChange: () => closePopup(),
 			rebuildGrid: () => rebuildGrid(),
 			activateGrid: () => activateGrid(),
-			pruneCache: (sheets) => pruneCache(sheets)
+			pruneCache: (sheets) => pruneCache(sheets),
+			syncAxisSizes: (axis, indexes) => getGrid()?.applyAxisSizes(axis, indexes)
 		});
 		const { popupTool, popupAnchor, closePopup, handleToolClick: openOrRunTool } = useToolPopup(context, rootRef);
 		const parsing = ref(false);
@@ -108,7 +111,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		const toolGroups = useToolGroups(context, stateTick);
 		const gridRef = useTemplateRef("gridRef");
 		const formulaBarRef = useTemplateRef("formulaBarRef");
-		const { rebuildGrid, activateGrid, pruneCache, getGrid } = useSheetGrid({
+		const { rebuildGrid, activateGrid, pruneCache, getGrid, setSelectionAnchor } = useSheetGrid({
 			props,
 			gridRef,
 			getActiveSheet: () => activeSheet.value,
@@ -188,8 +191,13 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 					ref_key: "formulaBarRef",
 					ref: formulaBarRef,
 					sheet: unref(activeSheet),
-					context: unref(context)
-				}, null, 8, ["sheet", "context"])) : createCommentVNode("v-if", true),
+					context: unref(context),
+					"set-selection-anchor": unref(setSelectionAnchor)
+				}, null, 8, [
+					"sheet",
+					"context",
+					"set-selection-anchor"
+				])) : createCommentVNode("v-if", true),
 				createElementVNode("div", {
 					ref_key: "gridRef",
 					ref: gridRef,

package/dist/components/sheet/style2.css

@@ -638,7 +638,7 @@
 }
 .u-sheet {
   /* LRU 缓存实例容器：absolute 堆叠于 grid 区，非激活实例 visibility:hidden
-     （保持尺寸不触发 VTable resize，切回仅翻转可见性 + 选区回驱） */
+     （保持尺寸不触发引擎表格 resize，切回仅翻转可见性 + 选区回驱） */
 }
 .u-sheet__grid-instance {
   position: absolute;

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

@@ -5,9 +5,9 @@ import { SheetGrid } from "@veltra/sheet-core/grid";
 //#region src/components/sheet/use-sheet-grid.ts
 /**
 * 缓存容量：最近 N 个 sheet 的 SheetGrid 实例常驻（tab 来回切换零重建）。
-* 大文件多 sheet 场景下切换卡顿的主因是每次重建 VTable（实例创建 + scenegraph
+* 大文件多 sheet 场景下切换卡顿的主因是每次重建引擎表格（实例创建 + 画布分层
 * 首屏构建 ~300ms）；缓存命中时仅切换容器可见性 + 选区回驱（≈0）。
-* 每实例持有一个 canvas + scenegraph，容量即内存上限（含隐藏实例的渲染开销）。
+* 每实例持有一组 [data-layer-kind] 分层画布，容量即内存上限（含隐藏实例的渲染开销）。
 */
 const GRID_CACHE_CAPACITY = 3;
 /**
@@ -29,7 +29,7 @@ function useSheetGrid(options) {
 		const sheet = getActiveSheet();
 		const renderSize = resolveRenderSize(props.rows, props.cols, sheet.rows, sheet.cols);
 		ensureContextMenuSelection(context, info, renderSize);
-		const menus = info.kind === "row-header" ? buildRowHeaderMenus(context) : info.kind === "col-header" ? buildColHeaderMenus(context) : buildBodyMenus(context);
+		const menus = info.kind === "row-header" ? buildRowHeaderMenus(context, { readonly: props.readonly }) : info.kind === "col-header" ? buildColHeaderMenus(context, { readonly: props.readonly }) : buildBodyMenus(context);
 		contextmenu.pop({
 			mousePosition: {
 				x: info.x,
@@ -69,6 +69,8 @@ function useSheetGrid(options) {
 			resolveDisplayValue: props.resolveDisplayValue,
 			resolveCellStyle: props.resolveCellStyle,
 			resolveCellRenderer: props.resolveCellRenderer,
+			header: props.header,
+			editors: props.editors,
 			onContextMenu: handleContextMenu,
 			onEditStart: (addr) => formulaBarRef.value?.mirrorGridEdit(addr),
 			onEditEnd: (addr) => formulaBarRef.value?.exitMirror(addr),
@@ -128,12 +130,13 @@ function useSheetGrid(options) {
 	* 命中时校验实例是否过期（隐藏期间程序化 structure-change——插入/删除/undo
 	* 行列——vue 层只绑定激活 sheet 的 structure-change，隐藏实例靠自持订阅标记
 	* dirty）；过期则释放重建。命中且未过期只翻可见性：隐藏实例的 cell/merge/
-	* content-reset 已在 GridSyncManager 置脏，setVisible(true) 时一次性 flush，
-	* 不必每次切 tab 都 syncFromModel（会重放全部列宽）。
+	* content-reset 已在 SheetGrid 内部置脏，setVisible(true) 时一次性全量同步，
+	* 无需宿主补推送。
 	*/
 	function activateGrid() {
 		const sheet = getActiveSheet();
 		if (!gridRef.value) return;
+		if (active && active.sheet !== sheet) active.grid.setSelectionAnchor(null);
 		const cached = cache.get(sheet);
 		if (cached && !cached.dirty) {
 			cached.lastUsed = ++seq;
@@ -177,7 +180,9 @@ function useSheetGrid(options) {
 		props.cols,
 		props.readonly,
 		props.showRowHeader,
-		props.showColHeader
+		props.showColHeader,
+		props.header,
+		props.editors
 	], ([nextRows, nextCols]) => {
 		const sheet = getActiveSheet();
 		if (nextRows != null) sheet.ensureTableSize(nextRows, 0);
@@ -187,11 +192,16 @@ function useSheetGrid(options) {
 	onBeforeUnmount(() => {
 		invalidateAll();
 	});
+	/** fx 引用拾取会话置/清选区锚点（公式栏 → 活动实例透传；无活动实例时静默） */
+	function setSelectionAnchor(addr) {
+		active?.grid.setSelectionAnchor(addr);
+	}
 	return {
 		rebuildGrid,
 		activateGrid,
 		pruneCache,
-		getGrid: () => active?.grid
+		getGrid: () => active?.grid,
+		setSelectionAnchor
 	};
 }
 //#endregion

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

@@ -21,7 +21,10 @@ function useSheetState(props, emit, hooks) {
 	const sheetList = shallowRef(workbook.value.getSheets());
 	const activeSheet = computed(() => sheetList.value[activeIndex.value] ?? workbook.value.activeSheet);
 	/** 工具上下文：动态解析活动 sheet / 工作簿 / 渲染尺寸，tab 切换后自动指向最新值 */
-	const context = createSheetContext(() => activeSheet.value, () => workbook.value, { resolveGridSize: () => resolveRenderSize(props.rows, props.cols, activeSheet.value.rows, activeSheet.value.cols) });
+	const context = createSheetContext(() => activeSheet.value, () => workbook.value, {
+		resolveGridSize: () => resolveRenderSize(props.rows, props.cols, activeSheet.value.rows, activeSheet.value.cols),
+		syncAxisSizes: (axis, indexes) => hooks.syncAxisSizes(axis, indexes)
+	});
 	/** 工具栏状态版本号：visible/disabled/active 是 (ctx) => boolean 纯函数，状态源变化时 bump 触发重算 */
 	const stateTick = ref(0);
 	const bump = () => {

package/dist/components/sheet/use-tool-popup.js

@@ -89,8 +89,7 @@ function useToolPopup(context, rootEl) {
 		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;
+			if (!(target !== null && root.contains(target)) && popupTool.value === null) return;
 		}
 		event.preventDefault();
 		const findTool = defaultToolRegistry.get("find");

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import _sfc_main from "./components/sheet/sheet.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 { SheetEmits, SheetExposed, SheetProps } from "./types/sheet.js";
 import "./types/index.js";
-export { type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as USheet, type _SheetExposed, createSheetContext, defaultToolRegistry, registerTool, unregisterTool };
+export { type SheetContext, type SheetEmits, type SheetExposed, type SheetProps, type SheetTool, type SheetToolGroup, type SheetToolPopupType, _sfc_main as USheet, createSheetContext, defaultToolRegistry, registerTool, unregisterTool };

package/dist/tools/context.d.ts

@@ -83,6 +83,14 @@ export interface SheetContext {
   readonly frozen: FrozenState;
   /** 设置冻结行列数（不进 undo，同 rowHeights 先例） */
   setFrozen(rows: number, cols: number): void;
+  /** 读取自定义行高；未设置返回 undefined（视图层用默认行高） */
+  getRowHeight(row: number): number | undefined;
+  /** 读取自定义列宽；未设置返回 undefined（视图层用默认列宽） */
+  getColWidth(col: number): number | undefined;
+  /** 按选区覆盖行批量设置行高（下限钳到 MIN_ROW_COL_SIZE；不进 undo，同 rowHeights 先例） */
+  setRowHeightBySelection(height: number): void;
+  /** 按选区覆盖列批量设置列宽（下限钳到 MIN_ROW_COL_SIZE；不进 undo，同 colWidths 先例） */
+  setColWidthBySelection(width: number): void;
   /** 插入 count 行到 at 行之前 */
   insertRows(at: number, count?: number): void;
   /** 插入 count 列到 at 列之前 */
@@ -117,6 +125,12 @@ export interface SheetContextOptions {
     rows: number;
     cols: number;
   };
+  /**
+   * 行列尺寸写模型后的即时同步钩子：`Sheet.setRowHeight`/`setColWidth` 不发事件，
+   * 宿主经此把尺寸落到活动 SheetGrid 引擎 table（菜单数值项画面即时生效）；
+   * 缺省（无头 / 测试直挂 Sheet）时仅写模型。
+   */
+  syncAxisSizes?: (axis: 'row' | 'col', indexes: number[]) => void;
 }
 /**
  * 创建工具上下文。
@@ -127,6 +141,7 @@ export interface SheetContextOptions {
  *   上下文始终解析到**当前**工作簿（#2：旧实现取构造时值快照，宿主切换
  *   workbook prop 后导出工具仍导出旧工作簿）
  * @param options.resolveGridSize 渲染尺寸解析器（整行/整列样式路由）
+ * @param options.syncAxisSizes 行列尺寸写模型后的即时同步钩子（USheet 接活动 grid）
  */
 export declare function createSheetContext(resolveSheet: Sheet | (() => Sheet), workbook?: Workbook | (() => Workbook), options?: SheetContextOptions): SheetContext;
 //#endregion

package/dist/tools/context.js

@@ -1,5 +1,4 @@
 import { axisStyleItemsForRange, classifySelectionStyleTarget } from "./apply-style.js";
-//#region src/tools/context.ts
 /**
 * 创建工具上下文。
 * @param resolveSheet 活动 sheet 解析器（USheet 传 `() => activeSheet`，
@@ -9,11 +8,13 @@ import { axisStyleItemsForRange, classifySelectionStyleTarget } from "./apply-st
 *   上下文始终解析到**当前**工作簿（#2：旧实现取构造时值快照，宿主切换
 *   workbook prop 后导出工具仍导出旧工作簿）
 * @param options.resolveGridSize 渲染尺寸解析器（整行/整列样式路由）
+* @param options.syncAxisSizes 行列尺寸写模型后的即时同步钩子（USheet 接活动 grid）
 */
 function createSheetContext(resolveSheet, workbook, options) {
 	const sheet = typeof resolveSheet === "function" ? resolveSheet : () => resolveSheet;
 	const resolveWorkbook = typeof workbook === "function" ? workbook : workbook != null ? () => workbook : void 0;
 	const resolveGridSize = options?.resolveGridSize;
+	const syncAxisSizes = options?.syncAxisSizes;
 	const resolveTarget = (range) => {
 		const size = resolveGridSize?.();
 		return size ? classifySelectionStyleTarget(range, size.rows, size.cols) : "cell";
@@ -74,6 +75,26 @@ function createSheetContext(resolveSheet, workbook, options) {
 			return sheet().frozen;
 		},
 		setFrozen: (rows, cols) => sheet().setFrozen(rows, cols),
+		getRowHeight: (row) => sheet().getRowHeight(row),
+		getColWidth: (col) => sheet().getColWidth(col),
+		setRowHeightBySelection: (height) => {
+			const size = Math.max(20, height);
+			const rows = [];
+			for (const range of sheet().getSelection().ranges) for (let row = range.start.row; row <= range.end.row; row++) {
+				sheet().setRowHeight(row, size);
+				rows.push(row);
+			}
+			if (rows.length > 0) syncAxisSizes?.("row", rows);
+		},
+		setColWidthBySelection: (width) => {
+			const size = Math.max(20, width);
+			const cols = [];
+			for (const range of sheet().getSelection().ranges) for (let col = range.start.col; col <= range.end.col; col++) {
+				sheet().setColWidth(col, size);
+				cols.push(col);
+			}
+			if (cols.length > 0) syncAxisSizes?.("col", cols);
+		},
 		insertRows: (at, count) => sheet().insertRows(at, count),
 		insertCols: (at, count) => sheet().insertCols(at, count),
 		deleteRows: (at, count) => sheet().deleteRows(at, count),

package/dist/types/sheet.d.ts

@@ -1,7 +1,7 @@
 import { SheetContext } from "../tools/context.js";
 import { ComputedRef } from "vue";
 import { DeconstructValue } from "@veltra/utils";
-import { ResolveCellRenderer, ResolveCellStyleHook, ResolveDisplayValue, SheetGrid } from "@veltra/sheet-core/grid";
+import { ResolveCellRenderer, ResolveCellStyleHook, ResolveDisplayValue, SheetGrid, SheetGridEditorsOptions, SheetGridHeaderOptions } from "@veltra/sheet-core/grid";
 import { Workbook } from "@veltra/sheet-core/core/workbook.js";
 import { Sheet } from "@veltra/sheet-core/core/sheet.js";
 //#region src/types/sheet.d.ts
@@ -14,7 +14,7 @@ export interface SheetProps {
   /** 渲染列数，默认 26（A..Z） */
   cols?: number;
   /**
-   * 显示值覆盖（设计态 Binding Placeholder 等）：覆盖 VTable record，不写 CellData.v
+   * 显示值覆盖（设计态 Binding Placeholder 等）：覆盖引擎视口显示文本，不写 CellData.v
    */
   resolveDisplayValue?: ResolveDisplayValue;
   /**
@@ -22,11 +22,21 @@ export interface SheetProps {
    */
   resolveCellStyle?: ResolveCellStyleHook;
   /**
-   * 动态单元格渲染（ADR-0004）：视口布局时按格自定义渲染形态（VTable
-   * customLayout，布局构建用 sheet-core 导出的 CustomLayout），返回 undefined
-   * 回落默认渲染；不写模型、不进快照
+   * 动态单元格渲染（ADR-0004）：视口布局时按格自定义渲染形态（返回引擎
+   * `CellRenderer`，见 `@veltra/sheet-core/grid`），返回 undefined 回落默认渲染；
+   * 不写模型、不进快照
    */
   resolveCellRenderer?: ResolveCellRenderer;
+  /**
+   * 列头机制（透传 SheetGrid）：按列列头标题与表头自定义 DOM 渲染，不传保持
+   * 缺省字母表头；传值变化（引用更替）触发网格重建
+   */
+  header?: SheetGridHeaderOptions;
+  /**
+   * 类型化编辑器机制（透传 SheetGrid）：多编辑器注册与按格路由，不传保持统一
+   * 文本编辑器；readonly 下忽略；传值变化（引用更替）触发网格重建
+   */
+  editors?: SheetGridEditorsOptions;
   /** 是否显示工具栏，默认 true */
   showToolbar?: boolean;
   /** 是否显示顶部公式栏（名称框 + fx 输入栏），默认 true */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.5.8",
+  "version": "2.6.0",
   "homepage": "https://github.com/cabinet-fe/ultra-ui#readme",
   "bugs": {
     "url": "https://github.com/cabinet-fe/ultra-ui/issues"
@@ -33,6 +33,9 @@
       "import": "./dist/*"
     }
   },
+  "dependencies": {
+    "infinitable": "^0.1.0"
+  },
   "peerDependencies": {
     "@cat-kit/core": ">=1.2.1",
     "@cat-kit/fe": ">=1.2.1",
@@ -41,6 +44,6 @@
     "@veltra/sheet-core": "^2.5.7",
     "@veltra/styles": "^1.7.14",
     "@veltra/utils": "^1.7.14",
-    "vue": ">=3.5.42"
+    "vue": ">=3.5.43"
   }
 }