@idraw/core 0.4.0 → 0.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.global.js +358 -333
- package/dist/index.global.min.js +1 -1
- package/package.json +4 -4
package/dist/index.global.js
CHANGED
|
@@ -85,16 +85,16 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
85
85
|
});
|
|
86
86
|
function deepClone(target) {
|
|
87
87
|
function _clone(t) {
|
|
88
|
-
const
|
|
89
|
-
if (["Null", "Number", "String", "Boolean", "Undefined"].indexOf(
|
|
88
|
+
const type2 = is$1(t);
|
|
89
|
+
if (["Null", "Number", "String", "Boolean", "Undefined"].indexOf(type2) >= 0) {
|
|
90
90
|
return t;
|
|
91
|
-
} else if (
|
|
91
|
+
} else if (type2 === "Array") {
|
|
92
92
|
const arr = [];
|
|
93
93
|
t.forEach((item) => {
|
|
94
94
|
arr.push(_clone(item));
|
|
95
95
|
});
|
|
96
96
|
return arr;
|
|
97
|
-
} else if (
|
|
97
|
+
} else if (type2 === "Object") {
|
|
98
98
|
const obj = {};
|
|
99
99
|
const keys = Object.keys(t);
|
|
100
100
|
keys.forEach((key2) => {
|
|
@@ -112,45 +112,45 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
112
112
|
function is$1(target) {
|
|
113
113
|
return Object.prototype.toString.call(target).replace(/[\]|\[]{1,1}/gi, "").split(" ")[1];
|
|
114
114
|
}
|
|
115
|
-
function parsePrototype(
|
|
116
|
-
const typeStr = Object.prototype.toString.call(
|
|
115
|
+
function parsePrototype(data2) {
|
|
116
|
+
const typeStr = Object.prototype.toString.call(data2) || "";
|
|
117
117
|
const result = typeStr.replace(/(\[object|\])/gi, "").trim();
|
|
118
118
|
return result;
|
|
119
119
|
}
|
|
120
120
|
const istype = {
|
|
121
|
-
type(
|
|
122
|
-
const result = parsePrototype(
|
|
121
|
+
type(data2, lowerCase) {
|
|
122
|
+
const result = parsePrototype(data2);
|
|
123
123
|
return lowerCase === true ? result.toLocaleLowerCase() : result;
|
|
124
124
|
},
|
|
125
|
-
array(
|
|
126
|
-
return parsePrototype(
|
|
125
|
+
array(data2) {
|
|
126
|
+
return parsePrototype(data2) === "Array";
|
|
127
127
|
},
|
|
128
|
-
json(
|
|
129
|
-
return parsePrototype(
|
|
128
|
+
json(data2) {
|
|
129
|
+
return parsePrototype(data2) === "Object";
|
|
130
130
|
},
|
|
131
|
-
function(
|
|
132
|
-
return parsePrototype(
|
|
131
|
+
function(data2) {
|
|
132
|
+
return parsePrototype(data2) === "Function";
|
|
133
133
|
},
|
|
134
|
-
asyncFunction(
|
|
135
|
-
return parsePrototype(
|
|
134
|
+
asyncFunction(data2) {
|
|
135
|
+
return parsePrototype(data2) === "AsyncFunction";
|
|
136
136
|
},
|
|
137
|
-
boolean(
|
|
138
|
-
return parsePrototype(
|
|
137
|
+
boolean(data2) {
|
|
138
|
+
return parsePrototype(data2) === "Boolean";
|
|
139
139
|
},
|
|
140
|
-
string(
|
|
141
|
-
return parsePrototype(
|
|
140
|
+
string(data2) {
|
|
141
|
+
return parsePrototype(data2) === "String";
|
|
142
142
|
},
|
|
143
|
-
number(
|
|
144
|
-
return parsePrototype(
|
|
143
|
+
number(data2) {
|
|
144
|
+
return parsePrototype(data2) === "Number";
|
|
145
145
|
},
|
|
146
|
-
undefined(
|
|
147
|
-
return parsePrototype(
|
|
146
|
+
undefined(data2) {
|
|
147
|
+
return parsePrototype(data2) === "Undefined";
|
|
148
148
|
},
|
|
149
|
-
null(
|
|
150
|
-
return parsePrototype(
|
|
149
|
+
null(data2) {
|
|
150
|
+
return parsePrototype(data2) === "Null";
|
|
151
151
|
},
|
|
152
|
-
promise(
|
|
153
|
-
return parsePrototype(
|
|
152
|
+
promise(data2) {
|
|
153
|
+
return parsePrototype(data2) === "Promise";
|
|
154
154
|
}
|
|
155
155
|
};
|
|
156
156
|
function parseHTMLToDataURL(html2, opts) {
|
|
@@ -333,8 +333,33 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
333
333
|
function numberStr(value) {
|
|
334
334
|
return /^(-?\d+(?:\.\d+)?)$/.test(`${value}`);
|
|
335
335
|
}
|
|
336
|
+
function type(value) {
|
|
337
|
+
return ["rect", "circle", "text", "image", "svg", "html", "group"].includes(value);
|
|
338
|
+
}
|
|
339
|
+
function element(elem) {
|
|
340
|
+
if (!elem) {
|
|
341
|
+
return false;
|
|
342
|
+
}
|
|
343
|
+
return type(elem === null || elem === void 0 ? void 0 : elem.type) && x(elem === null || elem === void 0 ? void 0 : elem.x) && y(elem === null || elem === void 0 ? void 0 : elem.y) && w(elem === null || elem === void 0 ? void 0 : elem.w) && h(elem === null || elem === void 0 ? void 0 : elem.h);
|
|
344
|
+
}
|
|
345
|
+
function layout(value) {
|
|
346
|
+
if (!value) {
|
|
347
|
+
return false;
|
|
348
|
+
}
|
|
349
|
+
return x(value === null || value === void 0 ? void 0 : value.x) && y(value === null || value === void 0 ? void 0 : value.y) && w(value === null || value === void 0 ? void 0 : value.w) && h(value === null || value === void 0 ? void 0 : value.h);
|
|
350
|
+
}
|
|
351
|
+
function data(d) {
|
|
352
|
+
if (Array(d === null || d === void 0 ? void 0 : d.elements) && (d === null || d === void 0 ? void 0 : d.elements.length) >= 0) {
|
|
353
|
+
return true;
|
|
354
|
+
}
|
|
355
|
+
return false;
|
|
356
|
+
}
|
|
336
357
|
const is = {
|
|
337
358
|
positiveNum,
|
|
359
|
+
data,
|
|
360
|
+
element,
|
|
361
|
+
layout,
|
|
362
|
+
type,
|
|
338
363
|
x,
|
|
339
364
|
y,
|
|
340
365
|
w,
|
|
@@ -1454,7 +1479,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
1454
1479
|
}
|
|
1455
1480
|
function getViewPointAtElement(p, opts) {
|
|
1456
1481
|
var _a, _b, _c;
|
|
1457
|
-
const { context2d: ctx, data, viewScaleInfo, viewSizeInfo, groupQueue } = opts;
|
|
1482
|
+
const { context2d: ctx, data: data2, viewScaleInfo, viewSizeInfo, groupQueue } = opts;
|
|
1458
1483
|
const result = {
|
|
1459
1484
|
index: -1,
|
|
1460
1485
|
element: null,
|
|
@@ -1505,8 +1530,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
1505
1530
|
if (result.element) {
|
|
1506
1531
|
return result;
|
|
1507
1532
|
}
|
|
1508
|
-
for (let i =
|
|
1509
|
-
const elem =
|
|
1533
|
+
for (let i = data2.elements.length - 1; i >= 0; i--) {
|
|
1534
|
+
const elem = data2.elements[i];
|
|
1510
1535
|
if (((_c = elem === null || elem === void 0 ? void 0 : elem.operations) === null || _c === void 0 ? void 0 : _c.invisible) === true) {
|
|
1511
1536
|
continue;
|
|
1512
1537
|
}
|
|
@@ -2060,8 +2085,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2060
2085
|
function toFlattenElement(elem) {
|
|
2061
2086
|
return flatObject(elem, { ignorePaths: ["detail.children"] });
|
|
2062
2087
|
}
|
|
2063
|
-
function toFlattenLayout(
|
|
2064
|
-
return flatObject(
|
|
2088
|
+
function toFlattenLayout(layout2) {
|
|
2089
|
+
return flatObject(layout2);
|
|
2065
2090
|
}
|
|
2066
2091
|
function toFlattenGlobal(global) {
|
|
2067
2092
|
return flatObject(global);
|
|
@@ -2248,14 +2273,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2248
2273
|
return record;
|
|
2249
2274
|
}
|
|
2250
2275
|
function deepResizeElementByRatio(elem, opts, record) {
|
|
2251
|
-
const { type, uuid } = elem;
|
|
2276
|
+
const { type: type2, uuid } = elem;
|
|
2252
2277
|
const rootRecord = resizeElementBaseByRatio(elem, opts);
|
|
2253
2278
|
const rootRecordBefore = Object.assign(Object.assign({}, rootRecord.content.before), { uuid });
|
|
2254
2279
|
const rootRecordAfter = Object.assign(Object.assign({}, rootRecord.content.after), { uuid });
|
|
2255
2280
|
record === null || record === void 0 ? void 0 : record.content.before.push(rootRecordBefore);
|
|
2256
2281
|
record === null || record === void 0 ? void 0 : record.content.after.push(rootRecordAfter);
|
|
2257
|
-
if (
|
|
2258
|
-
else if (
|
|
2282
|
+
if (type2 === "circle") ;
|
|
2283
|
+
else if (type2 === "text") {
|
|
2259
2284
|
const textRecord = resizeTextElementDetailByRatio(elem, opts);
|
|
2260
2285
|
Object.keys(textRecord.content.before || {}).forEach((key2) => {
|
|
2261
2286
|
var _a;
|
|
@@ -2265,11 +2290,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2265
2290
|
var _a;
|
|
2266
2291
|
rootRecordAfter[key2] = (_a = textRecord.content.after) === null || _a === void 0 ? void 0 : _a[key2];
|
|
2267
2292
|
});
|
|
2268
|
-
} else if (
|
|
2269
|
-
else if (
|
|
2270
|
-
else if (
|
|
2271
|
-
else if (
|
|
2272
|
-
else if (
|
|
2293
|
+
} else if (type2 === "image") ;
|
|
2294
|
+
else if (type2 === "svg") ;
|
|
2295
|
+
else if (type2 === "html") ;
|
|
2296
|
+
else if (type2 === "path") ;
|
|
2297
|
+
else if (type2 === "group" && Array.isArray(elem.detail.children)) {
|
|
2273
2298
|
elem.detail.children.forEach((child) => {
|
|
2274
2299
|
deepResizeElementByRatio(child, opts, record);
|
|
2275
2300
|
});
|
|
@@ -2377,7 +2402,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2377
2402
|
}
|
|
2378
2403
|
const defaultViewWidth = 200;
|
|
2379
2404
|
const defaultViewHeight = 200;
|
|
2380
|
-
function createElementSize(
|
|
2405
|
+
function createElementSize(type2, opts) {
|
|
2381
2406
|
let x2 = 0;
|
|
2382
2407
|
let y2 = 0;
|
|
2383
2408
|
let w2 = defaultViewWidth;
|
|
@@ -2398,9 +2423,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2398
2423
|
} else {
|
|
2399
2424
|
h2 = defaultViewHeight / scale;
|
|
2400
2425
|
}
|
|
2401
|
-
if (["circle", "svg", "image"].includes(
|
|
2426
|
+
if (["circle", "svg", "image"].includes(type2)) {
|
|
2402
2427
|
w2 = h2 = Math.max(w2, h2);
|
|
2403
|
-
} else if (
|
|
2428
|
+
} else if (type2 === "text") {
|
|
2404
2429
|
const fontSize2 = w2 / defaultText.length;
|
|
2405
2430
|
h2 = fontSize2 * 2;
|
|
2406
2431
|
}
|
|
@@ -2415,30 +2440,30 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2415
2440
|
};
|
|
2416
2441
|
return elemSize;
|
|
2417
2442
|
}
|
|
2418
|
-
function createElement(
|
|
2419
|
-
const elementSize = createElementSize(
|
|
2443
|
+
function createElement(type2, baseElem, opts) {
|
|
2444
|
+
const elementSize = createElementSize(type2, opts);
|
|
2420
2445
|
let detail = {};
|
|
2421
|
-
if (
|
|
2446
|
+
if (type2 === "rect") {
|
|
2422
2447
|
detail = getDefaultElementRectDetail();
|
|
2423
|
-
} else if (
|
|
2448
|
+
} else if (type2 === "circle") {
|
|
2424
2449
|
detail = getDefaultElementCircleDetail();
|
|
2425
|
-
} else if (
|
|
2450
|
+
} else if (type2 === "text") {
|
|
2426
2451
|
detail = getDefaultElementTextDetail(elementSize);
|
|
2427
|
-
} else if (
|
|
2452
|
+
} else if (type2 === "svg") {
|
|
2428
2453
|
detail = getDefaultElementSVGDetail();
|
|
2429
|
-
} else if (
|
|
2454
|
+
} else if (type2 === "image") {
|
|
2430
2455
|
detail = getDefaultElementImageDetail();
|
|
2431
|
-
} else if (
|
|
2456
|
+
} else if (type2 === "group") {
|
|
2432
2457
|
detail = getDefaultElementGroupDetail();
|
|
2433
2458
|
}
|
|
2434
|
-
const elem = Object.assign(Object.assign(Object.assign({ uuid: createUUID() }, elementSize), baseElem), { type, detail: Object.assign(Object.assign({}, detail), baseElem.detail || {}) });
|
|
2459
|
+
const elem = Object.assign(Object.assign(Object.assign({ uuid: createUUID() }, elementSize), baseElem), { type: type2, detail: Object.assign(Object.assign({}, detail), baseElem.detail || {}) });
|
|
2435
2460
|
return elem;
|
|
2436
2461
|
}
|
|
2437
|
-
function insertElementToListByPosition(
|
|
2462
|
+
function insertElementToListByPosition(element2, position, list) {
|
|
2438
2463
|
let result = false;
|
|
2439
2464
|
if (position.length === 1) {
|
|
2440
2465
|
const pos = position[0];
|
|
2441
|
-
list.splice(pos, 0,
|
|
2466
|
+
list.splice(pos, 0, element2);
|
|
2442
2467
|
result = true;
|
|
2443
2468
|
} else if (position.length > 1) {
|
|
2444
2469
|
let tempList = list;
|
|
@@ -2447,7 +2472,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
2447
2472
|
const item = tempList[pos];
|
|
2448
2473
|
if (i === position.length - 1) {
|
|
2449
2474
|
const pos2 = position[i];
|
|
2450
|
-
tempList.splice(pos2, 0,
|
|
2475
|
+
tempList.splice(pos2, 0, element2);
|
|
2451
2476
|
result = true;
|
|
2452
2477
|
} else if (i < position.length - 1 && item.type === "group") {
|
|
2453
2478
|
tempList = item.detail.children;
|
|
@@ -3529,14 +3554,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3529
3554
|
});
|
|
3530
3555
|
}
|
|
3531
3556
|
const defaultDetail = getDefaultElementDetailConfig();
|
|
3532
|
-
function drawElementList(ctx,
|
|
3557
|
+
function drawElementList(ctx, data2, opts) {
|
|
3533
3558
|
var _a;
|
|
3534
|
-
const { elements = [] } =
|
|
3559
|
+
const { elements = [] } = data2;
|
|
3535
3560
|
const { parentOpacity } = opts;
|
|
3536
3561
|
for (let i = 0; i < elements.length; i++) {
|
|
3537
|
-
const
|
|
3538
|
-
const elem = Object.assign(Object.assign({},
|
|
3539
|
-
detail: Object.assign(Object.assign({}, defaultDetail),
|
|
3562
|
+
const element2 = elements[i];
|
|
3563
|
+
const elem = Object.assign(Object.assign({}, element2), {
|
|
3564
|
+
detail: Object.assign(Object.assign({}, defaultDetail), element2 === null || element2 === void 0 ? void 0 : element2.detail)
|
|
3540
3565
|
});
|
|
3541
3566
|
if (opts.forceDrawAll !== true) {
|
|
3542
3567
|
if (!((_a = opts.calculator) === null || _a === void 0 ? void 0 : _a.needRender(elem))) {
|
|
@@ -3552,9 +3577,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3552
3577
|
}
|
|
3553
3578
|
}
|
|
3554
3579
|
}
|
|
3555
|
-
function drawLayout(ctx,
|
|
3580
|
+
function drawLayout(ctx, layout2, opts, renderContent) {
|
|
3556
3581
|
const { viewScaleInfo, viewSizeInfo, parentOpacity } = opts;
|
|
3557
|
-
const elem = Object.assign({ uuid: "layout", type: "group" },
|
|
3582
|
+
const elem = Object.assign({ uuid: "layout", type: "group" }, layout2);
|
|
3558
3583
|
const { x: x2, y: y2, w: w2, h: h2 } = calcViewElementSize(elem, { viewScaleInfo }) || elem;
|
|
3559
3584
|
const angle2 = 0;
|
|
3560
3585
|
const viewElem = Object.assign(Object.assign({}, elem), { x: x2, y: y2, w: w2, h: h2, angle: angle2 });
|
|
@@ -3565,9 +3590,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3565
3590
|
drawBoxBackground(ctx, viewElem, { viewScaleInfo, viewSizeInfo });
|
|
3566
3591
|
}
|
|
3567
3592
|
});
|
|
3568
|
-
if (
|
|
3593
|
+
if (layout2.detail.overflow === "hidden") {
|
|
3569
3594
|
const { viewScaleInfo: viewScaleInfo2, viewSizeInfo: viewSizeInfo2 } = opts;
|
|
3570
|
-
const elem2 = Object.assign({ uuid: "layout", type: "group" },
|
|
3595
|
+
const elem2 = Object.assign({ uuid: "layout", type: "group" }, layout2);
|
|
3571
3596
|
const viewElemSize = calcViewElementSize(elem2, { viewScaleInfo: viewScaleInfo2 }) || elem2;
|
|
3572
3597
|
const viewElem2 = Object.assign(Object.assign({}, elem2), viewElemSize);
|
|
3573
3598
|
const { x: x3, y: y3, w: w3, h: h3, radiusList } = calcViewBoxSize(viewElem2, {
|
|
@@ -3586,7 +3611,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3586
3611
|
ctx.clip("nonzero");
|
|
3587
3612
|
}
|
|
3588
3613
|
renderContent(ctx);
|
|
3589
|
-
if (
|
|
3614
|
+
if (layout2.detail.overflow === "hidden") {
|
|
3590
3615
|
ctx.restore();
|
|
3591
3616
|
}
|
|
3592
3617
|
drawBoxBorder(ctx, viewElem, { viewScaleInfo });
|
|
@@ -3641,23 +3666,23 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3641
3666
|
};
|
|
3642
3667
|
var _Loader_instances, _Loader_loadFuncMap, _Loader_currentLoadItemMap, _Loader_storageLoadItemMap, _Loader_hasDestroyed, _Loader_registerLoadFunc, _Loader_getLoadElementSource, _Loader_createLoadItem, _Loader_emitLoad, _Loader_emitError, _Loader_loadResource, _Loader_isExistingErrorStorage;
|
|
3643
3668
|
const supportElementTypes = ["image", "svg", "html"];
|
|
3644
|
-
const getAssetIdFromElement = (
|
|
3669
|
+
const getAssetIdFromElement = (element2) => {
|
|
3645
3670
|
var _a, _b, _c;
|
|
3646
3671
|
let source = null;
|
|
3647
|
-
if (
|
|
3648
|
-
source = ((_a =
|
|
3649
|
-
} else if (
|
|
3650
|
-
source = ((_b =
|
|
3651
|
-
} else if (
|
|
3652
|
-
source = ((_c =
|
|
3672
|
+
if (element2.type === "image") {
|
|
3673
|
+
source = ((_a = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _a === void 0 ? void 0 : _a.src) || null;
|
|
3674
|
+
} else if (element2.type === "svg") {
|
|
3675
|
+
source = ((_b = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _b === void 0 ? void 0 : _b.svg) || null;
|
|
3676
|
+
} else if (element2.type === "html") {
|
|
3677
|
+
source = ((_c = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _c === void 0 ? void 0 : _c.html) || null;
|
|
3653
3678
|
}
|
|
3654
3679
|
if (typeof source === "string" && source) {
|
|
3655
3680
|
if (isAssetId(source)) {
|
|
3656
3681
|
return source;
|
|
3657
3682
|
}
|
|
3658
|
-
return createAssetId(source,
|
|
3683
|
+
return createAssetId(source, element2.uuid);
|
|
3659
3684
|
}
|
|
3660
|
-
return createAssetId(`${createUUID()}-${
|
|
3685
|
+
return createAssetId(`${createUUID()}-${element2.uuid}-${createUUID()}-${createUUID()}`, element2.uuid);
|
|
3661
3686
|
};
|
|
3662
3687
|
class Loader extends EventEmitter {
|
|
3663
3688
|
constructor() {
|
|
@@ -3711,24 +3736,24 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3711
3736
|
__classPrivateFieldSet$2(this, _Loader_currentLoadItemMap, {}, "f");
|
|
3712
3737
|
__classPrivateFieldSet$2(this, _Loader_storageLoadItemMap, {}, "f");
|
|
3713
3738
|
}
|
|
3714
|
-
resetElementAsset(
|
|
3739
|
+
resetElementAsset(element2) {
|
|
3715
3740
|
var _a, _b, _c;
|
|
3716
|
-
if (supportElementTypes.includes(
|
|
3741
|
+
if (supportElementTypes.includes(element2.type)) {
|
|
3717
3742
|
let assetId = null;
|
|
3718
3743
|
let resource = null;
|
|
3719
|
-
if (
|
|
3720
|
-
resource =
|
|
3721
|
-
} else if (
|
|
3722
|
-
resource =
|
|
3723
|
-
} else if (
|
|
3724
|
-
resource =
|
|
3744
|
+
if (element2.type === "image" && typeof ((_a = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _a === void 0 ? void 0 : _a.src) === "string") {
|
|
3745
|
+
resource = element2.detail.src;
|
|
3746
|
+
} else if (element2.type === "svg" && typeof ((_b = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _b === void 0 ? void 0 : _b.svg) === "string") {
|
|
3747
|
+
resource = element2.detail.svg;
|
|
3748
|
+
} else if (element2.type === "html" && typeof ((_c = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _c === void 0 ? void 0 : _c.html) === "string") {
|
|
3749
|
+
resource = element2.detail.html;
|
|
3725
3750
|
}
|
|
3726
3751
|
if (typeof resource === "string") {
|
|
3727
|
-
this.load(
|
|
3752
|
+
this.load(element2, {});
|
|
3728
3753
|
if (isAssetId(resource)) {
|
|
3729
3754
|
assetId = resource;
|
|
3730
|
-
} else if (
|
|
3731
|
-
assetId = createAssetId(resource,
|
|
3755
|
+
} else if (element2.uuid) {
|
|
3756
|
+
assetId = createAssetId(resource, element2.uuid);
|
|
3732
3757
|
}
|
|
3733
3758
|
}
|
|
3734
3759
|
if (assetId && isAssetId(assetId)) {
|
|
@@ -3744,20 +3769,20 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3744
3769
|
__classPrivateFieldSet$2(this, _Loader_currentLoadItemMap, null, "f");
|
|
3745
3770
|
__classPrivateFieldSet$2(this, _Loader_storageLoadItemMap, null, "f");
|
|
3746
3771
|
}
|
|
3747
|
-
load(
|
|
3772
|
+
load(element2, assets) {
|
|
3748
3773
|
if (__classPrivateFieldGet$2(this, _Loader_hasDestroyed, "f") === true) {
|
|
3749
3774
|
return;
|
|
3750
3775
|
}
|
|
3751
|
-
if (__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_isExistingErrorStorage).call(this,
|
|
3776
|
+
if (__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_isExistingErrorStorage).call(this, element2)) {
|
|
3752
3777
|
return;
|
|
3753
3778
|
}
|
|
3754
|
-
if (supportElementTypes.includes(
|
|
3755
|
-
__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_loadResource).call(this,
|
|
3779
|
+
if (supportElementTypes.includes(element2.type)) {
|
|
3780
|
+
__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_loadResource).call(this, element2, assets);
|
|
3756
3781
|
}
|
|
3757
3782
|
}
|
|
3758
|
-
getContent(
|
|
3783
|
+
getContent(element2) {
|
|
3759
3784
|
var _a, _b;
|
|
3760
|
-
const assetId = getAssetIdFromElement(
|
|
3785
|
+
const assetId = getAssetIdFromElement(element2);
|
|
3761
3786
|
return ((_b = (_a = __classPrivateFieldGet$2(this, _Loader_storageLoadItemMap, "f")) === null || _a === void 0 ? void 0 : _a[assetId]) === null || _b === void 0 ? void 0 : _b.content) || null;
|
|
3762
3787
|
}
|
|
3763
3788
|
getLoadItemMap() {
|
|
@@ -3767,28 +3792,28 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3767
3792
|
__classPrivateFieldSet$2(this, _Loader_storageLoadItemMap, itemMap, "f");
|
|
3768
3793
|
}
|
|
3769
3794
|
}
|
|
3770
|
-
_Loader_loadFuncMap = /* @__PURE__ */ new WeakMap(), _Loader_currentLoadItemMap = /* @__PURE__ */ new WeakMap(), _Loader_storageLoadItemMap = /* @__PURE__ */ new WeakMap(), _Loader_hasDestroyed = /* @__PURE__ */ new WeakMap(), _Loader_instances = /* @__PURE__ */ new WeakSet(), _Loader_registerLoadFunc = function _Loader_registerLoadFunc2(
|
|
3771
|
-
__classPrivateFieldGet$2(this, _Loader_loadFuncMap, "f")[
|
|
3772
|
-
}, _Loader_getLoadElementSource = function _Loader_getLoadElementSource2(
|
|
3795
|
+
_Loader_loadFuncMap = /* @__PURE__ */ new WeakMap(), _Loader_currentLoadItemMap = /* @__PURE__ */ new WeakMap(), _Loader_storageLoadItemMap = /* @__PURE__ */ new WeakMap(), _Loader_hasDestroyed = /* @__PURE__ */ new WeakMap(), _Loader_instances = /* @__PURE__ */ new WeakSet(), _Loader_registerLoadFunc = function _Loader_registerLoadFunc2(type2, func) {
|
|
3796
|
+
__classPrivateFieldGet$2(this, _Loader_loadFuncMap, "f")[type2] = func;
|
|
3797
|
+
}, _Loader_getLoadElementSource = function _Loader_getLoadElementSource2(element2) {
|
|
3773
3798
|
var _a, _b, _c;
|
|
3774
3799
|
let source = null;
|
|
3775
|
-
if (
|
|
3776
|
-
source = ((_a =
|
|
3777
|
-
} else if (
|
|
3778
|
-
source = ((_b =
|
|
3779
|
-
} else if (
|
|
3780
|
-
source = ((_c =
|
|
3800
|
+
if (element2.type === "image") {
|
|
3801
|
+
source = ((_a = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _a === void 0 ? void 0 : _a.src) || null;
|
|
3802
|
+
} else if (element2.type === "svg") {
|
|
3803
|
+
source = ((_b = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _b === void 0 ? void 0 : _b.svg) || null;
|
|
3804
|
+
} else if (element2.type === "html") {
|
|
3805
|
+
source = ((_c = element2 === null || element2 === void 0 ? void 0 : element2.detail) === null || _c === void 0 ? void 0 : _c.html) || null;
|
|
3781
3806
|
}
|
|
3782
3807
|
return source;
|
|
3783
|
-
}, _Loader_createLoadItem = function _Loader_createLoadItem2(
|
|
3808
|
+
}, _Loader_createLoadItem = function _Loader_createLoadItem2(element2) {
|
|
3784
3809
|
return {
|
|
3785
|
-
element,
|
|
3810
|
+
element: element2,
|
|
3786
3811
|
status: "null",
|
|
3787
3812
|
content: null,
|
|
3788
3813
|
error: null,
|
|
3789
3814
|
startTime: -1,
|
|
3790
3815
|
endTime: -1,
|
|
3791
|
-
source: __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this,
|
|
3816
|
+
source: __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this, element2)
|
|
3792
3817
|
};
|
|
3793
3818
|
}, _Loader_emitLoad = function _Loader_emitLoad2(item) {
|
|
3794
3819
|
const assetId = getAssetIdFromElement(item.element);
|
|
@@ -3819,17 +3844,17 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3819
3844
|
this.trigger("error", Object.assign(Object.assign({}, item), { countTime: item.endTime - item.startTime }));
|
|
3820
3845
|
}
|
|
3821
3846
|
}
|
|
3822
|
-
}, _Loader_loadResource = function _Loader_loadResource2(
|
|
3823
|
-
const item = __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_createLoadItem).call(this,
|
|
3824
|
-
const assetId = getAssetIdFromElement(
|
|
3847
|
+
}, _Loader_loadResource = function _Loader_loadResource2(element2, assets) {
|
|
3848
|
+
const item = __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_createLoadItem).call(this, element2);
|
|
3849
|
+
const assetId = getAssetIdFromElement(element2);
|
|
3825
3850
|
if (__classPrivateFieldGet$2(this, _Loader_currentLoadItemMap, "f")[assetId]) {
|
|
3826
3851
|
return;
|
|
3827
3852
|
}
|
|
3828
3853
|
__classPrivateFieldGet$2(this, _Loader_currentLoadItemMap, "f")[assetId] = item;
|
|
3829
|
-
const loadFunc = __classPrivateFieldGet$2(this, _Loader_loadFuncMap, "f")[
|
|
3854
|
+
const loadFunc = __classPrivateFieldGet$2(this, _Loader_loadFuncMap, "f")[element2.type];
|
|
3830
3855
|
if (typeof loadFunc === "function" && !__classPrivateFieldGet$2(this, _Loader_hasDestroyed, "f")) {
|
|
3831
3856
|
item.startTime = Date.now();
|
|
3832
|
-
loadFunc(
|
|
3857
|
+
loadFunc(element2, assets).then((result) => {
|
|
3833
3858
|
if (!__classPrivateFieldGet$2(this, _Loader_hasDestroyed, "f")) {
|
|
3834
3859
|
item.content = result.content;
|
|
3835
3860
|
item.endTime = Date.now();
|
|
@@ -3837,18 +3862,18 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
3837
3862
|
__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_emitLoad).call(this, item);
|
|
3838
3863
|
}
|
|
3839
3864
|
}).catch((err) => {
|
|
3840
|
-
console.warn(`Load element source "${item.source}" fail`, err,
|
|
3865
|
+
console.warn(`Load element source "${item.source}" fail`, err, element2);
|
|
3841
3866
|
item.endTime = Date.now();
|
|
3842
3867
|
item.status = "error";
|
|
3843
3868
|
item.error = err;
|
|
3844
3869
|
__classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_emitError).call(this, item);
|
|
3845
3870
|
});
|
|
3846
3871
|
}
|
|
3847
|
-
}, _Loader_isExistingErrorStorage = function _Loader_isExistingErrorStorage2(
|
|
3872
|
+
}, _Loader_isExistingErrorStorage = function _Loader_isExistingErrorStorage2(element2) {
|
|
3848
3873
|
var _a;
|
|
3849
|
-
const assetId = getAssetIdFromElement(
|
|
3874
|
+
const assetId = getAssetIdFromElement(element2);
|
|
3850
3875
|
const existItem = (_a = __classPrivateFieldGet$2(this, _Loader_currentLoadItemMap, "f")) === null || _a === void 0 ? void 0 : _a[assetId];
|
|
3851
|
-
if (existItem && existItem.status === "error" && existItem.source && existItem.source === __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this,
|
|
3876
|
+
if (existItem && existItem.status === "error" && existItem.source && existItem.source === __classPrivateFieldGet$2(this, _Loader_instances, "m", _Loader_getLoadElementSource).call(this, element2)) {
|
|
3852
3877
|
return true;
|
|
3853
3878
|
}
|
|
3854
3879
|
return false;
|
|
@@ -4137,9 +4162,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4137
4162
|
const context2d = __classPrivateFieldGet$1(this, _Calculator_opts, "f").tempContext;
|
|
4138
4163
|
return getViewPointAtElement(p, Object.assign(Object.assign({}, opts), { context2d }));
|
|
4139
4164
|
}
|
|
4140
|
-
resetVirtualFlatItemMap(
|
|
4141
|
-
if (
|
|
4142
|
-
const { virtualFlatItemMap, invisibleCount, visibleCount } = sortElementsViewVisiableInfoMap(
|
|
4165
|
+
resetVirtualFlatItemMap(data2, opts) {
|
|
4166
|
+
if (data2) {
|
|
4167
|
+
const { virtualFlatItemMap, invisibleCount, visibleCount } = sortElementsViewVisiableInfoMap(data2.elements, Object.assign(Object.assign({}, opts), {
|
|
4143
4168
|
tempContext: __classPrivateFieldGet$1(this, _Calculator_opts, "f").tempContext
|
|
4144
4169
|
}));
|
|
4145
4170
|
__classPrivateFieldGet$1(this, _Calculator_store, "f").set("virtualFlatItemMap", virtualFlatItemMap);
|
|
@@ -4201,24 +4226,24 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4201
4226
|
};
|
|
4202
4227
|
return viewRectInfo;
|
|
4203
4228
|
}
|
|
4204
|
-
modifyText(
|
|
4229
|
+
modifyText(element2) {
|
|
4205
4230
|
const virtualFlatItemMap = __classPrivateFieldGet$1(this, _Calculator_store, "f").get("virtualFlatItemMap");
|
|
4206
|
-
const flatItem = virtualFlatItemMap[
|
|
4207
|
-
if (
|
|
4208
|
-
const newVirtualFlatItem = Object.assign(Object.assign({}, flatItem), calcVirtualTextDetail(
|
|
4231
|
+
const flatItem = virtualFlatItemMap[element2.uuid];
|
|
4232
|
+
if (element2 && element2.type === "text") {
|
|
4233
|
+
const newVirtualFlatItem = Object.assign(Object.assign({}, flatItem), calcVirtualTextDetail(element2, {
|
|
4209
4234
|
tempContext: __classPrivateFieldGet$1(this, _Calculator_opts, "f").tempContext
|
|
4210
4235
|
}));
|
|
4211
|
-
virtualFlatItemMap[
|
|
4236
|
+
virtualFlatItemMap[element2.uuid] = newVirtualFlatItem;
|
|
4212
4237
|
__classPrivateFieldGet$1(this, _Calculator_store, "f").set("virtualFlatItemMap", virtualFlatItemMap);
|
|
4213
4238
|
}
|
|
4214
4239
|
}
|
|
4215
|
-
modifyVirtualFlatItemMap(
|
|
4240
|
+
modifyVirtualFlatItemMap(data2, opts) {
|
|
4216
4241
|
const { modifyInfo, viewScaleInfo, viewSizeInfo } = opts;
|
|
4217
|
-
const { type, content } = modifyInfo;
|
|
4218
|
-
const list =
|
|
4242
|
+
const { type: type2, content } = modifyInfo;
|
|
4243
|
+
const list = data2.elements;
|
|
4219
4244
|
const virtualFlatItemMap = __classPrivateFieldGet$1(this, _Calculator_store, "f").get("virtualFlatItemMap");
|
|
4220
|
-
if (
|
|
4221
|
-
const { element } = content;
|
|
4245
|
+
if (type2 === "deleteElement") {
|
|
4246
|
+
const { element: element2 } = content;
|
|
4222
4247
|
const uuids = [];
|
|
4223
4248
|
const _walk = (e) => {
|
|
4224
4249
|
uuids.push(e.uuid);
|
|
@@ -4228,34 +4253,34 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4228
4253
|
});
|
|
4229
4254
|
}
|
|
4230
4255
|
};
|
|
4231
|
-
_walk(
|
|
4256
|
+
_walk(element2);
|
|
4232
4257
|
uuids.forEach((uuid) => {
|
|
4233
4258
|
delete virtualFlatItemMap[uuid];
|
|
4234
4259
|
});
|
|
4235
4260
|
__classPrivateFieldGet$1(this, _Calculator_store, "f").set("virtualFlatItemMap", virtualFlatItemMap);
|
|
4236
|
-
} else if (
|
|
4261
|
+
} else if (type2 === "addElement" || type2 === "updateElement") {
|
|
4237
4262
|
const { position } = content;
|
|
4238
|
-
const
|
|
4263
|
+
const element2 = findElementFromListByPosition(position, data2.elements);
|
|
4239
4264
|
const groupQueue = getGroupQueueByElementPosition(list, position);
|
|
4240
|
-
if (
|
|
4241
|
-
if (
|
|
4242
|
-
this.resetVirtualFlatItemMap(
|
|
4265
|
+
if (element2) {
|
|
4266
|
+
if (type2 === "updateElement" && element2.type === "group") {
|
|
4267
|
+
this.resetVirtualFlatItemMap(data2, { viewScaleInfo, viewSizeInfo });
|
|
4243
4268
|
} else {
|
|
4244
|
-
const originRectInfo = calcElementOriginRectInfo(
|
|
4269
|
+
const originRectInfo = calcElementOriginRectInfo(element2, {
|
|
4245
4270
|
groupQueue: groupQueue || []
|
|
4246
4271
|
});
|
|
4247
|
-
const newVirtualFlatItem = Object.assign({ type:
|
|
4272
|
+
const newVirtualFlatItem = Object.assign({ type: element2.type, originRectInfo, rangeRectInfo: is.angle(element2.angle) ? originRectInfoToRangeRectInfo(originRectInfo) : originRectInfo, isVisibleInView: true, position: [...position] }, calcVirtualFlatDetail(element2, {
|
|
4248
4273
|
tempContext: __classPrivateFieldGet$1(this, _Calculator_opts, "f").tempContext
|
|
4249
4274
|
}));
|
|
4250
|
-
virtualFlatItemMap[
|
|
4275
|
+
virtualFlatItemMap[element2.uuid] = newVirtualFlatItem;
|
|
4251
4276
|
__classPrivateFieldGet$1(this, _Calculator_store, "f").set("virtualFlatItemMap", virtualFlatItemMap);
|
|
4252
|
-
if (
|
|
4277
|
+
if (type2 === "updateElement") {
|
|
4253
4278
|
this.updateVisiableStatus({ viewScaleInfo, viewSizeInfo });
|
|
4254
4279
|
}
|
|
4255
4280
|
}
|
|
4256
4281
|
}
|
|
4257
|
-
} else if (
|
|
4258
|
-
this.resetVirtualFlatItemMap(
|
|
4282
|
+
} else if (type2 === "moveElement") {
|
|
4283
|
+
this.resetVirtualFlatItemMap(data2, { viewScaleInfo, viewSizeInfo });
|
|
4259
4284
|
}
|
|
4260
4285
|
}
|
|
4261
4286
|
getVirtualFlatItem(uuid) {
|
|
@@ -4303,7 +4328,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4303
4328
|
updateOptions(opts) {
|
|
4304
4329
|
__classPrivateFieldSet(this, _Renderer_opts, opts, "f");
|
|
4305
4330
|
}
|
|
4306
|
-
drawData(
|
|
4331
|
+
drawData(data2, opts) {
|
|
4307
4332
|
const loader = __classPrivateFieldGet(this, _Renderer_loader, "f");
|
|
4308
4333
|
const calculator = __classPrivateFieldGet(this, _Renderer_calculator, "f");
|
|
4309
4334
|
const { sharer } = __classPrivateFieldGet(this, _Renderer_opts, "f");
|
|
@@ -4316,7 +4341,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4316
4341
|
h: opts.viewSizeInfo.height
|
|
4317
4342
|
};
|
|
4318
4343
|
if (opts.forceDrawAll === true) {
|
|
4319
|
-
__classPrivateFieldGet(this, _Renderer_calculator, "f").resetVirtualFlatItemMap(
|
|
4344
|
+
__classPrivateFieldGet(this, _Renderer_calculator, "f").resetVirtualFlatItemMap(data2, {
|
|
4320
4345
|
viewScaleInfo: opts.viewScaleInfo,
|
|
4321
4346
|
viewSizeInfo: opts.viewSizeInfo
|
|
4322
4347
|
});
|
|
@@ -4325,17 +4350,17 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4325
4350
|
loader,
|
|
4326
4351
|
calculator,
|
|
4327
4352
|
parentElementSize,
|
|
4328
|
-
elementAssets:
|
|
4353
|
+
elementAssets: data2.assets,
|
|
4329
4354
|
parentOpacity: 1,
|
|
4330
4355
|
overrideElementMap: sharer === null || sharer === void 0 ? void 0 : sharer.getActiveOverrideElemenentMap()
|
|
4331
4356
|
}, opts);
|
|
4332
|
-
drawGlobalBackground(viewContext,
|
|
4333
|
-
if (
|
|
4334
|
-
drawLayout(viewContext,
|
|
4335
|
-
drawElementList(viewContext,
|
|
4357
|
+
drawGlobalBackground(viewContext, data2.global, drawOpts);
|
|
4358
|
+
if (data2.layout) {
|
|
4359
|
+
drawLayout(viewContext, data2.layout, drawOpts, () => {
|
|
4360
|
+
drawElementList(viewContext, data2, drawOpts);
|
|
4336
4361
|
});
|
|
4337
4362
|
} else {
|
|
4338
|
-
drawElementList(viewContext,
|
|
4363
|
+
drawElementList(viewContext, data2, drawOpts);
|
|
4339
4364
|
}
|
|
4340
4365
|
}
|
|
4341
4366
|
scale(num) {
|
|
@@ -4343,9 +4368,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4343
4368
|
if (!sharer) {
|
|
4344
4369
|
return;
|
|
4345
4370
|
}
|
|
4346
|
-
const { data, offsetTop, offsetBottom, offsetLeft, offsetRight, width, height, contextHeight, contextWidth, devicePixelRatio } = sharer.getActiveStoreSnapshot();
|
|
4347
|
-
if (
|
|
4348
|
-
this.drawData(
|
|
4371
|
+
const { data: data2, offsetTop, offsetBottom, offsetLeft, offsetRight, width, height, contextHeight, contextWidth, devicePixelRatio } = sharer.getActiveStoreSnapshot();
|
|
4372
|
+
if (data2) {
|
|
4373
|
+
this.drawData(data2, {
|
|
4349
4374
|
viewScaleInfo: {
|
|
4350
4375
|
scale: num,
|
|
4351
4376
|
offsetTop,
|
|
@@ -4686,9 +4711,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4686
4711
|
__privateSet(this, _opts2, opts);
|
|
4687
4712
|
__privateMethod(this, _Viewer_instances, init_fn2).call(this);
|
|
4688
4713
|
}
|
|
4689
|
-
resetVirtualFlatItemMap(
|
|
4690
|
-
if (
|
|
4691
|
-
__privateGet(this, _opts2).calculator.resetVirtualFlatItemMap(
|
|
4714
|
+
resetVirtualFlatItemMap(data2, opts) {
|
|
4715
|
+
if (data2) {
|
|
4716
|
+
__privateGet(this, _opts2).calculator.resetVirtualFlatItemMap(data2, opts);
|
|
4692
4717
|
}
|
|
4693
4718
|
}
|
|
4694
4719
|
drawFrame() {
|
|
@@ -4907,17 +4932,17 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4907
4932
|
getRenderer() {
|
|
4908
4933
|
return __privateGet(this, _renderer);
|
|
4909
4934
|
}
|
|
4910
|
-
setData(
|
|
4935
|
+
setData(data2) {
|
|
4911
4936
|
const sharer = __privateGet(this, _sharer);
|
|
4912
|
-
__privateGet(this, _sharer).setActiveStorage("data",
|
|
4937
|
+
__privateGet(this, _sharer).setActiveStorage("data", data2);
|
|
4913
4938
|
const viewSizeInfo = sharer.getActiveViewSizeInfo();
|
|
4914
4939
|
const viewScaleInfo = sharer.getActiveViewScaleInfo();
|
|
4915
|
-
const newViewContextSize = calcElementsContextSize(
|
|
4940
|
+
const newViewContextSize = calcElementsContextSize(data2.elements, {
|
|
4916
4941
|
viewWidth: viewSizeInfo.width,
|
|
4917
4942
|
viewHeight: viewSizeInfo.height,
|
|
4918
4943
|
extend: true
|
|
4919
4944
|
});
|
|
4920
|
-
__privateGet(this, _viewer).resetVirtualFlatItemMap(
|
|
4945
|
+
__privateGet(this, _viewer).resetVirtualFlatItemMap(data2, {
|
|
4921
4946
|
viewSizeInfo,
|
|
4922
4947
|
viewScaleInfo
|
|
4923
4948
|
});
|
|
@@ -4930,8 +4955,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
4930
4955
|
return { viewSizeInfo: newViewSizeInfo };
|
|
4931
4956
|
}
|
|
4932
4957
|
getData() {
|
|
4933
|
-
const { data } = __privateGet(this, _sharer).getActiveStoreSnapshot();
|
|
4934
|
-
return
|
|
4958
|
+
const { data: data2 } = __privateGet(this, _sharer).getActiveStoreSnapshot();
|
|
4959
|
+
return data2;
|
|
4935
4960
|
}
|
|
4936
4961
|
use(middleware, config) {
|
|
4937
4962
|
var _a, _b, _c;
|
|
@@ -5587,7 +5612,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
5587
5612
|
style,
|
|
5588
5613
|
rotateControllerPattern,
|
|
5589
5614
|
viewSizeInfo,
|
|
5590
|
-
element
|
|
5615
|
+
element: element2
|
|
5591
5616
|
// calculator, viewScaleInfo, viewSizeInfo
|
|
5592
5617
|
} = opts;
|
|
5593
5618
|
const { devicePixelRatio = 1 } = viewSizeInfo;
|
|
@@ -5606,7 +5631,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
5606
5631
|
drawVertexes(ctx, calcViewVertexes(topRight.vertexes, opts), ctrlOpts);
|
|
5607
5632
|
drawVertexes(ctx, calcViewVertexes(bottomLeft.vertexes, opts), ctrlOpts);
|
|
5608
5633
|
drawVertexes(ctx, calcViewVertexes(bottomRight.vertexes, opts), ctrlOpts);
|
|
5609
|
-
if (((_a =
|
|
5634
|
+
if (((_a = element2 == null ? void 0 : element2.operations) == null ? void 0 : _a.rotatable) !== false) {
|
|
5610
5635
|
drawCircleController(ctx, calcViewPointSize(rotate.center, opts), {
|
|
5611
5636
|
...ctrlOpts,
|
|
5612
5637
|
size: rotate.size
|
|
@@ -5753,7 +5778,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
5753
5778
|
};
|
|
5754
5779
|
const {
|
|
5755
5780
|
ctx,
|
|
5756
|
-
data,
|
|
5781
|
+
data: data2,
|
|
5757
5782
|
calculator,
|
|
5758
5783
|
selectedElements,
|
|
5759
5784
|
viewScaleInfo,
|
|
@@ -5810,10 +5835,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
5810
5835
|
return target;
|
|
5811
5836
|
}
|
|
5812
5837
|
}
|
|
5813
|
-
if (
|
|
5814
|
-
const { index, element } = calculator.getPointElement(p, { data, viewScaleInfo, viewSizeInfo });
|
|
5815
|
-
if (index >= 0 &&
|
|
5816
|
-
target.elements = [
|
|
5838
|
+
if (data2) {
|
|
5839
|
+
const { index, element: element2 } = calculator.getPointElement(p, { data: data2, viewScaleInfo, viewSizeInfo });
|
|
5840
|
+
if (index >= 0 && element2 && ((_e = element2 == null ? void 0 : element2.operations) == null ? void 0 : _e.invisible) !== true) {
|
|
5841
|
+
target.elements = [element2];
|
|
5817
5842
|
target.type = "over-element";
|
|
5818
5843
|
return target;
|
|
5819
5844
|
}
|
|
@@ -6404,21 +6429,21 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
6404
6429
|
angle: endAngle
|
|
6405
6430
|
};
|
|
6406
6431
|
}
|
|
6407
|
-
function getSelectedListArea(
|
|
6432
|
+
function getSelectedListArea(data2, opts) {
|
|
6408
6433
|
var _a;
|
|
6409
6434
|
const indexes = [];
|
|
6410
6435
|
const uuids = [];
|
|
6411
6436
|
const elements = [];
|
|
6412
6437
|
const { viewScaleInfo, start, end } = opts;
|
|
6413
|
-
if (!(Array.isArray(
|
|
6438
|
+
if (!(Array.isArray(data2.elements) && start && end)) {
|
|
6414
6439
|
return { indexes, uuids, elements };
|
|
6415
6440
|
}
|
|
6416
6441
|
const startX = Math.min(start.x, end.x);
|
|
6417
6442
|
const endX = Math.max(start.x, end.x);
|
|
6418
6443
|
const startY = Math.min(start.y, end.y);
|
|
6419
6444
|
const endY = Math.max(start.y, end.y);
|
|
6420
|
-
for (let idx = 0; idx <
|
|
6421
|
-
const elem =
|
|
6445
|
+
for (let idx = 0; idx < data2.elements.length; idx++) {
|
|
6446
|
+
const elem = data2.elements[idx];
|
|
6422
6447
|
if (((_a = elem == null ? void 0 : elem.operations) == null ? void 0 : _a.locked) === true) {
|
|
6423
6448
|
continue;
|
|
6424
6449
|
}
|
|
@@ -6541,8 +6566,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
6541
6566
|
const isEqualNum = (a, b) => Math.abs(a - b) < 1e-5;
|
|
6542
6567
|
function calcReferenceInfo(uuid, opts) {
|
|
6543
6568
|
var _a, _b;
|
|
6544
|
-
const { data, groupQueue, calculator, viewScaleInfo, viewSizeInfo } = opts;
|
|
6545
|
-
let targetElements =
|
|
6569
|
+
const { data: data2, groupQueue, calculator, viewScaleInfo, viewSizeInfo } = opts;
|
|
6570
|
+
let targetElements = data2.elements || [];
|
|
6546
6571
|
if ((groupQueue == null ? void 0 : groupQueue.length) > 0) {
|
|
6547
6572
|
targetElements = ((_b = (_a = groupQueue[groupQueue.length - 1]) == null ? void 0 : _a.detail) == null ? void 0 : _b.children) || [];
|
|
6548
6573
|
}
|
|
@@ -6873,9 +6898,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
6873
6898
|
return false;
|
|
6874
6899
|
};
|
|
6875
6900
|
const getLayoutSize = () => {
|
|
6876
|
-
const
|
|
6877
|
-
if (
|
|
6878
|
-
const { x: x2, y: y2, w: w2, h: h2 } =
|
|
6901
|
+
const data2 = sharer.getActiveStorage("data");
|
|
6902
|
+
if (data2 == null ? void 0 : data2.layout) {
|
|
6903
|
+
const { x: x2, y: y2, w: w2, h: h2 } = data2.layout;
|
|
6879
6904
|
return { x: x2, y: y2, w: w2, h: h2 };
|
|
6880
6905
|
}
|
|
6881
6906
|
return null;
|
|
@@ -6909,10 +6934,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
6909
6934
|
}
|
|
6910
6935
|
};
|
|
6911
6936
|
const resetControlType = (e) => {
|
|
6912
|
-
const
|
|
6937
|
+
const data2 = sharer.getActiveStorage("data");
|
|
6913
6938
|
const controller = sharer.getSharedStorage(keyLayoutController);
|
|
6914
6939
|
let controllerType = null;
|
|
6915
|
-
if (controller && (
|
|
6940
|
+
if (controller && (data2 == null ? void 0 : data2.layout) && (e == null ? void 0 : e.point)) {
|
|
6916
6941
|
let layoutControlType = null;
|
|
6917
6942
|
if (controller) {
|
|
6918
6943
|
const { topLeft, top, topRight, right, bottomRight, bottom, bottomLeft, left } = controller;
|
|
@@ -6975,8 +7000,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
6975
7000
|
}
|
|
6976
7001
|
if (sharer.getSharedStorage(keyLayoutIsSelected) === true) {
|
|
6977
7002
|
const prevLayoutActionType = sharer.getSharedStorage(keyLayoutActionType);
|
|
6978
|
-
const
|
|
6979
|
-
if (
|
|
7003
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7004
|
+
if (data2 == null ? void 0 : data2.layout) {
|
|
6980
7005
|
if (prevLayoutActionType !== "resize") {
|
|
6981
7006
|
resetController();
|
|
6982
7007
|
const layoutControlType = resetControlType(e);
|
|
@@ -7017,9 +7042,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7017
7042
|
}
|
|
7018
7043
|
sharer.setSharedStorage(keyLayoutIsSelected, false);
|
|
7019
7044
|
}
|
|
7020
|
-
const
|
|
7021
|
-
if (
|
|
7022
|
-
pointStartLayoutSize = getElementSize(
|
|
7045
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7046
|
+
if (data2 == null ? void 0 : data2.layout) {
|
|
7047
|
+
pointStartLayoutSize = getElementSize(data2.layout);
|
|
7023
7048
|
} else {
|
|
7024
7049
|
pointStartLayoutSize = null;
|
|
7025
7050
|
}
|
|
@@ -7046,8 +7071,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7046
7071
|
}
|
|
7047
7072
|
const layoutActionType = sharer.getSharedStorage(keyLayoutActionType);
|
|
7048
7073
|
const layoutControlType = sharer.getSharedStorage(keyLayoutControlType);
|
|
7049
|
-
const
|
|
7050
|
-
if (layoutActionType === "resize" && layoutControlType && (
|
|
7074
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7075
|
+
if (layoutActionType === "resize" && layoutControlType && (data2 == null ? void 0 : data2.layout)) {
|
|
7051
7076
|
if (prevPoint) {
|
|
7052
7077
|
sharer.setSharedStorage(keyLayoutIsBusyMoving, true);
|
|
7053
7078
|
const scale = sharer.getActiveStorage("scale");
|
|
@@ -7055,65 +7080,65 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7055
7080
|
const viewMoveY = e.point.y - prevPoint.y;
|
|
7056
7081
|
const moveX = viewMoveX / scale;
|
|
7057
7082
|
const moveY = viewMoveY / scale;
|
|
7058
|
-
const { x: x2, y: y2, w: w2, h: h2, operations = {} } =
|
|
7083
|
+
const { x: x2, y: y2, w: w2, h: h2, operations = {} } = data2.layout;
|
|
7059
7084
|
const { position = "absolute" } = operations;
|
|
7060
7085
|
if (layoutControlType === "top") {
|
|
7061
7086
|
if (position === "relative") {
|
|
7062
|
-
|
|
7087
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7063
7088
|
viewer.scroll({ moveY: viewMoveY });
|
|
7064
7089
|
} else {
|
|
7065
|
-
|
|
7066
|
-
|
|
7090
|
+
data2.layout.y = calculator.toGridNum(y2 + moveY);
|
|
7091
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7067
7092
|
}
|
|
7068
7093
|
} else if (layoutControlType === "right") {
|
|
7069
|
-
|
|
7094
|
+
data2.layout.w = calculator.toGridNum(w2 + moveX);
|
|
7070
7095
|
} else if (layoutControlType === "bottom") {
|
|
7071
|
-
|
|
7096
|
+
data2.layout.h = calculator.toGridNum(h2 + moveY);
|
|
7072
7097
|
} else if (layoutControlType === "left") {
|
|
7073
7098
|
if (position === "relative") {
|
|
7074
|
-
|
|
7099
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7075
7100
|
viewer.scroll({ moveX: viewMoveX });
|
|
7076
7101
|
} else {
|
|
7077
|
-
|
|
7078
|
-
|
|
7102
|
+
data2.layout.x = calculator.toGridNum(x2 + moveX);
|
|
7103
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7079
7104
|
}
|
|
7080
7105
|
} else if (layoutControlType === "top-left") {
|
|
7081
7106
|
if (position === "relative") {
|
|
7082
|
-
|
|
7083
|
-
|
|
7107
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7108
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7084
7109
|
viewer.scroll({ moveX: viewMoveX, moveY: viewMoveY });
|
|
7085
7110
|
} else {
|
|
7086
|
-
|
|
7087
|
-
|
|
7088
|
-
|
|
7089
|
-
|
|
7111
|
+
data2.layout.x = calculator.toGridNum(x2 + moveX);
|
|
7112
|
+
data2.layout.y = calculator.toGridNum(y2 + moveY);
|
|
7113
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7114
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7090
7115
|
}
|
|
7091
7116
|
} else if (layoutControlType === "top-right") {
|
|
7092
7117
|
if (position === "relative") {
|
|
7093
7118
|
viewer.scroll({
|
|
7094
7119
|
moveY: viewMoveY
|
|
7095
7120
|
});
|
|
7096
|
-
|
|
7097
|
-
|
|
7121
|
+
data2.layout.w = calculator.toGridNum(w2 + moveX);
|
|
7122
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7098
7123
|
} else {
|
|
7099
|
-
|
|
7100
|
-
|
|
7101
|
-
|
|
7124
|
+
data2.layout.y = calculator.toGridNum(y2 + moveY);
|
|
7125
|
+
data2.layout.w = calculator.toGridNum(w2 + moveX);
|
|
7126
|
+
data2.layout.h = calculator.toGridNum(h2 - moveY);
|
|
7102
7127
|
}
|
|
7103
7128
|
} else if (layoutControlType === "bottom-right") {
|
|
7104
|
-
|
|
7105
|
-
|
|
7129
|
+
data2.layout.w = calculator.toGridNum(w2 + moveX);
|
|
7130
|
+
data2.layout.h = calculator.toGridNum(h2 + moveY);
|
|
7106
7131
|
} else if (layoutControlType === "bottom-left") {
|
|
7107
7132
|
if (position === "relative") {
|
|
7108
7133
|
viewer.scroll({
|
|
7109
7134
|
moveX: viewMoveX
|
|
7110
7135
|
});
|
|
7111
|
-
|
|
7112
|
-
|
|
7136
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7137
|
+
data2.layout.h = calculator.toGridNum(h2 + moveY);
|
|
7113
7138
|
} else {
|
|
7114
|
-
|
|
7115
|
-
|
|
7116
|
-
|
|
7139
|
+
data2.layout.x = calculator.toGridNum(x2 + moveX);
|
|
7140
|
+
data2.layout.w = calculator.toGridNum(w2 - moveX);
|
|
7141
|
+
data2.layout.h = calculator.toGridNum(h2 + moveY);
|
|
7117
7142
|
}
|
|
7118
7143
|
}
|
|
7119
7144
|
}
|
|
@@ -7130,8 +7155,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7130
7155
|
sharer.setSharedStorage(keyLayoutIsBusyMoving, false);
|
|
7131
7156
|
const layoutActionType = sharer.getSharedStorage(keyLayoutActionType);
|
|
7132
7157
|
const layoutControlType = sharer.getSharedStorage(keyLayoutControlType);
|
|
7133
|
-
const
|
|
7134
|
-
if (
|
|
7158
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7159
|
+
if (data2 && layoutActionType === "resize" && layoutControlType) {
|
|
7135
7160
|
let modifyRecord = void 0;
|
|
7136
7161
|
if (pointStartLayoutSize) {
|
|
7137
7162
|
modifyRecord = {
|
|
@@ -7140,13 +7165,13 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7140
7165
|
content: {
|
|
7141
7166
|
method: "modifyLayout",
|
|
7142
7167
|
before: toFlattenLayout(pointStartLayoutSize),
|
|
7143
|
-
after: toFlattenLayout(getElementSize(
|
|
7168
|
+
after: toFlattenLayout(getElementSize(data2.layout))
|
|
7144
7169
|
}
|
|
7145
7170
|
};
|
|
7146
7171
|
}
|
|
7147
7172
|
eventHub.trigger(coreEventKeys.CHANGE, {
|
|
7148
7173
|
type: "resizeLayout",
|
|
7149
|
-
data,
|
|
7174
|
+
data: data2,
|
|
7150
7175
|
modifyRecord
|
|
7151
7176
|
});
|
|
7152
7177
|
}
|
|
@@ -7717,8 +7742,8 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7717
7742
|
}
|
|
7718
7743
|
if ((opts2 == null ? void 0 : opts2.triggerEvent) === true) {
|
|
7719
7744
|
const uuids = list.map((elem) => elem.uuid);
|
|
7720
|
-
const
|
|
7721
|
-
const positionMap = getElementPositionMapFromList(uuids, (
|
|
7745
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7746
|
+
const positionMap = getElementPositionMapFromList(uuids, (data2 == null ? void 0 : data2.elements) || []);
|
|
7722
7747
|
eventHub.trigger(coreEventKeys.SELECT, {
|
|
7723
7748
|
type: "clickCanvas",
|
|
7724
7749
|
uuids,
|
|
@@ -7761,11 +7786,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7761
7786
|
const selectCallback = ({ uuids = [], positions }) => {
|
|
7762
7787
|
let elements = [];
|
|
7763
7788
|
const actionType = sharer.getSharedStorage(keyActionType);
|
|
7764
|
-
const
|
|
7789
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7765
7790
|
if (positions && Array.isArray(positions)) {
|
|
7766
|
-
elements = findElementsFromListByPositions(positions, (
|
|
7791
|
+
elements = findElementsFromListByPositions(positions, (data2 == null ? void 0 : data2.elements) || []);
|
|
7767
7792
|
} else {
|
|
7768
|
-
elements = findElementsFromList(uuids, (
|
|
7793
|
+
elements = findElementsFromList(uuids, (data2 == null ? void 0 : data2.elements) || []);
|
|
7769
7794
|
}
|
|
7770
7795
|
let needRefresh = false;
|
|
7771
7796
|
if (!actionType && elements.length === 1) {
|
|
@@ -7776,7 +7801,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7776
7801
|
}
|
|
7777
7802
|
if (needRefresh) {
|
|
7778
7803
|
const elem = elements[0];
|
|
7779
|
-
const groupQueue = getGroupQueueFromList(elem.uuid, (
|
|
7804
|
+
const groupQueue = getGroupQueueFromList(elem.uuid, (data2 == null ? void 0 : data2.elements) || []);
|
|
7780
7805
|
sharer.setSharedStorage(keyGroupQueue, groupQueue);
|
|
7781
7806
|
updateSelectedElementList(elements);
|
|
7782
7807
|
viewer.drawFrame();
|
|
@@ -7987,7 +8012,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
7987
8012
|
pointMove: (e) => {
|
|
7988
8013
|
var _a, _b, _c;
|
|
7989
8014
|
sharer.setSharedStorage(keyIsMoving, true);
|
|
7990
|
-
const
|
|
8015
|
+
const data2 = sharer.getActiveStorage("data");
|
|
7991
8016
|
const elems = getActiveElements();
|
|
7992
8017
|
const scale = sharer.getActiveStorage("scale") || 1;
|
|
7993
8018
|
const viewScaleInfo = sharer.getActiveViewScaleInfo();
|
|
@@ -8003,14 +8028,14 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8003
8028
|
hasChangedData = true;
|
|
8004
8029
|
inBusyMode = "drag";
|
|
8005
8030
|
eventHub.trigger(MIDDLEWARE_INTERNAL_EVENT_SHOW_INFO_ANGLE, { show: false });
|
|
8006
|
-
if (
|
|
8031
|
+
if (data2 && (elems == null ? void 0 : elems.length) === 1 && moveOriginalStartElementSize && originalStart && end && ((_b = (_a = elems[0]) == null ? void 0 : _a.operations) == null ? void 0 : _b.locked) !== true) {
|
|
8007
8032
|
const { moveX, moveY } = calcPointMoveElementInGroup(originalStart, end, groupQueue);
|
|
8008
8033
|
let totalMoveX = calculator.toGridNum(moveX / scale);
|
|
8009
8034
|
let totalMoveY = calculator.toGridNum(moveY / scale);
|
|
8010
8035
|
if (enableSnapToGrid === true) {
|
|
8011
8036
|
const referenceInfo = calcReferenceInfo(elems[0].uuid, {
|
|
8012
8037
|
calculator,
|
|
8013
|
-
data,
|
|
8038
|
+
data: data2,
|
|
8014
8039
|
groupQueue,
|
|
8015
8040
|
viewScaleInfo,
|
|
8016
8041
|
viewSizeInfo
|
|
@@ -8031,7 +8056,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8031
8056
|
elems[0].x = calculator.toGridNum(moveOriginalStartElementSize.x + totalMoveX);
|
|
8032
8057
|
elems[0].y = calculator.toGridNum(moveOriginalStartElementSize.y + totalMoveY);
|
|
8033
8058
|
updateSelectedElementList([elems[0]]);
|
|
8034
|
-
calculator.modifyVirtualFlatItemMap(
|
|
8059
|
+
calculator.modifyVirtualFlatItemMap(data2, {
|
|
8035
8060
|
modifyInfo: {
|
|
8036
8061
|
type: "updateElement",
|
|
8037
8062
|
content: {
|
|
@@ -8047,7 +8072,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8047
8072
|
} else if (actionType === "drag-list") {
|
|
8048
8073
|
hasChangedData = true;
|
|
8049
8074
|
inBusyMode = "drag-list";
|
|
8050
|
-
if (
|
|
8075
|
+
if (data2 && originalStart && start && end && (elems == null ? void 0 : elems.length) > 1) {
|
|
8051
8076
|
const moveX = (end.x - start.x) / scale;
|
|
8052
8077
|
const moveY = (end.y - start.y) / scale;
|
|
8053
8078
|
elems.forEach((elem) => {
|
|
@@ -8055,12 +8080,12 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8055
8080
|
if (elem && ((_a2 = elem == null ? void 0 : elem.operations) == null ? void 0 : _a2.locked) !== true) {
|
|
8056
8081
|
elem.x = calculator.toGridNum(elem.x + moveX);
|
|
8057
8082
|
elem.y = calculator.toGridNum(elem.y + moveY);
|
|
8058
|
-
calculator.modifyVirtualFlatItemMap(
|
|
8083
|
+
calculator.modifyVirtualFlatItemMap(data2, {
|
|
8059
8084
|
modifyInfo: {
|
|
8060
8085
|
type: "updateElement",
|
|
8061
8086
|
content: {
|
|
8062
8087
|
element: elem,
|
|
8063
|
-
position: getElementPositionFromList(elem.uuid,
|
|
8088
|
+
position: getElementPositionFromList(elem.uuid, data2.elements) || []
|
|
8064
8089
|
}
|
|
8065
8090
|
},
|
|
8066
8091
|
viewSizeInfo,
|
|
@@ -8068,11 +8093,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8068
8093
|
});
|
|
8069
8094
|
}
|
|
8070
8095
|
});
|
|
8071
|
-
sharer.setActiveStorage("data",
|
|
8096
|
+
sharer.setActiveStorage("data", data2);
|
|
8072
8097
|
}
|
|
8073
8098
|
viewer.drawFrame();
|
|
8074
8099
|
} else if (actionType === "resize") {
|
|
8075
|
-
if (
|
|
8100
|
+
if (data2 && (elems == null ? void 0 : elems.length) === 1 && originalStart && moveOriginalStartElementSize && (resizeType == null ? void 0 : resizeType.startsWith("resize-"))) {
|
|
8076
8101
|
hasChangedData = true;
|
|
8077
8102
|
inBusyMode = "resize";
|
|
8078
8103
|
const pointGroupQueue = [];
|
|
@@ -8144,7 +8169,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8144
8169
|
}
|
|
8145
8170
|
}
|
|
8146
8171
|
updateSelectedElementList([elems[0]]);
|
|
8147
|
-
calculator.modifyVirtualFlatItemMap(
|
|
8172
|
+
calculator.modifyVirtualFlatItemMap(data2, {
|
|
8148
8173
|
modifyInfo: {
|
|
8149
8174
|
type: "updateElement",
|
|
8150
8175
|
content: {
|
|
@@ -8167,7 +8192,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8167
8192
|
pointEnd(e) {
|
|
8168
8193
|
inBusyMode = null;
|
|
8169
8194
|
sharer.setSharedStorage(keyIsMoving, false);
|
|
8170
|
-
const
|
|
8195
|
+
const data2 = sharer.getActiveStorage("data");
|
|
8171
8196
|
const selectedElements = sharer.getSharedStorage(keySelectedElementList);
|
|
8172
8197
|
const hoverElement = sharer.getSharedStorage(keyHoverElement);
|
|
8173
8198
|
const resizeType = sharer.getSharedStorage(keyResizeType);
|
|
@@ -8185,11 +8210,11 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8185
8210
|
needDrawFrame = true;
|
|
8186
8211
|
} else if (actionType === "area") {
|
|
8187
8212
|
sharer.setSharedStorage(keyActionType, null);
|
|
8188
|
-
if (
|
|
8213
|
+
if (data2) {
|
|
8189
8214
|
const start = sharer.getSharedStorage(keyAreaStart);
|
|
8190
8215
|
const end = sharer.getSharedStorage(keyAreaEnd);
|
|
8191
8216
|
if (start && end) {
|
|
8192
|
-
const { elements } = getSelectedListArea(
|
|
8217
|
+
const { elements } = getSelectedListArea(data2, {
|
|
8193
8218
|
start,
|
|
8194
8219
|
end,
|
|
8195
8220
|
viewScaleInfo: sharer.getActiveViewScaleInfo(),
|
|
@@ -8205,9 +8230,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8205
8230
|
} else if (actionType === "drag-list") {
|
|
8206
8231
|
sharer.setSharedStorage(keyActionType, "drag-list-end");
|
|
8207
8232
|
needDrawFrame = true;
|
|
8208
|
-
} else if (
|
|
8233
|
+
} else if (data2) {
|
|
8209
8234
|
const result = calculator.getPointElement(e.point, {
|
|
8210
|
-
data,
|
|
8235
|
+
data: data2,
|
|
8211
8236
|
viewScaleInfo: sharer.getActiveViewScaleInfo(),
|
|
8212
8237
|
viewSizeInfo: sharer.getActiveViewSizeInfo()
|
|
8213
8238
|
});
|
|
@@ -8226,13 +8251,13 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8226
8251
|
if (!needDrawFrame) {
|
|
8227
8252
|
return;
|
|
8228
8253
|
}
|
|
8229
|
-
if (
|
|
8230
|
-
const viewInfo = calcElementsViewInfo(
|
|
8254
|
+
if (data2 && Array.isArray(data2 == null ? void 0 : data2.elements) && ["drag", "drag-list"].includes(actionType)) {
|
|
8255
|
+
const viewInfo = calcElementsViewInfo(data2.elements, viewSizeInfo, { extend: true });
|
|
8231
8256
|
sharer.setActiveStorage("contextHeight", viewInfo.contextSize.contextHeight);
|
|
8232
8257
|
sharer.setActiveStorage("contextWidth", viewInfo.contextSize.contextWidth);
|
|
8233
8258
|
}
|
|
8234
|
-
if (
|
|
8235
|
-
let
|
|
8259
|
+
if (data2 && ["drag", "drag-list", "drag-list-end", "resize"].includes(actionType)) {
|
|
8260
|
+
let type2 = "resizeElement";
|
|
8236
8261
|
if (hasChangedData) {
|
|
8237
8262
|
const startSize = pointStartElementSizeList[0];
|
|
8238
8263
|
let modifyRecord = null;
|
|
@@ -8273,7 +8298,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
8273
8298
|
}
|
|
8274
8299
|
};
|
|
8275
8300
|
}
|
|
8276
|
-
eventHub.trigger(coreEventKeys.CHANGE, { data, type, selectedElements, hoverElement, modifyRecord });
|
|
8301
|
+
eventHub.trigger(coreEventKeys.CHANGE, { data: data2, type: type2, selectedElements, hoverElement, modifyRecord });
|
|
8277
8302
|
hasChangedData = false;
|
|
8278
8303
|
}
|
|
8279
8304
|
}
|
|
@@ -9296,7 +9321,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9296
9321
|
return div;
|
|
9297
9322
|
};
|
|
9298
9323
|
const resetTextArea = (e) => {
|
|
9299
|
-
const { viewScaleInfo, element, groupQueue } = e;
|
|
9324
|
+
const { viewScaleInfo, element: element2, groupQueue } = e;
|
|
9300
9325
|
const { scale, offsetTop, offsetLeft } = viewScaleInfo;
|
|
9301
9326
|
if (canvasWrapper.children) {
|
|
9302
9327
|
Array.from(canvasWrapper.children).forEach((child) => {
|
|
@@ -9323,17 +9348,17 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9323
9348
|
}
|
|
9324
9349
|
const detail = {
|
|
9325
9350
|
...defaultElementDetail,
|
|
9326
|
-
...
|
|
9351
|
+
...element2.detail
|
|
9327
9352
|
};
|
|
9328
|
-
let elemX =
|
|
9329
|
-
let elemY =
|
|
9330
|
-
let elemW =
|
|
9331
|
-
let elemH =
|
|
9353
|
+
let elemX = element2.x * scale + offsetLeft;
|
|
9354
|
+
let elemY = element2.y * scale + offsetTop;
|
|
9355
|
+
let elemW = element2.w * scale;
|
|
9356
|
+
let elemH = element2.h * scale;
|
|
9332
9357
|
if (groupQueue.length > 0) {
|
|
9333
|
-
elemX =
|
|
9334
|
-
elemY =
|
|
9335
|
-
elemW =
|
|
9336
|
-
elemH =
|
|
9358
|
+
elemX = element2.x * scale;
|
|
9359
|
+
elemY = element2.y * scale;
|
|
9360
|
+
elemW = element2.w * scale;
|
|
9361
|
+
elemH = element2.h * scale;
|
|
9337
9362
|
}
|
|
9338
9363
|
let justifyContent = "center";
|
|
9339
9364
|
let alignItems = "center";
|
|
@@ -9355,7 +9380,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9355
9380
|
textarea.style.top = `${elemY - 1}px`;
|
|
9356
9381
|
textarea.style.width = `${elemW + 2}px`;
|
|
9357
9382
|
textarea.style.height = `${elemH + 2}px`;
|
|
9358
|
-
textarea.style.transform = `rotate(${limitAngle(
|
|
9383
|
+
textarea.style.transform = `rotate(${limitAngle(element2.angle || 0)}deg)`;
|
|
9359
9384
|
textarea.style.boxSizing = "border-box";
|
|
9360
9385
|
textarea.style.border = "1px solid #1973ba";
|
|
9361
9386
|
textarea.style.resize = "none";
|
|
@@ -9417,13 +9442,13 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9417
9442
|
},
|
|
9418
9443
|
position: [...activePosition]
|
|
9419
9444
|
});
|
|
9420
|
-
const
|
|
9445
|
+
const data2 = sharer.getActiveStorage("data") || { elements: [] };
|
|
9421
9446
|
const updateContent = {
|
|
9422
9447
|
detail: {
|
|
9423
9448
|
text: activeElem.detail.text
|
|
9424
9449
|
}
|
|
9425
9450
|
};
|
|
9426
|
-
updateElementInList(activeElem.uuid, updateContent,
|
|
9451
|
+
updateElementInList(activeElem.uuid, updateContent, data2.elements);
|
|
9427
9452
|
eventHub.trigger(coreEventKeys.CHANGE, {
|
|
9428
9453
|
selectedElements: [
|
|
9429
9454
|
{
|
|
@@ -9434,7 +9459,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9434
9459
|
}
|
|
9435
9460
|
}
|
|
9436
9461
|
],
|
|
9437
|
-
data,
|
|
9462
|
+
data: data2,
|
|
9438
9463
|
type: "modifyElement",
|
|
9439
9464
|
modifyRecord: {
|
|
9440
9465
|
type: "modifyElement",
|
|
@@ -9645,10 +9670,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9645
9670
|
resetMiddlewareConfig(middleware, config) {
|
|
9646
9671
|
__privateGet(this, _board).resetMiddlewareConfig(middleware, config);
|
|
9647
9672
|
}
|
|
9648
|
-
setData(
|
|
9673
|
+
setData(data2) {
|
|
9649
9674
|
const loader = __privateGet(this, _board).getRenderer().getLoader();
|
|
9650
9675
|
loader.reset();
|
|
9651
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9676
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9652
9677
|
}
|
|
9653
9678
|
getData() {
|
|
9654
9679
|
return __privateGet(this, _board).getData();
|
|
@@ -9699,10 +9724,10 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9699
9724
|
const renderer = __privateGet(this, _board).getRenderer();
|
|
9700
9725
|
const calculator = renderer.getCalculator();
|
|
9701
9726
|
const loader = renderer.getLoader();
|
|
9702
|
-
const
|
|
9703
|
-
if (
|
|
9727
|
+
const data2 = this.getData();
|
|
9728
|
+
if (data2) {
|
|
9704
9729
|
const { viewScaleInfo, viewSizeInfo } = this.getViewInfo();
|
|
9705
|
-
calculator.resetVirtualFlatItemMap(
|
|
9730
|
+
calculator.resetVirtualFlatItemMap(data2, {
|
|
9706
9731
|
viewScaleInfo,
|
|
9707
9732
|
viewSizeInfo
|
|
9708
9733
|
});
|
|
@@ -9722,31 +9747,31 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9722
9747
|
offBoardWatcherEvents() {
|
|
9723
9748
|
__privateGet(this, _board).offWatcherEvents();
|
|
9724
9749
|
}
|
|
9725
|
-
createElement(
|
|
9750
|
+
createElement(type2, element2, opts) {
|
|
9726
9751
|
const { viewScaleInfo, viewSizeInfo } = this.getViewInfo();
|
|
9727
9752
|
return createElement(
|
|
9728
|
-
|
|
9729
|
-
|
|
9753
|
+
type2,
|
|
9754
|
+
element2 || {},
|
|
9730
9755
|
(opts == null ? void 0 : opts.viewCenter) === true ? {
|
|
9731
9756
|
viewScaleInfo,
|
|
9732
9757
|
viewSizeInfo
|
|
9733
9758
|
} : void 0
|
|
9734
9759
|
);
|
|
9735
9760
|
}
|
|
9736
|
-
updateElement(
|
|
9737
|
-
const
|
|
9738
|
-
const uuid =
|
|
9739
|
-
const position = getElementPositionFromList(uuid,
|
|
9740
|
-
const beforeElem = findElementFromListByPosition(position,
|
|
9761
|
+
updateElement(element2) {
|
|
9762
|
+
const data2 = this.getData() || { elements: [] };
|
|
9763
|
+
const uuid = element2.uuid;
|
|
9764
|
+
const position = getElementPositionFromList(uuid, data2.elements);
|
|
9765
|
+
const beforeElem = findElementFromListByPosition(position, data2.elements);
|
|
9741
9766
|
if (!beforeElem) {
|
|
9742
9767
|
return null;
|
|
9743
9768
|
}
|
|
9744
9769
|
const before = toFlattenElement(beforeElem);
|
|
9745
|
-
const updatedElement = updateElementInListByPosition(position,
|
|
9770
|
+
const updatedElement = updateElementInListByPosition(position, element2, data2.elements, { strict: true });
|
|
9746
9771
|
const after = toFlattenElement(updatedElement);
|
|
9747
9772
|
const loader = __privateGet(this, _board).getRenderer().getLoader();
|
|
9748
|
-
loader.resetElementAsset(
|
|
9749
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9773
|
+
loader.resetElementAsset(element2);
|
|
9774
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9750
9775
|
this.refresh();
|
|
9751
9776
|
const modifyRecord = {
|
|
9752
9777
|
type: "updateElement",
|
|
@@ -9755,39 +9780,39 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9755
9780
|
};
|
|
9756
9781
|
return modifyRecord;
|
|
9757
9782
|
}
|
|
9758
|
-
modifyElement(
|
|
9759
|
-
const { uuid, ...restElement } =
|
|
9760
|
-
const
|
|
9761
|
-
const position = getElementPositionFromList(uuid,
|
|
9762
|
-
const beforeElem = findElementFromListByPosition(position,
|
|
9783
|
+
modifyElement(element2) {
|
|
9784
|
+
const { uuid, ...restElement } = element2;
|
|
9785
|
+
const data2 = this.getData() || { elements: [] };
|
|
9786
|
+
const position = getElementPositionFromList(uuid, data2.elements);
|
|
9787
|
+
const beforeElem = findElementFromListByPosition(position, data2.elements);
|
|
9763
9788
|
if (!beforeElem) {
|
|
9764
9789
|
return null;
|
|
9765
9790
|
}
|
|
9766
9791
|
const modifyRecord = getModifyElementRecord({
|
|
9767
|
-
modifiedElement:
|
|
9792
|
+
modifiedElement: element2,
|
|
9768
9793
|
beforeElement: beforeElem
|
|
9769
9794
|
});
|
|
9770
|
-
updateElementInListByPosition(position, restElement,
|
|
9795
|
+
updateElementInListByPosition(position, restElement, data2.elements);
|
|
9771
9796
|
const loader = __privateGet(this, _board).getRenderer().getLoader();
|
|
9772
|
-
loader.resetElementAsset({ ...
|
|
9773
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9797
|
+
loader.resetElementAsset({ ...element2, type: beforeElem.type });
|
|
9798
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9774
9799
|
this.refresh();
|
|
9775
9800
|
return modifyRecord;
|
|
9776
9801
|
}
|
|
9777
9802
|
modifyElements(elements) {
|
|
9778
|
-
const
|
|
9803
|
+
const data2 = this.getData() || { elements: [] };
|
|
9779
9804
|
let modifyRecord = null;
|
|
9780
9805
|
const before = [];
|
|
9781
9806
|
const after = [];
|
|
9782
|
-
elements.forEach((
|
|
9783
|
-
const { uuid, ...restElement } =
|
|
9784
|
-
const position = getElementPositionFromList(uuid,
|
|
9785
|
-
const beforeElem = findElementFromListByPosition(position,
|
|
9807
|
+
elements.forEach((element2) => {
|
|
9808
|
+
const { uuid, ...restElement } = element2;
|
|
9809
|
+
const position = getElementPositionFromList(uuid, data2.elements);
|
|
9810
|
+
const beforeElem = findElementFromListByPosition(position, data2.elements);
|
|
9786
9811
|
if (!beforeElem) {
|
|
9787
9812
|
return null;
|
|
9788
9813
|
}
|
|
9789
9814
|
const tempRecord = getModifyElementRecord({
|
|
9790
|
-
modifiedElement:
|
|
9815
|
+
modifiedElement: element2,
|
|
9791
9816
|
beforeElement: beforeElem
|
|
9792
9817
|
});
|
|
9793
9818
|
if (tempRecord.content) {
|
|
@@ -9800,7 +9825,7 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9800
9825
|
uuid
|
|
9801
9826
|
});
|
|
9802
9827
|
}
|
|
9803
|
-
updateElementInListByPosition(position, restElement,
|
|
9828
|
+
updateElementInListByPosition(position, restElement, data2.elements);
|
|
9804
9829
|
});
|
|
9805
9830
|
modifyRecord = {
|
|
9806
9831
|
type: "modifyElements",
|
|
@@ -9811,63 +9836,63 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9811
9836
|
after
|
|
9812
9837
|
}
|
|
9813
9838
|
};
|
|
9814
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9839
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9815
9840
|
this.refresh();
|
|
9816
9841
|
return modifyRecord;
|
|
9817
9842
|
}
|
|
9818
|
-
addElement(
|
|
9843
|
+
addElement(element2, opts) {
|
|
9819
9844
|
var _a;
|
|
9820
|
-
const
|
|
9845
|
+
const data2 = this.getData() || { elements: [] };
|
|
9821
9846
|
if (!opts || !((_a = opts == null ? void 0 : opts.position) == null ? void 0 : _a.length)) {
|
|
9822
|
-
|
|
9847
|
+
data2.elements.push(element2);
|
|
9823
9848
|
} else if (opts == null ? void 0 : opts.position) {
|
|
9824
9849
|
const position2 = [...(opts == null ? void 0 : opts.position) || []];
|
|
9825
|
-
insertElementToListByPosition(
|
|
9850
|
+
insertElementToListByPosition(element2, position2, data2.elements);
|
|
9826
9851
|
}
|
|
9827
|
-
const position = getElementPositionFromList(
|
|
9852
|
+
const position = getElementPositionFromList(element2.uuid, data2.elements);
|
|
9828
9853
|
const modifyRecord = {
|
|
9829
9854
|
type: "addElement",
|
|
9830
9855
|
time: Date.now(),
|
|
9831
|
-
content: { method: "addElement", uuid:
|
|
9856
|
+
content: { method: "addElement", uuid: element2.uuid, position, element: deepClone(element2) }
|
|
9832
9857
|
};
|
|
9833
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9858
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9834
9859
|
this.refresh();
|
|
9835
9860
|
return modifyRecord;
|
|
9836
9861
|
}
|
|
9837
9862
|
deleteElement(uuid) {
|
|
9838
|
-
const
|
|
9839
|
-
const position = getElementPositionFromList(uuid,
|
|
9840
|
-
const
|
|
9863
|
+
const data2 = this.getData() || { elements: [] };
|
|
9864
|
+
const position = getElementPositionFromList(uuid, data2.elements);
|
|
9865
|
+
const element2 = findElementFromListByPosition(position, data2.elements);
|
|
9841
9866
|
const modifyRecord = {
|
|
9842
9867
|
type: "deleteElement",
|
|
9843
9868
|
time: Date.now(),
|
|
9844
|
-
content: { method: "deleteElement", uuid, position, element:
|
|
9869
|
+
content: { method: "deleteElement", uuid, position, element: element2 ? deepClone(element2) : null }
|
|
9845
9870
|
};
|
|
9846
|
-
if (
|
|
9871
|
+
if (element2) {
|
|
9847
9872
|
const loader = __privateGet(this, _board).getRenderer().getLoader();
|
|
9848
|
-
loader.resetElementAsset(
|
|
9873
|
+
loader.resetElementAsset(element2);
|
|
9849
9874
|
}
|
|
9850
|
-
deleteElementInList(uuid,
|
|
9851
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9875
|
+
deleteElementInList(uuid, data2.elements);
|
|
9876
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9852
9877
|
this.refresh();
|
|
9853
9878
|
return modifyRecord;
|
|
9854
9879
|
}
|
|
9855
9880
|
moveElement(uuid, to) {
|
|
9856
|
-
const
|
|
9857
|
-
const from = getElementPositionFromList(uuid,
|
|
9881
|
+
const data2 = this.getData() || { elements: [] };
|
|
9882
|
+
const from = getElementPositionFromList(uuid, data2.elements);
|
|
9858
9883
|
const modifyRecord = {
|
|
9859
9884
|
type: "moveElement",
|
|
9860
9885
|
time: Date.now(),
|
|
9861
9886
|
content: { method: "moveElement", uuid, from: [...from], to: [...to] }
|
|
9862
9887
|
};
|
|
9863
|
-
const { elements: list } = moveElementPosition(
|
|
9864
|
-
|
|
9865
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9888
|
+
const { elements: list } = moveElementPosition(data2.elements, { from, to });
|
|
9889
|
+
data2.elements = list;
|
|
9890
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9866
9891
|
this.refresh();
|
|
9867
9892
|
return modifyRecord;
|
|
9868
9893
|
}
|
|
9869
|
-
modifyLayout(
|
|
9870
|
-
const
|
|
9894
|
+
modifyLayout(layout2) {
|
|
9895
|
+
const data2 = this.getData() || { elements: [] };
|
|
9871
9896
|
const modifyRecord = {
|
|
9872
9897
|
type: "modifyLayout",
|
|
9873
9898
|
time: Date.now(),
|
|
@@ -9877,21 +9902,21 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9877
9902
|
after: null
|
|
9878
9903
|
}
|
|
9879
9904
|
};
|
|
9880
|
-
if (
|
|
9881
|
-
if (
|
|
9882
|
-
modifyRecord.content.before = toFlattenLayout(
|
|
9883
|
-
delete
|
|
9884
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9905
|
+
if (layout2 === null) {
|
|
9906
|
+
if (data2.layout) {
|
|
9907
|
+
modifyRecord.content.before = toFlattenLayout(data2.layout);
|
|
9908
|
+
delete data2["layout"];
|
|
9909
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9885
9910
|
this.refresh();
|
|
9886
9911
|
return modifyRecord;
|
|
9887
9912
|
} else {
|
|
9888
9913
|
return modifyRecord;
|
|
9889
9914
|
}
|
|
9890
9915
|
}
|
|
9891
|
-
const beforeLayout =
|
|
9916
|
+
const beforeLayout = data2.layout;
|
|
9892
9917
|
let before = {};
|
|
9893
|
-
const after = toFlattenLayout(
|
|
9894
|
-
if (
|
|
9918
|
+
const after = toFlattenLayout(layout2);
|
|
9919
|
+
if (data2.layout) {
|
|
9895
9920
|
Object.keys(after).forEach((key2) => {
|
|
9896
9921
|
let val = get(beforeLayout, key2);
|
|
9897
9922
|
if (val === void 0 && /(borderRadius|borderWidth)\[[0-9]{1,}\]$/.test(key2)) {
|
|
@@ -9903,16 +9928,16 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9903
9928
|
before = toFlattenLayout(before);
|
|
9904
9929
|
modifyRecord.content.before = before;
|
|
9905
9930
|
} else {
|
|
9906
|
-
|
|
9931
|
+
data2.layout = {};
|
|
9907
9932
|
}
|
|
9908
9933
|
modifyRecord.content.after = after;
|
|
9909
|
-
mergeLayout(
|
|
9910
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9934
|
+
mergeLayout(data2.layout, layout2);
|
|
9935
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9911
9936
|
this.refresh();
|
|
9912
9937
|
return modifyRecord;
|
|
9913
9938
|
}
|
|
9914
9939
|
modifyGlobal(global) {
|
|
9915
|
-
const
|
|
9940
|
+
const data2 = this.getData() || { elements: [] };
|
|
9916
9941
|
const modifyRecord = {
|
|
9917
9942
|
type: "modifyGlobal",
|
|
9918
9943
|
time: Date.now(),
|
|
@@ -9923,31 +9948,31 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9923
9948
|
}
|
|
9924
9949
|
};
|
|
9925
9950
|
if (global === null) {
|
|
9926
|
-
if (
|
|
9927
|
-
modifyRecord.content.before = toFlattenGlobal(
|
|
9928
|
-
delete
|
|
9929
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9951
|
+
if (data2.global) {
|
|
9952
|
+
modifyRecord.content.before = toFlattenGlobal(data2.global);
|
|
9953
|
+
delete data2["global"];
|
|
9954
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9930
9955
|
this.refresh();
|
|
9931
9956
|
return modifyRecord;
|
|
9932
9957
|
} else {
|
|
9933
9958
|
return modifyRecord;
|
|
9934
9959
|
}
|
|
9935
9960
|
}
|
|
9936
|
-
const beforeGlobal =
|
|
9961
|
+
const beforeGlobal = data2.global;
|
|
9937
9962
|
let before = {};
|
|
9938
9963
|
const after = toFlattenGlobal(global);
|
|
9939
|
-
if (
|
|
9964
|
+
if (data2.global) {
|
|
9940
9965
|
Object.keys(after).forEach((key2) => {
|
|
9941
9966
|
before[key2] = get(beforeGlobal, key2);
|
|
9942
9967
|
});
|
|
9943
9968
|
before = toFlattenGlobal(before);
|
|
9944
9969
|
modifyRecord.content.before = before;
|
|
9945
9970
|
} else {
|
|
9946
|
-
|
|
9971
|
+
data2.global = {};
|
|
9947
9972
|
}
|
|
9948
9973
|
modifyRecord.content.after = after;
|
|
9949
|
-
mergeGlobal(
|
|
9950
|
-
__privateMethod(this, _Core_instances, resetData_fn).call(this,
|
|
9974
|
+
mergeGlobal(data2.global, global);
|
|
9975
|
+
__privateMethod(this, _Core_instances, resetData_fn).call(this, data2);
|
|
9951
9976
|
this.refresh();
|
|
9952
9977
|
return modifyRecord;
|
|
9953
9978
|
}
|
|
@@ -9960,9 +9985,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
|
|
|
9960
9985
|
const container = __privateGet(this, _container2);
|
|
9961
9986
|
container.style.position = "relative";
|
|
9962
9987
|
};
|
|
9963
|
-
resetData_fn = function(
|
|
9964
|
-
validateElements((
|
|
9965
|
-
__privateGet(this, _board).setData(
|
|
9988
|
+
resetData_fn = function(data2) {
|
|
9989
|
+
validateElements((data2 == null ? void 0 : data2.elements) || []);
|
|
9990
|
+
__privateGet(this, _board).setData(data2);
|
|
9966
9991
|
};
|
|
9967
9992
|
exports.Board = Board;
|
|
9968
9993
|
exports.Calculator = Calculator;
|