@ai-matrx/office 0.8.56 → 0.8.58

package/dist/univer-collab.d.cts

@@ -591,7 +591,7 @@ type SheetOp = SheetMutation[] | null;
  * The room's protocol (§6.4): Univer 1.0.4 + transformer `SHEET_TRANSFORMER_VERSION`. Any Univer or transformer
  * change raises it; a room at another proto opens read-only for this build.
  */
-declare const SHEETS_COLLAB_PROTO = 4;
+declare const SHEETS_COLLAB_PROTO = 5;
 /**
  * Every Sheets protocol this package still reads (the fold, the server): each proto's transforms are a superset of
  * the one before, so a room still at an older protocol folds here. Raising the proto appends, never replaces.

package/dist/univer-collab.d.ts

@@ -591,7 +591,7 @@ type SheetOp = SheetMutation[] | null;
  * The room's protocol (§6.4): Univer 1.0.4 + transformer `SHEET_TRANSFORMER_VERSION`. Any Univer or transformer
  * change raises it; a room at another proto opens read-only for this build.
  */
-declare const SHEETS_COLLAB_PROTO = 4;
+declare const SHEETS_COLLAB_PROTO = 5;
 /**
  * Every Sheets protocol this package still reads (the fold, the server): each proto's transforms are a superset of
  * the one before, so a room still at an older protocol folds here. Raising the proto appends, never replaces.

package/dist/univer-collab.js

@@ -2532,7 +2532,7 @@ registerRangedResource({
 });
 
 // src/collab/sheets/transform/transform.ts
-var SHEET_TRANSFORMER_VERSION = "c5f-1";
+var SHEET_TRANSFORMER_VERSION = "c5f-2";
 var ID = {
   values: "sheet.mutation.set-range-values",
   insertRow: "sheet.mutation.insert-row",
@@ -2899,7 +2899,7 @@ function valuesUnderMerge(x, y) {
     if (v === null || !hasContent(v) || !coveredByMerge(ranges, r, c)) return putCell(out, r, c, v);
     changed = true;
     if (!isDerived(x)) dropped.push(cellRef(sheetOf(x), r, c));
-    if ("s" in v) putCell(out, r, c, { s: v.s });
+    putCell(out, r, c, { ...EMPTY_CONTENT, ..."s" in v ? { s: v.s } : {} });
   });
   if (!changed) return ok2([x]);
   return ok2(isEmptyMatrix(out) ? [] : [cellsMutation(x, out)], [], dropped);
@@ -3893,8 +3893,8 @@ async function sheetsStateHash(snapshot) {
 }
 
 // src/univer/collab/sheets-ot/room.ts
-var SHEETS_COLLAB_PROTO = 4;
-var SHEETS_READABLE_PROTOS = [2, 3, SHEETS_COLLAB_PROTO];
+var SHEETS_COLLAB_PROTO = 5;
+var SHEETS_READABLE_PROTOS = [2, 3, 4, SHEETS_COLLAB_PROTO];
 var SHEETS_EDIT_GROUP = "sheets.edit";
 var flip2 = (side) => side === "left" ? "right" : "left";
 var isNoopSheetOp = (op) => op == null || op.length === 0;