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