@egova/egova-api 1.0.264 → 1.0.265

package/dist/index.common.js

@@ -65849,6 +65849,7 @@ var project_detail_tree = __webpack_require__("9355");
 
 
 
+
 var project_detail_tree_extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -66392,25 +66393,45 @@ function (_super) {
     }
 
     this.renderData = this.filterData(this.data.$clone());
-  };
+  }; // /**
+  //  * 判断一个节点是否是与关键字匹配的叶子节点，或者是包含符合条件的叶子节点的祖先节点
+  //  * @param node
+  //  */
+  // public match(node: any) {
+  //     if (!node.children || node.children.length === 0) {
+  //         return (node.title || node.name).indexOf(this.keyword) !== -1 && (this.type === "all" || this.type === node.method);
+  //     } else {
+  //         let flag = false;
+  //         node.children.forEach((v: any) => {
+  //             flag = this.match(v) ? this.match(v) : flag;
+  //         });
+  //         return flag;
+  //     }
+  // }
+
   /**
-   * 判断一个节点是否是与关键字匹配的叶子节点，或者是包含符合条件的叶子节点的祖先节点
-   * @param node
-   */
+  * 判断一个节点是否是与关键字匹配的叶子节点或者目录节点，或者是包含符合条件的叶子节点的祖先节点
+  * 如果匹配的是目录节点，那么目录下的节点无需过滤
+  * @param node
+  */
 
 
   ProjectTree.prototype.match = function (node) {
     var _this = this;
 
-    if (!node.children || node.children.length === 0) {
-      return (node.title || node.name).indexOf(this.keyword) !== -1 && (this.type === "all" || this.type === node.method);
-    } else {
-      var flag_1 = false;
+    var matched = (node.title || node.name).indexOf(this.keyword) !== -1;
+    var childrenMatched = false;
+
+    if (!matched && node.children) {
       node.children.forEach(function (v) {
-        flag_1 = _this.match(v) ? _this.match(v) : flag_1;
+        childrenMatched = _this.match(v).matched || _this.match(v).childrenMatched || childrenMatched;
       });
-      return flag_1;
     }
+
+    return {
+      matched: matched,
+      childrenMatched: childrenMatched
+    };
   };
   /**
    * 处理渲染数据，只保留与关键字匹配的叶子节点和其祖先节点
@@ -66423,15 +66444,19 @@ function (_super) {
 
     if (!data || !Array.isArray(data)) return data;
     var d = data.filter(function (v) {
-      return _this.match(v);
+      return _this.match(v).childrenMatched;
     });
     d = d.map(function (v) {
       if (v.children) {
+        v.expand = true;
         v.children = _this.filterData(v.children);
       }
 
       return v;
     });
+    d = d.concat(data.filter(function (v) {
+      return _this.match(v).matched;
+    }));
     return d;
   };
 

package/dist/index.umd.js

@@ -65858,6 +65858,7 @@ var project_detail_tree = __webpack_require__("9355");
 
 
 
+
 var project_detail_tree_extends = undefined && undefined.__extends || function () {
   var _extendStatics = function extendStatics(d, b) {
     _extendStatics = Object.setPrototypeOf || {
@@ -66401,25 +66402,45 @@ function (_super) {
     }
 
     this.renderData = this.filterData(this.data.$clone());
-  };
+  }; // /**
+  //  * 判断一个节点是否是与关键字匹配的叶子节点，或者是包含符合条件的叶子节点的祖先节点
+  //  * @param node
+  //  */
+  // public match(node: any) {
+  //     if (!node.children || node.children.length === 0) {
+  //         return (node.title || node.name).indexOf(this.keyword) !== -1 && (this.type === "all" || this.type === node.method);
+  //     } else {
+  //         let flag = false;
+  //         node.children.forEach((v: any) => {
+  //             flag = this.match(v) ? this.match(v) : flag;
+  //         });
+  //         return flag;
+  //     }
+  // }
+
   /**
-   * 判断一个节点是否是与关键字匹配的叶子节点，或者是包含符合条件的叶子节点的祖先节点
-   * @param node
-   */
+  * 判断一个节点是否是与关键字匹配的叶子节点或者目录节点，或者是包含符合条件的叶子节点的祖先节点
+  * 如果匹配的是目录节点，那么目录下的节点无需过滤
+  * @param node
+  */
 
 
   ProjectTree.prototype.match = function (node) {
     var _this = this;
 
-    if (!node.children || node.children.length === 0) {
-      return (node.title || node.name).indexOf(this.keyword) !== -1 && (this.type === "all" || this.type === node.method);
-    } else {
-      var flag_1 = false;
+    var matched = (node.title || node.name).indexOf(this.keyword) !== -1;
+    var childrenMatched = false;
+
+    if (!matched && node.children) {
       node.children.forEach(function (v) {
-        flag_1 = _this.match(v) ? _this.match(v) : flag_1;
+        childrenMatched = _this.match(v).matched || _this.match(v).childrenMatched || childrenMatched;
       });
-      return flag_1;
     }
+
+    return {
+      matched: matched,
+      childrenMatched: childrenMatched
+    };
   };
   /**
    * 处理渲染数据，只保留与关键字匹配的叶子节点和其祖先节点
@@ -66432,15 +66453,19 @@ function (_super) {
 
     if (!data || !Array.isArray(data)) return data;
     var d = data.filter(function (v) {
-      return _this.match(v);
+      return _this.match(v).childrenMatched;
     });
     d = d.map(function (v) {
       if (v.children) {
+        v.expand = true;
         v.children = _this.filterData(v.children);
       }
 
       return v;
     });
+    d = d.concat(data.filter(function (v) {
+      return _this.match(v).matched;
+    }));
     return d;
   };