@fileverse-dev/fortune-core 1.3.13-create-1 → 1.3.13-create-3

package/es/events/paste.js

@@ -1446,28 +1446,91 @@ function shouldHandleNonTableHtml(html) {
   if (!html || /<table[\s/>]/i.test(html)) return false;
   return /<[a-z]/i.test(html);
 }
-function convertNonTableHtmlToTable(html) {
+function convertAnyHtmlToTable(html) {
   var container = document.createElement("div");
   container.innerHTML = html;
   var rows = [];
-  container.querySelectorAll("p").forEach(function (p) {
-    var _a;
-    if ((_a = p.textContent) === null || _a === void 0 ? void 0 : _a.trim()) {
-      rows.push("<tr><td>".concat(p.innerHTML, "</td></tr>"));
+  var currentParts = [];
+  var BLOCK_TAGS = new Set(["P", "DIV", "SECTION", "ARTICLE", "ASIDE", "HEADER", "FOOTER", "MAIN", "NAV", "BLOCKQUOTE", "PRE", "H1", "H2", "H3", "H4", "H5", "H6", "UL", "OL", "LI", "DL", "DT", "DD", "TABLE", "THEAD", "TBODY", "TFOOT", "TR", "TD", "TH", "HR"]);
+  var SKIP_TAGS = new Set(["SCRIPT", "STYLE", "NOSCRIPT", "META", "LINK", "HEAD", "SVG", "CANVAS", "IFRAME", "OBJECT"]);
+  var escapeHtml = function escapeHtml(text) {
+    return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+  };
+  var normalizeText = function normalizeText(text) {
+    return text.replace(/\u00A0/g, " ").replace(/\s+/g, " ");
+  };
+  var flushRow = function flushRow() {
+    var htmlContent = currentParts.join("").trim();
+    var textOnly = htmlContent.replace(/<br\s*\/?>/gi, "").replace(/&nbsp;/gi, " ").replace(/\s+/g, " ").trim();
+    if (textOnly) {
+      rows.push("<tr><td>".concat(htmlContent, "</td></tr>"));
     }
-  });
-  if (rows.length === 0) {
-    container.querySelectorAll("li").forEach(function (li) {
-      var _a;
-      if (!li.querySelector("p") && ((_a = li.textContent) === null || _a === void 0 ? void 0 : _a.trim())) {
-        rows.push("<tr><td>".concat(li.innerHTML, "</td></tr>"));
+    currentParts = [];
+  };
+  var appendText = function appendText(text) {
+    var normalized = normalizeText(text);
+    if (!normalized.trim()) return;
+    var prev = currentParts[currentParts.length - 1] || "";
+    var needsSpace = prev && !prev.endsWith(" ") && !prev.endsWith("<br>") && !/>\s*$/.test(prev);
+    currentParts.push((needsSpace ? " " : "") + escapeHtml(normalized.trim()));
+  };
+  var isBlock = function isBlock(node) {
+    return node.nodeType === Node.ELEMENT_NODE && BLOCK_TAGS.has(node.tagName);
+  };
+  var _walk = function walk(node) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      appendText(node.textContent || "");
+      return;
+    }
+    if (node.nodeType !== Node.ELEMENT_NODE) return;
+    var el = node;
+    var tag = el.tagName;
+    if (SKIP_TAGS.has(tag)) return;
+    if (tag === "BR" || tag === "HR") {
+      flushRow();
+      return;
+    }
+    if (tag === "TABLE") {
+      flushRow();
+      var trs = el.querySelectorAll(":scope > tbody > tr, :scope > thead > tr, :scope > tfoot > tr, :scope > tr");
+      if (trs.length > 0) {
+        trs.forEach(function (tr) {
+          var cells = Array.from(tr.children).filter(function (child) {
+            return /^(TD|TH)$/.test(child.tagName);
+          });
+          if (!cells.length) return;
+          var rowHtml = cells.map(function (cell) {
+            return "<td>".concat(escapeHtml((cell.textContent || "").replace(/\s+/g, " ").trim()), "</td>");
+          }).join("");
+          if (rowHtml.replace(/<[^>]+>/g, "").trim()) {
+            rows.push("<tr>".concat(rowHtml, "</tr>"));
+          }
+        });
+      } else {
+        var text = (el.textContent || "").replace(/\s+/g, " ").trim();
+        if (text) rows.push("<tr><td>".concat(escapeHtml(text), "</td></tr>"));
       }
-    });
-  }
-  if (rows.length > 0) {
-    return "<table>".concat(rows.join(""), "</table>");
+      return;
+    }
+    var block = isBlock(el);
+    if (block && currentParts.length > 0 && tag !== "LI") {
+      flushRow();
+    }
+    if (tag === "LI") {
+      flushRow();
+    }
+    Array.from(el.childNodes).forEach(_walk);
+    if (block) {
+      flushRow();
+    }
+  };
+  Array.from(container.childNodes).forEach(_walk);
+  flushRow();
+  if (!rows.length) {
+    var text = (container.textContent || "").replace(/\s+/g, " ").trim();
+    return "<table><tr><td>".concat(escapeHtml(text), "</td></tr></table>");
   }
-  return "<table><tr><td>".concat(html, "</td></tr></table>");
+  return "<table>".concat(rows.join(""), "</table>");
 }
 export function handlePaste(ctx, e) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
@@ -1579,7 +1642,7 @@ export function handlePaste(ctx, e) {
       var shouldHandleAsHtml = /<table[\s/>]/i.test(txtdata) || shouldHandleNonTableHtml(txtdata);
       if (shouldHandleAsHtml) {
         var hasNativeTable = /<table[\s/>]/i.test(txtdata);
-        var converted = hasNativeTable ? txtdata : convertNonTableHtmlToTable(txtdata);
+        var converted = hasNativeTable ? txtdata : convertAnyHtmlToTable(txtdata);
         handlePastedTable(ctx, converted, pasteHandler);
         if (hasNativeTable) {
           resizePastedCellsToContent(ctx);

package/es/modules/cell.d.ts

@@ -27,6 +27,7 @@ export declare function getFontStyleByCell(cell: Cell | null | undefined, checks
 export declare function getStyleByCell(ctx: Context, d: CellMatrix, r: number, c: number): any;
 export declare function getInlineStringHTML(r: number, c: number, data: CellMatrix, options?: {
     useSemanticMarkup?: boolean;
+    isRichTextCopy?: boolean;
     inheritedStyle?: Record<string, string>;
 }): string;
 export declare function getQKBorder(width: string, type: string, color: string): (string | number)[];

package/es/modules/cell.js

@@ -17,7 +17,7 @@ import { getFailureText, validateCellData } from "./dataVerification";
 import { genarate, update } from "./format";
 import { clearCellError, getRowHeight } from "../api";
 import { delFunctionGroup, execfunction, execFunctionGroup, functionHTMLGenerate, getcellrange, iscelldata, suppressFormulaRangeSelectionForInitialEdit } from "./formula";
-import { attrToCssName, convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
+import { convertSpanToShareString, isInlineStringCell, isInlineStringCT } from "./inline-string";
 import { isRealNull, isRealNum, valueIsError } from "./validation";
 import { getCellTextInfo } from "./text";
 import { locale } from "../locale";
@@ -1009,37 +1009,68 @@ export function getRangeByTxt(ctx, txt) {
   return range;
 }
 export function isAllSelectedCellsInStatus(ctx, attr, status) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (!_.isEmpty(ctx.luckysheetCellUpdate)) {
     var w = window.getSelection();
     if (!w) return false;
     if (w.rangeCount === 0) return false;
-    var range = w.getRangeAt(0);
-    if (range.collapsed === true) {
+    var range_1 = w.getRangeAt(0);
+    if (range_1.collapsed === true) {
       return false;
     }
-    var endContainer = range.endContainer;
-    var startContainer = range.startContainer;
-    var cssField_1 = _.camelCase(attrToCssName[attr]);
-    if (startContainer === endContainer) {
-      return !_.isEmpty((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.style[cssField_1]);
-    }
-    if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
-      var startSpan = startContainer.parentNode;
-      var endSpan = endContainer.parentNode;
-      var allSpans = (_d = startSpan === null || startSpan === void 0 ? void 0 : startSpan.parentNode) === null || _d === void 0 ? void 0 : _d.querySelectorAll("span");
-      if (allSpans) {
-        var startSpanIndex = _.indexOf(allSpans, startSpan);
-        var endSpanIndex = _.indexOf(allSpans, endSpan);
-        var rangeSpans = [];
-        for (var i = startSpanIndex; i <= endSpanIndex; i += 1) {
-          rangeSpans.push(allSpans[i]);
+    var endContainer = range_1.endContainer;
+    var startContainer = range_1.startContainer;
+    var toElement = function toElement(n) {
+      if (!n) return null;
+      if (n.nodeType === Node.ELEMENT_NODE) return n;
+      return n.parentElement;
+    };
+    var startEl = toElement(startContainer);
+    var endEl = toElement(endContainer);
+    var editorRoot = (_b = (_a = startEl === null || startEl === void 0 ? void 0 : startEl.closest("#luckysheet-rich-text-editor")) !== null && _a !== void 0 ? _a : endEl === null || endEl === void 0 ? void 0 : endEl.closest("#luckysheet-rich-text-editor")) !== null && _b !== void 0 ? _b : toElement(range_1.commonAncestorContainer);
+    var isStyleActive_1 = function isStyleActive_1(element) {
+      var computed = window.getComputedStyle(element);
+      var fontWeight = (computed.fontWeight || "").toLowerCase();
+      var fontStyle = (computed.fontStyle || "").toLowerCase();
+      var textDecorationLine = (computed.textDecorationLine || computed.textDecoration || "").toLowerCase();
+      var borderBottomWidth = (computed.borderBottomWidth || "").toLowerCase();
+      if (status === 1) {
+        if (attr === "bl") {
+          if (fontWeight === "bold") return true;
+          var n = Number(fontWeight);
+          return !Number.isNaN(n) && n >= 600;
+        }
+        if (attr === "it") {
+          return fontStyle === "italic" || fontStyle === "oblique";
+        }
+        if (attr === "cl") {
+          return textDecorationLine.includes("line-through");
+        }
+        if (attr === "un") {
+          return textDecorationLine.includes("underline") || borderBottomWidth !== "" && borderBottomWidth !== "0px" && borderBottomWidth !== "0";
         }
-        return _.every(rangeSpans, function (s) {
-          return !_.isEmpty(s.style[cssField_1]);
-        });
       }
+      return false;
+    };
+    var selectedElements_1 = [];
+    if (editorRoot) {
+      var spans = editorRoot.querySelectorAll("span");
+      spans.forEach(function (span) {
+        if (span.textContent && span.textContent.length > 0 && range_1.intersectsNode(span)) {
+          selectedElements_1.push(span);
+        }
+      });
+    }
+    if (selectedElements_1.length === 0) {
+      if (startEl) selectedElements_1.push(startEl);
+      if (endEl && endEl !== startEl) selectedElements_1.push(endEl);
+    }
+    if (selectedElements_1.length === 0) {
+      return false;
     }
+    return _.every(selectedElements_1, function (el) {
+      return isStyleActive_1(el);
+    });
   }
   var cells = getFlattenedRange(ctx);
   var flowdata = getFlowdata(ctx);
@@ -1234,11 +1265,15 @@ export function getInlineStringHTML(r, c, data, options) {
           return "".concat(_.kebabCase(key), ":").concat(_.isNumber(v) ? "".concat(v, "px") : v, ";");
         }).join(" ");
         var dataAttrs = !(options === null || options === void 0 ? void 0 : options.useSemanticMarkup) && (link === null || link === void 0 ? void 0 : link.linkType) && (link === null || link === void 0 ? void 0 : link.linkAddress) ? " data-link-type='".concat(String(link.linkType).replace(/'/g, "&#39;"), "' data-link-address='").concat(String(link.linkAddress).replace(/'/g, "&#39;"), "'") : "";
-        if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
-          value += buildClipboardCompatibleInlineRuns(strObj.v, styleStr);
+        if (options === null || options === void 0 ? void 0 : options.isRichTextCopy) {
+          if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
+            value += buildClipboardCompatibleInlineRuns(strObj.v, styleStr);
+          } else {
+            var segmentText = strObj.v.replace(/\r\n/g, "<br>").replace(/\n/g, "<br>");
+            value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(segmentText, "</span>");
+          }
         } else {
-          var segmentText = strObj.v.replace(/\r\n/g, "<br>").replace(/\n/g, "<br>");
-          value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(segmentText, "</span>");
+          value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(strObj.v, "</span>");
         }
       }
     }

package/es/modules/inline-string.js

@@ -236,9 +236,12 @@ function getCssText(cssText, attr, value) {
     styleObj._color = fontColor;
   }
   var s = getFontStyleByCell(styleObj, undefined, undefined, false);
+  cssText = removeClassWidthCss(cssText, attr);
+  if (_.isEmpty(s)) {
+    return cssText;
+  }
   var ukey = _.kebabCase(Object.keys(s)[0]);
   var uvalue = Object.values(s)[0];
-  cssText = removeClassWidthCss(cssText, attr);
   cssText = upsetClassWithCss(cssText, ukey, uvalue);
   return cssText;
 }
@@ -300,16 +303,31 @@ function escapeHtmlAttr(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/'/g, "&#39;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 export function updateInlineStringFormat(ctx, attr, value, cellInput) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   var w = window.getSelection();
   if (!w) return;
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  var editorText = ((_b = (_a = $textEditor.innerText) !== null && _a !== void 0 ? _a : $textEditor.textContent) !== null && _b !== void 0 ? _b : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  var selectedText = ((_c = range.toString()) !== null && _c !== void 0 ? _c : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  if (range.collapsed === false && editorText.length > 0 && selectedText === editorText) {
+    $textEditor.innerHTML = "";
+    var wrapper = document.createElement("span");
+    wrapper.setAttribute("style", getCssText("", attr, value));
+    wrapper.textContent = editorText;
+    $textEditor.appendChild(wrapper);
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   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);
+    var hasUnsupportedElementSelection_1 = false;
     children.forEach(function (node) {
       var _a, _b;
       if (node.nodeType === Node.ELEMENT_NODE) {
@@ -317,6 +335,16 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
         if (el.tagName === "SPAN") {
           var cssText = getCssText(el.style.cssText, attr, value);
           el.setAttribute("style", cssText);
+        } else {
+          var nestedSpans = el.querySelectorAll("span");
+          if (nestedSpans.length > 0) {
+            nestedSpans.forEach(function (nestedSpan) {
+              var cssText = getCssText(nestedSpan.style.cssText, attr, value);
+              nestedSpan.setAttribute("style", cssText);
+            });
+          } else {
+            hasUnsupportedElementSelection_1 = true;
+          }
         }
       } else if (node.nodeType === Node.TEXT_NODE) {
         var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
@@ -328,6 +356,14 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
         (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
       }
     });
+    if (hasUnsupportedElementSelection_1) {
+      var fullText = (_e = (_d = $textEditor.innerText) !== null && _d !== void 0 ? _d : $textEditor.textContent) !== null && _e !== void 0 ? _e : "";
+      $textEditor.innerHTML = "";
+      var wrapper = document.createElement("span");
+      wrapper.setAttribute("style", getCssText("", attr, value));
+      wrapper.textContent = fullText;
+      $textEditor.appendChild(wrapper);
+    }
     var newRange = document.createRange();
     newRange.selectNodeContents($textEditor);
     w.removeAllRanges();
@@ -405,7 +441,7 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
           }
           cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
-        if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
+        if (((_f = startContainer.parentElement) === null || _f === void 0 ? void 0 : _f.tagName) === "SPAN") {
           spanIndex = _.indexOf($textEditor.querySelectorAll("span"), span);
           span.outerHTML = cont;
         } else {
@@ -421,7 +457,7 @@ export function updateInlineStringFormat(ctx, attr, value, cellInput) {
         selectTextContent($textEditor.querySelectorAll("span")[seletedNodeIndex]);
       }
     } else {
-      if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
+      if (((_g = startContainer.parentElement) === null || _g === void 0 ? void 0 : _g.tagName) === "SPAN" && ((_h = endContainer.parentElement) === null || _h === void 0 ? void 0 : _h.tagName) === "SPAN") {
         var startSpan = startContainer.parentNode;
         var endSpan = endContainer.parentNode;
         var allSpans = $textEditor.querySelectorAll("span");

package/es/modules/selection.js

@@ -1426,7 +1426,8 @@ export function rangeValueToHtml(ctx, sheetId, ranges) {
         if (cell && isInlineStringCell(cell)) {
           cellHtml = getInlineStringHTML(r, c, d, {
             useSemanticMarkup: true,
-            inheritedStyle: styleObj
+            inheritedStyle: styleObj,
+            isRichTextCopy: true
           });
         } else {
           if (_.isNil(c_value)) {
@@ -1581,7 +1582,8 @@ export function copy(ctx) {
     if (isRichText_1) {
       innerContent = getInlineStringHTML(r, c, flowdata, {
         useSemanticMarkup: true,
-        inheritedStyle: mergedStyle
+        inheritedStyle: mergedStyle,
+        isRichTextCopy: true
       });
     } else {
       var displayValue = (_h = (_g = getCellValue(r, c, flowdata, "m")) !== null && _g !== void 0 ? _g : getCellValue(r, c, flowdata)) !== null && _h !== void 0 ? _h : "";

package/lib/events/paste.js

@@ -1459,28 +1459,91 @@ function shouldHandleNonTableHtml(html) {
   if (!html || /<table[\s/>]/i.test(html)) return false;
   return /<[a-z]/i.test(html);
 }
-function convertNonTableHtmlToTable(html) {
+function convertAnyHtmlToTable(html) {
   var container = document.createElement("div");
   container.innerHTML = html;
   var rows = [];
-  container.querySelectorAll("p").forEach(function (p) {
-    var _a;
-    if ((_a = p.textContent) === null || _a === void 0 ? void 0 : _a.trim()) {
-      rows.push("<tr><td>".concat(p.innerHTML, "</td></tr>"));
+  var currentParts = [];
+  var BLOCK_TAGS = new Set(["P", "DIV", "SECTION", "ARTICLE", "ASIDE", "HEADER", "FOOTER", "MAIN", "NAV", "BLOCKQUOTE", "PRE", "H1", "H2", "H3", "H4", "H5", "H6", "UL", "OL", "LI", "DL", "DT", "DD", "TABLE", "THEAD", "TBODY", "TFOOT", "TR", "TD", "TH", "HR"]);
+  var SKIP_TAGS = new Set(["SCRIPT", "STYLE", "NOSCRIPT", "META", "LINK", "HEAD", "SVG", "CANVAS", "IFRAME", "OBJECT"]);
+  var escapeHtml = function escapeHtml(text) {
+    return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+  };
+  var normalizeText = function normalizeText(text) {
+    return text.replace(/\u00A0/g, " ").replace(/\s+/g, " ");
+  };
+  var flushRow = function flushRow() {
+    var htmlContent = currentParts.join("").trim();
+    var textOnly = htmlContent.replace(/<br\s*\/?>/gi, "").replace(/&nbsp;/gi, " ").replace(/\s+/g, " ").trim();
+    if (textOnly) {
+      rows.push("<tr><td>".concat(htmlContent, "</td></tr>"));
     }
-  });
-  if (rows.length === 0) {
-    container.querySelectorAll("li").forEach(function (li) {
-      var _a;
-      if (!li.querySelector("p") && ((_a = li.textContent) === null || _a === void 0 ? void 0 : _a.trim())) {
-        rows.push("<tr><td>".concat(li.innerHTML, "</td></tr>"));
+    currentParts = [];
+  };
+  var appendText = function appendText(text) {
+    var normalized = normalizeText(text);
+    if (!normalized.trim()) return;
+    var prev = currentParts[currentParts.length - 1] || "";
+    var needsSpace = prev && !prev.endsWith(" ") && !prev.endsWith("<br>") && !/>\s*$/.test(prev);
+    currentParts.push((needsSpace ? " " : "") + escapeHtml(normalized.trim()));
+  };
+  var isBlock = function isBlock(node) {
+    return node.nodeType === Node.ELEMENT_NODE && BLOCK_TAGS.has(node.tagName);
+  };
+  var _walk = function walk(node) {
+    if (node.nodeType === Node.TEXT_NODE) {
+      appendText(node.textContent || "");
+      return;
+    }
+    if (node.nodeType !== Node.ELEMENT_NODE) return;
+    var el = node;
+    var tag = el.tagName;
+    if (SKIP_TAGS.has(tag)) return;
+    if (tag === "BR" || tag === "HR") {
+      flushRow();
+      return;
+    }
+    if (tag === "TABLE") {
+      flushRow();
+      var trs = el.querySelectorAll(":scope > tbody > tr, :scope > thead > tr, :scope > tfoot > tr, :scope > tr");
+      if (trs.length > 0) {
+        trs.forEach(function (tr) {
+          var cells = Array.from(tr.children).filter(function (child) {
+            return /^(TD|TH)$/.test(child.tagName);
+          });
+          if (!cells.length) return;
+          var rowHtml = cells.map(function (cell) {
+            return "<td>".concat(escapeHtml((cell.textContent || "").replace(/\s+/g, " ").trim()), "</td>");
+          }).join("");
+          if (rowHtml.replace(/<[^>]+>/g, "").trim()) {
+            rows.push("<tr>".concat(rowHtml, "</tr>"));
+          }
+        });
+      } else {
+        var text = (el.textContent || "").replace(/\s+/g, " ").trim();
+        if (text) rows.push("<tr><td>".concat(escapeHtml(text), "</td></tr>"));
       }
-    });
-  }
-  if (rows.length > 0) {
-    return "<table>".concat(rows.join(""), "</table>");
+      return;
+    }
+    var block = isBlock(el);
+    if (block && currentParts.length > 0 && tag !== "LI") {
+      flushRow();
+    }
+    if (tag === "LI") {
+      flushRow();
+    }
+    Array.from(el.childNodes).forEach(_walk);
+    if (block) {
+      flushRow();
+    }
+  };
+  Array.from(container.childNodes).forEach(_walk);
+  flushRow();
+  if (!rows.length) {
+    var text = (container.textContent || "").replace(/\s+/g, " ").trim();
+    return "<table><tr><td>".concat(escapeHtml(text), "</td></tr></table>");
   }
-  return "<table><tr><td>".concat(html, "</td></tr></table>");
+  return "<table>".concat(rows.join(""), "</table>");
 }
 function handlePaste(ctx, e) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
@@ -1592,7 +1655,7 @@ function handlePaste(ctx, e) {
       var shouldHandleAsHtml = /<table[\s/>]/i.test(txtdata) || shouldHandleNonTableHtml(txtdata);
       if (shouldHandleAsHtml) {
         var hasNativeTable = /<table[\s/>]/i.test(txtdata);
-        var converted = hasNativeTable ? txtdata : convertNonTableHtmlToTable(txtdata);
+        var converted = hasNativeTable ? txtdata : convertAnyHtmlToTable(txtdata);
         (0, _pasteTableHelpers.handlePastedTable)(ctx, converted, pasteHandler);
         if (hasNativeTable) {
           resizePastedCellsToContent(ctx);

package/lib/modules/cell.d.ts

@@ -27,6 +27,7 @@ export declare function getFontStyleByCell(cell: Cell | null | undefined, checks
 export declare function getStyleByCell(ctx: Context, d: CellMatrix, r: number, c: number): any;
 export declare function getInlineStringHTML(r: number, c: number, data: CellMatrix, options?: {
     useSemanticMarkup?: boolean;
+    isRichTextCopy?: boolean;
     inheritedStyle?: Record<string, string>;
 }): string;
 export declare function getQKBorder(width: string, type: string, color: string): (string | number)[];

package/lib/modules/cell.js

@@ -1042,37 +1042,68 @@ function getRangeByTxt(ctx, txt) {
   return range;
 }
 function isAllSelectedCellsInStatus(ctx, attr, status) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   if (!_lodash.default.isEmpty(ctx.luckysheetCellUpdate)) {
     var w = window.getSelection();
     if (!w) return false;
     if (w.rangeCount === 0) return false;
-    var range = w.getRangeAt(0);
-    if (range.collapsed === true) {
+    var range_1 = w.getRangeAt(0);
+    if (range_1.collapsed === true) {
       return false;
     }
-    var endContainer = range.endContainer;
-    var startContainer = range.startContainer;
-    var cssField_1 = _lodash.default.camelCase(_inlineString.attrToCssName[attr]);
-    if (startContainer === endContainer) {
-      return !_lodash.default.isEmpty((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.style[cssField_1]);
-    }
-    if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
-      var startSpan = startContainer.parentNode;
-      var endSpan = endContainer.parentNode;
-      var allSpans = (_d = startSpan === null || startSpan === void 0 ? void 0 : startSpan.parentNode) === null || _d === void 0 ? void 0 : _d.querySelectorAll("span");
-      if (allSpans) {
-        var startSpanIndex = _lodash.default.indexOf(allSpans, startSpan);
-        var endSpanIndex = _lodash.default.indexOf(allSpans, endSpan);
-        var rangeSpans = [];
-        for (var i = startSpanIndex; i <= endSpanIndex; i += 1) {
-          rangeSpans.push(allSpans[i]);
+    var endContainer = range_1.endContainer;
+    var startContainer = range_1.startContainer;
+    var toElement = function toElement(n) {
+      if (!n) return null;
+      if (n.nodeType === Node.ELEMENT_NODE) return n;
+      return n.parentElement;
+    };
+    var startEl = toElement(startContainer);
+    var endEl = toElement(endContainer);
+    var editorRoot = (_b = (_a = startEl === null || startEl === void 0 ? void 0 : startEl.closest("#luckysheet-rich-text-editor")) !== null && _a !== void 0 ? _a : endEl === null || endEl === void 0 ? void 0 : endEl.closest("#luckysheet-rich-text-editor")) !== null && _b !== void 0 ? _b : toElement(range_1.commonAncestorContainer);
+    var isStyleActive_1 = function isStyleActive_1(element) {
+      var computed = window.getComputedStyle(element);
+      var fontWeight = (computed.fontWeight || "").toLowerCase();
+      var fontStyle = (computed.fontStyle || "").toLowerCase();
+      var textDecorationLine = (computed.textDecorationLine || computed.textDecoration || "").toLowerCase();
+      var borderBottomWidth = (computed.borderBottomWidth || "").toLowerCase();
+      if (status === 1) {
+        if (attr === "bl") {
+          if (fontWeight === "bold") return true;
+          var n = Number(fontWeight);
+          return !Number.isNaN(n) && n >= 600;
+        }
+        if (attr === "it") {
+          return fontStyle === "italic" || fontStyle === "oblique";
+        }
+        if (attr === "cl") {
+          return textDecorationLine.includes("line-through");
+        }
+        if (attr === "un") {
+          return textDecorationLine.includes("underline") || borderBottomWidth !== "" && borderBottomWidth !== "0px" && borderBottomWidth !== "0";
         }
-        return _lodash.default.every(rangeSpans, function (s) {
-          return !_lodash.default.isEmpty(s.style[cssField_1]);
-        });
       }
+      return false;
+    };
+    var selectedElements_1 = [];
+    if (editorRoot) {
+      var spans = editorRoot.querySelectorAll("span");
+      spans.forEach(function (span) {
+        if (span.textContent && span.textContent.length > 0 && range_1.intersectsNode(span)) {
+          selectedElements_1.push(span);
+        }
+      });
+    }
+    if (selectedElements_1.length === 0) {
+      if (startEl) selectedElements_1.push(startEl);
+      if (endEl && endEl !== startEl) selectedElements_1.push(endEl);
+    }
+    if (selectedElements_1.length === 0) {
+      return false;
     }
+    return _lodash.default.every(selectedElements_1, function (el) {
+      return isStyleActive_1(el);
+    });
   }
   var cells = getFlattenedRange(ctx);
   var flowdata = (0, _context.getFlowdata)(ctx);
@@ -1267,11 +1298,15 @@ function getInlineStringHTML(r, c, data, options) {
           return "".concat(_lodash.default.kebabCase(key), ":").concat(_lodash.default.isNumber(v) ? "".concat(v, "px") : v, ";");
         }).join(" ");
         var dataAttrs = !(options === null || options === void 0 ? void 0 : options.useSemanticMarkup) && (link === null || link === void 0 ? void 0 : link.linkType) && (link === null || link === void 0 ? void 0 : link.linkAddress) ? " data-link-type='".concat(String(link.linkType).replace(/'/g, "&#39;"), "' data-link-address='").concat(String(link.linkAddress).replace(/'/g, "&#39;"), "'") : "";
-        if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
-          value += buildClipboardCompatibleInlineRuns(strObj.v, styleStr);
+        if (options === null || options === void 0 ? void 0 : options.isRichTextCopy) {
+          if (options === null || options === void 0 ? void 0 : options.useSemanticMarkup) {
+            value += buildClipboardCompatibleInlineRuns(strObj.v, styleStr);
+          } else {
+            var segmentText = strObj.v.replace(/\r\n/g, "<br>").replace(/\n/g, "<br>");
+            value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(segmentText, "</span>");
+          }
         } else {
-          var segmentText = strObj.v.replace(/\r\n/g, "<br>").replace(/\n/g, "<br>");
-          value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(segmentText, "</span>");
+          value += "<span class=\"luckysheet-input-span\" index='".concat(i, "' style='").concat(styleStr, "'").concat(dataAttrs, ">").concat(strObj.v, "</span>");
         }
       }
     }

package/lib/modules/inline-string.js

@@ -252,9 +252,12 @@ function getCssText(cssText, attr, value) {
     styleObj._color = fontColor;
   }
   var s = (0, _cell.getFontStyleByCell)(styleObj, undefined, undefined, false);
+  cssText = removeClassWidthCss(cssText, attr);
+  if (_lodash.default.isEmpty(s)) {
+    return cssText;
+  }
   var ukey = _lodash.default.kebabCase(Object.keys(s)[0]);
   var uvalue = Object.values(s)[0];
-  cssText = removeClassWidthCss(cssText, attr);
   cssText = upsetClassWithCss(cssText, ukey, uvalue);
   return cssText;
 }
@@ -316,16 +319,31 @@ 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 _a, _b, _c, _d, _e, _f, _g, _h;
   var w = window.getSelection();
   if (!w) return;
   if (w.rangeCount === 0) return;
   var range = w.getRangeAt(0);
   var $textEditor = cellInput;
+  var editorText = ((_b = (_a = $textEditor.innerText) !== null && _a !== void 0 ? _a : $textEditor.textContent) !== null && _b !== void 0 ? _b : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  var selectedText = ((_c = range.toString()) !== null && _c !== void 0 ? _c : "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+  if (range.collapsed === false && editorText.length > 0 && selectedText === editorText) {
+    $textEditor.innerHTML = "";
+    var wrapper = document.createElement("span");
+    wrapper.setAttribute("style", getCssText("", attr, value));
+    wrapper.textContent = editorText;
+    $textEditor.appendChild(wrapper);
+    var newRange = document.createRange();
+    newRange.selectNodeContents($textEditor);
+    w.removeAllRanges();
+    w.addRange(newRange);
+    return;
+  }
   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);
+    var hasUnsupportedElementSelection_1 = false;
     children.forEach(function (node) {
       var _a, _b;
       if (node.nodeType === Node.ELEMENT_NODE) {
@@ -333,6 +351,16 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         if (el.tagName === "SPAN") {
           var cssText = getCssText(el.style.cssText, attr, value);
           el.setAttribute("style", cssText);
+        } else {
+          var nestedSpans = el.querySelectorAll("span");
+          if (nestedSpans.length > 0) {
+            nestedSpans.forEach(function (nestedSpan) {
+              var cssText = getCssText(nestedSpan.style.cssText, attr, value);
+              nestedSpan.setAttribute("style", cssText);
+            });
+          } else {
+            hasUnsupportedElementSelection_1 = true;
+          }
         }
       } else if (node.nodeType === Node.TEXT_NODE) {
         var text = (_a = node.textContent) !== null && _a !== void 0 ? _a : "";
@@ -344,6 +372,14 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         (_b = node.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(wrapper, node);
       }
     });
+    if (hasUnsupportedElementSelection_1) {
+      var fullText = (_e = (_d = $textEditor.innerText) !== null && _d !== void 0 ? _d : $textEditor.textContent) !== null && _e !== void 0 ? _e : "";
+      $textEditor.innerHTML = "";
+      var wrapper = document.createElement("span");
+      wrapper.setAttribute("style", getCssText("", attr, value));
+      wrapper.textContent = fullText;
+      $textEditor.appendChild(wrapper);
+    }
     var newRange = document.createRange();
     newRange.selectNodeContents($textEditor);
     w.removeAllRanges();
@@ -421,7 +457,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
           }
           cont += "<span style=\"".concat(escapeHtmlAttr(cssText), "\">").concat(right, "</span>");
         }
-        if (((_a = startContainer.parentElement) === null || _a === void 0 ? void 0 : _a.tagName) === "SPAN") {
+        if (((_f = startContainer.parentElement) === null || _f === void 0 ? void 0 : _f.tagName) === "SPAN") {
           spanIndex = _lodash.default.indexOf($textEditor.querySelectorAll("span"), span);
           span.outerHTML = cont;
         } else {
@@ -437,7 +473,7 @@ function updateInlineStringFormat(ctx, attr, value, cellInput) {
         (0, _cursor.selectTextContent)($textEditor.querySelectorAll("span")[seletedNodeIndex]);
       }
     } else {
-      if (((_b = startContainer.parentElement) === null || _b === void 0 ? void 0 : _b.tagName) === "SPAN" && ((_c = endContainer.parentElement) === null || _c === void 0 ? void 0 : _c.tagName) === "SPAN") {
+      if (((_g = startContainer.parentElement) === null || _g === void 0 ? void 0 : _g.tagName) === "SPAN" && ((_h = endContainer.parentElement) === null || _h === void 0 ? void 0 : _h.tagName) === "SPAN") {
         var startSpan = startContainer.parentNode;
         var endSpan = endContainer.parentNode;
         var allSpans = $textEditor.querySelectorAll("span");

package/lib/modules/selection.js

@@ -1461,7 +1461,8 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
         if (cell && (0, _inlineString.isInlineStringCell)(cell)) {
           cellHtml = (0, _cell.getInlineStringHTML)(r, c, d, {
             useSemanticMarkup: true,
-            inheritedStyle: styleObj
+            inheritedStyle: styleObj,
+            isRichTextCopy: true
           });
         } else {
           if (_lodash.default.isNil(c_value)) {
@@ -1616,7 +1617,8 @@ function copy(ctx) {
     if (isRichText_1) {
       innerContent = (0, _cell.getInlineStringHTML)(r, c, flowdata, {
         useSemanticMarkup: true,
-        inheritedStyle: mergedStyle
+        inheritedStyle: mergedStyle,
+        isRichTextCopy: true
       });
     } else {
       var displayValue = (_h = (_g = (0, _cell.getCellValue)(r, c, flowdata, "m")) !== null && _g !== void 0 ? _g : (0, _cell.getCellValue)(r, c, flowdata)) !== null && _h !== void 0 ? _h : "";

package/package.json

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