util-helpers 4.15.0 → 4.15.1

package/dist/util-helpers.js

@@ -537,7 +537,7 @@
   }
 
   // eslint-disable-next-line no-undef
-  var version = "4.15.0";
+  var version = "4.15.1";
 
   /**
    * 打印警告信息
@@ -2441,24 +2441,21 @@
    *
    */
   function parseIdCard(id) {
-    if (!regIdCard.test(id)) {
+    var match = regIdCard.exec(id);
+    if (!match) {
       return null;
     }
 
-    /** @type {RegExpExecArray} */
-    // @ts-ignore
-    var info = regIdCard.exec(id);
-
     /** @type {{ province: string, city: string, area: string, year: string, month: string, day: string, gender: string }} */
     // @ts-ignore
-    var origin = (info === null || info === void 0 ? void 0 : info.groups) || {
-      province: info[1],
-      city: info[2],
-      area: info[3],
-      year: info[4],
-      month: info[5],
-      day: info[6],
-      gender: info[7]
+    var origin = match.groups || {
+      province: match[1],
+      city: match[2],
+      area: match[3],
+      year: match[4],
+      month: match[5],
+      day: match[6],
+      gender: match[7]
     };
     var province = Provinces.find(function (item) {
       return item[0] === origin.province;
@@ -2744,8 +2741,7 @@
      * @param {Array.<object>} arr 列表数据
      * @returns {*}
      */
-    function recusion() {
-      var arr = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    function recusion(arr) {
       return arr.map(function (item) {
         if (!isObject(item)) {
           return item;
@@ -2793,29 +2789,30 @@
    * @private
    * @template {Record<string,any>} [T=Record<string,any>]
    * @param {T[]} arr 列表数据
-   * @param {object} options 配置项
+   * @param {object} [options] 配置项
    * @param {string} [options.childrenField='children'] 子级字段名称
-   * @param {'none'|'null'|'array'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
-   */
-  function processEmptyChildren(arr) {
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var _options$childrenFiel = options.childrenField,
-      childrenField = _options$childrenFiel === void 0 ? 'children' : _options$childrenFiel,
-      _options$emptyChildre = options.emptyChildrenValue,
-      emptyChildrenValue = _options$emptyChildre === void 0 ? 'none' : _options$emptyChildre;
+   * @param {'none'|'null'} [options.emptyChildrenValue='none'] 子级为空时的值，none表示删除该子级，null表示为null，array表示为[]。
+   */
+  function processEmptyChildren(arr, options) {
+    var _ref = options || {},
+      _ref$childrenField = _ref.childrenField,
+      childrenField = _ref$childrenField === void 0 ? 'children' : _ref$childrenField,
+      _ref$emptyChildrenVal = _ref.emptyChildrenValue,
+      emptyChildrenValue = _ref$emptyChildrenVal === void 0 ? 'none' : _ref$emptyChildrenVal;
     arr.forEach(function (item) {
-      if (isObject(item) && Array.isArray(item[childrenField])) {
-        if (item[childrenField].length <= 0) {
-          if (emptyChildrenValue === 'null') {
-            // @ts-ignore
-            item[childrenField] = null;
-          } else if (emptyChildrenValue === 'none') {
-            delete item[childrenField];
-          }
+      // if (isObject(item) && Array.isArray(item[childrenField])) {
+      if (item[childrenField].length <= 0) {
+        if (emptyChildrenValue === 'null') {
+          // @ts-ignore
+          item[childrenField] = null;
+          // } else if (emptyChildrenValue === 'none') { // emptyChildrenValue='array' 不会执行该内部方法 
         } else {
-          processEmptyChildren(item[childrenField], options);
+          delete item[childrenField];
         }
+      } else {
+        processEmptyChildren(item[childrenField], options);
       }
+      // }
     });
   }
 
@@ -2828,7 +2825,7 @@
    * @template {Record<string,any>} [T=Record<string,any>]
    * @template {*} [R=T&Record<string,any>]
    * @param {T[]} list 列表数据
-   * @param {object} options 配置项
+   * @param {object} [options] 配置项
    * @param {string} [options.keyField='id'] 当前数据的键值字段名称
    * @param {string} [options.parentField='pid'] 当前数据的父级字段名称
    * @param {string} [options.childrenField='children'] 子级字段名称
@@ -2854,24 +2851,27 @@
    * // [{"id":"1","name":"首页","code":"trade","pid":null},{"id":"2","name":"交易管理","code":"trade","pid":null,"childs":[{"id":"3","name":"交易查询","code":"trade-1","pid":"2","childs":[{"id":"4","name":"交易查询-查询操作","code":"trade-1-1","pid":"3"}]}]},{"id":"5","name":"权限管理","code":"authorization","pid":null,"childs":[{"id":"6","name":"角色管理","code":"authorization-1","pid":"5"},{"id":"7","name":"用户管理","code":"authorization-2","pid":"5"}]}]
    * 
    */
-  function listToTree(list) {
-    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var _options$keyField = options.keyField,
-      keyField = _options$keyField === void 0 ? 'id' : _options$keyField,
-      _options$parentField = options.parentField,
-      parentField = _options$parentField === void 0 ? 'pid' : _options$parentField,
-      _options$childrenFiel2 = options.childrenField,
-      childrenField = _options$childrenFiel2 === void 0 ? 'children' : _options$childrenFiel2,
-      _options$emptyChildre2 = options.emptyChildrenValue,
-      emptyChildrenValue = _options$emptyChildre2 === void 0 ? 'none' : _options$emptyChildre2,
-      _options$nodeAssign = options.nodeAssign,
-      nodeAssign = _options$nodeAssign === void 0 ? 'spread' : _options$nodeAssign;
+  function listToTree(list, options) {
+    var _ref2 = options || {},
+      _ref2$keyField = _ref2.keyField,
+      keyField = _ref2$keyField === void 0 ? 'id' : _ref2$keyField,
+      _ref2$parentField = _ref2.parentField,
+      parentField = _ref2$parentField === void 0 ? 'pid' : _ref2$parentField,
+      _ref2$childrenField = _ref2.childrenField,
+      childrenField = _ref2$childrenField === void 0 ? 'children' : _ref2$childrenField,
+      _ref2$emptyChildrenVa = _ref2.emptyChildrenValue,
+      emptyChildrenValue = _ref2$emptyChildrenVa === void 0 ? 'none' : _ref2$emptyChildrenVa,
+      _ref2$nodeAssign = _ref2.nodeAssign,
+      nodeAssign = _ref2$nodeAssign === void 0 ? 'spread' : _ref2$nodeAssign;
 
     /** @type {R[]} */
     var tree = [];
 
     /** @type {Object.<string, T[]>} */
     var record = {};
+    if (!Array.isArray(list)) {
+      return tree;
+    }
     list.forEach(function (item) {
       if (isObject(item)) {
         var newItem = nodeAssign === 'spread' ? _objectSpread2({}, item) : item;
@@ -2928,6 +2928,9 @@
   function treeToList(tree, childrenField) {
     /** @type {R[]} */
     var list = [];
+    if (!Array.isArray(tree)) {
+      return list;
+    }
 
     /**
      * 递归遍历
@@ -2939,7 +2942,7 @@
           var newItem = _objectSpread2({}, item);
           // @ts-ignore
           list.push(newItem);
-          if (newItem !== null && newItem !== void 0 && newItem[childrenField]) {
+          if (newItem[childrenField]) {
             if (Array.isArray(newItem[childrenField]) && newItem[childrenField].length > 0) {
               recusion(newItem[childrenField]);
             }
@@ -2984,12 +2987,11 @@
   function filterTree(tree, predicate) {
     var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
     var nodeAssign = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'spread';
-    if (!Array.isArray(tree)) {
-      return tree;
-    }
-
     /** @type {T[]} */
     var result = [];
+    if (!Array.isArray(tree)) {
+      return result;
+    }
     tree.forEach(function (item) {
       var newItem = item;
       if (isObject(item)) {
@@ -3292,14 +3294,12 @@
 
   /**
    * @private
-   * @param {number} [len=0] 长度
-   * @param {string} [optionalChars] 允许的字符，默认为数字和大小写字母
+   * @param {number} len 长度
+   * @param {string} optionalChars 允许的字符，默认为数字和大小写字母
    * @param {string} [prefix=''] 前缀部分，不计入长度
    * @returns {string}
    */
-  function internalRandomString() {
-    var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
-    var optionalChars = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : defaultChars;
+  function internalRandomString(len, optionalChars) {
     var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
     while (len-- > 0) {
       var r = optionalChars[Math.floor(Math.random() * optionalChars.length)];
@@ -3396,6 +3396,9 @@
 
     /** @type {T|undefined} */
     var node;
+    if (!Array.isArray(tree)) {
+      return node;
+    }
     var _iterator = _createForOfIteratorHelper(tree),
       _step;
     try {
@@ -3464,6 +3467,9 @@
 
     /** @type {T[]} */
     var nodes = [];
+    if (!Array.isArray(tree)) {
+      return nodes;
+    }
     var _iterator = _createForOfIteratorHelper(tree),
       _step;
     try {
@@ -3503,14 +3509,13 @@
    * @template {(item: T) => boolean} F
    * @param {T[]} tree 树结构数据
    * @param {F} predicate 遍历每一项执行的函数，参数是当前遍历到的节点数据，如果返回 Truthy 将返回包含该节点的所有父级节点
-   * @param {string} [childrenField='children'] 子级字段名
+   * @param {string} [childrenField] 子级字段名
    * @param {T[]} [path=[]] 当前遍历路径
    * @returns {T[]}
    */
-  function internalFindTreeSelect(tree, predicate) {
-    var childrenField = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
+  function internalFindTreeSelect(tree, predicate, childrenField) {
     var path = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
-    if (!tree) {
+    if (!Array.isArray(tree)) {
       return [];
     }
     var _iterator = _createForOfIteratorHelper(tree),