ywana-core8 0.0.780 → 0.0.782

package/dist/index.cjs

@@ -1764,7 +1764,12 @@ var DataTable = function DataTable(props) {
     }
 
     var keySort = function keySort(a, b, direction) {
-      direction = direction !== null ? direction : 1;
+      direction = direction !== null ? direction : 1; // check if a and b are numbers and compare as numbers
+
+      if (!isNaN(a) && !isNaN(b)) {
+        a = Number(a);
+        b = Number(b);
+      }
 
       if (a === b) {
         // If the values are the same, do not switch positions.
@@ -1946,7 +1951,8 @@ var DataTableCell = function DataTableCell(_ref4) {
         _onChange = column.onChange,
         format = column.format,
         options = column.options,
-        action = column.action;
+        action = column.action,
+        maxDecimals = column.maxDecimals;
 
     if (id === "checked") {
       return /*#__PURE__*/React__default["default"].createElement(CheckBox, {
@@ -2078,7 +2084,8 @@ var DataTableCell = function DataTableCell(_ref4) {
           return /*#__PURE__*/React__default["default"].createElement(NumberCellViewer, {
             id: id,
             value: cell,
-            format: format
+            format: format,
+            maxDecimals: maxDecimals
           });
 
         default:
@@ -2185,11 +2192,27 @@ var NumberCellViewer = function NumberCellViewer(_ref7) {
       format = _ref7.format,
       maxDecimals = _ref7.maxDecimals;
 
-  function formatNumber(number) {
-    // convert number to numeric
+  /*
+      function formatNumber(number) {
+          // convert number to numeric
+          if (number === null) return "null"
+          const number2 = Number(number)
+          let result = number2.toLocaleString('es-ES', { minimumFractionDigits: 2, maximumFractionDigits: 2 })
+          // thousands separator is a dot
+          var parts = result.toString().split(",");
+          const numberPart = parts[0];
+          const decimalPart = parts[1];
+          const thousands = /\B(?=(\d{3})+(?!\d))/g;
+          return numberPart.replace(thousands, ".") + (decimalPart ? "," + decimalPart : "");
+      }
+  */
+  function formatNumber(number, maxDecimals) {
+    if (maxDecimals === void 0) {
+      maxDecimals = 0;
+    }
+
     if (number === null) return "null";
-    var number2 = Number(number);
-    var result = number2.toLocaleString('es-ES', {
+    var result = number.toLocaleString('es-ES', {
       minimumFractionDigits: 2,
       maximumFractionDigits: 2
     }); // thousands separator is a dot
@@ -2197,8 +2220,10 @@ var NumberCellViewer = function NumberCellViewer(_ref7) {
     var parts = result.toString().split(",");
     var numberPart = parts[0];
     var decimalPart = parts[1];
-    var thousands = /\B(?=(\d{3})+(?!\d))/g;
-    return numberPart.replace(thousands, ".") + (decimalPart ? "," + decimalPart : "");
+    var thousands = /\B(?=(\d{3})+(?!\d))/g; // limit decimal part to maxdecimals
+
+    var decimal = decimalPart ? decimalPart.substring(0, maxDecimals) : null;
+    return numberPart.replace(thousands, ".") + (decimal ? "," + decimal : "");
   }
 
   if (format) {
@@ -2219,11 +2244,9 @@ var NumberCellViewer = function NumberCellViewer(_ref7) {
         // convert value to number
         var number = Number(value); // if value is not a number, return value
 
-        if (isNaN(number)) return value; // if maxDecimals is defined, round number
-
-        if (maxDecimals) number = number.toFixed(maxDecimals); // format number
+        if (isNaN(number)) return value; // format number
 
-        return /*#__PURE__*/React__default["default"].createElement("span", null, formatNumber(number));
+        return /*#__PURE__*/React__default["default"].createElement("span", null, formatNumber(number, maxDecimals));
 
       default:
         return /*#__PURE__*/React__default["default"].createElement("span", null, value);