@lemon-fe/components 1.4.9 → 1.4.11

package/es/data-grid/components/custom-panel/index.js

@@ -120,22 +120,24 @@ export default function CustomColumnPanel(params) {
         path.unshift(node);
         parent = parent.getOriginalParent();
       }
-      for (var i = 0; i < path.length; i++) {
+      var mergeFlag = false;
+      for (var i = path.length - 1; i >= 0; i--) {
         var node1 = prevPath[i];
         var node2 = path[i];
         if (node1 !== undefined && node2 !== undefined && node1.id === node2.id) {
-          node1.children = [].concat(_toConsumableArray(node1.children), _toConsumableArray(node2.children));
+          if (!mergeFlag) {
+            node1.children = [].concat(_toConsumableArray(node1.children), _toConsumableArray(node2.children));
+            mergeFlag = true;
+          }
           node1.leaf = [].concat(_toConsumableArray(node1.leaf), _toConsumableArray(node2.leaf));
           node1.disabled = node1.disabled && node2.disabled;
           node1.visible = node1.visible === 1 && node2.visible === 1 ? 1 : node1.visible === 1 || node2.visible === 1 ? 2 : 0;
           path[i] = node1;
-          continue;
-        }
-        if (i === 0) {
-          items.push(path[0]);
-          break;
         }
       }
+      if (!mergeFlag) {
+        items.push(path[0]);
+      }
       prevPath = path;
     });
     return items;

package/es/data-grid/components/search.js

@@ -11,7 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { Button, Input, Space } from 'antd';
-import React, { forwardRef, memo, useState, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, memo, useState, useImperativeHandle, useMemo, useRef } from 'react';
 import { useLocaleReceiver } from "../../locale-receiver";
 import { useGridStore } from "../hooks";
 import { useDebounce } from '@lemon-fe/hooks';
@@ -38,11 +38,18 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
   var _useLocaleReceiver = useLocaleReceiver('DataGrid'),
     _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 1),
     dataGridLocale = _useLocaleReceiver2[0];
+  var searching = useRef(false);
   var handleSearch = useDebounce(function (str) {
     var keywords = str.trim();
+    var finish = function finish(newState) {
+      searching.current = false;
+      setState(function (pre) {
+        return _objectSpread(_objectSpread({}, pre), newState);
+      });
+      return newState;
+    };
     if (keywords.length <= 0) {
-      setState(defaultState);
-      return;
+      return finish(defaultState);
     }
     var cols = [];
     if (searchFields) {
@@ -78,11 +85,9 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
         }
       }
     });
-    setState(function (prev) {
-      return _objectSpread(_objectSpread({}, prev), {}, {
-        nodes: nodes,
-        index: -1
-      });
+    return finish({
+      nodes: nodes,
+      index: -1
     });
   }, 300);
   var focusCell = function focusCell(index) {
@@ -119,12 +124,13 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
       });
     });
   };
-  var handleNext = function handleNext() {
-    if (state.nodes.length <= 0) {
+  var handleNext = function handleNext(value) {
+    var data = value;
+    if (data.nodes.length <= 0) {
       return;
     }
-    var idx = (state.index + 1) % state.nodes.length;
-    focusCell(state.nodes[idx].index);
+    var idx = (data.index + 1) % data.nodes.length;
+    focusCell(data.nodes[idx].index);
     setState(function (prev) {
       return _objectSpread(_objectSpread({}, prev), {}, {
         index: idx
@@ -148,12 +154,13 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
           keywords: e.target.value
         });
       });
+      searching.current = true;
       handleSearch(e.target.value);
     },
     suffix: /*#__PURE__*/React.createElement("span", null, "".concat(state.index + 1, "/").concat(state.nodes.length)),
-    onKeyUp: function onKeyUp(e) {
+    onKeyDown: function onKeyDown(e) {
       if (e.key === 'Enter') {
-        handleNext();
+        handleNext(searching.current ? handleSearch.flush() : state);
       }
     }
   }), /*#__PURE__*/React.createElement(Button, {
@@ -161,6 +168,8 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
     onClick: handlePrev
   }, dataGridLocale.searchPrevText), /*#__PURE__*/React.createElement(Button, {
     size: "small",
-    onClick: handleNext
+    onClick: function onClick() {
+      return handleNext(state);
+    }
   }, dataGridLocale.searchNextText));
 }));

package/es/data-grid/index.d.ts

@@ -17,7 +17,7 @@ declare const Editors: {
     Text: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").TextEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Date: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").DateEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
     Number: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & import("./typings").NumberEditorParams<any> & React.RefAttributes<import("ag-grid-react").ICellEditorReactComp>>;
-    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "allowClear" | "mode" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
+    Select: React.ForwardRefExoticComponent<import("ag-grid-community").ICellEditorParams<any, any, any> & Pick<import("antd").SelectProps<any, import("antd/lib/select").BaseOptionType>, "disabled" | "mode" | "allowClear" | "showSearch" | "optionFilterProp" | "options" | "virtual" | "listHeight"> & {
         fieldNames?: {
             label: string;
             value: string;

package/es/popup/index.less

@@ -20,14 +20,9 @@
     padding: 1px;
     background-color: #fff;
     transform: translateY(-50%);
-    opacity: 0;
     transition: opacity 0.3s, color 0.3s !important;
   }
 
-  &-wrapper:hover &-input-clear {
-    opacity: 1;
-  }
-
   &-input input {
     cursor: pointer;
   }

package/es/select/index.js

@@ -16,15 +16,21 @@ import Empty from "../empty";
 import Icons from "../icons";
 import { useLocaleReceiver } from "../locale-receiver";
 import { mergeDefaultProps } from "../utils";
+import { LoadingOutlined } from '@ant-design/icons';
 
 // 这个必须加，否则部分select的样式会有问题
 mergeDefaultProps(AntdSelect, {
-  clearIcon: Icons.Clear,
   notFoundContent: /*#__PURE__*/React.createElement(Empty, {
     imageStyle: {
       height: 60
     }
-  })
+  }),
+  suffixIcon: /*#__PURE__*/React.createElement(Icons.Down, {
+    style: {
+      pointerEvents: 'none'
+    }
+  }),
+  clearIcon: /*#__PURE__*/React.createElement(Icons.Clear, null)
 });
 function InternalSelect(props, ref) {
   var wrapper = useRef(null);
@@ -38,7 +44,7 @@ function InternalSelect(props, ref) {
       style: {
         pointerEvents: 'none'
       }
-    }) : undefined
+    }) : /*#__PURE__*/React.createElement(LoadingOutlined, null)
   }, props, {
     ref: ref
   }));

package/es/styles/overrides.less

@@ -222,6 +222,10 @@ a[title='站长统计'] {
     align-items: center;
     line-height: 1 !important;
   }
+
+  &-clear {
+    opacity: 1;
+  }
 }
 
 /** tree */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "cdb79845cb423e932516831f73a9f77ebbc95d30"
+  "gitHead": "f95a565edfdb1d9c4937e75ab4c13fca67af3244"
 }