@fileverse-dev/fortune-core 1.3.12 → 1.3.13-create-2

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/cell.d.ts

@@ -25,7 +25,11 @@ export declare function getRangeByTxt(ctx: Context, txt: string): any[];
 export declare function isAllSelectedCellsInStatus(ctx: Context, attr: keyof Cell, status: any): boolean;
 export declare function getFontStyleByCell(cell: Cell | null | undefined, checksAF?: any[], checksCF?: any, isCheck?: boolean): any;
 export declare function getStyleByCell(ctx: Context, d: CellMatrix, r: number, c: number): any;
-export declare function getInlineStringHTML(r: number, c: number, data: CellMatrix): string;
+export declare function getInlineStringHTML(r: number, c: number, data: CellMatrix, options?: {
+    useSemanticMarkup?: boolean;
+    isRangeCopy?: boolean;
+    inheritedStyle?: Record<string, string>;
+}): string;
 export declare function getQKBorder(width: string, type: string, color: string): (string | number)[];
 export declare function getdatabyselection(ctx: Context, range: Selection | undefined, sheetId: string): (Cell | null)[][];
 export declare function luckysheetUpdateCell(ctx: Context, row_index: number, col_index: number): void;

package/es/modules/cell.js

@@ -16,10 +16,11 @@ import { checkCF, getComputeMap } from "./ConditionFormat";
 import { getFailureText, validateCellData } from "./dataVerification";
 import { genarate, update } from "./format";
 import { clearCellError, getRowHeight } from "../api";
