@veltra/sheet 2.8.1 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (68) hide show
  1. package/dist/components/sheet/formula-bar.js +1 -1
  2. package/dist/components/sheet/import-file.js +4 -2
  3. package/dist/components/sheet/insert-image.js +1 -1
  4. package/dist/components/sheet/popup-helpers.js +1 -1
  5. package/dist/components/sheet/popups/border-popup.js +1 -2
  6. package/dist/components/sheet/popups/functions-popup.js +3 -3
  7. package/dist/components/sheet/popups/import.worker.d.ts +5 -1
  8. package/dist/components/sheet/popups/import.worker.js +4 -2
  9. package/dist/components/sheet/sheet-context-menu.js +8 -6
  10. package/dist/components/sheet/sheet.js +12 -2
  11. package/dist/components/sheet/use-find-replace.js +1 -2
  12. package/dist/components/sheet/use-formula-suggest.js +5 -4
  13. package/dist/components/sheet/use-sheet-grid.js +55 -4
  14. package/dist/components/sheet/use-sheet-state.js +1 -1
  15. package/dist/components/sheet/use-tool-popup.js +13 -2
  16. package/dist/index.d.ts +2 -2
  17. package/dist/tools/builtin.js +1 -1
  18. package/dist/tools/context.d.ts +1 -11
  19. package/dist/tools/download.js +3 -3
  20. package/dist/tools/export.worker.d.ts +1 -1
  21. package/dist/tools/export.worker.js +1 -1
  22. package/dist/tools/registry.js +1 -1
  23. package/dist/types/sheet.d.ts +12 -6
  24. package/package.json +2 -3
  25. package/src/components/sheet/__test__/canvas-mock.ts +49 -0
  26. package/src/components/sheet/__test__/find-shortcut-anchor.test.ts +117 -0
  27. package/src/components/sheet/__test__/formula-bar.test.ts +11 -9
  28. package/src/components/sheet/__test__/formula-capability.test.ts +160 -0
  29. package/src/components/sheet/__test__/functions-popup.test.ts +7 -7
  30. package/src/components/sheet/__test__/grid-setup.ts +3 -0
  31. package/src/components/sheet/__test__/grid-test-utils.ts +46 -0
  32. package/src/components/sheet/__test__/import-file.test.ts +44 -9
  33. package/src/components/sheet/__test__/insert-image-popup.test.ts +1 -1
  34. package/src/components/sheet/__test__/insert-image.test.ts +1 -1
  35. package/src/components/sheet/__test__/sheet-component.test.ts +9 -19
  36. package/src/components/sheet/__test__/sheet-context-menu.test.ts +45 -2
  37. package/src/components/sheet/__test__/sheet-grow-on-scroll.test.ts +105 -0
  38. package/src/components/sheet/__test__/sheet-scrollbar.test.ts +87 -0
  39. package/src/components/sheet/__test__/sheet-theme.test.ts +212 -0
  40. package/src/components/sheet/__test__/use-formula-suggest.test.ts +1 -1
  41. package/src/components/sheet/formula-bar.vue +4 -4
  42. package/src/components/sheet/import-file.ts +22 -9
  43. package/src/components/sheet/insert-image.ts +2 -2
  44. package/src/components/sheet/popup-helpers.ts +3 -3
  45. package/src/components/sheet/popups/border-popup.vue +4 -4
  46. package/src/components/sheet/popups/export-popup.vue +1 -1
  47. package/src/components/sheet/popups/find-popup.vue +1 -1
  48. package/src/components/sheet/popups/functions-popup.vue +3 -9
  49. package/src/components/sheet/popups/import.worker.ts +21 -7
  50. package/src/components/sheet/sheet-context-menu.ts +18 -8
  51. package/src/components/sheet/sheet-tabs.vue +2 -2
  52. package/src/components/sheet/sheet.vue +11 -3
  53. package/src/components/sheet/use-find-replace.ts +3 -7
  54. package/src/components/sheet/use-formula-suggest.ts +6 -8
  55. package/src/components/sheet/use-sheet-grid.ts +58 -6
  56. package/src/components/sheet/use-sheet-state.ts +2 -2
  57. package/src/components/sheet/use-tool-popup.ts +22 -2
  58. package/src/index.ts +3 -1
  59. package/src/tools/__test__/apply-style.test.ts +2 -2
  60. package/src/tools/__test__/builtin.test.ts +4 -4
  61. package/src/tools/__test__/context.test.ts +2 -2
  62. package/src/tools/apply-style.ts +3 -3
  63. package/src/tools/builtin.ts +2 -2
  64. package/src/tools/context.ts +11 -11
  65. package/src/tools/download.ts +4 -4
  66. package/src/tools/export.worker.ts +4 -7
  67. package/src/tools/registry.ts +1 -1
  68. package/src/types/sheet.ts +15 -7
