@leankylin-sheet/core 1.2.17 → 1.2.19

package/dist/index.esm.js

@@ -44926,8 +44926,9 @@ var make_ssf = function make_ssf(SSF) {
     return [l, ff];
   }
   function format(fmt, v, o) {
-    if (fmt === 'leanky_n') {
-      return numberThousands(v);
+    if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
+      var precision = fmt.replace('leanky_n', '');
+      return numberThousands(v, ',', precision);
     }
     if (o == null) o = {};
     var sfmt = "";
@@ -45104,18 +45105,23 @@ var intThousands = function intThousands(number) {
 };
 var numberThousands = function numberThousands(number) {
   var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  var precision = arguments.length > 2 ? arguments[2] : undefined;
   if (number === 0) return '0';
   if (!number) return number;
-  if (String(number).includes('.')) {
-    var _String$split = String(number).split('.'),
+  var _number = !['', undefined].includes(precision) ? formatNumber(number, precision) : number;
+  if (String(_number).includes('.')) {
+    var _String$split = String(_number).split('.'),
       _String$split2 = _slicedToArray(_String$split, 2),
       init = _String$split2[0],
       decimal = _String$split2[1];
     return intThousands(init, groupSeparator) + '.' + decimal;
   } else {
-    return intThousands(number, groupSeparator);
+    return intThousands(_number, groupSeparator);
   }
 };
+function formatNumber(num, precision) {
+  return parseFloat(Number(num).toFixed(precision));
+}
 
 var base1904 = new Date(1900, 2, 1, 0, 0, 0);
 function datenum_local(v, date1904) {
@@ -52330,10 +52336,11 @@ function copy(ctx) {
   for (var r = rows[0]; r <= rows[1]; r += 1) {
     cpString += "<tr>";
     for (var c = columns[0]; c <= columns[1]; c += 1) {
-      var _flowdata$r, _ref, _data$m;
+      var _flowdata$r, _ref, _data$m, _ref2, _data$v;
       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 = (_ref = (_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 && _ref !== void 0 ? _ref : "";
-      cpString += "<td> ".concat(value, " </td>");
+      var realValue = (_ref2 = (_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 && _ref2 !== void 0 ? _ref2 : "";
+      cpString += "<td x:num=".concat(realValue, "> ").concat(value, " </td>");
     }
     cpString += "</tr>";
   }
@@ -69464,9 +69471,10 @@ function getClipboardData(e) {
     var cells = row.querySelectorAll("td");
     var rowData = [];
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
-      var _cell$textContent$tri, _cell$textContent;
+      var _ref, _cell$getAttribute, _cell$textContent;
       var cell = cells[cIndex];
-      rowData.push((_cell$textContent$tri = cell === null || cell === void 0 ? void 0 : (_cell$textContent = cell.textContent) === null || _cell$textContent === void 0 ? void 0 : _cell$textContent.trim()) !== null && _cell$textContent$tri !== void 0 ? _cell$textContent$tri : "");
+      var value = (_ref = (_cell$getAttribute = cell.getAttribute("x:num")) !== null && _cell$getAttribute !== void 0 ? _cell$getAttribute : cell === null || cell === void 0 ? void 0 : (_cell$textContent = cell.textContent) === null || _cell$textContent === void 0 ? void 0 : _cell$textContent.trim()) !== null && _ref !== void 0 ? _ref : "";
+      rowData.push(value);
     }
     result.push(rowData);
   }

package/dist/index.js

@@ -44936,8 +44936,9 @@ var make_ssf = function make_ssf(SSF) {
     return [l, ff];
   }
   function format(fmt, v, o) {
-    if (fmt === 'leanky_n') {
-      return numberThousands(v);
+    if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
+      var precision = fmt.replace('leanky_n', '');
+      return numberThousands(v, ',', precision);
     }
     if (o == null) o = {};
     var sfmt = "";
@@ -45114,18 +45115,23 @@ var intThousands = function intThousands(number) {
 };
 var numberThousands = function numberThousands(number) {
   var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
+  var precision = arguments.length > 2 ? arguments[2] : undefined;
   if (number === 0) return '0';
   if (!number) return number;
-  if (String(number).includes('.')) {
-    var _String$split = String(number).split('.'),
+  var _number = !['', undefined].includes(precision) ? formatNumber(number, precision) : number;
+  if (String(_number).includes('.')) {
+    var _String$split = String(_number).split('.'),
       _String$split2 = _slicedToArray(_String$split, 2),
       init = _String$split2[0],
       decimal = _String$split2[1];
     return intThousands(init, groupSeparator) + '.' + decimal;
   } else {
-    return intThousands(number, groupSeparator);
+    return intThousands(_number, groupSeparator);
   }
 };
+function formatNumber(num, precision) {
+  return parseFloat(Number(num).toFixed(precision));
+}
 
 var base1904 = new Date(1900, 2, 1, 0, 0, 0);
 function datenum_local(v, date1904) {
@@ -52340,10 +52346,11 @@ function copy(ctx) {
   for (var r = rows[0]; r <= rows[1]; r += 1) {
     cpString += "<tr>";
     for (var c = columns[0]; c <= columns[1]; c += 1) {
-      var _flowdata$r, _ref, _data$m;
+      var _flowdata$r, _ref, _data$m, _ref2, _data$v;
       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 = (_ref = (_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 && _ref !== void 0 ? _ref : "";
-      cpString += "<td> ".concat(value, " </td>");
+      var realValue = (_ref2 = (_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 && _ref2 !== void 0 ? _ref2 : "";
+      cpString += "<td x:num=".concat(realValue, "> ").concat(value, " </td>");
     }
     cpString += "</tr>";
   }
@@ -69474,9 +69481,10 @@ function getClipboardData(e) {
     var cells = row.querySelectorAll("td");
     var rowData = [];
     for (var cIndex = 0; cIndex < cells.length; cIndex += 1) {
-      var _cell$textContent$tri, _cell$textContent;
+      var _ref, _cell$getAttribute, _cell$textContent;
       var cell = cells[cIndex];
-      rowData.push((_cell$textContent$tri = cell === null || cell === void 0 ? void 0 : (_cell$textContent = cell.textContent) === null || _cell$textContent === void 0 ? void 0 : _cell$textContent.trim()) !== null && _cell$textContent$tri !== void 0 ? _cell$textContent$tri : "");
+      var value = (_ref = (_cell$getAttribute = cell.getAttribute("x:num")) !== null && _cell$getAttribute !== void 0 ? _cell$getAttribute : cell === null || cell === void 0 ? void 0 : (_cell$textContent = cell.textContent) === null || _cell$textContent === void 0 ? void 0 : _cell$textContent.trim()) !== null && _ref !== void 0 ? _ref : "";
+      rowData.push(value);
     }
     result.push(rowData);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "1.2.17",
+  "version": "1.2.19",
   "main": "dist/index.js",
   "module": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "repository": "http://114.55.85.79:19999/leankylin-front/leankylin-sheet",
   "license": "MIT",
   "dependencies": {
-    "@leankylin-sheet/formula-parser": "^1.2.17",
+    "@leankylin-sheet/formula-parser": "^1.2.19",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",