@fileverse-dev/fortune-core 1.3.10-yjs → 1.3.10-yjs-2

package/es/modules/selection.js

@@ -180,7 +180,7 @@ export function selectTitlesRange(map) {
   return rangeArr;
 }
 export function pasteHandlerOfPaintModel(ctx, copyRange) {
-  var _a;
+  var _a, _b, _c;
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -219,6 +219,7 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
   var timesC = Math.ceil((maxc - minc + 1) / copyc);
   var flowdata = getFlowdata(ctx);
   if (flowdata == null) return;
+  var cellChanges = [];
   var cellMaxLength = flowdata[0].length;
   var rowMaxLength = flowdata.length;
   var borderInfoCompute = getBorderInfoCompute(ctx, copySheetIndex);
@@ -356,6 +357,17 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
               }
             }
           }
+          cellChanges.push({
+            sheetId: ctx.currentSheetId,
+            path: ["celldata"],
+            value: {
+              r: h,
+              c: c,
+              v: (_a = x[c]) !== null && _a !== void 0 ? _a : null
+            },
+            key: "".concat(h, "_").concat(c),
+            type: "update"
+          });
         };
         for (var c = mtc; c < maxcellCahe; c += 1) {
           _loop_2(c);
@@ -368,6 +380,9 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
       }
     }
   }
