@fileverse-dev/fortune-core 1.3.10 → 1.3.11-mixed

package/es/modules/toolbar.js

@@ -396,7 +396,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(getRangetxt(ctx, ctx.currentSheetId, {
     row: rowh,
     column: columnh
@@ -407,7 +408,20 @@ function backFormulaInput(d, r, c, rowh, columnh, formula, ctx) {
     f: v[2]
   };
   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,
@@ -836,10 +850,12 @@ export function handleFormatPainter(ctx) {
   ctx.luckysheetPaintSingle = true;
 }
 export function handleClearFormat(ctx) {
-  var _a;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false) return;
   var flowdata = 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],
@@ -855,6 +871,17 @@ export function handleClearFormat(ctx) {
         var cell = flowdata[r][c];
         if (!cell) continue;
         flowdata[r][c] = _.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 = getSheetIndex(ctx, ctx.currentSheetId);
@@ -890,9 +917,25 @@ export 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 = 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);
+    }
+  }
 }
 export function handleTextColor(ctx, cellInput, color) {
   setAttr(ctx, cellInput, "fc", color);

package/es/modules/validation.js

@@ -66,6 +66,7 @@ var MONTH_NAME_MAP = {
 };
 var MONTH_NAMES_RE = "january|february|march|april|may|june|july|august|september|october|november|december|jan|feb|mar|apr|jun|jul|aug|sep|oct|nov|dec";
 var MONTH_ABBR_RE = "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec";
+var MONTH_ABBR_SET = new Set(MONTH_ABBR_RE.split("|"));
 function isValidDateParts(year, month, day) {
   if (year < 1900) return false;
   if (month < 1 || month > 12) return false;
@@ -280,6 +281,7 @@ export function detectDateFormat(str) {
     var d = +m[2];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      var isAbbr = MONTH_ABBR_SET.has(m[1].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -287,7 +289,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-mdy-abbr" : "named-mdy-full"
       };
     }
   }
@@ -297,6 +299,7 @@ export function detectDateFormat(str) {
     var mo = MONTH_NAME_MAP[m[2].toLowerCase()];
     var y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      var isAbbr = MONTH_ABBR_SET.has(m[2].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -304,7 +307,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-dmy-abbr" : "named-dmy-full"
       };
     }
   }
@@ -321,7 +324,7 @@ export function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: "named-abbr-dashes"
       };
     }
   }

package/es/settings.d.ts

