diginet-core-ui 1.4.66-beta.4 → 1.4.66-beta.5

package/components/form-control/money-input/index.js

@@ -38,13 +38,29 @@ const num2WordsVi = function () {
       return e > 0 && (o += n(e, r) + ' ngàn', r = !0), t > 0 && (o += n(t, r)), o;
     };
   return {
-    convert: function (r) {
+    convert: function (input) {
+      if (!Number.isFinite(input)) return '';
+      let parts = String(input).split('.');
+      let intPart = Math.floor(Number(parts[0]));
+      let decimalPart = parts[1];
+      let temp = intPart;
+      let nStr = '';
+      let a = '';
       let ty;
-      if (0 === r) return t[0];
-      let n = '',
-        a = '';
-      do ty = r % 1e9, r = Math.floor(r / 1e9), n = r > 0 ? o(ty, !0) + a + n : o(ty, !1) + a + n, a = ' tỷ'; while (r > 0);
-      return n.trim();
+      if (intPart === 0) return t[0];
+      do {
+        ty = temp % 1e9;
+        temp = Math.floor(temp / 1e9);
+        nStr = temp > 0 ? o(ty, true) + a + nStr : o(ty, false) + a + nStr;
+        a = ' tỷ';
+      } while (temp > 0);
+      let result = nStr.trim();
+
+      // xử lý thập phân
+      if (decimalPart) {
+        result += ' phẩy ' + decimalPart.split('').map(d => t[Number(d)]).join(' ');
+      }
+      return result;
     }
   };
 }();
