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

package/lib/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/lib/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/lib/locale/zh.js

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

package/lib/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/lib/locale/zh_tw.js

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

package/lib/modules/ConditionFormat.js

@@ -706,6 +706,32 @@ 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 = _lodash.default.isNil(d[r]) || _lodash.default.isNil(d[r][c]) ? null : d[r][c];
+                var isEmpty = _lodash.default.isNil(cell) || _lodash.default.isNil(cell.v) || (0, _validation.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/lib/modules/format.js

@@ -251,20 +251,24 @@ 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.default.format(ct.fa, v);
@@ -284,6 +288,7 @@ function update(fmt, v) {
   return _ssf.default.format(fmt, v);
 }
 function is_date(fmt, v) {
+  console.log(_ssf.default.is_date(fmt, v), "is_date");
   return _ssf.default.is_date(fmt, v);
 }
 function fuzzynum(s) {

package/lib/modules/inline-string.js

@@ -307,6 +307,9 @@ function extendCssText(origin, cover, isLimit) {
   }
   return newCss;
 }
+function escapeHtmlAttr(s) {
+  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function updateInlineStringFormat(ctx, attr, value, cellInput) {
   var _a, _b, _c;
   var w = window.getSelection();
@@ -314,6 +317,34 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  if (range.startContainer === $textEditor && range.endContainer === $textEditor && range.collapsed === false) {
+    var start = range.startOffset;
+    var end = range.endOffset;
+    var children = Array.from($textEditor.childNodes).slice(start, end);
+    children.forEach(function (node) {
+      var _a, _b;
+      if (node.nodeType === Node.ELEMENT_NODE) {
+        var el = node;
+        if (el.tagName === "SPAN") {
+          var cssText = getCssText(el.style.cssText, attr, value);
+          el.setAttribute("style", cssText);
+        }
+      } else if (node.nodeType === Node.TEXT_NODE) {
+        var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+        if (text.length === 0) return;
+        var wrapper = document.createElement("span");
+        var cssText = getCssText("", attr, value);
+        wrapper.setAttribute("style", cssText);
+        wrapper.textContent = text;
+        (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
+      }
+    });
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   if (range.collapsed === true) {
     return;
   }
@@ -351,7 +382,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(left, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(left, "</span>");
         }
         if (mid !== "") {
           var cssText = getCssText(span.style.cssText, attr, value);
@@ -361,7 +392,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(mid, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(mid, "</span>");
         }
         if (right !== "") {
           var cssText = span.style.cssText;
@@ -371,7 +402,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(right, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
         if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
           spanIndex = _lodash.default.indexOf($textEditor.querySelectorAll("span"), span);
@@ -414,33 +445,33 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         for (var i = 0; i < startSpanIndex; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         if (sleft !== "") {
-          cont += "<span style='".concat(startSpan.style.cssText, "'>").concat(sleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\">").concat(sleft, "</span>");
         }
         if (sright !== "") {
           var cssText = getCssText(startSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(sright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(sright, "</span>");
         }
         if (startSpanIndex < endSpanIndex) {
           for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
             var span = spans[i];
             var content = span.innerHTML;
-            cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+            cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
           }
         }
         if (eleft !== "") {
           var cssText = getCssText(endSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(eleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(eleft, "</span>");
         }
         if (eright !== "") {
-          cont += "<span style='".concat(endSpan.style.cssText, "'>").concat(eright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\">").concat(eright, "</span>");
         }
         for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         $textEditor.innerHTML = cont;
         var startSeletedNodeIndex = void 0;
@@ -458,13 +489,10 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
     }
   }
 }
-function escapeHtmlAttr(s) {
-  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
 function getLinkDataAttrs(span) {
   var _a, _b;
   if (((_a = span.dataset) === null || _a === void 0 ? void 0 : _a.linkType) && ((_b = span.dataset) === null || _b === void 0 ? void 0 : _b.linkAddress)) {
-    return " data-link-type='".concat(escapeHtmlAttr(span.dataset.linkType), "' data-link-address='").concat(escapeHtmlAttr(span.dataset.linkAddress), "'");
+    return " data-link-type=\"".concat(escapeHtmlAttr(span.dataset.linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(span.dataset.linkAddress), "\"");
   }
   return "";
 }
@@ -502,7 +530,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(left, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(left, "</span>");
     }
     if (mid !== "") {
       var cssText = getLinkStyleCssText(span.style.cssText);
@@ -510,7 +538,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(mid, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(mid, "</span>");
     }
     if (right !== "") {
       var cssText = span.style.cssText;
@@ -518,7 +546,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(right, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(right, "</span>");
     }
     if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
       span.outerHTML = cont;
@@ -548,32 +576,32 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
     var cont = "";
     for (var i = 0; i < startSpanIndex; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     if (sleft !== "") {
-      cont += "<span style='".concat(startSpan.style.cssText, "'").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\"").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
     }
     if (sright !== "") {
       var cssText = getLinkStyleCssText(startSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sright, "</span>");
     }
     if (startSpanIndex < endSpanIndex) {
       for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
         var sp = spans[i];
         var cssText = getLinkStyleCssText(sp.style.cssText);
-        cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sp.innerHTML, "</span>");
+        cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sp.innerHTML, "</span>");
       }
     }
     if (eleft !== "") {
       var cssText = getLinkStyleCssText(endSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(eleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(eleft, "</span>");
     }
     if (eright !== "") {
-      cont += "<span style='".concat(endSpan.style.cssText, "'").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\"").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
     }
     for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     $textEditor.innerHTML = cont;
     spans = $textEditor.querySelectorAll("span");

package/lib/modules/validation.js

@@ -84,6 +84,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;
@@ -298,6 +299,7 @@ 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,
@@ -305,7 +307,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-mdy-abbr" : "named-mdy-full"
       };
     }
   }
@@ -315,6 +317,7 @@ 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,
@@ -322,7 +325,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: isAbbr ? "named-dmy-abbr" : "named-dmy-full"
       };
     }
   }
@@ -339,7 +342,7 @@ function detectDateFormat(str) {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named"
+        formatType: "named-abbr-dashes"
       };
     }
   }

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

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