@univerjs/sheets-drawing 1.3.1 → 1.5.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.
- package/README.md +6 -5
- package/lib/cjs/facade.js +20 -27
- package/lib/cjs/index.js +161 -90
- package/lib/es/facade.js +20 -27
- package/lib/es/index.js +163 -93
- package/lib/facade.js +20 -27
- package/lib/index.js +163 -93
- package/lib/types/commands/commands/remove-sheet-drawing.command.d.ts +2 -1
- package/lib/types/facade/f-over-grid-image.d.ts +4 -0
- package/lib/types/facade/f-worksheet.d.ts +13 -0
- package/lib/types/index.d.ts +1 -1
- package/lib/types/services/sheet-drawing-placement.d.ts +6 -4
- package/lib/types/services/sheet-drawing.service.d.ts +1 -1
- package/lib/umd/facade.js +1 -1
- package/lib/umd/index.js +1 -1
- package/package.json +10 -10
package/README.md
CHANGED
|
@@ -8,9 +8,9 @@
|
|
|
8
8
|
|
|
9
9
|
## Package Overview
|
|
10
10
|
|
|
11
|
-
| Package | UMD global | CSS | Locales | Facade entry |
|
|
12
|
-
| --- | --- | :---: | :---: | :---: |
|
|
13
|
-
| `@univerjs/sheets-drawing` | `UniverSheetsDrawing` | No | No | Yes |
|
|
11
|
+
| Package | UMD global | CSS | Locales | Facade entry | Worker entry |
|
|
12
|
+
| --- | --- | :---: | :---: | :---: | :---: |
|
|
13
|
+
| `@univerjs/sheets-drawing` | `UniverSheetsDrawing` | No | No | Yes | No |
|
|
14
14
|
|
|
15
15
|
## Installation
|
|
16
16
|
|
|
@@ -20,10 +20,10 @@ pnpm add @univerjs/sheets-drawing
|
|
|
20
20
|
npm install @univerjs/sheets-drawing
|
|
21
21
|
```
|
|
22
22
|
|
|
23
|
-
Keep all `@univerjs/*` packages on the same version.
|
|
24
|
-
|
|
25
23
|
## Usage
|
|
26
24
|
|
|
25
|
+
Start with the [integration setup](https://docs.univer.ai/) for your document type, including its required plugins, styles, and locale resources. The snippet below assumes that setup is complete.
|
|
26
|
+
|
|
27
27
|
```ts
|
|
28
28
|
import { UniverSheetsDrawingPlugin } from '@univerjs/sheets-drawing';
|
|
29
29
|
|
|
@@ -33,6 +33,7 @@ univer.registerPlugin(UniverSheetsDrawingPlugin);
|
|
|
33
33
|
## Integration Notes
|
|
34
34
|
|
|
35
35
|
Use this package with `@univerjs/sheets-drawing-ui` when users need drawing interactions in the sheet UI.
|
|
36
|
+
- Import `@univerjs/sheets-drawing/facade` when using this package through Univer Facade APIs.
|
|
36
37
|
|
|
37
38
|
## Resources
|
|
38
39
|
|
package/lib/cjs/facade.js
CHANGED
|
@@ -7,7 +7,7 @@ let _univerjs_sheets_drawing = require("@univerjs/sheets-drawing");
|
|
|
7
7
|
let _univerjs_engine_render = require("@univerjs/engine-render");
|
|
8
8
|
let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
11
11
|
function _typeof(o) {
|
|
12
12
|
"@babel/helpers - typeof";
|
|
13
13
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -17,28 +17,25 @@ function _typeof(o) {
|
|
|
17
17
|
}, _typeof(o);
|
|
18
18
|
}
|
|
19
19
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
function toPrimitive(t, r) {
|
|
20
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
21
|
+
function toPrimitive(t, e) {
|
|
23
22
|
if ("object" != _typeof(t) || !t) return t;
|
|
24
|
-
var
|
|
25
|
-
if (void 0 !==
|
|
26
|
-
var i =
|
|
23
|
+
var r;
|
|
24
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
25
|
+
var i = r.call(t, e || "default");
|
|
27
26
|
if ("object" != _typeof(i)) return i;
|
|
28
27
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
29
28
|
}
|
|
30
|
-
return ("string" ===
|
|
29
|
+
return ("string" === e ? String : Number)(t);
|
|
31
30
|
}
|
|
32
31
|
|
|
33
|
-
|
|
34
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
|
|
32
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
35
33
|
function toPropertyKey(t) {
|
|
36
34
|
var i = toPrimitive(t, "string");
|
|
37
35
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
38
36
|
}
|
|
39
37
|
|
|
40
|
-
|
|
41
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
|
|
38
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
42
39
|
function _defineProperty(e, r, t) {
|
|
43
40
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
44
41
|
value: t,
|
|
@@ -48,16 +45,14 @@ function _defineProperty(e, r, t) {
|
|
|
48
45
|
}) : e[r] = t, e;
|
|
49
46
|
}
|
|
50
47
|
|
|
51
|
-
|
|
52
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
|
|
48
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
53
49
|
function __decorateParam(paramIndex, decorator) {
|
|
54
50
|
return function(target, key) {
|
|
55
51
|
decorator(target, key, paramIndex);
|
|
56
52
|
};
|
|
57
53
|
}
|
|
58
54
|
|
|
59
|
-
|
|
60
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorate.js
|
|
55
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
61
56
|
function __decorate(decorators, target, key, desc) {
|
|
62
57
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
63
58
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -65,8 +60,7 @@ function __decorate(decorators, target, key, desc) {
|
|
|
65
60
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
66
61
|
}
|
|
67
62
|
|
|
68
|
-
|
|
69
|
-
//#region src/facade/f-over-grid-image.ts
|
|
63
|
+
// src/facade/f-over-grid-image.ts
|
|
70
64
|
/**
|
|
71
65
|
* Convert the image parameter to a FOverGridImage
|
|
72
66
|
* @param {ISheetImage} sheetImage The image parameter
|
|
@@ -916,6 +910,10 @@ let FOverGridImage = class FOverGridImage extends _univerjs_core_facade.FBase {
|
|
|
916
910
|
}
|
|
917
911
|
/**
|
|
918
912
|
* Remove the image from the sheet
|
|
913
|
+
*
|
|
914
|
+
* For multiple images on the same worksheet, prefer {@link FWorksheet.deleteImages} with the image
|
|
915
|
+
* handles instead of calling this method on each image.
|
|
916
|
+
*
|
|
919
917
|
* @returns {boolean} true if the image is removed successfully, otherwise false
|
|
920
918
|
* @example
|
|
921
919
|
* ```ts
|
|
@@ -1156,8 +1154,7 @@ function validateImageOpacity(opacity) {
|
|
|
1156
1154
|
if (!Number.isFinite(opacity) || opacity < 0 || opacity > 1) throw new RangeError("Sheet image opacity must be between 0 and 1.");
|
|
1157
1155
|
}
|
|
1158
1156
|
|
|
1159
|
-
|
|
1160
|
-
//#region src/facade/f-worksheet.ts
|
|
1157
|
+
// src/facade/f-worksheet.ts
|
|
1161
1158
|
var FWorksheetDrawingMixin = class extends _univerjs_sheets_facade.FWorksheet {
|
|
1162
1159
|
get _sheetDrawingService() {
|
|
1163
1160
|
return this._injector.get(_univerjs_sheets_drawing.ISheetDrawingService);
|
|
@@ -1551,8 +1548,7 @@ function getDrawingBounds(drawing) {
|
|
|
1551
1548
|
}
|
|
1552
1549
|
_univerjs_sheets_facade.FWorksheet.extend(FWorksheetDrawingMixin);
|
|
1553
1550
|
|
|
1554
|
-
|
|
1555
|
-
//#region src/facade/f-enum.ts
|
|
1551
|
+
// src/facade/f-enum.ts
|
|
1556
1552
|
/**
|
|
1557
1553
|
* Copyright 2023-present DreamNum Co., Ltd.
|
|
1558
1554
|
*
|
|
@@ -1578,8 +1574,7 @@ var FSheetsDrawingEnumMixin = class extends _univerjs_core_facade.FEnum {
|
|
|
1578
1574
|
};
|
|
1579
1575
|
_univerjs_core_facade.FEnum.extend(FSheetsDrawingEnumMixin);
|
|
1580
1576
|
|
|
1581
|
-
|
|
1582
|
-
//#region src/facade/f-event.ts
|
|
1577
|
+
// src/facade/f-event.ts
|
|
1583
1578
|
var FSheetsDrawingEventNameMixin = class extends _univerjs_core_facade.FEventName {
|
|
1584
1579
|
get BeforeFloatDomAdd() {
|
|
1585
1580
|
return "BeforeFloatDomAdd";
|
|
@@ -1626,8 +1621,7 @@ var FSheetsDrawingEventNameMixin = class extends _univerjs_core_facade.FEventNam
|
|
|
1626
1621
|
};
|
|
1627
1622
|
_univerjs_core_facade.FEventName.extend(FSheetsDrawingEventNameMixin);
|
|
1628
1623
|
|
|
1629
|
-
|
|
1630
|
-
//#region src/facade/f-univer.ts
|
|
1624
|
+
// src/facade/f-univer.ts
|
|
1631
1625
|
/**
|
|
1632
1626
|
* @ignore
|
|
1633
1627
|
*/
|
|
@@ -1774,7 +1768,6 @@ var FUniverSheetsDrawingMixin = class extends _univerjs_core_facade.FUniver {
|
|
|
1774
1768
|
};
|
|
1775
1769
|
_univerjs_core_facade.FUniver.extend(FUniverSheetsDrawingMixin);
|
|
1776
1770
|
|
|
1777
|
-
//#endregion
|
|
1778
1771
|
Object.defineProperty(exports, "FOverGridImage", {
|
|
1779
1772
|
enumerable: true,
|
|
1780
1773
|
get: function () {
|
package/lib/cjs/index.js
CHANGED
|
@@ -4,7 +4,7 @@ let _univerjs_core = require("@univerjs/core");
|
|
|
4
4
|
let _univerjs_drawing = require("@univerjs/drawing");
|
|
5
5
|
let _univerjs_engine_render = require("@univerjs/engine-render");
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
// src/basics/transform-position.ts
|
|
8
8
|
function drawingPositionToTransform(position, sheetSkeletonParam) {
|
|
9
9
|
if (!sheetSkeletonParam) return;
|
|
10
10
|
const { unitId, sheetId, skeleton } = sheetSkeletonParam;
|
|
@@ -69,8 +69,7 @@ function transformToAxisAlignPosition(transform, skeleton) {
|
|
|
69
69
|
}, skeleton);
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
|
|
73
|
-
//#region src/services/sheet-drawing.service.ts
|
|
72
|
+
// src/services/sheet-drawing.service.ts
|
|
74
73
|
let SheetDrawingAnchorType = /* @__PURE__ */ function(SheetDrawingAnchorType) {
|
|
75
74
|
/**
|
|
76
75
|
* Only the position of the drawing follows the cell changes. When rows or columns are inserted or deleted, the position of the drawing changes, but the size remains the same.
|
|
@@ -89,8 +88,7 @@ let SheetDrawingAnchorType = /* @__PURE__ */ function(SheetDrawingAnchorType) {
|
|
|
89
88
|
var SheetDrawingService = class extends _univerjs_drawing.UnitDrawingService {};
|
|
90
89
|
const ISheetDrawingService = (0, _univerjs_core.createIdentifier)("sheets-drawing.sheet-drawing.service");
|
|
91
90
|
|
|
92
|
-
|
|
93
|
-
//#region src/commands/mutations/set-drawing-apply.mutation.ts
|
|
91
|
+
// src/commands/mutations/set-drawing-apply.mutation.ts
|
|
94
92
|
let DrawingApplyType = /* @__PURE__ */ function(DrawingApplyType) {
|
|
95
93
|
DrawingApplyType[DrawingApplyType["INSERT"] = 0] = "INSERT";
|
|
96
94
|
DrawingApplyType[DrawingApplyType["REMOVE"] = 1] = "REMOVE";
|
|
@@ -138,8 +136,7 @@ const SetDrawingApplyMutation = {
|
|
|
138
136
|
}
|
|
139
137
|
};
|
|
140
138
|
|
|
141
|
-
|
|
142
|
-
//#region src/commands/operations/clear-drawing-transformer.operation.ts
|
|
139
|
+
// src/commands/operations/clear-drawing-transformer.operation.ts
|
|
143
140
|
const ClearSheetDrawingTransformerOperation = {
|
|
144
141
|
id: "sheet.operation.clear-drawing-transformer",
|
|
145
142
|
type: _univerjs_core.CommandType.MUTATION,
|
|
@@ -153,8 +150,7 @@ const ClearSheetDrawingTransformerOperation = {
|
|
|
153
150
|
}
|
|
154
151
|
};
|
|
155
152
|
|
|
156
|
-
|
|
157
|
-
//#region src/commands/commands/insert-sheet-drawing.command.ts
|
|
153
|
+
// src/commands/commands/insert-sheet-drawing.command.ts
|
|
158
154
|
const InsertSheetDrawingCommand = {
|
|
159
155
|
id: "sheet.command.insert-sheet-image",
|
|
160
156
|
type: _univerjs_core.CommandType.COMMAND,
|
|
@@ -218,8 +214,33 @@ const InsertSheetDrawingCommand = {
|
|
|
218
214
|
}
|
|
219
215
|
};
|
|
220
216
|
|
|
221
|
-
|
|
222
|
-
|
|
217
|
+
// src/commands/commands/remove-sheet-drawing.command.ts
|
|
218
|
+
function expandDrawingRemovalParams(service, requested) {
|
|
219
|
+
const drawings = [];
|
|
220
|
+
const visit = (search, ancestors) => {
|
|
221
|
+
if (ancestors.has(search.drawingId)) throw new _univerjs_core.CustomCommandExecutionError(RemoveSheetDrawingCommand.id);
|
|
222
|
+
if (drawings.some((drawing) => drawing.unitId === search.unitId && drawing.subUnitId === search.subUnitId && drawing.drawingId === search.drawingId)) return;
|
|
223
|
+
const current = service.getDrawingByParam(search);
|
|
224
|
+
drawings.push({
|
|
225
|
+
unitId: search.unitId,
|
|
226
|
+
subUnitId: search.subUnitId,
|
|
227
|
+
drawingId: search.drawingId,
|
|
228
|
+
drawingType: (current === null || current === void 0 ? void 0 : current.drawingType) ?? search.drawingType
|
|
229
|
+
});
|
|
230
|
+
if (!current) return;
|
|
231
|
+
const children = Object.values(service.getDrawingData(search.unitId, search.subUnitId)).filter((drawing) => current.drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_GROUP && drawing.groupId === search.drawingId);
|
|
232
|
+
const nextAncestors = new Set(ancestors);
|
|
233
|
+
nextAncestors.add(search.drawingId);
|
|
234
|
+
children.forEach((drawing) => visit({
|
|
235
|
+
unitId: search.unitId,
|
|
236
|
+
subUnitId: search.subUnitId,
|
|
237
|
+
drawingId: drawing.drawingId,
|
|
238
|
+
drawingType: drawing.drawingType
|
|
239
|
+
}, nextAncestors));
|
|
240
|
+
};
|
|
241
|
+
requested.forEach((drawing) => visit(drawing, /* @__PURE__ */ new Set()));
|
|
242
|
+
return drawings;
|
|
243
|
+
}
|
|
223
244
|
const RemoveSheetDrawingCommand = {
|
|
224
245
|
id: "sheet.command.remove-sheet-image",
|
|
225
246
|
type: _univerjs_core.CommandType.COMMAND,
|
|
@@ -229,13 +250,20 @@ const RemoveSheetDrawingCommand = {
|
|
|
229
250
|
const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
|
|
230
251
|
const sheetInterceptorService = accessor.get(_univerjs_sheets.SheetInterceptorService);
|
|
231
252
|
const sheetDrawingService = accessor.get(ISheetDrawingService);
|
|
232
|
-
const
|
|
233
|
-
|
|
234
|
-
|
|
253
|
+
const normalizedParams = {
|
|
254
|
+
...params,
|
|
255
|
+
drawings: expandDrawingRemovalParams(sheetDrawingService, params.drawings)
|
|
256
|
+
};
|
|
257
|
+
if (!accessor.get(_univerjs_drawing.IDrawingManagerService).canExecuteCommand({
|
|
258
|
+
id: RemoveSheetDrawingCommand.id,
|
|
259
|
+
params: normalizedParams
|
|
260
|
+
})) return false;
|
|
235
261
|
const intercepted = sheetInterceptorService.onCommandExecute({
|
|
236
262
|
id: RemoveSheetDrawingCommand.id,
|
|
237
|
-
params
|
|
263
|
+
params: normalizedParams
|
|
238
264
|
});
|
|
265
|
+
const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchRemoveOp(normalizedParams.drawings);
|
|
266
|
+
if (Array.isArray(objects) && objects.length === 0) return false;
|
|
239
267
|
const redoMutations = [
|
|
240
268
|
...intercepted.preRedos ?? [],
|
|
241
269
|
{
|
|
@@ -284,8 +312,7 @@ const RemoveSheetDrawingCommand = {
|
|
|
284
312
|
}
|
|
285
313
|
};
|
|
286
314
|
|
|
287
|
-
|
|
288
|
-
//#region src/commands/commands/set-drawing-arrange.command.ts
|
|
315
|
+
// src/commands/commands/set-drawing-arrange.command.ts
|
|
289
316
|
const SetDrawingArrangeCommand = {
|
|
290
317
|
id: "sheet.command.set-drawing-arrange",
|
|
291
318
|
type: _univerjs_core.CommandType.COMMAND,
|
|
@@ -344,8 +371,7 @@ const SetDrawingArrangeCommand = {
|
|
|
344
371
|
}
|
|
345
372
|
};
|
|
346
373
|
|
|
347
|
-
|
|
348
|
-
//#region src/services/sheet-drawing-placement.ts
|
|
374
|
+
// src/services/sheet-drawing-placement.ts
|
|
349
375
|
const PLACEMENT_ERROR = {
|
|
350
376
|
CELL_INVALID: "SHEET_DRAWING_PLACEMENT_CELL_INVALID",
|
|
351
377
|
EXTENT_INVALID: "SHEET_DRAWING_PLACEMENT_EXTENT_INVALID",
|
|
@@ -380,6 +406,47 @@ function getSheetDrawingPlacement(drawing) {
|
|
|
380
406
|
function applySheetDrawingPlacement(drawing, input, skeleton) {
|
|
381
407
|
return resolveSheetDrawingPlacement(drawing, normalizePlacement(input, skeleton, requiresDrawingArea(drawing)), skeleton);
|
|
382
408
|
}
|
|
409
|
+
/** Place a batch at the logical start corner of a Chart Sheet, preserving its relative geometry. */
|
|
410
|
+
function transformDrawingsToChartSheet(drawings, chartSheetBounds, rightToLeft) {
|
|
411
|
+
if (validateBounds(chartSheetBounds, true)) return null;
|
|
412
|
+
if (!drawings.length) return [];
|
|
413
|
+
const bounds = [];
|
|
414
|
+
for (const drawing of drawings) {
|
|
415
|
+
const state = drawing.transform;
|
|
416
|
+
if (!state || validateBounds(state, requiresDrawingArea(drawing)) || [
|
|
417
|
+
state.angle,
|
|
418
|
+
state.skewX,
|
|
419
|
+
state.skewY,
|
|
420
|
+
state.scaleX,
|
|
421
|
+
state.scaleY
|
|
422
|
+
].some((value) => value !== void 0 && !Number.isFinite(value))) return null;
|
|
423
|
+
const { width = 0, height = 0, angle = 0 } = state;
|
|
424
|
+
const matrix = _univerjs_engine_render.Transform.create().composeMatrix(state);
|
|
425
|
+
if (angle) matrix.rotate(-angle).translate(width / 2, height / 2).rotate(angle).translate(-width / 2, -height / 2);
|
|
426
|
+
const box = matrix.makeBoundingBoxFromPoints([
|
|
427
|
+
new _univerjs_engine_render.Vector2(0, 0),
|
|
428
|
+
new _univerjs_engine_render.Vector2(width, 0),
|
|
429
|
+
new _univerjs_engine_render.Vector2(width, height),
|
|
430
|
+
new _univerjs_engine_render.Vector2(0, height)
|
|
431
|
+
]);
|
|
432
|
+
bounds.push({
|
|
433
|
+
left: box.left,
|
|
434
|
+
top: box.top,
|
|
435
|
+
width: box.width,
|
|
436
|
+
height: box.height
|
|
437
|
+
});
|
|
438
|
+
}
|
|
439
|
+
const group = (0, _univerjs_engine_render.getGroupState)(0, 0, bounds);
|
|
440
|
+
const scale = Math.min(1, group.width ? chartSheetBounds.width / group.width : 1, group.height ? chartSheetBounds.height / group.height : 1);
|
|
441
|
+
const left = rightToLeft ? chartSheetBounds.left + chartSheetBounds.width - group.width * scale : chartSheetBounds.left;
|
|
442
|
+
return drawings.map((drawing) => applySheetDrawingPlacement(drawing, {
|
|
443
|
+
kind: "2",
|
|
444
|
+
left: left + (drawing.transform.left - group.left) * scale,
|
|
445
|
+
top: chartSheetBounds.top + (drawing.transform.top - group.top) * scale,
|
|
446
|
+
width: drawing.transform.width * scale,
|
|
447
|
+
height: drawing.transform.height * scale
|
|
448
|
+
}));
|
|
449
|
+
}
|
|
383
450
|
/** Refresh layout-derived geometry without changing the drawing's anchor semantics. */
|
|
384
451
|
function refreshSheetDrawingPlacement(drawing, skeleton) {
|
|
385
452
|
const result = tryRefreshSheetDrawingPlacement(drawing, skeleton);
|
|
@@ -597,15 +664,17 @@ function createPlacementError(failure) {
|
|
|
597
664
|
return Object.assign(error, failure.details);
|
|
598
665
|
}
|
|
599
666
|
|
|
600
|
-
|
|
601
|
-
//#region src/commands/commands/set-sheet-drawing-placement.command.ts
|
|
667
|
+
// src/commands/commands/set-sheet-drawing-placement.command.ts
|
|
602
668
|
const SetSheetDrawingPlacementCommand = {
|
|
603
669
|
id: "sheet.command.set-drawing-placement",
|
|
604
670
|
type: _univerjs_core.CommandType.COMMAND,
|
|
605
671
|
handler: (accessor, params) => {
|
|
606
672
|
if (!(params === null || params === void 0 ? void 0 : params.drawings.length)) return false;
|
|
673
|
+
if (!accessor.get(_univerjs_drawing.IDrawingManagerService).canExecuteCommand({
|
|
674
|
+
id: SetSheetDrawingPlacementCommand.id,
|
|
675
|
+
params
|
|
676
|
+
})) return false;
|
|
607
677
|
const commandService = accessor.get(_univerjs_core.ICommandService);
|
|
608
|
-
const undoRedoService = accessor.get(_univerjs_core.IUndoRedoService);
|
|
609
678
|
const drawingService = accessor.get(ISheetDrawingService);
|
|
610
679
|
const skeleton = params.drawings.every(({ placement }) => placement.kind === "2") ? void 0 : accessor.get(_univerjs_sheets.SheetSkeletonService).ensureSkeleton(params.unitId, params.subUnitId);
|
|
611
680
|
const updatedDrawings = [];
|
|
@@ -618,45 +687,58 @@ const SetSheetDrawingPlacementCommand = {
|
|
|
618
687
|
if (!drawing) return false;
|
|
619
688
|
updatedDrawings.push(applySheetDrawingPlacement(drawing, placement, skeleton));
|
|
620
689
|
}
|
|
690
|
+
const intercepted = accessor.get(_univerjs_sheets.SheetInterceptorService).onCommandExecute({
|
|
691
|
+
id: SetSheetDrawingPlacementCommand.id,
|
|
692
|
+
params
|
|
693
|
+
});
|
|
621
694
|
const { unitId, subUnitId, undo, redo, objects } = drawingService.getBatchUpdateOp(updatedDrawings);
|
|
622
|
-
const redoMutations = [
|
|
623
|
-
|
|
624
|
-
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
629
|
-
|
|
630
|
-
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
|
|
637
|
-
|
|
638
|
-
|
|
639
|
-
|
|
640
|
-
|
|
641
|
-
|
|
642
|
-
|
|
643
|
-
|
|
644
|
-
|
|
645
|
-
|
|
646
|
-
|
|
647
|
-
|
|
695
|
+
const redoMutations = [
|
|
696
|
+
...intercepted.preRedos ?? [],
|
|
697
|
+
{
|
|
698
|
+
id: SetDrawingApplyMutation.id,
|
|
699
|
+
params: {
|
|
700
|
+
unitId,
|
|
701
|
+
subUnitId,
|
|
702
|
+
op: redo,
|
|
703
|
+
objects,
|
|
704
|
+
type: 2
|
|
705
|
+
}
|
|
706
|
+
},
|
|
707
|
+
{
|
|
708
|
+
id: ClearSheetDrawingTransformerOperation.id,
|
|
709
|
+
params: [unitId]
|
|
710
|
+
},
|
|
711
|
+
...intercepted.redos
|
|
712
|
+
];
|
|
713
|
+
const undoMutations = [
|
|
714
|
+
...intercepted.preUndos ?? [],
|
|
715
|
+
{
|
|
716
|
+
id: SetDrawingApplyMutation.id,
|
|
717
|
+
params: {
|
|
718
|
+
unitId,
|
|
719
|
+
subUnitId,
|
|
720
|
+
op: undo,
|
|
721
|
+
objects,
|
|
722
|
+
type: 2
|
|
723
|
+
}
|
|
724
|
+
},
|
|
725
|
+
{
|
|
726
|
+
id: ClearSheetDrawingTransformerOperation.id,
|
|
727
|
+
params: [unitId]
|
|
728
|
+
},
|
|
729
|
+
...intercepted.undos
|
|
730
|
+
];
|
|
648
731
|
if (!(0, _univerjs_core.sequenceExecute)(redoMutations, commandService).result) return false;
|
|
649
|
-
|
|
732
|
+
accessor.get(_univerjs_core.IUndoRedoService).pushUndoRedo({
|
|
650
733
|
unitID: unitId,
|
|
651
|
-
|
|
652
|
-
|
|
734
|
+
redoMutations,
|
|
735
|
+
undoMutations
|
|
653
736
|
});
|
|
654
737
|
return true;
|
|
655
738
|
}
|
|
656
739
|
};
|
|
657
740
|
|
|
658
|
-
|
|
659
|
-
//#region src/common/rotate-enabled.ts
|
|
741
|
+
// src/common/rotate-enabled.ts
|
|
660
742
|
function isKnownSheetNonRotatableDrawingType(drawingType) {
|
|
661
743
|
return drawingType === _univerjs_core.DrawingTypeEnum.DRAWING_CHART;
|
|
662
744
|
}
|
|
@@ -667,8 +749,7 @@ function resolveSheetDrawingRotateEnabled(drawing, drawingService, getChildren)
|
|
|
667
749
|
});
|
|
668
750
|
}
|
|
669
751
|
|
|
670
|
-
|
|
671
|
-
//#region src/commands/commands/set-sheet-drawing.command.ts
|
|
752
|
+
// src/commands/commands/set-sheet-drawing.command.ts
|
|
672
753
|
function hasIncomingAngle(drawing) {
|
|
673
754
|
var _drawing$transform, _drawing$sheetTransfo, _drawing$axisAlignShe;
|
|
674
755
|
return ((_drawing$transform = drawing.transform) === null || _drawing$transform === void 0 ? void 0 : _drawing$transform.angle) !== void 0 || ((_drawing$sheetTransfo = drawing.sheetTransform) === null || _drawing$sheetTransfo === void 0 ? void 0 : _drawing$sheetTransfo.angle) !== void 0 || ((_drawing$axisAlignShe = drawing.axisAlignSheetTransform) === null || _drawing$axisAlignShe === void 0 ? void 0 : _drawing$axisAlignShe.angle) !== void 0;
|
|
@@ -723,6 +804,10 @@ const SetSheetDrawingCommand = {
|
|
|
723
804
|
...params,
|
|
724
805
|
drawings: normalizedDrawings
|
|
725
806
|
};
|
|
807
|
+
if (!accessor.get(_univerjs_drawing.IDrawingManagerService).canExecuteCommand({
|
|
808
|
+
id: SetSheetDrawingCommand.id,
|
|
809
|
+
params: normalizedParams
|
|
810
|
+
})) return false;
|
|
726
811
|
const { unitId, subUnitId, undo, redo, objects } = sheetDrawingService.getBatchUpdateOp(normalizedDrawings);
|
|
727
812
|
const intercepted = sheetInterceptorService.onCommandExecute({
|
|
728
813
|
id: SetSheetDrawingCommand.id,
|
|
@@ -776,8 +861,7 @@ const SetSheetDrawingCommand = {
|
|
|
776
861
|
}
|
|
777
862
|
};
|
|
778
863
|
|
|
779
|
-
|
|
780
|
-
//#region src/commands/mutations/set-worksheet-background-image.mutation.ts
|
|
864
|
+
// src/commands/mutations/set-worksheet-background-image.mutation.ts
|
|
781
865
|
const SetWorksheetBackgroundImageMutation = {
|
|
782
866
|
id: "sheet.mutation.set-worksheet-background-image",
|
|
783
867
|
type: _univerjs_core.CommandType.MUTATION,
|
|
@@ -791,8 +875,7 @@ const SetWorksheetBackgroundImageMutation = {
|
|
|
791
875
|
}
|
|
792
876
|
};
|
|
793
877
|
|
|
794
|
-
|
|
795
|
-
//#region src/commands/commands/set-worksheet-background-image.command.ts
|
|
878
|
+
// src/commands/commands/set-worksheet-background-image.command.ts
|
|
796
879
|
const SetWorksheetBackgroundImageCommand = {
|
|
797
880
|
id: "sheet.command.set-worksheet-background-image",
|
|
798
881
|
type: _univerjs_core.CommandType.COMMAND,
|
|
@@ -832,16 +915,14 @@ const SetWorksheetBackgroundImageCommand = {
|
|
|
832
915
|
}
|
|
833
916
|
};
|
|
834
917
|
|
|
835
|
-
|
|
836
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorateParam.js
|
|
918
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorateParam.js
|
|
837
919
|
function __decorateParam(paramIndex, decorator) {
|
|
838
920
|
return function(target, key) {
|
|
839
921
|
decorator(target, key, paramIndex);
|
|
840
922
|
};
|
|
841
923
|
}
|
|
842
924
|
|
|
843
|
-
|
|
844
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/decorate.js
|
|
925
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/decorate.js
|
|
845
926
|
function __decorate(decorators, target, key, desc) {
|
|
846
927
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
847
928
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -849,8 +930,7 @@ function __decorate(decorators, target, key, desc) {
|
|
|
849
930
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
850
931
|
}
|
|
851
932
|
|
|
852
|
-
|
|
853
|
-
//#region src/controllers/sheet-drawing.controller.ts
|
|
933
|
+
// src/controllers/sheet-drawing.controller.ts
|
|
854
934
|
const SHEET_DRAWING_PLUGIN = "SHEET_DRAWING_PLUGIN";
|
|
855
935
|
function getDrawingsInOrder(drawingData, drawingOrder) {
|
|
856
936
|
const visited = /* @__PURE__ */ new Set();
|
|
@@ -1022,13 +1102,11 @@ SheetsDrawingLoadController = __decorate([
|
|
|
1022
1102
|
__decorateParam(5, _univerjs_core.IResourceManagerService)
|
|
1023
1103
|
], SheetsDrawingLoadController);
|
|
1024
1104
|
|
|
1025
|
-
|
|
1026
|
-
//#region package.json
|
|
1105
|
+
// package.json
|
|
1027
1106
|
var name = "@univerjs/sheets-drawing";
|
|
1028
|
-
var version = "1.
|
|
1107
|
+
var version = "1.5.0";
|
|
1029
1108
|
|
|
1030
|
-
|
|
1031
|
-
//#region src/config/config.ts
|
|
1109
|
+
// src/config/config.ts
|
|
1032
1110
|
/**
|
|
1033
1111
|
* Copyright 2023-present DreamNum Co., Ltd.
|
|
1034
1112
|
*
|
|
@@ -1048,8 +1126,7 @@ const SHEETS_DRAWING_PLUGIN_CONFIG_KEY = "sheets-drawing.config";
|
|
|
1048
1126
|
const configSymbol = Symbol(SHEETS_DRAWING_PLUGIN_CONFIG_KEY);
|
|
1049
1127
|
const defaultPluginConfig = {};
|
|
1050
1128
|
|
|
1051
|
-
|
|
1052
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/typeof.js
|
|
1129
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/typeof.js
|
|
1053
1130
|
function _typeof(o) {
|
|
1054
1131
|
"@babel/helpers - typeof";
|
|
1055
1132
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -1059,28 +1136,25 @@ function _typeof(o) {
|
|
|
1059
1136
|
}, _typeof(o);
|
|
1060
1137
|
}
|
|
1061
1138
|
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
function toPrimitive(t, r) {
|
|
1139
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPrimitive.js
|
|
1140
|
+
function toPrimitive(t, e) {
|
|
1065
1141
|
if ("object" != _typeof(t) || !t) return t;
|
|
1066
|
-
var
|
|
1067
|
-
if (void 0 !==
|
|
1068
|
-
var i =
|
|
1142
|
+
var r;
|
|
1143
|
+
if ("undefined" != typeof Symbol && void 0 !== (r = t[Symbol.toPrimitive])) {
|
|
1144
|
+
var i = r.call(t, e || "default");
|
|
1069
1145
|
if ("object" != _typeof(i)) return i;
|
|
1070
1146
|
throw new TypeError("@@toPrimitive must return a primitive value.");
|
|
1071
1147
|
}
|
|
1072
|
-
return ("string" ===
|
|
1148
|
+
return ("string" === e ? String : Number)(t);
|
|
1073
1149
|
}
|
|
1074
1150
|
|
|
1075
|
-
|
|
1076
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/toPropertyKey.js
|
|
1151
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/toPropertyKey.js
|
|
1077
1152
|
function toPropertyKey(t) {
|
|
1078
1153
|
var i = toPrimitive(t, "string");
|
|
1079
1154
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
1080
1155
|
}
|
|
1081
1156
|
|
|
1082
|
-
|
|
1083
|
-
//#region \0@oxc-project+runtime@0.153.0/helpers/esm/defineProperty.js
|
|
1157
|
+
// \0@oxc-project+runtime@0.157.0/helpers/esm/defineProperty.js
|
|
1084
1158
|
function _defineProperty(e, r, t) {
|
|
1085
1159
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
1086
1160
|
value: t,
|
|
@@ -1090,8 +1164,7 @@ function _defineProperty(e, r, t) {
|
|
|
1090
1164
|
}) : e[r] = t, e;
|
|
1091
1165
|
}
|
|
1092
1166
|
|
|
1093
|
-
|
|
1094
|
-
//#region src/services/sheet-drawing-transform-plan.service.ts
|
|
1167
|
+
// src/services/sheet-drawing-transform-plan.service.ts
|
|
1095
1168
|
function createEmptyResult() {
|
|
1096
1169
|
return {
|
|
1097
1170
|
preRedos: [],
|
|
@@ -1125,8 +1198,7 @@ var SheetDrawingTransformPlanService = class {
|
|
|
1125
1198
|
}
|
|
1126
1199
|
};
|
|
1127
1200
|
|
|
1128
|
-
|
|
1129
|
-
//#region src/controllers/sheet-drawing-transform-affected.controller.ts
|
|
1201
|
+
// src/controllers/sheet-drawing-transform-affected.controller.ts
|
|
1130
1202
|
const UPDATE_COMMANDS = [
|
|
1131
1203
|
_univerjs_sheets.InsertRowCommand.id,
|
|
1132
1204
|
_univerjs_sheets.InsertColCommand.id,
|
|
@@ -2071,8 +2143,7 @@ SheetDrawingTransformAffectedController = __decorate([
|
|
|
2071
2143
|
__decorateParam(7, _univerjs_core.ILogService)
|
|
2072
2144
|
], SheetDrawingTransformAffectedController);
|
|
2073
2145
|
|
|
2074
|
-
|
|
2075
|
-
//#region src/plugin.ts
|
|
2146
|
+
// src/plugin.ts
|
|
2076
2147
|
let UniverSheetsDrawingPlugin = class UniverSheetsDrawingPlugin extends _univerjs_core.Plugin {
|
|
2077
2148
|
constructor(_config = defaultPluginConfig, _injector, _configService) {
|
|
2078
2149
|
super();
|
|
@@ -2103,7 +2174,6 @@ UniverSheetsDrawingPlugin = __decorate([
|
|
|
2103
2174
|
__decorateParam(2, _univerjs_core.IConfigService)
|
|
2104
2175
|
], UniverSheetsDrawingPlugin);
|
|
2105
2176
|
|
|
2106
|
-
//#endregion
|
|
2107
2177
|
exports.ClearSheetDrawingTransformerOperation = ClearSheetDrawingTransformerOperation;
|
|
2108
2178
|
exports.DrawingApplyType = DrawingApplyType;
|
|
2109
2179
|
exports.ISheetDrawingService = ISheetDrawingService;
|
|
@@ -2132,5 +2202,6 @@ exports.isKnownSheetNonRotatableDrawingType = isKnownSheetNonRotatableDrawingTyp
|
|
|
2132
2202
|
exports.normalizeSheetDrawingPlacement = normalizeSheetDrawingPlacement;
|
|
2133
2203
|
exports.refreshSheetDrawingPlacement = refreshSheetDrawingPlacement;
|
|
2134
2204
|
exports.resolveSheetDrawingRotateEnabled = resolveSheetDrawingRotateEnabled;
|
|
2205
|
+
exports.transformDrawingsToChartSheet = transformDrawingsToChartSheet;
|
|
2135
2206
|
exports.transformToAxisAlignPosition = transformToAxisAlignPosition;
|
|
2136
2207
|
exports.transformToDrawingPosition = transformToDrawingPosition;
|