@fileverse-dev/fortune-react 1.2.86-pinyin-6 → 1.2.86-pinyin-8
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.
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
var __assign = this && this.__assign || function () {
|
|
2
|
+
__assign = Object.assign || function (t) {
|
|
3
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
4
|
+
s = arguments[i];
|
|
5
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
6
|
+
}
|
|
7
|
+
return t;
|
|
8
|
+
};
|
|
9
|
+
return __assign.apply(this, arguments);
|
|
10
|
+
};
|
|
1
11
|
var __rest = this && this.__rest || function (s, e) {
|
|
2
12
|
var t = {};
|
|
3
13
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
@@ -15,7 +25,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
|
|
|
15
25
|
}
|
|
16
26
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
17
27
|
};
|
|
18
|
-
import {
|
|
28
|
+
import { defaultContext, defaultSettings, initSheetIndex, handleGlobalKeyDown, getSheetIndex, handlePaste, filterPatch, patchToOp, inverseRowColOptions, ensureSheetIndex, insertRowCol, deleteRowCol, groupValuesRefresh, insertDuneChart, getFlowdata, api, handlePasteByClick } from "@fileverse-dev/fortune-core";
|
|
19
29
|
import React, { useMemo, useState, useCallback, useEffect, useRef, useImperativeHandle } from "react";
|
|
20
30
|
import "./index.css";
|
|
21
31
|
import produce, { applyPatches, enablePatches, produceWithPatches } from "immer";
|
|
@@ -248,113 +258,16 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
|
248
258
|
return result;
|
|
249
259
|
});
|
|
250
260
|
}, [emitOp]);
|
|
251
|
-
var
|
|
252
|
-
|
|
253
|
-
console.log("repaint is calling", context, context.config.borderInfo);
|
|
254
|
-
var tableCanvas = new Canvas(refs.canvas.current, context);
|
|
255
|
-
console.log(context.config.borderInfo, "global context");
|
|
256
|
-
setContext(function (draftCtx) {
|
|
257
|
-
console.log(draftCtx.config.borderInfo, "local context");
|
|
258
|
-
return draftCtx;
|
|
259
|
-
});
|
|
260
|
-
var freeze = (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[sheet.id];
|
|
261
|
-
if (((_b = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _b === void 0 ? void 0 : _b.freezenhorizontaldata) || ((_c = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _c === void 0 ? void 0 : _c.freezenverticaldata)) {
|
|
262
|
-
var horizontalData = (_d = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _d === void 0 ? void 0 : _d.freezenhorizontaldata;
|
|
263
|
-
var verticallData = (_e = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _e === void 0 ? void 0 : _e.freezenverticaldata;
|
|
264
|
-
if (horizontalData && verticallData) {
|
|
265
|
-
var horizontalPx = horizontalData[0],
|
|
266
|
-
horizontalScrollTop = horizontalData[2];
|
|
267
|
-
var verticalPx = verticallData[0],
|
|
268
|
-
verticalScrollWidth = verticallData[2];
|
|
269
|
-
tableCanvas.drawMain({
|
|
270
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
271
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
272
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth,
|
|
273
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
|
|
274
|
-
clear: true
|
|
275
|
-
});
|
|
276
|
-
tableCanvas.drawMain({
|
|
277
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
278
|
-
scrollHeight: horizontalScrollTop,
|
|
279
|
-
drawHeight: horizontalPx,
|
|
280
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
|
|
281
|
-
});
|
|
282
|
-
tableCanvas.drawMain({
|
|
283
|
-
scrollWidth: verticalScrollWidth,
|
|
284
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
285
|
-
drawWidth: verticalPx,
|
|
286
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight
|
|
287
|
-
});
|
|
288
|
-
tableCanvas.drawMain({
|
|
289
|
-
scrollWidth: verticalScrollWidth,
|
|
290
|
-
scrollHeight: horizontalScrollTop,
|
|
291
|
-
drawWidth: verticalPx,
|
|
292
|
-
drawHeight: horizontalPx
|
|
293
|
-
});
|
|
294
|
-
tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
|
|
295
|
-
tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
|
|
296
|
-
tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
|
|
297
|
-
tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
|
|
298
|
-
tableCanvas.drawFreezeLine({
|
|
299
|
-
horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2,
|
|
300
|
-
verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
|
|
301
|
-
});
|
|
302
|
-
} else if (horizontalData) {
|
|
303
|
-
var horizontalPx = horizontalData[0],
|
|
304
|
-
horizontalScrollTop = horizontalData[2];
|
|
305
|
-
tableCanvas.drawMain({
|
|
306
|
-
scrollWidth: context.scrollLeft,
|
|
307
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
308
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
|
|
309
|
-
clear: true
|
|
310
|
-
});
|
|
311
|
-
tableCanvas.drawMain({
|
|
312
|
-
scrollWidth: context.scrollLeft,
|
|
313
|
-
scrollHeight: horizontalScrollTop,
|
|
314
|
-
drawHeight: horizontalPx
|
|
315
|
-
});
|
|
316
|
-
tableCanvas.drawColumnHeader(context.scrollLeft);
|
|
317
|
-
tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
|
|
318
|
-
tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
|
|
319
|
-
tableCanvas.drawFreezeLine({
|
|
320
|
-
horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2
|
|
321
|
-
});
|
|
322
|
-
} else if (verticallData) {
|
|
323
|
-
var verticalPx = verticallData[0],
|
|
324
|
-
verticalScrollWidth = verticallData[2];
|
|
325
|
-
tableCanvas.drawMain({
|
|
326
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
327
|
-
scrollHeight: context.scrollTop,
|
|
328
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
|
|
329
|
-
});
|
|
330
|
-
tableCanvas.drawMain({
|
|
331
|
-
scrollWidth: verticalScrollWidth,
|
|
332
|
-
scrollHeight: context.scrollTop,
|
|
333
|
-
drawWidth: verticalPx
|
|
334
|
-
});
|
|
335
|
-
tableCanvas.drawRowHeader(context.scrollTop);
|
|
336
|
-
tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
|
|
337
|
-
tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
|
|
338
|
-
tableCanvas.drawFreezeLine({
|
|
339
|
-
verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
|
|
340
|
-
});
|
|
341
|
-
}
|
|
342
|
-
} else {
|
|
343
|
-
tableCanvas.drawMain({
|
|
344
|
-
scrollWidth: context.scrollLeft,
|
|
345
|
-
scrollHeight: context.scrollTop,
|
|
346
|
-
clear: true
|
|
347
|
-
});
|
|
348
|
-
tableCanvas.drawColumnHeader(context.scrollLeft);
|
|
349
|
-
tableCanvas.drawRowHeader(context.scrollTop);
|
|
350
|
-
}
|
|
351
|
-
};
|
|
352
|
-
var handleUndo = useCallback(function () {
|
|
261
|
+
var handleUndo = function handleUndo() {
|
|
262
|
+
console.log("undo poo");
|
|
353
263
|
var history = globalCache.current.undoList.pop();
|
|
354
|
-
console.log("undo", history);
|
|
355
264
|
if (history) {
|
|
356
265
|
setContext(function (ctx_) {
|
|
357
|
-
var _a, _b, _c, _d, _e;
|
|
266
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
267
|
+
var isBorderUndo = history.patches.some(function (onePatch) {
|
|
268
|
+
var _a;
|
|
269
|
+
return (_a = onePatch.value) === null || _a === void 0 ? void 0 : _a.borderInfo;
|
|
270
|
+
});
|
|
358
271
|
if ((_a = history.options) === null || _a === void 0 ? void 0 : _a.deleteSheetOp) {
|
|
359
272
|
history.inversePatches[0].path[1] = ctx_.luckysheetfile.length;
|
|
360
273
|
var order_1 = (_c = (_b = history.options.deletedSheet) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.order;
|
|
@@ -387,23 +300,44 @@ var Workbook = /*#__PURE__*/React.forwardRef(function (_a, ref) {
|
|
|
387
300
|
delete inversedOptions.addSheet.value.data;
|
|
388
301
|
}
|
|
389
302
|
emitOp(newContext, history.inversePatches, inversedOptions, true);
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
303
|
+
var nw = __assign({}, newContext);
|
|
304
|
+
if (isBorderUndo) {
|
|
305
|
+
var nwborderlist = (_g = (_f = nw === null || nw === void 0 ? void 0 : nw.config) === null || _f === void 0 ? void 0 : _f.borderInfo) === null || _g === void 0 ? void 0 : _g.slice(0, -1);
|
|
306
|
+
nw = __assign(__assign({}, nw), {
|
|
307
|
+
config: __assign(__assign({}, nw.config), {
|
|
308
|
+
borderInfo: nwborderlist
|
|
309
|
+
})
|
|
310
|
+
});
|
|
311
|
+
}
|
|
312
|
+
return isBorderUndo ? nw : newContext;
|
|
393
313
|
});
|
|
394
314
|
}
|
|
395
|
-
}
|
|
396
|
-
var handleRedo =
|
|
315
|
+
};
|
|
316
|
+
var handleRedo = function handleRedo() {
|
|
397
317
|
var history = globalCache.current.redoList.pop();
|
|
398
318
|
if (history) {
|
|
399
319
|
setContext(function (ctx_) {
|
|
320
|
+
var _a, _b, _c;
|
|
400
321
|
var newContext = applyPatches(ctx_, history.patches);
|
|
322
|
+
var isBorderUndo = history.patches.some(function (onePatch) {
|
|
323
|
+
var _a;
|
|
324
|
+
return (_a = onePatch.value) === null || _a === void 0 ? void 0 : _a.borderInfo;
|
|
325
|
+
});
|
|
401
326
|
globalCache.current.undoList.push(history);
|
|
402
327
|
emitOp(newContext, history.patches, history.options);
|
|
403
|
-
|
|
328
|
+
var nw = __assign({}, newContext);
|
|
329
|
+
if (isBorderUndo) {
|
|
330
|
+
var nwborderlist = ((_b = (_a = nw === null || nw === void 0 ? void 0 : nw.config) === null || _a === void 0 ? void 0 : _a.borderInfo) !== null && _b !== void 0 ? _b : []).concat((_c = history.patches[0].value) === null || _c === void 0 ? void 0 : _c.borderInfo[0]);
|
|
331
|
+
nw = __assign(__assign({}, nw), {
|
|
332
|
+
config: __assign(__assign({}, nw.config), {
|
|
333
|
+
borderInfo: nwborderlist
|
|
334
|
+
})
|
|
335
|
+
});
|
|
336
|
+
}
|
|
337
|
+
return isBorderUndo ? nw : newContext;
|
|
404
338
|
});
|
|
405
339
|
}
|
|
406
|
-
}
|
|
340
|
+
};
|
|
407
341
|
useEffect(function () {
|
|
408
342
|
var _a, _b;
|
|
409
343
|
(_b = (_a = mergedSettings.hooks) === null || _a === void 0 ? void 0 : _a.afterActivateSheet) === null || _b === void 0 ? void 0 : _b.call(_a, context.currentSheetId);
|
|
@@ -26,6 +26,16 @@ var _SheetList = _interopRequireDefault(require("../SheetList"));
|
|
|
26
26
|
var _DunePreview = _interopRequireDefault(require("../DunePreview/DunePreview"));
|
|
27
27
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
28
28
|
function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
|
|
29
|
+
var __assign = void 0 && (void 0).__assign || function () {
|
|
30
|
+
__assign = Object.assign || function (t) {
|
|
31
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
32
|
+
s = arguments[i];
|
|
33
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
|
|
34
|
+
}
|
|
35
|
+
return t;
|
|
36
|
+
};
|
|
37
|
+
return __assign.apply(this, arguments);
|
|
38
|
+
};
|
|
29
39
|
var __rest = void 0 && (void 0).__rest || function (s, e) {
|
|
30
40
|
var t = {};
|
|
31
41
|
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
@@ -257,113 +267,16 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
|
|
|
257
267
|
return result;
|
|
258
268
|
});
|
|
259
269
|
}, [emitOp]);
|
|
260
|
-
var
|
|
261
|
-
|
|
262
|
-
console.log("repaint is calling", context, context.config.borderInfo);
|
|
263
|
-
var tableCanvas = new _fortuneCore.Canvas(refs.canvas.current, context);
|
|
264
|
-
console.log(context.config.borderInfo, "global context");
|
|
265
|
-
setContext(function (draftCtx) {
|
|
266
|
-
console.log(draftCtx.config.borderInfo, "local context");
|
|
267
|
-
return draftCtx;
|
|
268
|
-
});
|
|
269
|
-
var freeze = (_a = refs.globalCache.freezen) === null || _a === void 0 ? void 0 : _a[sheet.id];
|
|
270
|
-
if (((_b = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _b === void 0 ? void 0 : _b.freezenhorizontaldata) || ((_c = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _c === void 0 ? void 0 : _c.freezenverticaldata)) {
|
|
271
|
-
var horizontalData = (_d = freeze === null || freeze === void 0 ? void 0 : freeze.horizontal) === null || _d === void 0 ? void 0 : _d.freezenhorizontaldata;
|
|
272
|
-
var verticallData = (_e = freeze === null || freeze === void 0 ? void 0 : freeze.vertical) === null || _e === void 0 ? void 0 : _e.freezenverticaldata;
|
|
273
|
-
if (horizontalData && verticallData) {
|
|
274
|
-
var horizontalPx = horizontalData[0],
|
|
275
|
-
horizontalScrollTop = horizontalData[2];
|
|
276
|
-
var verticalPx = verticallData[0],
|
|
277
|
-
verticalScrollWidth = verticallData[2];
|
|
278
|
-
tableCanvas.drawMain({
|
|
279
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
280
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
281
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth,
|
|
282
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
|
|
283
|
-
clear: true
|
|
284
|
-
});
|
|
285
|
-
tableCanvas.drawMain({
|
|
286
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
287
|
-
scrollHeight: horizontalScrollTop,
|
|
288
|
-
drawHeight: horizontalPx,
|
|
289
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
|
|
290
|
-
});
|
|
291
|
-
tableCanvas.drawMain({
|
|
292
|
-
scrollWidth: verticalScrollWidth,
|
|
293
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
294
|
-
drawWidth: verticalPx,
|
|
295
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight
|
|
296
|
-
});
|
|
297
|
-
tableCanvas.drawMain({
|
|
298
|
-
scrollWidth: verticalScrollWidth,
|
|
299
|
-
scrollHeight: horizontalScrollTop,
|
|
300
|
-
drawWidth: verticalPx,
|
|
301
|
-
drawHeight: horizontalPx
|
|
302
|
-
});
|
|
303
|
-
tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
|
|
304
|
-
tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
|
|
305
|
-
tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
|
|
306
|
-
tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
|
|
307
|
-
tableCanvas.drawFreezeLine({
|
|
308
|
-
horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2,
|
|
309
|
-
verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
|
|
310
|
-
});
|
|
311
|
-
} else if (horizontalData) {
|
|
312
|
-
var horizontalPx = horizontalData[0],
|
|
313
|
-
horizontalScrollTop = horizontalData[2];
|
|
314
|
-
tableCanvas.drawMain({
|
|
315
|
-
scrollWidth: context.scrollLeft,
|
|
316
|
-
scrollHeight: context.scrollTop + horizontalPx - horizontalScrollTop,
|
|
317
|
-
offsetTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight,
|
|
318
|
-
clear: true
|
|
319
|
-
});
|
|
320
|
-
tableCanvas.drawMain({
|
|
321
|
-
scrollWidth: context.scrollLeft,
|
|
322
|
-
scrollHeight: horizontalScrollTop,
|
|
323
|
-
drawHeight: horizontalPx
|
|
324
|
-
});
|
|
325
|
-
tableCanvas.drawColumnHeader(context.scrollLeft);
|
|
326
|
-
tableCanvas.drawRowHeader(context.scrollTop + horizontalPx - horizontalScrollTop, undefined, horizontalPx - horizontalScrollTop + context.columnHeaderHeight);
|
|
327
|
-
tableCanvas.drawRowHeader(horizontalScrollTop, horizontalPx);
|
|
328
|
-
tableCanvas.drawFreezeLine({
|
|
329
|
-
horizontalTop: horizontalPx - horizontalScrollTop + context.columnHeaderHeight - 2
|
|
330
|
-
});
|
|
331
|
-
} else if (verticallData) {
|
|
332
|
-
var verticalPx = verticallData[0],
|
|
333
|
-
verticalScrollWidth = verticallData[2];
|
|
334
|
-
tableCanvas.drawMain({
|
|
335
|
-
scrollWidth: context.scrollLeft + verticalPx - verticalScrollWidth,
|
|
336
|
-
scrollHeight: context.scrollTop,
|
|
337
|
-
offsetLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth
|
|
338
|
-
});
|
|
339
|
-
tableCanvas.drawMain({
|
|
340
|
-
scrollWidth: verticalScrollWidth,
|
|
341
|
-
scrollHeight: context.scrollTop,
|
|
342
|
-
drawWidth: verticalPx
|
|
343
|
-
});
|
|
344
|
-
tableCanvas.drawRowHeader(context.scrollTop);
|
|
345
|
-
tableCanvas.drawColumnHeader(context.scrollLeft + verticalPx - verticalScrollWidth, undefined, verticalPx - verticalScrollWidth + context.rowHeaderWidth);
|
|
346
|
-
tableCanvas.drawColumnHeader(verticalScrollWidth, verticalPx);
|
|
347
|
-
tableCanvas.drawFreezeLine({
|
|
348
|
-
verticalLeft: verticalPx - verticalScrollWidth + context.rowHeaderWidth - 2
|
|
349
|
-
});
|
|
350
|
-
}
|
|
351
|
-
} else {
|
|
352
|
-
tableCanvas.drawMain({
|
|
353
|
-
scrollWidth: context.scrollLeft,
|
|
354
|
-
scrollHeight: context.scrollTop,
|
|
355
|
-
clear: true
|
|
356
|
-
});
|
|
357
|
-
tableCanvas.drawColumnHeader(context.scrollLeft);
|
|
358
|
-
tableCanvas.drawRowHeader(context.scrollTop);
|
|
359
|
-
}
|
|
360
|
-
};
|
|
361
|
-
var handleUndo = (0, _react.useCallback)(function () {
|
|
270
|
+
var handleUndo = function handleUndo() {
|
|
271
|
+
console.log("undo poo");
|
|
362
272
|
var history = globalCache.current.undoList.pop();
|
|
363
|
-
console.log("undo", history);
|
|
364
273
|
if (history) {
|
|
365
274
|
setContext(function (ctx_) {
|
|
366
|
-
var _a, _b, _c, _d, _e;
|
|
275
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
276
|
+
var isBorderUndo = history.patches.some(function (onePatch) {
|
|
277
|
+
var _a;
|
|
278
|
+
return (_a = onePatch.value) === null || _a === void 0 ? void 0 : _a.borderInfo;
|
|
279
|
+
});
|
|
367
280
|
if ((_a = history.options) === null || _a === void 0 ? void 0 : _a.deleteSheetOp) {
|
|
368
281
|
history.inversePatches[0].path[1] = ctx_.luckysheetfile.length;
|
|
369
282
|
var order_1 = (_c = (_b = history.options.deletedSheet) === null || _b === void 0 ? void 0 : _b.value) === null || _c === void 0 ? void 0 : _c.order;
|
|
@@ -396,23 +309,44 @@ var Workbook = /*#__PURE__*/_react.default.forwardRef(function (_a, ref) {
|
|
|
396
309
|
delete inversedOptions.addSheet.value.data;
|
|
397
310
|
}
|
|
398
311
|
emitOp(newContext, history.inversePatches, inversedOptions, true);
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
312
|
+
var nw = __assign({}, newContext);
|
|
313
|
+
if (isBorderUndo) {
|
|
314
|
+
var nwborderlist = (_g = (_f = nw === null || nw === void 0 ? void 0 : nw.config) === null || _f === void 0 ? void 0 : _f.borderInfo) === null || _g === void 0 ? void 0 : _g.slice(0, -1);
|
|
315
|
+
nw = __assign(__assign({}, nw), {
|
|
316
|
+
config: __assign(__assign({}, nw.config), {
|
|
317
|
+
borderInfo: nwborderlist
|
|
318
|
+
})
|
|
319
|
+
});
|
|
320
|
+
}
|
|
321
|
+
return isBorderUndo ? nw : newContext;
|
|
402
322
|
});
|
|
403
323
|
}
|
|
404
|
-
}
|
|
405
|
-
var handleRedo =
|
|
324
|
+
};
|
|
325
|
+
var handleRedo = function handleRedo() {
|
|
406
326
|
var history = globalCache.current.redoList.pop();
|
|
407
327
|
if (history) {
|
|
408
328
|
setContext(function (ctx_) {
|
|
329
|
+
var _a, _b, _c;
|
|
409
330
|
var newContext = (0, _immer.applyPatches)(ctx_, history.patches);
|
|
331
|
+
var isBorderUndo = history.patches.some(function (onePatch) {
|
|
332
|
+
var _a;
|
|
333
|
+
return (_a = onePatch.value) === null || _a === void 0 ? void 0 : _a.borderInfo;
|
|
334
|
+
});
|
|
410
335
|
globalCache.current.undoList.push(history);
|
|
411
336
|
emitOp(newContext, history.patches, history.options);
|
|
412
|
-
|
|
337
|
+
var nw = __assign({}, newContext);
|
|
338
|
+
if (isBorderUndo) {
|
|
339
|
+
var nwborderlist = ((_b = (_a = nw === null || nw === void 0 ? void 0 : nw.config) === null || _a === void 0 ? void 0 : _a.borderInfo) !== null && _b !== void 0 ? _b : []).concat((_c = history.patches[0].value) === null || _c === void 0 ? void 0 : _c.borderInfo[0]);
|
|
340
|
+
nw = __assign(__assign({}, nw), {
|
|
341
|
+
config: __assign(__assign({}, nw.config), {
|
|
342
|
+
borderInfo: nwborderlist
|
|
343
|
+
})
|
|
344
|
+
});
|
|
345
|
+
}
|
|
346
|
+
return isBorderUndo ? nw : newContext;
|
|
413
347
|
});
|
|
414
348
|
}
|
|
415
|
-
}
|
|
349
|
+
};
|
|
416
350
|
(0, _react.useEffect)(function () {
|
|
417
351
|
var _a, _b;
|
|
418
352
|
(_b = (_a = mergedSettings.hooks) === null || _a === void 0 ? void 0 : _a.afterActivateSheet) === null || _b === void 0 ? void 0 : _b.call(_a, context.currentSheetId);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fileverse-dev/fortune-react",
|
|
3
|
-
"version": "1.2.86-pinyin-
|
|
3
|
+
"version": "1.2.86-pinyin-8",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "lib/index.d.ts",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"tsc": "tsc"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@fileverse-dev/fortune-core": "1.2.86-pinyin-
|
|
19
|
+
"@fileverse-dev/fortune-core": "1.2.86-pinyin-8",
|
|
20
20
|
"@fileverse/ui": "^4.1.7-patch-40",
|
|
21
21
|
"@tippyjs/react": "^4.2.6",
|
|
22
22
|
"@types/regenerator-runtime": "^0.13.6",
|