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

package/es/events/keyboard.js

@@ -169,63 +169,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 = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.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 (_.isNil(maxRow) || _.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 (_.isNil(currR) || _.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 (_.isNil(startR) || _.isNil(endR) || _.isNil(startC) || _.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) {
-        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currC, -1, 0, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+          moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        } else {
+          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) {
-        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currC, 1, 0, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+          moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        } else {
+          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) {
-        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, -1, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+          moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        } else {
+          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) {
-        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+      {
+        var selectedLimit = moveToEdge(sheetData, e.key, currR, 0, 1, startR, endR, startC, endC, maxRow, maxCol);
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+          moveHighlightRange(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        } else {
+          moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        }
       }
       break;
     default:
@@ -378,10 +387,10 @@ export function handleArrowKey(ctx, e) {
   }
 }
 export 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 handledFlvShortcut, 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();
@@ -489,7 +498,18 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
           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) {
+            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 && !_.isEmpty(ctx.luckysheet_select_save) && kstr !== "CapsLock" && kstr !== "Win" && kcode !== 18) {
@@ -498,7 +518,10 @@ export function handleGlobalKeyDown(ctx, cellInput, fxInput, e, cache, handleUnd
             col_index = last.column_focus;
             ctx.luckysheetCellUpdate = [row_index, col_index];
             cache.overwriteCell = true;
+            cache.overwriteCellFirstChar = e.key;
+            cache.enteredEditByTyping = true;
             handleFormulaInput(ctx, fxInput, cellInput, kcode);
+            e.preventDefault();
           }
         }
       }

package/es/events/mouse.js

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

package/es/events/paste.js

@@ -34,10 +34,10 @@ import { handlePastedTable } from "../paste-table-helpers";
 import { getFlowdata } from "../context";
 import { execfunction } from "../modules/formula";
 import { getdatabyselection } from "../modules/cell";
-import { update, datenum_local } from "../modules/format";
+import { update, genarate } from "../modules/format";
 import { normalizeSelection, selectionCache } from "../modules/selection";
 import { getSheetIndex, isAllowEdit } from "../utils";
-import { hasPartMC, isRealNum, detectDateFormat } from "../modules/validation";
+import { hasPartMC, isRealNum } from "../modules/validation";
 import { getBorderInfoCompute } from "../modules/border";
 import { expandRowsAndColumns, storeSheetParamALL } from "../modules/sheet";
 import { jfrefreshgrid } from "../modules/refresh";
@@ -223,7 +223,7 @@ var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
   }
 };
 function pasteHandler(ctx, data, borderInfo) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
