@fileverse-dev/fortune-core 1.3.10-yjs-3 → 1.3.10-yjs-5

package/lib/modules/hyperlink.js

@@ -57,7 +57,7 @@ function getCellHyperlink(ctx, r, c) {
   return undefined;
 }
 function saveHyperlink(ctx, r, c, linkText, linkType, linkAddress, options) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   var applyToSelection = (options === null || options === void 0 ? void 0 : options.applyToSelection) && (options === null || options === void 0 ? void 0 : options.cellInput);
   var sheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var flowdata = (0, _context.getFlowdata)(ctx);
@@ -77,8 +77,30 @@ function saveHyperlink(ctx, r, c, linkText, linkType, linkAddress, options) {
         id: ctx.currentSheetId
       };
       flowdata[r][c] = cell;
+      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: ["hyperlink"],
+          key: "".concat(r, "_").concat(c),
+          value: {
+            linkType: linkType,
+            linkAddress: linkAddress
+          },
+          type: "update"
+        }, {
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: r,
+            c: c,
+            v: cell
+          },
+          key: "".concat(r, "_").concat(c),
+          type: "update"
+        }]);
+      }
     }
-    var offsets = (_a = ctx.linkCard) === null || _a === void 0 ? void 0 : _a.selectionOffsets;
+    var offsets = (_b = ctx.linkCard) === null || _b === void 0 ? void 0 : _b.selectionOffsets;
     if (offsets) {
       (0, _cursor.setSelectionByCharacterOffset)(options.cellInput, offsets.start, offsets.end);
     }
@@ -107,8 +129,8 @@ function saveHyperlink(ctx, r, c, linkText, linkType, linkAddress, options) {
     };
     flowdata[r][c] = cell;
     ctx.linkCard = undefined;
-    if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc) {
-      (_c = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _c === void 0 ? void 0 : _c.updateCellYdoc([{
+    if ((_c = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _c === void 0 ? void 0 : _c.updateCellYdoc) {
+      (_d = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _d === void 0 ? void 0 : _d.updateCellYdoc([{
         sheetId: ctx.currentSheetId,
         path: ["celldata"],
         value: {
@@ -123,11 +145,12 @@ function saveHyperlink(ctx, r, c, linkText, linkType, linkAddress, options) {
   }
 }
 function removeHyperlink(ctx, r, c) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit) return;
   var sheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   var flowdata = (0, _context.getFlowdata)(ctx);
+  var updatedCell = null;
   if (flowdata != null && sheetIndex != null) {
     var hyperlink = _lodash.default.omit(ctx.luckysheetfile[sheetIndex].hyperlink, "".concat(r, "_").concat(c));
     _lodash.default.set(ctx.luckysheetfile[sheetIndex], "hyperlink", hyperlink);
@@ -136,9 +159,33 @@ function removeHyperlink(ctx, r, c) {
       (_a = flowdata[r][c]) === null || _a === void 0 ? true : delete _a.hl;
       (_b = flowdata[r][c]) === null || _b === void 0 ? true : delete _b.un;
       (_c = flowdata[r][c]) === null || _c === void 0 ? true : delete _c.fc;
+      updatedCell = flowdata[r][c];
     }
   }
   ctx.linkCard = undefined;
+  if ((_d = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _d === void 0 ? void 0 : _d.updateCellYdoc) {
+    var changes = [{
+      sheetId: ctx.currentSheetId,
+      path: ["hyperlink"],
+      key: "".concat(r, "_").concat(c),
+      value: null,
+      type: "delete"
+    }];
+    if (updatedCell != null) {
+      changes.push({
+        sheetId: ctx.currentSheetId,
+        path: ["celldata"],
+        value: {
+          r: r,
+          c: c,
+          v: updatedCell
+        },
+        key: "".concat(r, "_").concat(c),
+        type: "update"
+      });
+    }
+    ctx.hooks.updateCellYdoc(changes);
+  }
 }
 function showLinkCard(ctx, r, c, options, isEditing, isMouseDown) {
   var _a, _b, _c, _d, _e, _f, _g, _h;

package/lib/modules/rowcol.js

@@ -120,9 +120,6 @@ var emitCellRangeToYdoc = function emitCellRangeToYdoc(ctx, sheetId, d, r1, r2,
       });
     }
   }
-  changes.forEach(function (change) {
-    console.log("emitCellRangeToYdoc", change, __assign({}, change.value.v));
-  });
   if (changes.length > 0) ctx.hooks.updateCellYdoc(changes);
 };
 function insertRowCol(ctx, op, changeSelection) {

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";
@@ -1561,7 +1561,6 @@ function deleteSelectedCellText(ctx) {
     var d = (0, _context.getFlowdata)(ctx);
     if (!d) return "dataNullError";
     var has_PartMC = false;
-    var cellChanges = [];
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1615,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

@@ -78,6 +78,7 @@ function orderbydata(isAsc, index, data) {
   };
 }
 function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, edc) {
+  var _a, _b;
   var sortedData = orderbydata(isAsc, index, dataRange).sortedData;
   for (var r = str; r <= edr; r += 1) {
     for (var c = stc; c <= edc; c += 1) {
@@ -89,6 +90,26 @@ function sortDataRange(ctx, sheetData, dataRange, index, isAsc, str, edr, stc, e
     row: [str, edr],
     column: [stc, edc]
   }]);
+  if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) {
+    var changes = [];
+    for (var r = str; r <= edr; r += 1) {
+      var row = sheetData[r] || [];
+      for (var c = stc; c <= edc; c += 1) {
+        changes.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: r,
+            c: c,
+            v: (_b = row === null || row === void 0 ? void 0 : row[c]) !== null && _b !== void 0 ? _b : null
+          },
+          key: "".concat(r, "_").concat(c),
+          type: "update"
+        });
+      }
+    }
+    if (changes.length > 0) ctx.hooks.updateCellYdoc(changes);
+  }
 }
 function sortSelection(ctx, isAsc, colIndex) {
   var _a;
@@ -203,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;
@@ -234,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,

package/package.json

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