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

package/es/modules/validation.js

@@ -39,33 +39,296 @@ 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];
+    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;
 }
 export function isdatetime(s) {
   if (s === null || s.toString().length < 5) {

package/es/paste-table-helpers.js

@@ -12,7 +12,6 @@ var __assign = this && this.__assign || function () {
 import _ from "lodash";
 import { locale } from "./locale";
 import { getQKBorder, saveHyperlink } from "./modules";
-import { genarate } from "./modules/format";
 import { getSheetIndex } from "./utils";
 import { setRowHeight, setColumnWidth } from "./api";
 export var DEFAULT_FONT_SIZE = 12;
@@ -127,8 +126,7 @@ function brToNewline(str) {
   return str.replace(/<br\s*\/?>/gi, "\n");
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
-  var _a;
-  var _b, _c, _d, _e;
+  var _a, _b, _c, _d;
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -146,22 +144,24 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
       })
     });
   } else {
-    var mask = genarate(rawText);
-    _a = mask || [], cell.m = _a[0], cell.ct = _a[1], cell.v = _a[2];
+    cell.v = rawText;
+    cell.m = rawText;
+    cell.ct = {
+      fa: "General",
+      t: "g"
+    };
     if (HEX_REGEX.test(rawText)) {
       cell.ct = {
         fa: "@",
         t: "s"
       };
-      cell.m = rawText;
-      cell.v = rawText;
     }
   }
-  if (((_b = td.style) === null || _b === void 0 ? void 0 : _b.alignItems) === "center") {
+  if (((_a = td.style) === null || _a === void 0 ? void 0 : _a.alignItems) === "center") {
     cell.vt = 0;
-  } else if (((_c = td.style) === null || _c === void 0 ? void 0 : _c.alignItems) === "flex-end") {
+  } else if (((_b = td.style) === null || _b === void 0 ? void 0 : _b.alignItems) === "flex-end") {
     cell.vt = 2;
-  } else if (((_d = td.style) === null || _d === void 0 ? void 0 : _d.alignItems) === "flex-start") {
+  } else if (((_c = td.style) === null || _c === void 0 ? void 0 : _c.alignItems) === "flex-start") {
     cell.vt = 1;
   }
   var styleBlock = typeof classStyles[".".concat(td.className)] === "string" ? classStyles[".".concat(td.className)] : "";
@@ -188,7 +188,7 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   } else {
     cell.ht = 1;
   }
-  if (((_e = td === null || td === void 0 ? void 0 : td.style) === null || _e === void 0 ? void 0 : _e["overflow-wrap"]) === "anywhere") {
+  if (((_d = td === null || td === void 0 ? void 0 : td.style) === null || _d === void 0 ? void 0 : _d["overflow-wrap"]) === "anywhere") {
     cell.tb = "2";
   } else {
     cell.tb = "2";

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

@@ -220,14 +220,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") {
@@ -276,7 +275,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)];
           }
@@ -287,7 +286,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;
@@ -314,7 +313,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;
@@ -346,7 +345,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];
@@ -387,9 +386,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;
           }
@@ -418,8 +431,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);
@@ -168,6 +168,9 @@ function setCellValue(ctx, r, c, d, v) {
       if (!_lodash.default.isNil(v.ct)) {
         cell.ct = v.ct;
       }
+      if (!_lodash.default.isNil(v.ht)) {
+        cell.ht = v.ht;
+      }
     }
     if (_lodash.default.isPlainObject(v.v)) {
       vupdate = v.v.v;
@@ -309,10 +312,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,12 +322,16 @@ function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        cell.ht = 2;
       }
       var mask = (0, _format.update)(fa, vupdate);
       if (mask === vupdate) {
         mask = (0, _format.genarate)(vupdate);
         cell.m = mask[0].toString();
         cell.ct = mask[1], cell.v = mask[2];
+        if ((0, _validation.isRealNum)(vupdate)) {
+          cell.ht = 2;
+        }
       } else {
         if (v.m) {
           cell.m = v.m;
@@ -350,7 +354,7 @@ 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;
+        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 = String(value);
+      ct.fa = "General";
+      ct.t = "g";
     }
-    ct.t = "d";
-    m = _ssf.default.format(ct.fa, v);
   } else {
-    m = value;
+    m = String(value);
     ct.fa = "General";
     ct.t = "g";
   }