@ai-matrx/office 0.8.41 → 0.8.43
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/CHANGELOG.md +23 -0
- package/dist/{chunk-F2D7AUF7.js → chunk-5SHIHC4S.js} +3 -4
- package/dist/chunk-5SHIHC4S.js.map +1 -0
- package/dist/{chunk-AK63BAWA.cjs → chunk-DNW7C6CU.cjs} +3 -3
- package/dist/{chunk-AK63BAWA.cjs.map → chunk-DNW7C6CU.cjs.map} +1 -1
- package/dist/{chunk-4DJOY4LG.js → chunk-P6PETI3X.js} +3 -3
- package/dist/chunk-P6PETI3X.js.map +1 -0
- package/dist/{chunk-PTMX6YRQ.cjs → chunk-XJBJKOUH.cjs} +3 -4
- package/dist/chunk-XJBJKOUH.cjs.map +1 -0
- package/dist/core.d.cts +0 -2
- package/dist/core.d.ts +0 -2
- package/dist/docs-io.cjs +6 -6
- package/dist/docs-io.js +1 -1
- package/dist/docs.cjs +2 -2
- package/dist/docs.d.cts +0 -1
- package/dist/docs.d.ts +0 -1
- package/dist/docs.js +1 -1
- package/dist/sheets-xlsx.cjs +6 -6
- package/dist/sheets-xlsx.js +1 -1
- package/dist/sheets.cjs +3 -3
- package/dist/sheets.d.cts +0 -1
- package/dist/sheets.d.ts +0 -1
- package/dist/sheets.js +1 -1
- package/dist/univer-collab.cjs +23 -23
- package/dist/univer-collab.cjs.map +1 -1
- package/dist/univer-collab.js.map +1 -1
- package/package.json +3 -3
- package/dist/chunk-4DJOY4LG.js.map +0 -1
- package/dist/chunk-F2D7AUF7.js.map +0 -1
- package/dist/chunk-PTMX6YRQ.cjs.map +0 -1
package/dist/docs.cjs
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
|
|
18
18
|
|
|
19
|
-
var
|
|
19
|
+
var _chunkXJBJKOUHcjs = require('./chunk-XJBJKOUH.cjs');
|
|
20
20
|
|
|
21
21
|
|
|
22
22
|
var _chunkNSU6EVJKcjs = require('./chunk-NSU6EVJK.cjs');
|
|
@@ -1128,5 +1128,5 @@ var RemoteCaretBook = (_class2 = class {
|
|
|
1128
1128
|
|
|
1129
1129
|
|
|
1130
1130
|
|
|
1131
|
-
exports.CARET_HEARTBEAT_MS = CARET_HEARTBEAT_MS; exports.CARET_MAX_RANGES = CARET_MAX_RANGES; exports.CARET_STALE_MS = CARET_STALE_MS; exports.COMMENT_ANCHOR_LABEL_MAX = COMMENT_ANCHOR_LABEL_MAX; exports.COMMENT_ANCHOR_PART_PREFIX = COMMENT_ANCHOR_PART_PREFIX; exports.COMMENT_ANCHOR_RANGE_TYPE = COMMENT_ANCHOR_RANGE_TYPE; exports.DOCUMENT_BODY_MAX_LENGTH = DOCUMENT_BODY_MAX_LENGTH; exports.DOCUMENT_DESCRIPTION_MAX_LENGTH = DOCUMENT_DESCRIPTION_MAX_LENGTH; exports.DOCUMENT_NAME_MAX_LENGTH = DOCUMENT_NAME_MAX_LENGTH; exports.DOCUMENT_SAVE_DELAY_MS = DOCUMENT_SAVE_DELAY_MS; exports.DocumentModel = DocumentModel; exports.EMOJI_GROUPS = EMOJI_GROUPS; exports.MIN_FIT_ZOOM = MIN_FIT_ZOOM; exports.RemoteCaretBook = RemoteCaretBook; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.addCommentAnchorActions = addCommentAnchorActions; exports.anchorIdOfPartAnchor = anchorIdOfPartAnchor; exports.bodyTextOf = bodyTextOf; exports.commentAnchorPartKey = commentAnchorPartKey; exports.commentAnchorsOf = commentAnchorsOf; exports.commentPartAnchor = commentPartAnchor; exports.configureDocsHost =
|
|
1131
|
+
exports.CARET_HEARTBEAT_MS = CARET_HEARTBEAT_MS; exports.CARET_MAX_RANGES = CARET_MAX_RANGES; exports.CARET_STALE_MS = CARET_STALE_MS; exports.COMMENT_ANCHOR_LABEL_MAX = COMMENT_ANCHOR_LABEL_MAX; exports.COMMENT_ANCHOR_PART_PREFIX = COMMENT_ANCHOR_PART_PREFIX; exports.COMMENT_ANCHOR_RANGE_TYPE = COMMENT_ANCHOR_RANGE_TYPE; exports.DOCUMENT_BODY_MAX_LENGTH = DOCUMENT_BODY_MAX_LENGTH; exports.DOCUMENT_DESCRIPTION_MAX_LENGTH = DOCUMENT_DESCRIPTION_MAX_LENGTH; exports.DOCUMENT_NAME_MAX_LENGTH = DOCUMENT_NAME_MAX_LENGTH; exports.DOCUMENT_SAVE_DELAY_MS = DOCUMENT_SAVE_DELAY_MS; exports.DocumentModel = DocumentModel; exports.EMOJI_GROUPS = EMOJI_GROUPS; exports.MIN_FIT_ZOOM = MIN_FIT_ZOOM; exports.RemoteCaretBook = RemoteCaretBook; exports.SPECIAL_GROUPS = SPECIAL_GROUPS; exports.addCommentAnchorActions = addCommentAnchorActions; exports.anchorIdOfPartAnchor = anchorIdOfPartAnchor; exports.bodyTextOf = bodyTextOf; exports.commentAnchorPartKey = commentAnchorPartKey; exports.commentAnchorsOf = commentAnchorsOf; exports.commentPartAnchor = commentPartAnchor; exports.configureDocsHost = _chunkXJBJKOUHcjs.configureDocsHost; exports.copyDocument = _chunkXJBJKOUHcjs.copyDocument; exports.createDocument = _chunkXJBJKOUHcjs.createDocument; exports.deleteDocument = _chunkXJBJKOUHcjs.deleteDocument; exports.discardFailedDocument = _chunkXJBJKOUHcjs.discardFailedDocument; exports.documentBodyWriteHandler = documentBodyWriteHandler; exports.documentSourceLabel = documentSourceLabel; exports.fitZoomRatio = fitZoomRatio; exports.getDocsHost = _chunkXJBJKOUHcjs.getDocsHost; exports.getDocument = _chunkXJBJKOUHcjs.getDocument; exports.getLatestDocumentSnapshot = _chunkXJBJKOUHcjs.getLatestDocumentSnapshot; exports.isDocsAnchorOnlyOp = isDocsAnchorOnlyOp; exports.listAccessibleDocuments = _chunkXJBJKOUHcjs.listAccessibleDocuments; exports.listDocumentSnapshots = _chunkXJBJKOUHcjs.listDocumentSnapshots; exports.listTrashedDocuments = _chunkXJBJKOUHcjs.listTrashedDocuments; exports.moveDocument = _chunkXJBJKOUHcjs.moveDocument; exports.movePeerRangesThroughBodyEdit = movePeerRangesThroughBodyEdit; exports.moveRangesThroughBodyEdit = moveRangesThroughBodyEdit; exports.newCommentAnchorId = newCommentAnchorId; exports.planBodyEdit = planBodyEdit; exports.publishedCaretFromSelection = publishedCaretFromSelection; exports.quoteOfCommentAnchor = quoteOfCommentAnchor; exports.removeCommentAnchorActions = removeCommentAnchorActions; exports.renameDocument = _chunkXJBJKOUHcjs.renameDocument; exports.restoreDocument = _chunkXJBJKOUHcjs.restoreDocument; exports.sanitizeUniverDocSnapshot = _chunkXJBJKOUHcjs.sanitizeUniverDocSnapshot; exports.saveDocumentSnapshot = _chunkXJBJKOUHcjs.saveDocumentSnapshot; exports.searchSymbols = searchSymbols; exports.updateDocumentDescription = _chunkXJBJKOUHcjs.updateDocumentDescription; exports.validateDocumentBody = validateDocumentBody; exports.validateDocumentDescription = validateDocumentDescription; exports.validateDocumentName = validateDocumentName; exports.writeBodyText = writeBodyText;
|
|
1132
1132
|
//# sourceMappingURL=docs.cjs.map
|
package/dist/docs.d.cts
CHANGED
package/dist/docs.d.ts
CHANGED
package/dist/docs.js
CHANGED
package/dist/sheets-xlsx.cjs
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
|
|
4
4
|
|
|
5
5
|
|
|
6
|
-
var
|
|
6
|
+
var _chunkDNW7C6CUcjs = require('./chunk-DNW7C6CU.cjs');
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
|
|
@@ -455,7 +455,7 @@ function unsupportedFileReason(file) {
|
|
|
455
455
|
return `"${file.name}" isn't a spreadsheet file. Supported: .xlsx, .xls, .csv. For a Google Sheet, use Import from Google Sheets.`;
|
|
456
456
|
}
|
|
457
457
|
async function importWorkbookFile(file, organizationId) {
|
|
458
|
-
const capturedOrganizationId = await
|
|
458
|
+
const capturedOrganizationId = await _chunkDNW7C6CUcjs.getSheetsHost.call(void 0, ).ensureOrgId(organizationId);
|
|
459
459
|
const { xlsxToUniverWorkbook: xlsxToUniverWorkbook2 } = await Promise.resolve().then(() => _interopRequireWildcard(require("./xlsx-to-univer-NWCHAWJC.cjs")));
|
|
460
460
|
const droppedOnImport = [];
|
|
461
461
|
const { uploadImportedImage } = await Promise.resolve().then(() => _interopRequireWildcard(require("./matrxImagePorts-46SGQTLN.cjs")));
|
|
@@ -465,7 +465,7 @@ async function importWorkbookFile(file, organizationId) {
|
|
|
465
465
|
});
|
|
466
466
|
let originalFileId;
|
|
467
467
|
try {
|
|
468
|
-
const uploaded = await
|
|
468
|
+
const uploaded = await _chunkDNW7C6CUcjs.getSheetsHost.call(void 0, ).uploadOriginalFile(file, { folderPath: "Workbooks/Imports" });
|
|
469
469
|
originalFileId = uploaded.fileId;
|
|
470
470
|
} catch (uploadErr) {
|
|
471
471
|
console.warn(
|
|
@@ -474,7 +474,7 @@ async function importWorkbookFile(file, organizationId) {
|
|
|
474
474
|
);
|
|
475
475
|
}
|
|
476
476
|
const cleanName = file.name.replace(/\.[^.]+$/, "") || "Imported workbook";
|
|
477
|
-
const created = await
|
|
477
|
+
const created = await _chunkDNW7C6CUcjs.createWorkbook.call(void 0, {
|
|
478
478
|
name: cleanName,
|
|
479
479
|
description: `Imported from ${file.name}`,
|
|
480
480
|
source: file.name.toLowerCase().endsWith(".csv") ? "imported_csv" : "imported_xlsx",
|
|
@@ -482,14 +482,14 @@ async function importWorkbookFile(file, organizationId) {
|
|
|
482
482
|
...originalFileId ? { originalFileId } : {}
|
|
483
483
|
});
|
|
484
484
|
if (_core.isServiceFailure.call(void 0, created)) throw new Error(created.error);
|
|
485
|
-
const saved = await
|
|
485
|
+
const saved = await _chunkDNW7C6CUcjs.saveSnapshot.call(void 0, {
|
|
486
486
|
workbookId: created.data.id,
|
|
487
487
|
snapshot,
|
|
488
488
|
origin: "imported",
|
|
489
489
|
label: file.name
|
|
490
490
|
});
|
|
491
491
|
if (_core.isServiceFailure.call(void 0, saved)) {
|
|
492
|
-
await
|
|
492
|
+
await _chunkDNW7C6CUcjs.discardFailedWorkbook.call(void 0, created.data.id);
|
|
493
493
|
throw new Error(saved.error);
|
|
494
494
|
}
|
|
495
495
|
return { id: created.data.id, name: cleanName, notCarried: droppedOnImport };
|
package/dist/sheets-xlsx.js
CHANGED
package/dist/sheets.cjs
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
|
|
18
18
|
|
|
19
|
-
var
|
|
19
|
+
var _chunkDNW7C6CUcjs = require('./chunk-DNW7C6CU.cjs');
|
|
20
20
|
|
|
21
21
|
// src/sheets/univer-snapshot-rows.ts
|
|
22
22
|
function univerSheetIds(snapshot) {
|
|
@@ -658,7 +658,7 @@ function planSheetPrint(rows, setup, frozen = { rows: 0, cols: 0 }) {
|
|
|
658
658
|
|
|
659
659
|
// src/sheets/sheet-page-setup-service.ts
|
|
660
660
|
var _db = require('@ai-matrx/data/db');
|
|
661
|
-
var db = () =>
|
|
661
|
+
var db = () => _chunkDNW7C6CUcjs.getSheetsHost.call(void 0, ).getSupabase();
|
|
662
662
|
async function readSheetPageSetup(workbookId) {
|
|
663
663
|
const { data, error } = await db().schema("workbench").from("udt_workbooks").select("metadata").eq("id", workbookId).maybeSingle();
|
|
664
664
|
if (error) return { ok: false, error: error.message };
|
|
@@ -917,5 +917,5 @@ function readWorkbookScopeSource(workbookId) {
|
|
|
917
917
|
|
|
918
918
|
|
|
919
919
|
|
|
920
|
-
exports.DEFAULT_SHEET_PAGE_SETUP = DEFAULT_SHEET_PAGE_SETUP; exports.GRID_MAX_COLUMNS = GRID_MAX_COLUMNS; exports.GRID_MAX_ROWS = GRID_MAX_ROWS; exports.MARGIN_PRESET_INCHES = MARGIN_PRESET_INCHES; exports.PRINT_ROW_HEIGHT = PRINT_ROW_HEIGHT; exports.SHEET_MARGIN_PRESETS = SHEET_MARGIN_PRESETS; exports.SHEET_PRINT_SCOPES = SHEET_PRINT_SCOPES; exports.SHEET_SCALES = SHEET_SCALES; exports.THUMB_HEIGHT = THUMB_HEIGHT; exports.THUMB_WIDTH = THUMB_WIDTH; exports.buildSheetPrintDocument = buildSheetPrintDocument; exports.cfMatch = cfMatch; exports.collectPrintSheets = collectPrintSheets; exports.configureSheetsHost =
|
|
920
|
+
exports.DEFAULT_SHEET_PAGE_SETUP = DEFAULT_SHEET_PAGE_SETUP; exports.GRID_MAX_COLUMNS = GRID_MAX_COLUMNS; exports.GRID_MAX_ROWS = GRID_MAX_ROWS; exports.MARGIN_PRESET_INCHES = MARGIN_PRESET_INCHES; exports.PRINT_ROW_HEIGHT = PRINT_ROW_HEIGHT; exports.SHEET_MARGIN_PRESETS = SHEET_MARGIN_PRESETS; exports.SHEET_PRINT_SCOPES = SHEET_PRINT_SCOPES; exports.SHEET_SCALES = SHEET_SCALES; exports.THUMB_HEIGHT = THUMB_HEIGHT; exports.THUMB_WIDTH = THUMB_WIDTH; exports.buildSheetPrintDocument = buildSheetPrintDocument; exports.cfMatch = cfMatch; exports.collectPrintSheets = collectPrintSheets; exports.configureSheetsHost = _chunkDNW7C6CUcjs.configureSheetsHost; exports.copyWorkbook = _chunkDNW7C6CUcjs.copyWorkbook; exports.createWorkbook = _chunkDNW7C6CUcjs.createWorkbook; exports.deleteWorkbook = _chunkDNW7C6CUcjs.deleteWorkbook; exports.discardFailedWorkbook = _chunkDNW7C6CUcjs.discardFailedWorkbook; exports.documentPreviewSvg = documentPreviewSvg; exports.downloadSheetAsCsv = downloadSheetAsCsv; exports.downloadSheetAsHtml = downloadSheetAsHtml; exports.downloadSheetAsPdf = downloadSheetAsPdf; exports.downloadSheetAsTsv = downloadSheetAsTsv; exports.formatCellValue = formatCellValue; exports.getLatestSnapshot = _chunkDNW7C6CUcjs.getLatestSnapshot; exports.getSheetsHost = _chunkDNW7C6CUcjs.getSheetsHost; exports.getWorkbook = _chunkDNW7C6CUcjs.getWorkbook; exports.listAccessibleWorkbooks = _chunkDNW7C6CUcjs.listAccessibleWorkbooks; exports.listSnapshots = _chunkDNW7C6CUcjs.listSnapshots; exports.listTrashedWorkbooks = _chunkDNW7C6CUcjs.listTrashedWorkbooks; exports.moveWorkbook = _chunkDNW7C6CUcjs.moveWorkbook; exports.normalizeSheetPageSetup = normalizeSheetPageSetup; exports.pageSetupFromMetadata = pageSetupFromMetadata; exports.parseResource = parseResource; exports.planSheetPrint = planSheetPrint; exports.printColumnWidths = printColumnWidths; exports.printDocumentHtml = printDocumentHtml; exports.printGeometry = printGeometry; exports.printSheet = printSheet; exports.readSheetPageSetup = readSheetPageSetup; exports.readWorkbookScopeSource = readWorkbookScopeSource; exports.registerWorkbookScopeSource = registerWorkbookScopeSource; exports.renameWorkbook = _chunkDNW7C6CUcjs.renameWorkbook; exports.restoreWorkbook = _chunkDNW7C6CUcjs.restoreWorkbook; exports.saveSnapshot = _chunkDNW7C6CUcjs.saveSnapshot; exports.sheetGridToCsv = sheetGridToCsv; exports.sheetGridToMarkdownTable = sheetGridToMarkdownTable; exports.snapshotPreviewSvg = snapshotPreviewSvg; exports.snapshotToGridSheets = snapshotToGridSheets; exports.univerSheetIds = univerSheetIds; exports.univerSnapshotToRows = univerSnapshotToRows; exports.updateWorkbookDescription = _chunkDNW7C6CUcjs.updateWorkbookDescription; exports.workbookPreviewSvg = workbookPreviewSvg; exports.workbookSourceLabel = _chunkDNW7C6CUcjs.workbookSourceLabel; exports.writeSheetPageSetup = writeSheetPageSetup;
|
|
921
921
|
//# sourceMappingURL=sheets.cjs.map
|
package/dist/sheets.d.cts
CHANGED
package/dist/sheets.d.ts
CHANGED
package/dist/sheets.js
CHANGED
package/dist/univer-collab.cjs
CHANGED
|
@@ -932,7 +932,7 @@ function invertDocsOp(op, preDoc) {
|
|
|
932
932
|
var DOCS_TRANSFORM_VERSION = "univer-1.0.4+docs-ot-r6";
|
|
933
933
|
|
|
934
934
|
// src/univer/collab/docs-ot/state-hash.ts
|
|
935
|
-
var
|
|
935
|
+
var import_core3 = require("@univerjs/core");
|
|
936
936
|
|
|
937
937
|
// src/docs/sanitize-univer-doc-snapshot.ts
|
|
938
938
|
var import_core2 = require("@univerjs/core");
|
|
@@ -1108,7 +1108,7 @@ function asLoadedDocsSnapshot(snapshot) {
|
|
|
1108
1108
|
delete s.id;
|
|
1109
1109
|
for (const k of DOC_LOCAL_KEYS) delete s[k];
|
|
1110
1110
|
sanitizeUniverDocSnapshot(s, void 0, { quiet: true });
|
|
1111
|
-
const model = new
|
|
1111
|
+
const model = new import_core3.DocumentDataModel(s);
|
|
1112
1112
|
try {
|
|
1113
1113
|
return structuredClone(model.getSnapshot());
|
|
1114
1114
|
} finally {
|
|
@@ -1171,8 +1171,8 @@ function stampDeterministicIds(snapshot) {
|
|
|
1171
1171
|
var import_collab2 = require("@ai-matrx/data/realtime/collab");
|
|
1172
1172
|
|
|
1173
1173
|
// src/docs/comment-anchors.ts
|
|
1174
|
-
var
|
|
1175
|
-
var COMMENT_ANCHOR_RANGE_TYPE =
|
|
1174
|
+
var import_core4 = require("@univerjs/core");
|
|
1175
|
+
var COMMENT_ANCHOR_RANGE_TYPE = import_core4.CustomRangeType.COMMENT;
|
|
1176
1176
|
var RETAIN_KEYS = /* @__PURE__ */ new Set(["t", "len", "body", "coverType", "oldBody"]);
|
|
1177
1177
|
var RANGE_KEYS = /* @__PURE__ */ new Set(["rangeId", "rangeType", "startIndex", "endIndex", "properties"]);
|
|
1178
1178
|
var isObj = (v) => !!v && typeof v === "object" && !Array.isArray(v);
|
|
@@ -1458,7 +1458,7 @@ var import_awareness2 = require("y-protocols/awareness");
|
|
|
1458
1458
|
var import_collab3 = require("@ai-matrx/data/realtime/collab");
|
|
1459
1459
|
|
|
1460
1460
|
// src/docs/remote-carets.ts
|
|
1461
|
-
var
|
|
1461
|
+
var import_core5 = require("@univerjs/core");
|
|
1462
1462
|
var CARET_HEARTBEAT_MS = 2e3;
|
|
1463
1463
|
var CARET_STALE_MS = 12e3;
|
|
1464
1464
|
var CARET_MAX_RANGES = 4;
|
|
@@ -1476,8 +1476,8 @@ function movePeerRangesThroughBodyEdit(ranges, actions) {
|
|
|
1476
1476
|
const e = sub.e;
|
|
1477
1477
|
return ranges.map((r) => {
|
|
1478
1478
|
const collapsed = r.start === r.end;
|
|
1479
|
-
const start =
|
|
1480
|
-
return { start, end: collapsed ? start :
|
|
1479
|
+
const start = import_core5.TextX.transformPosition(e, r.start, false);
|
|
1480
|
+
return { start, end: collapsed ? start : import_core5.TextX.transformPosition(e, r.end, true) };
|
|
1481
1481
|
});
|
|
1482
1482
|
}
|
|
1483
1483
|
var sameRanges = (a, b) => a.length === b.length && a.every((r, i) => r.start === b[i].start && r.end === b[i].end);
|
|
@@ -2057,7 +2057,7 @@ function transformAxis(x, y, side) {
|
|
|
2057
2057
|
}
|
|
2058
2058
|
|
|
2059
2059
|
// src/collab/sheets/transform/formula.ts
|
|
2060
|
-
var
|
|
2060
|
+
var import_core6 = require("@univerjs/core");
|
|
2061
2061
|
var import_engine_formula = require("@univerjs/engine-formula");
|
|
2062
2062
|
var import_sheets = require("@univerjs/sheets");
|
|
2063
2063
|
var REF_ERROR = "#REF!";
|
|
@@ -2109,8 +2109,8 @@ function referencedSheetNames(text) {
|
|
|
2109
2109
|
}
|
|
2110
2110
|
return [...out];
|
|
2111
2111
|
}
|
|
2112
|
-
var fullRowsRange = (start, count) => ({ startRow: start, endRow: start + count - 1, startColumn: 0, endColumn: FULL, rangeType:
|
|
2113
|
-
var fullColsRange = (start, count) => ({ startRow: 0, endRow: FULL, startColumn: start, endColumn: start + count - 1, rangeType:
|
|
2112
|
+
var fullRowsRange = (start, count) => ({ startRow: start, endRow: start + count - 1, startColumn: 0, endColumn: FULL, rangeType: import_core6.RANGE_TYPE.ROW });
|
|
2113
|
+
var fullColsRange = (start, count) => ({ startRow: 0, endRow: FULL, startColumn: start, endColumn: start + count - 1, rangeType: import_core6.RANGE_TYPE.COLUMN });
|
|
2114
2114
|
var startV = (v) => Number.isNaN(v) || v == null ? -Infinity : v;
|
|
2115
2115
|
var endV = (v) => Number.isNaN(v) || v == null ? Infinity : v;
|
|
2116
2116
|
function startEnd(r) {
|
|
@@ -2119,9 +2119,9 @@ function startEnd(r) {
|
|
|
2119
2119
|
function checkMoveEdge(origin, from) {
|
|
2120
2120
|
const startRow = startV(origin.startRow), endRow = endV(origin.endRow), startColumn = startV(origin.startColumn), endColumn = endV(origin.endColumn);
|
|
2121
2121
|
const fromStartRow = startV(from.startRow), fromEndRow = endV(from.endRow), fromStartColumn = startV(from.startColumn), fromEndColumn = endV(from.endColumn);
|
|
2122
|
-
const rowsCover = () => origin.rangeType ===
|
|
2123
|
-
const columnsCover = () => origin.rangeType ===
|
|
2124
|
-
const allCover = () => origin.rangeType ===
|
|
2122
|
+
const rowsCover = () => origin.rangeType === import_core6.RANGE_TYPE.COLUMN && from.rangeType === import_core6.RANGE_TYPE.COLUMN || startRow >= fromStartRow && endRow <= fromEndRow;
|
|
2123
|
+
const columnsCover = () => origin.rangeType === import_core6.RANGE_TYPE.ROW && from.rangeType === import_core6.RANGE_TYPE.ROW || startColumn >= fromStartColumn && endColumn <= fromEndColumn;
|
|
2124
|
+
const allCover = () => origin.rangeType === import_core6.RANGE_TYPE.ALL && from.rangeType === import_core6.RANGE_TYPE.ALL;
|
|
2125
2125
|
if (rowsCover() && columnsCover() || allCover()) return 4;
|
|
2126
2126
|
if (columnsCover() && startRow >= fromStartRow && startRow <= fromEndRow && endRow > fromEndRow) return 0;
|
|
2127
2127
|
if (columnsCover() && endRow >= fromStartRow && endRow <= fromEndRow && startRow < fromStartRow) return 1;
|
|
@@ -2132,14 +2132,14 @@ function checkMoveEdge(origin, from) {
|
|
|
2132
2132
|
function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
|
|
2133
2133
|
const { startRow, endRow, startColumn, endColumn, rangeType } = startEnd(result);
|
|
2134
2134
|
const f = startEnd(from);
|
|
2135
|
-
const fromRangeType = from.rangeType ??
|
|
2135
|
+
const fromRangeType = from.rangeType ?? import_core6.RANGE_TYPE.NORMAL;
|
|
2136
2136
|
const t = startEnd(to);
|
|
2137
2137
|
const rm = startEnd(remain);
|
|
2138
2138
|
const o = startEnd(origin);
|
|
2139
|
-
const originRangeType = origin.rangeType ??
|
|
2139
|
+
const originRangeType = origin.rangeType ?? import_core6.RANGE_TYPE.NORMAL;
|
|
2140
2140
|
const newRange = { ...origin };
|
|
2141
|
-
const rowsCover = () => rangeType ===
|
|
2142
|
-
const columnsCover = () => rangeType ===
|
|
2141
|
+
const rowsCover = () => rangeType === import_core6.RANGE_TYPE.COLUMN && originRangeType === import_core6.RANGE_TYPE.COLUMN || startColumn >= o.startColumn && endColumn <= o.endColumn;
|
|
2142
|
+
const columnsCover = () => rangeType === import_core6.RANGE_TYPE.ROW && originRangeType === import_core6.RANGE_TYPE.ROW || startRow >= o.startRow && endRow <= o.endRow;
|
|
2143
2143
|
if (moveEdge === 0) {
|
|
2144
2144
|
if (!rowsCover()) return void 0;
|
|
2145
2145
|
if (startRow < o.startRow) newRange.startRow = startRow;
|
|
@@ -2162,7 +2162,7 @@ function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
|
|
|
2162
2162
|
else return void 0;
|
|
2163
2163
|
} else if (moveEdge === 4) {
|
|
2164
2164
|
Object.assign(newRange, { startRow, startColumn, endRow, endColumn });
|
|
2165
|
-
} else if (f.startColumn <= o.startColumn && f.endColumn >= o.endColumn || fromRangeType ===
|
|
2165
|
+
} else if (f.startColumn <= o.startColumn && f.endColumn >= o.endColumn || fromRangeType === import_core6.RANGE_TYPE.ROW && originRangeType === import_core6.RANGE_TYPE.ROW) {
|
|
2166
2166
|
const n = f.endRow - f.startRow + 1;
|
|
2167
2167
|
if (from.endRow < o.startRow) {
|
|
2168
2168
|
if (t.startRow >= o.startRow) newRange.startRow -= n;
|
|
@@ -2174,7 +2174,7 @@ function getMoveNewRange(moveEdge, result, from, to, origin, remain) {
|
|
|
2174
2174
|
if (t.startRow <= o.startRow) newRange.startRow += n;
|
|
2175
2175
|
else if (t.startRow >= o.endRow) newRange.endRow -= n;
|
|
2176
2176
|
}
|
|
2177
|
-
} else if (f.startRow <= o.startRow && f.endRow >= o.endRow || fromRangeType ===
|
|
2177
|
+
} else if (f.startRow <= o.startRow && f.endRow >= o.endRow || fromRangeType === import_core6.RANGE_TYPE.COLUMN && originRangeType === import_core6.RANGE_TYPE.COLUMN) {
|
|
2178
2178
|
const n = f.endColumn - f.startColumn + 1;
|
|
2179
2179
|
if (from.endColumn < o.startColumn) {
|
|
2180
2180
|
if (t.startColumn >= o.startColumn) newRange.startColumn -= n;
|
|
@@ -2196,7 +2196,7 @@ function moveRange(range, axis, op) {
|
|
|
2196
2196
|
const isRow = axis === "row";
|
|
2197
2197
|
if (op.kind === "insert") {
|
|
2198
2198
|
const r = isRow ? fullRowsRange(op.at, op.count) : fullColsRange(op.at, op.count);
|
|
2199
|
-
const ops2 = isRow ? (0, import_sheets.handleInsertRow)({ id: import_sheets.EffectRefRangId.InsertRowCommandId, params: { range: r, unitId: "", subUnitId: "", direction:
|
|
2199
|
+
const ops2 = isRow ? (0, import_sheets.handleInsertRow)({ id: import_sheets.EffectRefRangId.InsertRowCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core6.Direction.DOWN } }, range) : (0, import_sheets.handleInsertCol)({ id: import_sheets.EffectRefRangId.InsertColCommandId, params: { range: r, unitId: "", subUnitId: "", direction: import_core6.Direction.RIGHT } }, range);
|
|
2200
2200
|
const res2 = (0, import_sheets.runRefRangeMutations)(ops2, range);
|
|
2201
2201
|
return res2 == null ? void 0 : { ...range, ...res2 };
|
|
2202
2202
|
}
|
|
@@ -2209,11 +2209,11 @@ function moveRange(range, axis, op) {
|
|
|
2209
2209
|
const from = isRow ? fullRowsRange(op.from, op.count) : fullColsRange(op.from, op.count);
|
|
2210
2210
|
const to = isRow ? fullRowsRange(op.to, op.count) : fullColsRange(op.to, op.count);
|
|
2211
2211
|
const moveEdge = checkMoveEdge(range, from);
|
|
2212
|
-
let remain = (0,
|
|
2212
|
+
let remain = (0, import_core6.getIntersectRange)(range, from);
|
|
2213
2213
|
if (isRow) {
|
|
2214
2214
|
if (remain == null && (from.endRow < range.startRow && to.endRow <= range.startRow || from.startRow > range.endRow && to.startRow > range.endRow)) return void 0;
|
|
2215
2215
|
} else if (remain == null && (from.endColumn < range.startColumn && to.endColumn <= range.startColumn || from.startColumn > range.endColumn && to.startColumn > range.endColumn)) return void 0;
|
|
2216
|
-
remain ??= { startRow: range.startRow, endRow: range.endRow, startColumn: range.startColumn, endColumn: range.endColumn, rangeType:
|
|
2216
|
+
remain ??= { startRow: range.startRow, endRow: range.endRow, startColumn: range.startColumn, endColumn: range.endColumn, rangeType: import_core6.RANGE_TYPE.NORMAL };
|
|
2217
2217
|
const ops = isRow ? (0, import_sheets.handleMoveRows)({ id: import_sheets.EffectRefRangId.MoveRowsCommandId, params: { toRange: to, fromRange: from } }, remain) : (0, import_sheets.handleMoveCols)({ id: import_sheets.EffectRefRangId.MoveColsCommandId, params: { toRange: to, fromRange: from } }, remain);
|
|
2218
2218
|
const res = (0, import_sheets.runRefRangeMutations)(ops, remain);
|
|
2219
2219
|
if (res == null) return REF_ERROR;
|
|
@@ -2247,7 +2247,7 @@ function rewriteFormula(text, ctx, change) {
|
|
|
2247
2247
|
if (!sheetName) continue;
|
|
2248
2248
|
token = REF_ERROR;
|
|
2249
2249
|
} else {
|
|
2250
|
-
const moved = moveRange(
|
|
2250
|
+
const moved = moveRange(import_core6.Rectangle.moveOffset(range, 0, 0), change.axis, change.op);
|
|
2251
2251
|
if (moved === void 0) continue;
|
|
2252
2252
|
token = moved === REF_ERROR ? REF_ERROR : (0, import_engine_formula.serializeRangeToRefString)({ range: moved, sheetName: target === ctx.ownSheet && !ctx.keepQualifier ? "" : sheetName, unitId });
|
|
2253
2253
|
}
|