@veltra/sheet 2.3.1 → 2.3.3

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

@@ -1,5 +1,5 @@
 import { formatBindingPlaceholderParts, inferReportPreset } from "../../report/binding.js";
-import { CustomLayout } from "@veltra/sheet-core";
+import { CustomLayout } from "@veltra/sheet-core/grid";
 //#region src/components/report/binding-badge.ts
 const REPORT_PRESET_BADGE_COLORS = {
 	groupHeader: {

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

@@ -155,10 +155,14 @@ function useReportDesigner(options) {
 		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;
+			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);
 	}

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

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

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

@@ -1,7 +1,7 @@
 import { buildBodyMenus, buildColHeaderMenus, buildRowHeaderMenus, ensureContextMenuSelection, resolveRenderSize } from "./sheet-context-menu.js";
 import { onBeforeUnmount, onMounted, watch } from "vue";
 import { contextmenu } from "@veltra/desktop";
-import { SheetGrid } from "@veltra/sheet-core/grid/sheet-grid";
+import { SheetGrid } from "@veltra/sheet-core/grid";
 //#region src/components/sheet/use-sheet-grid.ts
 /**
 * 缓存容量：最近 N 个 sheet 的 SheetGrid 实例常驻（tab 来回切换零重建）。
@@ -127,8 +127,9 @@ function useSheetGrid(options) {
 	* tab 切换：优先复用缓存实例（零重建）。
 	* 命中时校验实例是否过期（隐藏期间程序化 structure-change——插入/删除/undo
 	* 行列——vue 层只绑定激活 sheet 的 structure-change，隐藏实例靠自持订阅标记
-	* dirty）；过期则释放重建，否则同步模型状态（选区回驱 + 冻结校正；数据/样式/
-	* 行高由实例常驻的 sheet 事件订阅持续同步，隐藏期间跨表重算等模型变更不丢）。
+	* dirty）；过期则释放重建。命中且未过期只翻可见性：隐藏实例的 cell/merge/
+	* content-reset 已在 GridSyncManager 置脏，setVisible(true) 时一次性 flush，
+	* 不必每次切 tab 都 syncFromModel（会重放全部列宽）。
 	*/
 	function activateGrid() {
 		const sheet = getActiveSheet();
@@ -136,7 +137,6 @@ function useSheetGrid(options) {
 		const cached = cache.get(sheet);
 		if (cached && !cached.dirty) {
 			cached.lastUsed = ++seq;
-			cached.grid.syncFromModel();
 			showOnly(cached);
 			active = cached;
 			bindGridPointerDown(cached.el);

package/dist/report/binding.js

@@ -266,11 +266,13 @@ function inferParentsForPreset(addr, preset, getBindingAt) {
 	const result = {};
 	if (rowSubtotal && rowParent) result.rowParent = rowParent;
 	if (columnSubtotal && colParent) result.colParent = colParent;
-	if (!rowSubtotal && !columnSubtotal) if (belowBand && rowParent) result.rowParent = rowParent;
-	else if (rightOfBand && colParent) result.colParent = colParent;
-	else {
-		if (rowParent) result.rowParent = rowParent;
-		if (colParent) result.colParent = colParent;
+	if (!rowSubtotal && !columnSubtotal) {
+		if (belowBand && rowParent) result.rowParent = rowParent;
+		else if (rightOfBand && colParent) result.colParent = colParent;
+		else {
+			if (rowParent) result.rowParent = rowParent;
+			if (colParent) result.colParent = colParent;
+		}
 	}
 	return result;
 }

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/sheet-grid";
+import { ResolveCellRenderer, ResolveCellStyleHook, ResolveDisplayValue, SheetGrid } from "@veltra/sheet-core/grid";
 import { Workbook } from "@veltra/sheet-core/core/workbook";
 import { Sheet } from "@veltra/sheet-core/core/sheet";
 //#region src/types/sheet.d.ts

package/package.json

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

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

@@ -3,7 +3,7 @@ import {
   CustomLayout,
   type ResolveCellRenderer,
   type ResolveCellStyleHook
-} from '@veltra/sheet-core'
+} from '@veltra/sheet-core/grid'
 
 import { formatBindingPlaceholderParts, inferReportPreset } from '../../report/binding'
 import type { ReportBinding, ReportPreset } from '../../report/types'

package/src/components/report/designer/cell-coords.ts

@@ -1,4 +1,5 @@
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 
 export interface CellOverlayRect {
   left: number

package/src/components/report/designer/drop-highlight-overlay.vue

@@ -6,7 +6,8 @@
 </template>
 
 <script lang="ts" setup>
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 import { bem } from '@veltra/utils'
 import { computed, ref, toRef } from 'vue'
 

package/src/components/report/designer/float-panel.vue

@@ -150,7 +150,8 @@
 
 <script lang="ts" setup>
 import { UButton, URadioGroup, USelect, USwitch } from '@veltra/desktop'
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 import { bem } from '@veltra/utils'
 import { computed, nextTick, ref, toRef, watch } from 'vue'
 

package/src/components/report/designer/topology-overlay.vue

@@ -35,7 +35,8 @@
 </template>
 
 <script lang="ts" setup>
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 import { bem } from '@veltra/utils'
 import { computed, ref, toRef } from 'vue'
 

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

@@ -1,4 +1,5 @@
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 import { onBeforeUnmount, watch, type Ref } from 'vue'
 
 import {

package/src/components/report/report-designer.vue

@@ -146,8 +146,9 @@
 
 <script lang="ts" setup>
 import { UButton, UDrawer } from '@veltra/desktop'
-import type { CellAddress, SheetGrid } from '@veltra/sheet-core'
+import type { CellAddress } from '@veltra/sheet-core'
 import { Workbook } from '@veltra/sheet-core'
+import type { SheetGrid } from '@veltra/sheet-core/grid'
 import { bem } from '@veltra/utils'
 import { computed, nextTick, onScopeDispose, ref, shallowRef, useTemplateRef, watch } from 'vue'
 

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

@@ -1,6 +1,6 @@
 import type { CellAddress } from '@veltra/sheet-core'
-import type { ResolveCellRenderer, ResolveCellStyleHook } from '@veltra/sheet-core'
 import { Workbook } from '@veltra/sheet-core'
+import type { ResolveCellRenderer, ResolveCellStyleHook } from '@veltra/sheet-core/grid'
 import { computed, onScopeDispose, ref, watch, type ComputedRef, type Ref } from 'vue'
 
 import {

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

@@ -30,11 +30,11 @@ self.onmessage = (e: MessageEvent<{ buffer: ArrayBuffer }>): void => {
   const { buffer } = e.data
   void (async () => {
     try {
-      const [{ readXlsx }, { buildWorkbookFromHucre }] = await Promise.all([
+      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), { readStyles: true })
+      const hucreWb = await readXlsx(new Uint8Array(buffer), XLSX_READ_OPTIONS)
       // 分片构建：按 10% 粒度回报进度（避免 196 条/秒的消息风暴与文字跳变过快；
       // 模型构建段约 1s，10 次更新肉眼可见数字推进）
       let lastPercent = -1

package/src/components/sheet/use-sheet-grid.ts

@@ -1,7 +1,7 @@
 import { contextmenu } from '@veltra/desktop'
 import type { CellAddress, CellRange } from '@veltra/sheet-core/core/address'
 import type { Sheet } from '@veltra/sheet-core/core/sheet'
-import { SheetGrid, type SheetGridContextMenuInfo } from '@veltra/sheet-core/grid/sheet-grid'
+import { SheetGrid, type SheetGridContextMenuInfo } from '@veltra/sheet-core/grid'
 import { onBeforeUnmount, onMounted, watch } from 'vue'
 
 import type { SheetContext } from '../../tools/context'
@@ -189,8 +189,9 @@ export function useSheetGrid(options: UseSheetGridOptions) {
    * tab 切换：优先复用缓存实例（零重建）。
    * 命中时校验实例是否过期（隐藏期间程序化 structure-change——插入/删除/undo
    * 行列——vue 层只绑定激活 sheet 的 structure-change，隐藏实例靠自持订阅标记
-   * dirty）；过期则释放重建，否则同步模型状态（选区回驱 + 冻结校正；数据/样式/
-   * 行高由实例常驻的 sheet 事件订阅持续同步，隐藏期间跨表重算等模型变更不丢）。
+   * dirty）；过期则释放重建。命中且未过期只翻可见性：隐藏实例的 cell/merge/
+   * content-reset 已在 GridSyncManager 置脏，setVisible(true) 时一次性 flush，
+   * 不必每次切 tab 都 syncFromModel（会重放全部列宽）。
    */
   function activateGrid(): void {
     const sheet = getActiveSheet()
@@ -199,7 +200,6 @@ export function useSheetGrid(options: UseSheetGridOptions) {
     const cached = cache.get(sheet)
     if (cached && !cached.dirty) {
       cached.lastUsed = ++seq
-      cached.grid.syncFromModel()
       showOnly(cached)
       active = cached
       bindGridPointerDown(cached.el)

package/src/index.ts

@@ -4,8 +4,8 @@
 import './tools/builtin'
 
 // 数据模型 / 渲染内核在 @veltra/sheet-core（独立发包）。本包**不做** re-export：
-// core API（Workbook / Sheet / SheetGrid / 公式 / IO 等）一律
-// `from '@veltra/sheet-core'` 直导，白名单外符号深导入其子路径。
+// core API（Workbook / Sheet / 公式 / IO 等）一律 `from '@veltra/sheet-core'` 直导；
+// SheetGrid 走 `@veltra/sheet-core/grid`；白名单外符号深导入其子路径。
 // 本入口只导出 sheet 自有能力：组件、tools、组件类型。
 
 export { createSheetContext, type SheetContext } from './tools/context'

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

@@ -1,5 +1,5 @@
 import { Sheet } from '@veltra/sheet-core'
-import { buildWorkbookFromHucre } from '@veltra/sheet-core/core/io/import'
+import { buildWorkbookFromHucre, XLSX_READ_OPTIONS } from '@veltra/sheet-core/core/io/import'
 import { readXlsx } from 'hucre/xlsx'
 import { describe, expect, it } from 'vitest'
 
@@ -69,7 +69,7 @@ describe('exportFilledReportXlsx', () => {
     expect(buffer[0]).toBe(0x50)
     expect(buffer[1]).toBe(0x4b)
 
-    const hucreWb = await readXlsx(buffer, { readStyles: true })
+    const hucreWb = await readXlsx(buffer, XLSX_READ_OPTIONS)
     const workbook = buildWorkbookFromHucre(hucreWb)
     const sheet = workbook.getSheets()[0]!
 

package/src/types/sheet.ts

@@ -5,7 +5,7 @@ import type {
   ResolveCellStyleHook,
   ResolveDisplayValue,
   SheetGrid
-} from '@veltra/sheet-core/grid/sheet-grid'
+} from '@veltra/sheet-core/grid'
 import type { DeconstructValue } from '@veltra/utils'
 import type { ComputedRef } from 'vue'