@fileverse-dev/fortune-core 1.3.11-mixed → 1.3.12-copyPaste-4

package/lib/modules/inline-string.js

@@ -307,6 +307,9 @@ function extendCssText(origin, cover, isLimit) {
   }
   return newCss;
 }
+function escapeHtmlAttr(s) {
+  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+}
 function updateInlineStringFormat(ctx, attr, value, cellInput) {
   var _a, _b, _c;
   var w = window.getSelection();
@@ -314,6 +317,34 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  if (range.startContainer === $textEditor && range.endContainer === $textEditor && range.collapsed === false) {
+    var start = range.startOffset;
+    var end = range.endOffset;
+    var children = Array.from($textEditor.childNodes).slice(start, end);
+    children.forEach(function (node) {
+      var _a, _b;
+      if (node.nodeType === Node.ELEMENT_NODE) {
+        var el = node;
+        if (el.tagName === "SPAN") {
+          var cssText = getCssText(el.style.cssText, attr, value);
+          el.setAttribute("style", cssText);
+        }
+      } else if (node.nodeType === Node.TEXT_NODE) {
+        var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
+        if (text.length === 0) return;
+        var wrapper = document.createElement("span");
+        var cssText = getCssText("", attr, value);
+        wrapper.setAttribute("style", cssText);
+        wrapper.textContent = text;
+        (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
+      }
+    });
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   if (range.collapsed === true) {
     return;
   }
@@ -351,7 +382,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(left, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(left, "</span>");
         }
         if (mid !== "") {
           var cssText = getCssText(span.style.cssText, attr, value);
@@ -361,7 +392,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(mid, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(mid, "</span>");
         }
         if (right !== "") {
           var cssText = span.style.cssText;
@@ -371,7 +402,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
               cssText = extendCssText(box.style.cssText, cssText);
             }
           }
-          cont += "<span style='".concat(cssText, "'>").concat(right, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
         if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
           spanIndex = _lodash.default.indexOf($textEditor.querySelectorAll("span"), span);
@@ -414,33 +445,33 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         for (var i = 0; i < startSpanIndex; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         if (sleft !== "") {
-          cont += "<span style='".concat(startSpan.style.cssText, "'>").concat(sleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\">").concat(sleft, "</span>");
         }
         if (sright !== "") {
           var cssText = getCssText(startSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(sright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(sright, "</span>");
         }
         if (startSpanIndex < endSpanIndex) {
           for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
             var span = spans[i];
             var content = span.innerHTML;
-            cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+            cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
           }
         }
         if (eleft !== "") {
           var cssText = getCssText(endSpan.style.cssText, attr, value);
-          cont += "<span style='".concat(cssText, "'>").concat(eleft, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(eleft, "</span>");
         }
         if (eright !== "") {
-          cont += "<span style='".concat(endSpan.style.cssText, "'>").concat(eright, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\">").concat(eright, "</span>");
         }
         for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
           var span = spans[i];
           var content = span.innerHTML;
-          cont += "<span style='".concat(span.style.cssText, "'>").concat(content, "</span>");
+          cont += "<span style=\"".concat(escapeHtmlAttr(span.style.cssText), "\">").concat(content, "</span>");
         }
         $textEditor.innerHTML = cont;
         var startSeletedNodeIndex = void 0;
@@ -458,13 +489,10 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
     }
   }
 }
-function escapeHtmlAttr(s) {
-  return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-}
 function getLinkDataAttrs(span) {
   var _a, _b;
   if (((_a = span.dataset) === null || _a === void 0 ? void 0 : _a.linkType) && ((_b = span.dataset) === null || _b === void 0 ? void 0 : _b.linkAddress)) {
-    return " data-link-type='".concat(escapeHtmlAttr(span.dataset.linkType), "' data-link-address='").concat(escapeHtmlAttr(span.dataset.linkAddress), "'");
+    return " data-link-type=\"".concat(escapeHtmlAttr(span.dataset.linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(span.dataset.linkAddress), "\"");
   }
   return "";
 }
@@ -502,7 +530,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(left, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(left, "</span>");
     }
     if (mid !== "") {
       var cssText = getLinkStyleCssText(span.style.cssText);
@@ -510,7 +538,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(mid, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(mid, "</span>");
     }
     if (right !== "") {
       var cssText = span.style.cssText;
@@ -518,7 +546,7 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
         var box = span.closest("#luckysheet-input-box");
         if (box != null) cssText = extendCssText(box.style.cssText, cssText);
       }
-      cont += "<span style='".concat(cssText, "'").concat(dataAttrs, ">").concat(right, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\"").concat(dataAttrs, ">").concat(right, "</span>");
     }
     if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
       span.outerHTML = cont;
@@ -548,32 +576,32 @@ function applyLinkToSelection(cellInput, linkType, linkAddress) {
     var cont = "";
     for (var i = 0; i < startSpanIndex; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     if (sleft !== "") {
-      cont += "<span style='".concat(startSpan.style.cssText, "'").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(startSpan.style.cssText), "\"").concat(getLinkDataAttrs(startSpan), ">").concat(sleft, "</span>");
     }
     if (sright !== "") {
       var cssText = getLinkStyleCssText(startSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sright, "</span>");
     }
     if (startSpanIndex < endSpanIndex) {
       for (var i = startSpanIndex + 1; i < endSpanIndex; i += 1) {
         var sp = spans[i];
         var cssText = getLinkStyleCssText(sp.style.cssText);
-        cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(sp.innerHTML, "</span>");
+        cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(sp.innerHTML, "</span>");
       }
     }
     if (eleft !== "") {
       var cssText = getLinkStyleCssText(endSpan.style.cssText);
-      cont += "<span style='".concat(cssText, "' data-link-type='").concat(escapeHtmlAttr(linkType), "' data-link-address='").concat(escapeHtmlAttr(linkAddress), "'>").concat(eleft, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\" data-link-type=\"").concat(escapeHtmlAttr(linkType), "\" data-link-address=\"").concat(escapeHtmlAttr(linkAddress), "\">").concat(eleft, "</span>");
     }
     if (eright !== "") {
-      cont += "<span style='".concat(endSpan.style.cssText, "'").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(endSpan.style.cssText), "\"").concat(getLinkDataAttrs(endSpan), ">").concat(eright, "</span>");
     }
     for (var i = endSpanIndex + 1; i < spans.length; i += 1) {
       var sp = spans[i];
-      cont += "<span style='".concat(sp.style.cssText, "'").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
+      cont += "<span style=\"".concat(escapeHtmlAttr(sp.style.cssText), "\"").concat(getLinkDataAttrs(sp), ">").concat(sp.innerHTML, "</span>");
     }
     $textEditor.innerHTML = cont;
     spans = $textEditor.querySelectorAll("span");

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/lib/types.d.ts

@@ -328,8 +328,6 @@ export type GlobalCache = {
     verticalScrollLock?: boolean;
     horizontalScrollLock?: boolean;
     overwriteCell?: boolean;
-    overwriteCellFirstChar?: string;
-    enteredEditByTyping?: boolean;
     ignoreWriteCell?: boolean;
     doNotFocus?: boolean;
     doNotUpdateCell?: boolean;

package/package.json

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