util-helpers 4.10.3 → 4.11.0

package/dist/util-helpers.js

@@ -558,6 +558,17 @@
     config.disableWarning = !!bool;
   }
 
+  /**
+   * 打印警告信息
+   *
+   * @param  {any[]} args 打印的信息
+   */
+  function devWarn(...args) {
+    if (!config.disableWarning) {
+      console.warn(...args);
+    }
+  }
+
   const regNumber = /[\d]/;
   const regLowerCaseLetter = /[a-z]/;
   const regUpperCaseLetter = /[A-Z]/;
@@ -612,15 +623,20 @@
    *
    * @private
    * @param {string} val 检测的值
-   * @param {string} [chars] 特殊字符
+   * @param {string} chars 特殊字符
    * @returns {boolean} 是否包含特殊字符
    */
-  function hasSpecialCharacter(val, chars = '') {
-    if (!chars) {
+  function hasSpecialCharacter(val, chars) {
+    if (!chars || !val) {
       return false;
     }
 
     const specialChars = val.replace(regAllNumberAndLetter, '');
+
+    if (!specialChars) {
+      return false;
+    }
+
     const regChars = hasHex(chars) ? new RegExp(`[${chars}]`) : null;
 
     if (regChars) {
@@ -642,13 +658,19 @@
    *
    * @private
    * @param {string} val 检测的值
-   * @param {string} chars 非法字符
+   * @param {string} chars 特殊字符
    * @returns {boolean} 是否包含非法字符
    */
-  function hasUnallowableCharacter(val, chars = '') {
+  function hasUnallowableCharacter(val, chars) {
+    if (!val) {
+      return false;
+    }
+
     const specialChars = val.replace(regAllNumberAndLetter, '');
 
-    if (!chars && specialChars) {
+    if (!specialChars) {
+      return false;
+    } else if (!chars) {
       return true;
     }
 
@@ -711,7 +733,7 @@
    *   }
    * }
    *
-   * validatePassword('a12345678', {level: 3});
+   * validatePassword('a12345678', { level: 3 });
    * // =>
    * {
    *   validated: false,
@@ -725,7 +747,7 @@
    *   }
    * }
    *
-   * validatePassword('_Aa一二三45678', {level: 3, ignoreCase: true});
+   * validatePassword('_Aa一二三45678', { level: 3, ignoreCase: true });
    * // =>
    * {
    *   validated: false,
@@ -740,7 +762,7 @@
    * }
    *
    * // 自定义特殊字符
-   * validatePassword('_Aa一二三45678', {level: 3, ignoreCase: true, special: '_一二三'});
+   * validatePassword('_Aa一二三45678', { level: 3, ignoreCase: true, special: '_一二三' });
    * // =>
    * {
    *   validated: true,
@@ -758,9 +780,7 @@
     let valStr = value;
 
     if (typeof value !== 'string') {
-      if (!config.disableWarning) {
-        console.warn(`[validatePassword] value must be a string.`);
-      }
+      devWarn(`[validatePassword] value must be a string.`);
       valStr = '';
     }
 
@@ -774,15 +794,15 @@
     const containesUpperCaseLetter = hasUpperCaseLetter(valStr);
     // 包含特殊字符
     const containesSpecialCharacter = hasSpecialCharacter(valStr, special);
-    // 包含非法字符
+    // 包含非法字符，即含有非数字字母特殊字符以外的其他字符
     const containesUnallowableCharacter = hasUnallowableCharacter(valStr, special);
 
     if (containesNumber) {
       currentLevel += 1;
     }
 
+    // 不区分大小写
     if (ignoreCase) {
-      // 不区分大小写
       if (containesLowerCaseLetter || containesUpperCaseLetter) {
         currentLevel += 1;
       }
@@ -913,18 +933,16 @@
     chineseExtendF: '[\u{2CEB0}-\u{2EBE0}]'
   };
 
-  let looseChineseRegExp = chineseDictionary.chineseBasic + '+';
+  const looseChineseRegExp = chineseDictionary.chineseBasic + '+';
+  const chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$';
 
-  let chineseRegExp = '^' + chineseDictionary.chineseBasic + '+$';
+  const chineseWithExtend = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')';
+  const looseChineseExtendRegExp = chineseWithExtend + '+';
+  const chineseExtendRegExp = '^' + chineseWithExtend + '+$';
 
   // eslint-disable-next-line no-prototype-builtins
   const supportRegExpUnicode = RegExp.prototype.hasOwnProperty('unicode');
 
-  if (supportRegExpUnicode) {
-    looseChineseRegExp = '(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')+';
-    chineseRegExp = '^(?:' + chineseDictionary.chineseBasic + '|' + chineseDictionary.chineseExtend + '|' + chineseDictionary.chineseExtendA + '|' + chineseDictionary.chineseExtendB + '|' + chineseDictionary.chineseExtendC + '|' + chineseDictionary.chineseExtendD + '|' + chineseDictionary.chineseExtendE + '|' + chineseDictionary.chineseExtendF + ')+$';
-  }
-
   /**
    * 检测值是否为中文
    *
@@ -935,6 +953,7 @@
    * @param {*} value 要检测的值
    * @param {Object} [options] 配置项
    * @param {boolean} [options.loose=false] 宽松模式。如果为true，只要包含中文即为true
+   * @param {boolean} [options.useExtend=false] 使用统一表意文字扩展A-F。注意：如果不支持 `RegExp.prototype.unicode`，扩展字符集将自动不生效，如IE浏览器。
    * @returns {boolean} 值是否为中文
    * @example
    *
@@ -945,16 +964,30 @@
    * // => false
    *
    * // 宽松模式，只要包含中文即为true
-   * isChinese('林A', {loose: true});
+   * isChinese('林A', { loose: true });
    * // => true
    *
-   * isChinese('A林A', {loose: true});
+   * isChinese('A林A', { loose: true });
    * // => true
    *
+   * isChinese('𠮷');
+   * // => false
+   *
+   * // 使用中文扩展字符集，需要浏览器支持 RegExp.prototype.unicode 才生效。
+   * isChinese('𠮷', { useExtend: true });
+   * // => true
+   * isChinese('𠮷aa', { useExtend: true, loose: true });
+   * // => true
    */
-  function isChinese(value, { loose = false } = {}) {
+  function isChinese(value, { loose = false, useExtend = false } = {}) {
     const valueStr = normalizeString(value);
-    const reg = new RegExp(loose ? looseChineseRegExp : chineseRegExp, supportRegExpUnicode ? 'u' : undefined);
+    const basicRegExp = loose ? looseChineseRegExp : chineseRegExp;
+    const extendRegExp = loose ? looseChineseExtendRegExp : chineseExtendRegExp;
+
+    const hasExtend = useExtend && supportRegExpUnicode;
+    const resultRegExp = hasExtend ? extendRegExp : basicRegExp;
+    const flag = hasExtend ? 'u' : undefined;
+    const reg = new RegExp(resultRegExp, flag);
     return reg.test(valueStr);
   }
 
@@ -1110,8 +1143,8 @@
     }
 
     // 反模10计算
-    if (pj === 10 || pj === 1) {
-      retNum = 1;
+    if (pj === 1) {
+      retNum = 0;
     } else {
       retNum = 11 - pj;
     }
@@ -1337,8 +1370,9 @@
    * @returns {number}
    */
   function float2Fixed(num) {
-    if (!isScientificNumber(num.toString())) {
-      return Number(num.toString().replace('.', ''));
+    const strNum = String(num);
+    if (!isScientificNumber(strNum)) {
+      return Number(strNum.replace('.', ''));
     }
     const dLen = digitLength(num);
     return dLen > 0 ? strip(+num * Math.pow(10, dLen)) : +num;
@@ -1351,9 +1385,7 @@
    */
   function checkBoundary(num) {
     if (+num > MAX_SAFE_INTEGER || +num < MIN_SAFE_INTEGER) {
-      if (!config.disableWarning) {
-        console.warn(`${num} is beyond boundary when transfer to integer, the results may not be accurate`);
-      }
+      devWarn(`${num} is beyond boundary when transfer to integer, the results may not be accurate`);
     }
   }
 
@@ -1385,37 +1417,63 @@
    *  2.小数点前边是0，小数点后十分位（包含十分位）之后连续零的个数大于等于6个
    *
    * @param {string | number} num 科学计数法数字
-   * @returns {string} 转换后的数字字符串
+   * @returns {string | number} 转换后的数字字符串
    */
   function scientificToNumber(num) {
-    if (isScientificNumber(num.toString())) {
-      const zero = '0';
-      const parts = String(num).toLowerCase().split('e');
-      const e = parts.pop(); // 存储指数
-      // @ts-ignore
-      const l = Math.abs(e); // 取绝对值，l-1就是0的个数
-      // @ts-ignore
-      const sign = e / l; //判断正负
-      const coeff_array = parts[0].split('.'); // 将系数按照小数点拆分
+    const strNum = String(num);
 
-      //如果是小数
-      if (sign === -1) {
-        //拼接字符串，如果是小数，拼接0和小数点
-        num = zero + '.' + new Array(l).join(zero) + coeff_array.join('');
-      } else {
-        const dec = coeff_array[1];
+    if (!isScientificNumber(strNum)) {
+      return num;
+    }
 
-        //如果是整数，将整数除第一位之外的非零数字计入位数，相应的减少0的个数
-        if (l - dec.length < 0) {
-          num = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
-        } else {
-          //拼接字符串，如果是整数，不需要拼接小数点
-          num = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);
+    /** @type string */
+    let ret;
+
+    const zero = '0';
+    const parts = strNum.toLowerCase().split('e');
+    const e = parts.pop(); // 存储指数
+    // @ts-ignore
+    const l = Math.abs(e); // 取绝对值，l-1就是0的个数
+    // @ts-ignore
+    const sign = e / l; //判断正负
+    const coeff_array = parts[0].split('.'); // 将系数按照小数点拆分
+
+    // 如果是小数
+    if (sign === -1) {
+      // 整数部分
+      const intVal = trimLeftZero(coeff_array[0]);
+
+      // 整数部分大于科学计数后面部分
+      // 如: 10e-1, 10.2e-1
+      if (intVal.length > l) {
+        const thanLen = intVal.length - l;
+        const dec = coeff_array[1] || '';
+
+        ret = intVal.slice(0, thanLen);
+
+        // 处理 10e-1, 100e-1
+        if (intVal.slice(thanLen) !== '0' || dec) {
+          ret += '.' + intVal.slice(thanLen) + dec;
         }
+      } else {
+        // 整数部分小于等于科学计数后面部分
+        // 如: 1e-1, 0.2e-1, 1.2e-2, 1.2e-1
+        ret = zero + '.' + new Array(l - intVal.length + 1).join(zero) + coeff_array.join('');
+      }
+    } else {
+      // 小数部分
+      const dec = coeff_array[1] || '';
+
+      // 如果是整数，将整数除第一位之外的非零数字计入位数，相应的减少0的个数
+      if (l - dec.length < 0) {
+        ret = trimLeftZero(coeff_array[0] + dec.substring(0, l)) + '.' + dec.substring(l);
+      } else {
+        // 拼接字符串，如果是整数，不需要拼接小数点
+        ret = coeff_array.join('') + new Array(l - dec.length + 1).join(zero);
       }
     }
-    // @ts-ignore
-    return num;
+
+    return trimLeftZero(ret);
   }
 
   /**
@@ -1449,9 +1507,7 @@
    */
   function checkNumber(num) {
     if (!(reg.test(num) || isScientificNumber(num)) || _isNaN(num) || (typeof num !== 'number' && typeof num !== 'string') || num === '') {
-      if (!config.disableWarning) {
-        console.warn(`${num} invalid parameter.`);
-      }
+      devWarn(`${num} invalid parameter.`);
 
       return false;
     }
@@ -1575,9 +1631,9 @@
     decimal = typeof decimal === 'string' ? decimal : '.';
 
     // 转换数字字符串，支持科学记数法
-    const numStr = scientificToNumber(num) + '';
+    const strNum = scientificToNumber(num) + '';
     // 整数和小数部分
-    const [intStr, decStr] = numStr.split('.');
+    const [intStr, decStr] = strNum.split('.');
 
     return symbol + formatInt(intStr, thousand) + formatDec(decStr, precision, decimal);
   };
@@ -1668,12 +1724,13 @@
    * // => 林**
    *
    */
-  function replaceChar(str = '', { start = 3, end = -4, char = '*', repeat, exclude } = {}) {
-    const strLen = str.length;
+  function replaceChar(str, { start = 3, end = -4, char = '*', repeat, exclude } = {}) {
+    const realStr = normalizeString(str);
+    const strLen = realStr.length;
 
     // 开始位置超过str长度
     if (Math.abs(start) >= strLen) {
-      return str;
+      return realStr;
     }
 
     start = start >= 0 ? start : strLen + start;
@@ -1681,10 +1738,10 @@
 
     // 开始位置大于结束位置
     if (start >= end) {
-      return str;
+      return realStr;
     }
 
-    let middleStr = str.substring(start, end);
+    let middleStr = realStr.substring(start, end);
 
     if (exclude) {
       const reg = new RegExp(`[^${exclude}]`, 'g');
@@ -1694,7 +1751,7 @@
       middleStr = char.repeat(repeat);
     }
 
-    return str.substring(0, start) + middleStr + str.substring(end);
+    return realStr.substring(0, start) + middleStr + realStr.substring(end);
   }
 
   // 简体
@@ -1733,10 +1790,10 @@
    * @returns {string} 转化的数字
    */
   function sectionToChinese(section) {
-    let str = '',
-      chnstr = '',
-      zero = false, //zero为是否进行补零， 第一次进行取余由于为个位数，默认不补零
-      unitPos = 0;
+    let str = '';
+    let chnstr = '';
+    let zero = false; //zero为是否进行补零， 第一次进行取余由于为个位数，默认不补零
+    let unitPos = 0;
 
     while (section > 0) {
       // 对数字取余10，得到的数即为个位数
@@ -1770,18 +1827,18 @@
    * @returns {string} 中文数字
    */
   function convertInteger(num) {
-    num = Math.floor(num);
+    let numInt = Math.floor(num);
 
     let unitPos = 0;
-    let strIns = '',
-      chnStr = '';
+    let strIns = '';
+    let chnStr = '';
     let needZero = false;
 
-    if (num === 0) {
+    if (numInt === 0) {
       return numberChar[0];
     }
-    while (num > 0) {
-      var section = num % 10000;
+    while (numInt > 0) {
+      var section = numInt % 10000;
       if (needZero) {
         chnStr = numberChar[0] + chnStr;
       }
@@ -1789,7 +1846,7 @@
       strIns += section !== 0 ? unitSection[unitPos] : unitSection[0];
       chnStr = strIns + chnStr;
       needZero = section < 1000 && section > 0;
-      num = Math.floor(num / 10000);
+      numInt = Math.floor(numInt / 10000);
       unitPos++;
     }
     return chnStr;
@@ -1802,13 +1859,13 @@
    * @param {number} num 要转换的数字
    */
   function convertDecimal(num) {
-    const numStr = num + '';
-    const index = numStr.indexOf('.');
+    const strNum = num + '';
+    const index = strNum.indexOf('.');
 
     let ret = '';
 
     if (index > -1) {
-      let decimalStr = numStr.slice(index + 1);
+      let decimalStr = strNum.slice(index + 1);
       ret = mapNumberChar(parseInt(decimalStr));
     }
 
@@ -1823,11 +1880,11 @@
    * @returns {string} 返回中文数字的映射
    */
   function mapNumberChar(num) {
-    const numStr = num + '';
+    const strNum = num + '';
     let ret = '';
 
-    for (let i = 0, len = numStr.length; i < len; i++) {
-      ret += numberChar[parseInt(numStr[i])];
+    for (let i = 0, len = strNum.length; i < len; i++) {
+      ret += numberChar[parseInt(strNum[i])];
     }
 
     return ret;
@@ -1878,25 +1935,10 @@
    * // => 一九九〇
    *
    */
-  function numberToChinese(
-    num,
-    {
-      big5 = false,
-      unit = true,
-      decimal = '点',
-      zero = '',
-      negative = '负',
-      unitConfig = {
-        w: '万', // '萬'
-        y: '亿' // '億'
-      }
-    } = {}
-  ) {
+  function numberToChinese(num, { big5 = false, unit = true, decimal = '点', zero = '', negative = '负', unitConfig = {} } = {}) {
     // 非数字 或 NaN 不处理
     if (typeof num !== 'number' || isNaN(num)) {
-      if (!config.disableWarning) {
-        console.warn(`参数错误 ${num}，请传入数字`);
-      }
+      devWarn(`参数错误 ${num}，请传入数字`);
 
       return '';
     }
@@ -1914,9 +1956,10 @@
     }
 
     // 设置节点计数单位，万、亿、万亿
-    const defaultUnitWan = '万';
-    const defaultUnitYi = '亿';
-    unitSection = ['', unitConfig.w || defaultUnitWan, unitConfig.y || defaultUnitYi, unitConfig.w && unitConfig.y ? unitConfig.w + unitConfig.y : defaultUnitWan + defaultUnitYi];
+    const unitWan = unitConfig?.w || '万';
+    const unitYi = unitConfig?.y || '亿';
+    const unitWanYi = unitWan + unitYi;
+    unitSection = ['', unitWan, unitYi, unitWanYi];
 
     // 设置0
     if (zero) {
@@ -1928,16 +1971,17 @@
 
     // 整数和小数
     let chnInteger, chnDecimal;
+    const numAbs = Math.abs(num);
 
     // 处理整数
     if (unit) {
-      chnInteger = convertInteger(num);
+      chnInteger = convertInteger(numAbs);
     } else {
-      chnInteger = mapNumberChar(Math.floor(num));
+      chnInteger = mapNumberChar(Math.floor(numAbs));
     }
 
     // 处理小数
-    chnDecimal = convertDecimal(num);
+    chnDecimal = convertDecimal(numAbs);
 
     return chnDecimal ? `${preStr}${chnInteger}${decimal}${chnDecimal}` : `${preStr}${chnInteger}`;
   }
@@ -1965,13 +2009,15 @@
    * // => 1 GB
    */
   function bytesToSize(bytes) {
-    if (bytes === 0) return '0 B';
+    const numBytes = typeof bytes !== 'number' ? Number(bytes) : bytes;
+    if (numBytes === 0 || isNaN(numBytes)) return '0 B';
+
     const k = 1024;
     // 存储单位
     const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    const i = Math.floor(Math.log(numBytes) / Math.log(k));
 
-    return sizes[i] ? `${Number((bytes / Math.pow(k, i)).toFixed(2))} ${sizes[i]}` : bytes + '';
+    return sizes[i] ? `${Number((numBytes / Math.pow(k, i)).toFixed(2))} ${sizes[i]}` : numBytes + '';
   }
 
   const regIdCard = /^(?<province>\d{2})(?<city>\d{2})(?<area>\d{2})(?<year>(?:\d{2})?\d{2})(?<month>\d{2})(?<day>\d{2})\d{2}(?<gender>\d)(?:\d|X)?$/i;
@@ -2112,31 +2158,17 @@
      * @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }}
      *
      */
-    let origin = {
-      province: '',
-      city: '',
-      area: '',
-      year: '',
-      month: '',
-      day: '',
-      gender: ''
+    // @ts-ignore
+    const origin = info?.groups || {
+      province: info[1],
+      city: info[2],
+      area: info[3],
+      year: info[4],
+      month: info[5],
+      day: info[6],
+      gender: info[7]
     };
 
-    if (info.groups) {
-      // @ts-ignore
-      origin = info.groups;
-    } else {
-      origin = {
-        province: info[1],
-        city: info[2],
-        area: info[3],
-        year: info[4],
-        month: info[5],
-        day: info[6],
-        gender: info[7]
-      };
-    }
-
     const province = Provinces.find((item) => item[0] === origin.province);
 
     if (!province) {
@@ -2555,6 +2587,12 @@
    * // => 4100
    */
   function round(num, precision = 0) {
+    // 兼容处理，如果参数为非数字或字符串时，直接返回
+    if ((!isNumber(num) || _isNaN(num)) && !isString(num)) {
+      // @ts-ignore
+      return num;
+    }
+
     const base = Math.pow(10, precision);
     return divide(Math.round(times(num, base)), base);
   }