@lemon-fe/components 1.4.22-alpha.2 → 1.4.22-alpha.4

package/es/data-grid/components/custom-panel/field-modal.js

@@ -194,13 +194,15 @@ export default function FieldModal(props) {
         message: fieldModal.customColumnNameTextRequired
       }, {
         validator: function validator(_, val) {
-          var _groups$find;
-          if (groupId ? (_groups$find = groups.find(function (item) {
-            return item.groupId === groupId;
-          })) === null || _groups$find === void 0 || (_groups$find = _groups$find.children) === null || _groups$find === void 0 ? void 0 : _groups$find.some(function (item) {
-            return item.headerName === val;
+          if (groupId ? groups.some(function (item) {
+            if (item.groupId === groupId) {
+              return item.children.some(function (child) {
+                return (typeof openProp === 'boolean' || child.colId !== (openProp === null || openProp === void 0 ? void 0 : openProp.id)) && child.headerName === val;
+              });
+            }
+            return false;
           }) : nodes.some(function (item) {
-            return item.title === val;
+            return (typeof openProp === 'boolean' || item.id !== (openProp === null || openProp === void 0 ? void 0 : openProp.id)) && item.title === val;
           })) {
             return Promise.reject(new Error(fieldModal.idTooltip));
           }

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

@@ -20,6 +20,14 @@ interface Props<KeyType> extends Omit<TreeProps, 'onSelect' | 'selectedKeys' | '
      * @description 是否在搜索时保留父节点
      */
     filterKeepParents?: boolean;
+    /**
+     * @description 是否在搜索时保留子孙节点
+     */
+    filterKeepDescendants?: boolean;
+    /**
+     * @description 是否高亮关键词
+     */
+    highlightKeywords?: 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", "filterKeepParents"];
+  _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "filterNode", "operation", "header", "footer", "height", "filterKeepParents", "filterKeepDescendants", "highlightKeywords"];
 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); }
@@ -74,6 +74,8 @@ export default function SiderTree(props) {
     footer = props.footer,
     heightProp = props.height,
     filterKeepParents = props.filterKeepParents,
+    filterKeepDescendants = props.filterKeepDescendants,
+    highlightKeywords = props.highlightKeywords,
     restProps = _objectWithoutProperties(props, _excluded2);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -87,47 +89,70 @@ export default function SiderTree(props) {
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     SiderTreeLocale = _useLocaleReceiver2[0];
   var tree = useMemo(function () {
-    var list = mData;
-    var items = new Set();
-    var addedNodes = new Set();
     var shouldInclude = function shouldInclude(item) {
       return filterNode ? filterNode(keywords, item) : item.title.toString().toLowerCase().includes(keywords.toLowerCase());
     };
-    if (keywords && !filterKeepParents) {
-      list = list.filter(shouldInclude);
-    }
-    var map = new Map(list.map(function (item) {
-      return [item.key, {
+    var matchedNodes = new Set();
+    var childrenIndex = new Map();
+    var nodesIndex = new Map();
+    var addedNodes = new Set();
+    var roots = [];
+    mData.forEach(function (item) {
+      var node = {
         key: item.key,
         parent: item.parent,
         icon: item.icon,
         data: item,
         title: item.title
-      }];
-    }));
-    list.forEach(function (item) {
-      if (keywords && !shouldInclude(item)) {
+      };
+      nodesIndex.set(item.key, node);
+      if (item.parent !== undefined) {
+        var children = childrenIndex.get(item.parent) || [];
+        children.push(node);
+        childrenIndex.set(item.parent, children);
+      }
+      if (!keywords || shouldInclude(item)) {
+        matchedNodes.add(node);
+      }
+    });
+    var collectAncestors = function collectAncestors(node) {
+      if (addedNodes.has(node.key)) {
         return;
       }
-      var parent;
-      var node = map.get(item.key);
-      while (node) {
-        if (addedNodes.has(node)) {
-          return;
-        }
-        parent = node.parent !== undefined ? map.get(node.parent) : undefined;
-        if (parent) {
-          parent.children = parent.children || [];
-          parent.children.push(node);
+      addedNodes.add(node.key);
+      if (node.parent !== undefined) {
+        var parentNode = nodesIndex.get(node.parent);
+        if (parentNode && (matchedNodes.has(parentNode) || filterKeepParents)) {
+          parentNode.children = parentNode.children || [];
+          parentNode.children.push(node);
+          collectAncestors(parentNode);
         } else {
-          items.add(node);
+          roots.push(node);
         }
-        addedNodes.add(node);
-        node = parent;
+      } else {
+        roots.push(node);
+      }
+    };
+    var collectChildren = function collectChildren(node) {
+      var children = childrenIndex.get(node.key) || [];
+      node.children = node.children || [];
+      children.forEach(function (child) {
+        if (addedNodes.has(child.key)) {
+          return;
+        }
+        node.children.push(child);
+        addedNodes.add(child.key);
+        collectChildren(child);
+      });
+    };
+    _toConsumableArray(matchedNodes).forEach(function (item) {
+      collectAncestors(item);
+      if (filterKeepDescendants) {
+        collectChildren(item);
       }
     });
-    return _toConsumableArray(items);
-  }, [mData, keywords, filterKeepParents]);
+    return roots;
+  }, [mData, keywords, filterKeepParents, filterKeepDescendants]);
   var handleChange = useDebounce(function (value) {
     setKeywords(value);
   }, 300);
@@ -156,7 +181,8 @@ export default function SiderTree(props) {
       return /*#__PURE__*/React.createElement(TreeNodeTitle, {
         operation: operation,
         node: node.data,
-        prefixCls: prefixCls
+        prefixCls: prefixCls,
+        highlightKeywords: highlightKeywords ? keywords : undefined
       });
     },
     onSelect: function onSelect(keys, info) {

package/es/sider-tree/tree-node-title.d.ts

@@ -4,6 +4,7 @@ interface Props<T> {
     node: TreeData<T>;
     prefixCls: string;
     operation?: OperationType<T>;
+    highlightKeywords?: string;
 }
 export default function TreeNodeTitle<T>(props: Props<T>): JSX.Element;
 export {};

package/es/sider-tree/tree-node-title.js

@@ -8,10 +8,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { Popover } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
+import { Popover, Typography } from 'antd';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { useLocaleReceiver } from "../locale-receiver";
 import classNames from 'classnames';
+var Text = Typography.Text;
 export default function TreeNodeTitle(props) {
   var _operation$others;
   var item = props.node,
@@ -46,17 +47,31 @@ export default function TreeNodeTitle(props) {
       title = null;
     };
   }, []);
+  var title = useMemo(function () {
+    if (!props.highlightKeywords) {
+      return item.title;
+    }
+    var searchValue = props.highlightKeywords;
+    var strTitle = item.title.toString();
+    var index = strTitle.indexOf(searchValue);
+    if (index === -1) {
+      return strTitle;
+    }
+    return /*#__PURE__*/React.createElement("span", null, strTitle.slice(0, index), /*#__PURE__*/React.createElement(Text, {
+      type: "danger"
+    }, strTitle.substring(index, index + searchValue.length)), strTitle.slice(index + searchValue.length));
+  }, [item.title, props.highlightKeywords]);
   if (!operation) {
     return /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-title-content")
-    }, item.title);
+    }, title);
   }
   var others = (_operation$others = operation.others) === null || _operation$others === void 0 ? void 0 : _operation$others.call(operation, item);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-title-content"),
     ref: trigger,
     title: item.title.toString()
-  }, item.title), /*#__PURE__*/React.createElement("div", {
+  }, title), /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefixCls, "-title-operators"),
     style: {
       display: visible || show ? 'block' : 'none'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.22-alpha.2",
+  "version": "1.4.22-alpha.4",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "b558090241f16b9e2be6079f6d8a8fad1e212cb7"
+  "gitHead": "ff08fa04ab97d9f6ab0e9c9130e96be8e66c1bc6"
 }