@@ -16,9 +16,12 @@ export type Hooks = {
     iframeListChange?: () => void;
     conditionRulesChange?: () => void;
     conditionFormatChange?: () => void;
+    filterSelectChange?: () => void;
+    filterChange?: () => void;
     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;
@@ -78,6 +81,8 @@ export type Hooks = {
     afterIframesChange?: () => void;
     afterFrozenChange?: () => void;
     afterOrderChanges?: () => void;
+    afterColorChanges?: () => void;
+    afterHideChanges?: () => void;
     afterConfigChanges?: () => void;
     afterColRowChanges?: () => void;
     afterShowGridLinesChange?: () => void;

package/es/types.d.ts

@@ -328,6 +328,8 @@ export type GlobalCache = {
     verticalScrollLock?: boolean;
     horizontalScrollLock?: boolean;
     overwriteCell?: boolean;
+    overwriteCellFirstChar?: string;
+    enteredEditByTyping?: boolean;
     ignoreWriteCell?: boolean;
     doNotFocus?: boolean;
     doNotUpdateCell?: boolean;

package/lib/api/range.js

@@ -93,6 +93,7 @@ function setSelection(ctx, range, options) {
   }
 }
 function setCellValuesByRange(ctx, data, range, cellInput, options, callAfterUpdate) {
+  var _a, _b, _c, _d, _e;
   if (options === void 0) {
     options = {};
   }
@@ -110,13 +111,32 @@ function setCellValuesByRange(ctx, data, range, cellInput, options, callAfterUpd
   if (data.length !== rowCount || data[0].length !== columnCount) {
     throw new Error("data size does not match range");
   }
+  var sheet = (0, _common.getSheet)(ctx, options);
+  var sheetId = sheet.id || ctx.currentSheetId;
+  var cellChanges = [];
   for (var i = 0; i < rowCount; i += 1) {
     for (var j = 0; j < columnCount; j += 1) {
       var row = range.row[0] + i;
       var column = range.column[0] + j;
       (0, _cell.setCellValue)(ctx, row, column, data[i][j], cellInput, options, callAfterUpdate);
+      if (((_a = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _a === void 0 ? void 0 : _a.updateCellYdoc) && sheet.data) {
+        cellChanges.push({
+          sheetId: sheetId,
+          path: ["celldata"],
+          value: {
+            r: row,
+            c: column,
+            v: (_d = (_c = (_b = sheet.data) === null || _b === void 0 ? void 0 : _b[row]) === null || _c === void 0 ? void 0 : _c[column]) !== null && _d !== void 0 ? _d : null
+          },
+          key: "".concat(row, "_").concat(column),
+          type: "update"
+        });
+      }
     }
   }
+  if (cellChanges.length > 0 && ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc)) {
+    ctx.hooks.updateCellYdoc(cellChanges);
+  }
 }
 function setCellFormatByRange(ctx, attr, value, range, options) {
   if (options === void 0) {

package/lib/api/sheet.js

@@ -164,7 +164,7 @@ function generateCopySheetName(ctx, sheetId) {
   return sheetCopyName;
 }
 function copySheet(ctx, sheetId) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   var index = (0, _utils.getSheetIndex)(ctx, sheetId);
   var order = ctx.luckysheetfile[index].order + 1;
   var sheetName = generateCopySheetName(ctx, sheetId);
@@ -201,6 +201,34 @@ function copySheet(ctx, sheetId) {
   var sheetOrderList = {};
   sheetOrderList[newSheetId] = order;
   _2.api.setSheetOrder(ctx, sheetOrderList);
+  (0, _2.changeSheet)(ctx, newSheetId, undefined, true, true);
+  if ((_d = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _d === void 0 ? void 0 : _d.updateAllCell) {
+    ctx.hooks.updateAllCell(newSheetId);
+  } else if ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _e === void 0 ? void 0 : _e.updateCellYdoc) {
+    var changes_1 = [];
+    var celldata = newSheet.celldata || (0, _common.dataToCelldata)(newSheet.data);
+    if (Array.isArray(celldata)) {
+      celldata.forEach(function (d) {
+        var _a;
+        if (d == null) return;
+        var r = d.r;
+        var c = d.c;
+        if (!_lodash.default.isNumber(r) || !_lodash.default.isNumber(c)) return;
+        changes_1.push({
+          sheetId: newSheetId,
+          path: ["celldata"],
+          key: "".concat(r, "_").concat(c),
+          value: {
+            r: r,
+            c: c,
+            v: (_a = d.v) !== null && _a !== void 0 ? _a : null
+          },
+          type: d.v == null ? "delete" : "update"
+        });
+      });
+    }
+    if (changes_1.length > 0) ctx.hooks.updateCellYdoc(changes_1);
+  }
 }
 function calculateSheetFromula(ctx, id) {
   var _a, _b, _c;

package/lib/events/keyboard.js

@@ -179,63 +179,72 @@ function moveToEdge(sheetData, key, curr, rowDelta, colDelta, startR, endR, star
   return colDelta === 0 ? r : c;
 }
 function handleControlPlusArrowKey(ctx, e, shiftPressed) {
-  if (ctx.luckysheetCellUpdate.length > 0) return;
+  var _a, _b, _c, _d;
   var idx = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
   if (_lodash.default.isNil(idx)) return;
   var file = ctx.luckysheetfile[idx];
-  if (!file || !file.row || !file.column) return;
   var maxRow = file.row;
   var maxCol = file.column;
-  var last;
-  if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0) last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
+  if (_lodash.default.isNil(maxRow) || _lodash.default.isNil(maxCol)) return;
+  var last = ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0 ? ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1] : undefined;
   if (!last) return;
   var currR = last.row_focus;
   var currC = last.column_focus;
   if (_lodash.default.isNil(currR) || _lodash.default.isNil(currC)) return;
-  var startR = last.row[0];
-  var endR = last.row[1];
-  var startC = last.column[0];
-  var endC = last.column[1];
+  var startR = (_a = last.row) === null || _a === void 0 ? void 0 : _a[0];
+  var endR = (_b = last.row) === null || _b === void 0 ? void 0 : _b[1];
+  var startC = (_c = last.column) === null || _c === void 0 ? void 0 : _c[0];
+  var endC = (_d = last.column) === null || _d === void 0 ? void 0 : _d[1];
+  if (_lodash.default.isNil(startR) || _lodash.default.isNil(endR) || _lodash.default.isNil(startC) || _lodash.default.isNil(endC)) {
+    return;
+  }
   var horizontalOffset = currC - endC !== 0 ? currC - endC : currC - startC;
   var verticalOffset = currR - endR !== 0 ? currR - endR : currR - startR;
   var sheetData = file.data;
   if (!sheetData) return;
-  var selectedLimit;
   switch (e.key) {
     case "ArrowUp":
-      selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
-      if (shiftPressed) {
-        (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
-        (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
+          (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        } else {
+          (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        }
       }
       break;
     case "ArrowDown":
-      selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
-      if (shiftPressed) {
-        (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
-        (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          (0, _selection.moveHighlightRange)(ctx, "down", verticalOffset, "rangeOfSelect");
+          (0, _selection.moveHighlightRange)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        } else {
+          (0, _selection.moveHighlightCell)(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        }
       }
       break;
     case "ArrowLeft":
-      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
-      if (shiftPressed) {
-        (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
-        (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-      } else {
-        (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
+          (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        } else {
+          (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        }
       }
       break;
     case "ArrowRight":
-      selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
-      if (shiftPressed) {
-        (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
-        (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-      } else {
-        (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          (0, _selection.moveHighlightRange)(ctx, "right", horizontalOffset, "rangeOfSelect");
+          (0, _selection.moveHighlightRange)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        } else {
+          (0, _selection.moveHighlightCell)(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        }
       }
       break;
     default:
@@ -388,37 +397,51 @@ function handleArrowKey(ctx, e) {
   }
 }
 function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, handleRedo, canvas) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   return __awaiter(this, void 0, void 0, function () {
-    var kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, last, row_index, col_index;
-    return __generator(this, function (_d) {
+    var handledFlvShortcut, kcode, kstr, allowEdit, isFxInput, ignoredKeys, restCod, last, row_index, col_index, isEditing, inputText, isFormulaEdit, enteredByTyping, last, row_index, col_index;
+    return __generator(this, function (_e) {
       if (e.shiftKey && e.code === "Space") {
         e.stopImmediatePropagation();
         e.stopPropagation();
         e.preventDefault();
         return [2];
       }
+      handledFlvShortcut = false;
       if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyE") {
         (0, _selection.textFormat)(ctx, "center");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyL") {
         (0, _selection.textFormat)(ctx, "left");
+        handledFlvShortcut = true;
       } else if ((e.ctrlKey || e.metaKey && e.shiftKey) && e.code === "KeyR") {
         (0, _selection.textFormat)(ctx, "right");
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyK") {
         (0, _toolbar.handleLink)(ctx, cellInput);
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "Semicolon") {
         (0, _selection.fillDate)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.shiftKey && e.code === "Semicolon") {
         (0, _selection.fillTime)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && !e.shiftKey && e.code === "KeyR") {
         (0, _selection.fillRightData)(ctx);
+        handledFlvShortcut = true;
       }
       if ((e.metaKey || e.ctrlKey) && e.code === "KeyD") {
         (0, _selection.fillDownData)(ctx);
+        handledFlvShortcut = true;
+      }
+      if (handledFlvShortcut) {
+        (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
+        e.stopPropagation();
+        e.preventDefault();
+        return [2];
       }
       ctx.luckysheet_select_status = false;
       kcode = e.keyCode;
@@ -485,7 +508,18 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
           (0, _refresh.jfrefreshgrid)(ctx, null, undefined);
           e.preventDefault();
         } else if (kstr === "ArrowUp" || kstr === "ArrowDown" || kstr === "ArrowLeft" || kstr === "ArrowRight") {
-          handleArrowKey(ctx, e);
+          isEditing = ctx.luckysheetCellUpdate.length > 0;
+          inputText = (_d = cellInput === null || cellInput === void 0 ? void 0 : cellInput.innerText) !== null && _d !== void 0 ? _d : "";
+          isFormulaEdit = isEditing && inputText.trim().startsWith("=");
+          enteredByTyping = cache.enteredEditByTyping === true;
+          if (isEditing && !isFormulaEdit && enteredByTyping) {
+            (0, _cell.updateCell)(ctx, ctx.luckysheetCellUpdate[0], ctx.luckysheetCellUpdate[1], cellInput, undefined, canvas);
+            cache.enteredEditByTyping = false;
+            handleArrowKey(ctx, e);
+            e.preventDefault();
+          } else {
+            handleArrowKey(ctx, e);
+          }
         } else if (!(kcode >= 112 && kcode <= 123 || kcode <= 46 || kcode === 144 || kcode === 108 || e.ctrlKey || e.altKey || e.shiftKey && (kcode === 37 || kcode === 38 || kcode === 39 || kcode === 40)) || kcode === 8 || kcode === 32 || kcode === 46 || kcode === 0 || e.ctrlKey && kcode === 86) {
           if (!allowEdit) return [2];
           if (String.fromCharCode(kcode) != null && !_lodash.default.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
@@ -494,7 +528,10 @@ function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUndo, hand
             col_index = last.column_focus;
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
+            cache.overwriteCellFirstChar = e.key;
+            cache.enteredEditByTyping = true;
             (0, _formula.handleFormulaInput)(ctx, fxInput, cellInput, kcode);
+            e.preventDefault();
           }
         }
       }

package/lib/events/mouse.js

@@ -508,6 +508,7 @@ function handleCellAreaDoubleClick(ctx, globalCache, settings, e, container) {
     row_index = row_focus;
     col_index = column_focus;
   }
+  globalCache.enteredEditByTyping = false;
   (0, _cell.luckysheetUpdateCell)(ctx, row_index, col_index);
 }
 function handleContextMenu(ctx, settings, e, workbookContainer, container, area) {