@fileverse-dev/fortune-core 1.3.3 → 1.3.4-date-format-2

package/es/canvas.js

@@ -1012,7 +1012,7 @@ var Canvas = function () {
       renderCtx.clip();
       renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
       var measureText = getMeasureText(value, renderCtx, this.sheetCtx);
-      var textMetrics = measureText.width + 14;
+      var textMetrics = measureText.width + 18;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

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 { genarate, update } from "../modules/format";
+import { update, datenum_local } from "../modules/format";
 import { normalizeSelection, selectionCache } from "../modules/selection";
 import { getSheetIndex, isAllowEdit } from "../utils";
-import { hasPartMC, isRealNum } from "../modules/validation";
+import { hasPartMC, isRealNum, detectDateFormat } from "../modules/validation";
 import { getBorderInfoCompute } from "../modules/border";
 import { expandRowsAndColumns, storeSheetParamALL } from "../modules/sheet";
 import { jfrefreshgrid } from "../modules/refresh";
@@ -209,14 +209,13 @@ var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
   }
 };
 function pasteHandler(ctx, data, borderInfo) {
-  var _a;
-  var _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
   var allowEdit = isAllowEdit(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
-  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
+  if (((_b = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) !== 1) {
     return;
   }
   if (_typeof(data) === "object") {
@@ -265,7 +264,7 @@ function pasteHandler(ctx, data, borderInfo) {
         currentRowLen = cfg.rowlen[h];
       }
       for (var c = minc; c <= maxc; c += 1) {
-        if ((_d = x === null || x === void 0 ? void 0 : x[c]) === null || _d === void 0 ? void 0 : _d.mc) {
+        if ((_c = x === null || x === void 0 ? void 0 : x[c]) === null || _c === void 0 ? void 0 : _c.mc) {
           if ("rs" in x[c].mc) {
             delete cfg.merge["".concat(x[c].mc.r, "_").concat(x[c].mc.c)];
           }
@@ -276,7 +275,7 @@ function pasteHandler(ctx, data, borderInfo) {
           value = data[h - minh][c - minc];
         }
         x[c] = value;
-        if (value != null && ((_e = x === null || x === void 0 ? void 0 : x[c]) === null || _e === void 0 ? void 0 : _e.mc)) {
+        if (value != null && ((_d = x === null || x === void 0 ? void 0 : x[c]) === null || _d === void 0 ? void 0 : _d.mc)) {
           if (x[c].mc.rs != null) {
             x[c].mc.r = h;
             x[c].mc.c = c;
@@ -303,7 +302,7 @@ function pasteHandler(ctx, data, borderInfo) {
               b: borderInfo["".concat(h - minh, "_").concat(c - minc)].b
             }
           };
-          (_f = cfg.borderInfo) === null || _f === void 0 ? void 0 : _f.push(bd_obj);
+          (_e = cfg.borderInfo) === null || _e === void 0 ? void 0 : _e.push(bd_obj);
         }
       }
       d[h] = x;
@@ -335,7 +334,7 @@ function pasteHandler(ctx, data, borderInfo) {
     }
     var d = getFlowdata(ctx);
     if (!d) return;
-    var last = (_g = ctx.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g[ctx.luckysheet_select_save.length - 1];
+    var last = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f[ctx.luckysheet_select_save.length - 1];
     if (!last) return;
     var curR = last.row == null ? 0 : last.row[0];
     var curC = last.column == null ? 0 : last.column[0];
@@ -376,9 +375,23 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          originCell.v = isUrl ? originalValueStr : value;
+          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) {
-            originCell.m = update(originCell.ct.fa, originCell.v);
+            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;
           }
@@ -407,8 +420,12 @@ function pasteHandler(ctx, data, borderInfo) {
               t: "s"
             };
           } else {
-            var mask = genarate(value);
-            _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
+            cell.v = originalValueStr;
+            cell.m = originalValueStr;
+            cell.ct = {
+              fa: "General",
+              t: "g"
+            };
             if (/^0x?[a-fA-F0-9]+$/.test(value)) {
               cell.m = value;
               cell.ct = {

package/es/modules/cell.js

@@ -110,7 +110,7 @@ export function getCellValue(r, c, data, attr) {
   return retv;
 }
 export function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_.isNil(d)) {
     d = getFlowdata(ctx);
@@ -276,10 +276,7 @@ export function setCellValue(ctx, r, c, d, v) {
     } else if (!_.isNil(cell.ct) && !_.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
       var fa = cell.ct.fa;
       if (isRealNum(vupdate)) {
-        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
-          if (fa.includes(",") !== String(vupdate).includes(",")) {
-            commaPresent = true;
-          }
+        if (commaPresent && !fa.includes(",")) {
           fa = getNumberFormat(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -289,6 +286,9 @@ export function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        if (_.isNil(cell.ht)) {
+          cell.ht = 2;
+        }
       }
       var mask = update(fa, vupdate);
       if (mask === vupdate) {
@@ -317,7 +317,9 @@ export function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = getNumberFormat(strValue, commaPresent);
         cell.m = v.m ? v.m : update(format, cell.v);
-        cell.ht = (v === null || v === void 0 ? void 0 : v.ht) ? cell.ht : 2;
+        if (_.isNil(cell.ht)) {
+          cell.ht = 2;
+        }
         cell.ct = {
           fa: format,
           t: "n"

package/es/modules/format.js

@@ -1,6 +1,6 @@
 import numeral from "numeral";
 import _ from "lodash";
-import { isRealNum, valueIsError, isdatetime } from "./validation";
+import { isRealNum, valueIsError, detectDateFormat } from "./validation";
 import SSF from "./ssf";
 import { getCellValue } from "./cell";
 var base1904 = new Date(1900, 2, 1, 0, 0, 0);
@@ -10,29 +10,6 @@ export function datenum_local(v, date1904) {
   if (date1904) epoch -= 1461 * 24 * 60 * 60 * 1000;else if (v >= base1904) epoch += 24 * 60 * 60 * 1000;
   return (epoch - dnthresh_utc) / (24 * 60 * 60 * 1000);
 }
-var good_pd_date = new Date("2017-02-19T19:06:09.000Z");
-if (Number.isNaN(good_pd_date.getFullYear())) good_pd_date = new Date("2/19/17");
-var good_pd = good_pd_date.getFullYear() === 2017;
-function parseDate(str, fixdate) {
-  var d = new Date(str);
-  if (good_pd) {
-    if (!_.isNil(fixdate)) {
-      if (fixdate > 0) d.setTime(d.getTime() + d.getTimezoneOffset() * 60 * 1000);else if (fixdate < 0) d.setTime(d.getTime() - d.getTimezoneOffset() * 60 * 1000);
-    }
-    return d;
-  }
-  if (str instanceof Date) return str;
-  if (good_pd_date.getFullYear() === 1917 && !Number.isNaN(d.getFullYear())) {
-    var s = d.getFullYear();
-    if (str.indexOf("".concat(s)) > -1) return d;
-    d.setFullYear(d.getFullYear() + 100);
-    return d;
-  }
-  var n = str.match(/\d+/g) || ["2017", "2", "19", "0", "0", "0"];
-  var out = new Date(+n[0], +n[1] - 1, +n[2], +n[3] || 0, +n[4] || 0, +n[5] || 0);
-  if (str.indexOf("Z") > -1) out = new Date(out.getTime() - out.getTimezoneOffset() * 60 * 1000);
-  return out;
-}
 export function genarate(value) {
   var m = null;
   var ct = {};
@@ -256,23 +233,37 @@ export function genarate(value) {
       t: "n"
     };
     v = parseFloat(value);
-  } else if (isdatetime(value) && (value.toString().indexOf(".") > -1 || value.toString().indexOf(":") > -1 || value.toString().length < 16)) {
-    v = datenum_local(parseDate(value.toString().replace(/-/g, "/")));
-    if (v.toString().indexOf(".") > -1) {
-      if (value.toString().length > 18) {
-        ct.fa = "yyyy-MM-dd hh:mm:ss";
-      } else if (value.toString().length > 11) {
-        ct.fa = "yyyy-MM-dd hh:mm";
-      } else {
-        ct.fa = "yyyy-MM-dd";
-      }
+  } else if (typeof value === "string") {
+    var df = detectDateFormat(value.toString());
+    if (df) {
+      var dateObj = new Date(df.year, df.month - 1, df.day, df.hours, df.minutes, df.seconds);
+      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",
+        "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",
+        named: "dd/MM/yyyy"
+      };
+      ct.fa = map[df.formatType] || "dd/MM/yyyy";
+      m = SSF.format(ct.fa, v);
     } else {
-      ct.fa = "yyyy-MM-dd";
+      m = value.toString();
+      ct.fa = "General";
+      ct.t = "g";
     }
-    ct.t = "d";
-    m = SSF.format(ct.fa, v);
   } else {
-    m = value;
+    m = value.toString();
     ct.fa = "General";
     ct.t = "g";
   }

package/es/modules/ssf.js

@@ -1364,7 +1364,7 @@ var make_ssf = function make_ssf(SSF) {
     if (typeof n !== "number" || !Number.isFinite(n)) return null;
     if (!Number.isInteger(n)) return null;
     if (n < 0) return null;
-    var minSec = 0; // 1970-01-01
+    var minSec = 100000; // Excel serial numbers max ~73050 for year 2100; avoids collision
     var maxSec = 4102444800; // ~2100-01-01
     var minMs = minSec * 1000;
     var maxMs = maxSec * 1000;

package/es/modules/toolbar.js

@@ -4,13 +4,13 @@ import { getFlowdata } from "../context";
 import { getSheetIndex, isAllowEdit, getLineCount } from "../utils";
 import { getRangetxt, isAllSelectedCellsInStatus, normalizedAttr, setCellValue } from "./cell";
 import { colors } from "./color";
-import { genarate, is_date, update } from "./format";
+import { datenum_local, genarate, is_date, update } from "./format";
 import { execfunction, execFunctionGroup, israngeseleciton, rangeSetValue, setCaretPosition, createFormulaRangeSelect } from "./formula";
 import { inlineStyleAffectAttribute, updateInlineStringFormat, updateInlineStringFormatOutside } from "./inline-string";
 import { colLocationByIndex, rowLocationByIndex } from "./location";
 import { normalizeSelection, selectionCopyShow, selectIsOverlap } from "./selection";
 import { sortSelection } from "./sort";
-import { hasPartMC, isdatatypemulti, isRealNull, isRealNum } from "./validation";
+import { detectDateFormat, hasPartMC, isdatatypemulti, isRealNull, isRealNum } from "./validation";
 import { showLinkCard } from "./hyperlink";
 import { cfSplitRange } from "./conditionalFormat";
 import { clearMeasureTextCache, getCellTextInfo } from "./text";
@@ -33,21 +33,42 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
         } else {
           value = cell;
         }
+        var type = "n";
+        if (is_date(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
+          type = "d";
+        } else if (foucsStatus === "@" || foucsStatus === 49) {
+          type = "s";
+        }
         if (_.isNil(value)) {
+          if (!_.isNil(d[r])) {
+            if (_.isNil(d[r][c])) {
+              d[r][c] = {
+                ct: {
+                  fa: foucsStatus,
+                  t: type
+                }
+              };
+            } else if (_.isPlainObject(d[r][c])) {
+              if (_.isNil(d[r][c].ct)) d[r][c].ct = {};
+              d[r][c].ct.fa = foucsStatus;
+              d[r][c].ct.t = type;
+            }
+          }
           continue;
         }
         if (foucsStatus !== "@" && isRealNum(value)) {
           value = Number(value);
+        } else if (type === "d" && typeof value === "string") {
+          var dateInfo = detectDateFormat(value);
+          if (dateInfo) {
+            var dateObj = new Date(dateInfo.year, dateInfo.month - 1, dateInfo.day, dateInfo.hours, dateInfo.minutes, dateInfo.seconds);
+            value = datenum_local(dateObj);
+          }
         }
-        var mask = update(foucsStatus, value);
-        var type = "n";
-        if (is_date(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
-          type = "d";
-        } else if (foucsStatus === "@" || foucsStatus === 49) {
-          type = "s";
-        } else if (foucsStatus === "General" || foucsStatus === 0) {
+        if (foucsStatus === "General" || foucsStatus === 0) {
           type = isRealNum(value) ? "n" : "g";
         }
+        var mask = update(foucsStatus, value);
         if (cell && _.isPlainObject(cell)) {
           cell.m = "".concat(mask);
           if (_.isNil(cell.ct)) {
@@ -55,7 +76,7 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
           }
           cell.ct.fa = foucsStatus;
           cell.ct.t = type;
-          cell.v = String(value);
+          cell.v = typeof value === "number" ? value : String(value);
           cell.fc = cell.fc || ((_f = (_e = (_d = cell.ct) === null || _d === void 0 ? void 0 : _d.s) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.fc);
           cell.bl = cell.bl || ((_j = (_h = (_g = cell.ct) === null || _g === void 0 ? void 0 : _g.s) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.bl);
           cell.it = cell.it || ((_m = (_l = (_k = cell.ct) === null || _k === void 0 ? void 0 : _k.s) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.it);
@@ -68,7 +89,7 @@ export function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_
               fa: foucsStatus,
               t: type
             },
-            v: value,
+            v: typeof value === "number" ? value : value,
             m: mask
           };
         }

package/es/modules/validation.d.ts

@@ -15,6 +15,16 @@ export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;
 export declare function isRealNum(val: any): boolean;
+export type DateFormatInfo = {
+    year: number;
+    month: number;
+    day: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+    formatType: string;
+};
+export declare function detectDateFormat(str: string): DateFormatInfo | null;
 export declare function isdatetime(s: any): boolean;
 export declare function diff(now: any, then: any): number;
 export declare function isdatatypemulti(s: any): any;

package/es/modules/validation.js

@@ -39,33 +39,294 @@ export function isRealNum(val) {
   }
   return !Number.isNaN(Number(val));
 }
-function checkDateTime(str) {
-  var reg1 = /^(\d{4})-(\d{1,2})-(\d{1,2})(\s(\d{1,2}):(\d{1,2})(:(\d{1,2}))?)?$/;
-  var reg2 = /^(\d{4})\/(\d{1,2})\/(\d{1,2})(\s(\d{1,2}):(\d{1,2})(:(\d{1,2}))?)?$/;
-  if (!reg1.test(str) && !reg2.test(str)) {
-    return false;
+var MONTH_NAME_MAP = {
+  january: 1,
+  february: 2,
+  march: 3,
+  april: 4,
+  may: 5,
+  june: 6,
+  july: 7,
+  august: 8,
+  september: 9,
+  october: 10,
+  november: 11,
+  december: 12,
+  jan: 1,
+  feb: 2,
+  mar: 3,
+  apr: 4,
+  jun: 6,
+  jul: 7,
+  aug: 8,
+  sep: 9,
+  oct: 10,
+  nov: 11,
+  dec: 12
+};
+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";
+function isValidDateParts(year, month, day) {
+  if (year < 1900) return false;
+  if (month < 1 || month > 12) return false;
+  if (day < 1 || day > 31) return false;
+  if (month === 2) {
+    var isLeap = new Date(year, 1, 29).getDate() === 29;
+    if (isLeap && day > 29) return false;
+    if (!isLeap && day > 28) return false;
   }
-  var year = Number(RegExp.$1);
-  var month = Number(RegExp.$2);
-  var day = Number(RegExp.$3);
-  if (year < 1900) {
-    return false;
+  if ([4, 6, 9, 11].includes(month) && day > 30) return false;
+  return true;
+}
+export function detectDateFormat(str) {
+  if (!str || str.toString().length < 5) return null;
+  var s = str.toString().trim();
+  var m;
+  m = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3],
+      h = +m[4],
+      mi = +m[5],
+      sec = m[6] != null ? +m[6] : 0;
+    if (isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: "yyyy-MM-ddTHH:mm"
+      };
+    }
   }
-  if (month > 12) {
-    return false;
+  m = /^(\d{4})-(\d{1,2})-(\d{1,2})(?:\s(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      var h = m[4] != null ? +m[4] : 0;
+      var mi = m[5] != null ? +m[5] : 0;
+      var sec = m[6] != null ? +m[6] : 0;
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: m[4] != null ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd"
+      };
+    }
   }
-  if (day > 31) {
-    return false;
+  m = /^(\d{4})\/(\d{1,2})\/(\d{1,2})(?:\s(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      var h = m[4] != null ? +m[4] : 0;
+      var mi = m[5] != null ? +m[5] : 0;
+      var sec = m[6] != null ? +m[6] : 0;
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: m[4] != null ? "yyyy/MM/dd HH:mm" : "yyyy/MM/dd"
+      };
+    }
   }
-  if (month === 2) {
-    if (new Date(year, 1, 29).getDate() === 29 && day > 29) {
-      return false;
+  m = /^(\d{4})\.(\d{1,2})\.(\d{1,2})$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "yyyy.MM.dd"
+      };
     }
-    if (new Date(year, 1, 29).getDate() !== 29 && day > 28) {
-      return false;
+  }
+  m = /^(\d{1,2})\/(\d{1,2})\/(\d{4})\s(\d{1,2}):(\d{2})\s?(AM|PM)$/i.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3],
+      h = +m[4],
+      mi = +m[5];
+    var ampm = m[6].toUpperCase();
+    if (p1 <= 12 && isValidDateParts(y, p1, p2)) {
+      var actualH = h;
+      if (ampm === "PM" && h !== 12) actualH = h + 12;
+      if (ampm === "AM" && h === 12) actualH = 0;
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: actualH,
+        minutes: mi,
+        seconds: 0,
+        formatType: "MM/dd/yyyy h:mm AM/PM"
+      };
     }
   }
-  return true;
+  m = /^(\d{1,2})\/(\d{1,2})\/(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd/MM/yyyy"
+      };
+    } else if (p2 > 12 && p1 <= 12 && isValidDateParts(y, p1, p2)) {
+      var formatType = m[1].length === 1 ? "M/d/yyyy" : "MM/dd/yyyy";
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: formatType
+      };
+    } else if (p1 <= 12 && p2 <= 31 && isValidDateParts(y, p1, p2)) {
+      var formatType = m[1].length === 1 ? "M/d/yyyy" : "MM/dd/yyyy";
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: formatType
+      };
+    }
+  }
+  m = /^(\d{2})\/(\d{2})\/(\d{2})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = 2000 + +m[3];
+    if (p1 <= 12 && p2 <= 31 && isValidDateParts(y, p1, p2)) {
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "MM/dd/yy"
+      };
+    }
+  }
+  m = /^(\d{1,2})-(\d{1,2})-(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd-MM-yyyy"
+      };
+    }
+  }
+  m = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd.MM.yyyy"
+      };
+    }
+  }
+  m = new RegExp("^(".concat(MONTH_NAMES_RE, ")\\s+(\\d{1,2}),?\\s+(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var mo = MONTH_NAME_MAP[m[1].toLowerCase()];
+    var d = +m[2],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  m = new RegExp("^(\\d{1,2})\\s+(".concat(MONTH_NAMES_RE, ")\\s+(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var d = +m[1],
+      mo = MONTH_NAME_MAP[m[2].toLowerCase()],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  m = new RegExp("^(".concat(MONTH_ABBR_RE, ")-(\\d{1,2})-(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var mo = MONTH_NAME_MAP[m[1].toLowerCase()];
+    var d = +m[2],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  return null;
+}
+function checkDateTime(str) {
+  return detectDateFormat(str) !== null;
 }
 export function isdatetime(s) {
   if (s === null || s.toString().length < 5) {

package/lib/canvas.js

@@ -1019,7 +1019,7 @@ var Canvas = exports.Canvas = function () {
       renderCtx.clip();
       renderCtx.scale(this.sheetCtx.zoomRatio, this.sheetCtx.zoomRatio);
       var measureText = (0, _text.getMeasureText)(value, renderCtx, this.sheetCtx);
-      var textMetrics = measureText.width + 14;
+      var textMetrics = measureText.width + 18;
       var oneLineTextHeight = measureText.actualBoundingBoxDescent + measureText.actualBoundingBoxAscent;
       var horizonAlignPos = pos_x + space_width;
       if (horizonAlign === 0) {

package/lib/events/paste.js

@@ -222,14 +222,13 @@ var handleFormulaOnPaste = function handleFormulaOnPaste(ctx, d) {
   }
 };
 function pasteHandler(ctx, data, borderInfo) {
-  var _a;
-  var _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   if (ctx.luckysheet_selection_range) {
     ctx.luckysheet_selection_range = [];
   }
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (!allowEdit || ctx.isFlvReadOnly) return;
-  if (((_c = (_b = ctx.luckysheet_select_save) === null || _b === void 0 ? void 0 : _b.length) !== null && _c !== void 0 ? _c : 0) !== 1) {
+  if (((_b = (_a = ctx.luckysheet_select_save) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) !== 1) {
     return;
   }
   if (_typeof(data) === "object") {
@@ -278,7 +277,7 @@ function pasteHandler(ctx, data, borderInfo) {
         currentRowLen = cfg.rowlen[h];
       }
       for (var c = minc; c <= maxc; c += 1) {
-        if ((_d = x === null || x === void 0 ? void 0 : x[c]) === null || _d === void 0 ? void 0 : _d.mc) {
+        if ((_c = x === null || x === void 0 ? void 0 : x[c]) === null || _c === void 0 ? void 0 : _c.mc) {
           if ("rs" in x[c].mc) {
             delete cfg.merge["".concat(x[c].mc.r, "_").concat(x[c].mc.c)];
           }
@@ -289,7 +288,7 @@ function pasteHandler(ctx, data, borderInfo) {
           value = data[h - minh][c - minc];
         }
         x[c] = value;
-        if (value != null && ((_e = x === null || x === void 0 ? void 0 : x[c]) === null || _e === void 0 ? void 0 : _e.mc)) {
+        if (value != null && ((_d = x === null || x === void 0 ? void 0 : x[c]) === null || _d === void 0 ? void 0 : _d.mc)) {
           if (x[c].mc.rs != null) {
             x[c].mc.r = h;
             x[c].mc.c = c;
@@ -316,7 +315,7 @@ function pasteHandler(ctx, data, borderInfo) {
               b: borderInfo["".concat(h - minh, "_").concat(c - minc)].b
             }
           };
-          (_f = cfg.borderInfo) === null || _f === void 0 ? void 0 : _f.push(bd_obj);
+          (_e = cfg.borderInfo) === null || _e === void 0 ? void 0 : _e.push(bd_obj);
         }
       }
       d[h] = x;
@@ -348,7 +347,7 @@ function pasteHandler(ctx, data, borderInfo) {
     }
     var d = (0, _context.getFlowdata)(ctx);
     if (!d) return;
-    var last = (_g = ctx.luckysheet_select_save) === null || _g === void 0 ? void 0 : _g[ctx.luckysheet_select_save.length - 1];
+    var last = (_f = ctx.luckysheet_select_save) === null || _f === void 0 ? void 0 : _f[ctx.luckysheet_select_save.length - 1];
     if (!last) return;
     var curR = last.row == null ? 0 : last.row[0];
     var curC = last.column == null ? 0 : last.column[0];
@@ -389,9 +388,23 @@ function pasteHandler(ctx, data, borderInfo) {
           }
         }
         if (originCell) {
-          originCell.v = isUrl ? originalValueStr : value;
+          if (originCell.ct && originCell.ct.t === "d" && !isUrl) {
+            var df = (0, _validation.detectDateFormat)(originalValueStr);
+            if (df) {
+              var dateObj = new Date(df.year, df.month - 1, df.day, df.hours, df.minutes, df.seconds);
+              originCell.v = (0, _format.datenum_local)(dateObj);
+            } else {
+              originCell.v = originalValueStr;
+            }
+          } else {
+            originCell.v = isUrl ? originalValueStr : value;
+          }
           if (originCell.ct != null && originCell.ct.fa != null) {
-            originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
+            if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
+              originCell.m = String(originCell.v);
+            } else {
+              originCell.m = (0, _format.update)(originCell.ct.fa, originCell.v);
+            }
           } else {
             originCell.m = typeof originCell.v === "boolean" ? String(originCell.v) : originCell.v;
           }
@@ -420,8 +433,12 @@ function pasteHandler(ctx, data, borderInfo) {
               t: "s"
             };
           } else {
-            var mask = (0, _format.genarate)(value);
-            _a = mask, cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
+            cell.v = originalValueStr;
+            cell.m = originalValueStr;
+            cell.ct = {
+              fa: "General",
+              t: "g"
+            };
             if (/^0x?[a-fA-F0-9]+$/.test(value)) {
               cell.m = value;
               cell.ct = {

package/lib/modules/cell.js

@@ -143,7 +143,7 @@ function getCellValue(r, c, data, attr) {
   return retv;
 }
 function setCellValue(ctx, r, c, d, v) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g;
   if (ctx.allowEdit === false || ctx.isFlvReadOnly) return;
   if (_lodash.default.isNil(d)) {
     d = (0, _context.getFlowdata)(ctx);
@@ -309,10 +309,7 @@ function setCellValue(ctx, r, c, d, v) {
     } else if (!_lodash.default.isNil(cell.ct) && !_lodash.default.isNil(cell.ct.fa) && cell.ct.fa !== "General") {
       var fa = cell.ct.fa;
       if ((0, _validation.isRealNum)(vupdate)) {
-        if (commaPresent && !fa.includes(",") || String(vupdate).includes(".") && ((_j = (_h = String(vupdate).split(".")) === null || _h === void 0 ? void 0 : _h[1]) === null || _j === void 0 ? void 0 : _j.length) !== ((_l = (_k = fa.split(".")) === null || _k === void 0 ? void 0 : _k[1]) === null || _l === void 0 ? void 0 : _l.length) || fa.includes(",") !== String(vupdate).includes(",")) {
-          if (fa.includes(",") !== String(vupdate).includes(",")) {
-            commaPresent = true;
-          }
+        if (commaPresent && !fa.includes(",")) {
           fa = (0, _utils.getNumberFormat)(String(vupdate), commaPresent);
         }
         vupdate = parseFloat(vupdate);
@@ -322,6 +319,9 @@ function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        if (_lodash.default.isNil(cell.ht)) {
+          cell.ht = 2;
+        }
       }
       var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {
@@ -350,7 +350,9 @@ function setCellValue(ctx, r, c, d, v) {
         var strValue = String(vupdate);
         var format = (0, _utils.getNumberFormat)(strValue, commaPresent);
         cell.m = v.m ? v.m : (0, _format.update)(format, cell.v);
-        cell.ht = (v === null || v === void 0 ? void 0 : v.ht) ? cell.ht : 2;
+        if (_lodash.default.isNil(cell.ht)) {
+          cell.ht = 2;
+        }
         cell.ct = {
           fa: format,
           t: "n"

package/lib/modules/format.js

@@ -21,29 +21,6 @@ function datenum_local(v, date1904) {
   if (date1904) epoch -= 1461 * 24 * 60 * 60 * 1000;else if (v >= base1904) epoch += 24 * 60 * 60 * 1000;
   return (epoch - dnthresh_utc) / (24 * 60 * 60 * 1000);
 }
-var good_pd_date = new Date("2017-02-19T19:06:09.000Z");
-if (Number.isNaN(good_pd_date.getFullYear())) good_pd_date = new Date("2/19/17");
-var good_pd = good_pd_date.getFullYear() === 2017;
-function parseDate(str, fixdate) {
-  var d = new Date(str);
-  if (good_pd) {
-    if (!_lodash.default.isNil(fixdate)) {
-      if (fixdate > 0) d.setTime(d.getTime() + d.getTimezoneOffset() * 60 * 1000);else if (fixdate < 0) d.setTime(d.getTime() - d.getTimezoneOffset() * 60 * 1000);
-    }
-    return d;
-  }
-  if (str instanceof Date) return str;
-  if (good_pd_date.getFullYear() === 1917 && !Number.isNaN(d.getFullYear())) {
-    var s = d.getFullYear();
-    if (str.indexOf("".concat(s)) > -1) return d;
-    d.setFullYear(d.getFullYear() + 100);
-    return d;
-  }
-  var n = str.match(/\d+/g) || ["2017", "2", "19", "0", "0", "0"];
-  var out = new Date(+n[0], +n[1] - 1, +n[2], +n[3] || 0, +n[4] || 0, +n[5] || 0);
-  if (str.indexOf("Z") > -1) out = new Date(out.getTime() - out.getTimezoneOffset() * 60 * 1000);
-  return out;
-}
 function genarate(value) {
   var m = null;
   var ct = {};
@@ -267,23 +244,37 @@ function genarate(value) {
       t: "n"
     };
     v = parseFloat(value);
-  } else if ((0, _validation.isdatetime)(value) && (value.toString().indexOf(".") > -1 || value.toString().indexOf(":") > -1 || value.toString().length < 16)) {
-    v = datenum_local(parseDate(value.toString().replace(/-/g, "/")));
-    if (v.toString().indexOf(".") > -1) {
-      if (value.toString().length > 18) {
-        ct.fa = "yyyy-MM-dd hh:mm:ss";
-      } else if (value.toString().length > 11) {
-        ct.fa = "yyyy-MM-dd hh:mm";
-      } else {
-        ct.fa = "yyyy-MM-dd";
-      }
+  } else if (typeof value === "string") {
+    var df = (0, _validation.detectDateFormat)(value.toString());
+    if (df) {
+      var dateObj = new Date(df.year, df.month - 1, df.day, df.hours, df.minutes, df.seconds);
+      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",
+        "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",
+        named: "dd/MM/yyyy"
+      };
+      ct.fa = map[df.formatType] || "dd/MM/yyyy";
+      m = _ssf.default.format(ct.fa, v);
     } else {
-      ct.fa = "yyyy-MM-dd";
+      m = value.toString();
+      ct.fa = "General";
+      ct.t = "g";
     }
-    ct.t = "d";
-    m = _ssf.default.format(ct.fa, v);
   } else {
-    m = value;
+    m = value.toString();
     ct.fa = "General";
     ct.t = "g";
   }

package/lib/modules/ssf.js

@@ -1370,7 +1370,7 @@ var make_ssf = function make_ssf(SSF) {
     if (typeof n !== "number" || !Number.isFinite(n)) return null;
     if (!Number.isInteger(n)) return null;
     if (n < 0) return null;
-    var minSec = 0; // 1970-01-01
+    var minSec = 100000; // Excel serial numbers max ~73050 for year 2100; avoids collision
     var maxSec = 4102444800; // ~2100-01-01
     var minMs = minSec * 1000;
     var maxMs = maxSec * 1000;

package/lib/modules/toolbar.js

@@ -66,21 +66,42 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
         } else {
           value = cell;
         }
+        var type = "n";
+        if ((0, _format.is_date)(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
+          type = "d";
+        } else if (foucsStatus === "@" || foucsStatus === 49) {
+          type = "s";
+        }
         if (_lodash.default.isNil(value)) {
+          if (!_lodash.default.isNil(d[r])) {
+            if (_lodash.default.isNil(d[r][c])) {
+              d[r][c] = {
+                ct: {
+                  fa: foucsStatus,
+                  t: type
+                }
+              };
+            } else if (_lodash.default.isPlainObject(d[r][c])) {
+              if (_lodash.default.isNil(d[r][c].ct)) d[r][c].ct = {};
+              d[r][c].ct.fa = foucsStatus;
+              d[r][c].ct.t = type;
+            }
+          }
           continue;
         }
         if (foucsStatus !== "@" && (0, _validation.isRealNum)(value)) {
           value = Number(value);
+        } else if (type === "d" && typeof value === "string") {
+          var dateInfo = (0, _validation.detectDateFormat)(value);
+          if (dateInfo) {
+            var dateObj = new Date(dateInfo.year, dateInfo.month - 1, dateInfo.day, dateInfo.hours, dateInfo.minutes, dateInfo.seconds);
+            value = (0, _format.datenum_local)(dateObj);
+          }
         }
-        var mask = (0, _format.update)(foucsStatus, value);
-        var type = "n";
-        if ((0, _format.is_date)(foucsStatus) || foucsStatus === 14 || foucsStatus === 15 || foucsStatus === 16 || foucsStatus === 17 || foucsStatus === 18 || foucsStatus === 19 || foucsStatus === 20 || foucsStatus === 21 || foucsStatus === 22 || foucsStatus === 45 || foucsStatus === 46 || foucsStatus === 47) {
-          type = "d";
-        } else if (foucsStatus === "@" || foucsStatus === 49) {
-          type = "s";
-        } else if (foucsStatus === "General" || foucsStatus === 0) {
+        if (foucsStatus === "General" || foucsStatus === 0) {
           type = (0, _validation.isRealNum)(value) ? "n" : "g";
         }
+        var mask = (0, _format.update)(foucsStatus, value);
         if (cell && _lodash.default.isPlainObject(cell)) {
           cell.m = "".concat(mask);
           if (_lodash.default.isNil(cell.ct)) {
@@ -88,7 +109,7 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
           }
           cell.ct.fa = foucsStatus;
           cell.ct.t = type;
-          cell.v = String(value);
+          cell.v = typeof value === "number" ? value : String(value);
           cell.fc = cell.fc || ((_f = (_e = (_d = cell.ct) === null || _d === void 0 ? void 0 : _d.s) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.fc);
           cell.bl = cell.bl || ((_j = (_h = (_g = cell.ct) === null || _g === void 0 ? void 0 : _g.s) === null || _h === void 0 ? void 0 : _h[0]) === null || _j === void 0 ? void 0 : _j.bl);
           cell.it = cell.it || ((_m = (_l = (_k = cell.ct) === null || _k === void 0 ? void 0 : _k.s) === null || _l === void 0 ? void 0 : _l[0]) === null || _m === void 0 ? void 0 : _m.it);
@@ -101,7 +122,7 @@ function updateFormatCell(ctx, d, attr, foucsStatus, row_st, row_ed, col_st, col
               fa: foucsStatus,
               t: type
             },
-            v: value,
+            v: typeof value === "number" ? value : value,
             m: mask
           };
         }

package/lib/modules/validation.d.ts

@@ -15,6 +15,16 @@ export declare function valueIsError(value: string): boolean;
 export declare function isRealNull(val: any): boolean;
 export declare function isHexValue(str: string): boolean;
 export declare function isRealNum(val: any): boolean;
+export type DateFormatInfo = {
+    year: number;
+    month: number;
+    day: number;
+    hours: number;
+    minutes: number;
+    seconds: number;
+    formatType: string;
+};
+export declare function detectDateFormat(str: string): DateFormatInfo | null;
 export declare function isdatetime(s: any): boolean;
 export declare function diff(now: any, then: any): number;
 export declare function isdatatypemulti(s: any): any;

package/lib/modules/validation.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.detectDateFormat = detectDateFormat;
 exports.detectErrorFromValue = detectErrorFromValue;
 exports.diff = diff;
 exports.errorMessagesFromValue = exports.error = void 0;
@@ -56,33 +57,294 @@ function isRealNum(val) {
   }
   return !Number.isNaN(Number(val));
 }
-function checkDateTime(str) {
-  var reg1 = /^(\d{4})-(\d{1,2})-(\d{1,2})(\s(\d{1,2}):(\d{1,2})(:(\d{1,2}))?)?$/;
-  var reg2 = /^(\d{4})\/(\d{1,2})\/(\d{1,2})(\s(\d{1,2}):(\d{1,2})(:(\d{1,2}))?)?$/;
-  if (!reg1.test(str) && !reg2.test(str)) {
-    return false;
+var MONTH_NAME_MAP = {
+  january: 1,
+  february: 2,
+  march: 3,
+  april: 4,
+  may: 5,
+  june: 6,
+  july: 7,
+  august: 8,
+  september: 9,
+  october: 10,
+  november: 11,
+  december: 12,
+  jan: 1,
+  feb: 2,
+  mar: 3,
+  apr: 4,
+  jun: 6,
+  jul: 7,
+  aug: 8,
+  sep: 9,
+  oct: 10,
+  nov: 11,
+  dec: 12
+};
+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";
+function isValidDateParts(year, month, day) {
+  if (year < 1900) return false;
+  if (month < 1 || month > 12) return false;
+  if (day < 1 || day > 31) return false;
+  if (month === 2) {
+    var isLeap = new Date(year, 1, 29).getDate() === 29;
+    if (isLeap && day > 29) return false;
+    if (!isLeap && day > 28) return false;
   }
-  var year = Number(RegExp.$1);
-  var month = Number(RegExp.$2);
-  var day = Number(RegExp.$3);
-  if (year < 1900) {
-    return false;
+  if ([4, 6, 9, 11].includes(month) && day > 30) return false;
+  return true;
+}
+function detectDateFormat(str) {
+  if (!str || str.toString().length < 5) return null;
+  var s = str.toString().trim();
+  var m;
+  m = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3],
+      h = +m[4],
+      mi = +m[5],
+      sec = m[6] != null ? +m[6] : 0;
+    if (isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: "yyyy-MM-ddTHH:mm"
+      };
+    }
   }
-  if (month > 12) {
-    return false;
+  m = /^(\d{4})-(\d{1,2})-(\d{1,2})(?:\s(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      var h = m[4] != null ? +m[4] : 0;
+      var mi = m[5] != null ? +m[5] : 0;
+      var sec = m[6] != null ? +m[6] : 0;
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: m[4] != null ? "yyyy-MM-dd HH:mm" : "yyyy-MM-dd"
+      };
+    }
   }
-  if (day > 31) {
-    return false;
+  m = /^(\d{4})\/(\d{1,2})\/(\d{1,2})(?:\s(\d{1,2}):(\d{2})(?::(\d{2}))?)?$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      var h = m[4] != null ? +m[4] : 0;
+      var mi = m[5] != null ? +m[5] : 0;
+      var sec = m[6] != null ? +m[6] : 0;
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: h,
+        minutes: mi,
+        seconds: sec,
+        formatType: m[4] != null ? "yyyy/MM/dd HH:mm" : "yyyy/MM/dd"
+      };
+    }
   }
-  if (month === 2) {
-    if (new Date(year, 1, 29).getDate() === 29 && day > 29) {
-      return false;
+  m = /^(\d{4})\.(\d{1,2})\.(\d{1,2})$/.exec(s);
+  if (m) {
+    var y = +m[1],
+      mo = +m[2],
+      d = +m[3];
+    if (isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "yyyy.MM.dd"
+      };
     }
-    if (new Date(year, 1, 29).getDate() !== 29 && day > 28) {
-      return false;
+  }
+  m = /^(\d{1,2})\/(\d{1,2})\/(\d{4})\s(\d{1,2}):(\d{2})\s?(AM|PM)$/i.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3],
+      h = +m[4],
+      mi = +m[5];
+    var ampm = m[6].toUpperCase();
+    if (p1 <= 12 && isValidDateParts(y, p1, p2)) {
+      var actualH = h;
+      if (ampm === "PM" && h !== 12) actualH = h + 12;
+      if (ampm === "AM" && h === 12) actualH = 0;
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: actualH,
+        minutes: mi,
+        seconds: 0,
+        formatType: "MM/dd/yyyy h:mm AM/PM"
+      };
     }
   }
-  return true;
+  m = /^(\d{1,2})\/(\d{1,2})\/(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd/MM/yyyy"
+      };
+    } else if (p2 > 12 && p1 <= 12 && isValidDateParts(y, p1, p2)) {
+      var formatType = m[1].length === 1 ? "M/d/yyyy" : "MM/dd/yyyy";
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: formatType
+      };
+    } else if (p1 <= 12 && p2 <= 31 && isValidDateParts(y, p1, p2)) {
+      var formatType = m[1].length === 1 ? "M/d/yyyy" : "MM/dd/yyyy";
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: formatType
+      };
+    }
+  }
+  m = /^(\d{2})\/(\d{2})\/(\d{2})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = 2000 + +m[3];
+    if (p1 <= 12 && p2 <= 31 && isValidDateParts(y, p1, p2)) {
+      return {
+        year: y,
+        month: p1,
+        day: p2,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "MM/dd/yy"
+      };
+    }
+  }
+  m = /^(\d{1,2})-(\d{1,2})-(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd-MM-yyyy"
+      };
+    }
+  }
+  m = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/.exec(s);
+  if (m) {
+    var p1 = +m[1],
+      p2 = +m[2],
+      y = +m[3];
+    if (p1 > 12 && isValidDateParts(y, p2, p1)) {
+      return {
+        year: y,
+        month: p2,
+        day: p1,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "dd.MM.yyyy"
+      };
+    }
+  }
+  m = new RegExp("^(".concat(MONTH_NAMES_RE, ")\\s+(\\d{1,2}),?\\s+(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var mo = MONTH_NAME_MAP[m[1].toLowerCase()];
+    var d = +m[2],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  m = new RegExp("^(\\d{1,2})\\s+(".concat(MONTH_NAMES_RE, ")\\s+(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var d = +m[1],
+      mo = MONTH_NAME_MAP[m[2].toLowerCase()],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  m = new RegExp("^(".concat(MONTH_ABBR_RE, ")-(\\d{1,2})-(\\d{4})$"), "i").exec(s);
+  if (m) {
+    var mo = MONTH_NAME_MAP[m[1].toLowerCase()];
+    var d = +m[2],
+      y = +m[3];
+    if (mo && isValidDateParts(y, mo, d)) {
+      return {
+        year: y,
+        month: mo,
+        day: d,
+        hours: 0,
+        minutes: 0,
+        seconds: 0,
+        formatType: "named"
+      };
+    }
+  }
+  return null;
+}
+function checkDateTime(str) {
+  return detectDateFormat(str) !== null;
 }
 function isdatetime(s) {
   if (s === null || s.toString().length < 5) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.3",
+  "version": "1.3.4-date-format-2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",