dlsjs 0.1.19 → 0.1.21

package/package.json

@@ -3,7 +3,7 @@
   "author": "林川",
   "license": "MIT",
   "private": false,
-  "version": "0.1.19",
+  "version": "0.1.21",
   "description": "domain-language for js",
   "main": "dist/dlsjs.esm.js",
   "module": "dist/dlsjs.esm.js",

package/src/core/ES/Tree.js

@@ -162,16 +162,16 @@ export function forkProp(obj, leafKey, propName) {
 
 /**
  * 维表转树
- * @param dimList
- * @param dimLink
- * @param dimMap
+ * @param dimList 平铺维表
+ * @param dimLink 维表关联关系 e.g.['市','区县','乡镇']
+ * @param dimMap 维表关联映射字段 e.g.{'市': {propFieldName: 'code1', textFieldName: 'name1'}, '区': {propFieldName: 'code2', textFieldName: 'name2'}, '乡镇': {propFieldName: 'code3', textFieldName: 'name3'}}
  */
 export function dim2Tree(dimList, dimLink, dimMap) {
     let filedSort = [];
     if (dimLink.length) {
         for (let propName of dimLink) {
             if (!propName) continue;
-            let match = dimMap.find(item => item.propName === propName);
+            let match = dimMap[propName]
             filedSort.push(match);
         }
     }
@@ -203,8 +203,9 @@ export function treeFilter(treeLike, func) {
     setParentIds4List(list)
     const res = list.filter(func)
     const resParentIds = res.map(item => item._parentIds).flat()
-    const res2 = list.filter(item => resParentIds.includes(item.id))
-    return list2Tree([res, res2])
+    const resIds = res.map(item => item.id)
+    const res2 = list.filter(item => resParentIds.includes(item.id) || resIds.includes(item.id))
+    return list2Tree(res2)
 }
 
 /**