@fileverse-dev/fortune-core 1.3.5-hyper-2 → 1.3.6-right

package/lib/modules/selection.js

@@ -1576,6 +1576,8 @@ function deleteSelectedCellText(ctx) {
             var cell = d[r][c];
             delete cell.m;
             delete cell.v;
+            delete cell.fc;
+            delete cell.un;
             if (cell.f != null) {
               delete cell.f;
               (0, _formula.delFunctionGroup)(ctx, r, c, ctx.currentSheetId);
@@ -1648,7 +1650,8 @@ function deleteSelectedCellFormat(ctx) {
   return "success";
 }
 function fillRightData(ctx) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1676,18 +1679,109 @@ function fillRightData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
+      var sheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+      var file = sheetIndex != null ? ctx.luckysheetfile[sheetIndex] : null;
+      var dataVerification = file === null || file === void 0 ? void 0 : file.dataVerification;
+      var hyperlink = file === null || file === void 0 ? void 0 : file.hyperlink;
+      var cdformat = file === null || file === void 0 ? void 0 : file.luckysheet_conditionformat_save;
       var isSingleCell = r1 === r2 && c1 === c2;
       if (isSingleCell) {
         if (c1 - 1 >= 0 && d[r1]) {
+          var srcRow = r1;
+          var srcCol = c1 - 1;
           var prev = d[r1][c1 - 1];
           d[r1][c1] = prev != null ? __assign({}, prev) : {};
+          if (file != null) {
+            var srcKey = "".concat(srcRow, "_").concat(srcCol);
+            var tgtKey = "".concat(r1, "_").concat(c1);
+            if (dataVerification != null) {
+              var dv = dataVerification[srcKey];
+              if (dv != null) {
+                console.log("[fillRightData] dataVerification copy from", {
+                  row: srcRow,
+                  col: srcCol
+                }, "→", {
+                  row: r1,
+                  col: c1
+                }, dv);
+                file.dataVerification = __assign(__assign({}, file.dataVerification || {}), (_a = {}, _a[tgtKey] = _lodash.default.cloneDeep(dv), _a));
+              }
+            }
+            if (hyperlink != null && hyperlink[srcKey] != null) {
+              file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_b = {}, _b[tgtKey] = _lodash.default.cloneDeep(hyperlink[srcKey]), _b));
+              var tgtCell = d[r1][c1];
+              if (tgtCell != null) tgtCell.hl = {
+                r: r1,
+                c: c1,
+                id: ctx.currentSheetId
+              };
+            }
+            if (cdformat != null && cdformat.length > 0) {
+              for (var i = 0; i < cdformat.length; i += 1) {
+                var ranges = cdformat[i].cellrange;
+                if (!ranges) continue;
+                for (var j = 0; j < ranges.length; j += 1) {
+                  var cr = ranges[j];
+                  if (srcRow >= cr.row[0] && srcRow <= cr.row[1] && srcCol >= cr.column[0] && srcCol <= cr.column[1]) {
+                    ranges.push({
+                      row: [r1, r1],
+                      column: [c1, c1]
+                    });
+                    break;
+                  }
+                }
+              }
+            }
+          }
         }
       } else {
         for (var r = r1; r <= r2; r += 1) {
-          var sourceCell = (_a = d[r]) === null || _a === void 0 ? void 0 : _a[c1];
+          var sourceCell = (_e = d[r]) === null || _e === void 0 ? void 0 : _e[c1];
           for (var c = c1 + 1; c <= c2; c += 1) {
             if (d[r]) {
-              d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+              d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_f = d[r][c]) !== null && _f !== void 0 ? _f : {};
+            }
+            if (file != null) {
+              var srcKey = "".concat(r, "_").concat(c1);
+              var tgtKey = "".concat(r, "_").concat(c);
+              if (dataVerification != null) {
+                var dv = dataVerification[srcKey];
+                if (dv != null) {
+                  console.log("[fillRightData] dataVerification copy from", {
+                    row: r,
+                    col: c1
+                  }, "→", {
+                    row: r,
+                    col: c
+                  }, dv);
+                  file.dataVerification = __assign(__assign({}, file.dataVerification || {}), (_c = {}, _c[tgtKey] = _lodash.default.cloneDeep(dv), _c));
+                }
+              }
+              if (hyperlink != null && hyperlink[srcKey] != null) {
+                file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_d = {}, _d[tgtKey] = _lodash.default.cloneDeep(hyperlink[srcKey]), _d));
+                var tgtCell = (_g = d[r]) === null || _g === void 0 ? void 0 : _g[c];
+                if (tgtCell != null) tgtCell.hl = {
+                  r: r,
+                  c: c,
+                  id: ctx.currentSheetId
+                };
+              }
+              if (cdformat != null && cdformat.length > 0) {
+                for (var i = 0; i < cdformat.length; i += 1) {
+                  var ranges = cdformat[i].cellrange;
+                  if (!ranges) continue;
+                  for (var j = 0; j < ranges.length; j += 1) {
+                    var cr = ranges[j];
+                    if (r >= cr.row[0] && r <= cr.row[1] && c1 >= cr.column[0] && c1 <= cr.column[1]) {
+                      ranges.push({
+                        row: [r, r],
+                        column: [c, c]
+                      });
+                      break;
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -1697,7 +1791,8 @@ function fillRightData(ctx) {
   return "success";
 }
 function fillDownData(ctx) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = (0, _utils.isAllowEdit)(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1725,19 +1820,110 @@ function fillDownData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
+      var sheetIndex = (0, _utils.getSheetIndex)(ctx, ctx.currentSheetId);
+      var file = sheetIndex != null ? ctx.luckysheetfile[sheetIndex] : null;
+      var dataVerification = file === null || file === void 0 ? void 0 : file.dataVerification;
+      var hyperlink = file === null || file === void 0 ? void 0 : file.hyperlink;
+      var cdformat = file === null || file === void 0 ? void 0 : file.luckysheet_conditionformat_save;
       var isSingleCell = r1 === r2 && c1 === c2;
       if (isSingleCell) {
         if (r1 - 1 >= 0 && d[r1 - 1]) {
+          var srcRow = r1 - 1;
+          var srcCol = c1;
           var prev = d[r1 - 1][c1];
           if (!d[r1]) d[r1] = [];
           d[r1][c1] = prev != null ? __assign({}, prev) : {};
+          if (file != null) {
+            var srcKey = "".concat(srcRow, "_").concat(srcCol);
+            var tgtKey = "".concat(r1, "_").concat(c1);
+            if (dataVerification != null) {
+              var dv = dataVerification[srcKey];
+              if (dv != null) {
+                console.log("[fillDownData] dataVerification copy from", {
+                  row: srcRow,
+                  col: srcCol
+                }, "→", {
+                  row: r1,
+                  col: c1
+                }, dv);
+                file.dataVerification = __assign(__assign({}, file.dataVerification || {}), (_a = {}, _a[tgtKey] = _lodash.default.cloneDeep(dv), _a));
+              }
+            }
+            if (hyperlink != null && hyperlink[srcKey] != null) {
+              file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_b = {}, _b[tgtKey] = _lodash.default.cloneDeep(hyperlink[srcKey]), _b));
+              var tgtCell = d[r1][c1];
+              if (tgtCell != null) tgtCell.hl = {
+                r: r1,
+                c: c1,
+                id: ctx.currentSheetId
+              };
+            }
+            if (cdformat != null && cdformat.length > 0) {
+              for (var i = 0; i < cdformat.length; i += 1) {
+                var ranges = cdformat[i].cellrange;
+                if (!ranges) continue;
+                for (var j = 0; j < ranges.length; j += 1) {
+                  var cr = ranges[j];
+                  if (srcRow >= cr.row[0] && srcRow <= cr.row[1] && srcCol >= cr.column[0] && srcCol <= cr.column[1]) {
+                    ranges.push({
+                      row: [r1, r1],
+                      column: [c1, c1]
+                    });
+                    break;
+                  }
+                }
+              }
+            }
+          }
         }
       } else {
         for (var c = c1; c <= c2; c += 1) {
-          var sourceCell = (_a = d[r1]) === null || _a === void 0 ? void 0 : _a[c];
+          var sourceCell = (_e = d[r1]) === null || _e === void 0 ? void 0 : _e[c];
           for (var r = r1 + 1; r <= r2; r += 1) {
             if (!d[r]) d[r] = [];
-            d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_b = d[r][c]) !== null && _b !== void 0 ? _b : {};
+            d[r][c] = sourceCell != null ? __assign({}, sourceCell) : (_f = d[r][c]) !== null && _f !== void 0 ? _f : {};
+            if (file != null) {
+              var srcKey = "".concat(r1, "_").concat(c);
+              var tgtKey = "".concat(r, "_").concat(c);
+              if (dataVerification != null) {
+                var dv = dataVerification[srcKey];
+                if (dv != null) {
+                  console.log("[fillDownData] dataVerification copy from", {
+                    row: r1,
+                    col: c
+                  }, "→", {
+                    row: r,
+                    col: c
+                  }, dv);
+                  file.dataVerification = __assign(__assign({}, file.dataVerification || {}), (_c = {}, _c[tgtKey] = _lodash.default.cloneDeep(dv), _c));
+                }
+              }
+              if (hyperlink != null && hyperlink[srcKey] != null) {
+                file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_d = {}, _d[tgtKey] = _lodash.default.cloneDeep(hyperlink[srcKey]), _d));
+                var tgtCell = (_g = d[r]) === null || _g === void 0 ? void 0 : _g[c];
+                if (tgtCell != null) tgtCell.hl = {
+                  r: r,
+                  c: c,
+                  id: ctx.currentSheetId
+                };
+              }
+              if (cdformat != null && cdformat.length > 0) {
+                for (var i = 0; i < cdformat.length; i += 1) {
+                  var ranges = cdformat[i].cellrange;
+                  if (!ranges) continue;
+                  for (var j = 0; j < ranges.length; j += 1) {
+                    var cr = ranges[j];
+                    if (r1 >= cr.row[0] && r1 <= cr.row[1] && c >= cr.column[0] && c <= cr.column[1]) {
+                      ranges.push({
+                        row: [r, r],
+                        column: [c, c]
+                      });
+                      break;
+                    }
+                  }
+                }
+              }
+            }
           }
         }
       }

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

@@ -36,8 +36,8 @@ var _context = require("../context");
 var _utils = require("../utils");
 var _cell = require("./cell");
 var _color = require("./color");
-var _format = require("./format");
 var _cursor = require("./cursor");
+var _format = require("./format");
 var _formula2 = require("./formula");
 var _inlineString = require("./inline-string");
 var _location = require("./location");
@@ -67,21 +67,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)) {
@@ -89,7 +110,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);
@@ -102,7 +123,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,296 @@ 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];
+    var mo = +m[2];
+    var d = +m[3];
+    var h = +m[4];
+    var mi = +m[5];
+    var 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];
+    var mo = +m[2];
+    var 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];
+    var mo = +m[2];
+    var 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];
+    var mo = +m[2];
+    var 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];
+    var p2 = +m[2];
+    var y = +m[3];
+    var h = +m[4];
+    var 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];
+    var p2 = +m[2];
+    var 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"
+      };
+    }
+    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
+      };
+    }
+    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];
+    var p2 = +m[2];
+    var 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];
+    var p2 = +m[2];
+    var 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];
+    var p2 = +m[2];
+    var 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];
+    var 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];
+    var mo = MONTH_NAME_MAP[m[2].toLowerCase()];
+    var 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];
+    var 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) {