@veltra/sheet 4.1.0 → 4.1.2
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.
- package/dist/components/sheet/float-image-menu.js +33 -5
- package/dist/components/sheet/formula-bar.js +95 -11
- package/dist/components/sheet/insert-image.js +33 -4
- package/dist/components/sheet/sheet-context-menu.js +56 -11
- package/dist/components/sheet/sheet.js +30 -6
- package/dist/components/sheet/style.d.ts +2 -0
- package/dist/components/sheet/style.js +2 -0
- package/dist/components/sheet/use-formula-ref-select.js +11 -3
- package/dist/components/sheet/use-sheet-grid.js +12 -3
- package/dist/types/sheet.d.ts +4 -3
- package/package.json +2 -4
- package/src/components/sheet/__test__/float-image-menu.test.ts +72 -6
- package/src/components/sheet/__test__/formula-bar.test.ts +203 -0
- package/src/components/sheet/__test__/insert-image.test.ts +60 -0
- package/src/components/sheet/__test__/sheet-component.test.ts +68 -3
- package/src/components/sheet/__test__/sheet-context-menu.test.ts +96 -17
- package/src/components/sheet/__test__/use-formula-ref-select.test.ts +12 -1
- package/src/components/sheet/float-image-menu.ts +26 -4
- package/src/components/sheet/formula-bar.vue +106 -14
- package/src/components/sheet/insert-image.ts +32 -3
- package/src/components/sheet/sheet-context-menu.ts +48 -12
- package/src/components/sheet/sheet.vue +62 -28
- package/src/components/sheet/style.ts +3 -1
- package/src/components/sheet/use-formula-ref-select.ts +13 -0
- package/src/components/sheet/use-sheet-grid.ts +30 -9
- package/src/types/sheet.ts +4 -3
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
buildBodyMenus,
|
|
9
9
|
buildColHeaderMenus,
|
|
10
10
|
buildRowHeaderMenus,
|
|
11
|
+
cellImageToFloat,
|
|
11
12
|
defaultInsertCount,
|
|
12
13
|
ensureContextMenuSelection,
|
|
13
14
|
isColInSelection,
|
|
@@ -220,23 +221,27 @@ describe('build*Menus', () => {
|
|
|
220
221
|
expect(readonlyCol.render).toBeUndefined()
|
|
221
222
|
})
|
|
222
223
|
|
|
223
|
-
it('body 菜单:合并/取消合并 + 设置数据格式子菜单 + 插入超链接 +
|
|
224
|
+
it('body 菜单:合并/取消合并 + 设置数据格式子菜单 + 插入超链接 + 插入/嵌入图片,不含行列插入删除', () => {
|
|
224
225
|
const sheet = new Sheet()
|
|
225
226
|
const ctx = createSheetContext(sheet)
|
|
226
227
|
sheet.selectCell({ row: 0, col: 0 })
|
|
227
228
|
const menus = buildBodyMenus(ctx)
|
|
228
|
-
expect(menus).toHaveLength(
|
|
229
|
+
expect(menus).toHaveLength(7)
|
|
229
230
|
expect(menus.map((m) => m.label ?? (m.divider ? '---' : ''))).toEqual([
|
|
230
231
|
'合并单元格',
|
|
231
232
|
'取消合并单元格',
|
|
232
233
|
'---',
|
|
233
234
|
'设置数据格式',
|
|
234
235
|
'插入超链接',
|
|
235
|
-
'插入图片'
|
|
236
|
+
'插入图片',
|
|
237
|
+
'嵌入图片'
|
|
236
238
|
])
|
|
237
239
|
const insertImage = menus.find((m) => m.label === '插入图片')!
|
|
238
240
|
expect(insertImage.disabled).toBeFalsy()
|
|
239
241
|
expect(insertImage.callback).toBeTruthy()
|
|
242
|
+
const embedImage = menus.find((m) => m.label === '嵌入图片')!
|
|
243
|
+
expect(embedImage.disabled).toBeFalsy()
|
|
244
|
+
expect(embedImage.callback).toBeTruthy()
|
|
240
245
|
const labels = menus.map((m) => m.label).join()
|
|
241
246
|
expect(labels).not.toContain('插入行')
|
|
242
247
|
expect(labels).not.toContain('插入列')
|
|
@@ -323,12 +328,13 @@ describe('build*Menus', () => {
|
|
|
323
328
|
expect(ctx.canUndo).toBe(false)
|
|
324
329
|
})
|
|
325
330
|
|
|
326
|
-
it('body 插入图片 / 设置数据格式:无活动格时禁用', () => {
|
|
331
|
+
it('body 插入图片 / 嵌入图片 / 设置数据格式:无活动格时禁用', () => {
|
|
327
332
|
const sheet = new Sheet()
|
|
328
333
|
const ctx = createSheetContext(sheet)
|
|
329
334
|
sheet.selection.clear()
|
|
330
335
|
const menus = buildBodyMenus(ctx)
|
|
331
336
|
expect(menus.find((m) => m.label === '插入图片')?.disabled).toBe(true)
|
|
337
|
+
expect(menus.find((m) => m.label === '嵌入图片')?.disabled).toBe(true)
|
|
332
338
|
expect(menus.find((m) => m.label === '设置数据格式')?.disabled).toBe(true)
|
|
333
339
|
// 无活动格:超链接项同样禁用
|
|
334
340
|
expect(menus.find((m) => m.label === '插入超链接')?.disabled).toBe(true)
|
|
@@ -468,18 +474,26 @@ describe('buildBodyMenus 嵌入图项(按目标格嵌入图状态出项)', (
|
|
|
468
474
|
return { previews, open: (source: unknown): void => previews.push(source) }
|
|
469
475
|
}
|
|
470
476
|
|
|
471
|
-
it('
|
|
477
|
+
it('无嵌入图:不出现图片项(普通格菜单 + 嵌入图片入口)', () => {
|
|
472
478
|
const sheet = new Sheet()
|
|
473
479
|
const ctx = createSheetContext(sheet)
|
|
474
480
|
sheet.selectCell(ADDR)
|
|
475
481
|
const labels = buildBodyMenus(ctx).map((m) => m.label ?? (m.divider ? '---' : ''))
|
|
476
|
-
expect(labels).toHaveLength(
|
|
477
|
-
|
|
482
|
+
expect(labels).toHaveLength(7)
|
|
483
|
+
expect(labels).toContain('嵌入图片')
|
|
484
|
+
for (const label of [
|
|
485
|
+
'预览',
|
|
486
|
+
'图片超链接',
|
|
487
|
+
'取消超链接',
|
|
488
|
+
'转为浮动图片',
|
|
489
|
+
'替换图片',
|
|
490
|
+
'移除图片'
|
|
491
|
+
]) {
|
|
478
492
|
expect(labels).not.toContain(label)
|
|
479
493
|
}
|
|
480
494
|
})
|
|
481
495
|
|
|
482
|
-
it('
|
|
496
|
+
it('嵌入图格出纯图片菜单:不含合并/数据格式/超链接/插入图片等普通格项(无链接)', () => {
|
|
483
497
|
const sheet = new Sheet()
|
|
484
498
|
const ctx = createSheetContext(sheet)
|
|
485
499
|
ctx.insertCellImage(ADDR, { src: 'https://example.com/a.png' })
|
|
@@ -491,18 +505,23 @@ describe('buildBodyMenus 嵌入图项(按目标格嵌入图状态出项)', (
|
|
|
491
505
|
openHyperlinkPopup: popup.open,
|
|
492
506
|
openImagePreview: preview.open
|
|
493
507
|
})
|
|
494
|
-
expect(menus.map((m) => m.label
|
|
508
|
+
expect(menus.map((m) => m.label)).toEqual([
|
|
509
|
+
'预览',
|
|
510
|
+
'图片超链接',
|
|
511
|
+
'转为浮动图片',
|
|
512
|
+
'替换图片',
|
|
513
|
+
'移除图片'
|
|
514
|
+
])
|
|
515
|
+
for (const label of [
|
|
495
516
|
'合并单元格',
|
|
496
517
|
'取消合并单元格',
|
|
497
|
-
'---',
|
|
498
518
|
'设置数据格式',
|
|
499
519
|
'插入超链接',
|
|
500
520
|
'插入图片',
|
|
501
|
-
'
|
|
502
|
-
|
|
503
|
-
|
|
504
|
-
|
|
505
|
-
])
|
|
521
|
+
'嵌入图片'
|
|
522
|
+
]) {
|
|
523
|
+
expect(menus.find((m) => m.label === label)).toBeUndefined()
|
|
524
|
+
}
|
|
506
525
|
|
|
507
526
|
menus.find((m) => m.label === '预览')!.callback!()
|
|
508
527
|
expect(preview.previews).toEqual([{ src: 'https://example.com/a.png' }])
|
|
@@ -520,7 +539,14 @@ describe('buildBodyMenus 嵌入图项(按目标格嵌入图状态出项)', (
|
|
|
520
539
|
const popup = popupSpy()
|
|
521
540
|
|
|
522
541
|
const menus = buildBodyMenus(ctx, { openHyperlinkPopup: popup.open })
|
|
523
|
-
expect(menus.map((m) => m.label)).
|
|
542
|
+
expect(menus.map((m) => m.label)).toEqual([
|
|
543
|
+
'预览',
|
|
544
|
+
'图片超链接',
|
|
545
|
+
'取消超链接',
|
|
546
|
+
'转为浮动图片',
|
|
547
|
+
'替换图片',
|
|
548
|
+
'移除图片'
|
|
549
|
+
])
|
|
524
550
|
|
|
525
551
|
menus.find((m) => m.label === '图片超链接')!.callback!()
|
|
526
552
|
expect(popup.calls).toEqual([
|
|
@@ -552,7 +578,57 @@ describe('buildBodyMenus 嵌入图项(按目标格嵌入图状态出项)', (
|
|
|
552
578
|
expect(ctx.hasCellImage(ADDR)).toBe(true)
|
|
553
579
|
})
|
|
554
580
|
|
|
555
|
-
it('
|
|
581
|
+
it('转为浮动图片:锚点格落浮动图(格宽高定尺寸、contain 保比例),link 随迁,单 undo 还原', () => {
|
|
582
|
+
const sheet = new Sheet()
|
|
583
|
+
const ctx = createSheetContext(sheet)
|
|
584
|
+
sheet.setRowHeight(ADDR.row, 64)
|
|
585
|
+
sheet.setColWidth(ADDR.col, 120)
|
|
586
|
+
ctx.insertCellImage(ADDR, {
|
|
587
|
+
src: 'https://example.com/a.png',
|
|
588
|
+
type: 'png',
|
|
589
|
+
link: 'https://example.com'
|
|
590
|
+
})
|
|
591
|
+
sheet.selectCell(ADDR)
|
|
592
|
+
|
|
593
|
+
buildBodyMenus(ctx).find((m) => m.label === '转为浮动图片')!.callback!()
|
|
594
|
+
// 嵌入图消失,浮动图落在锚点格:尺寸取格宽高,src/link 随迁,fit 对齐嵌入图缺省 contain
|
|
595
|
+
expect(ctx.hasCellImage(ADDR)).toBe(false)
|
|
596
|
+
const floats = ctx.getImages()
|
|
597
|
+
expect(floats).toHaveLength(1)
|
|
598
|
+
expect(floats[0]?.anchor.from).toEqual(ADDR)
|
|
599
|
+
expect(floats[0]?.width).toBe(120)
|
|
600
|
+
expect(floats[0]?.height).toBe(64)
|
|
601
|
+
expect(floats[0]?.fit).toBe('contain')
|
|
602
|
+
expect(floats[0]?.src).toBe('https://example.com/a.png')
|
|
603
|
+
expect(floats[0]?.link).toBe('https://example.com')
|
|
604
|
+
|
|
605
|
+
// 事务合并:一次 undo 同时还原嵌入图、清掉浮动图
|
|
606
|
+
expect(ctx.undo()).toBe(true)
|
|
607
|
+
expect(ctx.hasCellImage(ADDR)).toBe(true)
|
|
608
|
+
expect(ctx.getImages()).toHaveLength(0)
|
|
609
|
+
})
|
|
610
|
+
|
|
611
|
+
it('转为浮动图片:data 字节图迁字节;无嵌入图无操作', () => {
|
|
612
|
+
const sheet = new Sheet()
|
|
613
|
+
const ctx = createSheetContext(sheet)
|
|
614
|
+
const addr = { row: 3, col: 4 }
|
|
615
|
+
ctx.insertCellImage(addr, { data: new Uint8Array([7, 8]), type: 'gif' })
|
|
616
|
+
|
|
617
|
+
cellImageToFloat(ctx, addr)
|
|
618
|
+
const floats = ctx.getImages()
|
|
619
|
+
expect(floats).toHaveLength(1)
|
|
620
|
+
expect([...floats[0]!.data]).toEqual([7, 8])
|
|
621
|
+
expect(floats[0]!.type).toBe('gif')
|
|
622
|
+
expect(floats[0]!.src).toBeUndefined()
|
|
623
|
+
|
|
624
|
+
// 无嵌入图:无操作(不产生浮动图、不新增 undo 单元)
|
|
625
|
+
const undoSizeBefore = sheet.history.undoSize
|
|
626
|
+
cellImageToFloat(ctx, { row: 0, col: 0 })
|
|
627
|
+
expect(ctx.getImages()).toHaveLength(1)
|
|
628
|
+
expect(sheet.history.undoSize).toBe(undoSizeBefore)
|
|
629
|
+
})
|
|
630
|
+
|
|
631
|
+
it('readonly:图片超链接/取消超链接/转浮动/替换/移除禁用、预览可用;句柄缺省:预览/图片超链接禁用', () => {
|
|
556
632
|
const sheet = new Sheet()
|
|
557
633
|
const ctx = createSheetContext(sheet)
|
|
558
634
|
ctx.insertCellImage(ADDR, { src: 'https://example.com/a.png', link: 'https://e.com' })
|
|
@@ -566,11 +642,14 @@ describe('buildBodyMenus 嵌入图项(按目标格嵌入图状态出项)', (
|
|
|
566
642
|
expect(readonly.find((m) => m.label === '预览')?.disabled).toBeFalsy()
|
|
567
643
|
expect(readonly.find((m) => m.label === '图片超链接')?.disabled).toBe(true)
|
|
568
644
|
expect(readonly.find((m) => m.label === '取消超链接')?.disabled).toBe(true)
|
|
645
|
+
expect(readonly.find((m) => m.label === '转为浮动图片')?.disabled).toBe(true)
|
|
646
|
+
expect(readonly.find((m) => m.label === '替换图片')?.disabled).toBe(true)
|
|
569
647
|
expect(readonly.find((m) => m.label === '移除图片')?.disabled).toBe(true)
|
|
570
648
|
|
|
571
649
|
const noHandles = buildBodyMenus(ctx)
|
|
572
650
|
expect(noHandles.find((m) => m.label === '预览')?.disabled).toBe(true)
|
|
573
651
|
expect(noHandles.find((m) => m.label === '图片超链接')?.disabled).toBe(true)
|
|
652
|
+
expect(noHandles.find((m) => m.label === '转为浮动图片')?.disabled).toBeFalsy()
|
|
574
653
|
expect(noHandles.find((m) => m.label === '移除图片')?.disabled).toBeFalsy()
|
|
575
654
|
})
|
|
576
655
|
})
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { describe, expect, it } from 'vite-plus/test'
|
|
2
2
|
|
|
3
|
-
import { insertRefText, isRefSelectContext } from '../use-formula-ref-select'
|
|
3
|
+
import { insertRefText, isRefSelectContext, replaceRefText } from '../use-formula-ref-select'
|
|
4
4
|
|
|
5
5
|
describe('isRefSelectContext', () => {
|
|
6
6
|
it('运算符 / ( / , / = 之后可插入引用', () => {
|
|
@@ -33,3 +33,14 @@ describe('insertRefText', () => {
|
|
|
33
33
|
expect(insertRefText('=SUM(XX)', 5, 'A1', 7)).toEqual({ text: '=SUM(A1)', cursor: 7 })
|
|
34
34
|
})
|
|
35
35
|
})
|
|
36
|
+
|
|
37
|
+
describe('replaceRefText', () => {
|
|
38
|
+
it('替换区间为引用文本,光标落替换文本后(shift 扩展语义)', () => {
|
|
39
|
+
expect(replaceRefText('=SUM(A1', 5, 7, 'A1:C3')).toEqual({ text: '=SUM(A1:C3', cursor: 10 })
|
|
40
|
+
expect(replaceRefText('=SUM(A1:C3', 5, 10, 'A1:D5')).toEqual({ text: '=SUM(A1:D5', cursor: 10 })
|
|
41
|
+
})
|
|
42
|
+
|
|
43
|
+
it('区间收缩为空等价插入', () => {
|
|
44
|
+
expect(replaceRefText('=SUM(', 5, 5, 'B2')).toEqual({ text: '=SUM(B2', cursor: 7 })
|
|
45
|
+
})
|
|
46
|
+
})
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ContextmenuItem } from '@veltra/desktop'
|
|
2
2
|
import { contextmenu } from '@veltra/desktop'
|
|
3
|
+
import type { CellImagePayload } from 'infinitable/sheet'
|
|
3
4
|
|
|
4
5
|
import type { SheetContext } from '../../tools/context'
|
|
5
6
|
import type { FloatContextMenuPayload } from '../../types'
|
|
@@ -15,10 +16,30 @@ export interface FloatImageMenuHandles {
|
|
|
15
16
|
}
|
|
16
17
|
|
|
17
18
|
/**
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
|
|
19
|
+
* 浮动图转为按格嵌入图(对齐 WPS/Excel「放置在单元格中」):落点为图片锚点格
|
|
20
|
+
* (anchor.from,即图片左上角所在格),src/data/type/link 随载荷迁移。事务内
|
|
21
|
+
* insertCellImage + removeImage——一次转换 = 一个 undo 单元。
|
|
22
|
+
*/
|
|
23
|
+
export function embedFloatImageToCell(ctx: SheetContext, id: string): void {
|
|
24
|
+
const image = ctx.getImages().find((item) => item.id === id)
|
|
25
|
+
if (!image) return
|
|
26
|
+
const payload: CellImagePayload = image.src
|
|
27
|
+
? { src: image.src, type: image.type }
|
|
28
|
+
: { data: image.data, type: image.type }
|
|
29
|
+
if (image.link) payload.link = image.link
|
|
30
|
+
ctx.beginTransaction()
|
|
31
|
+
ctx.insertCellImage(image.anchor.from, payload)
|
|
32
|
+
ctx.removeImage(id)
|
|
33
|
+
ctx.commit()
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* 浮动图右键独立菜单:预览 / 设置超链接 / 取消超链接(无链接不出现)/
|
|
38
|
+
* 嵌入单元格 / 删除图片。设置走 hyperlink 弹窗 image 模式(confirm
|
|
39
|
+
* `updateImage(id, { link })`);取消直写 `updateImage(id, { link: null })`
|
|
40
|
+
* (null 清除,可 undo);嵌入单元格走 `embedFloatImageToCell`(事务合并单 undo);
|
|
41
|
+
* 删除走 `removeImage`(命令系统,可 undo)。命中 id 不存在(并发删除)返回空数组,
|
|
42
|
+
* 调用方不弹菜单。
|
|
22
43
|
*/
|
|
23
44
|
export function buildFloatImageMenus(
|
|
24
45
|
ctx: SheetContext,
|
|
@@ -50,6 +71,7 @@ export function buildFloatImageMenus(
|
|
|
50
71
|
}
|
|
51
72
|
]
|
|
52
73
|
: []),
|
|
74
|
+
{ label: '嵌入单元格', disabled: readonly, callback: () => embedFloatImageToCell(ctx, id) },
|
|
53
75
|
{ label: '删除图片', disabled: readonly, callback: () => ctx.removeImage(id) }
|
|
54
76
|
]
|
|
55
77
|
return items
|
|
@@ -96,6 +96,7 @@
|
|
|
96
96
|
<script lang="ts" setup>
|
|
97
97
|
import { message, UDropdown } from '@veltra/desktop'
|
|
98
98
|
import { bem } from '@veltra/utils'
|
|
99
|
+
import { scanFormulaReferences, type ScannedReference } from 'infinitable'
|
|
99
100
|
import {
|
|
100
101
|
formatAddress,
|
|
101
102
|
formatRange,
|
|
@@ -119,7 +120,12 @@ import {
|
|
|
119
120
|
import type { SheetContext } from '../../tools/context'
|
|
120
121
|
import UFormulaSuggestList from './formula-suggest-list.vue'
|
|
121
122
|
import USheetFunctionsPopup from './popups/functions-popup.vue'
|
|
122
|
-
import {
|
|
123
|
+
import {
|
|
124
|
+
REF_HIGHLIGHT_COLORS,
|
|
125
|
+
insertRefText,
|
|
126
|
+
isRefSelectContext,
|
|
127
|
+
replaceRefText
|
|
128
|
+
} from './use-formula-ref-select'
|
|
123
129
|
import {
|
|
124
130
|
applySuggest,
|
|
125
131
|
filterFormulaSuggestions,
|
|
@@ -145,6 +151,8 @@ const props = defineProps<{
|
|
|
145
151
|
context: SheetContext
|
|
146
152
|
/** fx 编辑会话置/清引擎选区锚点(use-sheet-grid 经活动实例透传;缺省静默) */
|
|
147
153
|
setSelectionAnchor?: (addr: CellAddress | null) => void
|
|
154
|
+
/** 公式引用染色框同步(use-sheet-grid 经活动实例透传;空数组清除;缺省静默) */
|
|
155
|
+
setRefHighlights?: (items: { range: CellRange; color: string }[]) => void
|
|
148
156
|
}>()
|
|
149
157
|
|
|
150
158
|
const cls = bem('sheet')
|
|
@@ -182,31 +190,106 @@ function isRefSelecting(): boolean {
|
|
|
182
190
|
return editing.value && !mirroring.value && isRefSelectContext(fxDraft.value, fxCursor.value)
|
|
183
191
|
}
|
|
184
192
|
|
|
185
|
-
/**
|
|
193
|
+
/** 上次引用插入的文本区间(fxDraft 内 [start, end)):插入引用后光标离开触发位、
|
|
194
|
+
* isRefSelectContext 判定失效,拾取会话延续依赖它维持 blur 抑制与替换/扩展语义 */
|
|
195
|
+
let lastRefInsert: { start: number; end: number } | null = null
|
|
196
|
+
|
|
197
|
+
function clearRefInsert(): void {
|
|
198
|
+
lastRefInsert = null
|
|
199
|
+
}
|
|
200
|
+
|
|
201
|
+
/** 引用拾取延续中(上次插入的引用可被后续点选替换/扩展,点击画布不退出编辑) */
|
|
202
|
+
function hasRefInsert(): boolean {
|
|
203
|
+
return lastRefInsert !== null
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/** 网格 pointerdown(capture)→ 挂起即将到来的 blur 提交;拾取会话延续中
|
|
207
|
+
* (上次插入的引用未被打断)同样挂起——任意点击都消费为引用替换/扩展 */
|
|
186
208
|
function beginBlurSuppress(): void {
|
|
187
|
-
if (!isRefSelecting()) return
|
|
209
|
+
if (!isRefSelecting() && !lastRefInsert) return
|
|
188
210
|
suppressBlurCommit = true
|
|
189
211
|
}
|
|
190
212
|
|
|
191
|
-
/** 选区拦截回调:插入 A1 / A1:B2
|
|
213
|
+
/** 选区拦截回调:插入 A1 / A1:B2 到光标处(仅引用选择模式;弹框打开但非引用上下文时不插入)。
|
|
214
|
+
* 拾取会话延续(lastRefInsert 存在):替换上次插入的引用——shift 扩展回交(Excel 锚点
|
|
215
|
+
* 恒定连续扩展)与普通点选(Point mode 换目标)同走此路径,编辑不中断 */
|
|
192
216
|
function handleRefSelect(range: CellRange): void {
|
|
193
|
-
|
|
217
|
+
// 延续拾取放行:插入后光标离开触发位、isRefSelectContext 失效,延续回交
|
|
218
|
+
// 靠 lastRefInsert 而非光标上下文成立
|
|
219
|
+
if (!isRefSelecting() && !lastRefInsert) return
|
|
220
|
+
// 被编辑格自身不可拾取为引用(Excel 语义:避免循环引用;点中目标格视作无操作)
|
|
221
|
+
if (
|
|
222
|
+
editAddr &&
|
|
223
|
+
range.start.row === range.end.row &&
|
|
224
|
+
range.start.col === range.end.col &&
|
|
225
|
+
range.start.row === editAddr.row &&
|
|
226
|
+
range.start.col === editAddr.col
|
|
227
|
+
) {
|
|
228
|
+
return
|
|
229
|
+
}
|
|
194
230
|
const rangeText = formatRange(range)
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
231
|
+
if (lastRefInsert) {
|
|
232
|
+
const { start } = lastRefInsert
|
|
233
|
+
const result = replaceRefText(fxDraft.value, start, lastRefInsert.end, rangeText)
|
|
234
|
+
fxDraft.value = result.text
|
|
235
|
+
fxCursor.value = result.cursor
|
|
236
|
+
lastRefInsert = { start, end: result.cursor }
|
|
237
|
+
} else {
|
|
238
|
+
const el = fxRef.value
|
|
239
|
+
const selEnd = el?.selectionEnd ?? fxCursor.value
|
|
240
|
+
const result = insertRefText(fxDraft.value, fxCursor.value, rangeText, selEnd)
|
|
241
|
+
fxDraft.value = result.text
|
|
242
|
+
fxCursor.value = result.cursor
|
|
243
|
+
lastRefInsert = { start: result.cursor - rangeText.length, end: result.cursor }
|
|
244
|
+
}
|
|
200
245
|
closeSuggest()
|
|
201
246
|
void nextTick(() => {
|
|
202
247
|
const input = fxRef.value
|
|
203
248
|
if (!input) return
|
|
204
249
|
input.focus()
|
|
205
|
-
input.setSelectionRange(
|
|
250
|
+
input.setSelectionRange(fxCursor.value, fxCursor.value)
|
|
206
251
|
autosizeFx()
|
|
207
252
|
})
|
|
208
253
|
}
|
|
209
254
|
|
|
255
|
+
// ─── 引用染色框(画布视觉反馈) ────────────────────────────
|
|
256
|
+
|
|
257
|
+
/** 公式文本扫描 → 画布染色框:编辑中且 `=` 开头时逐引用上框(颜色按出现顺序循环),
|
|
258
|
+
* 手输/点选/扩展一视同仁(对齐 Excel:编辑公式即染色全部引用);其余状态清除 */
|
|
259
|
+
function syncRefHighlights(): void {
|
|
260
|
+
if (!editing.value || mirroring.value || !fxDraft.value.startsWith('=')) {
|
|
261
|
+
props.setRefHighlights?.([])
|
|
262
|
+
return
|
|
263
|
+
}
|
|
264
|
+
props.setRefHighlights?.(scanFormulaReferences(fxDraft.value).map(refToHighlight))
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
/** 扫描结果 → 染色框条目(RangeRef 展开为区域,单格引用同形) */
|
|
268
|
+
function refToHighlight(
|
|
269
|
+
scanned: ScannedReference,
|
|
270
|
+
index: number
|
|
271
|
+
): { range: CellRange; color: string } {
|
|
272
|
+
const color = REF_HIGHLIGHT_COLORS[index % REF_HIGHLIGHT_COLORS.length]!
|
|
273
|
+
const ref = scanned.ref
|
|
274
|
+
if (scanned.isRange) {
|
|
275
|
+
return {
|
|
276
|
+
range: {
|
|
277
|
+
start: { row: ref.startRow, col: ref.startCol },
|
|
278
|
+
end: { row: ref.endRow, col: ref.endCol }
|
|
279
|
+
},
|
|
280
|
+
color
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
return {
|
|
284
|
+
range: { start: { row: ref.row, col: ref.col }, end: { row: ref.row, col: ref.col } },
|
|
285
|
+
color
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
|
|
289
|
+
// 草稿/编辑态/镜像态任一变化即重扫(拾取回交改稿、手输、会话结束都经这三者;
|
|
290
|
+
// 提交同文提交时 fxDraft 不变但 editing 翻转,watch 仍触发完成清除)
|
|
291
|
+
watch([fxDraft, editing, mirroring], syncRefHighlights)
|
|
292
|
+
|
|
210
293
|
// ─── 显示文本 ──────────────────────────────────────────────
|
|
211
294
|
|
|
212
295
|
function nameText(state: SelectionState): string {
|
|
@@ -316,6 +399,8 @@ function syncFxCursor(): void {
|
|
|
316
399
|
}
|
|
317
400
|
|
|
318
401
|
function handleFxInput(): void {
|
|
402
|
+
// 用户手动编辑使上次插入区间失效(shift 扩展只对未经编辑的插入文本有效)
|
|
403
|
+
clearRefInsert()
|
|
319
404
|
syncFxCursor()
|
|
320
405
|
autosizeFx()
|
|
321
406
|
}
|
|
@@ -350,6 +435,7 @@ function confirmSuggest(item?: FormulaSuggestItem): void {
|
|
|
350
435
|
const result = applySuggest(fxDraft.value, ctx.start, ctx.end, pick.name)
|
|
351
436
|
fxDraft.value = result.text
|
|
352
437
|
fxCursor.value = result.cursor
|
|
438
|
+
clearRefInsert()
|
|
353
439
|
closeSuggest()
|
|
354
440
|
void nextTick(() => {
|
|
355
441
|
const el = fxRef.value
|
|
@@ -466,8 +552,9 @@ function commitEdit(): void {
|
|
|
466
552
|
editing.value = false
|
|
467
553
|
editAddr = null
|
|
468
554
|
suppressBlurCommit = false
|
|
469
|
-
// 会话结束清锚点(Enter / ✓ /
|
|
555
|
+
// 会话结束清锚点(Enter / ✓ / 失焦同路径)与引用插入延续状态
|
|
470
556
|
props.setSelectionAnchor?.(null)
|
|
557
|
+
clearRefInsert()
|
|
471
558
|
closeSuggest()
|
|
472
559
|
if (addr) {
|
|
473
560
|
props.context.setCellValue(addr, fxDraft.value)
|
|
@@ -485,8 +572,9 @@ function cancelEdit(): void {
|
|
|
485
572
|
editing.value = false
|
|
486
573
|
editAddr = null
|
|
487
574
|
suppressBlurCommit = false
|
|
488
|
-
// 会话结束清锚点(Esc /
|
|
575
|
+
// 会话结束清锚点(Esc / ✗)与引用插入延续状态
|
|
489
576
|
props.setSelectionAnchor?.(null)
|
|
577
|
+
clearRefInsert()
|
|
490
578
|
closeSuggest()
|
|
491
579
|
refreshFx()
|
|
492
580
|
}
|
|
@@ -524,6 +612,7 @@ function mirrorGridEdit(addr: CellAddress): void {
|
|
|
524
612
|
mirroring.value = true
|
|
525
613
|
mirrorAddr = addr
|
|
526
614
|
fxDraft.value = cellText(addr)
|
|
615
|
+
clearRefInsert()
|
|
527
616
|
closeSuggest()
|
|
528
617
|
}
|
|
529
618
|
|
|
@@ -601,7 +690,8 @@ function insertFunction(name: string): void {
|
|
|
601
690
|
fxDraft.value = text
|
|
602
691
|
fxCursor.value = cursor
|
|
603
692
|
suppressBlurCommit = false
|
|
604
|
-
//
|
|
693
|
+
// 插入函数即进入引用拾取会话:目标格置选区锚点,新会话清引用插入延续状态
|
|
694
|
+
clearRefInsert()
|
|
605
695
|
props.setSelectionAnchor?.(addr)
|
|
606
696
|
closeSuggest()
|
|
607
697
|
void nextTick(() => {
|
|
@@ -621,6 +711,7 @@ defineExpose({
|
|
|
621
711
|
mirrorGridEdit,
|
|
622
712
|
exitMirror,
|
|
623
713
|
isRefSelecting,
|
|
714
|
+
hasRefInsert,
|
|
624
715
|
isFunctionPopupOpen: () => functionsOpen.value,
|
|
625
716
|
beginBlurSuppress,
|
|
626
717
|
handleRefSelect,
|
|
@@ -647,6 +738,7 @@ watch(
|
|
|
647
738
|
mirroring.value = false
|
|
648
739
|
mirrorAddr = null
|
|
649
740
|
suppressBlurCommit = false
|
|
741
|
+
clearRefInsert()
|
|
650
742
|
functionsOpen.value = false
|
|
651
743
|
closeSuggest()
|
|
652
744
|
bindSheet(sheet)
|
|
@@ -88,9 +88,9 @@ export function insertImageFromUrl(ctx: SheetContext, url: string): string | und
|
|
|
88
88
|
|
|
89
89
|
/**
|
|
90
90
|
* 拉起系统文件选择框(右键菜单用;不用 UFilePicker——无编程式打开 API)。
|
|
91
|
-
*
|
|
91
|
+
* 选中文件后交给 onPick;取消选择时清理节点。
|
|
92
92
|
*/
|
|
93
|
-
|
|
93
|
+
function pickImageFile(onPick: (file: File) => void): void {
|
|
94
94
|
const input = document.createElement('input')
|
|
95
95
|
input.type = 'file'
|
|
96
96
|
input.accept = INSERT_IMAGE_ACCEPT
|
|
@@ -101,7 +101,7 @@ export function pickAndInsertImage(ctx: SheetContext): void {
|
|
|
101
101
|
input.addEventListener('change', () => {
|
|
102
102
|
const file = input.files?.[0]
|
|
103
103
|
cleanup()
|
|
104
|
-
if (file)
|
|
104
|
+
if (file) onPick(file)
|
|
105
105
|
})
|
|
106
106
|
// 取消选择时也清理节点(focus 回窗口后延迟判定)
|
|
107
107
|
window.addEventListener(
|
|
@@ -116,3 +116,32 @@ export function pickAndInsertImage(ctx: SheetContext): void {
|
|
|
116
116
|
document.body.appendChild(input)
|
|
117
117
|
input.click()
|
|
118
118
|
}
|
|
119
|
+
|
|
120
|
+
/** 拉起系统文件选择框,选中后插入浮动图片 */
|
|
121
|
+
export function pickAndInsertImage(ctx: SheetContext): void {
|
|
122
|
+
pickImageFile((file) => void insertImageFromFile(ctx, file))
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* 从本地 File 嵌入图片到活动格:读字节 → 映射类型 → ctx.insertCellImage
|
|
127
|
+
* (格内已有嵌入图时整体覆盖)。不支持的格式 / 无活动格时 message.error 提示。
|
|
128
|
+
*/
|
|
129
|
+
export async function insertCellImageFromFile(ctx: SheetContext, file: File): Promise<void> {
|
|
130
|
+
const type = resolveImageType(file)
|
|
131
|
+
if (!type) {
|
|
132
|
+
message.error('不支持的图片格式,请选择 png / jpeg / gif / svg / webp')
|
|
133
|
+
return
|
|
134
|
+
}
|
|
135
|
+
const active = ctx.getSelection().activeCell
|
|
136
|
+
if (!active) {
|
|
137
|
+
message.error('请先选择单元格')
|
|
138
|
+
return
|
|
139
|
+
}
|
|
140
|
+
const buffer = await file.arrayBuffer()
|
|
141
|
+
ctx.insertCellImage(active, { data: new Uint8Array(buffer), type })
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
/** 拉起系统文件选择框,选中后嵌入图片到活动格(已有嵌入图时覆盖替换) */
|
|
145
|
+
export function pickAndEmbedCellImage(ctx: SheetContext): void {
|
|
146
|
+
pickImageFile((file) => void insertCellImageFromFile(ctx, file))
|
|
147
|
+
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import type { ContextmenuItem } from '@veltra/desktop'
|
|
2
2
|
import { createRange, type CellAddress, type CellRange } from 'infinitable/sheet'
|
|
3
|
-
import type { NumFmt } from 'infinitable/sheet'
|
|
3
|
+
import type { ImageInput, NumFmt } from 'infinitable/sheet'
|
|
4
4
|
import { defineComponent, h } from 'vue'
|
|
5
5
|
|
|
6
6
|
import type { SheetContext } from '../../tools/context'
|
|
7
7
|
import { MIN_ROW_COL_SIZE } from '../../tools/context'
|
|
8
8
|
import { defaultToolRegistry } from '../../tools/registry'
|
|
9
9
|
import InsertCountMenuItem from './insert-count-menu-item.vue'
|
|
10
|
-
import { pickAndInsertImage } from './insert-image'
|
|
10
|
+
import { pickAndEmbedCellImage, pickAndInsertImage } from './insert-image'
|
|
11
11
|
import type { ImagePreviewSource, OpenHyperlinkPopup } from './popup-helpers'
|
|
12
12
|
import { imageLinkInitial, imagePreviewSource } from './popup-helpers'
|
|
13
13
|
|
|
@@ -303,11 +303,37 @@ function cellLinkMenuItems(
|
|
|
303
303
|
}
|
|
304
304
|
|
|
305
305
|
/**
|
|
306
|
-
*
|
|
307
|
-
*
|
|
308
|
-
*
|
|
309
|
-
*
|
|
310
|
-
|
|
306
|
+
* 按格嵌入图转为浮动图片(对齐 Excel「放置到单元格上」/ WPS 反向切换):浮动图
|
|
307
|
+
* 落在嵌入图锚点格、尺寸取该格宽高(视觉等价还原),fit 缺省 contain(对齐嵌入图
|
|
308
|
+
* 渲染约定,避免浮动图缺省 fill 拉伸变形),src/data/type/link 随载荷迁移。事务内
|
|
309
|
+
* insertImage + removeCellImage——一次转换 = 一个 undo 单元。
|
|
310
|
+
*/
|
|
311
|
+
export function cellImageToFloat(ctx: SheetContext, addr: CellAddress): void {
|
|
312
|
+
const payload = ctx.getCellImage(addr)
|
|
313
|
+
if (!payload) return
|
|
314
|
+
const anchor = ctx.getCellInfo(addr).anchor
|
|
315
|
+
const input: ImageInput = {
|
|
316
|
+
data: payload.data ?? new Uint8Array(),
|
|
317
|
+
type: payload.type ?? 'png',
|
|
318
|
+
anchor: { from: { row: anchor.row, col: anchor.col } },
|
|
319
|
+
width: ctx.getColWidth(anchor.col) ?? FALLBACK_COL_WIDTH,
|
|
320
|
+
height: ctx.getRowHeight(anchor.row) ?? FALLBACK_ROW_HEIGHT,
|
|
321
|
+
fit: payload.fit ?? 'contain'
|
|
322
|
+
}
|
|
323
|
+
if (payload.src) input.src = payload.src
|
|
324
|
+
if (payload.link) input.link = payload.link
|
|
325
|
+
ctx.beginTransaction()
|
|
326
|
+
ctx.insertImage(input)
|
|
327
|
+
ctx.removeCellImage(addr)
|
|
328
|
+
ctx.commit()
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
/**
|
|
332
|
+
* body 菜单嵌入图项:预览 / 图片超链接 / 取消超链接(按载荷 link 状态出项)/
|
|
333
|
+
* 转为浮动图片 / 替换图片 / 移除图片。设置走 hyperlink 弹窗 image 模式(确认后由宿主覆盖写
|
|
334
|
+
* `insertCellImage(addr, { ...payload, link })`);取消直写覆盖 `link: undefined`
|
|
335
|
+
* (引擎 CellImagePayload 清除约定,其余字段保留);转换/替换/移除分别走
|
|
336
|
+
* `cellImageToFloat`、`insertCellImage` 覆盖与 `removeCellImage`(命令系统,可 undo)。
|
|
311
337
|
*/
|
|
312
338
|
function cellImageMenuItems(
|
|
313
339
|
ctx: SheetContext,
|
|
@@ -339,16 +365,26 @@ function cellImageMenuItems(
|
|
|
339
365
|
callback: () => ctx.insertCellImage(active, { ...payload, link: undefined })
|
|
340
366
|
})
|
|
341
367
|
}
|
|
342
|
-
items.push(
|
|
368
|
+
items.push(
|
|
369
|
+
{ label: '转为浮动图片', disabled: readonly, callback: () => cellImageToFloat(ctx, active) },
|
|
370
|
+
{ label: '替换图片', disabled: readonly, callback: () => pickAndEmbedCellImage(ctx) },
|
|
371
|
+
{ label: '移除图片', disabled: readonly, callback: () => ctx.removeCellImage(active) }
|
|
372
|
+
)
|
|
343
373
|
return items
|
|
344
374
|
}
|
|
345
375
|
|
|
346
|
-
/**
|
|
376
|
+
/**
|
|
377
|
+
* body 格右键菜单。目标格含嵌入图时出**纯图片菜单**(预览 / 超链接 / 转浮动 /
|
|
378
|
+
* 替换 / 移除)——图片盖住整格,右键语义是「图片」而非「单元格」,不出合并 /
|
|
379
|
+
* 数据格式 / 超链接等普通格项(对齐 Excel 图片右键约定)。普通格:合并 / 取消合并 +
|
|
380
|
+
* 设置数据格式 + 超链接 + 插入图片(浮动)+ 嵌入图片(入格);行列插入/删除仅行号/列头菜单。
|
|
381
|
+
*/
|
|
347
382
|
export function buildBodyMenus(ctx: SheetContext, options?: BodyMenuOptions): ContextmenuItem[] {
|
|
383
|
+
const active = ctx.getSelection().activeCell
|
|
384
|
+
if (active && ctx.hasCellImage(active)) return cellImageMenuItems(ctx, active, options)
|
|
385
|
+
|
|
348
386
|
const mergeTool = defaultToolRegistry.get('merge')
|
|
349
387
|
const unmergeTool = defaultToolRegistry.get('unmerge')
|
|
350
|
-
const active = ctx.getSelection().activeCell
|
|
351
|
-
const imageItems = cellImageMenuItems(ctx, active, options)
|
|
352
388
|
|
|
353
389
|
return [
|
|
354
390
|
{
|
|
@@ -385,7 +421,7 @@ export function buildBodyMenus(ctx: SheetContext, options?: BodyMenuOptions): Co
|
|
|
385
421
|
},
|
|
386
422
|
...cellLinkMenuItems(ctx, active, options),
|
|
387
423
|
{ label: '插入图片', disabled: !active, callback: () => pickAndInsertImage(ctx) },
|
|
388
|
-
|
|
424
|
+
{ label: '嵌入图片', disabled: !active, callback: () => pickAndEmbedCellImage(ctx) }
|
|
389
425
|
]
|
|
390
426
|
}
|
|
391
427
|
|