+  if (cellChanges.length > 0 && ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
+  }
   var currFile = ctx.luckysheetfile[getSheetIndex(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
   if (dataVerification != null) {
@@ -379,7 +394,7 @@ export function pasteHandlerOfPaintModel(ctx, copyRange) {
     if (!_.isNil(ruleArr) && ruleArr.length > 0) {
       var currentIndex = getSheetIndex(ctx, ctx.currentSheetId);
       var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
-      var cdformat = (_a = _.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      var cdformat = (_c = _.cloneDeep(existingCf)) !== null && _c !== void 0 ? _c : [];
       for (var i = 0; i < ruleArr.length; i += 1) {
         var cdformat_cellrange = ruleArr[i].cellrange;
         var emptyRange = [];
@@ -1501,7 +1516,7 @@ export function copy(ctx) {
   }
 }
 export function deleteSelectedCellText(ctx) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false || ctx.isFlvReadOnly) {
     return "allowEdit";
@@ -1511,6 +1526,7 @@ export function deleteSelectedCellText(ctx) {
     var d = 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];
@@ -1571,15 +1587,21 @@ export function deleteSelectedCellText(ctx) {
               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)) {
+        ctx.hooks.updateCellYdoc(changes);
+      }
     }
   }
   return "success";
 }
 export function deleteSelectedCellFormat(ctx) {
+  var _a;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1602,6 +1624,7 @@ export function deleteSelectedCellFormat(ctx) {
     if (has_PartMC) {
       return "partMC";
     }
+    var cellChanges = [];
     for (var s = 0; s < selection.length; s += 1) {
       var r1 = selection[s].row[0];
       var r2 = selection[s].row[1];
@@ -1620,10 +1643,24 @@ export function deleteSelectedCellFormat(ctx) {
               delete cell.bg;
               delete cell.tb;
             }
+            cellChanges.push({
+              sheetId: ctx.currentSheetId,
+              path: ["celldata"],
+              value: {
+                r: r,
+                c: c,
+                v: d[r][c]
+              },
+              key: "".concat(r, "_").concat(c),
+              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);
+    }
   }
   return "success";
 }

package/es/modules/sort.js

@@ -143,32 +143,53 @@ export function sortSelection(ctx, isAsc, colIndex) {
   sortDataRange(ctx, d, data, colIndex, isAsc, str, edr, c1, c2);
 }
 function createRowsOrColumnsForSpilledValues(ctx, startRow, startColumn, spillRows, spillCols) {
+  var _a, _b;
   var flowdata = getFlowdata(ctx);
   if (!flowdata) return;
+  var cellChanges = [];
   try {
     var sheetIndex = getSheetIndex(ctx, ctx.currentSheetId);
     var sheet = ctx.luckysheetfile[sheetIndex];
-    var requiredRowCount = startRow + spillRows;
-    var requiredColCount = startColumn + spillCols;
-    if (sheet.row && sheet.row < requiredRowCount) {
-      sheet.row = requiredRowCount;
+    var requiredRowCount_1 = startRow + spillRows;
+    var requiredColCount_1 = startColumn + spillCols;
+    if (sheet.row && sheet.row < requiredRowCount_1) {
+      sheet.row = requiredRowCount_1;
     }
-    if (sheet.column && sheet.column < requiredColCount) {
-      sheet.column = requiredColCount;
+    if (sheet.column && sheet.column < requiredColCount_1) {
+      sheet.column = requiredColCount_1;
     }
   } catch (error) {
     console.error("Failed to update sheet metadata for spill operation", error);
   }
-  while (flowdata.length < startRow + spillRows) {
+  var requiredRowCount = startRow + spillRows;
+  var requiredColCount = startColumn + spillCols;
+  while (flowdata.length < requiredRowCount) {
     flowdata.push([]);
   }
-  for (var rowIndex = startRow; rowIndex < startRow + spillRows; rowIndex++) {
+  for (var rowIndex = startRow; rowIndex < requiredRowCount; rowIndex++) {
     if (!Array.isArray(flowdata[rowIndex])) {
       flowdata[rowIndex] = [];
     }
-    while (flowdata[rowIndex].length < startColumn + spillCols) {
+    var prevLen = flowdata[rowIndex].length;
+    while (flowdata[rowIndex].length < requiredColCount) {
       flowdata[rowIndex].push(null);
     }
+    for (var c = Math.max(prevLen, startColumn); c < requiredColCount; c += 1) {
+      cellChanges.push({
+        sheetId: ctx.currentSheetId,
+        path: ["celldata"],
+        value: {
+          r: rowIndex,
+          c: c,
+          v: (_a = flowdata[rowIndex][c]) !== null && _a !== void 0 ? _a : null
+        },
+        key: "".concat(rowIndex, "_").concat(c),
+        type: "update"
+      });
+    }
+  }
+  if (cellChanges.length > 0 && ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
   }
 }
 export function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {

package/es/settings.d.ts

@@ -19,6 +19,7 @@ export type Hooks = {
     cellDataChange?: () => void;
     hyperlinkChange?: () => void;
     updateCellYdoc?: (changes: SheetChangePath[]) => void;
+    updateAllCell?: (sheetId: string) => void;
     beforeUpdateCell?: (r: number, c: number, value: any) => boolean;
     afterUpdateCell?: (row: number, column: number, oldValue: any, newValue: any) => void;
     afterSelectionChange?: (sheetId: string, selection: Selection) => void;

package/lib/events/paste.js

@@ -216,19 +216,19 @@ var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
         cell.f = f;
         cell.m = v.toString();
         x[c] = cell;
+        changes.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: r,
+            c: c,
+            v: d[r][c]
+          },
+          key: "".concat(r, "_").concat(c),
+          type: "update"
+        });
       }
       d[r] = x;
-      changes.push({
-        sheetId: ctx.currentSheetId,
-        path: ["celldata"],
-        value: {
-          r: r,
-          c: c,
-          v: d[r][c]
-        },
-        key: "".concat(r, "_").concat(c),
-        type: "update"
-      });
     }
   }
   if ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _b === void 0 ? void 0 : _b.updateCellYdoc) {
@@ -362,7 +362,9 @@ function pasteHandler(ctx, data, borderInfo) {
       ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].config = cfg;
     }
     (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
-    handleFormulaOnPaste(ctx, d);
+    if (data.includes("=")) {
+      handleFormulaOnPaste(ctx, d);
+    }
   } else {
     data = data.replace(/\r/g, "");
     var dataChe = [];
@@ -492,17 +494,17 @@ function pasteHandler(ctx, data, borderInfo) {
           }
           x[c + curC] = cell;
         }
-        changes.push(changes.push({
+        changes.push({
           sheetId: ctx.currentSheetId,
           path: ["celldata"],
           value: {
-            r: r,
-            c: c,
-            v: d[r][c]
+            r: r + curR,
+            c: c + curC,
+            v: d[r + curR][c + curC]
           },
-          key: "".concat(r, "_").concat(c),
+          key: "".concat(r + curR, "_").concat(c + curC),
           type: "update"
-        }));
+        });
       }
       d[r + curR] = x;
     }
@@ -512,7 +514,9 @@ function pasteHandler(ctx, data, borderInfo) {
     last.row = [curR, curR + rlen - 1];
     last.column = [curC, curC + clen - 1];
     (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
-    handleFormulaOnPaste(ctx, d);
+    if (data.includes("=")) {
+      handleFormulaOnPaste(ctx, d);
+    }
   }
 }
 function setCellHyperlink(ctx, id, r, c, link) {
@@ -523,7 +527,7 @@ function setCellHyperlink(ctx, id, r, c, link) {
   ctx.luckysheetfile[index].hyperlink["".concat(r, "_").concat(c)] = link;
 }
 function pasteHandlerOfCutPaste(ctx, copyRange) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
   if (!copyRange) return;
@@ -566,6 +570,7 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
   if (addr > 0 || addc > 0) {
     (0, _sheet.expandRowsAndColumns)(d, addr, addc);
   }
+  var changes = [];
   var borderInfoCompute = (0, _border.getBorderInfoCompute)(ctx, copySheetId);
   var c_dataVerification = _lodash.default.cloneDeep(ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, copySheetId)].dataVerification) || {};
   var dataVerification = _lodash.default.cloneDeep(ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].dataVerification) || {};
