@lemon-fe/components 1.4.22-alpha.6 → 1.4.22-alpha.9

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

@@ -25,16 +25,18 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
     searchFields = props.searchFields,
     focusColumn = props.focusColumn,
     _props$clearSelection = props.clearSelection,
-    clearSelection = _props$clearSelection === void 0 ? true : _props$clearSelection;
+    clearSelection = _props$clearSelection === void 0 ? true : _props$clearSelection,
+    defaultValue = props.defaultValue,
+    onValueChange = props.onValueChange;
   // 单行搜索大致耗时
   var duration = useRef(0);
   var defaultState = useMemo(function () {
     return {
-      keywords: '',
+      keywords: defaultValue || '',
       nodes: [],
       index: -1
     };
-  }, []);
+  }, [defaultValue]);
   var grid = useGridStore(function (state) {
     return state.grid;
   });
@@ -75,6 +77,7 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
   var handleSearch = useDebounce(function (str, prevState) {
     var keywords = str.trim();
     var start = performance.now();
+    onValueChange === null || onValueChange === void 0 || onValueChange(keywords);
     var finish = function finish(newState) {
       searching.current = false;
       setState(function (pre) {
@@ -253,6 +256,7 @@ export default /*#__PURE__*/memo( /*#__PURE__*/forwardRef(function Search(props,
   return /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Input, {
     placeholder: placeholder || dataGridLocale.searchPlaceholderText,
     value: state.keywords,
+    defaultValue: defaultValue,
     size: "small",
     onChange: function onChange(e) {
       setState(function (prev) {

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

@@ -150,6 +150,12 @@ export interface DataGridSearch {
      * 搜索后聚焦到哪个单元格，一般情况不要使用
      */
     focusColumn?: string;
+    /**
+     * @description
+     * 关键字默认值
+     */
+    defaultValue?: string;
+    onValueChange?: (value: string) => void;
 }
 export interface DataGridSearchRef {
     reset: () => void;

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", "filterKeepDescendants", "highlightKeywords"];
+  _excluded2 = ["data", "showSearch", "placeholder", "onSelect", "filterNode", "operation", "header", "footer", "height", "filterKeepParents", "filterKeepDescendants", "highlightKeywords", "onScroll"];
 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); }
@@ -14,7 +14,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Input, Tabs, Tree } from 'antd';
-import React, { useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { EmptyImage } from "../empty";
 import Icons from "../icons";
 import { useLocaleReceiver } from "../locale-receiver";
@@ -76,6 +76,7 @@ export default function SiderTree(props) {
     filterKeepParents = props.filterKeepParents,
     filterKeepDescendants = props.filterKeepDescendants,
     highlightKeywords = props.highlightKeywords,
+    onScroll = props.onScroll,
     restProps = _objectWithoutProperties(props, _excluded2);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
@@ -169,6 +170,15 @@ export default function SiderTree(props) {
     });
   }
   var prefixCls = prefix();
+
+  /** 解决Firefox 元素隐藏后，列表的scrollTop会被重置，但是rc-tree没有监听到的问题 */
+  var list = useRef(null);
+  var shouldRecoverScroll = useRef(false);
+  var scrollTop = useRef(0);
+  var handleScroll = useCallback(function (e) {
+    scrollTop.current = e.currentTarget.scrollTop;
+    onScroll === null || onScroll === void 0 || onScroll(e);
+  }, [onScroll]);
   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({
@@ -177,6 +187,7 @@ export default function SiderTree(props) {
     itemHeight: 28,
     showLine: true,
     height: height,
+    ref: list,
     titleRender: function titleRender(node) {
       return /*#__PURE__*/React.createElement(TreeNodeTitle, {
         operation: operation,
@@ -199,7 +210,8 @@ export default function SiderTree(props) {
           verticalAlign: '-0.125em'
         }
       });
-    }
+    },
+    onScroll: handleScroll
   }, restProps));
   return /*#__PURE__*/React.createElement("div", {
     className: prefix('wrapper')
@@ -209,6 +221,15 @@ export default function SiderTree(props) {
     onResize: function onResize(e) {
       if (e.height) {
         setHeight(e.height);
+        if (shouldRecoverScroll.current) {
+          shouldRecoverScroll.current = false;
+          if (scrollTop.current) {
+            var _list$current;
+            (_list$current = list.current) === null || _list$current === void 0 || _list$current.scrollTo(scrollTop.current);
+          }
+        }
+      } else {
+        shouldRecoverScroll.current = true;
       }
     }
   }, /*#__PURE__*/React.createElement("div", {
@@ -216,7 +237,7 @@ export default function SiderTree(props) {
     style: {
       flex: 1
     }
-  }, bodyContent)) : /*#__PURE__*/React.createElement("div", {
+  }, height ? bodyContent : null)) : /*#__PURE__*/React.createElement("div", {
     className: prefix('body')
   }, bodyContent), !!footer && /*#__PURE__*/React.createElement("div", {
     className: prefix('footer')

package/package.json

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