@leankylin-sheet/core 2.0.21 → 2.0.23

package/dist/index.esm.js

@@ -44935,10 +44935,16 @@ var make_ssf = function make_ssf(SSF) {
   }
   function format(fmt, v, o) {
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
+      if (isNaN(v)) {
+        return '#VALUE!';
+      }
       var precision = fmt.replace('leanky_n', '');
       return numberThousands(v, ',', precision);
     }
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_p')) {
+      if (isNaN(v)) {
+        return '#VALUE!';
+      }
       var _precision = fmt.replace('leanky_p', '');
       return numberThousands(v * 100, ',', _precision) + '%';
     }
@@ -45119,9 +45125,6 @@ var numberThousands = function numberThousands(num) {
   var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
   var precision = arguments.length > 2 ? arguments[2] : undefined;
   var number = Number(num).toFixed(precision);
-  if (isNaN(number)) {
-    return '';
-  }
   var _String$split = String(number).split('.'),
     _String$split2 = _slicedToArray(_String$split, 2),
     init = _String$split2[0],
@@ -49921,28 +49924,15 @@ function setCellValue(ctx, r, c, d, v) {
       if (cell.v === Infinity || cell.v === -Infinity) {
         cell.m = cell.v.toString();
       } else {
-        if (cell.v.toString().indexOf("e") > -1) {
-          var len;
-          if (cell.v.toString().split(".").length === 1) {
-            len = 0;
-          } else {
-            len = cell.v.toString().split(".")[1].split("e")[0].length;
+        var v_p = Math.round(cell.v * 1000000000) / 1000000000;
+        if (_.isNil(cell.ct)) {
+          var mask = genarate(v_p);
+          if (mask != null) {
+            cell.m = mask[0].toString();
           }
-          if (len > 5) {
-            len = 5;
-          }
-          cell.m = cell.v.toExponential(len).toString();
         } else {
-          var v_p = Math.round(cell.v * 1000000000) / 1000000000;
-          if (_.isNil(cell.ct)) {
-            var mask = genarate(v_p);
-            if (mask != null) {
-              cell.m = mask[0].toString();
-            }
-          } else {
-            var _mask = update(cell.ct.fa, v_p);
-            cell.m = _mask.toString();
-          }
+          var _mask = update(cell.ct.fa, v_p);
+          cell.m = _mask.toString();
         }
       }
     } else if (!_.isNil(cell.ct) && cell.ct.fa === "@") {

package/dist/index.js

@@ -44945,10 +44945,16 @@ var make_ssf = function make_ssf(SSF) {
   }
   function format(fmt, v, o) {
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_n')) {
+      if (isNaN(v)) {
+        return '#VALUE!';
+      }
       var precision = fmt.replace('leanky_n', '');
       return numberThousands(v, ',', precision);
     }
     if (fmt === null || fmt === void 0 ? void 0 : fmt.includes('leanky_p')) {
+      if (isNaN(v)) {
+        return '#VALUE!';
+      }
       var _precision = fmt.replace('leanky_p', '');
       return numberThousands(v * 100, ',', _precision) + '%';
     }
@@ -45129,9 +45135,6 @@ var numberThousands = function numberThousands(num) {
   var groupSeparator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ',';
   var precision = arguments.length > 2 ? arguments[2] : undefined;
   var number = Number(num).toFixed(precision);
-  if (isNaN(number)) {
-    return '';
-  }
   var _String$split = String(number).split('.'),
     _String$split2 = _slicedToArray(_String$split, 2),
     init = _String$split2[0],
@@ -49931,28 +49934,15 @@ function setCellValue(ctx, r, c, d, v) {
       if (cell.v === Infinity || cell.v === -Infinity) {
         cell.m = cell.v.toString();
       } else {
-        if (cell.v.toString().indexOf("e") > -1) {
-          var len;
-          if (cell.v.toString().split(".").length === 1) {
-            len = 0;
-          } else {
-            len = cell.v.toString().split(".")[1].split("e")[0].length;
+        var v_p = Math.round(cell.v * 1000000000) / 1000000000;
+        if (___default['default'].isNil(cell.ct)) {
+          var mask = genarate(v_p);
+          if (mask != null) {
+            cell.m = mask[0].toString();
           }
-          if (len > 5) {
-            len = 5;
-          }
-          cell.m = cell.v.toExponential(len).toString();
         } else {
-          var v_p = Math.round(cell.v * 1000000000) / 1000000000;
-          if (___default['default'].isNil(cell.ct)) {
-            var mask = genarate(v_p);
-            if (mask != null) {
-              cell.m = mask[0].toString();
-            }
-          } else {
-            var _mask = update(cell.ct.fa, v_p);
-            cell.m = _mask.toString();
-          }
+          var _mask = update(cell.ct.fa, v_p);
+          cell.m = _mask.toString();
         }
       }
     } else if (!___default['default'].isNil(cell.ct) && cell.ct.fa === "@") {

package/dist/settings.d.ts

@@ -91,7 +91,7 @@ export type Settings = {
     toolbarItems?: string[];
     cellContextMenu?: () => string[];
     headerContextMenu?: string[];
-    cellCustomContextMenu?: (selectSave?: any) => {
+    cellCustomContextMenu?: (selectSave?: any, headMenu?: any) => {
         key: string;
         element: any;
         onClick: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leankylin-sheet/core",
-  "version": "2.0.21",
+  "version": "2.0.23",
   "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": "^2.0.21",
+    "@leankylin-sheet/formula-parser": "^2.0.23",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",