-import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata } from "./formula";
-import { attrToCssName, convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
+import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata, suppressFormulaRangeSelectionForInitialEdit } from "./formula";
+import { convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
 import { isRealNull, isRealNum, valueIsError } from "./validation";
 import { getCellTextInfo } from "./text";
+import { locale } from "../locale";
 import { spillSortResult } from "./sort";
 export function normalizedCellAttr(cell, attr, defaultFontSize) {
   if (defaultFontSize === void 0) {
@@ -69,6 +70,32 @@ function newlinesToBr(text) {
   if (!text) return "";
   return text.replace(/\r\n|\r|\n/g, "<br />");
 }
+function closeUnclosedParenthesesInFormula(formula) {
+  if (!formula.startsWith("=") || formula.length <= 1) return formula;
+  var body = formula.slice(1);
+  var depth = 0;
+  var inString = false;
+  for (var i = 0; i < body.length; i += 1) {
+    var ch = body[i];
+    if (inString) {
+      if (ch === '"') {
+        if (body[i + 1] === '"') {
+          i += 1;
+        } else {
+          inString = false;
+        }
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch === "(") depth += 1;else if (ch === ")") depth = Math.max(0, depth - 1);
+  }
+  if (depth <= 0) return formula;
+  return "".concat(formula).concat(")".repeat(depth));
+}
 export function getCellValue(r, c, data, attr) {
   var _a;
   if (!attr) {
@@ -541,6 +568,8 @@ export function cancelNormalSelected(ctx) {
   ctx.formulaCache.rangestart = false;
   ctx.formulaCache.rangedrag_column_start = false;
   ctx.formulaCache.rangedrag_row_start = false;
+  ctx.formulaCache.rangeSelectionActive = null;
+  ctx.formulaCache.formulaEditorOwner = null;
 }
 export function updateCell(ctx, r, c, $input, value, canvas) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
@@ -616,6 +645,11 @@ export function updateCell(ctx, r, c, $input, value, canvas) {
       }
     }
     value = value || inputText;
+    if (_.isString(value) && value.startsWith("=") && value.length > 1) {
+      value = closeUnclosedParenthesesInFormula(value);
+    } else if (_.isPlainObject(value) && _.isString(value.f) && value.f.startsWith("=") && value.f.length > 1) {
+      value.f = closeUnclosedParenthesesInFormula(value.f);
+    }
     var shouldClearError = (oldValue_1 === null || oldValue_1 === void 0 ? void 0 : oldValue_1.f) ? oldValue_1.f !== value : (oldValue_1 === null || oldValue_1 === void 0 ? void 0 : oldValue_1.v) !== value;
     if (shouldClearError) {
       clearCellError(ctx, r, c);
@@ -975,37 +1009,68 @@ export function getRangeByTxt(ctx, txt) {
   return range;
 }
 export function isAllSelectedCellsInStatus(ctx, attr, status) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (!_.isEmpty(ctx.luckysheetCellUpdate)) {
     var w = window.getSelection();
     if (!w) return false;
     if (w.rangeCount === 0) return false;
-    var range = w.getRangeAt(0);
-    if (range.collapsed === true) {
+    var range_1 = w.getRangeAt(0);
+    if (range_1.collapsed === true) {
       return false;
     }
-    var endContainer = range.endContainer;
-    var startContainer = range.startContainer;
-    var cssField_1 = _.camelCase(attrToCssName[attr]);
-    if (startContainer === endContainer) {
-      return !_.isEmpty((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.style[cssField_1]);
-    }
-    if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
-      var startSpan = startContainer.parentNode;
-      var endSpan = endContainer.parentNode;
-      var allSpans = (_d = startSpan === null || startSpan === void 0 ? void 0 : startSpan.parentNode) === null || _d === void 0 ? void 0 : _d.querySelectorAll("span");
-      if (allSpans) {
-        var startSpanIndex = _.indexOf(allSpans, startSpan);
-        var endSpanIndex = _.indexOf(allSpans, endSpan);
-        var rangeSpans = [];
-        for (var i = startSpanIndex; i <= endSpanIndex; i += 1) {
-          rangeSpans.push(allSpans[i]);
+    var endContainer = range_1.endContainer;
+    var startContainer = range_1.startContainer;
+    var toElement = function toElement(n) {
+      if (!n) return null;
+      if (n.nodeType === Node.ELEMENT_NODE) return n;
+      return n.parentElement;
+    };
+    var startEl = toElement(startContainer);
+    var endEl = toElement(endContainer);
+    var editorRoot = (_b = (_a = startEl === null || startEl === void 0 ? void 0 : startEl.closest("#luckysheet-rich-text-editor")) !== null && _a !== void 0 ? _a : endEl === null || endEl === void 0 ? void 0 : endEl.closest("#luckysheet-rich-text-editor")) !== null && _b !== void 0 ? _b : toElement(range_1.commonAncestorContainer);
+    var isStyleActive_1 = function isStyleActive_1(element) {
+      var computed = window.getComputedStyle(element);
+      var fontWeight = (computed.fontWeight || "").toLowerCase();
+      var fontStyle = (computed.fontStyle || "").toLowerCase();
+      var textDecorationLine = (computed.textDecorationLine || computed.textDecoration || "").toLowerCase();
+      var borderBottomWidth = (computed.borderBottomWidth || "").toLowerCase();
+      if (status === 1) {
+        if (attr === "bl") {
+          if (fontWeight === "bold") return true;
+          var n = Number(fontWeight);
+          return !Number.isNaN(n) && n >= 600;
+        }
+        if (attr === "it") {
+          return fontStyle === "italic" || fontStyle === "oblique";
+        }
+        if (attr === "cl") {
+          return textDecorationLine.includes("line-through");
+        }
+        if (attr === "un") {
+          return textDecorationLine.includes("underline") || borderBottomWidth !== "" && borderBottomWidth !== "0px" && borderBottomWidth !== "0";
         }
-        return _.every(rangeSpans, function (s) {
-          return !_.isEmpty(s.style[cssField_1]);
-        });
       }
+      return false;
+    };
+    var selectedElements_1 = [];
+    if (editorRoot) {
+      var spans = editorRoot.querySelectorAll("span");
+      spans.forEach(function (span) {
+        if (span.textContent && span.textContent.length > 0 && range_1.intersectsNode(span)) {
+          selectedElements_1.push(span);
+        }
+      });
+    }
+    if (selectedElements_1.length === 0) {
+      if (startEl) selectedElements_1.push(startEl);
+      if (endEl && endEl !== startEl) selectedElements_1.push(endEl);
+    }
+    if (selectedElements_1.length === 0) {
+      return false;
     }
+    return _.every(selectedElements_1, function (el) {
+      return isStyleActive_1(el);
+    });
   }
   var cells = getFlattenedRange(ctx);
   var flowdata = getFlowdata(ctx);
@@ -1041,7 +1106,7 @@ export function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
     if (key === "it" && valueNum !== 0) {
       style.fontStyle = "italic";
     }
-    if (key === "fs" && valueNum !== 10) {
+    if (key === "fs" && !_.isNil(value)) {
       style.fontSize = "".concat(valueNum, "pt");
     }
     if (key === "fc" && value !== "#000000" || ((_a = checksAF === null || checksAF === void 0 ? void 0 : checksAF.length) !== null && _a !== void 0 ? _a : 0) > 0 || (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor)) {
@@ -1065,14 +1130,13 @@ export function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
   return style;
 }
 export function getStyleByCell(ctx, d, r, c) {
-  var _a;
+  var _a, _b;
   var style = {};
   var checksAF = [];
   var cf_compute = getComputeMap(ctx);
   var checksCF = checkCF(r, c, cf_compute);
   var cell = (_a = d === null || d === void 0 ? void 0 : d[r]) === null || _a === void 0 ? void 0 : _a[c];
   if (!cell) return {};
-  var isInline = isInlineStringCell(cell);
   if ("bg" in cell) {
     var value = normalizedCellAttr(cell, "bg");
     if (checksCF === null || checksCF === void 0 ? void 0 : checksCF.cellColor) {
@@ -1103,7 +1167,9 @@ export function getStyleByCell(ctx, d, r, c) {
   }
   if ("ff" in cell) {
     var value = normalizedCellAttr(cell, "ff");
-    style.fontFamily = value;
+    var fontarray = locale(ctx).fontarray;
+    var ffIndex = parseInt(value, 10);
+    style.fontFamily = Number.isNaN(ffIndex) ? value : (_b = fontarray[ffIndex]) !== null && _b !== void 0 ? _b : value;
   }
   if ("vt" in cell) {
     var value = normalizedCellAttr(cell, "vt");
@@ -1113,12 +1179,52 @@ export function getStyleByCell(ctx, d, r, c) {
       style.alignItems = "flex-end";
     }
   }
-  if (!isInline) {
-    style = _.assign(style, getFontStyleByCell(cell, checksAF, checksCF));
-  }
+  style = _.assign(style, getFontStyleByCell(cell, checksAF, checksCF));
   return style;
 }
-export function getInlineStringHTML(r, c, data) {
+function normalizeInlineStringClipboardStyle(style) {
+  var decorations = new Set();
+  var normalizedStyle = {
+    color: style.color || "#000000",
+    fontFamily: style.fontFamily || "Arial",
+    fontSize: style.fontSize || "11pt",
+    fontStyle: style.fontStyle || "normal",
+    fontWeight: style.fontWeight || "400"
+  };
+  var backgroundColor = style.backgroundColor || style.background;
+  if (backgroundColor && backgroundColor !== "transparent" && backgroundColor !== "rgba(0, 0, 0, 0)") {
+    normalizedStyle.backgroundColor = backgroundColor;
+  }
+  if (typeof style.textDecoration === "string") {
+    style.textDecoration.split(/\s+/).filter(Boolean).forEach(function (decoration) {
+      return decorations.add(decoration);
+    });
+  }
+  if (style.borderBottom) {
+    decorations.add("underline");
+    normalizedStyle.textDecorationSkipInk = "none";
+  }
+  if (decorations.size > 0) {
+    normalizedStyle.textDecoration = Array.from(decorations).join(" ");
+  }
+  return normalizedStyle;
+}
+function buildClipboardCompatibleInlineRuns(text, styleAttr) {
+  var normalizedText = text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  var segments = normalizedText.split("\n");
+  return segments.map(function (segment, index) {
+    var html = "";
+    if (segment.length > 0) {
+      html += "<span style='".concat(styleAttr, "'>").concat(segment, "</span>");
+    }
+    if (index < segments.length - 1) {
+      html += "<span style='".concat(styleAttr, "'><br></span>");
+    }
+    return html;
+  }).join("");
+}
+export function getInlineStringHTML(r, c, data, options) {
+  var _a;
   var ct = getCellValue(r, c, data, "ct");
   if (isInlineStringCT(ct)) {
     var strings = ct.s;
@@ -1126,17 +1232,49 @@ export function getInlineStringHTML(r, c, data) {
     for (var i = 0; i < strings.length; i += 1) {
       var strObj = strings[i];
       if (strObj.v) {
-        var style = getFontStyleByCell(strObj);
+        var baseStyle = __assign(__assign({}, (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) ? (_a = options.inheritedStyle) !== null && _a !== void 0 ? _a : {} : {}), getFontStyleByCell(strObj));
+        var style = (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) ? normalizeInlineStringClipboardStyle(baseStyle) : baseStyle;
+        if (!style.fontWeight) {
+          style.fontWeight = "400";
+        }
+        if (!style.fontStyle) {
+          style.fontStyle = "normal";
+        }
+        if (!style.fontSize) {
+          style.fontSize = "11pt";
+        }
+        if (!style.fontFamily) {
+          style.fontFamily = "Arial";
+        }
         var link = strObj.link;
         if ((link === null || link === void 0 ? void 0 : link.linkType) && (link === null || link === void 0 ? void 0 : link.linkAddress)) {
           style.color = style.color || "rgb(0, 0, 255)";
-          style.borderBottom = style.borderBottom || "1px solid rgb(0, 0, 255)";
+          if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
+            style.textDecoration = style.textDecoration ? "".concat(style.textDecoration, " underline") : "underline";
+            style.textDecorationSkipInk = "none";
+          } else {
+            style.borderBottom = style.borderBottom || "1px solid rgb(0, 0, 255)";
+          }
         }
-        var styleStr = _.map(style, function (v, key) {
+        var styleStr = _.toPairs(style).filter(function (_a) {
+          var v = _a[1];
+          return !_.isNil(v) && v !== "" && v !== "undefined";
+        }).map(function (_a) {
+          var key = _a[0],
+            v = _a[1];
           return "".concat(_.kebabCase(key), ":").concat(_.isNumber(v) ? "".concat(v, "px") : v, ";");
-        }).join("");
-        var dataAttrs = (link === null || link === void 0 ? void 0 : link.linkType) && (link === null || link === void 0 ? void 0 : link.linkAddress) ? " data-link-type='".concat(String(link.linkType).replace(/'/g, "&#39;"), "' data-link-address='").concat(String(link.linkAddress).replace(/'/g, "&#39;"), "'") : "";
-        value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(strObj.v, "</span>");
+        }).join(" ");
+        var dataAttrs = !(options === null || options === void 0 ? void 0 : options.useSemanticMarkup) && (link === null || link === void 0 ? void 0 : link.linkType) && (link === null || link === void 0 ? void 0 : link.linkAddress) ? " data-link-type='".concat(String(link.linkType).replace(/'/g, "&#39;"), "' data-link-address='").concat(String(link.linkAddress).replace(/'/g, "&#39;"), "'") : "";
+        if (options === null || options === void 0 ? void 0 : options.isRangeCopy) {
+          if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
+            value += buildClipboardCompatibleInlineRuns(strObj.v, styleStr);
+          } else {
+            var segmentText = strObj.v.replace(/\r\n/g, "<br>").replace(/\n/g, "<br>");
+            value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(segmentText, "</span>");
+          }
+        } else {
+          value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(strObj.v, "</span>");
+        }
       }
     }
     return value;
@@ -1224,6 +1362,12 @@ export function getdatabyselection(ctx, range, sheetId) {
   return data;
 }
 export function luckysheetUpdateCell(ctx, row_index, col_index) {
+  var _a;
+  var flowdata = getFlowdata(ctx);
+  var cell = (_a = flowdata === null || flowdata === void 0 ? void 0 : flowdata[row_index]) === null || _a === void 0 ? void 0 : _a[col_index];
+  if ((cell === null || cell === void 0 ? void 0 : cell.f) != null && String(cell.f).trim() !== "") {
+    suppressFormulaRangeSelectionForInitialEdit(ctx);
+  }
   ctx.luckysheetCellUpdate = [row_index, col_index];
 }
 export function getDataBySelectionNoCopy(ctx, range) {

package/es/modules/clipboard.js

@@ -1,7 +1,116 @@
+function getNodePlainText(node) {
+  var _a;
+  if (node.nodeType === 3) {
+    return (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+  }
+  if (node.nodeType !== 1) {
+    return "";
+  }
+  var element = node;
+  if (element.tagName === "BR") {
+    return "\n";
+  }
+  return Array.from(element.childNodes).map(function (child) {
+    return getNodePlainText(child);
+  }).join("");
+}
+function normalizeClipboardCellText(value) {
+  return value.replace(/\r\n/g, "\n").replace(/<br\s*\/?>/gi, "\n");
+}
+function formatTableCellForPlainText(value) {
+  var normalizedValue = normalizeClipboardCellText(value);
+  if (/["\n\t]/.test(normalizedValue)) {
+    return "\"".concat(normalizedValue.replace(/"/g, '""'), "\"");
+  }
+  return normalizedValue;
+}
+function tableToPlainText(table) {
+  var grid = [];
+  Array.from(table.rows).forEach(function (row, rowIndex) {
+    var _a;
+    (_a = grid[rowIndex]) !== null && _a !== void 0 ? _a : grid[rowIndex] = [];
+    var colIndex = 0;
+    Array.from(row.cells).forEach(function (cell) {
+      var _a;
+      while (grid[rowIndex][colIndex] !== undefined) {
+        colIndex += 1;
+      }
+      var cellText = Array.from(cell.childNodes).map(function (child) {
+        return getNodePlainText(child);
+      }).join("");
+      var rowSpan = Math.max(Number(cell.getAttribute("rowspan")) || 1, 1);
+      var colSpan = Math.max(Number(cell.getAttribute("colspan")) || 1, 1);
+      for (var r = 0; r < rowSpan; r += 1) {
+        var targetRow = rowIndex + r;
+        (_a = grid[targetRow]) !== null && _a !== void 0 ? _a : grid[targetRow] = [];
+        for (var c = 0; c < colSpan; c += 1) {
+          grid[targetRow][colIndex + c] = r === 0 && c === 0 ? cellText : "";
+        }
+      }
+      colIndex += colSpan;
+    });
+  });
+  var columnCount = grid.reduce(function (max, row) {
+    return Math.max(max, row.length);
+  }, 0);
+  return grid.map(function (row) {
+    return Array.from({
+      length: columnCount
+    }, function (_, index) {
+      var _a;
+      return (_a = row[index]) !== null && _a !== void 0 ? _a : "";
+    }).map(function (cell) {
+      return formatTableCellForPlainText(cell);
+    }).join("\t");
+  }).join("\n");
+}
+function legacyHtmlToPlainText(html) {
+  return html.replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]*>/g, "");
+}
+function htmlToPlainText(html) {
+  var legacyPlainText = legacyHtmlToPlainText(html);
+  if (typeof document === "undefined" || !/<table[\s>]/i.test(html)) {
+    return legacyPlainText;
+  }
+  var container = document.createElement("div");
+  container.innerHTML = html;
+  var table = container.querySelector("table");
+  if (!table || table.rows.length === 0) {
+    return legacyPlainText;
+  }
+  return tableToPlainText(table);
+}
+function formatPlainTextForClipboard(plainText, isTableContent) {
+  if (isTableContent === void 0) {
+    isTableContent = false;
+  }
+  if (!isTableContent && plainText.includes("\n") && !plainText.includes("\t")) {
+    return "\"".concat(plainText.replace(/"/g, '""'), "\"");
+  }
+  return plainText;
+}
 var clipboard = function () {
   function clipboard() {}
   clipboard.writeHtml = function (str) {
-    var _a;
+    var _a, _b;
+    if (typeof ((_a = navigator === null || navigator === void 0 ? void 0 : navigator.clipboard) === null || _a === void 0 ? void 0 : _a.write) === "function") {
+      var htmlStr = str;
+      var htmlBlob = new Blob([htmlStr], {
+        type: "text/html"
+      });
+      var isTableContent = /<table[\s>]/i.test(str);
+      var plainText = formatPlainTextForClipboard(htmlToPlainText(str), isTableContent);
+      var textBlob = new Blob([plainText], {
+        type: "text/plain"
+      });
+      navigator.clipboard.write([new ClipboardItem({
+        "text/html": htmlBlob,
+        "text/plain": textBlob
+      })]).catch(function (e) {
+        return console.error(e);
+      });
+      return;
+    }
     try {
       var ele_1 = document.getElementById("fortune-copy-content");
       if (!ele_1) {
@@ -12,7 +121,7 @@ var clipboard = function () {
         ele_1.style.height = "0";
         ele_1.style.width = "0";
         ele_1.style.left = "-10000px";
-        (_a = document.querySelector(".fortune-container")) === null || _a === void 0 ? void 0 : _a.append(ele_1);
+        (_b = document.querySelector(".fortune-container")) === null || _b === void 0 ? void 0 : _b.append(ele_1);
       }
       var previouslyFocusedElement_1 = document.activeElement;
       ele_1.style.display = "block";

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) {

package/es/modules/formula.d.ts

@@ -20,6 +20,9 @@ export declare class FormulaCache {
     rangetosheet?: string;
     rangedrag_column_start?: boolean;
     rangedrag_row_start?: boolean;
+    rangeSelectionActive?: boolean | null;
+    keyboardRangeSelectionLock?: boolean;
+    formulaEditorOwner?: "cell" | "fx" | null;
     functionRangeIndex?: number[];
     functionlistMap: any;
     execFunctionExist?: any[];
@@ -44,8 +47,20 @@ export declare function setCaretPosition(ctx: Context, textDom: HTMLElement, chi
 export declare function getrangeseleciton(): ParentNode | ChildNode | null | undefined;
 export declare function rangeHightlightselected(ctx: Context, $editor: HTMLDivElement): void;
 export declare function functionHTMLGenerate(txt: string): string;
+export declare function getLastFormulaRangeIndex($editor: HTMLDivElement): number | null;
+export declare function getFormulaRangeIndexAtCaret($editor: HTMLDivElement): number | null;
+export declare function setFormulaEditorOwner(ctx: Context, owner: "cell" | "fx" | null): void;
+export declare function getFormulaEditorOwner(ctx: Context): "cell" | "fx" | null;
+export declare function hasIncompleteTruncatedCellRangeSyntax(formulaText: string): boolean;
+export declare function isBareCellOrRangeOnlyFormula(formulaText: string): boolean;
+export declare function suppressFormulaRangeSelectionForInitialEdit(ctx: Context): void;
+export declare function isCaretAtValidFormulaRangeInsertionPoint(editor: HTMLElement | null): boolean;
+export declare function markRangeSelectionDirty(ctx: Context): void;
+export declare function getFormulaRangeIndexForKeyboardSync($editor: HTMLDivElement): number | null;
 export declare function handleFormulaInput(ctx: Context, $copyTo: HTMLDivElement | null | undefined, $editor: HTMLDivElement, kcode: number, preText?: string, refreshRangeSelect?: boolean): void;
 export declare function israngeseleciton(ctx: Context, istooltip?: boolean): boolean;
+export declare function isFormulaReferenceInputMode(ctx: Context): boolean;
+export declare function maybeRecoverDirtyRangeSelection(ctx: Context): boolean;
 export declare function functionStrChange(txt: string, type: string, rc: "row" | "col", orient: string | null, stindex: number, step: number): string;
 export declare function rangeSetValue(ctx: Context, cellInput: HTMLDivElement, selected: any, fxInput?: HTMLDivElement | null): void;
 export declare function onFormulaRangeDragEnd(ctx: Context): void;
@@ -53,3 +68,11 @@ export declare function rangeDrag(ctx: Context, e: MouseEvent, cellInput: HTMLDi
 export declare function rangeDragColumn(ctx: Context, e: MouseEvent, cellInput: HTMLDivElement, scrollLeft: number, scrollTop: number, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function rangeDragRow(ctx: Context, e: MouseEvent, cellInput: HTMLDivElement, scrollLeft: number, scrollTop: number, container: HTMLDivElement, fxInput?: HTMLDivElement | null): void;
 export declare function functionCopy(ctx: Context, txt: string, mode: string, step: number): string;
+type MoveReferenceRect = {
+    rowStart: number;
+    rowEnd: number;
+    colStart: number;
+    colEnd: number;
+};
+export declare function functionMoveReference(txt: string, formulaSheetName: string, movedSheetName: string, sourceRect: MoveReferenceRect, targetRowStart: number, targetColStart: number): string;
+export {};