@@ -407,25 +407,39 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          if (originCell.ct && originCell.ct.t === "d" && !isUrl) {
-            var df = detectDateFormat(originalValueStr);
-            if (df) {
-              var dateObj = new Date(df.year, df.month - 1, df.day, df.hours, df.minutes, df.seconds);
-              originCell.v = datenum_local(dateObj);
-            } else {
-              originCell.v = originalValueStr;
-            }
-          } else {
-            originCell.v = isUrl ? originalValueStr : value;
-          }
-          if (originCell.ct != null && originCell.ct.fa != null) {
-            if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
-              originCell.m = String(originCell.v);
+          if (!isUrl) {
+            var generated = genarate(originalValueStr);
+            if (generated) {
+              var genM = generated[0],
+                genCt = generated[1],
+                genV = generated[2];
+              if ((genCt === null || genCt === void 0 ? void 0 : genCt.t) === "d") {
+                originCell.v = genV;
+                originCell.m = genM !== null && genM !== void 0 ? genM : originalValueStr;
+                originCell.ct = genCt;
+              } else {
+                originCell.v = value;
+                if (originCell.ct != null && originCell.ct.fa != null) {
+                  if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
+                    originCell.m = String(originCell.v);
+                  } else {
+                    originCell.m = update(originCell.ct.fa, originCell.v);
+                  }
+                } else {
+                  originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
+                }
+              }
             } else {
-              originCell.m = update(originCell.ct.fa, originCell.v);
+              originCell.v = value;
+              if (originCell.ct != null && originCell.ct.fa != null) {
+                originCell.m = update(originCell.ct.fa, originCell.v);
+              } else {
+                originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
+              }
             }
           } else {
-            originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
+            originCell.v = originalValueStr;
+            originCell.m = originalValueStr;
           }
           if (originCell.f != null && originCell.f.length > 0) {
             originCell.f = "";
@@ -452,19 +466,24 @@ function pasteHandler(ctx, data, borderInfo) {
               t: "s"
             };
           } else {
-            cell.v = originalValueStr;
-            cell.m = originalValueStr;
-            cell.ct = {
-              fa: "General",
-              t: "g"
-            };
             if (/^0x?[a-fA-F0-9]+$/.test(value)) {
+              cell.v = value;
               cell.m = value;
               cell.ct = {
                 fa: "@",
                 t: "s"
               };
-              cell.v = value;
+            } else {
+              var _m = (_j = genarate(originalValueStr)) !== null && _j !== void 0 ? _j : [],
+                m = _m[0],
+                ct = _m[1],
+                v = _m[2];
+              cell.v = v !== null && v !== void 0 ? v : originalValueStr;
+              cell.m = m != null ? String(m) : originalValueStr;
+              cell.ct = ct !== null && ct !== void 0 ? ct : {
+                fa: "General",
+                t: "g"
+              };
             }
           }
           if (isUrl && url) {
@@ -495,8 +514,8 @@ function pasteHandler(ctx, data, borderInfo) {
       }
       d[r + curR] = x;
     }
