@lemon-fe/components 1.4.12 → 1.4.13-alpha.0

package/es/sider-tree/index.d.ts

@@ -16,6 +16,10 @@ interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | '
     defaultExpandedKeys?: KeyType[];
     active?: boolean;
     height?: number | 'auto';
+    /**
+     * @description 是否在搜索时保留父节点
+     */
+    filterKeepParents?: boolean;
 }
 declare function SiderTreeTabs(props: {
     tabs: {

package/es/sider-tree/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["tabs", "children"],
-  _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "filterNode", "operation", "header", "footer", "height"];
+  _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "filterNode", "operation", "header", "footer", "height", "filterKeepParents"];
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -73,6 +73,7 @@ export default function SiderTree(props) {
     header = props.header,
     footer = props.footer,
     heightProp = props.height,
+    filterKeepParents = props.filterKeepParents,
     restProps = _objectWithoutProperties(props, _excluded2);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -87,14 +88,13 @@ export default function SiderTree(props) {
     SiderTreeLocale = _useLocaleReceiver2[0];
   var tree = useMemo(function () {
     var list = mData;
-    if (keywords) {
-      list = list.filter(function (item) {
-        if (filterNode) {
-          return filterNode(keywords, item);
-        } else {
-          return item.title.toString().toLowerCase().includes(keywords.toLowerCase());
-        }
-      });
+    var items = new Set();
+    var addedNodes = new Set();
+    var shouldInclude = function shouldInclude(item) {
+      return filterNode ? filterNode(keywords, item) : item.title.toString().includes(keywords);
+    };
+    if (keywords && !filterKeepParents) {
+      list = list.filter(shouldInclude);
     }
     var map = new Map(list.map(function (item) {
       return [item.key, {
@@ -102,30 +102,32 @@ export default function SiderTree(props) {
         parent: item.parent,
         icon: item.icon,
         data: item,
-        title: /*#__PURE__*/React.createElement(TreeNodeTitle, {
-          operation: operation,
-          node: item,
-          prefixCls: prefix()
-        })
+        title: item.title
       }];
     }));
-    var items = [];
-    _toConsumableArray(map.values()).forEach(function (item) {
-      var parent;
-      if (item.parent !== undefined) {
-        parent = map.get(item.parent);
+    list.forEach(function (item) {
+      if (keywords && !shouldInclude(item)) {
+        return;
       }
-      if (!parent) {
-        items.push(item);
-      } else {
-        if (parent.children === undefined) {
-          parent.children = [];
+      var parent;
+      var node = map.get(item.key);
+      while (node) {
+        if (addedNodes.has(node)) {
+          return;
+        }
+        parent = node.parent ? map.get(node.parent) : undefined;
+        if (parent) {
+          parent.children = parent.children || [];
+          parent.children.push(node);
+        } else {
+          items.add(node);
         }
-        parent.children.push(item);
+        addedNodes.add(node);
+        node = parent;
       }
     });
-    return items;
-  }, [mData, keywords]);
+    return _toConsumableArray(items);
+  }, [mData, keywords, filterKeepParents]);
   var handleChange = useDebounce(function (value) {
     setKeywords(value);
   }, 300);
@@ -141,14 +143,23 @@ export default function SiderTree(props) {
       prefix: /*#__PURE__*/React.createElement(Icons.Search, null)
     });
   }
+  var prefixCls = prefix();
   var bodyContent = tree.length <= 0 ? /*#__PURE__*/React.createElement("div", {
     className: prefix('empty')
   }, /*#__PURE__*/React.createElement(EmptyImage, null), /*#__PURE__*/React.createElement("div", null, SiderTreeLocale.noDataText)) : /*#__PURE__*/React.createElement(Tree, _extends({
+    // @ts-ignore antd Tree type error
     treeData: tree,
     itemHeight: 28,
     showLine: true,
     height: height,
-    onSelect: function onSelect(_, info) {
+    titleRender: function titleRender(node) {
+      return /*#__PURE__*/React.createElement(TreeNodeTitle, {
+        operation: operation,
+        node: node.data,
+        prefixCls: prefixCls
+      });
+    },
+    onSelect: function onSelect(keys, info) {
       if (_onSelect) {
         _onSelect(info.node.data, info);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.12",
+  "version": "1.4.13-alpha.0",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "3115130fcdb626142ac775355fc2ae79a79dd647"
+  "gitHead": "00899f57f0b55f7f3a06850c2d264a47ba675a44"
 }