@egova/egova-api 1.3.14 → 1.3.15

package/dist/index.common.js

@@ -11033,14 +11033,25 @@ var tree_ProjectTree = /** @class */function (_super) {
    * @param node
    */
   ProjectTree.prototype.match = function (node) {
-    var _this = this;
-    var matched = (node.title || node.name).indexOf(this.keyword) !== -1;
+    // 关键词匹配
+    var keywordMatched = !this.keyword || (node.title || node.name).indexOf(this.keyword) !== -1;
+    // 方法匹配
+    var methodMatched = this.type === "all" || !node.method || this.type === node.method;
+    var selfMatched = keywordMatched && methodMatched;
+    // 检查子节点匹配情况
     var childrenMatched = false;
-    if (!matched && node.children) {
-      node.children.forEach(function (v) {
-        childrenMatched = _this.match(v).matched || _this.match(v).childrenMatched || childrenMatched;
-      });
+    if (node.children && node.children.length > 0) {
+      for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
+        var child = _a[_i];
+        var result = this.match(child);
+        if (result.matched || result.childrenMatched) {
+          childrenMatched = true;
+          break;
+        }
+      }
     }
+    // 节点匹配成功或者有子节点匹配成功都认为是匹配的
+    var matched = selfMatched || childrenMatched;
     return {
       matched: matched,
       childrenMatched: childrenMatched
@@ -11053,20 +11064,30 @@ var tree_ProjectTree = /** @class */function (_super) {
   ProjectTree.prototype.filterData = function (data) {
     var _this = this;
     if (!data || !Array.isArray(data)) return data;
-    var d = data.filter(function (v) {
-      return _this.match(v).childrenMatched;
-    });
-    d = d.map(function (v) {
-      if (v.children) {
-        v.expand = true;
-        v.children = _this.filterData(v.children);
+    return data.map(function (node) {
+      var newNode = node.$clone ? node.$clone() : __assign({}, node);
+      var matchResult = _this.match(node);
+      // 如果节点匹配或者有匹配的子节点，则保留在结果中
+      if (matchResult.matched) {
+        if (newNode.children && newNode.children.length > 0) {
+          newNode.expand = true;
+          newNode.children = _this.filterData(newNode.children);
+        }
+        return newNode;
       }
-      return v;
+      // 如果当前节点不匹配，但有匹配的子节点，也保留在结果中
+      if (matchResult.childrenMatched) {
+        newNode.expand = true;
+        if (newNode.children && newNode.children.length > 0) {
+          newNode.children = _this.filterData(newNode.children);
+        }
+        return newNode;
+      }
+      // 节点不匹配也不包含匹配的子节点，则不包含在结果中
+      return null;
+    }).filter(function (node) {
+      return node !== null;
     });
-    d = d.concat(data.filter(function (v) {
-      return _this.match(v).matched;
-    }));
-    return d;
   };
   ProjectTree.prototype.onSelectParent = function (group) {
     this.parent = group;

package/dist/index.umd.js

@@ -11042,14 +11042,25 @@ var tree_ProjectTree = /** @class */function (_super) {
    * @param node
    */
   ProjectTree.prototype.match = function (node) {
-    var _this = this;
-    var matched = (node.title || node.name).indexOf(this.keyword) !== -1;
+    // 关键词匹配
+    var keywordMatched = !this.keyword || (node.title || node.name).indexOf(this.keyword) !== -1;
+    // 方法匹配
+    var methodMatched = this.type === "all" || !node.method || this.type === node.method;
+    var selfMatched = keywordMatched && methodMatched;
+    // 检查子节点匹配情况
     var childrenMatched = false;
-    if (!matched && node.children) {
-      node.children.forEach(function (v) {
-        childrenMatched = _this.match(v).matched || _this.match(v).childrenMatched || childrenMatched;
-      });
+    if (node.children && node.children.length > 0) {
+      for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
+        var child = _a[_i];
+        var result = this.match(child);
+        if (result.matched || result.childrenMatched) {
+          childrenMatched = true;
+          break;
+        }
+      }
     }
+    // 节点匹配成功或者有子节点匹配成功都认为是匹配的
+    var matched = selfMatched || childrenMatched;
     return {
       matched: matched,
       childrenMatched: childrenMatched
@@ -11062,20 +11073,30 @@ var tree_ProjectTree = /** @class */function (_super) {
   ProjectTree.prototype.filterData = function (data) {
     var _this = this;
     if (!data || !Array.isArray(data)) return data;
-    var d = data.filter(function (v) {
-      return _this.match(v).childrenMatched;
-    });
-    d = d.map(function (v) {
-      if (v.children) {
-        v.expand = true;
-        v.children = _this.filterData(v.children);
+    return data.map(function (node) {
+      var newNode = node.$clone ? node.$clone() : __assign({}, node);
+      var matchResult = _this.match(node);
+      // 如果节点匹配或者有匹配的子节点，则保留在结果中
+      if (matchResult.matched) {
+        if (newNode.children && newNode.children.length > 0) {
+          newNode.expand = true;
+          newNode.children = _this.filterData(newNode.children);
+        }
+        return newNode;
       }
-      return v;
+      // 如果当前节点不匹配，但有匹配的子节点，也保留在结果中
+      if (matchResult.childrenMatched) {
+        newNode.expand = true;
+        if (newNode.children && newNode.children.length > 0) {
+          newNode.children = _this.filterData(newNode.children);
+        }
+        return newNode;
+      }
+      // 节点不匹配也不包含匹配的子节点，则不包含在结果中
+      return null;
+    }).filter(function (node) {
+      return node !== null;
     });
-    d = d.concat(data.filter(function (v) {
-      return _this.match(v).matched;
-    }));
-    return d;
   };
   ProjectTree.prototype.onSelectParent = function (group) {
     this.parent = group;