Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheet): parse snapshot string (#2897)

Dushusirf4fe38df536d
diff --git a/packages/core/src/services/snapshot/snapshot-transform.ts b/packages/core/src/services/snapshot/snapshot-transform.ts
index 1b0619f271..456b822138 100644
--- a/packages/core/src/services/snapshot/snapshot-transform.ts
+++ b/packages/core/src/services/snapshot/snapshot-transform.ts
@@ -279,8 +279,8 @@ export function transformSnapshotToWorkbookData(
// Deal with workbook meta
const otherMeta = decodeWorksheetOtherMetas(workbookMeta.originalMeta);
const workbookData: IWorkbookData = {
- id: snapshot.unitID,
- rev: workbookMeta.rev,
+ id: snapshot.unitID || workbookMeta.unitID,
+ rev: snapshot.rev || workbookMeta.rev,
name: workbookMeta.name,
sheetOrder: workbookMeta.sheetOrder,
appVersion: '',
diff --git a/packages/core/src/services/snapshot/snapshot-utils.ts b/packages/core/src/services/snapshot/snapshot-utils.ts
index c1580a589e..cd65c83490 100644
--- a/packages/core/src/services/snapshot/snapshot-utils.ts
+++ b/packages/core/src/services/snapshot/snapshot-utils.ts
@@ -72,11 +72,17 @@ export function encodeDocOriginalMeta(document: IDocumentData): Uint8Array {
return meta;
}
-export function decodeWorksheetOtherMetas(buffer: Uint8Array): Partial<IWorksheetData> {
+export function decodeWorksheetOtherMetas(buffer: Uint8Array | string): Partial<IWorksheetData> {
+ if (typeof buffer === 'string') {
+ return JSON.parse(b64DecodeUnicode(buffer));
+ }
return JSON.parse(textDecoder.decode(buffer));
}
-export function decodeWorkbookOtherMetas(buffer: Uint8Array): Partial<IWorkbookData> {
+export function decodeWorkbookOtherMetas(buffer: Uint8Array | string): Partial<IWorkbookData> {
+ if (typeof buffer === 'string') {
+ return JSON.parse(b64DecodeUnicode(buffer));
+ }
return JSON.parse(textDecoder.decode(buffer));
}