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

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";
@@ -207,14 +207,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") {
@@ -263,7 +262,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)];
           }
@@ -274,7 +273,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;
@@ -301,7 +300,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;
@@ -333,7 +332,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];
@@ -374,9 +373,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;
           }
@@ -405,8 +418,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);
@@ -135,6 +135,9 @@ export function setCellValue(ctx, r, c, d, v) {
       if (!_.isNil(v.ct)) {
         cell.ct = v.ct;
       }
+      if (!_.isNil(v.ht)) {
+        cell.ht = v.ht;
+      }
     }
     if (_.isPlainObject(v.v)) {
       vupdate = v.v.v;
@@ -276,10 +279,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,12 +289,16 @@ export function setCellValue(ctx, r, c, d, v) {
             t: "n"
           });
         }
+        cell.ht = 2;
       }
       var mask = update(fa, vupdate);
       if (mask === vupdate) {
         mask = genarate(vupdate);
         cell.m = mask[0].toString();
         cell.ct = mask[1], cell.v = mask[2];
+        if (isRealNum(vupdate)) {
+          cell.ht = 2;
+        }
       } else {
         if (v.m) {
           cell.m = v.m;
@@ -317,7 +321,7 @@ 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;
+        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 = String(value);
+      ct.fa = "General";
+      ct.t = "g";
     }
-    ct.t = "d";
-    m = SSF.format(ct.fa, v);
   } else {
-    m = value;
+    m = String(value);
     ct.fa = "General";
     ct.t = "g";
   }

package/es/modules/selection.js

@@ -1541,6 +1541,8 @@ export 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;
               delFunctionGroup(ctx, r, c, ctx.currentSheetId);
@@ -1613,7 +1615,8 @@ export function deleteSelectedCellFormat(ctx) {
   return "success";
 }
 export function fillRightData(ctx) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1641,18 +1644,109 @@ export function fillRightData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
+      var sheetIndex = 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] = _.cloneDeep(dv), _a));
+              }
+            }
+            if (hyperlink != null && hyperlink[srcKey] != null) {
+              file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_b = {}, _b[tgtKey] = _.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] = _.cloneDeep(dv), _c));
+                }
+              }
+              if (hyperlink != null && hyperlink[srcKey] != null) {
+                file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_d = {}, _d[tgtKey] = _.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;
+                    }
+                  }
+                }
+              }
             }
           }
         }
@@ -1662,7 +1756,8 @@ export function fillRightData(ctx) {
   return "success";
 }
 export function fillDownData(ctx) {
-  var _a, _b;
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1690,19 +1785,110 @@ export function fillDownData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
+      var sheetIndex = 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] = _.cloneDeep(dv), _a));
+              }
+            }
+            if (hyperlink != null && hyperlink[srcKey] != null) {
+              file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_b = {}, _b[tgtKey] = _.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] = _.cloneDeep(dv), _c));
+                }
+              }
+              if (hyperlink != null && hyperlink[srcKey] != null) {
+                file.hyperlink = __assign(__assign({}, file.hyperlink || {}), (_d = {}, _d[tgtKey] = _.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/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,14 +4,14 @@ 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 { getSelectionCharacterOffsets } from "./cursor";
+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";
@@ -34,21 +34,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)) {
@@ -56,7 +77,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);
@@ -69,7 +90,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;