@ai-matrx/office 0.8.28 → 0.8.30

package/dist/univer-collab.d.cts

@@ -796,6 +796,13 @@ interface UniverSheetsOtPortOptions {
         get(): SheetSelection[] | null | undefined;
         set(selections: SheetSelection[]): void;
     };
+    /**
+     * The sheet's filter range (`SheetsFilterService.getFilterModel(unitId, subUnitId)?.getRange()`), or null. Univer's
+     * filter grows its own range when a value lands in the first row under it, with no mutation (SheetsFilterController,
+     * 1.0.4): the port sends that growth as a `set-filter-range`, and keeps a peer's value from growing it a second
+     * time on this seat. Without it a seat with a filter diverges from its peers on that write.
+     */
+    filterRange?(unitId: string, subUnitId: string): SheetRange | null | undefined;
     /** Replace the workbook's whole content, keeping its unit id. */
     load(snapshot: unknown): void;
     markDirty(): void;

package/dist/univer-collab.d.ts

@@ -796,6 +796,13 @@ interface UniverSheetsOtPortOptions {
         get(): SheetSelection[] | null | undefined;
         set(selections: SheetSelection[]): void;
     };
+    /**
+     * The sheet's filter range (`SheetsFilterService.getFilterModel(unitId, subUnitId)?.getRange()`), or null. Univer's
+     * filter grows its own range when a value lands in the first row under it, with no mutation (SheetsFilterController,
+     * 1.0.4): the port sends that growth as a `set-filter-range`, and keeps a peer's value from growing it a second
+     * time on this seat. Without it a seat with a filter diverges from its peers on that write.
+     */
+    filterRange?(unitId: string, subUnitId: string): SheetRange | null | undefined;
     /** Replace the workbook's whole content, keeping its unit id. */
     load(snapshot: unknown): void;
     markDirty(): void;

package/dist/univer-collab.js

@@ -4045,6 +4045,7 @@ var ADD_MERGE = "sheet.mutation.add-worksheet-merge";
 var REMOVE_MERGE = "sheet.mutation.remove-worksheet-merge";
 var SHEET_NAME = "sheet.mutation.set-worksheet-name";
 var INSERT_SHEET = "sheet.mutation.insert-sheet";
+var FILTER_RANGE = "sheet.mutation.set-filter-range";
 var RESHAPE = /* @__PURE__ */ new Set(["sheet.mutation.set-worksheet-row-count", "sheet.mutation.set-worksheet-column-count", "sheet.mutation.remove-sheet", INSERT_SHEET]);
 var UNDO = "univer.command.undo";
 var REDO = "univer.command.redo";
@@ -4086,6 +4087,17 @@ function univerSheetsOtPort(o) {
     return out;
   };
   const sheetOrder = () => (o.workbook()?.getSheets() ?? []).map((ws) => ws.getSheetId());
+  const filterOf = (sheet) => {
+    const u = unitId();
+    if (!u || !o.filterRange) return null;
+    try {
+      const r = o.filterRange(u, sheet);
+      return r ? { startRow: r.startRow, endRow: r.endRow, startColumn: r.startColumn, endColumn: r.endColumn } : null;
+    } catch {
+      return null;
+    }
+  };
+  const sameRange = (a, b) => !a && !b || !!a && !!b && a.startRow === b.startRow && a.endRow === b.endRow && a.startColumn === b.startColumn && a.endColumn === b.endColumn;
   const openGroup = (label2) => ({ label: label2, order: sheetOrder(), sheets: sheetNames(), names: definedNames(), mutations: [], inverses: [], notShared: null });
   const emit = (e) => {
     for (const l of [...listeners]) {
@@ -4135,6 +4147,7 @@ function univerSheetsOtPort(o) {
           if (copy && "s" in copy) copy.s = styleObject(copy.s);
           record.cells.set(`${r}:${c}`, copy);
         }
+      record.filter = filterOf(String(p.subUnitId ?? ""));
     }
     if (info.id === SHEET_NAME) record.name = ws.getName();
     pre.set(p, record);
@@ -4288,6 +4301,15 @@ function univerSheetsOtPort(o) {
         g.mutations.push(r.m);
         g.inverses.push(r.inverse);
       }
+      const was = info.id === VALUES ? pre.get(info.params)?.filter : void 0;
+      if (was && !g.notShared) {
+        const sheet = String(info.params.subUnitId ?? "");
+        const now = filterOf(sheet);
+        if (now && !sameRange(was, now)) {
+          g.mutations.push({ id: FILTER_RANGE, params: { subUnitId: sheet, range: json(now), derived: true } });
+          g.inverses.push([{ id: FILTER_RANGE, params: { subUnitId: sheet, range: json(was) } }]);
+        }
+      }
     }
     const owedAdd = pre.get(info.params)?.addAfter;
     if (owedAdd?.length) runOwn(ADD_MERGE, String(info.params.subUnitId ?? ""), owedAdd, REMOVE_MERGE);
@@ -4309,6 +4331,27 @@ function univerSheetsOtPort(o) {
       console.warn("[sheets-ot] could not keep this seat's selection inside the sheet after its own row or column change", err);
     }
   };
+  const recalcDue = /* @__PURE__ */ new Set();
+  let recalcQueued = false;
+  const recalcFilterSoon = (sheet) => {
+    recalcDue.add(sheet);
+    if (recalcQueued) return;
+    recalcQueued = true;
+    queueMicrotask(() => {
+      recalcQueued = false;
+      const sheets = [...recalcDue];
+      recalcDue.clear();
+      const u = unitId();
+      if (!u) return;
+      for (const s of sheets) {
+        if (o.filterRange && !filterOf(s)) continue;
+        try {
+          cs.syncExecuteCommand("sheet.mutation.re-calc-filter", { unitId: u, subUnitId: s }, { onlyLocal: true });
+        } catch {
+        }
+      }
+    });
+  };
   const followSelection = (m) => {
     const sel = o.selections;
     if (!sel || !axisOpOf(m) && !RESHAPE.has(m.id)) return;
@@ -4343,14 +4386,15 @@ function univerSheetsOtPort(o) {
       const a = forApply(m);
       applying = true;
       try {
+        const sheet = String(a.params.subUnitId ?? "");
+        const filterWas = a.id === VALUES ? filterOf(sheet) : null;
         const ok3 = cs.syncExecuteCommand(a.id, { ...json(a.params), unitId: u }, { fromCollab: true });
         if (ok3 === false) throw new Error(`"${m.id}" was refused by the editor`);
-        if (a.id.startsWith("sheet.mutation.set-filter") || isStructuralMutation(a)) {
-          try {
-            cs.syncExecuteCommand("sheet.mutation.re-calc-filter", { unitId: u, subUnitId: a.params.subUnitId }, { onlyLocal: true });
-          } catch {
-          }
+        if (filterWas) {
+          const now = filterOf(sheet);
+          if (now && !sameRange(filterWas, now)) cs.syncExecuteCommand(FILTER_RANGE, { unitId: u, subUnitId: sheet, range: filterWas }, { onlyLocal: true });
         }
+        if (a.id.startsWith("sheet.mutation.set-filter") || isStructuralMutation(a)) recalcFilterSoon(sheet);
       } finally {
         applying = false;
       }