@fileverse-dev/fortune-core 1.3.10-yjs-4 → 1.3.10-yjs-6

package/lib/modules/searchReplace.js

@@ -271,7 +271,7 @@ function onSearchDialogMoveEnd(globalCache) {
   _lodash.default.set(globalCache, "searchDialog.moveProps", undefined);
 }
 function replace(ctx, searchText, replaceText, checkModes) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   var findAndReplace = (0, _locale.locale)(ctx).findAndReplace;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) {
@@ -318,6 +318,19 @@ function replace(ctx, searchText, replaceText, checkModes) {
     c = searchIndexArr[count].c;
     var v = replaceText;
     (0, _cell.setCellValue)(ctx, r, c, d, v);
+    if ((_c = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _c === void 0 ? void 0 : _c.updateCellYdoc) {
+      ctx.hooks.updateCellYdoc([{
+        sheetId: ctx.currentSheetId,
+        path: ["celldata"],
+        value: {
+          r: r,
+          c: c,
+          v: (_e = (_d = d === null || d === void 0 ? void 0 : d[r]) === null || _d === void 0 ? void 0 : _d[c]) !== null && _e !== void 0 ? _e : null
+        },
+        key: "".concat(r, "_").concat(c),
+        type: "update"
+      }]);
+    }
   } else {
     var reg = void 0;
     if (checkModes.caseCheck) {
@@ -329,6 +342,19 @@ function replace(ctx, searchText, replaceText, checkModes) {
     c = searchIndexArr[count].c;
     var v = (0, _format.valueShowEs)(r, c, d).toString().replace(reg, replaceText);
     (0, _cell.setCellValue)(ctx, r, c, d, v);
+    if ((_f = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _f === void 0 ? void 0 : _f.updateCellYdoc) {
+      ctx.hooks.updateCellYdoc([{
+        sheetId: ctx.currentSheetId,
+        path: ["celldata"],
+        value: {
+          r: r,
+          c: c,
+          v: (_h = (_g = d === null || d === void 0 ? void 0 : d[r]) === null || _g === void 0 ? void 0 : _g[c]) !== null && _h !== void 0 ? _h : null
+        },
+        key: "".concat(r, "_").concat(c),
+        type: "update"
+      }]);
+    }
   }
   ctx.luckysheet_select_save = (0, _selection.normalizeSelection)(ctx, [{
     row: [r, r],
@@ -338,7 +364,7 @@ function replace(ctx, searchText, replaceText, checkModes) {
   return null;
 }
 function replaceAll(ctx, searchText, replaceText, checkModes) {
-  var _a;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   var findAndReplace = (0, _locale.locale)(ctx).findAndReplace;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) {
@@ -362,6 +388,7 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
     return findAndReplace.noReplceTip;
   }
   var d = flowdata;
+  var cellChanges = [];
   var replaceCount = 0;
   if (checkModes.wordCheck) {
     for (var i = 0; i < searchIndexArr.length; i += 1) {
@@ -369,6 +396,19 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
       var c = searchIndexArr[i].c;
       var v = replaceText;
       (0, _cell.setCellValue)(ctx, r, c, d, v);
+      if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc) {
+        cellChanges.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: r,
+            c: c,
+            v: (_d = (_c = d === null || d === void 0 ? void 0 : d[r]) === null || _c === void 0 ? void 0 : _c[c]) !== null && _d !== void 0 ? _d : null
+          },
+          key: "".concat(r, "_").concat(c),
+          type: "update"
+        });
+      }
       range.push({
         row: [r, r],
         column: [c, c]
@@ -387,6 +427,19 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
       var c = searchIndexArr[i].c;
       var v = (0, _format.valueShowEs)(r, c, d).toString().replace(reg, replaceText);
       (0, _cell.setCellValue)(ctx, r, c, d, v);
+      if ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc) {
+        cellChanges.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: r,
+            c: c,
+            v: (_g = (_f = d === null || d === void 0 ? void 0 : d[r]) === null || _f === void 0 ? void 0 : _f[c]) !== null && _g !== void 0 ? _g : null
+          },
+          key: "".concat(r, "_").concat(c),
+          type: "update"
+        });
+      }
       range.push({
         row: [r, r],
         column: [c, c]
@@ -394,6 +447,9 @@ function replaceAll(ctx, searchText, replaceText, checkModes) {
       replaceCount += 1;
     }
   }
+  if (cellChanges.length > 0 && ((_h = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _h === void 0 ? void 0 : _h.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
+  }
   ctx.luckysheet_select_save = (0, _selection.normalizeSelection)(ctx, range);
   var succeedInfo = (0, _utils.replaceHtml)(findAndReplace.successTip, {
     xlength: replaceCount

package/lib/modules/selection.js

@@ -1551,7 +1551,7 @@ function copy(ctx) {
   }
 }
 function deleteSelectedCellText(ctx) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false || ctx.isFlvReadOnly) {
     return "allowEdit";
@@ -1614,20 +1614,22 @@ function deleteSelectedCellText(ctx) {
           if ((_d = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _d === void 0 ? void 0 : _d.afterUpdateCell) {
             ctx.hooks.afterUpdateCell(r, c, null, d[r][c]);
           }
-          changes.push({
-            sheetId: ctx.currentSheetId,
-            path: ["celldata"],
-            value: {
-              r: r,
-              c: c,
-              v: d[r][c]
-            },
-            key: "".concat(r, "_").concat(c),
-            type: "update"
-          });
+          if (!((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.afterUpdateCell)) {
+            changes.push({
+              sheetId: ctx.currentSheetId,
+              path: ["celldata"],
+              value: {
+                r: r,
+                c: c,
+                v: d[r][c]
+              },
+              key: "".concat(r, "_").concat(c),
+              type: "update"
+            });
+          }
         }
       }
-      if (changes.length > 0 && ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc)) {
+      if (changes.length > 0 && ((_f = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _f === void 0 ? void 0 : _f.updateCellYdoc)) {
         ctx.hooks.updateCellYdoc(changes);
       }
     }

package/lib/modules/sort.js

@@ -224,6 +224,7 @@ function createRowsOrColumnsForSpilledValues(ctx, startRow, startColumn, spillRo
   }
 }
 function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {
+  var _a, _b;
   var formulaString = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.f;
   var formulaValue = formulaResult === null || formulaResult === void 0 ? void 0 : formulaResult.v;
   if (typeof formulaString !== "string" || !(/= *SORT\s*\(/i.test(formulaString) || /= *XLOOKUP\s*\(/i.test(formulaString) || /= *SEQUENCE\s*\(/i.test(formulaString))) return false;
@@ -255,5 +256,27 @@ function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {
       });
     }
   }
+  if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) {
+    var cellChanges = [];
+    for (var r = 0; r < rowCount; r += 1) {
+      var rr = startRow + r;
+      var row = (sheetData === null || sheetData === void 0 ? void 0 : sheetData[rr]) || [];
+      for (var c = 0; c < colCount; c += 1) {
+        var cc = startCol + c;
+        cellChanges.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: rr,
+            c: cc,
+            v: (_b = row === null || row === void 0 ? void 0 : row[cc]) !== null && _b !== void 0 ? _b : null
+          },
+          key: "".concat(rr, "_").concat(cc),
+          type: "update"
+        });
+      }
+    }
+    if (cellChanges.length > 0) ctx.hooks.updateCellYdoc(cellChanges);
+  }
   return true;
 }

package/lib/modules/splitColumn.js

@@ -23,14 +23,35 @@ function getNullData(rlen, clen) {
   return arr;
 }
 function updateMoreCell(r, c, dataMatrix, ctx) {
+  var _a;
   if (ctx.allowEdit === false) return;
   var flowdata = (0, _context.getFlowdata)(ctx);
+  var cellChanges = [];
   dataMatrix.forEach(function (datas, i) {
     datas.forEach(function (data, j) {
+      var _a, _b, _c;
       var v = dataMatrix[i][j];
       (0, _cell.setCellValue)(ctx, r + i, c + j, flowdata, v);
+      if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) {
+        var rr = r + i;
+        var cc = c + j;
+        cellChanges.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: rr,
+            c: cc,
+            v: (_c = (_b = flowdata === null || flowdata === void 0 ? void 0 : flowdata[rr]) === null || _b === void 0 ? void 0 : _b[cc]) !== null && _c !== void 0 ? _c : null
+          },
+          key: "".concat(rr, "_").concat(cc),
+          type: "update"
+        });
+      }
     });
   });
+  if (cellChanges.length > 0 && ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
+  }
 }
 function getRegStr(regStr, splitSymbols) {
   regStr = "";

package/lib/modules/toolbar.js

@@ -429,7 +429,8 @@ function activeFormulaInput(cellInput, fxInput, ctx, row_index, col_index, rowh,
   });
 }
 function backFormulaInput(d, r, c, rowh, columnh, formula, ctx) {
-  var _a;
+  var _a, _b, _c;
+  var _d;
   var f = "=".concat(formula.toUpperCase(), "(").concat((0, _cell.getRangetxt)(ctx, ctx.currentSheetId, {
     row: rowh,
     column: columnh
@@ -440,7 +441,20 @@ function backFormulaInput(d, r, c, rowh, columnh, formula, ctx) {
     f: v[2]
   };
   (0, _cell.setCellValue)(ctx, r, c, d, value);
-  (_a = ctx.formulaCache).execFunctionExist || (_a.execFunctionExist = []);
+  if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) {
+    ctx.hooks.updateCellYdoc([{
+      sheetId: ctx.currentSheetId,
+      path: ["celldata"],
+      value: {
+        r: r,
+        c: c,
+        v: (_c = (_b = d === null || d === void 0 ? void 0 : d[r]) === null || _b === void 0 ? void 0 : _b[c]) !== null && _c !== void 0 ? _c : null
+      },
+      key: "".concat(r, "_").concat(c),
+      type: "update"
+    }]);
+  }
+  (_d = ctx.formulaCache).execFunctionExist || (_d.execFunctionExist = []);
   ctx.formulaCache.execFunctionExist.push({
     r: r,
     c: c,
@@ -869,10 +883,12 @@ function handleFormatPainter(ctx) {
   ctx.luckysheetPaintSingle = true;
 }
 function handleClearFormat(ctx) {
-  var _a;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false) return;
   var flowdata = (0, _context.getFlowdata)(ctx);
   if (!flowdata) return;
+  var ydocChanges = [];
+  var borderInfoChanged = false;
   (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.every(function (selection) {
     var _a = selection.row,
       rowSt = _a[0],
@@ -888,6 +904,17 @@ function handleClearFormat(ctx) {
         var cell = flowdata[r][c];
         if (!cell) continue;
         flowdata[r][c] = _lodash.default.pick(cell, "v", "m", "mc", "f", "ct");
+        ydocChanges.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          key: "".concat(r, "_").concat(c),
+          value: {
+            r: r,
+            c: c,
+            v: flowdata[r][c]
+          },
+          type: "update"
+        });
       }
     }
     var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
@@ -923,9 +950,25 @@ function handleClearFormat(ctx) {
         }
       }
       ctx.luckysheetfile[index].config.borderInfo = source_borderInfo;
+      borderInfoChanged = true;
     }
     return true;
   });
+  if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc) {
+    if (borderInfoChanged) {
+      var index = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+      var borderInfo = index == null ? (_d = (_c = ctx.config) === null || _c === void 0 ? void 0 : _c.borderInfo) !== null && _d !== void 0 ? _d : [] : (_g = (_f = (_e = ctx.luckysheetfile[index]) === null || _e === void 0 ? void 0 : _e.config) === null || _f === void 0 ? void 0 : _f.borderInfo) !== null && _g !== void 0 ? _g : [];
+      ydocChanges.push({
+        sheetId: ctx.currentSheetId,
+        path: ["config", "borderInfo"],
+        value: borderInfo,
+        type: "update"
+      });
+    }
+    if (ydocChanges.length > 0) {
+      ctx.hooks.updateCellYdoc(ydocChanges);
+    }
+  }
 }
 function handleTextColor(ctx, cellInput, color) {
   setAttr(ctx, cellInput, "fc", color);

package/lib/settings.d.ts

@@ -79,6 +79,8 @@ export type Hooks = {
     afterIframesChange?: () => void;
     afterFrozenChange?: () => void;
     afterOrderChanges?: () => void;
+    afterColorChanges?: () => void;
+    afterHideChanges?: () => void;
     afterConfigChanges?: () => void;
     afterColRowChanges?: () => void;
     afterShowGridLinesChange?: () => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10-yjs-4",
+  "version": "1.3.10-yjs-6",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",