@fileverse-dev/fortune-core 1.3.12-mixed-a → 1.3.13

package/es/modules/cell.js

@@ -1041,7 +1041,7 @@ export function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
     if (key === "it" && valueNum !== 0) {
       style.fontStyle = "italic";
     }
-    if (key === "fs" && valueNum !== 10) {
+    if (key === "fs" && !_.isNil(value)) {
       style.fontSize = "".concat(valueNum, "pt");
     }
     if (key === "fc" && value !== "#000000" || ((_a = checksAF === null || checksAF === void 0 ? void 0 : checksAF.length) !== null && _a !== void 0 ? _a : 0) > 0 || (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor)) {

package/es/modules/selection.js

@@ -1186,7 +1186,7 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
     cpdata += "<tr height=".concat(rowLen, "px >");
     var _loop_3 = function _loop_3(j) {
       var c = colIndexArr[j];
-      var column = '<td ${span} style="${style}">';
+      var column = '<td ${span} style="${style}" data-fortune-cell="${cellData}">';
       var cell = (_f = d[r]) === null || _f === void 0 ? void 0 : _f[c];
       if (cell != null) {
         var style = "";
@@ -1397,9 +1397,14 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
             }
           }
         }
+        var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell), {
+          _srcRow: r,
+          _srcCol: c
+        })));
         column = replaceHtml(column, {
           style: style,
-          span: span
+          span: span,
+          cellData: cellData
         });
         if (_.isNil(c_value)) {
           c_value = getCellValue(r, c, d);
@@ -1449,7 +1454,8 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
         }
         column = replaceHtml(column, {
           style: style,
-          span: ""
+          span: "",
+          cellData: ""
         });
         column += "";
       }

package/es/paste-table-helpers.js

@@ -9,11 +9,20 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
 import _ from "lodash";
 import { locale } from "./locale";
 import { getQKBorder, saveHyperlink } from "./modules";
 import { getSheetIndex } from "./utils";
 import { setRowHeight, setColumnWidth } from "./api";
+import { adjustFormulaForPaste } from "./events/paste";
 export var DEFAULT_FONT_SIZE = 12;
 var parseStylesheetPairs = function parseStylesheetPairs(styleInner) {
   var patternReg = /{([^}]*)}/g;