@@ -597,6 +602,17 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
           delete cell.mc;
         }
         d[i][j] = null;
+        changes.push({
+          sheetId: ctx.currentSheetId,
+          path: ["celldata"],
+          value: {
+            r: i,
+            c: j,
+            v: null
+          },
+          key: "".concat(i, "_").concat(j),
+          type: "update"
+        });
         delete dataVerification["".concat(i, "_").concat(j)];
         (_f = ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)].hyperlink) === null || _f === void 0 ? true : delete _f["".concat(i, "_").concat(j)];
       }
@@ -696,6 +712,17 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
         value = copyData[h - minh][c - minc];
       }
       x[c] = _lodash.default.cloneDeep(value);
+      changes.push({
+        sheetId: ctx.currentSheetId,
+        path: ["celldata"],
+        value: {
+          r: h,
+          c: c,
+          v: d[h][c]
+        },
+        key: "".concat(h, "_").concat(c),
+        type: "update"
+      });
       if (value != null && copyHasMC && ((_k = x[c]) === null || _k === void 0 ? void 0 : _k.mc)) {
         if (x[c].mc.rs != null) {
           x[c].mc.r = h;
@@ -716,6 +743,9 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
   }
   last.row = [minh, maxh];
   last.column = [minc, maxc];
+  if (changes.length > 0 && ((_l = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _l === void 0 ? void 0 : _l.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(changes);
+  }
   if (copyRowlChange) {}
   var source;
   var target;
@@ -798,7 +828,7 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
         }
         source_curCdformat[i].cellrange = emptyRange;
         if (emptyRange2.length > 0) {
-          var ruleObj = (_l = source_curCdformat[i]) !== null && _l !== void 0 ? _l : {};
+          var ruleObj = (_m = source_curCdformat[i]) !== null && _m !== void 0 ? _m : {};
           ruleObj.cellrange = emptyRange2;
           ruleArr.push(ruleObj);
         }
@@ -902,7 +932,7 @@ function pasteHandlerOfCutPaste(ctx, copyRange) {
   }
 }
 function pasteHandlerOfCopyPaste(ctx, copyRange) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
   if (!copyRange) return;
@@ -993,6 +1023,7 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
   if (addr > 0 || addc > 0) {
     (0, _sheet.expandRowsAndColumns)(d, addr, addc);
   }
+  var changes = [];
   var borderInfoCompute = (0, _border.getBorderInfoCompute)(ctx, copySheetIndex);
   var c_dataVerification = _lodash.default.cloneDeep(ctx.luckysheetfile[(0, _utils.getSheetIndex)(ctx, copySheetIndex)].dataVerification) || {};
   var dataVerification = null;
@@ -1154,6 +1185,17 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
               };
             }
           }
+          changes.push({
+            sheetId: ctx.currentSheetId,
+            path: ["celldata"],
+            value: {
+              r: h,
+              c: c,
+              v: d[h][c]
+            },
+            key: "".concat(h, "_").concat(c),
+            type: "update"
+          });
         }
         d[h] = x;
       }
@@ -1261,6 +1303,9 @@ function pasteHandlerOfCopyPaste(ctx, copyRange) {
       }
     }
   }
