dtable-ui-component 0.1.98 → 0.1.99

package/lib/utils/value-format-utils.js

@@ -9,6 +9,18 @@ var _separatorMap = {
   'no': '',
   'space': ' '
 };
+/**
+ * @param {string} value
+ * e.g. removeZerosFromEnd('0.0100') // '0.01'
+ */
+
+var removeZerosFromEnd = function removeZerosFromEnd(value) {
+  if (value.endsWith('0')) {
+    return value.replace(/(?:\.0*|(\.\d+?)0+)$/, '$1');
+  }
+
+  return value;
+};
 
 var _toThousands = function _toThousands(num, isCurrency, formatData) {
   var _ref = formatData || {},
@@ -23,27 +35,53 @@ var _toThousands = function _toThousands(num, isCurrency, formatData) {
 
   var decimalString = _separatorMap[decimal];
   var thousandsString = _separatorMap[thousands];
+
+  if ((num + '').indexOf('e') > -1) {
+    if (num < 1 && num > -1) {
+      // 1.convert to non-scientific number
+      var numericString = num.toFixed(enable_precision ? precision : 8); // 2.remove 0 from end of the number which not set precision. e.g. 0.100000
+
+      if (!enable_precision) {
+        numericString = removeZerosFromEnd(numericString);
+      } // 3.remove minus from number which equal to 0. e.g. '-0.00'
+
+
+      if (parseFloat(numericString) === 0) {
+        return numericString.startsWith('-') ? numericString.substring(1) : numericString;
+      }
+
+      return numericString;
+    }
+
+    return num;
+  }
+
   var decimalDigits = enable_precision ? precision : _getDecimalDigits(num);
   var value = parseFloat(num.toFixed(decimalDigits));
-  var integer = Math.trunc(value);
+  var isMinus = value < 0;
+  var integer = Math.trunc(value); // format decimal value
+
   var decimalValue = String(Math.abs(NP.minus(value, integer)).toFixed(decimalDigits)).slice(1);
 
-  if (isCurrency) {
-    if (decimalValue.length === 2) {
-      decimalValue = decimalValue.padEnd(3, '0');
-    } else {
-      decimalValue = (decimalValue.substring(0, 3) || '.').padEnd(3, '0');
-    }
+  if (!enable_precision) {
+    decimalValue = removeZerosFromEnd(decimalValue);
+  }
 
-    if (enable_precision) {
-      decimalValue = precision === 0 ? '' : decimalValue.slice(0, precision + 1);
+  if (isCurrency) {
+    if (!enable_precision) {
+      if (decimalValue.length === 2) {
+        decimalValue = decimalValue.padEnd(3, '0');
+      } else {
+        decimalValue = (decimalValue.substring(0, 3) || '.').padEnd(3, '0');
+      }
     }
   }
 
-  decimalValue = decimalValue.replace(/./, decimalString);
+  decimalValue = decimalValue.replace(/./, decimalString); // format integer value
+
   var result = [],
       counter = 0;
-  integer = Object.is(integer, -0) ? ['-', '0'] : integer.toString().split('');
+  integer = Math.abs(integer).toString();
 
   for (var i = integer.length - 1; i >= 0; i--) {
     counter++;
@@ -54,7 +92,7 @@ var _toThousands = function _toThousands(num, isCurrency, formatData) {
     }
   }
 
-  return result.join('') + decimalValue;
+  return (isMinus ? '-' : '') + result.join('') + decimalValue;
 };
 
 var _getDecimalDigits = function _getDecimalDigits(num) {
@@ -72,14 +110,15 @@ export var getNumberDisplayString = function getNumberDisplayString(value, forma
   var type = Object.prototype.toString.call(value);
 
   if (type !== '[object Number]') {
+    // return formula internal errors directly.
     if (type === '[object String]' && value.startsWith('#')) {
       return value;
     }
 
-    return null;
+    return '';
   }
 
-  if (isNaN(value) || value === Infinity || value === -Infinity || (value + '').indexOf('e') > -1) return value + '';
+  if (isNaN(value) || value === Infinity || value === -Infinity) return value + '';
 
   var _ref2 = formatData || {},
       _ref2$format = _ref2.format,
@@ -87,7 +126,9 @@ export var getNumberDisplayString = function getNumberDisplayString(value, forma
 
   switch (format) {
     case 'number':
-      return _toThousands(value, false, formatData);
+      {
+        return _toThousands(value, false, formatData);
+      }
 
     case 'percent':
       {
@@ -95,17 +136,32 @@ export var getNumberDisplayString = function getNumberDisplayString(value, forma
       }
 
     case 'yuan':
-      return "\uFFE5".concat(_toThousands(value, true, formatData));
+      {
+        return "\uFFE5".concat(_toThousands(value, true, formatData));
+      }
 
     case 'dollar':
-      return "$".concat(_toThousands(value, true, formatData));
+      {
+        return "$".concat(_toThousands(value, true, formatData));
+      }
 
     case 'euro':
-      return "\u20AC".concat(_toThousands(value, true, formatData));
+      {
+        return "\u20AC".concat(_toThousands(value, true, formatData));
+      }
 
     case 'duration':
       {
-        return getDurationDisplayString(value, formatData.duration_format);
+        return getDurationDisplayString(value, formatData);
+      }
+
+    case 'custom_currency':
+      {
+        if (formatData.currency_symbol_position === 'after') {
+          return "".concat(_toThousands(value, true, formatData)).concat(formatData.currency_symbol || '');
+        } else {
+          return "".concat(formatData.currency_symbol || '').concat(_toThousands(value, true, formatData));
+        }
       }
 
     default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-ui-component",
-  "version": "0.1.98",
+  "version": "0.1.99",
   "main": "./lib/index.js",
   "dependencies": {
     "@seafile/react-image-lightbox": "0.0.9",