@fileverse-dev/fortune-core 1.2.56-patch-1 → 1.2.56-patch-3

package/es/events/paste.js

@@ -77,7 +77,7 @@ export function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow)
   var colOffset = destCol - srcCol;
   var rowOffset = destRow - srcRow;
   var hadInvalid = false;
-  var result = formula.replace(/(\$?)([A-Z]+)(\$?)(\d+)/g, function (__, absCol, colLetters, absRow, rowNum) {
+  var result = formula.replace(/\b(\$?)([A-Z]+)(\$?)(\d+)\b/g, function (__, absCol, colLetters, absRow, rowNum) {
     var colIndex = columnLabelIndex(colLetters);
     var rowIndex = parseInt(rowNum, 10);
     if (!absCol) colIndex += colOffset;
@@ -1253,7 +1253,6 @@ export function handlePaste(ctx, e) {
     } else if (txtdata.indexOf("fortune-copy-action-image") > -1) {} else {
       if (txtdata.indexOf("table") > -1) {
         handlePastedTable(ctx, txtdata, pasteHandler);
-        resizePastedCellsToContent(ctx);
       } else if (clipboardData.files.length === 1 && clipboardData.files[0].type.indexOf("image") > -1) {} else {
         txtdata = clipboardData.getData("text/plain");
         var isExcelFormula = txtdata.startsWith("=");

package/es/paste-table-helpers.js

@@ -14,7 +14,7 @@ import { locale } from "./locale";
 import { getQKBorder, saveHyperlink } from "./modules";
 import { genarate } from "./modules/format";
 import { getSheetIndex } from "./utils";
-import { setRowHeight } from "../src/api";
+import { setRowHeight, setColumnWidth } from "./api";
 export var DEFAULT_FONT_SIZE = 12;
 var parseStylesheetPairs = function parseStylesheetPairs(styleInner) {
   var patternReg = /{([^}]*)}/g;
@@ -128,7 +128,7 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a;
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -157,6 +157,13 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
       cell.v = rawText;
     }
   }
+  if (((_b = td.style) === null || _b === void 0 ? void 0 : _b.alignItems) === "center") {
+    cell.vt = 0;
+  } else if (((_c = td.style) === null || _c === void 0 ? void 0 : _c.alignItems) === "flex-end") {
+    cell.vt = 2;
+  } else if (((_d = td.style) === null || _d === void 0 ? void 0 : _d.alignItems) === "flex-start") {
+    cell.vt = 1;
+  }
   var styleBlock = typeof classStyles[".".concat(td.className)] === "string" ? classStyles[".".concat(td.className)] : "";
   var styles = parseInlineStyleBlock(styleBlock);
   if (!_.isNil(styles.border)) td.style.border = styles.border;
@@ -181,17 +188,7 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   } else {
     cell.ht = 1;
   }
-  var regex = /vertical-align:\s*(.*?);/;
-  var vtStyle = typeof classStyles.td === "string" && ((_c = (_b = classStyles.td.match(regex)) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : "") || "top";
-  var vt = td.style.verticalAlign || styles["vertical-align"] || vtStyle;
-  if (vt === "middle") {
-    cell.vt = 0;
-  } else if (vt === "top" || vt === "text-top") {
-    cell.vt = 1;
-  } else {
-    cell.vt = 2;
-  }
-  if (((_d = td === null || td === void 0 ? void 0 : td.style) === null || _d === void 0 ? void 0 : _d["overflow-wrap"]) === "anywhere") {
+  if (((_e = td === null || td === void 0 ? void 0 : td.style) === null || _e === void 0 ? void 0 : _e["overflow-wrap"]) === "anywhere") {
     cell.tb = "2";
   } else {
     cell.tb = "2";
@@ -213,6 +210,15 @@ export function handlePastedTable(ctx, html, pasteHandler) {
   if (!html.includes("table")) return;
   var containerDiv = document.createElement("div");
   containerDiv.innerHTML = html;
+  var tableColGropup = containerDiv.querySelectorAll("colgroup");
+  tableColGropup.forEach(function (colGroup, index) {
+    var _a;
+    var colWidth = colGroup === null || colGroup === void 0 ? void 0 : colGroup.getAttribute("width");
+    var intColWidth = parseInt(colWidth || "0", 10);
+    var anchorCol = ctx.luckysheet_select_save[0].column[0];
+    var absoluteCol = anchorCol + index;
+    setColumnWidth(ctx, (_a = {}, _a[absoluteCol] = intColWidth, _a));
+  });
   var tableRows = containerDiv.querySelectorAll("table tr");
   if (tableRows.length === 0) {
     containerDiv.remove();

package/lib/events/paste.js

@@ -90,7 +90,7 @@ function adjustFormulaForPaste(formula, srcCol, srcRow, destCol, destRow) {
   var colOffset = destCol - srcCol;
   var rowOffset = destRow - srcRow;
   var hadInvalid = false;
-  var result = formula.replace(/(\$?)([A-Z]+)(\$?)(\d+)/g, function (__, absCol, colLetters, absRow, rowNum) {
+  var result = formula.replace(/\b(\$?)([A-Z]+)(\$?)(\d+)\b/g, function (__, absCol, colLetters, absRow, rowNum) {
     var colIndex = columnLabelIndex(colLetters);
     var rowIndex = parseInt(rowNum, 10);
     if (!absCol) colIndex += colOffset;
@@ -1266,7 +1266,6 @@ function handlePaste(ctx, e) {
     } else if (txtdata.indexOf("fortune-copy-action-image") > -1) {} else {
       if (txtdata.indexOf("table") > -1) {
         (0, _pasteTableHelpers.handlePastedTable)(ctx, txtdata, pasteHandler);
-        resizePastedCellsToContent(ctx);
       } else if (clipboardData.files.length === 1 && clipboardData.files[0].type.indexOf("image") > -1) {} else {
         txtdata = clipboardData.getData("text/plain");
         var isExcelFormula = txtdata.startsWith("=");

package/lib/paste-table-helpers.js

@@ -10,7 +10,7 @@ var _locale = require("./locale");
 var _modules = require("./modules");
 var _format = require("./modules/format");
 var _utils = require("./utils");
-var _api = require("../src/api");
+var _api = require("./api");
 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 () {
@@ -136,7 +136,7 @@ function brToNewline(str) {
 }
 var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   var _a;
-  var _b, _c, _d;
+  var _b, _c, _d, _e;
   var cell = {};
   var rawText = (td.innerText || td.innerHTML || "").trim();
   var isLineBreak = rawText.includes("<br />");
@@ -165,6 +165,13 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
       cell.v = rawText;
     }
   }
+  if (((_b = td.style) === null || _b === void 0 ? void 0 : _b.alignItems) === "center") {
+    cell.vt = 0;
+  } else if (((_c = td.style) === null || _c === void 0 ? void 0 : _c.alignItems) === "flex-end") {
+    cell.vt = 2;
+  } else if (((_d = td.style) === null || _d === void 0 ? void 0 : _d.alignItems) === "flex-start") {
+    cell.vt = 1;
+  }
   var styleBlock = typeof classStyles[".".concat(td.className)] === "string" ? classStyles[".".concat(td.className)] : "";
   var styles = parseInlineStyleBlock(styleBlock);
   if (!_lodash.default.isNil(styles.border)) td.style.border = styles.border;
@@ -189,17 +196,7 @@ var buildCellFromTd = function buildCellFromTd(td, classStyles, ctx) {
   } else {
     cell.ht = 1;
   }
-  var regex = /vertical-align:\s*(.*?);/;
-  var vtStyle = typeof classStyles.td === "string" && ((_c = (_b = classStyles.td.match(regex)) === null || _b === void 0 ? void 0 : _b[1]) !== null && _c !== void 0 ? _c : "") || "top";
-  var vt = td.style.verticalAlign || styles["vertical-align"] || vtStyle;
-  if (vt === "middle") {
-    cell.vt = 0;
-  } else if (vt === "top" || vt === "text-top") {
-    cell.vt = 1;
-  } else {
-    cell.vt = 2;
-  }
-  if (((_d = td === null || td === void 0 ? void 0 : td.style) === null || _d === void 0 ? void 0 : _d["overflow-wrap"]) === "anywhere") {
+  if (((_e = td === null || td === void 0 ? void 0 : td.style) === null || _e === void 0 ? void 0 : _e["overflow-wrap"]) === "anywhere") {
     cell.tb = "2";
   } else {
     cell.tb = "2";
@@ -221,6 +218,15 @@ function handlePastedTable(ctx, html, pasteHandler) {
   if (!html.includes("table")) return;
   var containerDiv = document.createElement("div");
   containerDiv.innerHTML = html;
+  var tableColGropup = containerDiv.querySelectorAll("colgroup");
+  tableColGropup.forEach(function (colGroup, index) {
+    var _a;
+    var colWidth = colGroup === null || colGroup === void 0 ? void 0 : colGroup.getAttribute("width");
+    var intColWidth = parseInt(colWidth || "0", 10);
+    var anchorCol = ctx.luckysheet_select_save[0].column[0];
+    var absoluteCol = anchorCol + index;
+    (0, _api.setColumnWidth)(ctx, (_a = {}, _a[absoluteCol] = intColWidth, _a));
+  });
   var tableRows = containerDiv.querySelectorAll("table tr");
   if (tableRows.length === 0) {
     containerDiv.remove();

package/package.json

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