+  if (changes.length > 0 && ((_s = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _s === void 0 ? void 0 : _s.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(changes);
+  }
   if (copyRowlChange || addr > 0 || addc > 0) {
     (0, _refresh.jfrefreshgrid)(ctx, d, ctx.luckysheet_select_save);
   } else {

package/lib/modules/cell.js

@@ -143,12 +143,13 @@ function getCellValue(r, c, data, attr) {
   return retv;
 }
 function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
   }
   if (!d) return;
+  var oldValue = _lodash.default.cloneDeep(d[r][c]);
   var cell = d[r][c];
   var vupdate;
   if (_lodash.default.isPlainObject(v)) {
@@ -196,6 +197,9 @@ function setCellValue(ctx, r, c, d, v) {
       cell = null;
     }
     d[r][c] = cell;
+    if ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.afterUpdateCell) {
+      ctx.hooks.afterUpdateCell(r, c, oldValue, (_b = d[r][c]) !== null && _b !== void 0 ? _b : null);
+    }
     return;
   }
   if ((0, _validation.isRealNull)(cell) || (_lodash.default.isString(cell) || _lodash.default.isNumber(cell)) && cell === v) {
@@ -218,21 +222,21 @@ function setCellValue(ctx, r, c, d, v) {
       t: "s"
     };
     cell.v = vupdateStr;
-  } else if (vupdateStr.toUpperCase() === "TRUE" && (_lodash.default.isNil((_a = cell.ct) === null || _a === void 0 ? void 0 : _a.fa) || ((_b = cell.ct) === null || _b === void 0 ? void 0 : _b.fa) !== "@")) {
+  } else if (vupdateStr.toUpperCase() === "TRUE" && (_lodash.default.isNil((_c = cell.ct) === null || _c === void 0 ? void 0 : _c.fa) || ((_d = cell.ct) === null || _d === void 0 ? void 0 : _d.fa) !== "@")) {
     cell.m = "TRUE";
     cell.ct = {
       fa: "General",
       t: "b"
     };
     cell.v = true;
-  } else if (vupdateStr.toUpperCase() === "FALSE" && (_lodash.default.isNil((_c = cell.ct) === null || _c === void 0 ? void 0 : _c.fa) || ((_d = cell.ct) === null || _d === void 0 ? void 0 : _d.fa) !== "@")) {
+  } else if (vupdateStr.toUpperCase() === "FALSE" && (_lodash.default.isNil((_e = cell.ct) === null || _e === void 0 ? void 0 : _e.fa) || ((_f = cell.ct) === null || _f === void 0 ? void 0 : _f.fa) !== "@")) {
     cell.m = "FALSE";
     cell.ct = {
       fa: "General",
       t: "b"
     };
     cell.v = false;
-  } else if (vupdateStr.substr(-1) === "%" && (0, _validation.isRealNum)(vupdateStr.substring(0, vupdateStr.length - 1)) && (_lodash.default.isNil((_e = cell.ct) === null || _e === void 0 ? void 0 : _e.fa) || ((_f = cell.ct) === null || _f === void 0 ? void 0 : _f.fa) !== "@")) {
+  } else if (vupdateStr.substr(-1) === "%" && (0, _validation.isRealNum)(vupdateStr.substring(0, vupdateStr.length - 1)) && (_lodash.default.isNil((_g = cell.ct) === null || _g === void 0 ? void 0 : _g.fa) || ((_h = cell.ct) === null || _h === void 0 ? void 0 : _h.fa) !== "@")) {
     cell.ct = {
       fa: "0%",
       t: "n"
@@ -262,7 +266,7 @@ function setCellValue(ctx, r, c, d, v) {
       var isDigit = /^\d+$/.test(vupdate);
       if (isDigit) {
         var flowdata = (0, _context.getFlowdata)(ctx);
-        var args = (_g = (0, _utils.getContentInParentheses)(cell === null || cell === void 0 ? void 0 : cell.f)) === null || _g === void 0 ? void 0 : _g.split(",");
+        var args = (_j = (0, _utils.getContentInParentheses)(cell === null || cell === void 0 ? void 0 : cell.f)) === null || _j === void 0 ? void 0 : _j.split(",");
         var cellRefs = args === null || args === void 0 ? void 0 : args.map(function (arg) {
           return arg.trim().toUpperCase();
         });
@@ -385,6 +389,9 @@ function setCellValue(ctx, r, c, d, v) {
     }
   }
   d[r][c] = cell;
+  if ((_k = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _k === void 0 ? void 0 : _k.afterUpdateCell) {
+    ctx.hooks.afterUpdateCell(r, c, oldValue, (_l = d[r][c]) !== null && _l !== void 0 ? _l : null);
+  }
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -842,7 +849,7 @@ function updateCell(ctx, r, c, $input, value, canvas) {
             var newValue_1 = _lodash.default.cloneDeep(d[r][c]);
             setTimeout(function () {
               var _a, _b;
-              return (_b = (_a = ctx.hooks).afterUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, null, newValue_1);
+              return (_b = (_a = ctx.hooks).afterUpdateCell) === null || _b === void 0 ? void 0 : _b.call(_a, r, c, oldValue_1, newValue_1);
             });
           }
           ctx.formulaCache.execFunctionGlobalData = null;
@@ -892,13 +899,6 @@ function updateCell(ctx, r, c, $input, value, canvas) {
         }
       }
     }
-    if (ctx.hooks.afterUpdateCell) {
-      var newValue_2 = _lodash.default.cloneDeep(flowdata[r][c]);
-      var afterUpdateCell_1 = ctx.hooks.afterUpdateCell;
-      setTimeout(function () {
-        afterUpdateCell_1 === null || afterUpdateCell_1 === void 0 ? void 0 : afterUpdateCell_1(r, c, oldValue_1, newValue_2);
-      });
-    }
     ctx.formulaCache.execFunctionGlobalData = null;
   } catch (e) {
     console.error(e);