@leankylin-sheet/core 3.1.47 → 4.0.1

package/dist/index.esm.js

@@ -42216,6 +42216,11 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
   }
   return "<table data-type=\"leankylin-copy-action-table\">".concat(colgroup).concat(cpdata, "</table>");
 }
+function ptToPx(pt) {
+  var ppi = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 96;
+  var px = pt * (ppi / 72);
+  return parseFloat(px.toFixed(2));
+}
 function cellAttrToDomStyle(cell, cellBorderInfo) {
   var _ref = cell || {},
     bg = _ref.bg,
@@ -42236,7 +42241,7 @@ function cellAttrToDomStyle(cell, cellBorderInfo) {
     2: "bottom"
   }[String(vt)] || "middle";
   var fontWeight = bl === 1 ? "bold" : "normal";
-  var fontSize = "".concat(parseInt(fs, 10), "px");
+  var fontSize = typeof fs === "number" ? ptToPx(fs) : "".concat(parseInt(fs, 10), "px");
   var result = {
     background: bg || "#fff",
     color: fc || "#000",
@@ -42277,6 +42282,7 @@ function copy(ctx) {
       var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
+      var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
@@ -42285,7 +42291,7 @@ function copy(ctx) {
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -59767,13 +59773,15 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
+      var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
         var mainCell = _objectSpread2({
           v: v || m,
-          m: m || v
+          m: m || v,
+          f: f || undefined
         }, domStyleToCellAttr(style));
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {

package/dist/index.js

@@ -42226,6 +42226,11 @@ function rangeValueToHtml(ctx, sheetId, ranges) {
   }
   return "<table data-type=\"leankylin-copy-action-table\">".concat(colgroup).concat(cpdata, "</table>");
 }
+function ptToPx(pt) {
+  var ppi = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 96;
+  var px = pt * (ppi / 72);
+  return parseFloat(px.toFixed(2));
+}
 function cellAttrToDomStyle(cell, cellBorderInfo) {
   var _ref = cell || {},
     bg = _ref.bg,
@@ -42246,7 +42251,7 @@ function cellAttrToDomStyle(cell, cellBorderInfo) {
     2: "bottom"
   }[String(vt)] || "middle";
   var fontWeight = bl === 1 ? "bold" : "normal";
-  var fontSize = "".concat(parseInt(fs, 10), "px");
+  var fontSize = typeof fs === "number" ? ptToPx(fs) : "".concat(parseInt(fs, 10), "px");
   var result = {
     background: bg || "#fff",
     color: fc || "#000",
@@ -42287,6 +42292,7 @@ function copy(ctx) {
       var data = flowdata === null || flowdata === void 0 ? void 0 : (_flowdata$r = flowdata[r]) === null || _flowdata$r === void 0 ? void 0 : _flowdata$r[c];
       var value = (_ref2 = (_data$m = data === null || data === void 0 ? void 0 : data.m) !== null && _data$m !== void 0 ? _data$m : data === null || data === void 0 ? void 0 : data.v) !== null && _ref2 !== void 0 ? _ref2 : "";
       var realValue = (_ref3 = (_data$v = data === null || data === void 0 ? void 0 : data.v) !== null && _data$v !== void 0 ? _data$v : data === null || data === void 0 ? void 0 : data.m) !== null && _ref3 !== void 0 ? _ref3 : "";
+      var f = (data === null || data === void 0 ? void 0 : data.f) || "";
       var rowspan = (_data$mc$rs = data === null || data === void 0 ? void 0 : (_data$mc = data.mc) === null || _data$mc === void 0 ? void 0 : _data$mc.rs) !== null && _data$mc$rs !== void 0 ? _data$mc$rs : 1;
       var colspan = (_data$mc$cs = data === null || data === void 0 ? void 0 : (_data$mc2 = data.mc) === null || _data$mc2 === void 0 ? void 0 : _data$mc2.cs) !== null && _data$mc$cs !== void 0 ? _data$mc$cs : 1;
       if (!(data === null || data === void 0 ? void 0 : data.mc) || (data === null || data === void 0 ? void 0 : data.mc) && (data === null || data === void 0 ? void 0 : data.mc.r) === r && data.mc.c === c) {
@@ -42295,7 +42301,7 @@ function copy(ctx) {
         var styleStr = (_Object$keys = Object.keys(style)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.map(function (item) {
           return "".concat(item, ":").concat(style[item], ";");
         }).join("");
-        cpString += "<td x:num='".concat(realValue, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
+        cpString += "<td x:num='".concat(realValue, "' f='").concat(f, "' style='").concat(styleStr, "' rowspan=").concat(rowspan, " colspan=").concat(colspan, ">").concat(value, "</td>");
       }
     };
     for (var c = columns[0]; c <= columns[1]; c += 1) {
@@ -59777,13 +59783,15 @@ function getClipboardData(ctx, e, copyRich, startRow, startCol) {
       var cell = cells[cIndex];
       var m = cell === null || cell === void 0 ? void 0 : cell.textContent;
       var v = cell.getAttribute("x:num");
+      var f = cell.getAttribute("f");
       if (copyRich) {
         var style = iframe.contentWindow.getComputedStyle(cell);
         var rowspan = Number(cell.getAttribute("rowspan")) || 1;
         var colspan = Number(cell.getAttribute("colspan")) || 1;
         var mainCell = _objectSpread2({
           v: v || m,
-          m: m || v
+          m: m || v,
+          f: f || undefined
         }, domStyleToCellAttr(style));
         if (colspan > 1 || rowspan > 1) {
           mainCell.mc = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "3.1.47",
+  "version": "4.0.1",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -13,7 +13,7 @@
     "build": "father-build"
   },
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "3.1.47",
+    "@leankylin-sheet/formula-parser": "4.0.1",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",