@kdcloudjs/kdesign 1.7.33-stable.5 → 1.7.33-stable.6

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.33-stable.4
+ *   @kdcloudjs/kdesign v1.7.33-stable.5
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -36071,17 +36071,21 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.fo
     _React$useState12 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState11, 2),
     loadingKeys = _React$useState12[0],
     setLoadingKeys = _React$useState12[1];
-  var _React$useState13 = react__WEBPACK_IMPORTED_MODULE_14___default.a.useState([]),
+  var _React$useState13 = react__WEBPACK_IMPORTED_MODULE_14___default.a.useState('NONE'),
     _React$useState14 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_React$useState13, 2),
-    searchExpandedKeys = _React$useState14[0],
-    setSearchExpandedKeys = _React$useState14[1];
+    searchStatus = _React$useState14[0],
+    setSearchStatus = _React$useState14[1];
   var isSearching = react__WEBPACK_IMPORTED_MODULE_14___default.a.useMemo(function () {
     return typeof filterTreeNode === 'function' && !!filterValue;
   }, [filterValue]);
   Object(react__WEBPACK_IMPORTED_MODULE_14__["useEffect"])(function () {
-    setSearchExpandedKeys([]);
+    if (isSearching) {
+      setSearchStatus('SEARCH_START');
+    } else {
+      setSearchStatus('NONE');
+    }
   }, [filterValue]);
-  var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_22__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys),
+  var _useExpand = Object(_treeHooks__WEBPACK_IMPORTED_MODULE_22__["useExpand"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue),
     _useExpand2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default()(_useExpand, 2),
     expandedKeys = _useExpand2[0],
     setExpandedKeys = _useExpand2[1];
@@ -36098,7 +36102,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.fo
     setHalfCheckedKeys = _useChecked2[3];
   var filterData = react__WEBPACK_IMPORTED_MODULE_14___default.a.useMemo(function () {
     return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_21__["getFilterData"])(spreadAttrData, filterTreeNode, isSearching, posData, keysData);
-  }, [spreadAttrData, isSearching, posData, keysData]);
+  }, [spreadAttrData, isSearching, posData, keysData, filterValue]);
   Object(react__WEBPACK_IMPORTED_MODULE_14__["useEffect"])(function () {
     if (typeof scrollKey === 'undefined') {
       return;
@@ -36165,12 +36169,9 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_14___default.a.fo
       node: node,
       expanded: expanded
     });
-    if (isSearching) {
-      var newSearchExpandedKeys = expanded ? Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_21__["addKeys"])(searchExpandedKeys, [key]) : Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_21__["delKey"])(searchExpandedKeys, [key]);
-      setSearchExpandedKeys(newSearchExpandedKeys);
-    }
     setScrollKey(undefined);
     setIsInit(false);
+    setSearchStatus('SEARCH_DONE');
     if (expanded && loadData) {
       handleNodeLoad(loadedKeys, loadingKeys, node);
     }
@@ -36472,22 +36473,22 @@ var useChecked = function useChecked(checkStrictly, checkedKeysProps, defaultChe
   }, [nextHalfCheckedKeys]);
   return [checkedKeys, halfCheckedKeys, setCheckedKeys, setHalfCheckedKeys];
 };
-var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchExpandedKeys) {
+var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, isInit, filterTreeNode, isSearching, keysData, searchStatus, filterValue) {
   var expandScrollkeys = [];
   if (scrollKey) {
     var pos = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getPos"])(flattenAllData, scrollKey);
     expandScrollkeys = Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getAllParentKeys"])(flattenAllData, pos);
   }
   var initialExpandedKeys = react__WEBPACK_IMPORTED_MODULE_3___default.a.useMemo(function () {
-    return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
+    return Object(_utils_treeUtils__WEBPACK_IMPORTED_MODULE_4__["getInitExpandedKeys"])(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, isInit, searchStatus);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, isInit, searchStatus, filterValue]);
   var _React$useState7 = react__WEBPACK_IMPORTED_MODULE_3___default.a.useState(initialExpandedKeys),
     _React$useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_0___default()(_React$useState7, 2),
     expandedKeys = _React$useState8[0],
     setExpandedKeys = _React$useState8[1];
   react__WEBPACK_IMPORTED_MODULE_3___default.a.useEffect(function () {
     setExpandedKeys(initialExpandedKeys);
-  }, [flattenAllData, expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent, scrollKey]);
+  }, [flattenAllData, expandedKeysProps, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent, scrollKey, searchStatus, filterValue]);
   return [expandedKeys, setExpandedKeys];
 };
 var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {
@@ -37552,8 +37553,8 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
-  var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
-  var isInit = arguments.length > 11 ? arguments[11] : undefined;
+  var isInit = arguments.length > 10 ? arguments[10] : undefined;
+  var searchStatus = arguments.length > 11 ? arguments[11] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : expandedKeys.concat(expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : defaultExpandedKeys.concat(expandScrollkeys)) || [];
   if (isInit) {
     if (defaultExpandAll) {
@@ -37574,10 +37575,10 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
       }
     }
   }
-  if (isSearching) {
-    keys = [].concat(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(searchExpandedKeys), _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys));
+  if (isSearching && searchStatus === 'SEARCH_START') {
+    keys = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(getAllFilterKeys(data, filterTreeNode, keysData).filterExpandKeys);
   }
-  return Array.from(new Set(_babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_1___default()(keys)));
+  return keys;
 };
 var getExpandedKeys = function getExpandedKeys(expandedKeys) {
   var expandScrollkeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];