@veltra/sheet 2.3.0 → 2.3.2

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/hub-dataset-editor.js

@@ -66,11 +66,25 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			resetPreview();
 			runDescribe();
 		}, { immediate: true });
+		/** 立即把草稿 SQL 落入数据集（v-model 实时、change 失焦才发且提交有 debounce），供预览同步拿到最新 SQL */
+		function flushSqlDraft(datasetId) {
+			if (sqlTimer) {
+				clearTimeout(sqlTimer);
+				sqlTimer = void 0;
+			}
+			const current = dataset.value;
+			if (!current || current.sql === sqlDraft.value) return;
+			props.hub.updateDataset(datasetId, { sql: sqlDraft.value });
+			runDescribe();
+		}
 		function onSqlChange(value) {
 			sqlDraft.value = value;
+			const datasetId = props.datasetId;
 			if (sqlTimer) clearTimeout(sqlTimer);
 			sqlTimer = setTimeout(() => {
-				props.hub.updateDataset(props.datasetId, { sql: value });
+				sqlTimer = void 0;
+				if (props.datasetId !== datasetId) return;
+				props.hub.updateDataset(datasetId, { sql: value });
 				runDescribe();
 			}, 280);
 		}
@@ -104,6 +118,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 			}));
 		});
 		async function runPreview() {
+			flushSqlDraft(props.datasetId);
 			previewing.value = true;
 			previewError.value = "";
 			const result = await props.hub.previewDataset(props.datasetId);

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/fill-color-popup.js

@@ -13,7 +13,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		*/
 		const props = __props;
 		/** 填充颜色（'' = 无填充） */
-		const fillColor = ref("");
+		const fillColor = ref();
 		onMounted(() => {
 			const active = props.context.getSelection().activeCell;
 			const style = active ? props.context.getEffectiveStyle(active) : void 0;
@@ -21,6 +21,7 @@ const _sfc_main = /*@__PURE__*/ defineComponent({
 		});
 		/** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
 		function applyFillColor(color) {
+			fillColor.value = color;
 			const range = currentRange(props.context);
 			if (!range) return;
 			props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} });

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 来回切换零重建）。

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,15 @@
 {
   "name": "@veltra/sheet",
-  "version": "2.3.0",
+  "version": "2.3.2",
+  "homepage": "https://github.com/cabinet-fe/ultra-ui#readme",
+  "bugs": {
+    "url": "https://github.com/cabinet-fe/ultra-ui/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/cabinet-fe/ultra-ui",
+    "directory": "packages/sheet"
+  },
   "files": [
     "dist",
     "src"
@@ -25,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.0",
-    "@veltra/desktop": "^1.6.0",
+    "@veltra/compositions": "^1.6.4",
+    "@veltra/desktop": "^1.6.4",
     "@veltra/icons": "^1.5.0",
-    "@veltra/sheet-core": "^2.3.0",
-    "@veltra/styles": "^1.6.0",
-    "@veltra/utils": "^1.6.0",
+    "@veltra/sheet-core": "^2.3.2",
+    "@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/hub-dataset-editor.vue

@@ -219,11 +219,27 @@ watch(
   { immediate: true }
 )
 
+/** 立即把草稿 SQL 落入数据集（v-model 实时、change 失焦才发且提交有 debounce），供预览同步拿到最新 SQL */
+function flushSqlDraft(datasetId: string): void {
+  if (sqlTimer) {
+    clearTimeout(sqlTimer)
+    sqlTimer = undefined
+  }
+  const current = dataset.value
+  if (!current || current.sql === sqlDraft.value) return
+  props.hub.updateDataset(datasetId, { sql: sqlDraft.value })
+  void runDescribe()
+}
+
 function onSqlChange(value: string): void {
   sqlDraft.value = value
+  const datasetId = props.datasetId
   if (sqlTimer) clearTimeout(sqlTimer)
   sqlTimer = setTimeout(() => {
-    props.hub.updateDataset(props.datasetId, { sql: value })
+    sqlTimer = undefined
+    // 防抖窗口内切换了数据集则丢弃，避免把旧草稿写进新数据集
+    if (props.datasetId !== datasetId) return
+    props.hub.updateDataset(datasetId, { sql: value })
     void runDescribe()
   }, 280)
 }
@@ -271,6 +287,8 @@ const schemaRows = computed(() => {
 // ---- 记录预览（按参数默认值经连接器取数） ----
 
 async function runPreview(): Promise<void> {
+  // 编辑器 change 仅在失焦时触发且提交有 debounce，先同步落草稿 SQL，避免用旧 SQL 取数
+  flushSqlDraft(props.datasetId)
   previewing.value = true
   previewError.value = ''
   const result = await props.hub.previewDataset(props.datasetId)

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/fill-color-popup.vue

@@ -21,7 +21,7 @@ const props = defineProps<{
 }>()
 
 /** 填充颜色（'' = 无填充） */
-const fillColor = ref('')
+const fillColor = ref<string>()
 
 // 打开时初始化为活动格当前填充色
 onMounted(() => {
@@ -31,7 +31,8 @@ onMounted(() => {
 })
 
 /** 填充颜色变化（'' = 无填充：清除 fill 保留边框） */
-function applyFillColor(color: string): void {
+function applyFillColor(color?: string): void {
+  fillColor.value = color
   const range = currentRange(props.context)
   if (!range) return
   props.context.applyStyle(range, color ? { fill: { color } } : { fill: {} })

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'

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'