@@ -0,0 +1,105 @@
1
+ import { Workbook } from 'infinitable/sheet'
2
+ import { afterEach, describe, expect, it } from 'vite-plus/test'
3
+ import { createApp, h, nextTick, ref, type App } from 'vue'
4
+
5
+ import { USheet } from '../../../index'
6
+ import type { SheetExposed } from '../../../types'
7
+
8
+ const apps: App[] = []
9
+ const containers: HTMLElement[] = []
10
+
11
+ function mount(props: () => Record<string, unknown>): {
12
+ exposed: { value: SheetExposed | undefined }
13
+ el: HTMLElement
14
+ } {
15
+ const exposed: { value: SheetExposed | undefined } = { value: undefined }
16
+ const el = document.createElement('div')
17
+ el.style.width = '800px'
18
+ el.style.height = '600px'
19
+ document.body.appendChild(el)
20
+ containers.push(el)
21
+ const app = createApp({
22
+ render: () =>
23
+ h(USheet, {
24
+ ...props(),
25
+ ref: (value: unknown) => {
26
+ exposed.value = value as SheetExposed | undefined
27
+ }
28
+ })
29
+ })
30
+ app.mount(el)
31
+ apps.push(app)
32
+ return { exposed, el }
33
+ }
34
+
35
+ /**
36
+ * 滚动帧经 requestAnimationFrame 派发(引擎 host.requestFrame):
37
+ * 等待 n 帧确保 onScrollFrame → growOnNearEdge 已执行
38
+ */
39
+ async function nextFrames(count: number): Promise<void> {
40
+ for (let i = 0; i < count; i++) {
41
+ await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
42
+ }
43
+ }
44
+
45
+ /** 滚动到水平最末端(引擎按内容宽度钳制到 maxLeft,可视缓冲触到当前列数) */
46
+ function scrollToLeftEnd(exposed: { value: SheetExposed | undefined }): void {
47
+ exposed.value!.getGrid()!.getTable().setScrollLeft(Number.MAX_SAFE_INTEGER)
48
+ }
49
+
50
+ afterEach(() => {
51
+ while (apps.length) apps.pop()!.unmount()
52
+ while (containers.length) containers.pop()!.remove()
53
+ })
54
+
55
+ describe('USheet growOnScroll(近边增长开关透传)', () => {
56
+ it('缺省:不传保持引擎缺省(true),滚动触界后模型列数扩容', async () => {
57
+ const { exposed } = mount(() => ({ workbook: new Workbook(), rows: 10, cols: 26 }))
58
+ await nextTick()
59
+
60
+ const sheet = exposed.value!.getActiveSheet()
61
+ expect(sheet.cols).toBe(26)
62
+
63
+ scrollToLeftEnd(exposed)
64
+ await nextFrames(3)
65
+ // 引擎 growOnNearEdge:可视缓冲触到 26 列 → 模型与引擎同步扩容
66
+ expect(sheet.cols).toBeGreaterThan(26)
67
+ })
68
+
69
+ it('growOnScroll: false:固定尺寸网格,滚动触界不扩容', async () => {
70
+ const { exposed } = mount(() => ({
71
+ workbook: new Workbook(),
72
+ rows: 10,
73
+ cols: 26,
74
+ growOnScroll: false
75
+ }))
76
+ await nextTick()
77
+
78
+ const sheet = exposed.value!.getActiveSheet()
79
+ scrollToLeftEnd(exposed)
80
+ await nextFrames(3)
81
+ expect(sheet.cols).toBe(26)
82
+ })
83
+
84
+ it('watch 重建:切换 growOnScroll 触发网格重建', async () => {
85
+ const state = ref<boolean | undefined>(false)
86
+ const { exposed } = mount(() => ({
87
+ workbook: new Workbook(),
88
+ rows: 10,
89
+ cols: 26,
90
+ growOnScroll: state.value
91
+ }))
92
+ await nextTick()
93
+
94
+ const gridFixed = exposed.value!.getGrid()
95
+ state.value = undefined
96
+ await nextTick()
97
+ const gridGrow = exposed.value!.getGrid()
98
+ expect(gridGrow).not.toBe(gridFixed)
99
+
100
+ // 重建后的实例恢复引擎缺省(近边增长生效)
101
+ scrollToLeftEnd(exposed)
102
+ await nextFrames(3)
103
+ expect(exposed.value!.getActiveSheet().cols).toBeGreaterThan(26)
104
+ })
105
+ })
@@ -0,0 +1,87 @@
1
+ import { Workbook } from 'infinitable/sheet'
2
+ import { afterEach, describe, expect, it } from 'vite-plus/test'
3
+ import { createApp, h, nextTick, ref, type App } from 'vue'
4
+
5
+ import { USheet } from '../../../index'
6
+ import type { SheetExposed } from '../../../types'
7
+
8
+ const apps: App[] = []
9
+ const containers: HTMLElement[] = []
10
+
11
+ function mount(props: () => Record<string, unknown>): {
12
+ exposed: { value: SheetExposed | undefined }
13
+ } {
14
+ const exposed: { value: SheetExposed | undefined } = { value: undefined }
15
+ const el = document.createElement('div')
16
+ el.style.width = '800px'
17
+ el.style.height = '600px'
18
+ document.body.appendChild(el)
19
+ containers.push(el)
20
+ const app = createApp({
21
+ render: () =>
22
+ h(USheet, {
23
+ ...props(),
24
+ ref: (value: unknown) => {
25
+ exposed.value = value as SheetExposed | undefined
26
+ }
27
+ })
28
+ })
29
+ app.mount(el)
30
+ apps.push(app)
31
+ return { exposed }
32
+ }
33
+
34
+ afterEach(() => {
35
+ while (apps.length) apps.pop()!.unmount()
36
+ while (containers.length) containers.pop()!.remove()
37
+ })
38
+
39
+ describe('USheet scrollbar(缺省画布常驻档,boolean 透传)', () => {
40
+ it('缺省 true:画布常驻档下发引擎', async () => {
41
+ const { exposed } = mount(() => ({ workbook: new Workbook(), rows: 10, cols: 6 }))
42
+ await nextTick()
43
+
44
+ // 组件缺省 true:引擎归一化为 canvas always + reserve,滚动条常驻画在画布内
45
+ expect(exposed.value!.getGrid()!.getTable().options.scrollbar).toBe(true)
46
+ })
47
+
48
+ it('scrollbar: false:整体关闭语义透传', async () => {
49
+ const { exposed } = mount(() => ({
50
+ workbook: new Workbook(),
51
+ rows: 10,
52
+ cols: 6,
53
+ scrollbar: false
54
+ }))
55
+ await nextTick()
56
+
57
+ expect(exposed.value!.getGrid()!.getTable().options.scrollbar).toBe(false)
58
+ })
59
+
60
+ it('watch 重建:boolean 切换触发网格重建,新配置生效', async () => {
61
+ const state = ref(true)
62
+ const { exposed } = mount(() => ({
63
+ workbook: new Workbook(),
64
+ rows: 10,
65
+ cols: 6,
66
+ scrollbar: state.value
67
+ }))
68
+ await nextTick()
69
+
70
+ const gridOn = exposed.value!.getGrid()
71
+ expect(gridOn!.getTable().options.scrollbar).toBe(true)
72
+
73
+ // true → false:构造期选项变化 → 重建,整体关闭
74
+ state.value = false
75
+ await nextTick()
76
+ const gridOff = exposed.value!.getGrid()
77
+ expect(gridOff).not.toBe(gridOn)
78
+ expect(gridOff!.getTable().options.scrollbar).toBe(false)
79
+
80
+ // false → true:恢复画布常驻档,同样重建
81
+ state.value = true
82
+ await nextTick()
83
+ const gridOnAgain = exposed.value!.getGrid()
84
+ expect(gridOnAgain).not.toBe(gridOff)
85
+ expect(gridOnAgain!.getTable().options.scrollbar).toBe(true)
86
+ })
87
+ })
@@ -0,0 +1,212 @@
1
+ import { currentTheme, lightTheme } from '@veltra/styles/theme'
2
+ import { Workbook } from 'infinitable/sheet'
3
+ import { afterEach, describe, expect, it, vi } from 'vite-plus/test'
4
+ import { createApp, h, nextTick, type App } from 'vue'
5
+
6
+ import { USheet } from '../../../index'
7
+ import type { SheetExposed } from '../../../types'
8
+ import { resolveCanvasThemeOverride } from '../use-sheet-grid'
9
+
10
+ /**
11
+ * 画布主题接入(B3):CSS 变量 → 引擎 ThemeOverride 映射 + loadTheme 后缓存
12
+ * 实例原地换肤。变量样本值刻意避开引擎内置缺省色(body #FFF / 表头 #F5F5F5 /
13
+ * 网格线 #E1E4E8 / 冻结线 #B6BABF),断言命中即可区分 override 生效而非缺省。
14
+ */
15
+ const THEME_VARS = {
16
+ '--u-bg-color-top': '#123456',
17
+ '--u-bg-color-bottom': '#234567',
18
+ '--u-text-color-main': '#abcdef',
19
+ '--u-border-color': '#987654',
20
+ '--u-border-muted-color': '#654321'
21
+ } as const
22
+
23
+ /**
24
+ * mock 全局 getComputedStyle:仅覆盖 getPropertyValue 返回的主题 CSS 变量,
25
+ * 未给的变量回退真实计算值,其余属性 / 方法原样透传(挂载路径中引擎
26
+ * normalizeContainer 等仍真实消费 computed style)。返回还原函数。
27
+ */
28
+ function mockThemeVars(vars: Record<string, string>): () => void {
29
+ const real = getComputedStyle
30
+ vi.stubGlobal('getComputedStyle', (el: Element, pseudo?: string | null): CSSStyleDeclaration => {
31
+ const style = real(el, pseudo ?? undefined)
32
+ return new Proxy(style, {
33
+ get(target, prop) {
34
+ if (prop === 'getPropertyValue') {
35
+ return (name: string) => (name in vars ? vars[name]! : target.getPropertyValue(name))
36
+ }
37
+ const value = Reflect.get(target, prop, target)
38
+ return typeof value === 'function' ? value.bind(target) : value
39
+ }
40
+ })
41
+ })
42
+ return () => vi.unstubAllGlobals()
43
+ }
44
+
45
+ const apps: App[] = []
46
+ const containers: HTMLElement[] = []
47
+
48
+ function mount(props: () => Record<string, unknown>): {
49
+ exposed: { value: SheetExposed | undefined }
50
+ el: HTMLElement
51
+ } {
52
+ const exposed: { value: SheetExposed | undefined } = { value: undefined }
53
+ const el = document.createElement('div')
54
+ el.style.width = '800px'
55
+ el.style.height = '600px'
56
+ document.body.appendChild(el)
57
+ containers.push(el)
58
+ const app = createApp({
59
+ render: () =>
60
+ h(USheet, {
61
+ ...props(),
62
+ ref: (value: unknown) => {
63
+ exposed.value = value as SheetExposed | undefined
64
+ }
65
+ })
66
+ })
67
+ app.mount(el)
68
+ apps.push(app)
69
+ return { exposed, el }
70
+ }
71
+
72
+ function tabs(el: HTMLElement): HTMLButtonElement[] {
73
+ return [...el.querySelectorAll<HTMLButtonElement>('.u-sheet__tab')]
74
+ }
75
+
76
+ afterEach(() => {
77
+ while (apps.length) apps.pop()!.unmount()
78
+ while (containers.length) containers.pop()!.remove()
79
+ // 主题单例复位(换肤测试副作用),避免用例间串扰;此时实例已卸载、watcher 已停
80
+ currentTheme.value = undefined
81
+ vi.unstubAllGlobals()
82
+ })
83
+
84
+ describe('resolveCanvasThemeOverride:CSS 变量 → 引擎 ThemeOverride', () => {
85
+ it('变量齐全:按映射表换算(底色/表头/文字/网格线/冻结分隔线)', () => {
86
+ const restore = mockThemeVars({ ...THEME_VARS })
87
+ try {
88
+ expect(resolveCanvasThemeOverride(document.createElement('div'))).toEqual({
89
+ body: { background: '#123456', color: '#abcdef', borderColor: '#987654' },
90
+ header: { background: '#234567', color: '#abcdef', borderColor: '#987654' },
91
+ underlayBackgroundColor: '#123456',
92
+ interaction: { freezeDividerColor: '#654321' },
93
+ frameStyle: { color: '#987654' }
94
+ })
95
+ } finally {
96
+ restore()
97
+ }
98
+ })
99
+
100
+ it('未 loadTheme(变量全空):返回 undefined,保持引擎缺省白底', () => {
101
+ const restore = mockThemeVars({})
102
+ try {
103
+ expect(resolveCanvasThemeOverride(document.createElement('div'))).toBeUndefined()
104
+ } finally {
105
+ restore()
106
+ }
107
+ })
108
+
109
+ it('任一变量为空:返回 undefined,不半套主题', () => {
110
+ for (const key of Object.keys(THEME_VARS)) {
111
+ const restore = mockThemeVars({ ...THEME_VARS, [key]: '' })
112
+ try {
113
+ expect(resolveCanvasThemeOverride(document.createElement('div'))).toBeUndefined()
114
+ } finally {
115
+ restore()
116
+ }
117
+ }
118
+ })
119
+ })
120
+
121
+ describe('USheet 画布主题跟随', () => {
122
+ it('挂载时主题已生效:构造期 override 进入引擎主题', async () => {
123
+ const restore = mockThemeVars({ ...THEME_VARS })
124
+ try {
125
+ const { exposed } = mount(() => ({ workbook: new Workbook(), rows: 10, cols: 6 }))
126
+ await nextTick()
127
+
128
+ const theme = exposed.value!.getGrid()!.getTable().getTheme()
129
+ expect(theme.body.background).toBe('#123456')
130
+ expect(theme.header.background).toBe('#234567')
131
+ expect(theme.body.color).toBe('#abcdef')
132
+ expect(theme.header.color).toBe('#abcdef')
133
+ expect(theme.body.borderColor).toBe('#987654')
134
+ expect(theme.underlayBackgroundColor).toBe('#123456')
135
+ expect(theme.interaction.freezeDividerColor).toBe('#654321')
136
+ expect(theme.frameStyle.color).toBe('#987654')
137
+ } finally {
138
+ restore()
139
+ }
140
+ })
141
+
142
+ it('未 loadTheme 挂载:不带 override,保持引擎内置缺省色', async () => {
143
+ const { exposed } = mount(() => ({ workbook: new Workbook(), rows: 10, cols: 6 }))
144
+ await nextTick()
145
+
146
+ const theme = exposed.value!.getGrid()!.getTable().getTheme()
147
+ expect(theme.body.background).toBe('#FFF')
148
+ expect(theme.header.background).toBe('#F5F5F5')
149
+ })
150
+
151
+ it('loadTheme 实例替换:缓存中所有实例原地 updateTheme,零重建', async () => {
152
+ const workbook = new Workbook()
153
+ workbook.addSheet('Sheet2')
154
+ const { exposed, el } = mount(() => ({ workbook, rows: 10, cols: 6 }))
155
+ await nextTick()
156
+
157
+ // 切到 Sheet2 再切回:两个实例均入缓存(LRU)
158
+ tabs(el)[1]!.click()
159
+ await nextTick()
160
+ const grid2 = exposed.value!.getGrid()!
161
+ tabs(el)[0]!.click()
162
+ await nextTick()
163
+ const grid1 = exposed.value!.getGrid()!
164
+ expect(el.querySelectorAll('.u-sheet__grid-instance')).toHaveLength(2)
165
+ const instancesBefore = [...el.querySelectorAll('.u-sheet__grid-instance')]
166
+
167
+ // 换主题:CSS 变量就位 + loadTheme 替换主题实例 → flush 'post' 后全实例换肤
168
+ const restore = mockThemeVars({ ...THEME_VARS })
169
+ try {
170
+ currentTheme.value = lightTheme
171
+ await nextTick()
172
+ } finally {
173
+ restore()
174
+ }
175
+
176
+ // 缓存中所有实例(含隐藏的 Sheet2 实例)都已换肤
177
+ for (const grid of [grid1, grid2]) {
178
+ const theme = grid.getTable().getTheme()
179
+ expect(theme.body.background).toBe('#123456')
180
+ expect(theme.header.background).toBe('#234567')
181
+ expect(theme.interaction.freezeDividerColor).toBe('#654321')
182
+ }
183
+ // 零重建:实例容器与激活实例都是原对象(updateTheme 原地覆盖,不重建网格)
184
+ const instancesAfter = el.querySelectorAll('.u-sheet__grid-instance')
185
+ expect(instancesAfter).toHaveLength(2)
186
+ expect(instancesAfter[0]).toBe(instancesBefore[0])
187
+ expect(instancesAfter[1]).toBe(instancesBefore[1])
188
+ expect(exposed.value!.getGrid()).toBe(grid1)
189
+ })
190
+
191
+ it('主题 token 原地修改(deep):同样触发换肤', async () => {
192
+ const { exposed } = mount(() => ({ workbook: new Workbook(), rows: 10, cols: 6 }))
193
+ await nextTick()
194
+ const grid = exposed.value!.getGrid()!
195
+
196
+ // 实例替换但变量未注入:不换肤,保持缺省白底
197
+ currentTheme.value = lightTheme
198
+ await nextTick()
199
+ expect(grid.getTable().getTheme().body.background).toBe('#FFF')
200
+
201
+ // 主题 token 原地改(reactive deep)→ 重读 CSS 变量 → updateTheme
202
+ const restore = mockThemeVars({ ...THEME_VARS })
203
+ try {
204
+ lightTheme.theme.bg.color.top = '#123456'
205
+ await nextTick()
206
+ } finally {
207
+ restore()
208
+ lightTheme.theme.bg.color.top = '#ffffff'
209
+ }
210
+ expect(grid.getTable().getTheme().body.background).toBe('#123456')
211
+ })
212
+ })
@@ -1,4 +1,4 @@
1
- import { registerFormulaFunction } from '@veltra/sheet-core/core/formula/functions.js'
1
+ import { registerFormulaFunction } from 'infinitable'
2
2
  import { describe, expect, it } from 'vite-plus/test'