-    if ((_j = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _j === void 0 ? void 0 : _j.updateCellYdoc) {
-      (_k = ctx.hooks) === null || _k === void 0 ? void 0 : _k.updateCellYdoc(changes);
+    if ((_k = ctx === null || ctx === void 0 ? void 0 : ctx.hooks) === null || _k === void 0 ? void 0 : _k.updateCellYdoc) {
+      (_l = ctx.hooks) === null || _l === void 0 ? void 0 : _l.updateCellYdoc(changes);
     }
     last.row = [curR, curR + rlen - 1];
     last.column = [curC, curC + clen - 1];

package/es/locale/en.d.ts

@@ -530,6 +530,8 @@ declare const _default: {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -633,6 +635,7 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/en.js

@@ -9628,6 +9628,8 @@ export default {
     conditionformat_equal_title: "Format cells equal to",
     conditionformat_textContains: "Conditional format - Text Contains",
     conditionformat_textContains_title: "Format cells containing the following text",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "Format cells that are empty",
     conditionformat_occurrenceDate: "Conditional format - Occurrence Date",
     conditionformat_occurrenceDate_title: "Format cells containing the following dates",
     conditionformat_duplicateValue: "Conditional format - Duplicate Value",
@@ -9731,6 +9733,7 @@ export default {
     between2: "",
     contain: "Contain",
     textContains: "Text contains",
+    empty: "Empty",
     duplicateValue: "Duplicate value",
     uniqueValue: "Unique value",
     top: "Top",

package/es/locale/es.d.ts

@@ -688,6 +688,8 @@ declare const _default: {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -789,6 +791,7 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/es.js

@@ -9565,6 +9565,8 @@ export default {
     conditionformat_equal_title: "Dar formato a celdas iguales a",
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title: "Dar formato a las celdas que contienen el siguiente texto",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "Dar formato a las celdas vacías",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title: "Dar formato a celdas que contienen las siguientes fechas",
     conditionformat_duplicateValue: "Conditionformat-DuplicateValue",
@@ -9666,6 +9668,7 @@ export default {
     between2: "",
     contain: "Contiene",
     textContains: "Texto contiene",
+    empty: "Vacío",
     duplicateValue: "Valor duplicado",
     uniqueValue: "Valor Unico",
     top: "Mejor",

package/es/locale/hi.d.ts

@@ -563,6 +563,8 @@ declare const _default: {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -664,6 +666,7 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/hi.js

@@ -10078,6 +10078,8 @@ export default {
     conditionformat_equal_title: "के बराबर कोशिकाओं को प्रारूपित करें",
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title: "निम्नलिखित पाठ वाली कोशिकाओं को प्रारूपित करें",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "खाली कोशिकाओं को प्रारूपित करें",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title: "निम्नलिखित तिथियों वाली कोशिकाओं को प्रारूपित करें",
     conditionformat_duplicateValue: "Conditionformat-DuplicateValue",
@@ -10179,6 +10181,7 @@ export default {
     between2: "",
     contain: "शामिल",
     textContains: "पाठ शामिल है",
+    empty: "खाली",
     duplicateValue: "डुप्लिकेट मान",
     uniqueValue: "अद्वितीय मान",
     top: "शीर्ष",

package/es/locale/index.d.ts

@@ -583,6 +583,8 @@ declare function locale(ctx: Context): {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -685,6 +687,7 @@ declare function locale(ctx: Context): {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/zh.d.ts

@@ -582,6 +582,8 @@ declare const _default: {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -684,6 +686,7 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/zh.js

@@ -10097,6 +10097,8 @@ export default {
     conditionformat_equal_title: "为等于以下值的单元格设置格式",
     conditionformat_textContains: "条件格式——文本包含",
     conditionformat_textContains_title: "为包含以下文本的单元格设置格式",
+    conditionformat_empty: "条件格式——空值",
+    conditionformat_empty_title: "为空单元格设置格式",
     conditionformat_occurrenceDate: "条件格式——发生日期",
     conditionformat_occurrenceDate_title: "为包含以下日期的单元格设置格式",
     conditionformat_duplicateValue: "条件格式——重复值",
@@ -10199,6 +10201,7 @@ export default {
     between2: "之间",
     contain: "包含",
     textContains: "文本包含",
+    empty: "空值",
     duplicateValue: "重复值",
     uniqueValue: "唯一值",
     top: "前",

package/es/locale/zh_tw.d.ts

@@ -726,6 +726,8 @@ declare const _default: {
         conditionformat_equal_title: string;
         conditionformat_textContains: string;
         conditionformat_textContains_title: string;
+        conditionformat_empty: string;
+        conditionformat_empty_title: string;
         conditionformat_occurrenceDate: string;
         conditionformat_occurrenceDate_title: string;
         conditionformat_duplicateValue: string;
@@ -828,6 +830,7 @@ declare const _default: {
         between2: string;
         contain: string;
         textContains: string;
+        empty: string;
         duplicateValue: string;
         uniqueValue: string;
         top: string;

package/es/locale/zh_tw.js

@@ -9612,6 +9612,8 @@ export default {
     conditionformat_equal_title: "為等於以下值的儲存格設定格式",
     conditionformat_textContains: "條件格式——文字包含",
     conditionformat_textContains_title: "為包含以下文字的儲存格設定格式",
+    conditionformat_empty: "條件格式——空值",
+    conditionformat_empty_title: "為空儲存格設定格式",
     conditionformat_occurrenceDate: "條件格式——發生日期",
     conditionformat_occurrenceDate_title: "為包含以下日期的儲存格設定格式",
     conditionformat_duplicateValue: "條件格式——重複值",
@@ -9714,6 +9716,7 @@ export default {
     between2: "之間",
     contain: "包含",
     textContains: "文字包含",
+    empty: "空值",
     duplicateValue: "重複值",
     uniqueValue: "唯一值",
     top: "前",

package/es/modules/ConditionFormat.js

@@ -691,6 +691,32 @@ export function compute(ctx, ruleArr, d) {
                 }
               }
             }
+          } else if (conditionName === "empty") {
+            for (var r = cellrange[s].row[0]; r <= cellrange[s].row[1]; r += 1) {
+              for (var c = cellrange[s].column[0]; c <= cellrange[s].column[1]; c += 1) {
+                var cell = _.isNil(d[r]) || _.isNil(d[r][c]) ? null : d[r][c];
+                var isEmpty = _.isNil(cell) || _.isNil(cell.v) || isRealNull(cell.v);
+                if (isEmpty) {
+                  if ("".concat(r, "_").concat(c) in computeMap) {
+                    computeMap["".concat(r, "_").concat(c)].textColor = textColor_1;
+                    computeMap["".concat(r, "_").concat(c)].cellColor = cellColor_1;
+                    computeMap["".concat(r, "_").concat(c)].bold = bold_1;
+                    computeMap["".concat(r, "_").concat(c)].italic = italic_1;
+                    computeMap["".concat(r, "_").concat(c)].underline = underline_1;
+                    computeMap["".concat(r, "_").concat(c)].strikethrough = strikethrough_1;
+                  } else {
+                    computeMap["".concat(r, "_").concat(c)] = {
+                      textColor: textColor_1,
+                      cellColor: cellColor_1,
+                      bold: bold_1,
+                      italic: italic_1,
+                      underline: underline_1,
+                      strikethrough: strikethrough_1
+                    };
+                  }
+                }
+              }
+            }
           } else if (conditionName === "between") {
             for (var r = cellrange[s].row[0]; r <= cellrange[s].row[1]; r += 1) {
               for (var c = cellrange[s].column[0]; c <= cellrange[s].column[1]; c += 1) {

package/es/modules/format.js

@@ -240,20 +240,24 @@ export function genarate(value) {
       v = datenum_local(dateObj);
       ct.t = "d";
       var map = {
-        "yyyy-MM-dd": "dd/MM/yyyy",
-        "yyyy-MM-dd HH:mm": "dd/MM/yyyy",
-        "yyyy-MM-ddTHH:mm": "dd/MM/yyyy",
-        "yyyy/MM/dd": "dd/MM/yyyy",
-        "yyyy/MM/dd HH:mm": "dd/MM/yyyy",
+        "yyyy-MM-dd": "yyyy-MM-dd",
+        "yyyy-MM-dd HH:mm": "yyyy-MM-dd HH:mm",
+        "yyyy-MM-ddTHH:mm": "yyyy-MM-dd HH:mm",
+        "yyyy/MM/dd": "yyyy/MM/dd",
+        "yyyy/MM/dd HH:mm": "yyyy/MM/dd HH:mm",
         "yyyy.MM.dd": "yyyy.MM.dd",
         "MM/dd/yyyy h:mm AM/PM": "MM/dd/yyyy h:mm AM/PM",
         "MM/dd/yyyy": "MM/dd/yyyy",
         "M/d/yyyy": "M/d/yyyy",
         "MM/dd/yy": "MM/dd/yy",
         "dd/MM/yyyy": "dd/MM/yyyy",
-        "dd-MM-yyyy": "dd/MM/yyyy",
+        "dd-MM-yyyy": "dd-MM-yyyy",
         "dd.MM.yyyy": "dd.MM.yyyy",
-        named: "dd/MM/yyyy"
+        "named-mdy-full": "mmmm d, yyyy",
+        "named-mdy-abbr": "mmm d, yyyy",
+        "named-dmy-full": "d mmmm yyyy",
+        "named-dmy-abbr": "d mmm yyyy",
+        "named-abbr-dashes": "mmm-d-yyyy"
       };
       ct.fa = map[df.formatType] || "dd/MM/yyyy";
       m = SSF.format(ct.fa, v);
@@ -273,6 +277,7 @@ export function update(fmt, v) {
   return SSF.format(fmt, v);
 }
 export function is_date(fmt, v) {
+  console.log(SSF.is_date(fmt, v), "is_date");
   return SSF.is_date(fmt, v);
 }
 function fuzzynum(s) {