@sheinx/hooks 3.5.8 → 3.6.0-beta.10

package/esm/components/use-tree/use-tree.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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); }
@@ -11,14 +17,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useEffect, useRef } from 'react';
 import useLatestObj from "../../common/use-latest-obj";
 import { useInputAble } from "../../common/use-input-able";
+import { getExpandVirtualData } from "../use-table/use-table-tree";
 import { usePersistFn } from "../../common/use-persist-fn";
 import { isFunc, isString, isNumber, isArray, isUnMatchedData, isOptionalDisabled } from "../../utils/is";
-import { devUseWarning } from "../../utils";
+import { devUseWarning, produce } from "../../utils";
 function toArray(value) {
   if (!value) return [];
   if (!Array.isArray(value)) return [value];
   return value;
 }
+var global_tree_map = new Map();
 export var MODE = {
   /**
    * 返回全选数据，包含父节点和子节点
@@ -51,6 +59,7 @@ var useTree = function useTree(props) {
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
     keygen = props.keygen,
     mode = props.mode,
+    virtual = props.virtual,
     activeProp = props.active,
     expandedProp = props.expanded,
     _props$dataUpdate = props.dataUpdate,
@@ -67,6 +76,10 @@ var useTree = function useTree(props) {
     _useState2 = _slicedToArray(_useState, 2),
     inited = _useState2[0],
     setInited = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    dataFlat = _useState4[0],
+    setDataFlat = _useState4[1];
   var _useInputAble = useInputAble({
       value: expandedProp,
       defaultValue: defaultExpanded,
@@ -79,6 +92,8 @@ var useTree = function useTree(props) {
   var _useRef = useRef({
       pathMap: new Map(),
       dataMap: new Map(),
+      dataFlatStatusMap: new Map(),
+      dataFlat: [],
       forceUpdateMap: new Map(),
       valueMap: new Map(),
       updateMap: new Map(),
@@ -110,11 +125,27 @@ var useTree = function useTree(props) {
         expanded: shouldDefaultExpand
       };
     }
+    if (virtual) {
+      return {
+        active: isActive,
+        expanded: context.dataFlatStatusMap.get(id).expanded
+      };
+    }
     return {
       active: isActive,
       expanded: !!(expandeds && expandeds.indexOf(id) >= 0)
     };
   };
+
+  // 注册节点
+  var bindVirtualNode = function bindVirtualNode(id, update) {
+    context.updateMap.set(id, update);
+    var isActive = activeProp === id;
+    return {
+      active: isActive,
+      expanded: context.dataFlatStatusMap.get(id).expanded
+    };
+  };
   var get = function get(id) {
     return context.valueMap.get(id);
   };
@@ -127,7 +158,6 @@ var useTree = function useTree(props) {
     if (keygen && (isString(keygen) || isNumber(keygen))) {
       return item[keygen];
     }
-
     // 降级处理
     return id + (id ? ',' : '') + index;
   };
@@ -225,6 +255,8 @@ var useTree = function useTree(props) {
   };
   var initData = function initData(data, path, disabled) {
     var index = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+    var level = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+    var pid = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : null;
     var ids = [];
     for (var i = 0; i < data.length; i++) {
       var item = data[i];
@@ -236,6 +268,28 @@ var useTree = function useTree(props) {
       }
       // 制作 data mapping
       context.dataMap.set(id, item);
+      if (virtual) {
+        context.dataFlatStatusMap.set(id, {
+          active: false,
+          expanded: defaultExpandAll ? true : (expanded === null || expanded === void 0 ? void 0 : expanded.includes(id)) || false,
+          fetching: false
+        });
+        var node = {
+          id: id,
+          level: level,
+          data: item,
+          pid: pid
+        };
+        if (defaultExpandAll) {
+          context.dataFlat.push(node);
+        } else {
+          if (level === 1) {
+            context.dataFlat.push(node);
+          } else if (expanded && pid !== null && expanded.indexOf(pid) >= 0) {
+            context.dataFlat.push(node);
+          }
+        }
+      }
       var _isDisabled = !!disabled;
       if (_isDisabled === false) {
         _isDisabled = getDisabled()(item);
@@ -244,7 +298,7 @@ var useTree = function useTree(props) {
       ids.push(id);
       var children = [];
       if (Array.isArray(item[childrenKey])) {
-        var _children = initData(item[childrenKey], [].concat(_toConsumableArray(path), [id]), mode === MODE.MODE_4 ? disabled : _isDisabled, indexPath);
+        var _children = initData(item[childrenKey], [].concat(_toConsumableArray(path), [id]), mode === MODE.MODE_4 ? disabled : _isDisabled, indexPath, level + 1, id);
         if (_children) children = _children;
       }
       context.pathMap.set(id, {
@@ -347,17 +401,37 @@ var useTree = function useTree(props) {
     return 2;
   };
   var setData = function setData(data) {
+    // if(data && global_tree_map.get(data)){
+    //   context.cachedValue = global_tree_map.get(data)?.cachedValue || []
+    //   context.pathMap = global_tree_map.get(data)?.pathMap || new Map()
+    //   context.dataMap = global_tree_map.get(data)?.dataMap || new Map()
+    //   context.valueMap = global_tree_map.get(data)?.valueMap || new Map()
+    //   context.unmatchedValueMap = global_tree_map.get(data)?.unmatchedValueMap || new Map()
+    //   return
+    // }
+
     var prevValue = context.value || [];
     context.cachedValue = [];
     context.pathMap = new Map();
     context.dataMap = new Map();
+    context.dataFlat = [];
+    context.dataFlatStatusMap = new Map();
     context.valueMap = new Map();
     context.unmatchedValueMap = new Map();
     context.data = toArray(data);
+    if (virtual) {
+      context.dataFlat = [];
+      setDataFlat([]);
+    }
     if (!data) return;
     initData(context.data, []);
+    if (virtual) {
+      setDataFlat(context.dataFlat);
+    }
     initValue();
     setValue(prevValue);
+
+    // global_tree_map.set(data, context)
   };
   var set = function set(id, checked, direction) {
     if (!isDisabled(id)) {
@@ -399,6 +473,101 @@ var useTree = function useTree(props) {
     }
     return current;
   };
+  var appendChildrenExpanded = function appendChildrenExpanded(child, level, pid, insertData) {
+    if (!child) return;
+    child.forEach(function (item, i) {
+      var _context$dataFlatStat;
+      var childId = getKey(item, pid, i);
+      var node = {
+        id: childId,
+        level: level,
+        data: item,
+        pid: pid
+      };
+      insertData.push(node);
+      if ((_context$dataFlatStat = context.dataFlatStatusMap.get(childId)) !== null && _context$dataFlatStat !== void 0 && _context$dataFlatStat.expanded && item[childrenKey]) {
+        appendChildrenExpanded(item[childrenKey], level + 1, childId, insertData);
+      }
+    });
+  };
+  var insertFlat = function insertFlat(id) {
+    var item = getDataById(id);
+    if (isUnMatchedData(item)) return;
+    if (!item) return;
+    var status = context.dataFlatStatusMap.get(id);
+    if (!status) return;
+    var childrenData = item[childrenKey];
+    var insertStartNode = dataFlat.find(function (item) {
+      return item.id === id;
+    });
+    context.dataFlatStatusMap.set(id, _objectSpread(_objectSpread({}, status), {}, {
+      expanded: true,
+      fetching: false
+    }));
+    if (!insertStartNode) return;
+    var insertData = [];
+    appendChildrenExpanded(childrenData, insertStartNode.level + 1, id, insertData);
+    var insertIndex = dataFlat.indexOf(insertStartNode);
+    var nextDataFlat = produce(dataFlat, function (draft) {
+      draft.splice.apply(draft, [insertIndex + 1, 0].concat(_toConsumableArray(insertData)));
+    });
+    setDataFlat(nextDataFlat);
+  };
+  var removeFlat = function removeFlat(id) {
+    var item = getDataById(id);
+    if (isUnMatchedData(item)) return;
+    if (!item) return;
+    var removeNode = dataFlat.find(function (item) {
+      return item.id === id;
+    });
+    if (!removeNode) return;
+    var status = context.dataFlatStatusMap.get(id);
+    if (!status) return;
+    context.dataFlatStatusMap.set(id, _objectSpread(_objectSpread({}, status), {}, {
+      fetching: false,
+      expanded: false
+    }));
+    var removeStartIndex = dataFlat.indexOf(removeNode);
+    var removeEndIndex = 0;
+    for (var i = removeStartIndex + 1; i < dataFlat.length; i++) {
+      if (dataFlat[i].level <= removeNode.level) {
+        removeEndIndex = i;
+        break;
+      }
+      if (i === dataFlat.length - 1) {
+        removeEndIndex = i + 1;
+        break;
+      }
+    }
+    var nextDataFlat = produce(dataFlat, function (draft) {
+      draft.splice(removeStartIndex + 1, removeEndIndex - removeStartIndex - 1);
+    });
+    setDataFlat(nextDataFlat);
+  };
+  var expandedFlat = function expandedFlat(expanded) {
+    if (!context.data) return;
+    context.dataFlatStatusMap.forEach(function (status, id) {
+      context.dataFlatStatusMap.set(id, _objectSpread(_objectSpread({}, status), {}, {
+        expanded: false
+      }));
+    });
+    expanded.forEach(function (id) {
+      var status = context.dataFlatStatusMap.get(id);
+      if (!status) return;
+      context.dataFlatStatusMap.set(id, _objectSpread(_objectSpread({}, status), {}, {
+        expanded: true
+      }));
+    });
+    var _getExpandVirtualData = getExpandVirtualData(context.data, expanded, getKey, childrenKey),
+      treeDataInfo = _getExpandVirtualData.treeDataInfo;
+    if (!treeDataInfo) {
+      return;
+    }
+    setDataFlat(treeDataInfo);
+  };
+  var getFlatData = function getFlatData() {
+    return context.dataFlat;
+  };
   useEffect(function () {
     if (defaultExpandAll) {
       var nextExpanded = [];
@@ -409,7 +578,7 @@ var useTree = function useTree(props) {
       });
       onExpand(nextExpanded);
     }
-  }, []);
+  }, [context.dataMap]);
   useEffect(function () {
     if (props.datum) return;
     if (!dataUpdate) return;
@@ -425,25 +594,32 @@ var useTree = function useTree(props) {
   var datum = useLatestObj({
     get: get,
     set: set,
+    insertFlat: insertFlat,
+    removeFlat: removeFlat,
+    expandedFlat: expandedFlat,
     getPath: getPath,
     getValue: getValue,
     getChecked: getChecked,
     getKey: getKey,
+    getFlatData: getFlatData,
     getDataByValues: getDataByValues,
     setValue: setValue,
     setData: setData,
     isDisabled: isDisabled,
     bindNode: bindNode,
+    bindVirtualNode: bindVirtualNode,
     getDataById: getDataById,
     bindUpdate: bindUpdate,
     unBindUpdate: unBindUpdate,
     isUnMatched: isUnMatched,
     childrenKey: childrenKey,
     data: data,
+    dataFlat: dataFlat,
     pathMap: context.pathMap,
     dataMap: context.dataMap,
     valueMap: context.valueMap,
-    updateMap: context.updateMap
+    updateMap: context.updateMap,
+    dataFlatStatusMap: context.dataFlatStatusMap
   });
   return {
     inited: inited,

package/esm/components/use-tree/use-tree.type.d.ts

@@ -2,9 +2,22 @@ import { StructKeygenStringType, KeygenResult, ObjectKey } from '../../common/ty
 export type CheckedStatusType = 0 | 1 | 2;
 export type TreeModeType = 0 | 1 | 2 | 3 | 4;
 export type UpdateFunc = (name: string, active: boolean) => void;
+export type FlatNodeType<DataItem> = {
+    id: KeygenResult;
+    data: DataItem;
+    level: number;
+    pid?: KeygenResult | null;
+};
+export type FlatMapType = {
+    active: boolean;
+    expanded: boolean;
+    fetching: boolean;
+};
 export interface TreeContext<DataItem> {
     pathMap: Map<KeygenResult, TreePathType>;
     dataMap: Map<KeygenResult, DataItem>;
+    dataFlat: FlatNodeType<DataItem>[];
+    dataFlatStatusMap: Map<KeygenResult, FlatMapType>;
     valueMap: Map<KeygenResult, CheckedStatusType>;
     unmatchedValueMap: Map<any, any>;
     updateMap: Map<KeygenResult, UpdateFunc>;
@@ -110,10 +123,17 @@ export interface BaseTreeProps<DataItem> {
      * @private 内部数据处理
      */
     datum?: TreeDatum<DataItem>;
+    /**
+     * @private 是否虚拟化
+     */
+    virtual?: boolean;
 }
 export interface TreeDatum<DataItem> {
     get: (id: KeygenResult) => CheckedStatusType | undefined;
     set: (id: KeygenResult, checked: CheckedStatusType, direction?: 'asc' | 'desc') => CheckedStatusType | null;
+    insertFlat: (id: KeygenResult) => void;
+    removeFlat: (id: KeygenResult) => void;
+    expandedFlat: (id: KeygenResult[]) => void;
     getPath: (id: KeygenResult) => TreePathType | undefined;
     getValue: () => KeygenResult[];
     getChecked: (id: KeygenResult) => boolean | 'indeterminate';
@@ -126,6 +146,10 @@ export interface TreeDatum<DataItem> {
         active: boolean;
         expanded: boolean;
     };
+    bindVirtualNode: (id: KeygenResult, update: UpdateFunc, data: DataItem) => {
+        active: boolean;
+        expanded: boolean;
+    };
     getDataById: (id: KeygenResult) => DataItem | {
         IS_NOT_MATCHED_VALUE: boolean;
         value: KeygenResult | null;
@@ -136,8 +160,10 @@ export interface TreeDatum<DataItem> {
     updateMap: Map<KeygenResult, UpdateFunc>;
     childrenKey: string;
     data: DataItem[];
+    dataFlat: FlatNodeType<DataItem>[];
     pathMap: Map<KeygenResult, TreePathType>;
     dataMap: Map<KeygenResult, DataItem>;
     valueMap: Map<KeygenResult, CheckedStatusType>;
+    dataFlatStatusMap: Map<KeygenResult, FlatMapType>;
 }
 //# sourceMappingURL=use-tree.type.d.ts.map

package/esm/components/use-tree/use-tree.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"use-tree.type.d.ts","sourceRoot":"","sources":["use-tree.type.ts"],"names":[],"mappings":"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"}

package/esm/components/use-treeselect/use-tiled.d.ts

@@ -5,7 +5,7 @@ declare const useTiled: <DataItem>(props: UseTiledProps<DataItem>) => {
     onFilter: ((text: string, from?: string | undefined) => void) | undefined;
     expandIcons?: undefined;
 } | {
-    data: any[];
+    data: any;
     onFilter: (text: string, from?: string) => void;
     expandIcons: ((item: DataItem) => string | number | boolean | import("react").ReactFragment | JSX.Element | null | undefined)[];
 };

package/esm/components/use-treeselect/use-tiled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBA4BgB,MAAM,SAAS,MAAM;;CA8ClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"use-tiled.d.ts","sourceRoot":"","sources":["use-tiled.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAGjD,QAAA,MAAM,QAAQ;;;;;;qBAkCgB,MAAM,SAAS,MAAM;;CAyClD,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/esm/components/use-treeselect/use-tiled.js

@@ -13,7 +13,7 @@ import { useTree } from "../use-tree";
 import { mergeFilteredTree } from "../../utils/tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 var useTiled = function useTiled(props) {
-  var data = props.data,
+  var filterData = props.data,
     keygen = props.keygen,
     _props$childrenKey = props.childrenKey,
     childrenKey = _props$childrenKey === void 0 ? 'children' : _props$childrenKey,
@@ -30,19 +30,19 @@ var useTiled = function useTiled(props) {
     tileds = _useState2[0],
     setTileds = _useState2[1];
   var _useTree = useTree({
-      data: data,
-      childrenKey: childrenKey,
-      keygen: keygen,
-      isControlled: false
-    }),
-    datum = _useTree.datum;
-  var _useTree2 = useTree({
       data: rawData,
+      datum: props.rawDatum,
       childrenKey: childrenKey,
       keygen: keygen,
       isControlled: false
     }),
-    rawDatum = _useTree2.datum;
+    rawDatum = _useTree.datum;
+  if (!filterText || !onAdvancedFilter) {
+    return {
+      data: filterData,
+      onFilter: onFilter
+    };
+  }
   var handleToggle = function handleToggle(e, key) {
     e.stopPropagation();
     var nextTileds = _toConsumableArray(tileds);
@@ -74,13 +74,7 @@ var useTiled = function useTiled(props) {
       children: moreIcon()
     });
   };
-  if (!filterText || !onAdvancedFilter) {
-    return {
-      data: data,
-      onFilter: onFilter
-    };
-  }
-  var nextData = mergeFilteredTree(datum, rawDatum, tileds);
+  var nextData = mergeFilteredTree(filterData, rawDatum, tileds);
   return {
     data: nextData,
     onFilter: handleFilter,

package/esm/components/use-treeselect/use-tiled.type.d.ts

@@ -1,9 +1,11 @@
 import React from 'react';
 import { TreeKeygenType, KeygenResult, ObjectKey } from '../../common/type';
+import { TreeDatum } from '../use-tree/use-tree.type';
 export type FilterFormType = 'blur' | 'edit';
 export interface UseTiledProps<DataItem> {
     data: DataItem[];
     rawData: DataItem[];
+    rawDatum?: TreeDatum<DataItem>;
     onFilter?: (text: string, from?: string) => void;
     keygen: TreeKeygenType<DataItem>;
     childrenKey?: ObjectKey<DataItem>;

package/esm/components/use-treeselect/use-tiled.type.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE5E,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}
+{"version":3,"file":"use-tiled.type.d.ts","sourceRoot":"","sources":["use-tiled.type.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,aAAa,CAAC,QAAQ;IACrC,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,OAAO,EAAE,QAAQ,EAAE,CAAC;IACpB,QAAQ,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC;IAC5B,QAAQ,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IAChC,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,CAAC,IAAI,EAAE,QAAQ,KAAK,OAAO,CAAC;CAClE"}

package/esm/utils/tree.d.ts

@@ -9,6 +9,6 @@ type FilterDatum<DataItem> = {
     getKey: (node: DataItem) => KeygenResult;
     getDataById: (id: KeygenResult) => DataItem;
 };
-export declare const mergeFilteredTree: (filterDatum: FilterDatum<any>, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any[];
+export declare const mergeFilteredTree: (filterData: any, rawDatum: FilterDatum<any>, tiledId: KeygenResult[]) => any;
 export {};
 //# sourceMappingURL=tree.d.ts.map

package/esm/utils/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,gBACf,YAAY,GAAG,CAAC,YACnB,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,UAqBxB,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAG9C,eAAO,MAAM,cAAc,+CAGlB,OAAO,UAkBf,CAAC;AAEF,eAAO,MAAM,aAAa,2CAA4C,YAAY,6EAE5B,OAAO,iCACzC,YAAY,EAAE,GAAG,SAAS,2EAGxB,OAAO,wCACU,IAAI;;yBA4B1C,CAAC;AAEF,KAAK,WAAW,CAAC,QAAQ,IAAI;IAC3B,IAAI,EAAE,QAAQ,EAAE,CAAC;IACjB,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC;IACzC,WAAW,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,QAAQ,CAAC;CAC7C,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAChB,GAAG,YACL,YAAY,GAAG,CAAC,WACjB,YAAY,EAAE,QAexB,CAAC"}

package/esm/utils/tree.js

@@ -62,19 +62,13 @@ export var getFilterTree = function getFilterTree(treeNodes, filterFunc, filterE
     return node;
   });
 };
-export var mergeFilteredTree = function mergeFilteredTree(filterDatum, rawDatum, tiledId) {
-  var filterData = filterDatum.data;
-  var childrenKey = filterDatum.childrenKey;
+export var mergeFilteredTree = function mergeFilteredTree(filterData, rawDatum, tiledId) {
+  var childrenKey = rawDatum.childrenKey;
   if (tiledId.length === 0) return filterData;
   var recursion = function recursion(node) {
-    var nodeKey = filterDatum.getKey(node);
+    var nodeKey = rawDatum.getKey(node);
     if (tiledId.indexOf(nodeKey) >= 0) {
       node[childrenKey] = deepClone(rawDatum.getDataById(nodeKey)[childrenKey] || []);
-    } else {
-      var item = filterDatum.getDataById(nodeKey);
-      if (item && item[childrenKey]) {
-        node[childrenKey] = deepClone(item[childrenKey] || []);
-      }
     }
     var children = node[childrenKey] || [];
     children.map(recursion);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/hooks",
-  "version": "3.5.8",
+  "version": "3.6.0-beta.10",
   "description": "",
   "keywords": [],
   "license": "MIT",