@univerjs/sheets-drawing-ui 0.1.13 → 0.1.14
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/es/index.js
CHANGED
|
@@ -1,67 +1,67 @@
|
|
|
1
|
-
var
|
|
2
|
-
var
|
|
3
|
-
var
|
|
4
|
-
import { CommandType as $, ICommandService as
|
|
5
|
-
import { Inject as
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import { getSheetCommandTarget as
|
|
15
|
-
import
|
|
16
|
-
import { MessageType as
|
|
17
|
-
import
|
|
1
|
+
var Wt = Object.defineProperty;
|
|
2
|
+
var Bt = (r, e, n) => e in r ? Wt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n;
|
|
3
|
+
var H = (r, e, n) => (Bt(r, typeof e != "symbol" ? e + "" : e, n), n);
|
|
4
|
+
import { CommandType as $, ICommandService as B, IUndoRedoService as ie, LocaleService as de, IUniverInstanceService as ue, RxDisposable as Gt, UniverInstanceType as ee, toDisposable as Ae, FOCUSING_COMMON_DRAWINGS as le, OnLifecycle as me, LifecycleStages as he, IContextService as tt, Disposable as ge, Direction as K, FOCUSING_FORMULA_EDITOR as xt, EDITOR_ACTIVATED as $t, Rectangle as Ft, DrawingTypeEnum as Ne, DisposableCollection as Vt, Tools as ne, Plugin as Yt, DependentOn as Xt } from "@univerjs/core";
|
|
5
|
+
import { Inject as W, Injector as Ve } from "@wendellhu/redi";
|
|
6
|
+
import { ImageCropperObject as Ht, COMPONENT_IMAGE_POPUP_MENU as kt, OpenImageCropOperation as zt, ImageResetSizeOperation as Kt, DrawingCommonPanel as Jt, DrawingRenderService as Zt, UniverDrawingUIPlugin as qt } from "@univerjs/drawing-ui";
|
|
7
|
+
import { ISheetDrawingService as Y, SetDrawingApplyMutation as b, DrawingApplyType as P, SheetDrawingAnchorType as O, UniverSheetsDrawingPlugin as Qt } from "@univerjs/sheets-drawing";
|
|
8
|
+
import { IDrawingManagerService as k, IImageIoService as nt, ArrangeTypeEnum as we, DrawingTypeEnum as ye, DRAWING_IMAGE_COUNT_LIMIT as ze, ImageUploadStatusType as Le, DRAWING_IMAGE_ALLOW_SIZE as en, getImageSize as tn, DRAWING_IMAGE_WIDTH_LIMIT as Ke, DRAWING_IMAGE_HEIGHT_LIMIT as Je, DRAWING_IMAGE_ALLOW_IMAGE_LIST as nn, getDrawingShapeKeyByDrawingSearch as rn, UniverDrawingPlugin as on } from "@univerjs/drawing";
|
|
9
|
+
import { IRenderManagerService as se, getGroupState as sn, transformObjectOutOfGroup as an, precisionTo as J, Rect as cn, DRAWING_OBJECT_LAYER_INDEX as ln } from "@univerjs/engine-render";
|
|
10
|
+
import { SheetCanvasPopManagerService as dn, ISelectionRenderService as Te, getCurrentRangeDisable$ as un, SheetSkeletonManagerService as Be, SetScrollOperation as mn, SetZoomRatioOperation as hn, VIEWPORT_KEY as gn, SheetPrintInterceptorService as fn } from "@univerjs/sheets-ui";
|
|
11
|
+
import { takeUntil as Ze, Subject as qe, BehaviorSubject as pn } from "rxjs";
|
|
12
|
+
import { ISidebarService as wn, BuiltInUIPart as _n, IUIPartsService as vn, IMessageService as Sn, MenuItemType as rt, MenuPosition as Cn, MenuGroup as Rn, getMenuHiddenObservable as ot, KeyCode as oe, ComponentManager as In, IMenuService as Dn, IShortcutService as Mn, CanvasFloatDomService as On } from "@univerjs/ui";
|
|
13
|
+
import { useDependency as Z, connectInjector as bn } from "@wendellhu/redi/react-bindings";
|
|
14
|
+
import { getSheetCommandTarget as re, SelectionManagerService as Pn, WorkbookEditablePermission as yn, WorksheetEditPermission as Tn, RangeProtectionPermissionEditPoint as En, InsertRowCommand as it, InsertColCommand as st, RemoveRowCommand as at, RemoveColCommand as ct, DeleteRangeMoveLeftCommand as lt, DeleteRangeMoveUpCommand as dt, InsertRangeMoveDownCommand as ut, InsertRangeMoveRightCommand as mt, DeltaRowHeightCommand as Ge, SetRowHeightCommand as xe, DeltaColumnWidthCommand as ht, SetColWidthCommand as gt, SetRowHiddenCommand as ft, SetSpecificRowsVisibleCommand as pt, SetSpecificColsVisibleCommand as wt, SetColHiddenCommand as _t, SetRowVisibleMutation as Un, SetRowHiddenMutation as An, SetColVisibleMutation as Nn, SetColHiddenMutation as Ln, SetWorksheetRowHeightMutation as jn, SetWorksheetColWidthMutation as Wn, SetWorksheetActiveOperation as Bn, SheetInterceptorService as Gn, SetFrozenMutation as xn } from "@univerjs/sheets";
|
|
15
|
+
import L, { useEffect as Ye, forwardRef as vt, useRef as St, createElement as Ct, useState as $e } from "react";
|
|
16
|
+
import { MessageType as _e, RadioGroup as $n, Radio as je } from "@univerjs/design";
|
|
17
|
+
import ve from "clsx";
|
|
18
18
|
const N = {
|
|
19
19
|
id: "sheet.operation.clear-drawing-transformer",
|
|
20
20
|
type: $.MUTATION,
|
|
21
21
|
handler: (r, e) => {
|
|
22
|
-
const n = r.get(
|
|
22
|
+
const n = r.get(se);
|
|
23
23
|
return e.forEach((t) => {
|
|
24
24
|
var o, i;
|
|
25
25
|
(i = (o = n.getRenderById(t)) == null ? void 0 : o.scene.getTransformer()) == null || i.debounceRefreshControls();
|
|
26
26
|
}), !0;
|
|
27
27
|
}
|
|
28
|
-
},
|
|
28
|
+
}, Xe = {
|
|
29
29
|
id: "sheet.command.remove-sheet-image",
|
|
30
30
|
type: $.COMMAND,
|
|
31
31
|
handler: (r, e) => {
|
|
32
|
-
const n = r.get(
|
|
32
|
+
const n = r.get(B), t = r.get(ie), o = r.get(Y);
|
|
33
33
|
if (!e)
|
|
34
34
|
return !1;
|
|
35
35
|
const { drawings: i } = e, s = [];
|
|
36
|
-
i.forEach((
|
|
37
|
-
const { unitId: g } =
|
|
36
|
+
i.forEach((f) => {
|
|
37
|
+
const { unitId: g } = f;
|
|
38
38
|
s.push(g);
|
|
39
39
|
});
|
|
40
40
|
const a = o.getBatchRemoveOp(i), { unitId: c, subUnitId: u, undo: d, redo: l, objects: h } = a;
|
|
41
|
-
return n.syncExecuteCommand(b.id, { unitId: c, subUnitId: u, op: l, objects: h, type:
|
|
41
|
+
return n.syncExecuteCommand(b.id, { unitId: c, subUnitId: u, op: l, objects: h, type: P.REMOVE }) ? (t.pushUndoRedo({
|
|
42
42
|
unitID: c,
|
|
43
43
|
undoMutations: [
|
|
44
|
-
{ id: b.id, params: { unitId: c, subUnitId: u, op: d, objects: h, type:
|
|
44
|
+
{ id: b.id, params: { unitId: c, subUnitId: u, op: d, objects: h, type: P.INSERT } },
|
|
45
45
|
{ id: N.id, params: s }
|
|
46
46
|
],
|
|
47
47
|
redoMutations: [
|
|
48
|
-
{ id: b.id, params: { unitId: c, subUnitId: u, op: l, objects: h, type:
|
|
48
|
+
{ id: b.id, params: { unitId: c, subUnitId: u, op: l, objects: h, type: P.REMOVE } },
|
|
49
49
|
{ id: N.id, params: s }
|
|
50
50
|
]
|
|
51
51
|
}), !0) : !1;
|
|
52
52
|
}
|
|
53
|
-
},
|
|
53
|
+
}, Rt = "COMPONENT_SHEET_DRAWING_PANEL", It = {
|
|
54
54
|
id: "sidebar.operation.sheet-image",
|
|
55
55
|
type: $.COMMAND,
|
|
56
56
|
handler: async (r, e) => {
|
|
57
|
-
const n = r.get(
|
|
58
|
-
if (!
|
|
57
|
+
const n = r.get(wn), t = r.get(de), o = r.get(ue), i = r.get(k);
|
|
58
|
+
if (!re(o))
|
|
59
59
|
return !1;
|
|
60
60
|
switch (e.value) {
|
|
61
61
|
case "open":
|
|
62
62
|
n.open({
|
|
63
63
|
header: { title: t.t("sheetImage.panel.title") },
|
|
64
|
-
children: { label:
|
|
64
|
+
children: { label: Rt },
|
|
65
65
|
onClose: () => {
|
|
66
66
|
i.focusDrawing(null);
|
|
67
67
|
},
|
|
@@ -75,43 +75,43 @@ const N = {
|
|
|
75
75
|
}
|
|
76
76
|
return !0;
|
|
77
77
|
}
|
|
78
|
-
},
|
|
78
|
+
}, Dt = {
|
|
79
79
|
id: "sheet.operation.edit-sheet-image",
|
|
80
80
|
type: $.OPERATION,
|
|
81
81
|
handler: (r, e) => {
|
|
82
|
-
const n = r.get(
|
|
83
|
-
return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(
|
|
84
|
-
}
|
|
85
|
-
},
|
|
86
|
-
uploadLoading:
|
|
87
|
-
uploadLoadingBody:
|
|
88
|
-
uploadLoadingBodyAnimation:
|
|
89
|
-
univerCircleAnimation:
|
|
90
|
-
uploadLoadingBodyText:
|
|
91
|
-
},
|
|
92
|
-
const r = Z(
|
|
93
|
-
return
|
|
82
|
+
const n = r.get(k), t = r.get(B);
|
|
83
|
+
return e == null ? !1 : (n.focusDrawing([e]), t.executeCommand(It.id, { value: "open" }), !0);
|
|
84
|
+
}
|
|
85
|
+
}, Fn = "univer-upload-loading", Vn = "univer-upload-loading-body", Yn = "univer-upload-loading-body-animation", Xn = "univer-UniverCircleAnimation", Hn = "univer-upload-loading-body-text", Se = {
|
|
86
|
+
uploadLoading: Fn,
|
|
87
|
+
uploadLoadingBody: Vn,
|
|
88
|
+
uploadLoadingBodyAnimation: Yn,
|
|
89
|
+
univerCircleAnimation: Xn,
|
|
90
|
+
uploadLoadingBodyText: Hn
|
|
91
|
+
}, kn = () => {
|
|
92
|
+
const r = Z(nt), e = Z(de), [n, t] = L.useState(0);
|
|
93
|
+
return Ye(() => {
|
|
94
94
|
const o = r.change$.subscribe((i) => {
|
|
95
95
|
t(i);
|
|
96
96
|
});
|
|
97
97
|
return () => {
|
|
98
98
|
o.unsubscribe();
|
|
99
99
|
};
|
|
100
|
-
}, [r]), /* @__PURE__ */
|
|
100
|
+
}, [r]), /* @__PURE__ */ L.createElement("div", { style: { display: n > 0 ? "block" : "none" }, className: Se.uploadLoading }, /* @__PURE__ */ L.createElement("div", { className: Se.uploadLoadingBody }, /* @__PURE__ */ L.createElement("div", { className: Se.uploadLoadingBodyAnimation }), /* @__PURE__ */ L.createElement("div", { className: Se.uploadLoadingBodyText }, `${e.t("uploadLoading.loading")}: ${n}`)));
|
|
101
101
|
};
|
|
102
|
-
var
|
|
103
|
-
for (var o = t > 1 ? void 0 : t ?
|
|
102
|
+
var zn = Object.defineProperty, Kn = Object.getOwnPropertyDescriptor, Jn = (r, e, n, t) => {
|
|
103
|
+
for (var o = t > 1 ? void 0 : t ? Kn(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
104
104
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
105
|
-
return t && o &&
|
|
106
|
-
},
|
|
107
|
-
let
|
|
105
|
+
return t && o && zn(e, n, o), o;
|
|
106
|
+
}, q = (r, e) => (n, t) => e(n, t, r);
|
|
107
|
+
let Re = class extends Gt {
|
|
108
108
|
constructor(e, n, t, o, i, s, a) {
|
|
109
109
|
super();
|
|
110
|
-
|
|
110
|
+
H(this, "_initImagePopupMenu", /* @__PURE__ */ new Set());
|
|
111
111
|
this._injector = e, this._drawingManagerService = n, this._canvasPopManagerService = t, this._renderManagerService = o, this._univerInstanceService = i, this._contextService = s, this._uiPartsService = a, this._init();
|
|
112
112
|
}
|
|
113
113
|
_init() {
|
|
114
|
-
this._univerInstanceService.getCurrentTypeOfUnit$(ee.UNIVER_SHEET).pipe(
|
|
114
|
+
this._univerInstanceService.getCurrentTypeOfUnit$(ee.UNIVER_SHEET).pipe(Ze(this.dispose$)).subscribe((e) => this._create(e)), this._univerInstanceService.getTypeOfUnitDisposed$(ee.UNIVER_SHEET).pipe(Ze(this.dispose$)).subscribe((e) => this._dispose(e)), this._univerInstanceService.getAllUnitsForType(ee.UNIVER_SHEET).forEach((e) => this._create(e)), this._uiPartsService.registerComponent(_n.CONTENT, () => bn(kn, this._injector));
|
|
115
115
|
}
|
|
116
116
|
_dispose(e) {
|
|
117
117
|
const n = e.getUnitId();
|
|
@@ -126,7 +126,7 @@ let _e = class extends Nt {
|
|
|
126
126
|
_hasCropObject(e) {
|
|
127
127
|
const n = e.getAllObjects();
|
|
128
128
|
for (const t of n)
|
|
129
|
-
if (t instanceof
|
|
129
|
+
if (t instanceof Ht)
|
|
130
130
|
return !0;
|
|
131
131
|
return !1;
|
|
132
132
|
}
|
|
@@ -140,9 +140,9 @@ let _e = class extends Nt {
|
|
|
140
140
|
return;
|
|
141
141
|
const o = [];
|
|
142
142
|
this.disposeWithMe(
|
|
143
|
-
|
|
143
|
+
Ae(
|
|
144
144
|
t.onCreateControlObservable.add(() => {
|
|
145
|
-
if (this._contextService.setContextValue(
|
|
145
|
+
if (this._contextService.setContextValue(le, !0), this._hasCropObject(n))
|
|
146
146
|
return;
|
|
147
147
|
const s = t.getSelectedObjectMap();
|
|
148
148
|
if (s.size > 1) {
|
|
@@ -157,7 +157,7 @@ let _e = class extends Nt {
|
|
|
157
157
|
return;
|
|
158
158
|
const { unitId: d, subUnitId: l, drawingId: h } = u;
|
|
159
159
|
o.push(this.disposeWithMe(this._canvasPopManagerService.attachPopupToObject(a, {
|
|
160
|
-
componentKey:
|
|
160
|
+
componentKey: kt,
|
|
161
161
|
direction: "horizontal",
|
|
162
162
|
offset: [2, 0],
|
|
163
163
|
extraProps: {
|
|
@@ -171,13 +171,13 @@ let _e = class extends Nt {
|
|
|
171
171
|
})
|
|
172
172
|
)
|
|
173
173
|
), this.disposeWithMe(
|
|
174
|
-
|
|
174
|
+
Ae(
|
|
175
175
|
t.onClearControlObservable.add(() => {
|
|
176
|
-
o.forEach((s) => s.dispose()), this._contextService.setContextValue(
|
|
176
|
+
o.forEach((s) => s.dispose()), this._contextService.setContextValue(le, !1), this._drawingManagerService.focusDrawing(null);
|
|
177
177
|
})
|
|
178
178
|
)
|
|
179
179
|
), this.disposeWithMe(
|
|
180
|
-
|
|
180
|
+
Ae(
|
|
181
181
|
t.onChangingObservable.add(() => {
|
|
182
182
|
o.forEach((s) => s.dispose());
|
|
183
183
|
})
|
|
@@ -189,123 +189,123 @@ let _e = class extends Nt {
|
|
|
189
189
|
{
|
|
190
190
|
label: "image-popup.edit",
|
|
191
191
|
index: 0,
|
|
192
|
-
commandId:
|
|
192
|
+
commandId: Dt.id,
|
|
193
193
|
commandParams: { unitId: e, subUnitId: n, drawingId: t },
|
|
194
194
|
disable: !1
|
|
195
195
|
},
|
|
196
196
|
{
|
|
197
197
|
label: "image-popup.delete",
|
|
198
198
|
index: 1,
|
|
199
|
-
commandId:
|
|
199
|
+
commandId: Xe.id,
|
|
200
200
|
commandParams: { unitId: e, drawings: [{ unitId: e, subUnitId: n, drawingId: t }] },
|
|
201
201
|
disable: !1
|
|
202
202
|
},
|
|
203
203
|
{
|
|
204
204
|
label: "image-popup.crop",
|
|
205
205
|
index: 2,
|
|
206
|
-
commandId:
|
|
206
|
+
commandId: zt.id,
|
|
207
207
|
commandParams: { unitId: e, subUnitId: n, drawingId: t },
|
|
208
208
|
disable: !1
|
|
209
209
|
},
|
|
210
210
|
{
|
|
211
211
|
label: "image-popup.reset",
|
|
212
212
|
index: 3,
|
|
213
|
-
commandId:
|
|
213
|
+
commandId: Kt.id,
|
|
214
214
|
commandParams: [{ unitId: e, subUnitId: n, drawingId: t }],
|
|
215
215
|
disable: !1
|
|
216
216
|
}
|
|
217
217
|
];
|
|
218
218
|
}
|
|
219
219
|
};
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
],
|
|
230
|
-
const
|
|
220
|
+
Re = Jn([
|
|
221
|
+
me(he.Steady, Re),
|
|
222
|
+
q(0, W(Ve)),
|
|
223
|
+
q(1, k),
|
|
224
|
+
q(2, W(dn)),
|
|
225
|
+
q(3, se),
|
|
226
|
+
q(4, ue),
|
|
227
|
+
q(5, tt),
|
|
228
|
+
q(6, W(vn))
|
|
229
|
+
], Re);
|
|
230
|
+
const Ee = {
|
|
231
231
|
id: "sheet.operation.insert-float-image",
|
|
232
232
|
type: $.OPERATION,
|
|
233
233
|
handler: (r, e) => !0
|
|
234
|
-
},
|
|
234
|
+
}, Oe = {
|
|
235
235
|
id: "sheet.operation.insert-cell-image",
|
|
236
236
|
type: $.OPERATION,
|
|
237
237
|
handler: (r, e) => !0
|
|
238
|
-
},
|
|
238
|
+
}, He = {
|
|
239
239
|
id: "sheet.command.insert-sheet-image",
|
|
240
240
|
type: $.COMMAND,
|
|
241
241
|
handler: (r, e) => {
|
|
242
|
-
const n = r.get(
|
|
242
|
+
const n = r.get(B), t = r.get(ie), o = r.get(Y);
|
|
243
243
|
if (!e)
|
|
244
244
|
return !1;
|
|
245
|
-
const i = e.drawings, s = i.map((
|
|
246
|
-
return n.syncExecuteCommand(b.id, { op: l, unitId: c, subUnitId: u, objects: h, type:
|
|
245
|
+
const i = e.drawings, s = i.map((f) => f.unitId), a = o.getBatchAddOp(i), { unitId: c, subUnitId: u, undo: d, redo: l, objects: h } = a;
|
|
246
|
+
return n.syncExecuteCommand(b.id, { op: l, unitId: c, subUnitId: u, objects: h, type: P.INSERT }) ? (t.pushUndoRedo({
|
|
247
247
|
unitID: c,
|
|
248
248
|
undoMutations: [
|
|
249
|
-
{ id: b.id, params: { op: d, unitId: c, subUnitId: u, objects: h, type:
|
|
249
|
+
{ id: b.id, params: { op: d, unitId: c, subUnitId: u, objects: h, type: P.REMOVE } },
|
|
250
250
|
{ id: N.id, params: s }
|
|
251
251
|
],
|
|
252
252
|
redoMutations: [
|
|
253
|
-
{ id: b.id, params: { op: l, unitId: c, subUnitId: u, objects: h, type:
|
|
253
|
+
{ id: b.id, params: { op: l, unitId: c, subUnitId: u, objects: h, type: P.INSERT } },
|
|
254
254
|
{ id: N.id, params: s }
|
|
255
255
|
]
|
|
256
256
|
}), !0) : !1;
|
|
257
257
|
}
|
|
258
|
-
},
|
|
258
|
+
}, Ue = {
|
|
259
259
|
id: "sheet.command.set-sheet-image",
|
|
260
260
|
type: $.COMMAND,
|
|
261
261
|
handler: (r, e) => {
|
|
262
|
-
const n = r.get(
|
|
262
|
+
const n = r.get(B), t = r.get(ie), o = r.get(Y);
|
|
263
263
|
if (!e)
|
|
264
264
|
return !1;
|
|
265
265
|
const { drawings: i } = e, s = o.getBatchUpdateOp(i), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = s;
|
|
266
|
-
return n.syncExecuteCommand(b.id, { unitId: a, subUnitId: c, op: d, objects: l, type:
|
|
266
|
+
return n.syncExecuteCommand(b.id, { unitId: a, subUnitId: c, op: d, objects: l, type: P.UPDATE }) ? (t.pushUndoRedo({
|
|
267
267
|
unitID: a,
|
|
268
268
|
undoMutations: [
|
|
269
|
-
{ id: b.id, params: { unitId: a, subUnitId: c, op: u, objects: l, type:
|
|
269
|
+
{ id: b.id, params: { unitId: a, subUnitId: c, op: u, objects: l, type: P.UPDATE } },
|
|
270
270
|
{ id: N.id, params: [a] }
|
|
271
271
|
],
|
|
272
272
|
redoMutations: [
|
|
273
|
-
{ id: b.id, params: { unitId: a, subUnitId: c, op: d, objects: l, type:
|
|
273
|
+
{ id: b.id, params: { unitId: a, subUnitId: c, op: d, objects: l, type: P.UPDATE } },
|
|
274
274
|
{ id: N.id, params: [a] }
|
|
275
275
|
]
|
|
276
276
|
}), !0) : !1;
|
|
277
277
|
}
|
|
278
|
-
},
|
|
278
|
+
}, Mt = {
|
|
279
279
|
id: "sheet.command.set-drawing-arrange",
|
|
280
280
|
type: $.COMMAND,
|
|
281
281
|
handler: (r, e) => {
|
|
282
|
-
const n = r.get(
|
|
282
|
+
const n = r.get(B), t = r.get(ie);
|
|
283
283
|
if (!e)
|
|
284
284
|
return !1;
|
|
285
|
-
const o = r.get(
|
|
285
|
+
const o = r.get(Y), { unitId: i, subUnitId: s, drawingIds: a, arrangeType: c } = e, u = { unitId: i, subUnitId: s, drawingIds: a };
|
|
286
286
|
let d;
|
|
287
|
-
if (c ===
|
|
287
|
+
if (c === we.forward ? d = o.getForwardDrawingsOp(u) : c === we.backward ? d = o.getBackwardDrawingOp(u) : c === we.front ? d = o.getFrontDrawingsOp(u) : c === we.back && (d = o.getBackDrawingsOp(u)), d == null)
|
|
288
288
|
return !1;
|
|
289
289
|
const { objects: l, redo: h, undo: m } = d;
|
|
290
|
-
return n.syncExecuteCommand(b.id, { op: h, unitId: i, subUnitId: s, objects: l, type:
|
|
290
|
+
return n.syncExecuteCommand(b.id, { op: h, unitId: i, subUnitId: s, objects: l, type: P.ARRANGE }) ? (t.pushUndoRedo({
|
|
291
291
|
unitID: i,
|
|
292
292
|
undoMutations: [
|
|
293
|
-
{ id: b.id, params: { op: m, unitId: i, subUnitId: s, objects: l, type:
|
|
293
|
+
{ id: b.id, params: { op: m, unitId: i, subUnitId: s, objects: l, type: P.ARRANGE } }
|
|
294
294
|
],
|
|
295
295
|
redoMutations: [
|
|
296
|
-
{ id: b.id, params: { op: h, unitId: i, subUnitId: s, objects: l, type:
|
|
296
|
+
{ id: b.id, params: { op: h, unitId: i, subUnitId: s, objects: l, type: P.ARRANGE } }
|
|
297
297
|
]
|
|
298
298
|
}), !0) : !1;
|
|
299
299
|
}
|
|
300
300
|
};
|
|
301
|
-
function
|
|
301
|
+
function Zn(r) {
|
|
302
302
|
const e = [];
|
|
303
303
|
return r.forEach((n) => {
|
|
304
|
-
const { parent: t, children: o } = n, { unitId: i, subUnitId: s, drawingId: a } = t, c =
|
|
305
|
-
const h = l.transform || { left: 0, top: 0 }, { unitId: m, subUnitId:
|
|
304
|
+
const { parent: t, children: o } = n, { unitId: i, subUnitId: s, drawingId: a } = t, c = sn(0, 0, o.map((l) => l.transform || {})), u = o.map((l) => {
|
|
305
|
+
const h = l.transform || { left: 0, top: 0 }, { unitId: m, subUnitId: f, drawingId: g } = l;
|
|
306
306
|
return {
|
|
307
307
|
unitId: m,
|
|
308
|
-
subUnitId:
|
|
308
|
+
subUnitId: f,
|
|
309
309
|
drawingId: g,
|
|
310
310
|
transform: {
|
|
311
311
|
...h,
|
|
@@ -318,7 +318,7 @@ function Wn(r) {
|
|
|
318
318
|
unitId: i,
|
|
319
319
|
subUnitId: s,
|
|
320
320
|
drawingId: a,
|
|
321
|
-
drawingType:
|
|
321
|
+
drawingType: ye.DRAWING_GROUP,
|
|
322
322
|
transform: c
|
|
323
323
|
};
|
|
324
324
|
e.push({
|
|
@@ -327,17 +327,17 @@ function Wn(r) {
|
|
|
327
327
|
});
|
|
328
328
|
}), e;
|
|
329
329
|
}
|
|
330
|
-
function
|
|
330
|
+
function qn(r) {
|
|
331
331
|
const e = [];
|
|
332
332
|
return r.forEach((n) => {
|
|
333
333
|
const { parent: t, children: o } = n, { unitId: i, subUnitId: s, drawingId: a, transform: c = { width: 0, height: 0 } } = t;
|
|
334
334
|
if (c == null)
|
|
335
335
|
return;
|
|
336
336
|
const u = o.map((l) => {
|
|
337
|
-
const { transform: h } = l, { unitId: m, subUnitId:
|
|
337
|
+
const { transform: h } = l, { unitId: m, subUnitId: f, drawingId: g } = l, _ = an(h || {}, c, c.width || 0, c.height || 0);
|
|
338
338
|
return {
|
|
339
339
|
unitId: m,
|
|
340
|
-
subUnitId:
|
|
340
|
+
subUnitId: f,
|
|
341
341
|
drawingId: g,
|
|
342
342
|
transform: _,
|
|
343
343
|
groupId: void 0
|
|
@@ -346,7 +346,7 @@ function Bn(r) {
|
|
|
346
346
|
unitId: i,
|
|
347
347
|
subUnitId: s,
|
|
348
348
|
drawingId: a,
|
|
349
|
-
drawingType:
|
|
349
|
+
drawingType: ye.DRAWING_GROUP,
|
|
350
350
|
transform: {
|
|
351
351
|
left: 0,
|
|
352
352
|
top: 0
|
|
@@ -358,60 +358,60 @@ function Bn(r) {
|
|
|
358
358
|
});
|
|
359
359
|
}), e;
|
|
360
360
|
}
|
|
361
|
-
const
|
|
361
|
+
const Ot = {
|
|
362
362
|
id: "sheet.command.group-sheet-image",
|
|
363
363
|
type: $.COMMAND,
|
|
364
364
|
handler: (r, e) => {
|
|
365
|
-
const n = r.get(
|
|
365
|
+
const n = r.get(B), t = r.get(ie), o = r.get(Y);
|
|
366
366
|
if (!e)
|
|
367
367
|
return !1;
|
|
368
368
|
const i = [];
|
|
369
|
-
e.forEach(({ parent: m, children:
|
|
370
|
-
i.push(m.unitId),
|
|
369
|
+
e.forEach(({ parent: m, children: f }) => {
|
|
370
|
+
i.push(m.unitId), f.forEach((g) => {
|
|
371
371
|
i.push(g.unitId);
|
|
372
372
|
});
|
|
373
373
|
});
|
|
374
374
|
const s = o.getGroupDrawingOp(e), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = s;
|
|
375
|
-
return n.syncExecuteCommand(b.id, { op: d, unitId: a, subUnitId: c, objects: l, type:
|
|
375
|
+
return n.syncExecuteCommand(b.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.GROUP }) ? (t.pushUndoRedo({
|
|
376
376
|
unitID: a,
|
|
377
377
|
undoMutations: [
|
|
378
|
-
{ id: b.id, params: { op: u, unitId: a, subUnitId: c, objects:
|
|
378
|
+
{ id: b.id, params: { op: u, unitId: a, subUnitId: c, objects: qn(l), type: P.UNGROUP } },
|
|
379
379
|
{ id: N.id, params: i }
|
|
380
380
|
],
|
|
381
381
|
redoMutations: [
|
|
382
|
-
{ id: b.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type:
|
|
382
|
+
{ id: b.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type: P.GROUP } },
|
|
383
383
|
{ id: N.id, params: i }
|
|
384
384
|
]
|
|
385
385
|
}), !0) : !1;
|
|
386
386
|
}
|
|
387
|
-
},
|
|
387
|
+
}, bt = {
|
|
388
388
|
id: "sheet.command.ungroup-sheet-image",
|
|
389
389
|
type: $.COMMAND,
|
|
390
390
|
handler: (r, e) => {
|
|
391
|
-
const n = r.get(
|
|
391
|
+
const n = r.get(B), t = r.get(ie), o = r.get(Y);
|
|
392
392
|
if (!e)
|
|
393
393
|
return !1;
|
|
394
394
|
const i = [];
|
|
395
|
-
e.forEach(({ parent: m, children:
|
|
396
|
-
i.push(m.unitId),
|
|
395
|
+
e.forEach(({ parent: m, children: f }) => {
|
|
396
|
+
i.push(m.unitId), f.forEach((g) => {
|
|
397
397
|
i.push(g.unitId);
|
|
398
398
|
});
|
|
399
399
|
});
|
|
400
400
|
const s = o.getUngroupDrawingOp(e), { unitId: a, subUnitId: c, undo: u, redo: d, objects: l } = s;
|
|
401
|
-
return n.syncExecuteCommand(b.id, { op: d, unitId: a, subUnitId: c, objects: l, type:
|
|
401
|
+
return n.syncExecuteCommand(b.id, { op: d, unitId: a, subUnitId: c, objects: l, type: P.UNGROUP }) ? (t.pushUndoRedo({
|
|
402
402
|
unitID: a,
|
|
403
403
|
undoMutations: [
|
|
404
|
-
{ id: b.id, params: { op: u, unitId: a, subUnitId: c, objects:
|
|
404
|
+
{ id: b.id, params: { op: u, unitId: a, subUnitId: c, objects: Zn(l), type: P.GROUP } },
|
|
405
405
|
{ id: N.id, params: i }
|
|
406
406
|
],
|
|
407
407
|
redoMutations: [
|
|
408
|
-
{ id: b.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type:
|
|
408
|
+
{ id: b.id, params: { op: d, unitId: a, subUnitId: c, objects: l, type: P.UNGROUP } },
|
|
409
409
|
{ id: N.id, params: i }
|
|
410
410
|
]
|
|
411
411
|
}), !0) : !1;
|
|
412
412
|
}
|
|
413
413
|
};
|
|
414
|
-
function
|
|
414
|
+
function x(r, e) {
|
|
415
415
|
const { from: n, to: t } = r, { column: o, columnOffset: i, row: s, rowOffset: a } = n, { column: c, columnOffset: u, row: d, rowOffset: l } = t, h = e.attachRangeWithCoord({
|
|
416
416
|
startColumn: o,
|
|
417
417
|
endColumn: o,
|
|
@@ -428,13 +428,13 @@ function G(r, e) {
|
|
|
428
428
|
});
|
|
429
429
|
if (m == null)
|
|
430
430
|
return;
|
|
431
|
-
const { startX:
|
|
432
|
-
let R = J(_ + u - C, 1),
|
|
433
|
-
return h.startX === m.endX && (R = 0), h.startY === m.endY && (
|
|
431
|
+
const { startX: f, startY: g } = h, { startX: _, startY: I } = m, C = J(f + i, 1), v = J(g + a, 1);
|
|
432
|
+
let R = J(_ + u - C, 1), w = J(I + l - v, 1);
|
|
433
|
+
return h.startX === m.endX && (R = 0), h.startY === m.endY && (w = 0), {
|
|
434
434
|
left: C,
|
|
435
435
|
top: v,
|
|
436
436
|
width: R,
|
|
437
|
-
height:
|
|
437
|
+
height: w
|
|
438
438
|
};
|
|
439
439
|
}
|
|
440
440
|
function A(r, e) {
|
|
@@ -460,12 +460,12 @@ function A(r, e) {
|
|
|
460
460
|
to: u
|
|
461
461
|
};
|
|
462
462
|
}
|
|
463
|
-
var
|
|
464
|
-
for (var o = t > 1 ? void 0 : t ?
|
|
463
|
+
var Qn = Object.defineProperty, er = Object.getOwnPropertyDescriptor, tr = (r, e, n, t) => {
|
|
464
|
+
for (var o = t > 1 ? void 0 : t ? er(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
465
465
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
466
|
-
return t && o &&
|
|
467
|
-
},
|
|
468
|
-
let
|
|
466
|
+
return t && o && Qn(e, n, o), o;
|
|
467
|
+
}, V = (r, e) => (n, t) => e(n, t, r);
|
|
468
|
+
let Ie = class extends ge {
|
|
469
469
|
constructor(r, e, n, t, o, i, s, a, c, u, d) {
|
|
470
470
|
super(), this._commandService = r, this._univerInstanceService = e, this._selectionManagerService = n, this._selectionRenderService = t, this._imageIoService = o, this._sheetDrawingService = i, this._drawingManagerService = s, this._contextService = a, this._messageService = c, this._localeService = u, this._renderManagerService = d, this._init();
|
|
471
471
|
}
|
|
@@ -478,19 +478,19 @@ let ve = class extends Me {
|
|
|
478
478
|
_initCommandListeners() {
|
|
479
479
|
this.disposeWithMe(
|
|
480
480
|
this._commandService.onCommandExecuted(async (r) => {
|
|
481
|
-
if (r.id ===
|
|
481
|
+
if (r.id === Oe.id || r.id === Ee.id) {
|
|
482
482
|
const e = r.params;
|
|
483
483
|
if (e.files == null)
|
|
484
484
|
return;
|
|
485
485
|
const n = e.files.length;
|
|
486
|
-
if (n >
|
|
486
|
+
if (n > ze) {
|
|
487
487
|
this._messageService.show({
|
|
488
|
-
type:
|
|
489
|
-
content: this._localeService.t("update-status.exceedMaxCount", String(
|
|
488
|
+
type: _e.Error,
|
|
489
|
+
content: this._localeService.t("update-status.exceedMaxCount", String(ze))
|
|
490
490
|
});
|
|
491
491
|
return;
|
|
492
492
|
}
|
|
493
|
-
this._imageIoService.setWaitCount(n), r.id ===
|
|
493
|
+
this._imageIoService.setWaitCount(n), r.id === Oe.id ? e.files.forEach(async (t) => {
|
|
494
494
|
await this._insertCellImage(t);
|
|
495
495
|
}) : e.files.forEach(async (t) => {
|
|
496
496
|
await this._insertFloatImage(t);
|
|
@@ -507,14 +507,14 @@ let ve = class extends Me {
|
|
|
507
507
|
e = await this._imageIoService.saveImage(r);
|
|
508
508
|
} catch (C) {
|
|
509
509
|
const v = C.message;
|
|
510
|
-
v ===
|
|
511
|
-
type:
|
|
512
|
-
content: this._localeService.t("update-status.exceedMaxSize", String(
|
|
513
|
-
}) : v ===
|
|
514
|
-
type:
|
|
510
|
+
v === Le.ERROR_EXCEED_SIZE ? this._messageService.show({
|
|
511
|
+
type: _e.Error,
|
|
512
|
+
content: this._localeService.t("update-status.exceedMaxSize", String(en / (1024 * 1024)))
|
|
513
|
+
}) : v === Le.ERROR_IMAGE_TYPE ? this._messageService.show({
|
|
514
|
+
type: _e.Error,
|
|
515
515
|
content: this._localeService.t("update-status.invalidImageType")
|
|
516
|
-
}) : v ===
|
|
517
|
-
type:
|
|
516
|
+
}) : v === Le.ERROR_IMAGE && this._messageService.show({
|
|
517
|
+
type: _e.Error,
|
|
518
518
|
content: this._localeService.t("update-status.invalidImage")
|
|
519
519
|
});
|
|
520
520
|
}
|
|
@@ -523,30 +523,30 @@ let ve = class extends Me {
|
|
|
523
523
|
const n = this._getUnitInfo();
|
|
524
524
|
if (n == null)
|
|
525
525
|
return;
|
|
526
|
-
const { unitId: t, subUnitId: o } = n, { imageId: i, imageSourceType: s, source: a, base64Cache: c } = e, { width: u, height: d, image: l } = await
|
|
526
|
+
const { unitId: t, subUnitId: o } = n, { imageId: i, imageSourceType: s, source: a, base64Cache: c } = e, { width: u, height: d, image: l } = await tn(c || ""), h = this._renderManagerService.getRenderById(t);
|
|
527
527
|
if (h == null)
|
|
528
528
|
return;
|
|
529
|
-
const { width: m, height:
|
|
529
|
+
const { width: m, height: f } = h.scene;
|
|
530
530
|
this._imageIoService.addImageSourceCache(a, s, l);
|
|
531
531
|
let g = 1;
|
|
532
|
-
if (u >
|
|
533
|
-
const C =
|
|
532
|
+
if (u > Ke || d > Je) {
|
|
533
|
+
const C = Ke / u, v = Je / d;
|
|
534
534
|
g = Math.max(C, v);
|
|
535
535
|
}
|
|
536
|
-
const _ = this._getImagePosition(u * g, d * g, m,
|
|
536
|
+
const _ = this._getImagePosition(u * g, d * g, m, f);
|
|
537
537
|
if (_ == null)
|
|
538
538
|
return;
|
|
539
539
|
const I = {
|
|
540
540
|
unitId: t,
|
|
541
541
|
subUnitId: o,
|
|
542
542
|
drawingId: i,
|
|
543
|
-
drawingType:
|
|
543
|
+
drawingType: ye.DRAWING_IMAGE,
|
|
544
544
|
imageSourceType: s,
|
|
545
545
|
source: a,
|
|
546
|
-
transform:
|
|
546
|
+
transform: x(_, this._selectionRenderService),
|
|
547
547
|
sheetTransform: _
|
|
548
548
|
};
|
|
549
|
-
this._commandService.executeCommand(
|
|
549
|
+
this._commandService.executeCommand(He.id, {
|
|
550
550
|
unitId: t,
|
|
551
551
|
drawings: [I]
|
|
552
552
|
});
|
|
@@ -591,7 +591,7 @@ let ve = class extends Me {
|
|
|
591
591
|
}, m = this._selectionRenderService.getSelectionCellByPosition(u + r, d + e);
|
|
592
592
|
if (m == null)
|
|
593
593
|
return;
|
|
594
|
-
const
|
|
594
|
+
const f = {
|
|
595
595
|
column: m.actualColumn,
|
|
596
596
|
columnOffset: u + r - m.startX,
|
|
597
597
|
row: m.actualRow,
|
|
@@ -599,13 +599,13 @@ let ve = class extends Me {
|
|
|
599
599
|
};
|
|
600
600
|
return {
|
|
601
601
|
from: h,
|
|
602
|
-
to:
|
|
602
|
+
to: f
|
|
603
603
|
};
|
|
604
604
|
}
|
|
605
605
|
_updateOrderListener() {
|
|
606
606
|
this._drawingManagerService.featurePluginOrderUpdate$.subscribe((r) => {
|
|
607
607
|
const { unitId: e, subUnitId: n, drawingIds: t, arrangeType: o } = r;
|
|
608
|
-
this._commandService.executeCommand(
|
|
608
|
+
this._commandService.executeCommand(Mt.id, {
|
|
609
609
|
unitId: e,
|
|
610
610
|
subUnitId: n,
|
|
611
611
|
drawingIds: t,
|
|
@@ -628,11 +628,11 @@ let ve = class extends Me {
|
|
|
628
628
|
return;
|
|
629
629
|
const d = {
|
|
630
630
|
...n,
|
|
631
|
-
transform: { ...c.transform, ...a, ...
|
|
631
|
+
transform: { ...c.transform, ...a, ...x(u, this._selectionRenderService) },
|
|
632
632
|
sheetTransform: { ...u }
|
|
633
633
|
};
|
|
634
634
|
e.push(d);
|
|
635
|
-
}), e.length > 0 && this._commandService.executeCommand(
|
|
635
|
+
}), e.length > 0 && this._commandService.executeCommand(Ue.id, {
|
|
636
636
|
unitId: r[0].unitId,
|
|
637
637
|
drawings: e
|
|
638
638
|
}));
|
|
@@ -640,45 +640,45 @@ let ve = class extends Me {
|
|
|
640
640
|
}
|
|
641
641
|
_groupDrawingListener() {
|
|
642
642
|
this._drawingManagerService.featurePluginGroupUpdate$.subscribe((r) => {
|
|
643
|
-
this._commandService.executeCommand(
|
|
643
|
+
this._commandService.executeCommand(Ot.id, r);
|
|
644
644
|
const { unitId: e, subUnitId: n, drawingId: t } = r[0].parent;
|
|
645
645
|
this._drawingManagerService.focusDrawing([{ unitId: e, subUnitId: n, drawingId: t }]);
|
|
646
646
|
}), this._drawingManagerService.featurePluginUngroupUpdate$.subscribe((r) => {
|
|
647
|
-
this._commandService.executeCommand(
|
|
647
|
+
this._commandService.executeCommand(bt.id, r);
|
|
648
648
|
});
|
|
649
649
|
}
|
|
650
650
|
_focusDrawingListener() {
|
|
651
651
|
this.disposeWithMe(
|
|
652
652
|
this._drawingManagerService.focus$.subscribe((r) => {
|
|
653
|
-
r == null || r.length === 0 ? (this._contextService.setContextValue(
|
|
653
|
+
r == null || r.length === 0 ? (this._contextService.setContextValue(le, !1), this._sheetDrawingService.focusDrawing([])) : (this._contextService.setContextValue(le, !0), this._sheetDrawingService.focusDrawing(r));
|
|
654
654
|
})
|
|
655
655
|
);
|
|
656
656
|
}
|
|
657
657
|
};
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
664
|
-
|
|
665
|
-
|
|
666
|
-
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
],
|
|
672
|
-
var
|
|
673
|
-
return
|
|
658
|
+
Ie = tr([
|
|
659
|
+
me(he.Rendered, Ie),
|
|
660
|
+
V(0, B),
|
|
661
|
+
V(1, ue),
|
|
662
|
+
V(2, W(Pn)),
|
|
663
|
+
V(3, Te),
|
|
664
|
+
V(4, nt),
|
|
665
|
+
V(5, Y),
|
|
666
|
+
V(6, k),
|
|
667
|
+
V(7, tt),
|
|
668
|
+
V(8, Sn),
|
|
669
|
+
V(9, W(de)),
|
|
670
|
+
V(10, se)
|
|
671
|
+
], Ie);
|
|
672
|
+
var F = function() {
|
|
673
|
+
return F = Object.assign || function(r) {
|
|
674
674
|
for (var e, n = 1, t = arguments.length; n < t; n++) {
|
|
675
675
|
e = arguments[n];
|
|
676
676
|
for (var o in e)
|
|
677
677
|
Object.prototype.hasOwnProperty.call(e, o) && (r[o] = e[o]);
|
|
678
678
|
}
|
|
679
679
|
return r;
|
|
680
|
-
},
|
|
681
|
-
},
|
|
680
|
+
}, F.apply(this, arguments);
|
|
681
|
+
}, nr = function(r, e) {
|
|
682
682
|
var n = {};
|
|
683
683
|
for (var t in r)
|
|
684
684
|
Object.prototype.hasOwnProperty.call(r, t) && e.indexOf(t) < 0 && (n[t] = r[t]);
|
|
@@ -686,17 +686,17 @@ var V = function() {
|
|
|
686
686
|
for (var o = 0, t = Object.getOwnPropertySymbols(r); o < t.length; o++)
|
|
687
687
|
e.indexOf(t[o]) < 0 && Object.prototype.propertyIsEnumerable.call(r, t[o]) && (n[t[o]] = r[t[o]]);
|
|
688
688
|
return n;
|
|
689
|
-
},
|
|
690
|
-
var n = r.icon, t = r.id, o = r.className, i = r.extend, s =
|
|
691
|
-
return
|
|
689
|
+
}, Pt = vt(function(r, e) {
|
|
690
|
+
var n = r.icon, t = r.id, o = r.className, i = r.extend, s = nr(r, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(o || "").trim(), c = St("_".concat(ir()));
|
|
691
|
+
return yt(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, F({ ref: e, className: a }, s), i);
|
|
692
692
|
});
|
|
693
|
-
function
|
|
694
|
-
return
|
|
695
|
-
return
|
|
693
|
+
function yt(r, e, n, t, o) {
|
|
694
|
+
return Ct(r.tag, F(F({ key: e }, rr(r, n, o)), t), (or(r, n).children || []).map(function(i, s) {
|
|
695
|
+
return yt(i, "".concat(e, "-").concat(r.tag, "-").concat(s), n, void 0, o);
|
|
696
696
|
}));
|
|
697
697
|
}
|
|
698
|
-
function
|
|
699
|
-
var t =
|
|
698
|
+
function rr(r, e, n) {
|
|
699
|
+
var t = F({}, r.attrs);
|
|
700
700
|
n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
|
|
701
701
|
var o = e.defIds;
|
|
702
702
|
return !o || o.length === 0 || (r.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(i) {
|
|
@@ -704,197 +704,197 @@ function Fn(r, e, n) {
|
|
|
704
704
|
typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
|
|
705
705
|
})), t;
|
|
706
706
|
}
|
|
707
|
-
function
|
|
707
|
+
function or(r, e) {
|
|
708
708
|
var n, t = e.defIds;
|
|
709
|
-
return !t || t.length === 0 ? r : r.tag === "defs" && (!((n = r.children) === null || n === void 0) && n.length) ?
|
|
710
|
-
return typeof o.attrs.id == "string" && t && t.indexOf(o.attrs.id) > -1 ?
|
|
709
|
+
return !t || t.length === 0 ? r : r.tag === "defs" && (!((n = r.children) === null || n === void 0) && n.length) ? F(F({}, r), { children: r.children.map(function(o) {
|
|
710
|
+
return typeof o.attrs.id == "string" && t && t.indexOf(o.attrs.id) > -1 ? F(F({}, o), { attrs: F(F({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
|
|
711
711
|
}) }) : r;
|
|
712
712
|
}
|
|
713
|
-
function
|
|
713
|
+
function ir() {
|
|
714
714
|
return Math.random().toString(36).substring(2, 8);
|
|
715
715
|
}
|
|
716
|
-
|
|
717
|
-
var
|
|
718
|
-
return
|
|
716
|
+
Pt.displayName = "UniverIcon";
|
|
717
|
+
var sr = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M2.2498 3.65005C2.2498 2.87685 2.87661 2.25005 3.64981 2.25005H7.9998C8.33118 2.25005 8.5998 1.98142 8.5998 1.65005C8.5998 1.31868 8.33118 1.05005 7.9998 1.05005H3.64981C2.21387 1.05005 1.0498 2.21411 1.0498 3.65005V12.35C1.0498 13.786 2.21386 14.95 3.6498 14.95H12.3498C13.7857 14.95 14.9498 13.786 14.9498 12.3501V8.00005C14.9498 7.66868 14.6812 7.40005 14.3498 7.40005C14.0184 7.40005 13.7498 7.66868 13.7498 8.00005V9.23974L12.2385 8.1063C11.7252 7.72129 11.0068 7.7723 10.5531 8.22605L9.00869 9.77041L6.73916 7.8251C6.24387 7.40055 5.5095 7.41278 5.02864 7.85359L2.2498 10.4009V3.65005ZM2.2498 12.0287V12.35C2.2498 13.1232 2.87661 13.75 3.6498 13.75H12.3498C13.123 13.75 13.7498 13.1232 13.7498 12.3501V10.7397L11.5186 9.06631C11.4829 9.03956 11.433 9.04314 11.4016 9.07458L9.92249 10.5537L11.1015 11.5642C11.3531 11.7799 11.3822 12.1587 11.1666 12.4103C10.9509 12.6619 10.5721 12.691 10.3205 12.4753L5.9582 8.7362C5.92384 8.70674 5.87288 8.70758 5.83952 8.73816L2.2498 12.0287Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.8097 1.14783C12.1411 1.14783 12.4097 1.41646 12.4097 1.74783V3.297H14.1541C14.4855 3.297 14.7541 3.56563 14.7541 3.897C14.7541 4.22837 14.4855 4.497 14.1541 4.497H12.4097V6.24167C12.4097 6.57304 12.1411 6.84167 11.8097 6.84167C11.4783 6.84167 11.2097 6.57304 11.2097 6.24167V4.497H9.6603C9.32893 4.497 9.0603 4.22837 9.0603 3.897C9.0603 3.56563 9.32893 3.297 9.6603 3.297H11.2097V1.74783C11.2097 1.41646 11.4783 1.14783 11.8097 1.14783Z" } }] }, Tt = vt(function(r, e) {
|
|
718
|
+
return Ct(Pt, Object.assign({}, r, {
|
|
719
719
|
id: "add-image-single",
|
|
720
720
|
ref: e,
|
|
721
|
-
icon:
|
|
721
|
+
icon: sr
|
|
722
722
|
}));
|
|
723
723
|
});
|
|
724
|
-
|
|
725
|
-
const
|
|
726
|
-
uploadFileMenu:
|
|
727
|
-
uploadFileMenuInput:
|
|
728
|
-
},
|
|
729
|
-
var
|
|
730
|
-
const
|
|
731
|
-
const { type: e } = r, n = Z(
|
|
724
|
+
Tt.displayName = "AddImageSingle";
|
|
725
|
+
const ar = "univer-upload-file-menu", cr = "univer-upload-file-menu-input", Qe = {
|
|
726
|
+
uploadFileMenu: ar,
|
|
727
|
+
uploadFileMenuInput: cr
|
|
728
|
+
}, Et = "COMPONENT_UPLOAD_FILE_MENU";
|
|
729
|
+
var be = /* @__PURE__ */ ((r) => (r[r.cellImage = 0] = "cellImage", r[r.floatImage = 1] = "floatImage", r))(be || {});
|
|
730
|
+
const lr = (r) => {
|
|
731
|
+
const { type: e } = r, n = Z(B), t = St(null), o = () => {
|
|
732
732
|
var a;
|
|
733
733
|
(a = t.current) == null || a.click();
|
|
734
|
-
}, i =
|
|
734
|
+
}, i = nn.map((a) => `.${a.replace("image/", "")}`).join(","), s = (a) => {
|
|
735
735
|
const c = a.target.files;
|
|
736
736
|
if (c == null)
|
|
737
737
|
return;
|
|
738
738
|
const u = Array.from(c);
|
|
739
|
-
e ===
|
|
739
|
+
e === be.floatImage ? n.executeCommand(Ee.id, { files: u }) : e === be.cellImage && n.executeCommand(Oe.id, { files: u }), t.current && (t.current.value = "");
|
|
740
740
|
};
|
|
741
|
-
return /* @__PURE__ */
|
|
741
|
+
return /* @__PURE__ */ L.createElement("div", { onClick: o, className: Qe.uploadFileMenu }, /* @__PURE__ */ L.createElement(
|
|
742
742
|
"input",
|
|
743
743
|
{
|
|
744
744
|
type: "file",
|
|
745
|
-
className:
|
|
745
|
+
className: Qe.uploadFileMenuInput,
|
|
746
746
|
ref: t,
|
|
747
747
|
onChange: s,
|
|
748
748
|
accept: i,
|
|
749
749
|
multiple: !0
|
|
750
750
|
}
|
|
751
751
|
));
|
|
752
|
-
},
|
|
753
|
-
function
|
|
752
|
+
}, Ut = "addition-and-subtraction-single", At = "sheet.menu.image";
|
|
753
|
+
function dr(r) {
|
|
754
754
|
return {
|
|
755
|
-
id:
|
|
756
|
-
type:
|
|
757
|
-
positions: [
|
|
758
|
-
group:
|
|
759
|
-
icon:
|
|
755
|
+
id: At,
|
|
756
|
+
type: rt.SUBITEMS,
|
|
757
|
+
positions: [Cn.TOOLBAR_START],
|
|
758
|
+
group: Rn.TOOLBAR_FORMULAS_INSERT,
|
|
759
|
+
icon: Ut,
|
|
760
760
|
tooltip: "sheetImage.title",
|
|
761
|
-
hidden$:
|
|
761
|
+
hidden$: ot(r, ee.UNIVER_SHEET),
|
|
762
|
+
disabled$: un(r, { workbookTypes: [yn], worksheetTypes: [Tn], rangeTypes: [En] })
|
|
762
763
|
};
|
|
763
764
|
}
|
|
764
|
-
function
|
|
765
|
+
function ur(r) {
|
|
765
766
|
return {
|
|
766
|
-
id:
|
|
767
|
+
id: Ee.id,
|
|
767
768
|
title: "sheetImage.upload.float",
|
|
768
|
-
type:
|
|
769
|
+
type: rt.SELECTOR,
|
|
769
770
|
label: {
|
|
770
|
-
name:
|
|
771
|
+
name: Et,
|
|
771
772
|
props: {
|
|
772
|
-
type:
|
|
773
|
+
type: be.floatImage
|
|
773
774
|
}
|
|
774
775
|
},
|
|
775
|
-
positions: [
|
|
776
|
-
|
|
777
|
-
hidden$: tt(r, ee.UNIVER_SHEET)
|
|
776
|
+
positions: [At],
|
|
777
|
+
hidden$: ot(r, ee.UNIVER_SHEET)
|
|
778
778
|
};
|
|
779
779
|
}
|
|
780
|
-
const
|
|
781
|
-
imageCommonPanel:
|
|
782
|
-
imageCommonPanelGrid:
|
|
783
|
-
imageCommonPanelBorder:
|
|
784
|
-
imageCommonPanelTitle:
|
|
785
|
-
imageCommonPanelRow:
|
|
786
|
-
imageCommonPanelRowVertical:
|
|
787
|
-
imageCommonPanelColumn:
|
|
788
|
-
imageCommonPanelColumnCenter:
|
|
789
|
-
imageCommonPanelInline:
|
|
790
|
-
imageCommonPanelSpan2:
|
|
791
|
-
imageCommonPanelSpan3:
|
|
792
|
-
imageCommonPanelInput:
|
|
793
|
-
sheetImageMenu:
|
|
794
|
-
sheetImageMenuInput:
|
|
795
|
-
},
|
|
780
|
+
const mr = "univer-image-common-panel", hr = "univer-image-common-panel-grid", gr = "univer-image-common-panel-border", fr = "univer-image-common-panel-title", pr = "univer-image-common-panel-row", wr = "univer-image-common-panel-row-vertical", _r = "univer-image-common-panel-column", vr = "univer-image-common-panel-column-center", Sr = "univer-image-common-panel-inline", Cr = "univer-image-common-panel-span2", Rr = "univer-image-common-panel-span3", Ir = "univer-image-common-panel-input", Dr = "univer-sheet-image-menu", Mr = "univer-sheet-image-menu-input", z = {
|
|
781
|
+
imageCommonPanel: mr,
|
|
782
|
+
imageCommonPanelGrid: hr,
|
|
783
|
+
imageCommonPanelBorder: gr,
|
|
784
|
+
imageCommonPanelTitle: fr,
|
|
785
|
+
imageCommonPanelRow: pr,
|
|
786
|
+
imageCommonPanelRowVertical: wr,
|
|
787
|
+
imageCommonPanelColumn: _r,
|
|
788
|
+
imageCommonPanelColumnCenter: vr,
|
|
789
|
+
imageCommonPanelInline: Sr,
|
|
790
|
+
imageCommonPanelSpan2: Cr,
|
|
791
|
+
imageCommonPanelSpan3: Rr,
|
|
792
|
+
imageCommonPanelInput: Ir,
|
|
793
|
+
sheetImageMenu: Dr,
|
|
794
|
+
sheetImageMenuInput: Mr
|
|
795
|
+
}, Or = (r) => {
|
|
796
796
|
var v;
|
|
797
|
-
const e = Z(
|
|
797
|
+
const e = Z(B), n = Z(de), t = Z(k), o = Z(se), { drawings: i } = r, s = i[0];
|
|
798
798
|
if (s == null)
|
|
799
799
|
return;
|
|
800
800
|
const { unitId: a } = s, c = o.getRenderById(a), u = c == null ? void 0 : c.scene;
|
|
801
801
|
if (u == null)
|
|
802
802
|
return;
|
|
803
|
-
const d = u.getTransformerByCreate(), [l, h] =
|
|
804
|
-
function _(R,
|
|
803
|
+
const d = u.getTransformerByCreate(), [l, h] = $e(!0), m = (v = s.anchorType) != null ? v : O.Position, [f, g] = $e(m);
|
|
804
|
+
function _(R, w) {
|
|
805
805
|
const M = [];
|
|
806
|
-
return R.forEach((
|
|
807
|
-
const { oKey:
|
|
806
|
+
return R.forEach((p) => {
|
|
807
|
+
const { oKey: T } = p, D = w.getDrawingOKey(T);
|
|
808
808
|
if (D == null)
|
|
809
809
|
return M.push(null), !0;
|
|
810
|
-
const { unitId:
|
|
810
|
+
const { unitId: E, subUnitId: U, drawingId: y, drawingType: S, anchorType: j, sheetTransform: X } = D;
|
|
811
811
|
M.push({
|
|
812
|
-
unitId:
|
|
812
|
+
unitId: E,
|
|
813
813
|
subUnitId: U,
|
|
814
|
-
drawingId:
|
|
815
|
-
anchorType:
|
|
816
|
-
sheetTransform:
|
|
814
|
+
drawingId: y,
|
|
815
|
+
anchorType: j,
|
|
816
|
+
sheetTransform: X,
|
|
817
817
|
drawingType: S
|
|
818
818
|
});
|
|
819
819
|
}), M;
|
|
820
820
|
}
|
|
821
|
-
|
|
821
|
+
Ye(() => {
|
|
822
822
|
const R = d.onClearControlObservable.add((M) => {
|
|
823
823
|
M === !0 && h(!1);
|
|
824
|
-
}),
|
|
824
|
+
}), w = d.onChangeStartObservable.add((M) => {
|
|
825
825
|
var D;
|
|
826
|
-
const { objects:
|
|
827
|
-
if (
|
|
826
|
+
const { objects: p } = M, T = _(p, t);
|
|
827
|
+
if (T.length === 0)
|
|
828
828
|
h(!1);
|
|
829
|
-
else if (
|
|
829
|
+
else if (T.length >= 1) {
|
|
830
830
|
h(!0);
|
|
831
|
-
const
|
|
832
|
-
g(
|
|
831
|
+
const E = ((D = T[0]) == null ? void 0 : D.anchorType) || O.Position;
|
|
832
|
+
g(E);
|
|
833
833
|
}
|
|
834
834
|
});
|
|
835
835
|
return () => {
|
|
836
|
-
|
|
836
|
+
w == null || w.dispose(), R == null || R.dispose();
|
|
837
837
|
};
|
|
838
838
|
}, []);
|
|
839
839
|
function I(R) {
|
|
840
840
|
g(R);
|
|
841
|
-
const
|
|
842
|
-
if (
|
|
841
|
+
const w = t.getFocusDrawings();
|
|
842
|
+
if (w.length === 0)
|
|
843
843
|
return;
|
|
844
|
-
const M =
|
|
845
|
-
unitId:
|
|
846
|
-
subUnitId:
|
|
847
|
-
drawingId:
|
|
844
|
+
const M = w.map((p) => ({
|
|
845
|
+
unitId: p.unitId,
|
|
846
|
+
subUnitId: p.subUnitId,
|
|
847
|
+
drawingId: p.drawingId,
|
|
848
848
|
anchorType: R
|
|
849
849
|
}));
|
|
850
|
-
e.executeCommand(
|
|
851
|
-
unitId:
|
|
850
|
+
e.executeCommand(Ue.id, {
|
|
851
|
+
unitId: w[0].unitId,
|
|
852
852
|
drawings: M
|
|
853
853
|
});
|
|
854
854
|
}
|
|
855
855
|
const C = (R) => R ? "block" : "none";
|
|
856
|
-
return /* @__PURE__ */
|
|
857
|
-
},
|
|
858
|
-
const r = Z(
|
|
856
|
+
return /* @__PURE__ */ L.createElement("div", { className: ve(z.imageCommonPanelGrid, z.imageCommonPanelBorder), style: { display: C(l) } }, /* @__PURE__ */ L.createElement("div", { className: z.imageCommonPanelRow }, /* @__PURE__ */ L.createElement("div", { className: ve(z.imageCommonPanelColumn, z.imageCommonPanelTitle) }, /* @__PURE__ */ L.createElement("div", null, n.t("drawing-anchor.title")))), /* @__PURE__ */ L.createElement("div", { className: ve(z.imageCommonPanelRow) }, /* @__PURE__ */ L.createElement("div", { className: ve(z.imageCommonPanelColumn) }, /* @__PURE__ */ L.createElement($n, { value: f, onChange: I, direction: "vertical" }, /* @__PURE__ */ L.createElement(je, { value: O.Both }, n.t("drawing-anchor.both")), /* @__PURE__ */ L.createElement(je, { value: O.Position }, n.t("drawing-anchor.position")), /* @__PURE__ */ L.createElement(je, { value: O.None }, n.t("drawing-anchor.none"))))));
|
|
857
|
+
}, br = () => {
|
|
858
|
+
const r = Z(k), e = r.getFocusDrawings();
|
|
859
859
|
if (e == null || e.length === 0)
|
|
860
860
|
return;
|
|
861
|
-
const [n, t] =
|
|
862
|
-
return
|
|
861
|
+
const [n, t] = $e(e);
|
|
862
|
+
return Ye(() => {
|
|
863
863
|
const o = r.focus$.subscribe((i) => {
|
|
864
864
|
t(i);
|
|
865
865
|
});
|
|
866
866
|
return () => {
|
|
867
867
|
o.unsubscribe();
|
|
868
868
|
};
|
|
869
|
-
}, []), /* @__PURE__ */
|
|
870
|
-
},
|
|
869
|
+
}, []), /* @__PURE__ */ L.createElement("div", { className: z.imageCommonPanel }, /* @__PURE__ */ L.createElement(Jt, { drawings: n }), /* @__PURE__ */ L.createElement(Or, { drawings: n }));
|
|
870
|
+
}, fe = {
|
|
871
871
|
id: "sheet.command.move-drawing",
|
|
872
872
|
type: $.COMMAND,
|
|
873
873
|
handler: (r, e) => {
|
|
874
|
-
const n = r.get(
|
|
874
|
+
const n = r.get(B), t = r.get(Y), o = r.get(Te), { direction: i } = e, s = t.getFocusDrawings();
|
|
875
875
|
if (s.length === 0)
|
|
876
876
|
return !1;
|
|
877
877
|
const a = s[0].unitId, c = s.map((d) => {
|
|
878
878
|
const { transform: l } = d;
|
|
879
879
|
if (l == null)
|
|
880
880
|
return null;
|
|
881
|
-
const h = { ...l }, { left: m = 0, top:
|
|
882
|
-
return i === K.UP ? h.top =
|
|
881
|
+
const h = { ...l }, { left: m = 0, top: f = 0 } = l;
|
|
882
|
+
return i === K.UP ? h.top = f - 1 : i === K.DOWN ? h.top = f + 1 : i === K.LEFT ? h.left = m - 1 : i === K.RIGHT && (h.left = m + 1), {
|
|
883
883
|
...d,
|
|
884
884
|
transform: h,
|
|
885
885
|
sheetTransform: A(h, o)
|
|
886
886
|
};
|
|
887
887
|
}).filter((d) => d != null);
|
|
888
|
-
return n.syncExecuteCommand(
|
|
888
|
+
return n.syncExecuteCommand(Ue.id, {
|
|
889
889
|
unitId: a,
|
|
890
890
|
drawings: c
|
|
891
891
|
}) ? (n.syncExecuteCommand(N.id, [a]), !0) : !1;
|
|
892
892
|
}
|
|
893
|
-
},
|
|
893
|
+
}, Nt = {
|
|
894
894
|
id: "sheet.command.delete-drawing",
|
|
895
895
|
type: $.COMMAND,
|
|
896
896
|
handler: (r) => {
|
|
897
|
-
const e = r.get(
|
|
897
|
+
const e = r.get(B), t = r.get(Y).getFocusDrawings();
|
|
898
898
|
if (t.length === 0)
|
|
899
899
|
return !1;
|
|
900
900
|
const o = t[0].unitId, i = t.map((s) => {
|
|
@@ -906,83 +906,83 @@ const qn = "univer-image-common-panel", Qn = "univer-image-common-panel-grid", e
|
|
|
906
906
|
drawingType: d
|
|
907
907
|
};
|
|
908
908
|
});
|
|
909
|
-
return e.executeCommand(
|
|
909
|
+
return e.executeCommand(Xe.id, {
|
|
910
910
|
unitId: o,
|
|
911
911
|
drawings: i
|
|
912
912
|
});
|
|
913
913
|
}
|
|
914
914
|
};
|
|
915
|
-
function
|
|
916
|
-
return !r.getContextValue(
|
|
915
|
+
function pe(r) {
|
|
916
|
+
return !r.getContextValue(xt) && !r.getContextValue($t) && r.getContextValue(le);
|
|
917
917
|
}
|
|
918
|
-
const
|
|
919
|
-
id:
|
|
918
|
+
const Pr = {
|
|
919
|
+
id: fe.id,
|
|
920
920
|
description: "shortcut.sheet.drawing-move-down",
|
|
921
921
|
group: "4_sheet-drawing-view",
|
|
922
|
-
binding:
|
|
922
|
+
binding: oe.ARROW_DOWN,
|
|
923
923
|
priority: 100,
|
|
924
|
-
preconditions:
|
|
924
|
+
preconditions: pe,
|
|
925
925
|
staticParameters: {
|
|
926
926
|
direction: K.DOWN
|
|
927
927
|
}
|
|
928
|
-
},
|
|
929
|
-
id:
|
|
928
|
+
}, yr = {
|
|
929
|
+
id: fe.id,
|
|
930
930
|
description: "shortcut.sheet.drawing-move-up",
|
|
931
931
|
group: "4_sheet-drawing-view",
|
|
932
|
-
binding:
|
|
932
|
+
binding: oe.ARROW_UP,
|
|
933
933
|
priority: 100,
|
|
934
|
-
preconditions:
|
|
934
|
+
preconditions: pe,
|
|
935
935
|
staticParameters: {
|
|
936
936
|
direction: K.UP
|
|
937
937
|
}
|
|
938
|
-
},
|
|
939
|
-
id:
|
|
938
|
+
}, Tr = {
|
|
939
|
+
id: fe.id,
|
|
940
940
|
description: "shortcut.sheet.drawing-move-left",
|
|
941
941
|
group: "4_sheet-drawing-view",
|
|
942
|
-
binding:
|
|
942
|
+
binding: oe.ARROW_LEFT,
|
|
943
943
|
priority: 100,
|
|
944
|
-
preconditions:
|
|
944
|
+
preconditions: pe,
|
|
945
945
|
staticParameters: {
|
|
946
946
|
direction: K.LEFT
|
|
947
947
|
}
|
|
948
|
-
},
|
|
949
|
-
id:
|
|
948
|
+
}, Er = {
|
|
949
|
+
id: fe.id,
|
|
950
950
|
description: "shortcut.sheet.drawing-move-right",
|
|
951
951
|
group: "4_sheet-drawing-view",
|
|
952
|
-
binding:
|
|
952
|
+
binding: oe.ARROW_RIGHT,
|
|
953
953
|
priority: 100,
|
|
954
|
-
preconditions:
|
|
954
|
+
preconditions: pe,
|
|
955
955
|
staticParameters: {
|
|
956
956
|
direction: K.RIGHT
|
|
957
957
|
}
|
|
958
|
-
},
|
|
959
|
-
id:
|
|
958
|
+
}, Ur = {
|
|
959
|
+
id: Nt.id,
|
|
960
960
|
description: "shortcut.sheet.drawing-delete",
|
|
961
961
|
group: "4_sheet-drawing-view",
|
|
962
962
|
// when focusing on any other input tag do not trigger this shortcut
|
|
963
|
-
preconditions:
|
|
964
|
-
binding:
|
|
965
|
-
mac:
|
|
963
|
+
preconditions: pe,
|
|
964
|
+
binding: oe.DELETE,
|
|
965
|
+
mac: oe.BACKSPACE
|
|
966
966
|
};
|
|
967
|
-
var
|
|
968
|
-
for (var o = t > 1 ? void 0 : t ?
|
|
967
|
+
var Ar = Object.defineProperty, Nr = Object.getOwnPropertyDescriptor, Lr = (r, e, n, t) => {
|
|
968
|
+
for (var o = t > 1 ? void 0 : t ? Nr(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
969
969
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
970
|
-
return t && o &&
|
|
971
|
-
},
|
|
972
|
-
const
|
|
973
|
-
let
|
|
970
|
+
return t && o && Ar(e, n, o), o;
|
|
971
|
+
}, ae = (r, e) => (n, t) => e(n, t, r);
|
|
972
|
+
const jr = {};
|
|
973
|
+
let ce = class extends ge {
|
|
974
974
|
constructor(r, e, n, t, o, i) {
|
|
975
975
|
super(), this._config = r, this._injector = e, this._componentManager = n, this._menuService = t, this._commandService = o, this._shortcutService = i, this._init();
|
|
976
976
|
}
|
|
977
977
|
_initCustomComponents() {
|
|
978
978
|
const r = this._componentManager;
|
|
979
|
-
this.disposeWithMe(r.register(
|
|
979
|
+
this.disposeWithMe(r.register(Ut, Tt)), this.disposeWithMe(r.register(Et, lr)), this.disposeWithMe(r.register(Rt, br));
|
|
980
980
|
}
|
|
981
981
|
_initMenus() {
|
|
982
982
|
const { menu: r = {} } = this._config;
|
|
983
983
|
[
|
|
984
|
-
|
|
985
|
-
|
|
984
|
+
dr,
|
|
985
|
+
ur
|
|
986
986
|
// UploadCellImageMenuFactory,
|
|
987
987
|
].forEach((e) => {
|
|
988
988
|
this._menuService.addMenuItem(e(this._injector), r);
|
|
@@ -990,29 +990,29 @@ let se = class extends Me {
|
|
|
990
990
|
}
|
|
991
991
|
_initCommands() {
|
|
992
992
|
[
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
|
|
996
|
-
|
|
997
|
-
|
|
998
|
-
St,
|
|
999
|
-
N,
|
|
1000
|
-
Ct,
|
|
993
|
+
Ee,
|
|
994
|
+
Oe,
|
|
995
|
+
He,
|
|
996
|
+
Xe,
|
|
997
|
+
Ue,
|
|
1001
998
|
It,
|
|
999
|
+
N,
|
|
1002
1000
|
Dt,
|
|
1003
|
-
|
|
1004
|
-
|
|
1005
|
-
|
|
1001
|
+
Ot,
|
|
1002
|
+
bt,
|
|
1003
|
+
fe,
|
|
1004
|
+
Nt,
|
|
1005
|
+
Mt
|
|
1006
1006
|
].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
|
|
1007
1007
|
}
|
|
1008
1008
|
_initShortcuts() {
|
|
1009
1009
|
[
|
|
1010
1010
|
// sheet drawing shortcuts
|
|
1011
|
-
|
|
1012
|
-
|
|
1013
|
-
|
|
1014
|
-
|
|
1015
|
-
|
|
1011
|
+
Pr,
|
|
1012
|
+
yr,
|
|
1013
|
+
Tr,
|
|
1014
|
+
Er,
|
|
1015
|
+
Ur
|
|
1016
1016
|
].forEach((r) => {
|
|
1017
1017
|
this.disposeWithMe(this._shortcutService.registerShortcut(r));
|
|
1018
1018
|
});
|
|
@@ -1021,45 +1021,45 @@ let se = class extends Me {
|
|
|
1021
1021
|
this._initCommands(), this._initCustomComponents(), this._initMenus(), this._initShortcuts();
|
|
1022
1022
|
}
|
|
1023
1023
|
};
|
|
1024
|
-
|
|
1025
|
-
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1030
|
-
|
|
1031
|
-
],
|
|
1032
|
-
var
|
|
1033
|
-
for (var o = t > 1 ? void 0 : t ?
|
|
1024
|
+
ce = Lr([
|
|
1025
|
+
me(he.Rendered, ce),
|
|
1026
|
+
ae(1, W(Ve)),
|
|
1027
|
+
ae(2, W(In)),
|
|
1028
|
+
ae(3, Dn),
|
|
1029
|
+
ae(4, B),
|
|
1030
|
+
ae(5, Mn)
|
|
1031
|
+
], ce);
|
|
1032
|
+
var Wr = Object.defineProperty, Br = Object.getOwnPropertyDescriptor, Gr = (r, e, n, t) => {
|
|
1033
|
+
for (var o = t > 1 ? void 0 : t ? Br(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
1034
1034
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
1035
|
-
return t && o &&
|
|
1035
|
+
return t && o && Wr(e, n, o), o;
|
|
1036
1036
|
}, te = (r, e) => (n, t) => e(n, t, r);
|
|
1037
|
-
const
|
|
1038
|
-
nt.id,
|
|
1039
|
-
rt.id,
|
|
1040
|
-
ot.id,
|
|
1037
|
+
const xr = [
|
|
1041
1038
|
it.id,
|
|
1042
1039
|
st.id,
|
|
1043
1040
|
at.id,
|
|
1044
1041
|
ct.id,
|
|
1045
1042
|
lt.id,
|
|
1046
|
-
Ne.id,
|
|
1047
|
-
je.id,
|
|
1048
1043
|
dt.id,
|
|
1049
1044
|
ut.id,
|
|
1050
1045
|
mt.id,
|
|
1046
|
+
Ge.id,
|
|
1047
|
+
xe.id,
|
|
1051
1048
|
ht.id,
|
|
1052
1049
|
gt.id,
|
|
1053
|
-
ft.id
|
|
1054
|
-
|
|
1055
|
-
|
|
1056
|
-
|
|
1057
|
-
|
|
1058
|
-
|
|
1059
|
-
|
|
1060
|
-
|
|
1050
|
+
ft.id,
|
|
1051
|
+
pt.id,
|
|
1052
|
+
wt.id,
|
|
1053
|
+
_t.id
|
|
1054
|
+
], $r = [
|
|
1055
|
+
Un.id,
|
|
1056
|
+
An.id,
|
|
1057
|
+
Nn.id,
|
|
1058
|
+
Ln.id,
|
|
1059
|
+
jn.id,
|
|
1060
|
+
Wn.id
|
|
1061
1061
|
];
|
|
1062
|
-
let
|
|
1062
|
+
let De = class extends ge {
|
|
1063
1063
|
constructor(r, e, n, t, o, i) {
|
|
1064
1064
|
super(), this._commandService = r, this._sheetInterceptorService = e, this._sheetDrawingService = n, this._drawingManagerService = t, this._selectionRenderService = o, this._univerInstanceService = i, this._init();
|
|
1065
1065
|
}
|
|
@@ -1070,55 +1070,55 @@ let Se = class extends Me {
|
|
|
1070
1070
|
this.disposeWithMe(
|
|
1071
1071
|
this._sheetInterceptorService.interceptCommand({
|
|
1072
1072
|
getMutations: (r) => {
|
|
1073
|
-
if (!
|
|
1073
|
+
if (!xr.includes(r.id))
|
|
1074
1074
|
return { redos: [], undos: [] };
|
|
1075
1075
|
if (r.params == null)
|
|
1076
1076
|
return { redos: [], undos: [] };
|
|
1077
1077
|
const e = r.id;
|
|
1078
|
-
if (e ===
|
|
1078
|
+
if (e === it.id)
|
|
1079
1079
|
return this._moveRowInterceptor(r.params, "insert");
|
|
1080
|
-
if (e ===
|
|
1080
|
+
if (e === st.id)
|
|
1081
1081
|
return this._moveColInterceptor(r.params, "insert");
|
|
1082
|
-
if (e ===
|
|
1082
|
+
if (e === at.id)
|
|
1083
1083
|
return this._moveRowInterceptor(r.params, "remove");
|
|
1084
|
-
if (e ===
|
|
1084
|
+
if (e === ct.id)
|
|
1085
1085
|
return this._moveColInterceptor(r.params, "remove");
|
|
1086
|
-
if (e ===
|
|
1086
|
+
if (e === lt.id) {
|
|
1087
1087
|
const { range: n } = r.params;
|
|
1088
1088
|
return this._getRangeMoveUndo(
|
|
1089
1089
|
n,
|
|
1090
1090
|
0
|
|
1091
1091
|
/* deleteLeft */
|
|
1092
1092
|
);
|
|
1093
|
-
} else if (e ===
|
|
1093
|
+
} else if (e === dt.id) {
|
|
1094
1094
|
const { range: n } = r.params;
|
|
1095
1095
|
return this._getRangeMoveUndo(
|
|
1096
1096
|
n,
|
|
1097
1097
|
1
|
|
1098
1098
|
/* deleteUp */
|
|
1099
1099
|
);
|
|
1100
|
-
} else if (e ===
|
|
1100
|
+
} else if (e === ut.id) {
|
|
1101
1101
|
const { range: n } = r.params;
|
|
1102
1102
|
return this._getRangeMoveUndo(
|
|
1103
1103
|
n,
|
|
1104
1104
|
2
|
|
1105
1105
|
/* insertDown */
|
|
1106
1106
|
);
|
|
1107
|
-
} else if (e ===
|
|
1107
|
+
} else if (e === mt.id) {
|
|
1108
1108
|
const { range: n } = r.params;
|
|
1109
1109
|
return this._getRangeMoveUndo(
|
|
1110
1110
|
n,
|
|
1111
1111
|
3
|
|
1112
1112
|
/* insertRight */
|
|
1113
1113
|
);
|
|
1114
|
-
} else if (e ===
|
|
1114
|
+
} else if (e === ft.id || e === pt.id) {
|
|
1115
1115
|
const n = r.params, { unitId: t, subUnitId: o, ranges: i } = n;
|
|
1116
1116
|
return this._getDrawingUndoForRowVisible(t, o, i);
|
|
1117
|
-
} else if (e ===
|
|
1117
|
+
} else if (e === wt.id || e === _t.id) {
|
|
1118
1118
|
const n = r.params, { unitId: t, subUnitId: o, ranges: i } = n;
|
|
1119
1119
|
return this._getDrawingUndoForColVisible(t, o, i);
|
|
1120
|
-
} else if (e ===
|
|
1121
|
-
const n = r.params, { unitId: t, subUnitId: o, ranges: i } = n, s = e ===
|
|
1120
|
+
} else if (e === Ge.id || e === xe.id || e === ht.id || e === gt.id) {
|
|
1121
|
+
const n = r.params, { unitId: t, subUnitId: o, ranges: i } = n, s = e === Ge.id || e === xe.id;
|
|
1122
1122
|
return this._getDrawingUndoForRowAndColSize(t, o, i, s);
|
|
1123
1123
|
}
|
|
1124
1124
|
return { redos: [], undos: [] };
|
|
@@ -1127,7 +1127,7 @@ let Se = class extends Me {
|
|
|
1127
1127
|
);
|
|
1128
1128
|
}
|
|
1129
1129
|
_getRangeMoveUndo(r, e) {
|
|
1130
|
-
const n =
|
|
1130
|
+
const n = re(this._univerInstanceService);
|
|
1131
1131
|
if (n == null)
|
|
1132
1132
|
return { redos: [], undos: [] };
|
|
1133
1133
|
const t = n.unitId, o = n.subUnitId, i = [], s = [], a = this._sheetDrawingService.getDrawingData(t, o), c = [], u = [];
|
|
@@ -1138,11 +1138,11 @@ let Se = class extends Me {
|
|
|
1138
1138
|
return { redos: [], undos: [] };
|
|
1139
1139
|
if (c.length > 0) {
|
|
1140
1140
|
const d = this._sheetDrawingService.getBatchUpdateOp(c), { undo: l, redo: h, objects: m } = d;
|
|
1141
|
-
i.push({ id: b.id, params: { unitId: t, subUnitId: o, op: h, objects: m, type:
|
|
1141
|
+
i.push({ id: b.id, params: { unitId: t, subUnitId: o, op: h, objects: m, type: P.UPDATE } }), s.push({ id: b.id, params: { unitId: t, subUnitId: o, op: l, objects: m, type: P.UPDATE } });
|
|
1142
1142
|
}
|
|
1143
1143
|
if (u.length > 0) {
|
|
1144
1144
|
const d = this._sheetDrawingService.getBatchRemoveOp(u), l = d.undo, h = d.redo, m = d.objects;
|
|
1145
|
-
i.push({ id: b.id, params: { unitId: t, subUnitId: o, op: h, objects: m, type:
|
|
1145
|
+
i.push({ id: b.id, params: { unitId: t, subUnitId: o, op: h, objects: m, type: P.REMOVE } }), s.push({ id: b.id, params: { unitId: t, subUnitId: o, op: l, objects: m, type: P.INSERT } });
|
|
1146
1146
|
}
|
|
1147
1147
|
return i.push({ id: N.id, params: [t] }), s.push({ id: N.id, params: [t] }), {
|
|
1148
1148
|
redos: i,
|
|
@@ -1150,38 +1150,38 @@ let Se = class extends Me {
|
|
|
1150
1150
|
};
|
|
1151
1151
|
}
|
|
1152
1152
|
_getUpdateOrDeleteDrawings(r, e, n) {
|
|
1153
|
-
const t = [], o = [], { sheetTransform: i, anchorType: s = O.Position, transform: a, unitId: c, subUnitId: u, drawingId: d } = n, { from: l, to: h } = i, { row: m, column:
|
|
1153
|
+
const t = [], o = [], { sheetTransform: i, anchorType: s = O.Position, transform: a, unitId: c, subUnitId: u, drawingId: d } = n, { from: l, to: h } = i, { row: m, column: f } = l, { row: g, column: _ } = h;
|
|
1154
1154
|
if (i == null || a == null)
|
|
1155
1155
|
return {
|
|
1156
1156
|
updateDrawings: t,
|
|
1157
1157
|
deleteDrawings: o
|
|
1158
1158
|
};
|
|
1159
1159
|
const { startRow: I, endRow: C, startColumn: v, endColumn: R } = r;
|
|
1160
|
-
let
|
|
1160
|
+
let w = null, M = null;
|
|
1161
1161
|
if (e === 0 && m >= I && g <= C)
|
|
1162
|
-
if (
|
|
1162
|
+
if (f >= v && _ <= R)
|
|
1163
1163
|
o.push({ unitId: c, subUnitId: u, drawingId: d });
|
|
1164
1164
|
else {
|
|
1165
|
-
const
|
|
1166
|
-
|
|
1165
|
+
const p = this._shrinkCol(i, a, v, R, s);
|
|
1166
|
+
w = p == null ? void 0 : p.newSheetTransform, M = p == null ? void 0 : p.newTransform;
|
|
1167
1167
|
}
|
|
1168
|
-
else if (e === 1 &&
|
|
1168
|
+
else if (e === 1 && f >= v && _ <= R)
|
|
1169
1169
|
if (m >= I && g <= C)
|
|
1170
1170
|
o.push({ unitId: c, subUnitId: u, drawingId: d });
|
|
1171
1171
|
else {
|
|
1172
|
-
const
|
|
1173
|
-
|
|
1172
|
+
const p = this._shrinkRow(i, a, I, C, s);
|
|
1173
|
+
w = p == null ? void 0 : p.newSheetTransform, M = p == null ? void 0 : p.newTransform;
|
|
1174
1174
|
}
|
|
1175
1175
|
else if (e === 2) {
|
|
1176
|
-
const
|
|
1177
|
-
|
|
1176
|
+
const p = this._expandRow(i, a, I, C, s);
|
|
1177
|
+
w = p == null ? void 0 : p.newSheetTransform, M = p == null ? void 0 : p.newTransform;
|
|
1178
1178
|
} else if (e === 3) {
|
|
1179
|
-
const
|
|
1180
|
-
|
|
1179
|
+
const p = this._expandCol(i, a, v, R, s);
|
|
1180
|
+
w = p == null ? void 0 : p.newSheetTransform, M = p == null ? void 0 : p.newTransform;
|
|
1181
1181
|
}
|
|
1182
|
-
if (
|
|
1183
|
-
const
|
|
1184
|
-
t.push({ ...n, sheetTransform:
|
|
1182
|
+
if (w != null && M != null) {
|
|
1183
|
+
const p = x(w, this._selectionRenderService);
|
|
1184
|
+
t.push({ ...n, sheetTransform: w, transform: p });
|
|
1185
1185
|
}
|
|
1186
1186
|
return { updateDrawings: t, deleteDrawings: o };
|
|
1187
1187
|
}
|
|
@@ -1196,64 +1196,64 @@ let Se = class extends Me {
|
|
|
1196
1196
|
_getDrawingUndoForColVisible(r, e, n) {
|
|
1197
1197
|
const t = this._drawingManagerService.getDrawingData(r, e), o = [], i = [];
|
|
1198
1198
|
if (Object.keys(t).forEach((d) => {
|
|
1199
|
-
const l = t[d], { sheetTransform: h, transform: m, anchorType:
|
|
1200
|
-
if (
|
|
1199
|
+
const l = t[d], { sheetTransform: h, transform: m, anchorType: f = O.Position } = l;
|
|
1200
|
+
if (f === O.None)
|
|
1201
1201
|
this._remainDrawingSize(m, o, l);
|
|
1202
1202
|
else {
|
|
1203
1203
|
const { from: g, to: _ } = h, { row: I, column: C } = g, { row: v, column: R } = _;
|
|
1204
|
-
for (let
|
|
1205
|
-
const M = n[
|
|
1204
|
+
for (let w = 0; w < n.length; w++) {
|
|
1205
|
+
const M = n[w], { startRow: p, endRow: T, startColumn: D, endColumn: E } = M;
|
|
1206
1206
|
if (R < D)
|
|
1207
1207
|
continue;
|
|
1208
|
-
if (
|
|
1209
|
-
let S = null,
|
|
1210
|
-
if (C >= D && C <=
|
|
1211
|
-
const
|
|
1212
|
-
if (
|
|
1208
|
+
if (f === O.Position) {
|
|
1209
|
+
let S = null, j = null;
|
|
1210
|
+
if (C >= D && C <= E) {
|
|
1211
|
+
const X = this._selectionRenderService.attachRangeWithCoord({ startColumn: C, endColumn: E, startRow: g.row, endRow: _.row });
|
|
1212
|
+
if (X == null)
|
|
1213
1213
|
return;
|
|
1214
|
-
|
|
1214
|
+
j = { ...m, left: X.startX };
|
|
1215
1215
|
}
|
|
1216
|
-
if (
|
|
1217
|
-
o.push({ ...l, sheetTransform: S, transform:
|
|
1216
|
+
if (j != null && (S = A(j, this._selectionRenderService), S != null && j != null)) {
|
|
1217
|
+
o.push({ ...l, sheetTransform: S, transform: j });
|
|
1218
1218
|
break;
|
|
1219
1219
|
}
|
|
1220
1220
|
this._remainDrawingSize(m, o, l);
|
|
1221
1221
|
continue;
|
|
1222
1222
|
}
|
|
1223
|
-
if (C >= D && R <=
|
|
1223
|
+
if (C >= D && R <= E)
|
|
1224
1224
|
continue;
|
|
1225
|
-
let U = null,
|
|
1226
|
-
if (C >= D && C <=
|
|
1227
|
-
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: C, endColumn:
|
|
1225
|
+
let U = null, y = null;
|
|
1226
|
+
if (C >= D && C <= E) {
|
|
1227
|
+
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: C, endColumn: E, startRow: g.row, endRow: _.row });
|
|
1228
1228
|
if (S == null)
|
|
1229
1229
|
return;
|
|
1230
|
-
|
|
1230
|
+
y = {
|
|
1231
1231
|
...m,
|
|
1232
1232
|
left: (S == null ? void 0 : S.startX) || 0,
|
|
1233
1233
|
width: ((m == null ? void 0 : m.width) || 0) - S.endX + S.startX
|
|
1234
1234
|
};
|
|
1235
|
-
} else if (R >= D && R <=
|
|
1235
|
+
} else if (R >= D && R <= E) {
|
|
1236
1236
|
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: R, startRow: g.row, endRow: _.row });
|
|
1237
1237
|
if (S == null)
|
|
1238
1238
|
return;
|
|
1239
|
-
|
|
1239
|
+
y = {
|
|
1240
1240
|
...m,
|
|
1241
1241
|
left: S.startX - ((m == null ? void 0 : m.width) || 0)
|
|
1242
1242
|
};
|
|
1243
1243
|
} else {
|
|
1244
|
-
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn:
|
|
1244
|
+
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: D, endColumn: E, startRow: g.row, endRow: _.row });
|
|
1245
1245
|
if (S == null)
|
|
1246
1246
|
return;
|
|
1247
|
-
if (
|
|
1247
|
+
if (y = {
|
|
1248
1248
|
...m,
|
|
1249
1249
|
width: ((m == null ? void 0 : m.width) || 0) - S.endX + S.startX
|
|
1250
|
-
}, U = A(
|
|
1251
|
-
i.push({ ...l, sheetTransform: U, transform:
|
|
1250
|
+
}, U = A(y, this._selectionRenderService), U != null && y != null) {
|
|
1251
|
+
i.push({ ...l, sheetTransform: U, transform: y });
|
|
1252
1252
|
break;
|
|
1253
1253
|
}
|
|
1254
1254
|
}
|
|
1255
|
-
if (
|
|
1256
|
-
o.push({ ...l, sheetTransform: U, transform:
|
|
1255
|
+
if (y != null && (U = A(y, this._selectionRenderService)), y != null && U != null) {
|
|
1256
|
+
o.push({ ...l, sheetTransform: U, transform: y });
|
|
1257
1257
|
break;
|
|
1258
1258
|
} else
|
|
1259
1259
|
this._remainDrawingSize(m, o, l);
|
|
@@ -1275,10 +1275,10 @@ let Se = class extends Me {
|
|
|
1275
1275
|
}
|
|
1276
1276
|
_createUndoAndRedoMutation(r, e, n) {
|
|
1277
1277
|
const t = this._sheetDrawingService.getBatchUpdateOp(n), { undo: o, redo: i, objects: s } = t, a = [
|
|
1278
|
-
{ id: b.id, params: { unitId: r, subUnitId: e, op: i, objects: s, type:
|
|
1278
|
+
{ id: b.id, params: { unitId: r, subUnitId: e, op: i, objects: s, type: P.UPDATE } },
|
|
1279
1279
|
{ id: N.id, params: [r] }
|
|
1280
1280
|
], c = [
|
|
1281
|
-
{ id: b.id, params: { unitId: r, subUnitId: e, op: o, objects: s, type:
|
|
1281
|
+
{ id: b.id, params: { unitId: r, subUnitId: e, op: o, objects: s, type: P.UPDATE } },
|
|
1282
1282
|
{ id: N.id, params: [r] }
|
|
1283
1283
|
];
|
|
1284
1284
|
return {
|
|
@@ -1290,64 +1290,64 @@ let Se = class extends Me {
|
|
|
1290
1290
|
_getDrawingUndoForRowVisible(r, e, n) {
|
|
1291
1291
|
const t = this._drawingManagerService.getDrawingData(r, e), o = [], i = [];
|
|
1292
1292
|
if (Object.keys(t).forEach((d) => {
|
|
1293
|
-
const l = t[d], { sheetTransform: h, transform: m, anchorType:
|
|
1294
|
-
if (
|
|
1293
|
+
const l = t[d], { sheetTransform: h, transform: m, anchorType: f = O.Position } = l;
|
|
1294
|
+
if (f === O.None)
|
|
1295
1295
|
this._remainDrawingSize(m, o, l);
|
|
1296
1296
|
else {
|
|
1297
1297
|
const { from: g, to: _ } = h, { row: I, column: C } = g, { row: v, column: R } = _;
|
|
1298
|
-
for (let
|
|
1299
|
-
const M = n[
|
|
1300
|
-
if (v <
|
|
1298
|
+
for (let w = 0; w < n.length; w++) {
|
|
1299
|
+
const M = n[w], { startRow: p, endRow: T, startColumn: D, endColumn: E } = M;
|
|
1300
|
+
if (v < p)
|
|
1301
1301
|
continue;
|
|
1302
|
-
if (
|
|
1303
|
-
let S = null,
|
|
1304
|
-
if (I >=
|
|
1305
|
-
const
|
|
1306
|
-
if (
|
|
1302
|
+
if (f === O.Position) {
|
|
1303
|
+
let S = null, j = null;
|
|
1304
|
+
if (I >= p && I <= T) {
|
|
1305
|
+
const X = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow: I, endRow: T });
|
|
1306
|
+
if (X == null)
|
|
1307
1307
|
return;
|
|
1308
|
-
|
|
1308
|
+
j = { ...m, top: X.startY };
|
|
1309
1309
|
}
|
|
1310
|
-
if (
|
|
1311
|
-
o.push({ ...l, sheetTransform: S, transform:
|
|
1310
|
+
if (j != null && (S = A(j, this._selectionRenderService), S != null && j != null)) {
|
|
1311
|
+
o.push({ ...l, sheetTransform: S, transform: j });
|
|
1312
1312
|
break;
|
|
1313
1313
|
}
|
|
1314
1314
|
this._remainDrawingSize(m, o, l);
|
|
1315
1315
|
continue;
|
|
1316
1316
|
}
|
|
1317
|
-
if (I >=
|
|
1317
|
+
if (I >= p && v <= T)
|
|
1318
1318
|
continue;
|
|
1319
|
-
let U = null,
|
|
1320
|
-
if (I >=
|
|
1321
|
-
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow: I, endRow:
|
|
1319
|
+
let U = null, y = null;
|
|
1320
|
+
if (I >= p && I <= T) {
|
|
1321
|
+
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow: I, endRow: T });
|
|
1322
1322
|
if (S == null)
|
|
1323
1323
|
return;
|
|
1324
|
-
|
|
1324
|
+
y = {
|
|
1325
1325
|
...m,
|
|
1326
1326
|
top: (S == null ? void 0 : S.startY) || 0,
|
|
1327
1327
|
height: ((m == null ? void 0 : m.height) || 0) - S.endY + S.startY
|
|
1328
1328
|
};
|
|
1329
|
-
} else if (v >=
|
|
1330
|
-
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow:
|
|
1329
|
+
} else if (v >= p && v <= T) {
|
|
1330
|
+
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow: p, endRow: v });
|
|
1331
1331
|
if (S == null)
|
|
1332
1332
|
return;
|
|
1333
|
-
|
|
1333
|
+
y = {
|
|
1334
1334
|
...m,
|
|
1335
1335
|
top: S.startY - ((m == null ? void 0 : m.height) || 0)
|
|
1336
1336
|
};
|
|
1337
1337
|
} else {
|
|
1338
|
-
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow:
|
|
1338
|
+
const S = this._selectionRenderService.attachRangeWithCoord({ startColumn: g.column, endColumn: _.column, startRow: p, endRow: T });
|
|
1339
1339
|
if (S == null)
|
|
1340
1340
|
return;
|
|
1341
|
-
if (
|
|
1341
|
+
if (y = {
|
|
1342
1342
|
...m,
|
|
1343
1343
|
height: ((m == null ? void 0 : m.height) || 0) - S.endY + S.startY
|
|
1344
|
-
}, U = A(
|
|
1345
|
-
i.push({ ...l, sheetTransform: U, transform:
|
|
1344
|
+
}, U = A(y, this._selectionRenderService), U != null && y != null) {
|
|
1345
|
+
i.push({ ...l, sheetTransform: U, transform: y });
|
|
1346
1346
|
break;
|
|
1347
1347
|
}
|
|
1348
1348
|
}
|
|
1349
|
-
if (
|
|
1350
|
-
o.push({ ...l, sheetTransform: U, transform:
|
|
1349
|
+
if (y != null && (U = A(y, this._selectionRenderService)), y != null && U != null) {
|
|
1350
|
+
o.push({ ...l, sheetTransform: U, transform: y });
|
|
1351
1351
|
break;
|
|
1352
1352
|
} else
|
|
1353
1353
|
this._remainDrawingSize(m, o, l);
|
|
@@ -1374,20 +1374,20 @@ let Se = class extends Me {
|
|
|
1374
1374
|
if (d === O.None)
|
|
1375
1375
|
this._remainDrawingSize(u, i, a);
|
|
1376
1376
|
else {
|
|
1377
|
-
const { from: l, to: h } = c, { row: m, column:
|
|
1377
|
+
const { from: l, to: h } = c, { row: m, column: f } = l, { row: g, column: _ } = h;
|
|
1378
1378
|
for (let I = 0; I < n.length; I++) {
|
|
1379
|
-
const C = n[I], { startRow: v, endRow: R, startColumn:
|
|
1380
|
-
if (g < v || _ <
|
|
1379
|
+
const C = n[I], { startRow: v, endRow: R, startColumn: w, endColumn: M } = C;
|
|
1380
|
+
if (g < v || _ < w)
|
|
1381
1381
|
continue;
|
|
1382
|
-
if (d === O.Position && (m <= v && g >= R ||
|
|
1382
|
+
if (d === O.Position && (m <= v && g >= R || f <= w && _ >= M)) {
|
|
1383
1383
|
this._remainDrawingSize(u, i, a);
|
|
1384
1384
|
continue;
|
|
1385
1385
|
}
|
|
1386
|
-
const
|
|
1387
|
-
if (
|
|
1386
|
+
const p = x({ ...c }, this._selectionRenderService);
|
|
1387
|
+
if (p != null) {
|
|
1388
1388
|
i.push({
|
|
1389
1389
|
...a,
|
|
1390
|
-
transform:
|
|
1390
|
+
transform: p
|
|
1391
1391
|
});
|
|
1392
1392
|
break;
|
|
1393
1393
|
}
|
|
@@ -1400,7 +1400,7 @@ let Se = class extends Me {
|
|
|
1400
1400
|
if (e === "insert")
|
|
1401
1401
|
n = r.unitId, t = r.subUnitId;
|
|
1402
1402
|
else {
|
|
1403
|
-
const o =
|
|
1403
|
+
const o = re(this._univerInstanceService);
|
|
1404
1404
|
if (o == null)
|
|
1405
1405
|
return;
|
|
1406
1406
|
n = o.unitId, t = o.subUnitId;
|
|
@@ -1413,16 +1413,16 @@ let Se = class extends Me {
|
|
|
1413
1413
|
return { redos: [], undos: [] };
|
|
1414
1414
|
const { unitId: t, subUnitId: o } = n, { range: i } = r, s = i.startRow, a = i.endRow, c = [], u = [], d = this._sheetDrawingService.getDrawingData(t, o), l = [], h = [];
|
|
1415
1415
|
if (Object.keys(d).forEach((m) => {
|
|
1416
|
-
const
|
|
1416
|
+
const f = d[m], { sheetTransform: g, transform: _, anchorType: I = O.Position } = f;
|
|
1417
1417
|
if (g == null || _ == null)
|
|
1418
1418
|
return;
|
|
1419
1419
|
let C, v;
|
|
1420
1420
|
if (e === "insert") {
|
|
1421
|
-
const
|
|
1422
|
-
C =
|
|
1421
|
+
const w = this._expandRow(g, _, s, a, I);
|
|
1422
|
+
C = w == null ? void 0 : w.newSheetTransform, v = w == null ? void 0 : w.newTransform;
|
|
1423
1423
|
} else {
|
|
1424
|
-
const { from:
|
|
1425
|
-
if (
|
|
1424
|
+
const { from: w, to: M } = g, { row: p } = w, { row: T } = M;
|
|
1425
|
+
if (p >= s && T <= a)
|
|
1426
1426
|
h.push({ unitId: t, subUnitId: o, drawingId: m });
|
|
1427
1427
|
else {
|
|
1428
1428
|
const D = this._shrinkRow(g, _, s, a, I);
|
|
@@ -1436,12 +1436,12 @@ let Se = class extends Me {
|
|
|
1436
1436
|
}), l.length === 0 && h.length === 0)
|
|
1437
1437
|
return { redos: [], undos: [] };
|
|
1438
1438
|
if (l.length > 0) {
|
|
1439
|
-
const m = this._sheetDrawingService.getBatchUpdateOp(l), { undo:
|
|
1440
|
-
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type:
|
|
1439
|
+
const m = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: g, objects: _ } = m;
|
|
1440
|
+
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type: P.UPDATE } }), u.push({ id: b.id, params: { unitId: t, subUnitId: o, op: f, objects: _, type: P.UPDATE } });
|
|
1441
1441
|
}
|
|
1442
1442
|
if (h.length > 0) {
|
|
1443
|
-
const m = this._sheetDrawingService.getBatchRemoveOp(h),
|
|
1444
|
-
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type:
|
|
1443
|
+
const m = this._sheetDrawingService.getBatchRemoveOp(h), f = m.undo, g = m.redo, _ = m.objects;
|
|
1444
|
+
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type: P.REMOVE } }), u.push({ id: b.id, params: { unitId: t, subUnitId: o, op: f, objects: _, type: P.INSERT } });
|
|
1445
1445
|
}
|
|
1446
1446
|
return c.push({ id: N.id, params: [t] }), u.push({ id: N.id, params: [t] }), {
|
|
1447
1447
|
redos: c,
|
|
@@ -1454,16 +1454,16 @@ let Se = class extends Me {
|
|
|
1454
1454
|
return { redos: [], undos: [] };
|
|
1455
1455
|
const { unitId: t, subUnitId: o } = n, { range: i } = r, s = i.startColumn, a = i.endColumn, c = [], u = [], d = this._sheetDrawingService.getDrawingData(t, o), l = [], h = [];
|
|
1456
1456
|
if (Object.keys(d).forEach((m) => {
|
|
1457
|
-
const
|
|
1457
|
+
const f = d[m], { sheetTransform: g, transform: _, anchorType: I = O.Position } = f;
|
|
1458
1458
|
if (g == null || _ == null)
|
|
1459
1459
|
return;
|
|
1460
1460
|
let C, v;
|
|
1461
1461
|
if (e === "insert") {
|
|
1462
|
-
const
|
|
1463
|
-
C =
|
|
1462
|
+
const w = this._expandCol(g, _, s, a, I);
|
|
1463
|
+
C = w == null ? void 0 : w.newSheetTransform, v = w == null ? void 0 : w.newTransform;
|
|
1464
1464
|
} else {
|
|
1465
|
-
const { from:
|
|
1466
|
-
if (
|
|
1465
|
+
const { from: w, to: M } = g, { column: p } = w, { column: T } = M;
|
|
1466
|
+
if (p >= s && T <= a)
|
|
1467
1467
|
h.push({ unitId: t, subUnitId: o, drawingId: m });
|
|
1468
1468
|
else {
|
|
1469
1469
|
const D = this._shrinkCol(g, _, s, a, I);
|
|
@@ -1477,12 +1477,12 @@ let Se = class extends Me {
|
|
|
1477
1477
|
}), l.length === 0 && h.length === 0)
|
|
1478
1478
|
return { redos: [], undos: [] };
|
|
1479
1479
|
if (l.length > 0) {
|
|
1480
|
-
const m = this._sheetDrawingService.getBatchUpdateOp(l), { undo:
|
|
1481
|
-
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type:
|
|
1480
|
+
const m = this._sheetDrawingService.getBatchUpdateOp(l), { undo: f, redo: g, objects: _ } = m;
|
|
1481
|
+
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type: P.UPDATE } }), u.push({ id: b.id, params: { unitId: t, subUnitId: o, op: f, objects: _, type: P.UPDATE } });
|
|
1482
1482
|
}
|
|
1483
1483
|
if (h.length > 0) {
|
|
1484
|
-
const m = this._sheetDrawingService.getBatchRemoveOp(h),
|
|
1485
|
-
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type:
|
|
1484
|
+
const m = this._sheetDrawingService.getBatchRemoveOp(h), f = m.undo, g = m.redo, _ = m.objects;
|
|
1485
|
+
c.push({ id: b.id, params: { unitId: t, subUnitId: o, op: g, objects: _, type: P.REMOVE } }), u.push({ id: b.id, params: { unitId: t, subUnitId: o, op: f, objects: _, type: P.INSERT } });
|
|
1486
1486
|
}
|
|
1487
1487
|
return c.push({ id: N.id, params: [t] }), u.push({ id: N.id, params: [t] }), { redos: c, undos: u };
|
|
1488
1488
|
}
|
|
@@ -1504,7 +1504,7 @@ let Se = class extends Me {
|
|
|
1504
1504
|
d = {
|
|
1505
1505
|
from: { ...s },
|
|
1506
1506
|
to: { ...a, column: u + i }
|
|
1507
|
-
}, l =
|
|
1507
|
+
}, l = x(d, this._selectionRenderService);
|
|
1508
1508
|
else
|
|
1509
1509
|
return {
|
|
1510
1510
|
newSheetTransform: A({ ...e }, this._selectionRenderService),
|
|
@@ -1527,7 +1527,7 @@ let Se = class extends Me {
|
|
|
1527
1527
|
d = {
|
|
1528
1528
|
from: { ...s, column: c - i },
|
|
1529
1529
|
to: { ...a, column: u - i }
|
|
1530
|
-
}, l =
|
|
1530
|
+
}, l = x(d, this._selectionRenderService);
|
|
1531
1531
|
else {
|
|
1532
1532
|
if (c >= n && u <= t)
|
|
1533
1533
|
return null;
|
|
@@ -1536,7 +1536,7 @@ let Se = class extends Me {
|
|
|
1536
1536
|
d = {
|
|
1537
1537
|
from: { ...s },
|
|
1538
1538
|
to: { ...a, column: u - i }
|
|
1539
|
-
}, l =
|
|
1539
|
+
}, l = x(d, this._selectionRenderService);
|
|
1540
1540
|
else
|
|
1541
1541
|
return {
|
|
1542
1542
|
newSheetTransform: A({ ...e }, this._selectionRenderService),
|
|
@@ -1564,7 +1564,7 @@ let Se = class extends Me {
|
|
|
1564
1564
|
d = {
|
|
1565
1565
|
from: { ...s },
|
|
1566
1566
|
to: { ...a, column: n - 1, columnOffset: h.endX - h.startX }
|
|
1567
|
-
}, l =
|
|
1567
|
+
}, l = x(d, this._selectionRenderService);
|
|
1568
1568
|
}
|
|
1569
1569
|
}
|
|
1570
1570
|
return d != null && l != null ? {
|
|
@@ -1593,7 +1593,7 @@ let Se = class extends Me {
|
|
|
1593
1593
|
...a,
|
|
1594
1594
|
row: u + i
|
|
1595
1595
|
}
|
|
1596
|
-
}, l =
|
|
1596
|
+
}, l = x(d, this._selectionRenderService);
|
|
1597
1597
|
else
|
|
1598
1598
|
return {
|
|
1599
1599
|
newSheetTransform: A({ ...e }, this._selectionRenderService),
|
|
@@ -1616,7 +1616,7 @@ let Se = class extends Me {
|
|
|
1616
1616
|
d = {
|
|
1617
1617
|
from: { ...s, row: c - i },
|
|
1618
1618
|
to: { ...a, row: u - i }
|
|
1619
|
-
}, l =
|
|
1619
|
+
}, l = x(d, this._selectionRenderService);
|
|
1620
1620
|
else {
|
|
1621
1621
|
if (c >= n && u <= t)
|
|
1622
1622
|
return null;
|
|
@@ -1625,7 +1625,7 @@ let Se = class extends Me {
|
|
|
1625
1625
|
d = {
|
|
1626
1626
|
from: { ...s },
|
|
1627
1627
|
to: { ...a, row: u - i }
|
|
1628
|
-
}, l =
|
|
1628
|
+
}, l = x(d, this._selectionRenderService);
|
|
1629
1629
|
else
|
|
1630
1630
|
return {
|
|
1631
1631
|
newSheetTransform: A({ ...e }, this._selectionRenderService),
|
|
@@ -1648,7 +1648,7 @@ let Se = class extends Me {
|
|
|
1648
1648
|
d = {
|
|
1649
1649
|
from: { ...s },
|
|
1650
1650
|
to: { ...a, row: n - 1, rowOffset: h.endY - h.startY }
|
|
1651
|
-
}, l =
|
|
1651
|
+
}, l = x(d, this._selectionRenderService);
|
|
1652
1652
|
}
|
|
1653
1653
|
}
|
|
1654
1654
|
return d != null && l != null ? {
|
|
@@ -1659,7 +1659,7 @@ let Se = class extends Me {
|
|
|
1659
1659
|
_commandListener() {
|
|
1660
1660
|
this.disposeWithMe(
|
|
1661
1661
|
this._commandService.onCommandExecuted((r) => {
|
|
1662
|
-
if (r.id ===
|
|
1662
|
+
if (r.id === Bn.id) {
|
|
1663
1663
|
const e = r.params, { unitId: n, subUnitId: t } = e, o = this._drawingManagerService.drawingManagerData, i = [], s = [];
|
|
1664
1664
|
Object.keys(o).forEach((a) => {
|
|
1665
1665
|
const c = o[a];
|
|
@@ -1677,7 +1677,7 @@ let Se = class extends Me {
|
|
|
1677
1677
|
_sheetRefreshListener() {
|
|
1678
1678
|
this.disposeWithMe(
|
|
1679
1679
|
this._commandService.onCommandExecuted((r) => {
|
|
1680
|
-
|
|
1680
|
+
$r.includes(r.id) && requestIdleCallback(() => {
|
|
1681
1681
|
const e = r.params, { unitId: n, subUnitId: t, ranges: o } = e;
|
|
1682
1682
|
this._refreshDrawingTransform(n, t, o);
|
|
1683
1683
|
});
|
|
@@ -1690,10 +1690,10 @@ let Se = class extends Me {
|
|
|
1690
1690
|
const s = t[i], { sheetTransform: a, anchorType: c = O.Position } = s;
|
|
1691
1691
|
if (c === O.None)
|
|
1692
1692
|
return !0;
|
|
1693
|
-
const { from: u, to: d } = a, { row: l, column: h } = u, { row: m, column:
|
|
1693
|
+
const { from: u, to: d } = a, { row: l, column: h } = u, { row: m, column: f } = d;
|
|
1694
1694
|
for (let g = 0; g < n.length; g++) {
|
|
1695
1695
|
const _ = n[g], { startRow: I, endRow: C, startColumn: v, endColumn: R } = _;
|
|
1696
|
-
if (
|
|
1696
|
+
if (Ft.intersects(
|
|
1697
1697
|
{
|
|
1698
1698
|
startRow: I,
|
|
1699
1699
|
endRow: C,
|
|
@@ -1704,12 +1704,12 @@ let Se = class extends Me {
|
|
|
1704
1704
|
startRow: l,
|
|
1705
1705
|
endRow: m,
|
|
1706
1706
|
startColumn: h,
|
|
1707
|
-
endColumn:
|
|
1707
|
+
endColumn: f
|
|
1708
1708
|
}
|
|
1709
1709
|
) || l > C || h > R) {
|
|
1710
1710
|
o.push({
|
|
1711
1711
|
...s,
|
|
1712
|
-
transform:
|
|
1712
|
+
transform: x(a, this._selectionRenderService)
|
|
1713
1713
|
});
|
|
1714
1714
|
break;
|
|
1715
1715
|
}
|
|
@@ -1717,22 +1717,22 @@ let Se = class extends Me {
|
|
|
1717
1717
|
}), o.length !== 0 && (this._drawingManagerService.refreshTransform(o), this._commandService.syncExecuteCommand(N.id, [r]));
|
|
1718
1718
|
}
|
|
1719
1719
|
};
|
|
1720
|
-
|
|
1721
|
-
|
|
1722
|
-
te(0,
|
|
1723
|
-
te(1,
|
|
1724
|
-
te(2,
|
|
1725
|
-
te(3,
|
|
1726
|
-
te(4,
|
|
1727
|
-
te(5,
|
|
1728
|
-
],
|
|
1729
|
-
var
|
|
1730
|
-
for (var o = t > 1 ? void 0 : t ?
|
|
1720
|
+
De = Gr([
|
|
1721
|
+
me(he.Rendered, De),
|
|
1722
|
+
te(0, B),
|
|
1723
|
+
te(1, W(Gn)),
|
|
1724
|
+
te(2, Y),
|
|
1725
|
+
te(3, k),
|
|
1726
|
+
te(4, Te),
|
|
1727
|
+
te(5, ue)
|
|
1728
|
+
], De);
|
|
1729
|
+
var Fr = Object.defineProperty, Vr = Object.getOwnPropertyDescriptor, Yr = (r, e, n, t) => {
|
|
1730
|
+
for (var o = t > 1 ? void 0 : t ? Vr(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
1731
1731
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
1732
|
-
return t && o &&
|
|
1733
|
-
},
|
|
1734
|
-
function
|
|
1735
|
-
const { scaleX: o, scaleY: i } = e.getAncestorScale(), s = e.getViewport(
|
|
1732
|
+
return t && o && Fr(e, n, o), o;
|
|
1733
|
+
}, Q = (r, e) => (n, t) => e(n, t, r);
|
|
1734
|
+
function Xr(r, e, n, t) {
|
|
1735
|
+
const { scaleX: o, scaleY: i } = e.getAncestorScale(), s = e.getViewport(gn.VIEW_MAIN), a = {
|
|
1736
1736
|
left: !0,
|
|
1737
1737
|
top: !0
|
|
1738
1738
|
};
|
|
@@ -1741,37 +1741,37 @@ function Pr(r, e, n, t) {
|
|
|
1741
1741
|
...r,
|
|
1742
1742
|
absolute: a
|
|
1743
1743
|
};
|
|
1744
|
-
const { left: c, right: u, top: d, bottom: l } = r, h = t.getFreeze(), { startColumn: m, startRow:
|
|
1745
|
-
let U,
|
|
1746
|
-
c <
|
|
1744
|
+
const { left: c, right: u, top: d, bottom: l } = r, h = t.getFreeze(), { startColumn: m, startRow: f, xSplit: g, ySplit: _ } = h, I = n.getNoMergeCellPositionByIndexWithNoHeader(f - _, m - g), C = n.getNoMergeCellPositionByIndexWithNoHeader(f, m), { rowHeaderWidth: v, columnHeaderHeight: R } = n, w = C.startX - I.startX, M = C.startY - I.startY, { top: p, left: T, viewportScrollX: D, viewportScrollY: E } = s;
|
|
1745
|
+
let U, y;
|
|
1746
|
+
c < T ? (a.left = !0, U = (w + v + (c - T)) * o, y = Math.max(
|
|
1747
1747
|
Math.min(
|
|
1748
|
-
(
|
|
1749
|
-
(
|
|
1748
|
+
(w + v + (u - T)) * o,
|
|
1749
|
+
(w + v) * o
|
|
1750
1750
|
),
|
|
1751
1751
|
(u - D) * o
|
|
1752
|
-
)) : (a.left = !1, U = Math.max((c - D) * o, (
|
|
1753
|
-
let S,
|
|
1754
|
-
return d <
|
|
1752
|
+
)) : (a.left = !1, U = Math.max((c - D) * o, (w + v) * o), y = Math.max((u - D) * o, (w + v) * o));
|
|
1753
|
+
let S, j;
|
|
1754
|
+
return d < p ? (a.top = !0, S = (M + R + (d - p)) * i, j = Math.max(
|
|
1755
1755
|
Math.min(
|
|
1756
|
-
(M + R + (u -
|
|
1756
|
+
(M + R + (u - p)) * i,
|
|
1757
1757
|
(M + R) * i
|
|
1758
1758
|
),
|
|
1759
|
-
(l -
|
|
1760
|
-
)) : (a.top = !1, S = Math.max((d -
|
|
1759
|
+
(l - E) * i
|
|
1760
|
+
)) : (a.top = !1, S = Math.max((d - E) * i, (M + R) * i), j = Math.max((l - E) * i, (M + R) * i)), {
|
|
1761
1761
|
left: U,
|
|
1762
|
-
right:
|
|
1762
|
+
right: y,
|
|
1763
1763
|
top: S,
|
|
1764
|
-
bottom:
|
|
1764
|
+
bottom: j,
|
|
1765
1765
|
absolute: a
|
|
1766
1766
|
};
|
|
1767
1767
|
}
|
|
1768
|
-
const
|
|
1768
|
+
const We = (r, e, n, t) => {
|
|
1769
1769
|
const { scene: o } = e, { left: i, top: s, width: a, height: c, angle: u } = r, d = {
|
|
1770
1770
|
left: i,
|
|
1771
1771
|
right: i + a,
|
|
1772
1772
|
top: s,
|
|
1773
1773
|
bottom: s + c
|
|
1774
|
-
}, l =
|
|
1774
|
+
}, l = Xr(d, o, n, t);
|
|
1775
1775
|
return {
|
|
1776
1776
|
startX: l.left,
|
|
1777
1777
|
endX: l.right,
|
|
@@ -1783,16 +1783,16 @@ const Ae = (r, e, n, t) => {
|
|
|
1783
1783
|
absolute: l.absolute
|
|
1784
1784
|
};
|
|
1785
1785
|
};
|
|
1786
|
-
let
|
|
1787
|
-
constructor(e, n, t, o, i, s, a
|
|
1786
|
+
let Fe = class extends ge {
|
|
1787
|
+
constructor(e, n, t, o, i, s, a) {
|
|
1788
1788
|
super();
|
|
1789
|
-
|
|
1790
|
-
|
|
1791
|
-
|
|
1792
|
-
|
|
1793
|
-
|
|
1794
|
-
|
|
1795
|
-
this._renderManagerService = e, this._univerInstanceService = n, this.
|
|
1789
|
+
H(this, "_domLayerMap", /* @__PURE__ */ new Map());
|
|
1790
|
+
H(this, "_domLayerInfoMap", /* @__PURE__ */ new Map());
|
|
1791
|
+
H(this, "_transformChange$", new qe());
|
|
1792
|
+
H(this, "transformChange$", this._transformChange$.asObservable());
|
|
1793
|
+
H(this, "_remove$", new qe());
|
|
1794
|
+
H(this, "remove$", this._remove$.asObservable());
|
|
1795
|
+
this._renderManagerService = e, this._univerInstanceService = n, this._commandService = t, this._drawingManagerService = o, this._selectionRenderService = i, this._canvasFloatDomService = s, this._sheetDrawingService = a, this._drawingAddListener(), this._scrollUpdateListener(), this._featureUpdateListener(), this._deleteListener();
|
|
1796
1796
|
}
|
|
1797
1797
|
_ensureMap(e, n) {
|
|
1798
1798
|
let t = this._domLayerMap.get(e);
|
|
@@ -1815,11 +1815,12 @@ let We = class extends Me {
|
|
|
1815
1815
|
// eslint-disable-next-line max-lines-per-function
|
|
1816
1816
|
this._drawingManagerService.add$.subscribe((e) => {
|
|
1817
1817
|
e.forEach((n) => {
|
|
1818
|
-
|
|
1818
|
+
var ke;
|
|
1819
|
+
const { unitId: t, subUnitId: o, drawingId: i } = n, s = re(this._univerInstanceService, { unitId: t, subUnitId: o }), a = this._drawingManagerService.getDrawingByParam(n), c = (ke = this._renderManagerService.getRenderById(t)) == null ? void 0 : ke.with(Be).getUnitSkeleton(t, o);
|
|
1819
1820
|
if (a == null || s == null || c == null)
|
|
1820
1821
|
return;
|
|
1821
1822
|
const { transform: u, drawingType: d } = a;
|
|
1822
|
-
if (d !==
|
|
1823
|
+
if (d !== Ne.DRAWING_DOM)
|
|
1823
1824
|
return;
|
|
1824
1825
|
const l = this._getSceneAndTransformerByDrawingSearch(t);
|
|
1825
1826
|
if (l == null)
|
|
@@ -1827,22 +1828,22 @@ let We = class extends Me {
|
|
|
1827
1828
|
const { scene: h, canvas: m } = l;
|
|
1828
1829
|
if (u == null)
|
|
1829
1830
|
return !0;
|
|
1830
|
-
const { left:
|
|
1831
|
-
if (
|
|
1832
|
-
|
|
1831
|
+
const { left: f, top: g, width: _, height: I, angle: C, flipX: v, flipY: R, skewX: w, skewY: M } = u, p = rn({ unitId: t, subUnitId: o, drawingId: i }), T = h.getObject(p);
|
|
1832
|
+
if (T != null) {
|
|
1833
|
+
T.transformByState({ left: f, top: g, width: _, height: I, angle: C, flipX: v, flipY: R, skewX: w, skewY: M });
|
|
1833
1834
|
return;
|
|
1834
1835
|
}
|
|
1835
1836
|
const D = {
|
|
1836
|
-
left:
|
|
1837
|
+
left: f,
|
|
1837
1838
|
top: g,
|
|
1838
1839
|
width: _,
|
|
1839
1840
|
height: I,
|
|
1840
1841
|
zIndex: this._drawingManagerService.getDrawingOrder(t, o).length - 1
|
|
1841
|
-
},
|
|
1842
|
-
h.addObject(
|
|
1843
|
-
const U = new
|
|
1842
|
+
}, E = new cn(p, D);
|
|
1843
|
+
h.addObject(E, ln).attachTransformerTo(E);
|
|
1844
|
+
const U = new Vt(), y = We(E, l.renderObject, c.skeleton, s.worksheet), S = new pn(y), j = {
|
|
1844
1845
|
dispose: U,
|
|
1845
|
-
rect:
|
|
1846
|
+
rect: E,
|
|
1846
1847
|
position$: S,
|
|
1847
1848
|
unitId: t,
|
|
1848
1849
|
subUnitId: o
|
|
@@ -1851,28 +1852,28 @@ let We = class extends Me {
|
|
|
1851
1852
|
position$: S,
|
|
1852
1853
|
id: i,
|
|
1853
1854
|
componentKey: a.componentKey,
|
|
1854
|
-
onPointerDown: (
|
|
1855
|
-
m.dispatchEvent(new PointerEvent(
|
|
1855
|
+
onPointerDown: (G) => {
|
|
1856
|
+
m.dispatchEvent(new PointerEvent(G.type, G));
|
|
1856
1857
|
},
|
|
1857
|
-
onPointerMove: (
|
|
1858
|
-
m.dispatchEvent(new PointerEvent(
|
|
1858
|
+
onPointerMove: (G) => {
|
|
1859
|
+
m.dispatchEvent(new PointerEvent(G.type, G));
|
|
1859
1860
|
},
|
|
1860
|
-
onPointerUp: (
|
|
1861
|
-
m.dispatchEvent(new PointerEvent(
|
|
1861
|
+
onPointerUp: (G) => {
|
|
1862
|
+
m.dispatchEvent(new PointerEvent(G.type, G));
|
|
1862
1863
|
},
|
|
1863
|
-
onWheel: (
|
|
1864
|
-
m.dispatchEvent(new WheelEvent(
|
|
1864
|
+
onWheel: (G) => {
|
|
1865
|
+
m.dispatchEvent(new WheelEvent(G.type, G));
|
|
1865
1866
|
}
|
|
1866
1867
|
});
|
|
1867
|
-
const
|
|
1868
|
-
const
|
|
1868
|
+
const X = E.onTransformChangeObservable.add(() => {
|
|
1869
|
+
const G = We(E, l.renderObject, c.skeleton, s.worksheet);
|
|
1869
1870
|
S.next(
|
|
1870
|
-
|
|
1871
|
+
G
|
|
1871
1872
|
);
|
|
1872
1873
|
});
|
|
1873
1874
|
U.add(() => {
|
|
1874
1875
|
this._canvasFloatDomService.removeFloatDom(i);
|
|
1875
|
-
}),
|
|
1876
|
+
}), X && U.add(X), this._domLayerInfoMap.set(i, j);
|
|
1876
1877
|
});
|
|
1877
1878
|
})
|
|
1878
1879
|
);
|
|
@@ -1881,24 +1882,25 @@ let We = class extends Me {
|
|
|
1881
1882
|
this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
|
|
1882
1883
|
var t, o;
|
|
1883
1884
|
const n = (i, s) => {
|
|
1884
|
-
|
|
1885
|
-
|
|
1886
|
-
|
|
1887
|
-
|
|
1888
|
-
|
|
1889
|
-
|
|
1885
|
+
var h;
|
|
1886
|
+
const a = this._getSceneAndTransformerByDrawingSearch(i), c = this._ensureMap(i, s), u = Array.from(c.keys()), d = re(this._univerInstanceService, { unitId: i, subUnitId: s }), l = (h = this._renderManagerService.getRenderById(i)) == null ? void 0 : h.with(Be).getUnitSkeleton(i, s);
|
|
1887
|
+
!a || !d || !l || u.forEach((m) => {
|
|
1888
|
+
const f = this._domLayerInfoMap.get(m);
|
|
1889
|
+
if (f) {
|
|
1890
|
+
const g = We(f.rect, a.renderObject, l.skeleton, d.worksheet);
|
|
1891
|
+
f.position$.next(g);
|
|
1890
1892
|
}
|
|
1891
1893
|
});
|
|
1892
1894
|
};
|
|
1893
|
-
if (e.id ===
|
|
1895
|
+
if (e.id === mn.id) {
|
|
1894
1896
|
const i = e.params, { unitId: s, sheetId: a } = i;
|
|
1895
1897
|
n(s, a);
|
|
1896
|
-
} else if (e.id ===
|
|
1898
|
+
} else if (e.id === hn.id) {
|
|
1897
1899
|
const i = e.params, { unitId: s } = i;
|
|
1898
1900
|
Array.from((o = (t = this._domLayerMap.get(s)) == null ? void 0 : t.keys()) != null ? o : []).forEach((c) => {
|
|
1899
1901
|
n(s, c);
|
|
1900
1902
|
});
|
|
1901
|
-
} else if (e.id ===
|
|
1903
|
+
} else if (e.id === xn.id) {
|
|
1902
1904
|
const { unitId: i, subUnitId: s } = e.params;
|
|
1903
1905
|
n(i, s);
|
|
1904
1906
|
}
|
|
@@ -1932,7 +1934,7 @@ let We = class extends Me {
|
|
|
1932
1934
|
this._drawingManagerService.update$.subscribe((e) => {
|
|
1933
1935
|
e.forEach((n) => {
|
|
1934
1936
|
const t = this._drawingManagerService.getDrawingByParam(n);
|
|
1935
|
-
if (!t || t.drawingType !==
|
|
1937
|
+
if (!t || t.drawingType !== Ne.DRAWING_DOM)
|
|
1936
1938
|
return;
|
|
1937
1939
|
const o = {
|
|
1938
1940
|
...t.transform
|
|
@@ -1952,20 +1954,20 @@ let We = class extends Me {
|
|
|
1952
1954
|
);
|
|
1953
1955
|
}
|
|
1954
1956
|
addFloatDomToPosition(e) {
|
|
1955
|
-
const n =
|
|
1957
|
+
const n = re(this._univerInstanceService, {
|
|
1956
1958
|
unitId: e.unitId,
|
|
1957
1959
|
subUnitId: e.subUnitId
|
|
1958
1960
|
});
|
|
1959
1961
|
if (!n)
|
|
1960
1962
|
throw new Error("cannot find current target!");
|
|
1961
|
-
const { unitId: t, subUnitId: o } = n, { initPosition: i, componentKey: s } = e, a =
|
|
1963
|
+
const { unitId: t, subUnitId: o } = n, { initPosition: i, componentKey: s } = e, a = ne.generateRandomId(), c = this._getPosition(i);
|
|
1962
1964
|
if (c == null)
|
|
1963
1965
|
return;
|
|
1964
1966
|
const u = {
|
|
1965
1967
|
unitId: t,
|
|
1966
1968
|
subUnitId: o,
|
|
1967
1969
|
drawingId: a,
|
|
1968
|
-
drawingType:
|
|
1970
|
+
drawingType: Ne.DRAWING_DOM,
|
|
1969
1971
|
componentKey: s,
|
|
1970
1972
|
sheetTransform: c,
|
|
1971
1973
|
transform: {
|
|
@@ -1975,7 +1977,7 @@ let We = class extends Me {
|
|
|
1975
1977
|
height: i.endY - i.startY
|
|
1976
1978
|
}
|
|
1977
1979
|
};
|
|
1978
|
-
return this._commandService.executeCommand(
|
|
1980
|
+
return this._commandService.executeCommand(He.id, {
|
|
1979
1981
|
unitId: t,
|
|
1980
1982
|
drawings: [u]
|
|
1981
1983
|
}), this._ensureMap(t, o).set(a, e), {
|
|
@@ -1997,32 +1999,86 @@ let We = class extends Me {
|
|
|
1997
1999
|
if (!c)
|
|
1998
2000
|
return;
|
|
1999
2001
|
const u = this._sheetDrawingService.getBatchRemoveOp([c]), { redo: d, objects: l } = u;
|
|
2000
|
-
this._commandService.syncExecuteCommand(b.id, { unitId: o, subUnitId: i, op: d, objects: l, type:
|
|
2002
|
+
this._commandService.syncExecuteCommand(b.id, { unitId: o, subUnitId: i, op: d, objects: l, type: P.REMOVE });
|
|
2001
2003
|
}
|
|
2002
2004
|
}
|
|
2003
2005
|
};
|
|
2004
|
-
|
|
2005
|
-
|
|
2006
|
-
|
|
2007
|
-
|
|
2008
|
-
|
|
2009
|
-
|
|
2010
|
-
|
|
2011
|
-
|
|
2012
|
-
|
|
2013
|
-
|
|
2014
|
-
var
|
|
2015
|
-
for (var o = t > 1 ? void 0 : t ? Ar(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
2006
|
+
Fe = Yr([
|
|
2007
|
+
Q(0, W(se)),
|
|
2008
|
+
Q(1, ue),
|
|
2009
|
+
Q(2, W(B)),
|
|
2010
|
+
Q(3, k),
|
|
2011
|
+
Q(4, Te),
|
|
2012
|
+
Q(5, W(On)),
|
|
2013
|
+
Q(6, Y)
|
|
2014
|
+
], Fe);
|
|
2015
|
+
var Hr = Object.defineProperty, kr = Object.getOwnPropertyDescriptor, zr = (r, e, n, t) => {
|
|
2016
|
+
for (var o = t > 1 ? void 0 : t ? kr(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
2016
2017
|
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
2017
|
-
return t && o &&
|
|
2018
|
-
},
|
|
2019
|
-
|
|
2020
|
-
|
|
2021
|
-
|
|
2018
|
+
return t && o && Hr(e, n, o), o;
|
|
2019
|
+
}, Ce = (r, e) => (n, t) => e(n, t, r);
|
|
2020
|
+
let Me = class extends ge {
|
|
2021
|
+
constructor(r, e, n, t) {
|
|
2022
|
+
super(), this._sheetPrintInterceptorService = r, this._drawingRenderService = e, this._drawingManagerService = n, this._renderManagerService = t, this._initPrinting();
|
|
2023
|
+
}
|
|
2024
|
+
_initPrinting() {
|
|
2025
|
+
this.disposeWithMe(
|
|
2026
|
+
this._sheetPrintInterceptorService.interceptor.intercept(
|
|
2027
|
+
this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_COMPONENT_COLLECT,
|
|
2028
|
+
{
|
|
2029
|
+
handler: (r, e, n) => {
|
|
2030
|
+
const { unitId: t, scene: o, subUnitId: i } = e, s = this._drawingManagerService.getDrawingDataForUnit(t), a = s == null ? void 0 : s[i];
|
|
2031
|
+
return a && a.order.forEach((c) => {
|
|
2032
|
+
this._drawingRenderService.renderDrawing(a.data[c], o);
|
|
2033
|
+
}), n();
|
|
2034
|
+
}
|
|
2035
|
+
}
|
|
2036
|
+
)
|
|
2037
|
+
), this.disposeWithMe(
|
|
2038
|
+
this._sheetPrintInterceptorService.interceptor.intercept(
|
|
2039
|
+
this._sheetPrintInterceptorService.interceptor.getInterceptPoints().PRINTING_RANGE,
|
|
2040
|
+
{
|
|
2041
|
+
handler: (r, e, n) => {
|
|
2042
|
+
const { unitId: t, subUnitId: o } = e, i = this._renderManagerService.getRenderById(t);
|
|
2043
|
+
if (!i)
|
|
2044
|
+
return n(r);
|
|
2045
|
+
const s = i.with(Be).getUnitSkeleton(t, o);
|
|
2046
|
+
if (!s)
|
|
2047
|
+
return n(r);
|
|
2048
|
+
const a = this._drawingManagerService.getDrawingDataForUnit(t), c = a == null ? void 0 : a[e.subUnitId];
|
|
2049
|
+
if (!c)
|
|
2050
|
+
return n(r);
|
|
2051
|
+
const { scaleX: u, scaleY: d } = i.scene, l = r ? { ...r } : { startColumn: 0, endColumn: 0, endRow: 0, startRow: 0 }, h = c.order.map((m) => c.data[m]).filter((m) => m.drawingType !== ye.DRAWING_DOM);
|
|
2052
|
+
return h.length ? (h.forEach((m) => {
|
|
2053
|
+
if (!m.groupId && m.transform && ne.isDefine(m.transform.left) && ne.isDefine(m.transform.top) && ne.isDefine(m.transform.width) && ne.isDefine(m.transform.height)) {
|
|
2054
|
+
const f = s.skeleton.getCellPositionByOffset(m.transform.left, m.transform.top, u, d, { x: 0, y: 0 }), g = s.skeleton.getCellPositionByOffset(m.transform.left + m.transform.width, m.transform.top + m.transform.height, u, d, { x: 0, y: 0 });
|
|
2055
|
+
f.column < l.startColumn && (l.startColumn = f.column), f.row < l.startRow && (l.startRow = f.row), l.endRow < g.row && (l.endRow = g.row), l.endColumn < g.column && (l.endColumn = g.column);
|
|
2056
|
+
}
|
|
2057
|
+
}), n(l)) : n(r);
|
|
2058
|
+
}
|
|
2059
|
+
}
|
|
2060
|
+
)
|
|
2061
|
+
);
|
|
2062
|
+
}
|
|
2063
|
+
};
|
|
2064
|
+
Me = zr([
|
|
2065
|
+
me(he.Rendered, Me),
|
|
2066
|
+
Ce(0, W(fn)),
|
|
2067
|
+
Ce(1, W(Zt)),
|
|
2068
|
+
Ce(2, k),
|
|
2069
|
+
Ce(3, se)
|
|
2070
|
+
], Me);
|
|
2071
|
+
var Lt = Object.defineProperty, Kr = Object.getOwnPropertyDescriptor, Jr = (r, e, n) => e in r ? Lt(r, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : r[e] = n, Zr = (r, e, n, t) => {
|
|
2072
|
+
for (var o = t > 1 ? void 0 : t ? Kr(e, n) : e, i = r.length - 1, s; i >= 0; i--)
|
|
2073
|
+
(s = r[i]) && (o = (t ? s(e, n, o) : s(o)) || o);
|
|
2074
|
+
return t && o && Lt(e, n, o), o;
|
|
2075
|
+
}, et = (r, e) => (n, t) => e(n, t, r), jt = (r, e, n) => (Jr(r, typeof e != "symbol" ? e + "" : e, n), n);
|
|
2076
|
+
const qr = "SHEET_IMAGE_UI_PLUGIN";
|
|
2077
|
+
let Pe = class extends Yt {
|
|
2022
2078
|
constructor(e = {}, n, t) {
|
|
2023
2079
|
super();
|
|
2024
|
-
|
|
2025
|
-
this._injector = n, this._localeService = t, this._pluginConfig =
|
|
2080
|
+
H(this, "_pluginConfig");
|
|
2081
|
+
this._injector = n, this._localeService = t, this._pluginConfig = ne.deepMerge({}, jr, e);
|
|
2026
2082
|
}
|
|
2027
2083
|
onStarting(e) {
|
|
2028
2084
|
super.onStarting(e), this._initDependencies(e);
|
|
@@ -2030,25 +2086,29 @@ let Je = (we = class extends xt {
|
|
|
2030
2086
|
_initDependencies(e) {
|
|
2031
2087
|
[
|
|
2032
2088
|
// services
|
|
2033
|
-
[
|
|
2089
|
+
[Fe],
|
|
2034
2090
|
// controllers
|
|
2035
2091
|
[
|
|
2036
|
-
|
|
2092
|
+
ce,
|
|
2037
2093
|
{
|
|
2038
|
-
useFactory: () => this._injector.createInstance(
|
|
2094
|
+
useFactory: () => this._injector.createInstance(ce, this._pluginConfig)
|
|
2039
2095
|
}
|
|
2040
2096
|
],
|
|
2041
|
-
[
|
|
2042
|
-
[
|
|
2043
|
-
[
|
|
2097
|
+
[Ie],
|
|
2098
|
+
[Re],
|
|
2099
|
+
[De],
|
|
2100
|
+
[Me]
|
|
2044
2101
|
].forEach((t) => e.add(t));
|
|
2045
2102
|
}
|
|
2046
|
-
}
|
|
2047
|
-
|
|
2048
|
-
|
|
2049
|
-
|
|
2050
|
-
|
|
2103
|
+
};
|
|
2104
|
+
jt(Pe, "type", ee.UNIVER_SHEET);
|
|
2105
|
+
jt(Pe, "pluginName", qr);
|
|
2106
|
+
Pe = Zr([
|
|
2107
|
+
Xt(on, qt, Qt),
|
|
2108
|
+
et(1, W(Ve)),
|
|
2109
|
+
et(2, W(de))
|
|
2110
|
+
], Pe);
|
|
2051
2111
|
export {
|
|
2052
|
-
|
|
2053
|
-
|
|
2112
|
+
Fe as SheetCanvasFloatDomManagerService,
|
|
2113
|
+
Pe as UniverSheetsDrawingUIPlugin
|
|
2054
2114
|
};
|