3
3
 
4
4
  import {
@@ -95,16 +95,16 @@
95
95
 
96
96
  <script lang="ts" setup>
97
97
  import { message, UDropdown } from '@veltra/desktop'
98
+ import { bem } from '@veltra/utils'
98
99
  import {
99
100
  formatAddress,
100
101
  formatRange,
101
102
  parseRange,
102
103
  type CellAddress,
103
104
  type CellRange
104
- } from '@veltra/sheet-core/core/address.js'
105
- import type { SelectionState } from '@veltra/sheet-core/core/selection.js'
106
- import type { Sheet } from '@veltra/sheet-core/core/sheet.js'
107
- import { bem } from '@veltra/utils'
105
+ } from 'infinitable/sheet'
106
+ import type { SelectionState } from 'infinitable/sheet'
107
+ import type { Sheet } from 'infinitable/sheet'
108
108
  import {
109
109
  computed,
110
110
  nextTick,
@@ -1,12 +1,8 @@
1
1
  import { message, messageConfirm } from '@veltra/desktop'
2
- import {
3
- importCsv,
4
- importXlsx,
5
- replaceWorkbookWithSnapshots
6
- } from '@veltra/sheet-core/core/io/import.js'
7
- import type { Sheet, SheetSnapshot } from '@veltra/sheet-core/core/sheet.js'
8
- import type { Workbook } from '@veltra/sheet-core/core/workbook.js'
9
2
  import { nextFrame } from '@veltra/utils'
3
+ import { importCsv, importXlsx, replaceWorkbookWithSnapshots } from 'infinitable/sheet'
4
+ import type { Sheet, SheetSnapshot } from 'infinitable/sheet'
5
+ import type { Workbook } from 'infinitable/sheet'
10
6
  import type { Ref } from 'vue'
11
7
 
12
8
  import type { ImportWorkerResponse } from './popups/import.worker'
@@ -28,7 +24,18 @@ export interface ImportFileOptions {
28
24
  onWorkbookReplaced?: () => void
29
25
  }
30
26
 
31
- type ParsedXlsx = { sheets: { name: string; snapshot: SheetSnapshot }[]; activeIndex: number }
27
+ /** worker done 载荷 / 主线程降级解析共用的条目形状(结构化可赋给 SheetReplaceItem) */
28
+ type ParsedXlsx = {
29
+ sheets: {
30
+ name: string
31
+ snapshot: SheetSnapshot
32
+ /** 默认行高 px(模型未声明则不携带) */
33
+ defaultRowHeight?: number
34
+ /** 默认列宽 px(模型未声明则不携带) */
35
+ defaultColWidth?: number
36
+ }[]
37
+ activeIndex: number
38
+ }
32
39
 
33
40
  /**
34
41
  * xlsx 解析(worker 优先):importXlsx 是同步重活,主线程直接跑会冻结 UI。
@@ -83,7 +90,13 @@ async function parseXlsxAsync(
83
90
 
84
91
  function toSnapshotArray(wb: Workbook): ParsedXlsx {
85
92
  return {
86
- sheets: wb.getSheets().map((s) => ({ name: s.name, snapshot: s.snapshot() })),
93
+ sheets: wb.getSheets().map((s) => ({
94
+ name: s.name,
95
+ snapshot: s.snapshot(),
96
+ // 模型未声明默认尺寸不序列化(口径同 snapshot() 的条件字段写法)
97
+ ...(s.defaultRowHeight !== undefined ? { defaultRowHeight: s.defaultRowHeight } : {}),
98
+ ...(s.defaultColWidth !== undefined ? { defaultColWidth: s.defaultColWidth } : {})
99
+ })),
87
100
  activeIndex: wb.activeSheetIndex
88
101
  }
89
102
  }
@@ -1,5 +1,5 @@
1
1
  import { message } from '@veltra/desktop'
2
- import type { SheetImageAnchor, SheetImageType } from '@veltra/sheet-core/core/image.js'
2
+ import type { SheetImageAnchor, SheetImageType } from 'infinitable/sheet'
3
3
 
4
4
  import type { SheetContext } from '../../tools/context'
5
5
 
@@ -24,7 +24,7 @@ const EXT_TO_TYPE: Record<string, SheetImageType> = {
24
24
  webp: 'webp'
25
25
  }
26
26
 
27
- /** MIME → sheet-core 图片类型(core/image 的 SheetImageType);MIME 为空时回落扩展名 */
27
+ /** MIME → 引擎图片类型(SheetImageType);MIME 为空时回落扩展名 */
28
28
  export function resolveImageType(file: File): SheetImageType | undefined {
29
29
  const mime = file.type.trim().toLowerCase()
30
30
  if (mime && MIME_TO_TYPE[mime]) return MIME_TO_TYPE[mime]
@@ -1,6 +1,6 @@
1
- import type { CellRange } from '@veltra/sheet-core/core/address.js'
2
- import type { BorderPreset } from '@veltra/sheet-core/core/style/border-presets.js'
3
- import { BORDER_STYLE_WIDTH, type BorderLineStyle } from '@veltra/sheet-core/core/style/types.js'
1
+ import type { CellRange } from 'infinitable/sheet'
2
+ import type { BorderPreset } from 'infinitable/sheet'
3
+ import { BORDER_STYLE_WIDTH, type BorderLineStyle } from 'infinitable/sheet'
4
4
 
5
5
  import type { SheetContext } from '../../tools/context'
6
6
 
@@ -35,15 +35,15 @@
35
35
 
36
36
  <script lang="ts" setup>
37
37
  import { UPalette } from '@veltra/desktop'
38
- import type { SetCellStyleItem } from '@veltra/sheet-core/core/command/set-cell-style.js'
39
- import { buildBorderPresetItems } from '@veltra/sheet-core/core/style/border-presets.js'
38
+ import { bem } from '@veltra/utils'
39
+ import type { SetCellStyleItem } from 'infinitable/sheet'
40
+ import { buildBorderPresetItems } from 'infinitable/sheet'
40
41
  import {
41
42
  BORDER_STYLE_WIDTH,
42
43
  type BorderEdge,
43
44
  type BorderLineStyle,
44
45
  type CellStylePatch
45
- } from '@veltra/sheet-core/core/style/types.js'
46
- import { bem } from '@veltra/utils'
46
+ } from 'infinitable/sheet'
47
47
  import { ref } from 'vue'
48
48
 
49
49
  import type { SheetContext } from '../../../tools/context'
@@ -30,7 +30,7 @@ const cls = bem('sheet')
30
30
  function exportXlsx(): void {
31
31
  emit('close')
32
32
  // 大工作簿序列化在 worker 中进行(数秒):给常驻反馈,失败(如 sheet 名含
33
- // Excel 非法字符,sheet-core 写入校验抛 InvalidArgumentError)明确报错,
33
+ // Excel 非法字符,引擎写入校验抛 InvalidArgumentError)明确报错,
34
34
  // 绝不静默失败
35
35
  const loading = message({ message: '正在导出…', duration: 0 })
36
36
  exportWorkbookFile(props.context)
@@ -69,8 +69,8 @@
69
69
 
70
70
  <script lang="ts" setup>
71
71
  import { UInput } from '@veltra/desktop'
72
- import type { Sheet } from '@veltra/sheet-core/core/sheet.js'
73
72
  import { bem } from '@veltra/utils'
73
+ import type { Sheet } from 'infinitable/sheet'
74
74
 
75
75
  import type { SheetContext } from '../../../tools/context'
76
76
  import { useFindReplace } from '../use-find-replace'
@@ -28,9 +28,7 @@
28
28
  @click="emit('select', fn.name)"
29
29
  @mouseenter="activeIndex = index"
30
30
  >
31
- <span :class="cls.e('functions-signature')">{{
32
- formatFunctionSignature(fn.name, fn.params)
33
- }}</span>
31
+ <span :class="cls.e('functions-signature')">{{ fn.signature }}</span>
34
32
  <span v-if="fn.description" :class="cls.e('functions-description')">{{
35
33
  fn.description
36
34
  }}</span>
@@ -44,16 +42,12 @@
44
42
 
45
43
  <script lang="ts" setup>
46
44
  import { UInput, UScroll } from '@veltra/desktop'
47
- import {
48
- listFormulaFunctions,
49
- type FormulaFunctionMeta
50
- } from '@veltra/sheet-core/core/formula/functions.js'
51
45
  import { bem } from '@veltra/utils'
46
+ import { listFormulaFunctions, type FormulaFunctionInfo } from 'infinitable'
52
47
  import { computed, onMounted, ref, useTemplateRef, watch } from 'vue'
53
48
 
54
49
  import {
55
50
  COMMON_FORMULA_NAMES,
56
- formatFunctionSignature,
57
51
  FUNCTION_POPUP_CATEGORIES,
58
52
  moveSuggestIndex,
59
53
  type FunctionPopupCategory
@@ -68,7 +62,7 @@ defineOptions({ name: 'USheetFunctionsPopup' })
68
62
  * 弹框随 v-if 挂载 / 销毁,每次打开都是全新状态(关键词清空、回到「常用」)。
69
63
  */
70
64
 
71
- type FunctionItem = { name: string } & FormulaFunctionMeta
65
+ type FunctionItem = FormulaFunctionInfo
72
66
 
73
67
  const emit = defineEmits<{ select: [name: string] }>()
74
68
 
@@ -5,24 +5,32 @@
5
5
  *
6
6
  * 协议:主线程 postMessage({ buffer: ArrayBuffer }) → worker 返回
7
7
  * - { type: 'progress', done, total }(模型分片构建进度,xlsx 解析段无进度)
8
- * - { type: 'done', ok: true, sheets: [{ name, snapshot }], activeIndex }(快照为
9
- * 纯数据,可结构化克隆);失败 { type: 'done', ok: false, error }。
8
+ * - { type: 'done', ok: true, sheets: [{ name, snapshot, defaultRowHeight?,
9
+ * defaultColWidth? }], activeIndex }(快照为纯数据,可结构化克隆;默认行列
10
+ * 尺寸未声明不携带);失败 { type: 'done', ok: false, error }。
10
11
  *
11
- * 解析与构建经 sheet-core importXlsx 完成(hucre 仅由 sheet-core 依赖);
12
+ * 解析与构建经 infinitable/sheet importXlsx 完成(hucre 已内联进引擎统一包);
12
13
  * 名字唯一化与活动表对齐在 worker 内完成,主线程直接把快照替换进目标
13
14
  * (无 undo 历史——替换语义由确认后的 replaceWorkbookWithSnapshots 负责)。
14
15
  *
15
16
  * 注意:必须用**运行时动态 import**——worker 顶层静态 import 在 vite dev 的
16
17
  * worker 上下文中会因模块图加载顺序导致 `Workbook is not defined`(实测)。
17
18
  */
18
- import type { SheetSnapshot } from '@veltra/sheet-core/core/sheet.js'
19
+ import type { SheetSnapshot } from 'infinitable/sheet'
19
20
 
20
21
  export type ImportWorkerResponse =
21
22
  | { type: 'progress'; done: number; total: number }
22
23
  | {
23
24
  type: 'done'
24
25
  ok: true
25
- sheets: { name: string; snapshot: SheetSnapshot }[]
26
+ sheets: {
27
+ name: string
28
+ snapshot: SheetSnapshot
29
+ /** 默认行高 px(模型未声明则不携带;形状同上游 SheetReplaceItem 对应字段) */
30
+ defaultRowHeight?: number
31
+ /** 默认列宽 px(模型未声明则不携带;形状同上游 SheetReplaceItem 对应字段) */
32
+ defaultColWidth?: number
33
+ }[]
26
34
  activeIndex: number
27
35
  }
28
36
  | { type: 'done'; ok: false; error: string }
@@ -31,7 +39,7 @@ self.onmessage = (e: MessageEvent<{ buffer: ArrayBuffer }>): void => {
31
39
  const { buffer } = e.data
32
40
  void (async () => {
33
41
  try {
34
- const { importXlsx } = await import('@veltra/sheet-core/core/io/import.js')
42
+ const { importXlsx } = await import('infinitable/sheet')
35
43
  // 分片构建:按 10% 粒度回报进度(避免 196 条/秒的消息风暴与文字跳变过快;
36
44
  // 模型构建段约 1s,10 次更新肉眼可见数字推进)
37
45
  let lastPercent = -1
@@ -43,7 +51,13 @@ self.onmessage = (e: MessageEvent<{ buffer: ArrayBuffer }>): void => {
43
51
  ;(self as unknown as Worker).postMessage(progress)
44
52
  }
45
53
  })
46
- const sheets = wb.getSheets().map((s) => ({ name: s.name, snapshot: s.snapshot() }))
54
+ const sheets = wb.getSheets().map((s) => ({
55
+ name: s.name,
56
+ snapshot: s.snapshot(),
57
+ // 模型未声明默认尺寸不序列化(口径同 snapshot() 的条件字段写法)
58
+ ...(s.defaultRowHeight !== undefined ? { defaultRowHeight: s.defaultRowHeight } : {}),
59
+ ...(s.defaultColWidth !== undefined ? { defaultColWidth: s.defaultColWidth } : {})
60
+ }))
47
61
  const response: ImportWorkerResponse = {
48
62
  type: 'done',
49
63
  ok: true,