@@ -127,6 +136,28 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a, _b, _c, _d;
+  var fortuneCellAttr = td.getAttribute("data-fortune-cell");
+  if (fortuneCellAttr) {
+    try {
+      var _e = JSON.parse(decodeURIComponent(fortuneCellAttr)),
+        _srcRow = _e._srcRow,
+        _srcCol = _e._srcCol,
+        parsed = __rest(_e, ["_srcRow", "_srcCol"]);
+      var cell_1 = parsed;
+      delete cell_1.mc;
+      delete cell_1.hl;
+      var rowspan_1 = parseInt(td.getAttribute("rowspan") || "1", 10);
+      var colspan_1 = parseInt(td.getAttribute("colspan") || "1", 10);
+      return {
+        cell: cell_1,
+        rowspan: Number.isNaN(rowspan_1) ? 1 : rowspan_1,
+        colspan: Number.isNaN(colspan_1) ? 1 : colspan_1,
+        hyperlink: detectHyperlink(td),
+        srcRow: _srcRow,
+        srcCol: _srcCol
+      };
+    } catch (_f) {}
+  }
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -277,10 +308,17 @@ export function handlePastedTable(ctx, html, pasteHandler) {
         cell = _a.cell,
         rowspan = _a.rowspan,
         colspan = _a.colspan,
-        hyperlink = _a.hyperlink;
+        hyperlink = _a.hyperlink,
+        srcRow = _a.srcRow,
+        srcCol = _a.srcCol;
       var anchorCol = ctx.luckysheet_select_save[0].column[0];
       var absoluteRow = anchorRow + localRowIndex;
       var absoluteCol = anchorCol + localColIndex;
+      if (cell.f && srcRow != null && srcCol != null) {
+        try {
+          cell.f = adjustFormulaForPaste(cell.f, srcCol, srcRow, absoluteCol, absoluteRow);
+        } catch (_b) {}
+      }
       pastedMatrix[localRowIndex][localColIndex] = cell;
       if (hyperlink) {
         saveHyperlink(ctx, absoluteRow, absoluteCol, hyperlink.href, "webpage", hyperlink.display);

package/lib/modules/cell.js

@@ -1074,7 +1074,7 @@ function getFontStyleByCell(cell, checksAF, checksCF, isCheck) {
     if (key === "it" && valueNum !== 0) {
       style.fontStyle = "italic";
     }
-    if (key === "fs" && valueNum !== 10) {
+    if (key === "fs" && !_lodash.default.isNil(value)) {
       style.fontSize = "".concat(valueNum, "pt");
     }
     if (key === "fc" && value !== "#000000" || ((_a = checksAF === null || checksAF === void 0 ? void 0 : checksAF.length) !== null && _a !== void 0 ? _a : 0) > 0 || (checksCF === null || checksCF === void 0 ? void 0 : checksCF.textColor)) {

package/lib/modules/selection.js

@@ -1221,7 +1221,7 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
     cpdata += "<tr height=".concat(rowLen, "px >");
     var _loop_3 = function _loop_3(j) {
       var c = colIndexArr[j];
-      var column = '<td ${span} style="${style}">';
+      var column = '<td ${span} style="${style}" data-fortune-cell="${cellData}">';
       var cell = (_f = d[r]) === null || _f === void 0 ? void 0 : _f[c];
       if (cell != null) {
         var style = "";
@@ -1432,9 +1432,14 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
             }
           }
         }
+        var cellData = encodeURIComponent(JSON.stringify(__assign(__assign({}, cell), {
+          _srcRow: r,
+          _srcCol: c
+        })));
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: span
+          span: span,
+          cellData: cellData
         });
         if (_lodash.default.isNil(c_value)) {
           c_value = (0, _cell.getCellValue)(r, c, d);
@@ -1484,7 +1489,8 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
         }
         column = (0, _utils.replaceHtml)(column, {
           style: style,
-          span: ""
+          span: "",
+          cellData: ""
         });
         column += "";
       }

package/lib/paste-table-helpers.js

@@ -10,6 +10,7 @@ var _locale = require("./locale");
 var _modules = require("./modules");
 var _utils = require("./utils");
 var _api = require("./api");
+var _paste = require("./events/paste");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var __assign = void 0 && (void 0).__assign || function () {
@@ -22,6 +23,14 @@ var __assign = void 0 && (void 0).__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
 var DEFAULT_FONT_SIZE = exports.DEFAULT_FONT_SIZE = 12;
 var parseStylesheetPairs = function parseStylesheetPairs(styleInner) {
   var patternReg = /{([^}]*)}/g;
@@ -135,6 +144,28 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a, _b, _c, _d;
+  var fortuneCellAttr = td.getAttribute("data-fortune-cell");
+  if (fortuneCellAttr) {
+    try {
+      var _e = JSON.parse(decodeURIComponent(fortuneCellAttr)),
+        _srcRow = _e._srcRow,
+        _srcCol = _e._srcCol,
+        parsed = __rest(_e, ["_srcRow", "_srcCol"]);
+      var cell_1 = parsed;
+      delete cell_1.mc;
+      delete cell_1.hl;
+      var rowspan_1 = parseInt(td.getAttribute("rowspan") || "1", 10);
+      var colspan_1 = parseInt(td.getAttribute("colspan") || "1", 10);
+      return {
+        cell: cell_1,
+        rowspan: Number.isNaN(rowspan_1) ? 1 : rowspan_1,
+        colspan: Number.isNaN(colspan_1) ? 1 : colspan_1,
+        hyperlink: detectHyperlink(td),
+        srcRow: _srcRow,
+        srcCol: _srcCol
+      };
+    } catch (_f) {}
+  }
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -285,10 +316,17 @@ function handlePastedTable(ctx, html, pasteHandler) {
         cell = _a.cell,
         rowspan = _a.rowspan,
         colspan = _a.colspan,
-        hyperlink = _a.hyperlink;
+        hyperlink = _a.hyperlink,
+        srcRow = _a.srcRow,
+        srcCol = _a.srcCol;
       var anchorCol = ctx.luckysheet_select_save[0].column[0];
       var absoluteRow = anchorRow + localRowIndex;
       var absoluteCol = anchorCol + localColIndex;
+      if (cell.f && srcRow != null && srcCol != null) {
+        try {
+          cell.f = (0, _paste.adjustFormulaForPaste)(cell.f, srcCol, srcRow, absoluteCol, absoluteRow);
+        } catch (_b) {}
+      }
       pastedMatrix[localRowIndex][localColIndex] = cell;
       if (hyperlink) {
         (0, _modules.saveHyperlink)(ctx, absoluteRow, absoluteCol, hyperlink.href, "webpage", hyperlink.display);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.12-mixed-a",
+  "version": "1.3.13",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",