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

package/lib/modules/selection.js

@@ -215,7 +215,7 @@ function selectTitlesRange(map) {
   return rangeArr;
 }
 function pasteHandlerOfPaintModel(ctx, copyRange) {
-  var _a;
+  var _a, _b, _c;
   var cfg = ctx.config;
   if (cfg.merge == null) {
     cfg.merge = {};
@@ -254,6 +254,7 @@ function pasteHandlerOfPaintModel(ctx, copyRange) {
   var timesC = Math.ceil((maxc - minc + 1) / copyc);
   var flowdata = (0, _context.getFlowdata)(ctx);
   if (flowdata == null) return;
+  var cellChanges = [];
   var cellMaxLength = flowdata[0].length;
   var rowMaxLength = flowdata.length;
   var borderInfoCompute = (0, _border.getBorderInfoCompute)(ctx, copySheetIndex);
@@ -391,6 +392,17 @@ 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);
@@ -403,6 +415,9 @@ 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[(0, _utils.getSheetIndex)(ctx, ctx.currentSheetId)];
   currFile.config = cfg;
   if (dataVerification != null) {
@@ -414,7 +429,7 @@ function pasteHandlerOfPaintModel(ctx, copyRange) {
     if (!_lodash.default.isNil(ruleArr) && ruleArr.length > 0) {
       var currentIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
       var existingCf = ctx.luckysheetfile[currentIndex].luckysheet_conditionformat_save;
-      var cdformat = (_a = _lodash.default.cloneDeep(existingCf)) !== null && _a !== void 0 ? _a : [];
+      var cdformat = (_c = _lodash.default.cloneDeep(existingCf)) !== null && _c !== void 0 ? _c : [];
       for (var i = 0; i < ruleArr.length; i += 1) {
         var cdformat_cellrange = ruleArr[i].cellrange;
         var emptyRange = [];
@@ -1536,7 +1551,7 @@ function copy(ctx) {
   }
 }
 function deleteSelectedCellText(ctx) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false || ctx.isFlvReadOnly) {
     return "allowEdit";
@@ -1546,6 +1561,7 @@ 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];
@@ -1606,15 +1622,21 @@ 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";
 }
 function deleteSelectedCellFormat(ctx) {
+  var _a;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1637,6 +1659,7 @@ 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];
@@ -1655,10 +1678,24 @@ 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/lib/modules/sort.js

@@ -153,32 +153,53 @@ 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 = (0, _2.getFlowdata)(ctx);
   if (!flowdata) return;
+  var cellChanges = [];
   try {
     var sheetIndex = (0, _2.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);
   }
 }
 function spillSortResult(ctx, startRow, startCol, formulaResult, flowdata) {

package/lib/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/package.json

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