@@ -56,22 +72,32 @@ const num2WordsEn = n => {
   const drop = n => xs => xs.slice(n);
   const reverse = xs => xs.slice(0).reverse();
   const comp = f => g => x => f(g(x));
-  const not = x => !x;
   const chunk = n => xs => isEmpty(xs) ? [] : [take(n)(xs), ...chunk(n)(drop(n)(xs))];
   let a = ['', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight', 'nine', 'ten', 'eleven', 'twelve', 'thirteen', 'fourteen', 'fifteen', 'sixteen', 'seventeen', 'eighteen', 'nineteen'];
   let b = ['', '', 'twenty', 'thirty', 'forty', 'fifty', 'sixty', 'seventy', 'eighty', 'ninety'];
   let g = ['', 'thousand', 'million', 'billion', 'trillion', 'quadrillion', 'quintillion', 'sextillion', 'septillion', 'octillion', 'nonillion'];
-  // this part is really nasty still
-  // it might edit this again later to show how Monoids could fix this up
   let makeGroup = ([ones, tens, huns]) => {
     return [num(huns) === 0 ? '' : a[huns] + ' hundred ', num(ones) === 0 ? b[tens] : b[tens] && b[tens] + '-' || '', a[tens + ones] || a[ones]].join('');
   };
-  // "thousands" constructor; no real good names for this, I guess
   let thousand = (group, i) => group === '' ? group : `${group} ${g[i]}`;
-  // execute !
-  if (typeof n === 'number') return num2WordsEn(String(n));
-  if (n === '0') return 'zero';
-  return comp(chunk(3))(reverse)(arr(n)).map(makeGroup).map(thousand).filter(comp(not)(isEmpty)).reverse().join(' ');
+  // convert integer part
+  const convertInt = str => {
+    if (str === '0') return 'zero';
+    return comp(chunk(3))(reverse)(arr(str)).map(makeGroup).map(thousand).filter(x => x.trim().length > 0).reverse().join(' ').trim();
+  };
+  // normalize input
+  if (typeof n === 'number') n = String(n);
+  const parts = n.split('.');
+  const intPart = parts[0];
+  const decimalPart = parts[1];
+  let result = convertInt(intPart);
+
+  // decimal handling
+  if (decimalPart) {
+    const decimalWords = decimalPart.split('').map(d => a[Number(d)] || '').join(' ').trim();
+    result += ' point ' + decimalWords;
+  }
+  return result;
 };
 const num2WordsZh = (() => {
   const t = ['零', '一', '二', '三', '四', '五', '六', '七', '八', '九'];
@@ -79,47 +105,63 @@ const num2WordsZh = (() => {
   const bigUnits = ['', '万', '亿', '兆'];
   const readSection = num => {
     let str = '';
-    let zero = true;
-    for (let i = 0; i < 4 && num > 0; i++) {
+    let zero = false;
+    for (let i = 0; i < 4; i++) {
       const digit = num % 10;
       if (digit === 0) {
-        if (!zero) {
-          zero = true;
+        if (!zero && str !== '') {
           str = t[0] + str;
         }
+        zero = true;
       } else {
-        zero = false;
         str = t[digit] + units[i] + str;
+        zero = false;
       }
       num = Math.floor(num / 10);
+      if (num === 0) break;
     }
     return str;
   };
-  return {
-    convert: num => {
-      if (num === 0) return t[0];
-      let str = '';
-      let unitPos = 0;
-      let needZero = false;
-      while (num > 0) {
-        const section = num % 10000;
-        if (section === 0) {
-          if (needZero) {
-            str = t[0] + str;
-            needZero = false;
-          }
-        } else {
-          const sectionStr = readSection(section) + bigUnits[unitPos];
-          str = sectionStr + str;
-          needZero = true;
+  const readInteger = num => {
+    if (num === 0) return t[0];
+    let sections = [];
+    while (num > 0) {
+      sections.unshift(num % 10000);
+      num = Math.floor(num / 10000);
+    }
+    let result = '';
+    for (let i = 0; i < sections.length; i++) {
+      const section = sections[i];
+      const unit = bigUnits[sections.length - 1 - i];
+      if (section === 0) {
+        if (result && !result.endsWith(t[0]) && sections.slice(i + 1).some(v => v > 0)) {
+          result += t[0];
         }
-        num = Math.floor(num / 10000);
-        unitPos++;
+        continue;
       }
 
-      // Special cases
-      str = str.replace(/^一十/, '十'); // "一十X" => "十X"
-      return str;
+      // Nếu nhóm hiện tại <1000 và phía trước đã có nội dung
+      // => cần thêm "零"
+      if (result && section < 1000 && !result.endsWith(t[0])) {
+        result += t[0];
+      }
+      result += readSection(section) + unit;
+    }
+    return result.replace(/零+/g, '零').replace(/零$/g, '').replace(/^一十/, '十');
+  };
+  return {
+    convert: num => {
+      if (typeof num === 'string') {
+        num = num.trim();
+      }
+      const strNum = String(num);
+      if (!strNum.includes('.')) {
+        return readInteger(Number(strNum));
+      }
+      const [intPart, decPart] = strNum.split('.');
+      const intWords = readInteger(Number(intPart));
+      const decWords = decPart.split('').map(ch => t[Number(ch)]).join('');
+      return `${intWords}点${decWords}`;
     }
   };
 })();
@@ -403,7 +445,7 @@ const MoneyInput = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referenc
           }
         }
         const v = getValueWithDecimal(number.toString().replace('.', decimalSymbol));
-        if (convertToWords && !decimalDigit && (disabled || readOnly)) {
+        if (convertToWords && (disabled || readOnly)) {
           inputRef.current.value = convertNumToWords(value);
         } else {
           inputRef.current.value = parseValueWithFix(thousandSeparator ? getThousandSeparator(v) : v);
@@ -431,9 +473,9 @@ const MoneyInput = /*#__PURE__*/memo( /*#__PURE__*/forwardRef((inProps, referenc
   });
   const convertNumToWords = number => {
     let valueConverted = getGlobal('helperInvalid');
-    if (Number.isInteger(number)) {
+    if (Number.isFinite(number)) {
       const currentLocale = locale.get();
-      const converter = converters[currentLocale] || num2WordsVi; // fallback VN
+      const converter = converters[currentLocale] || num2WordsEn; // fallback VN
       valueConverted = Object.hasOwn(converter, 'convert') ? converter.convert(number) : converter(number);
     }
     return valueConverted;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "diginet-core-ui",
-  "version": "1.4.66-beta.4",
+  "version": "1.4.66-beta.5",
   "description": "",
   "main": "index.js",
   "license": "UNLICENSED",