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

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);
@@ -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

@@ -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;