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

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,6 +1615,8 @@ export function deleteSelectedCellFormat(ctx) {
   return "success";
 }
 export function fillRightData(ctx) {
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1640,10 +1644,111 @@ export function fillRightData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 1) {
-        for (var c = c1; c <= c2; c += 1) {
-          var previousCell = d[r][c - 1];
-          d[r][c] = __assign({}, previousCell);
+      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 = (_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) : (_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;
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       }
     }
@@ -1651,6 +1756,8 @@ export function fillRightData(ctx) {
   return "success";
 }
 export function fillDownData(ctx) {
+  var _a, _b, _c, _d;
+  var _e, _f, _g;
   var allowEdit = isAllowEdit(ctx);
   if (allowEdit === false) {
     return "allowEdit";
@@ -1678,10 +1785,111 @@ export function fillDownData(ctx) {
       var r2 = selection[s].row[1];
       var c1 = selection[s].column[0];
       var c2 = selection[s].column[1];
-      for (var r = r1; r <= r2; r += 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 previousCell = d[r - 1][c];
-          d[r][c] = __assign({}, previousCell);
+          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) : (_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
           };
         }
@@ -995,11 +1016,11 @@ export function handleLink(ctx, cellInput) {
       }
     }
   }
-  showLinkCard(ctx, r, c, true, false, {
+  showLinkCard(ctx, r, c, {
     applyToSelection: applyToSelection || undefined,
     originText: originText,
     selectionOffsets: selectionOffsets
-  });
+  }, true, false);
 }
 var handlerMap = {
   "currency-format": handleCurrencyFormat,

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;