fix #55

x-extends · Aug 18, 2023 · 3ea376a · 3ea376a
1 parent 468a6dc
commit 3ea376a
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 7 deletions.
diff --git a/docs/favicon.ico b/docs/favicon.ico
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/xe-utils/favicon.ico"><meta name="description" content="xe-utils 函数库、工具类，vxe-table 表格解决方案."><title>xe-utils 函数库、工具类</title><script>var _hmt=_hmt||[];(function(){if(location.host.indexOf("localhost")===-1){var b=document.createElement("script");b.src="https://hm.baidu.com/hm.js?bb92c84d2dff18210f9be4cf2aa28fee";b.onload=function(){_hmt.push(["_requirePlugin","UrlChangeTracker",{shouldTrackUrlChange:function(c,d){return c&&d}}])};var a=document.getElementsByTagName("script")[0];a.parentNode.insertBefore(b,a)}})();</script><script data-mode="hash" charset="UTF-8" src="https://cdn.wwads.cn/js/makemoney.js" async></script><style>.pagead-right {position: fixed;right: 20px;top: 50px;width: 280px;z-index: 99;}</style><link href="/xe-utils/static/css/app.2b94ba7e.css" rel="preload" as="style"><link href="/xe-utils/static/css/chunk-vendors.42851454.css" rel="preload" as="style"><link href="/xe-utils/static/js/app.1d269360.js" rel="preload" as="script"><link href="/xe-utils/static/js/chunk-vendors.81bac7f4.js" rel="preload" as="script"><link href="/xe-utils/static/css/chunk-vendors.42851454.css" rel="stylesheet"><link href="/xe-utils/static/css/app.2b94ba7e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but xe-utils doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div class="pagead-right"><div class="wwads-cn wwads-vertical" data-id="214" style="max-width:180px;margin: 20px auto 0 auto;"></div></div><div id="app"></div><script src="https://cdn.jsdelivr.net/npm/xe-utils"></script><script src="https://cdn.jsdelivr.net/npm/xe-ajax"></script><script src="https://cdn.jsdelivr.net/npm/xe-clipboard"></script><script src="/xe-utils/static/js/chunk-vendors.81bac7f4.js"></script><script src="/xe-utils/static/js/app.1d269360.js"></script></body></html>
diff --git a/docs/logo.png b/docs/logo.png
diff --git a/docs/static/css/app.2b94ba7e.css b/docs/static/css/app.2b94ba7e.css
diff --git a/docs/static/css/chunk-vendors.42851454.css b/docs/static/css/chunk-vendors.42851454.css
diff --git a/docs/static/js/app.1d269360.js b/docs/static/js/app.1d269360.js
diff --git a/docs/static/js/chunk-vendors.81bac7f4.js b/docs/static/js/chunk-vendors.81bac7f4.js
diff --git a/func/toArrayTree.js b/func/toArrayTree.js
@@ -4,15 +4,15 @@ var map = require('./map')
 var orderBy = require('./orderBy')
 
 var clone = require('./clone')
-var includes = require('./includes')
+var eqNull = require('./eqNull')
 var each = require('./each')
 var remove = require('./remove')
 
 var assign = require('./assign')
 
 function strictTree (array, optChildren) {
   each(array, function (item) {
-    if (item.children && !item.children.length) {
+    if (item[optChildren] && !item[optChildren].length) {
       remove(item, optChildren)
     }
   })
@@ -73,7 +73,7 @@ function toArrayTree (array, options) {
       treeData[optMapChildren] = treeMap[id]
     }
 
-    if (!optStrict || (optStrict && !parentId)) {
+    if (!optStrict || (optStrict && eqNull(parentId))) {
       if (!idsMap[parentId]) {
         result.push(treeData)
       }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "xe-utils",
-  "version": "3.5.11",
+  "version": "3.5.12",
   "description": "JavaScript 函数库、工具类",
   "main": "index.js",
   "unpkg": "dist/xe-utils.umd.min.js",

diff --git a/src/views/API.vue b/src/views/API.vue
@@ -2190,9 +2190,8 @@ export default {
             //         ]
             //       }
             //     ]
-            //     XEUtils.filterTree(tree1, item => item.id === 1) 
+            //     XEUtils.filterTree(tree1, item => item.id === 1)
             //     // { id: 1 }
-
             //     var tree2 = [
             //       { id: 1 },
             //       {
@@ -2208,7 +2207,7 @@ export default {
             //         ]
             //       }
             //     ]
-            //     XEUtils.filterTree(tree2, item => item.id >= 3, {children: 'childs'}) 
+            //     XEUtils.filterTree(tree2, item => item.id >= 3, {children: 'childs'})
             //     // [
             //     //   {
             //     //     id: 3,