@univerjs/sheets-drawing 1.5.1 → 1.6.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/lib/cjs/facade.js +52 -77
- package/lib/cjs/index.js +1088 -666
- package/lib/es/facade.js +53 -78
- package/lib/es/index.js +1040 -626
- package/lib/facade.js +53 -78
- package/lib/index.js +1040 -626
- package/lib/types/basics/drawing-reference.d.ts +19 -0
- package/lib/types/basics/transform-position.d.ts +1 -0
- package/lib/types/commands/mutations/set-drawing-apply.mutation.d.ts +13 -0
- package/lib/types/controllers/sheet-drawing-transform-affected.controller.d.ts +4 -5
- package/lib/types/controllers/sheet-drawing.controller.d.ts +3 -2
- package/lib/types/facade/f-over-grid-image.d.ts +4 -4
- package/lib/types/facade/f-worksheet.d.ts +10 -4
- package/lib/types/index.d.ts +3 -1
- package/lib/types/services/sheet-drawing-changeset.d.ts +23 -0
- package/lib/types/services/sheet-drawing-placement.d.ts +16 -9
- package/lib/types/services/sheet-drawing.service.d.ts +14 -6
- package/lib/umd/facade.js +1 -1
- package/lib/umd/index.js +1 -1
- package/package.json +8 -8
package/lib/es/facade.js
CHANGED
|
@@ -2,11 +2,11 @@ import { ArrangeTypeEnum, CanceledError, DrawingTypeEnum, ICommandService, IUndo
|
|
|
2
2
|
import { FBase, FEnum, FEventName, FUniver } from "@univerjs/core/facade";
|
|
3
3
|
import { IDrawingManagerService, SetDrawingSelectedOperation, getImageSize, isGroupableDrawingType } from "@univerjs/drawing";
|
|
4
4
|
import { SheetSkeletonService, convertPositionCellToSheetOverGrid, convertPositionSheetOverGridToAbsolute } from "@univerjs/sheets";
|
|
5
|
-
import { DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SetSheetDrawingPlacementCommand, SetWorksheetBackgroundImageCommand, SheetDrawingAnchorType, applySheetDrawingPlacement, getSheetDrawingPlacement, normalizeSheetDrawingPlacement, transformToAxisAlignPosition } from "@univerjs/sheets-drawing";
|
|
5
|
+
import { DrawingApplyType, ISheetDrawingService, InsertSheetDrawingCommand, RemoveSheetDrawingCommand, SetDrawingApplyMutation, SetDrawingArrangeCommand, SetSheetDrawingCommand, SetSheetDrawingPlacementCommand, SetWorksheetBackgroundImageCommand, SheetDrawingAnchorType, applySheetDrawingPlacement, getLegacySheetDrawingPosition, getSheetDrawingPlacement, normalizeSheetDrawingPlacement, transformToAxisAlignPosition } from "@univerjs/sheets-drawing";
|
|
6
6
|
import { getGroupState, transformObjectOutOfGroup } from "@univerjs/engine-render";
|
|
7
7
|
import { FWorksheet } from "@univerjs/sheets/facade";
|
|
8
8
|
|
|
9
|
-
// \0@oxc-project+runtime@0.
|
|
9
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/typeof.js
|
|
10
10
|
function _typeof(o) {
|
|
11
11
|
"@babel/helpers - typeof";
|
|
12
12
|
return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
|
|
@@ -16,7 +16,7 @@ function _typeof(o) {
|
|
|
16
16
|
}, _typeof(o);
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
// \0@oxc-project+runtime@0.
|
|
19
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/toPrimitive.js
|
|
20
20
|
function toPrimitive(t, e) {
|
|
21
21
|
if ("object" != _typeof(t) || !t) return t;
|
|
22
22
|
var r;
|
|
@@ -28,13 +28,13 @@ function toPrimitive(t, e) {
|
|
|
28
28
|
return ("string" === e ? String : Number)(t);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
// \0@oxc-project+runtime@0.
|
|
31
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/toPropertyKey.js
|
|
32
32
|
function toPropertyKey(t) {
|
|
33
33
|
var i = toPrimitive(t, "string");
|
|
34
34
|
return "symbol" == _typeof(i) ? i : i + "";
|
|
35
35
|
}
|
|
36
36
|
|
|
37
|
-
// \0@oxc-project+runtime@0.
|
|
37
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/defineProperty.js
|
|
38
38
|
function _defineProperty(e, r, t) {
|
|
39
39
|
return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
|
|
40
40
|
value: t,
|
|
@@ -44,14 +44,14 @@ function _defineProperty(e, r, t) {
|
|
|
44
44
|
}) : e[r] = t, e;
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
// \0@oxc-project+runtime@0.
|
|
47
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/decorateParam.js
|
|
48
48
|
function __decorateParam(paramIndex, decorator) {
|
|
49
49
|
return function(target, key) {
|
|
50
50
|
decorator(target, key, paramIndex);
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
|
|
54
|
-
// \0@oxc-project+runtime@0.
|
|
54
|
+
// \0@oxc-project+runtime@0.158.0/helpers/esm/decorate.js
|
|
55
55
|
function __decorate(decorators, target, key, desc) {
|
|
56
56
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
57
57
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
@@ -67,12 +67,16 @@ function __decorate(decorators, target, key, desc) {
|
|
|
67
67
|
* @returns {IFOverGridImage} The FOverGridImage {@link IFOverGridImage}
|
|
68
68
|
*/
|
|
69
69
|
function convertSheetImageToFOverGridImage(sheetImage, skeleton) {
|
|
70
|
-
|
|
70
|
+
var _sheetImage$transform, _sheetImage$transform2;
|
|
71
|
+
const { from, to, flipY = false, flipX = false, angle = 0, skewX = 0, skewY = 0 } = getLegacySheetDrawingPosition(sheetImage, skeleton);
|
|
71
72
|
const { column: fromColumn, columnOffset: fromColumnOffset, row: fromRow, rowOffset: fromRowOffset } = from;
|
|
72
|
-
const
|
|
73
|
+
const absolutePosition = convertPositionSheetOverGridToAbsolute(sheetImage.unitId, sheetImage.subUnitId, {
|
|
73
74
|
from,
|
|
74
75
|
to
|
|
75
76
|
}, skeleton);
|
|
77
|
+
const fixed = sheetImage.anchorType !== SheetDrawingAnchorType.Both;
|
|
78
|
+
const width = (fixed ? (_sheetImage$transform = sheetImage.transform) === null || _sheetImage$transform === void 0 ? void 0 : _sheetImage$transform.width : void 0) ?? absolutePosition.width;
|
|
79
|
+
const height = (fixed ? (_sheetImage$transform2 = sheetImage.transform) === null || _sheetImage$transform2 === void 0 ? void 0 : _sheetImage$transform2.height : void 0) ?? absolutePosition.height;
|
|
76
80
|
return {
|
|
77
81
|
...sheetImage,
|
|
78
82
|
column: fromColumn,
|
|
@@ -98,30 +102,22 @@ function convertFOverGridImageToSheetImage(fOverGridImage, sheetSkeletonService)
|
|
|
98
102
|
const skeleton = sheetSkeletonService.ensureSkeleton(fOverGridImage.unitId, fOverGridImage.subUnitId);
|
|
99
103
|
if (!skeleton) throw new Error(`Skeleton for unitId ${fOverGridImage.unitId} and subUnitId ${fOverGridImage.subUnitId} not found`);
|
|
100
104
|
const { column: fromColumn, columnOffset: fromColumnOffset, row: fromRow, rowOffset: fromRowOffset, flipY = false, flipX = false, angle = 0, skewX = 0, skewY = 0, width, height } = fOverGridImage;
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
105
|
+
const transform = {
|
|
106
|
+
...convertPositionCellToSheetOverGrid(fOverGridImage.unitId, fOverGridImage.subUnitId, {
|
|
107
|
+
column: fromColumn,
|
|
108
|
+
columnOffset: fromColumnOffset,
|
|
109
|
+
row: fromRow,
|
|
110
|
+
rowOffset: fromRowOffset
|
|
111
|
+
}, width, height, skeleton).transform,
|
|
112
|
+
flipY,
|
|
113
|
+
flipX,
|
|
114
|
+
angle,
|
|
115
|
+
skewX,
|
|
116
|
+
skewY
|
|
117
|
+
};
|
|
107
118
|
return {
|
|
108
119
|
...fOverGridImage,
|
|
109
|
-
|
|
110
|
-
...sheetTransform,
|
|
111
|
-
flipY,
|
|
112
|
-
flipX,
|
|
113
|
-
angle,
|
|
114
|
-
skewX,
|
|
115
|
-
skewY
|
|
116
|
-
},
|
|
117
|
-
transform: {
|
|
118
|
-
...transform,
|
|
119
|
-
flipY,
|
|
120
|
-
flipX,
|
|
121
|
-
angle,
|
|
122
|
-
skewX,
|
|
123
|
-
skewY
|
|
124
|
-
},
|
|
120
|
+
transform,
|
|
125
121
|
axisAlignSheetTransform: transformToAxisAlignPosition(transform, skeleton)
|
|
126
122
|
};
|
|
127
123
|
}
|
|
@@ -189,34 +185,6 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
|
|
|
189
185
|
const { unitId, subUnitId } = image;
|
|
190
186
|
const skeleton = this._sheetSkeletonService.getSkeleton(unitId, subUnitId);
|
|
191
187
|
if (!skeleton) throw new Error(`Skeleton for unitId ${unitId} and subUnitId ${subUnitId} not found`);
|
|
192
|
-
if (image.sheetTransform == null) image.sheetTransform = {
|
|
193
|
-
from: {
|
|
194
|
-
column: 0,
|
|
195
|
-
columnOffset: 0,
|
|
196
|
-
row: 0,
|
|
197
|
-
rowOffset: 0
|
|
198
|
-
},
|
|
199
|
-
to: {
|
|
200
|
-
column: 0,
|
|
201
|
-
columnOffset: 0,
|
|
202
|
-
row: 0,
|
|
203
|
-
rowOffset: 0
|
|
204
|
-
}
|
|
205
|
-
};
|
|
206
|
-
if (image.axisAlignSheetTransform == null) image.axisAlignSheetTransform = {
|
|
207
|
-
from: {
|
|
208
|
-
column: 0,
|
|
209
|
-
columnOffset: 0,
|
|
210
|
-
row: 0,
|
|
211
|
-
rowOffset: 0
|
|
212
|
-
},
|
|
213
|
-
to: {
|
|
214
|
-
column: 0,
|
|
215
|
-
columnOffset: 0,
|
|
216
|
-
row: 0,
|
|
217
|
-
rowOffset: 0
|
|
218
|
-
}
|
|
219
|
-
};
|
|
220
188
|
this._image = convertSheetImageToFOverGridImage(image, skeleton);
|
|
221
189
|
return this;
|
|
222
190
|
}
|
|
@@ -477,7 +445,7 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
|
|
|
477
445
|
*
|
|
478
446
|
* This placement takes precedence over the individual row, column, size,
|
|
479
447
|
* and anchor type builder fields. Use bounds inference for an existing
|
|
480
|
-
* transform; use exact markers
|
|
448
|
+
* unrotated transform; use exact Excel-aligned markers to select cells.
|
|
481
449
|
* @param {ISheetDrawingPlacementInput} placement Exact placement or bounds with an explicit anchor type.
|
|
482
450
|
* @returns {FOverGridImageBuilder} This builder.
|
|
483
451
|
* @example
|
|
@@ -742,7 +710,6 @@ let FOverGridImageBuilder = class FOverGridImageBuilder {
|
|
|
742
710
|
skewX: this._image.skewX,
|
|
743
711
|
skewY: this._image.skewY
|
|
744
712
|
},
|
|
745
|
-
sheetTransform,
|
|
746
713
|
axisAlignSheetTransform: sheetTransform
|
|
747
714
|
};
|
|
748
715
|
return applySheetDrawingPlacement(image, this._placement);
|
|
@@ -806,7 +773,7 @@ let FOverGridImage = class FOverGridImage extends FBase {
|
|
|
806
773
|
return this._image.drawingType;
|
|
807
774
|
}
|
|
808
775
|
/**
|
|
809
|
-
* Get this image's
|
|
776
|
+
* Get this image's placement with Excel-aligned cell markers.
|
|
810
777
|
* @returns {ISheetDrawingPlacement} OneCell, TwoCell, or Absolute placement.
|
|
811
778
|
* @example
|
|
812
779
|
* ```ts
|
|
@@ -820,7 +787,9 @@ let FOverGridImage = class FOverGridImage extends FBase {
|
|
|
820
787
|
subUnitId: this._image.subUnitId,
|
|
821
788
|
drawingId: this._image.drawingId
|
|
822
789
|
});
|
|
823
|
-
|
|
790
|
+
const { unitId, subUnitId } = this._image;
|
|
791
|
+
const skeleton = this._sheetSkeletonService.getSkeleton(unitId, subUnitId);
|
|
792
|
+
return getSheetDrawingPlacement(current ?? this._image, skeleton ?? void 0);
|
|
824
793
|
}
|
|
825
794
|
/**
|
|
826
795
|
* Get the current whole-image opacity.
|
|
@@ -854,8 +823,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
|
|
|
854
823
|
/**
|
|
855
824
|
* Set this image's explicit placement through the drawing command.
|
|
856
825
|
* `Position`, `Both`, and `None` correspond to OneCell, TwoCell, and
|
|
857
|
-
* Absolute.
|
|
858
|
-
*
|
|
826
|
+
* Absolute. Use the unrotated rectangle to infer placement, or specify
|
|
827
|
+
* exact Excel-aligned cell markers and offsets.
|
|
859
828
|
* @param {ISheetDrawingPlacementInput} placement Exact placement or bounds with an explicit anchor type.
|
|
860
829
|
* @returns {boolean} `true` when the command succeeds.
|
|
861
830
|
* @example OneCell
|
|
@@ -946,7 +915,8 @@ let FOverGridImage = class FOverGridImage extends FBase {
|
|
|
946
915
|
*/
|
|
947
916
|
toBuilder() {
|
|
948
917
|
const builder = this._injector.createInstance(FOverGridImageBuilder, this._image.unitId, this._image.subUnitId);
|
|
949
|
-
|
|
918
|
+
const current = this._sheetDrawingService.getDrawingByParam(this._image);
|
|
919
|
+
builder.setImage(current ?? this._image);
|
|
950
920
|
return builder;
|
|
951
921
|
}
|
|
952
922
|
setSource(source, sourceType) {
|
|
@@ -1046,16 +1016,15 @@ let FOverGridImage = class FOverGridImage extends FBase {
|
|
|
1046
1016
|
* ```
|
|
1047
1017
|
*/
|
|
1048
1018
|
setRotate(angle) {
|
|
1049
|
-
this._image
|
|
1050
|
-
this._image.transform && (this._image.transform.angle = angle);
|
|
1051
|
-
if (this._image.transform) {
|
|
1052
|
-
const skeleton = this._sheetSkeletonService.getSkeleton(this._image.unitId, this._image.subUnitId);
|
|
1053
|
-
if (!skeleton) throw new Error(`Skeleton for unitId ${this._image.unitId} and subUnitId ${this._image.subUnitId} not found`);
|
|
1054
|
-
this._image.axisAlignSheetTransform && (this._image.axisAlignSheetTransform = transformToAxisAlignPosition(this._image.transform, skeleton));
|
|
1055
|
-
}
|
|
1019
|
+
const { unitId, subUnitId, drawingId } = this._image;
|
|
1056
1020
|
return this._commandService.syncExecuteCommand(SetSheetDrawingCommand.id, {
|
|
1057
|
-
unitId
|
|
1058
|
-
drawings: [
|
|
1021
|
+
unitId,
|
|
1022
|
+
drawings: [{
|
|
1023
|
+
unitId,
|
|
1024
|
+
subUnitId,
|
|
1025
|
+
drawingId,
|
|
1026
|
+
transform: { angle }
|
|
1027
|
+
}]
|
|
1059
1028
|
});
|
|
1060
1029
|
}
|
|
1061
1030
|
/**
|
|
@@ -1276,7 +1245,9 @@ var FWorksheetDrawingMixin = class extends FWorksheet {
|
|
|
1276
1245
|
subUnitId: this.getSheetId(),
|
|
1277
1246
|
drawingId
|
|
1278
1247
|
});
|
|
1279
|
-
|
|
1248
|
+
if (!drawing) return null;
|
|
1249
|
+
const skeleton = drawing.anchorType === SheetDrawingAnchorType.None ? void 0 : this._sheetSkeletonService.ensureSkeleton(drawing.unitId, drawing.subUnitId);
|
|
1250
|
+
return getSheetDrawingPlacement(drawing, skeleton ?? void 0);
|
|
1280
1251
|
}
|
|
1281
1252
|
setDrawingPlacement(drawingId, placement) {
|
|
1282
1253
|
return this._commandService.syncExecuteCommand(SetSheetDrawingPlacementCommand.id, {
|
|
@@ -1291,7 +1262,11 @@ var FWorksheetDrawingMixin = class extends FWorksheet {
|
|
|
1291
1262
|
resolveDrawingPlacement(placement) {
|
|
1292
1263
|
const skeleton = placement.kind === SheetDrawingAnchorType.None ? void 0 : this._sheetSkeletonService.ensureSkeleton(this._fWorkbook.getId(), this.getSheetId());
|
|
1293
1264
|
if (placement.kind !== SheetDrawingAnchorType.None && !skeleton) throw new Error("SHEET_DRAWING_PLACEMENT_SKELETON_REQUIRED");
|
|
1294
|
-
|
|
1265
|
+
const resolved = normalizeSheetDrawingPlacement(placement, skeleton);
|
|
1266
|
+
return "bounds" in placement && resolved.kind !== SheetDrawingAnchorType.None ? {
|
|
1267
|
+
...resolved,
|
|
1268
|
+
bounds: { ...placement.bounds }
|
|
1269
|
+
} : resolved;
|
|
1295
1270
|
}
|
|
1296
1271
|
getDrawingLayout() {
|
|
1297
1272
|
const unitId = this._fWorkbook.getId();
|
|
@@ -1314,7 +1289,7 @@ var FWorksheetDrawingMixin = class extends FWorksheet {
|
|
|
1314
1289
|
drawingId,
|
|
1315
1290
|
drawingType: drawing.drawingType,
|
|
1316
1291
|
bounds,
|
|
1317
|
-
placement: getSheetDrawingPlacement(drawing),
|
|
1292
|
+
placement: getSheetDrawingPlacement(drawing, skeleton),
|
|
1318
1293
|
groupId: drawing.groupId
|
|
1319
1294
|
});
|
|
1320
1295
|
}
|