@sheinx/base 3.0.10 → 3.0.11

package/cjs/cascader/cascader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYhD,QAAA,MAAM,QAAQ,iGA+rBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYhD,QAAA,MAAM,QAAQ,iGA8rBb,CAAC;AACF,eAAe,QAAQ,CAAC"}

package/cjs/cascader/cascader.js

@@ -330,8 +330,8 @@ var Cascader = function Cascader(props0) {
     if (!path) return;
     handlePathChange(id, null, path);
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    var dataKey = _hooks.util.isUnMatchedData(item) ? item.value : datum.getKey(item, key, index);
+  var handleRemove = function handleRemove(item, key) {
+    var dataKey = key !== null && key !== void 0 ? key : _hooks.util.isUnMatchedData(item) ? item.value : datum.getKey(item);
     var isDisabled = datum.isDisabled(dataKey);
     if (isDisabled) return;
     datum.set(dataKey, 0);

package/cjs/select/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,QAAA,MAAM,MAAM,uEAkXX,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,QAAA,MAAM,MAAM,uEA8WX,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/cjs/select/result.js

@@ -29,7 +29,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var isObject = _hooks.util.isObject,
   isEmpty = _hooks.util.isEmpty,
   isNumber = _hooks.util.isNumber,
-  getKey = _hooks.util.getKey,
   isUnMatchedData = _hooks.util.isUnMatchedData,
   isFunc = _hooks.util.isFunc,
   isArray = _hooks.util.isArray;
@@ -66,7 +65,7 @@ var Result = function Result(props) {
     onRemove = props.onRemove,
     onResultItemClick = props.onResultItemClick,
     data = props.data;
-  var value = [null, undefined, ''].includes(valueProp) ? [] : multiple ? valueProp : [valueProp];
+  var value = [null, undefined, ''].includes(valueProp) ? [] : Array.isArray(valueProp) ? valueProp : [valueProp];
   var _useState = (0, _react.useState)(-1),
     _useState2 = _slicedToArray(_useState, 2),
     more = _useState2[0],
@@ -142,20 +141,9 @@ var Result = function Result(props) {
       })
     }, 'input');
   };
-  var renderResultItem = function renderResultItem(item, index, nodes) {
-    var key;
-    if (isUnMatchedData(item)) {
-      if (isFunc(keygen)) {
-        key = keygen(item.value, index);
-        if (key === undefined) key = index;
-      } else {
-        key = item.value;
-      }
-    } else {
-      key = getKey(keygen, item, index);
-    }
+  var renderResultItem = function renderResultItem(item, index, nodes, v) {
     var handleClose = function handleClose() {
-      onRemove === null || onRemove === void 0 || onRemove(item, key, index);
+      onRemove === null || onRemove === void 0 || onRemove(item, v);
     };
     var isDisabled;
     if (_hooks.util.isFunc(disabled)) {
@@ -165,7 +153,7 @@ var Result = function Result(props) {
     }
     var resultClassName;
     if (_hooks.util.isFunc(props.resultClassName)) {
-      resultClassName = props.resultClassName(key);
+      resultClassName = props.resultClassName(isUnMatchedData(item) ? item.value : item);
     } else {
       resultClassName = props.resultClassName;
     }
@@ -175,8 +163,9 @@ var Result = function Result(props) {
     var content = renderResultContent(item, index, nodes);
     if (!content) return null;
     if (renderResultContentProp) {
+      // cascader 不渲染tag
       return renderResultContentProp(_objectSpread({
-        key: key,
+        key: index,
         size: size,
         disabled: isDisabled,
         className: (0, _classnames.default)(styles.tag, styles.hideTag, resultClassName),
@@ -202,7 +191,7 @@ var Result = function Result(props) {
       type: disabled === true ? 'dark' : undefined
     })), {}, {
       children: content
-    }), key);
+    }), index);
   };
   var renderNbsp = function renderNbsp() {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
@@ -233,22 +222,28 @@ var Result = function Result(props) {
       children: content
     }, 'single');
   };
+  var getValueArr = function getValueArr(v) {
+    return (isArray(v) ? v : [v]).filter(function (v) {
+      return v !== undefined && v !== null;
+    });
+  };
   var renderMultipleResult = function renderMultipleResult() {
     if (isEmptyResult()) return renderNbsp();
     // [TODO] separator 处理逻辑后续交给 hooks 处理，此处临时处理
-    var nextValue = value;
+    var nextValue = getValueArr(value);
     if (separator && _hooks.util.isString(valueProp)) {
       nextValue = valueProp.split(separator);
     }
-    var values = getDataByValues(nextValue);
-    var result = values.map(function (v, i) {
-      if (renderResultContentProp && i !== values.length - 1) {
-        return [renderResultItem(v, i, values), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    var datas = getDataByValues(nextValue);
+    var result = datas.map(function (d, i) {
+      var v = nextValue[i];
+      if (renderResultContentProp && i !== datas.length - 1) {
+        return [renderResultItem(d, i, datas, v), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           className: (0, _classnames.default)(styles.tag, styles.hideTag),
           children: "/"
         }, "separator-".concat(i))];
       }
-      return renderResultItem(v, i, values);
+      return renderResultItem(d, i, datas, v);
     });
     return result;
   };

package/cjs/tree/tree-context.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { TreeContextProps, TreeProviderProps } from './tree-context.type';
-export declare const TreeContext: React.Context<TreeContextProps<any>>;
+import { TreeProviderProps } from './tree-context.type';
+export declare const TreeContext: React.Context<import("../../../hooks/src/components/use-tree/use-tree.type").TreeDatum<any>>;
 export declare const Provider: <DataItem>(props: TreeProviderProps<DataItem>) => JSX.Element;
-export declare const useTreeContext: () => TreeContextProps<any>;
+export declare const useTreeContext: () => import("../../../hooks/src/components/use-tree/use-tree.type").TreeDatum<any>;
 //# sourceMappingURL=tree-context.d.ts.map

package/cjs/tree/tree-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-context.d.ts","sourceRoot":"","sources":["tree-context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,eAAO,MAAM,WAAW,sCAA0E,CAAC;AAEnG,eAAO,MAAM,QAAQ,+DAGpB,CAAC;AAEF,eAAO,MAAM,cAAc,6BAAsC,CAAC"}
+{"version":3,"file":"tree-context.d.ts","sourceRoot":"","sources":["tree-context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAoB,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,eAAO,MAAM,WAAW,8FAA0E,CAAC;AAEnG,eAAO,MAAM,QAAQ,+DAGpB,CAAC;AAEF,eAAO,MAAM,cAAc,qFAAsC,CAAC"}

package/cjs/tree/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAyC,MAAM,eAAe,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FA4OT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAA4B,MAAM,eAAe,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FA8NT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/cjs/tree/tree.js

@@ -11,7 +11,7 @@ var _hooks = require("@sheinx/hooks");
 var _treeRoot = _interopRequireDefault(require("./tree-root"));
 var _treeContext = require("./tree-context");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "keepCache"];
+var _excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -73,9 +73,8 @@ var Tree = function Tree(props) {
     onDragLeave = props.onDragLeave,
     onDragOver = props.onDragOver,
     onDragStart = props.onDragStart,
-    keepCache = props.keepCache,
+    propsDatum = props.datum,
     rest = _objectWithoutProperties(props, _excluded);
-  var prevData = (0, _hooks.usePrevious)(data);
   var _useTree = (0, _hooks.useTree)({
       mode: mode,
       value: value,
@@ -92,7 +91,7 @@ var Tree = function Tree(props) {
       childrenKey: childrenKey,
       keygen: keygen,
       onExpand: onExpandProp,
-      keepCache: keepCache
+      datum: propsDatum
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -193,16 +192,6 @@ var Tree = function Tree(props) {
   (0, _react.useEffect)(function () {
     handleUpdateExpanded(expanded);
   }, [expanded]);
-  (0, _react.useEffect)(function () {
-    if (!prevData) return;
-    if (prevData !== data && dataUpdate) {
-      datum.setData(data);
-    }
-  }, [data]);
-  (0, _react.useEffect)(function () {
-    if (!value) return;
-    datum.setValue(value);
-  }, [value]);
   (0, _react.useEffect)(function () {
     if (getDatum) getDatum(datum);
   }, []);

package/cjs/tree-select/tree-select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-select.d.ts","sourceRoot":"","sources":["tree-select.tsx"],"names":[],"mappings":";AACA,OAAO,EAQL,YAAY,EAEb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAc,MAAM,oBAAoB,CAAC;AAcjE,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,YAAY,EAAE,CAAC;AAIhE,QAAA,MAAM,UAAU,wGA8mBf,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"tree-select.d.ts","sourceRoot":"","sources":["tree-select.tsx"],"names":[],"mappings":";AACA,OAAO,EAQL,YAAY,EAEb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAc,MAAM,oBAAoB,CAAC;AAajE,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,YAAY,EAAE,CAAC;AAIhE,QAAA,MAAM,UAAU,wGA8oBf,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/cjs/tree-select/tree-select.js

@@ -39,7 +39,6 @@ var preventDefault = function preventDefault(e) {
 var TreeSelect = function TreeSelect(props0) {
   var _jssStyle$treeSelect;
   var props = (0, _useWithFormConfig.default)(props0);
-  var render = (0, _hooks.useRender)();
   var _useConfig = (0, _config.useConfig)(),
     locale = _useConfig.locale;
   var jssStyle = props.jssStyle,
@@ -47,9 +46,11 @@ var TreeSelect = function TreeSelect(props0) {
     size = props.size,
     valueProp = props.value,
     defaultValue = props.defaultValue,
-    data = props.data,
+    _props$data = props.data,
+    data = _props$data === void 0 ? [] : _props$data,
     multiple = props.multiple,
-    mode = props.mode,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 1 : _props$mode,
     _props$line = props.line,
     line = _props$line === void 0 ? false : _props$line,
     innerTitle = props.innerTitle,
@@ -109,9 +110,12 @@ var TreeSelect = function TreeSelect(props0) {
     width: width
   }, style);
   var showInput = _hooks.util.isFunc(props.onAdvancedFilter || onFilterProp);
-  var datum = (0, _react.useRef)();
   var blurEvent = (0, _react.useRef)();
   var inputRef = (0, _react.useRef)();
+  var _useRef = (0, _react.useRef)({
+      cachedMap: new Map()
+    }),
+    context = _useRef.current;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     focused = _useState2[0],
@@ -121,7 +125,8 @@ var TreeSelect = function TreeSelect(props0) {
       onChange: onChangeProp,
       defaultValue: defaultValue,
       control: 'value' in props,
-      filterSameChange: filterSameChange
+      filterSameChange: filterSameChange,
+      multiple: multiple
     }),
     value = _useTreeSelect.value,
     onChange = _useTreeSelect.onChange;
@@ -152,6 +157,23 @@ var TreeSelect = function TreeSelect(props0) {
     onFilter = _useFilter.onFilter,
     onClearCreatedData = _useFilter.onClearCreatedData,
     setInputText = _useFilter.setInputText;
+  var controlExpanded = 'expanded' in props || expanded !== null && expanded !== void 0 && expanded.length ? expanded : undefined;
+  var _useTree = (0, _hooks.useTree)({
+      mode: mode,
+      value: value,
+      data: data,
+      unmatch: unmatch,
+      disabled: disabled,
+      childrenKey: childrenKey,
+      keygen: keygen,
+      onExpand: onExpand,
+      expanded: controlExpanded,
+      defaultExpanded: defaultExpanded,
+      defaultExpandAll: defaultExpandAll,
+      isControlled: controlExpanded !== undefined
+    }),
+    datum = _useTree.datum,
+    onExpandTree = _useTree.onExpand;
   var renderMoreIcon = function renderMoreIcon() {
     return _icons.default.treeSelect.More;
   };
@@ -202,10 +224,6 @@ var TreeSelect = function TreeSelect(props0) {
     jssStyle: props.jssStyle
   });
   var rootClass = (0, _classnames.default)(className, isEmpty && styles.wrapperEmpty, styles === null || styles === void 0 ? void 0 : styles.wrapper, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), !!open && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), _defineProperty({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
-  var bindTreeDatum = function bindTreeDatum(treeDatum) {
-    datum.current = treeDatum;
-    render();
-  };
   var getRenderItem = function getRenderItem(data, expanded, active, id) {
     return typeof renderItemProp === 'function' ? renderItemProp(data, expanded, active, id) : data[renderItemProp];
   };
@@ -261,9 +279,9 @@ var TreeSelect = function TreeSelect(props0) {
   };
   var handleClear = function handleClear(e) {
     e.stopPropagation();
-    if (!datum.current) return;
-    datum.current.setValue([]);
-    onChange(multiple ? [] : '');
+    if (!datum) return;
+    datum.setValue([]);
+    onChange(multiple ? [] : ['']);
     if (onChangeAddition) {
       onChangeAddition({
         data: multiple ? [] : null
@@ -271,9 +289,6 @@ var TreeSelect = function TreeSelect(props0) {
     }
     if (open) closePop();
   };
-  var handleExpand = function handleExpand(expands) {
-    onExpand === null || onExpand === void 0 || onExpand(expands);
-  };
   var renderClearable = function renderClearable() {
     if (!multiple !== undefined && !showArrow) return null;
     var defaultIcon = multiple ? _icons.default.treeSelect.More : _icons.default.treeSelect.DropdownArrow;
@@ -303,37 +318,43 @@ var TreeSelect = function TreeSelect(props0) {
       children: defaultIcon
     });
   };
+  var getDataById = (0, _hooks.usePersistFn)(function (id) {
+    if (!props.noCache) {
+      if (context.cachedMap.has(id)) {
+        return context.cachedMap.get(id);
+      }
+    }
+    if (!datum) return undefined;
+    var origin = datum === null || datum === void 0 ? void 0 : datum.getDataById(id);
+    if (!props.noCache && !(datum !== null && datum !== void 0 && datum.isUnMatched(origin))) {
+      context.cachedMap.set(id, origin);
+    }
+    return origin;
+  });
   var getDataByValues = function getDataByValues(values) {
-    if (!datum.current || !values) return [];
-    return datum.current.getDataByValues(values);
+    if (!datum || !values) return [];
+    return datum.getDataByValues(values);
   };
   var getDataByValuesRef = function getDataByValuesRef(values) {
-    var _datum$current2;
     if (_hooks.util.isArray(values)) {
       return values.map(function (id) {
-        var _datum$current;
-        return (_datum$current = datum.current) === null || _datum$current === void 0 ? void 0 : _datum$current.getDataById(id);
+        return datum === null || datum === void 0 ? void 0 : datum.getDataById(id);
       });
     }
-    return (_datum$current2 = datum.current) === null || _datum$current2 === void 0 ? void 0 : _datum$current2.getDataById(values);
+    return datum === null || datum === void 0 ? void 0 : datum.getDataById(values);
   };
   var getValue = function getValue() {
-    if (!datum.current) return;
-    var nextValue = datum.current.getValue();
+    if (!datum) return;
+    var nextValue = datum.getValue();
     if (multiple) return nextValue;
-    return nextValue.length ? nextValue[0] : '';
-  };
-  var getValueArray = function getValueArray(value) {
-    if (!value) return [];
-    if (!Array.isArray(value)) return [value];
-    return value;
+    if (nextValue.length === 0) return [];
+    return [nextValue[0]];
   };
   var getContentClass = function getContentClass(data) {
-    var _datum$current3, _datum$current4;
-    if (!datum.current) return '';
-    var key = datum.current.getKey(data);
-    var isDisabled = (_datum$current3 = datum.current) === null || _datum$current3 === void 0 ? void 0 : _datum$current3.isDisabled(key);
-    var isCheck = (_datum$current4 = datum.current) === null || _datum$current4 === void 0 ? void 0 : _datum$current4.getChecked(key);
+    if (!datum) return '';
+    var key = datum.getKey(data);
+    var isDisabled = datum === null || datum === void 0 ? void 0 : datum.isDisabled(key);
+    var isCheck = datum === null || datum === void 0 ? void 0 : datum.getChecked(key);
     if (isDisabled) {
       return (0, _classnames.default)(styles.optionDisabled);
     }
@@ -364,46 +385,62 @@ var TreeSelect = function TreeSelect(props0) {
     onTiledFilter === null || onTiledFilter === void 0 || onTiledFilter(trim ? text.trim() : text);
   };
   var handleChange = function handleChange(item, id) {
-    var _datum$current5;
-    if (!datum.current) return;
-    if (disabled === true || (_datum$current5 = datum.current) !== null && _datum$current5 !== void 0 && _datum$current5.isDisabled(id)) return;
-    var currentData = datum.current.getDataById(id);
+    if (disabled === true || datum !== null && datum !== void 0 && datum.isDisabled(id)) return;
+    var currentData = datum.getDataById(id);
     if (!multiple) {
-      datum.current.setValue([]);
-      datum.current.set(datum.current.getKey(item), 1);
+      datum.setValue([]);
+      datum.set(datum.getKey(item), 1);
     }
     var nextValue = getValue();
     if (onChange) {
-      onChange(nextValue, currentData, id ? (datum.current.getPath(id) || {}).path : undefined);
+      onChange(nextValue, currentData, id ? (datum.getPath(id) || {}).path : undefined);
     }
     if (typeof onChangeAddition === 'function') {
       onChangeAddition({
         data: getDataByValues(nextValue),
-        checked: multiple ? datum.current.get(id) : undefined,
+        checked: multiple ? datum.get(id) : undefined,
         current: currentData
       });
     }
   };
-  var handleTreeChange = function handleTreeChange(item, id) {
+  var handleTreeClick = function handleTreeClick(item, id) {
     handleChange(item, id);
-    if (!multiple) closePop();
+    closePop();
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    if (!datum.current) return;
-    var dataKey = _hooks.util.isUnMatchedData(item) ? item.value : datum.current.getKey(item, key, index);
-    var isDisabled = datum.current.isDisabled(dataKey);
+  var handleTreeChange = function handleTreeChange(_value, id) {
+    var item = datum.getDataById(id);
+    handleChange(item, id);
+  };
+  var handleRemove = function handleRemove(item, key) {
+    if (!datum) return;
+    var dataKey = key !== null && key !== void 0 ? key : _hooks.util.isUnMatchedData(item) ? item.value : datum.getKey(item);
+    var isDisabled = datum.isDisabled(dataKey);
     if (isDisabled) return;
-    datum.current.set(dataKey, 0);
-    handleChange(item, datum.current.getKey(item, key, index));
+    datum.set(dataKey, 0);
+    handleChange(item, dataKey);
   };
 
   // innerTitle 模式
   var renderInnerTitle = (0, _useInnerTitle.default)({
-    open: open || !!value,
+    open: open || !!(value && value.length),
     size: size,
     jssStyle: jssStyle,
     innerTitle: innerTitle
   });
+  var getResultByValue = (0, _hooks.usePersistFn)(function (arr) {
+    var result = (Array.isArray(arr) ? arr : [arr]).map(function (id) {
+      return getDataById(id);
+    }).filter(function (item) {
+      return item !== undefined;
+    });
+    return result;
+  });
+  var getResultValue = function getResultValue() {
+    if (!multiple && Array.isArray(value)) {
+      return value[0];
+    }
+    return value;
+  };
   var renderResult = function renderResult() {
     var result = /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames.default)(styles === null || styles === void 0 ? void 0 : styles.result),
@@ -411,13 +448,11 @@ var TreeSelect = function TreeSelect(props0) {
         trim: trim,
         jssStyle: jssStyle,
         size: size,
-        value: value,
-        data: tiledData,
+        value: getResultValue(),
+        data: data,
         focus: open,
         keygen: keygen,
-        disabled: disabled
-        // maxLength={maxLength}
-        ,
+        disabled: disabled,
         compressed: compressed,
         compressedBound: compressedBound,
         compressedClassName: compressedClassName,
@@ -436,7 +471,7 @@ var TreeSelect = function TreeSelect(props0) {
         onRef: inputRef,
         checkUnMatched: checkUnMatched,
         onClearCreatedData: onClearCreatedData,
-        getDataByValues: getDataByValues,
+        getDataByValues: getResultByValue,
         onRemove: handleRemove,
         classes: styles,
         setInputText: setInputText
@@ -492,14 +527,13 @@ var TreeSelect = function TreeSelect(props0) {
     if (multiple) {
       treeProps.onChange = handleTreeChange;
     } else {
-      treeProps.onClick = handleTreeChange;
+      treeProps.onClick = handleTreeClick;
       treeProps.renderItem = renderActive;
       treeProps.active = value;
     }
     if ('expanded' in props) {
       treeProps.expanded = expanded;
     }
-    var nextValue = getValueArray(value);
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: (0, _classnames.default)(styles.tree),
       style: {
@@ -507,30 +541,28 @@ var TreeSelect = function TreeSelect(props0) {
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_tree.default, _objectSpread(_objectSpread({
         jssStyle: jssStyle,
-        getDatum: bindTreeDatum,
         renderItem: renderItem
       }, treeProps), {}, {
-        keepCache: !props.noCache,
         line: line,
         mode: mode,
         data: tiledData,
         keygen: keygen,
         unmatch: unmatch,
-        value: nextValue,
+        value: value,
         loader: loader,
-        expanded: 'expanded' in props || expanded !== null && expanded !== void 0 && expanded.length ? expanded : undefined,
+        onExpand: onExpandTree,
+        expanded: controlExpanded,
+        defaultExpandAll: defaultExpandAll,
         expandIcons: tiledExpandIcons,
         disabled: disabled,
         parentClickExpand: parentClickExpand,
-        defaultExpanded: defaultExpanded,
-        defaultExpandAll: defaultExpandAll,
         contentClass: getContentClass,
-        onExpand: handleExpand
+        datum: datum
       }))
     });
   };
   (0, _react.useEffect)(function () {
-    if (getComponentRef && datum.current) {
+    if (getComponentRef && datum) {
       if (_hooks.util.isFunc(getComponentRef)) {
         getComponentRef({
           getDataByValues: getDataByValuesRef

package/esm/cascader/cascader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYhD,QAAA,MAAM,QAAQ,iGA+rBb,CAAC;AACF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"cascader.d.ts","sourceRoot":"","sources":["cascader.tsx"],"names":[],"mappings":";AAEA,OAAO,EAML,YAAY,EAIb,MAAM,eAAe,CAAC;AAMvB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAYhD,QAAA,MAAM,QAAQ,iGA8rBb,CAAC;AACF,eAAe,QAAQ,CAAC"}

package/esm/cascader/cascader.js

@@ -323,8 +323,8 @@ var Cascader = function Cascader(props0) {
     if (!path) return;
     handlePathChange(id, null, path);
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    var dataKey = util.isUnMatchedData(item) ? item.value : datum.getKey(item, key, index);
+  var handleRemove = function handleRemove(item, key) {
+    var dataKey = key !== null && key !== void 0 ? key : util.isUnMatchedData(item) ? item.value : datum.getKey(item);
     var isDisabled = datum.isDisabled(dataKey);
     if (isDisabled) return;
     datum.set(dataKey, 0);

package/esm/select/result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,QAAA,MAAM,MAAM,uEAkXX,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["result.tsx"],"names":[],"mappings":";AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAQ5C,QAAA,MAAM,MAAM,uEA8WX,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/esm/select/result.js

@@ -21,7 +21,6 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var isObject = util.isObject,
   isEmpty = util.isEmpty,
   isNumber = util.isNumber,
-  getKey = util.getKey,
   isUnMatchedData = util.isUnMatchedData,
   isFunc = util.isFunc,
   isArray = util.isArray;
@@ -58,7 +57,7 @@ var Result = function Result(props) {
     onRemove = props.onRemove,
     onResultItemClick = props.onResultItemClick,
     data = props.data;
-  var value = [null, undefined, ''].includes(valueProp) ? [] : multiple ? valueProp : [valueProp];
+  var value = [null, undefined, ''].includes(valueProp) ? [] : Array.isArray(valueProp) ? valueProp : [valueProp];
   var _useState = useState(-1),
     _useState2 = _slicedToArray(_useState, 2),
     more = _useState2[0],
@@ -134,20 +133,9 @@ var Result = function Result(props) {
       })
     }, 'input');
   };
-  var renderResultItem = function renderResultItem(item, index, nodes) {
-    var key;
-    if (isUnMatchedData(item)) {
-      if (isFunc(keygen)) {
-        key = keygen(item.value, index);
-        if (key === undefined) key = index;
-      } else {
-        key = item.value;
-      }
-    } else {
-      key = getKey(keygen, item, index);
-    }
+  var renderResultItem = function renderResultItem(item, index, nodes, v) {
     var handleClose = function handleClose() {
-      onRemove === null || onRemove === void 0 || onRemove(item, key, index);
+      onRemove === null || onRemove === void 0 || onRemove(item, v);
     };
     var isDisabled;
     if (util.isFunc(disabled)) {
@@ -157,7 +145,7 @@ var Result = function Result(props) {
     }
     var resultClassName;
     if (util.isFunc(props.resultClassName)) {
-      resultClassName = props.resultClassName(key);
+      resultClassName = props.resultClassName(isUnMatchedData(item) ? item.value : item);
     } else {
       resultClassName = props.resultClassName;
     }
@@ -167,8 +155,9 @@ var Result = function Result(props) {
     var content = renderResultContent(item, index, nodes);
     if (!content) return null;
     if (renderResultContentProp) {
+      // cascader 不渲染tag
       return renderResultContentProp(_objectSpread({
-        key: key,
+        key: index,
         size: size,
         disabled: isDisabled,
         className: classNames(styles.tag, styles.hideTag, resultClassName),
@@ -194,7 +183,7 @@ var Result = function Result(props) {
       type: disabled === true ? 'dark' : undefined
     })), {}, {
       children: content
-    }), key);
+    }), index);
   };
   var renderNbsp = function renderNbsp() {
     return /*#__PURE__*/_jsx(React.Fragment, {
@@ -225,22 +214,28 @@ var Result = function Result(props) {
       children: content
     }, 'single');
   };
+  var getValueArr = function getValueArr(v) {
+    return (isArray(v) ? v : [v]).filter(function (v) {
+      return v !== undefined && v !== null;
+    });
+  };
   var renderMultipleResult = function renderMultipleResult() {
     if (isEmptyResult()) return renderNbsp();
     // [TODO] separator 处理逻辑后续交给 hooks 处理，此处临时处理
-    var nextValue = value;
+    var nextValue = getValueArr(value);
     if (separator && util.isString(valueProp)) {
       nextValue = valueProp.split(separator);
     }
-    var values = getDataByValues(nextValue);
-    var result = values.map(function (v, i) {
-      if (renderResultContentProp && i !== values.length - 1) {
-        return [renderResultItem(v, i, values), /*#__PURE__*/_jsx("span", {
+    var datas = getDataByValues(nextValue);
+    var result = datas.map(function (d, i) {
+      var v = nextValue[i];
+      if (renderResultContentProp && i !== datas.length - 1) {
+        return [renderResultItem(d, i, datas, v), /*#__PURE__*/_jsx("span", {
           className: classNames(styles.tag, styles.hideTag),
           children: "/"
         }, "separator-".concat(i))];
       }
-      return renderResultItem(v, i, values);
+      return renderResultItem(d, i, datas, v);
     });
     return result;
   };

package/esm/tree/tree-context.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { TreeContextProps, TreeProviderProps } from './tree-context.type';
-export declare const TreeContext: React.Context<TreeContextProps<any>>;
+import { TreeProviderProps } from './tree-context.type';
+export declare const TreeContext: React.Context<import("../../../hooks/src/components/use-tree/use-tree.type").TreeDatum<any>>;
 export declare const Provider: <DataItem>(props: TreeProviderProps<DataItem>) => JSX.Element;
-export declare const useTreeContext: () => TreeContextProps<any>;
+export declare const useTreeContext: () => import("../../../hooks/src/components/use-tree/use-tree.type").TreeDatum<any>;
 //# sourceMappingURL=tree-context.d.ts.map

package/esm/tree/tree-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-context.d.ts","sourceRoot":"","sources":["tree-context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,eAAO,MAAM,WAAW,sCAA0E,CAAC;AAEnG,eAAO,MAAM,QAAQ,+DAGpB,CAAC;AAEF,eAAO,MAAM,cAAc,6BAAsC,CAAC"}
+{"version":3,"file":"tree-context.d.ts","sourceRoot":"","sources":["tree-context.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAoB,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE1E,eAAO,MAAM,WAAW,8FAA0E,CAAC;AAEnG,eAAO,MAAM,QAAQ,+DAGpB,CAAC;AAEF,eAAO,MAAM,cAAc,qFAAsC,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAAyC,MAAM,eAAe,CAAC;AAEpF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FA4OT,CAAC;AAEF,eAAe,IAAI,CAAC"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["tree.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,YAAY,EAA4B,MAAM,eAAe,CAAC;AAEvE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAMxC,QAAA,MAAM,IAAI,4FA8NT,CAAC;AAEF,eAAe,IAAI,CAAC"}

package/esm/tree/tree.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "keepCache"];
+var _excluded = ["jssStyle", "line", "childrenKey", "data", "value", "mode", "keygen", "expanded", "expandIcons", "iconClass", "leafClass", "nodeClass", "contentClass", "renderItem", "defaultValue", "dataUpdate", "childrenClass", "defaultExpandAll", "defaultExpanded", "parentClickExpand", "doubleClickExpand", "dragImageSelector", "dragImageStyle", "dragSibling", "unmatch", "dragHoverExpand", "active", "disabled", "inlineNode", "highlight", "className", "onClick", "loader", "getDatum", "onDrop", "onExpand", "onChange", "onDragEnd", "onDragLeave", "onDragOver", "onDragStart", "datum"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -15,7 +15,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 { useEffect } from 'react';
 import classNames from 'classnames';
-import { useTree, util, usePrevious } from '@sheinx/hooks';
+import { useTree, util } from '@sheinx/hooks';
 import RootTree from "./tree-root";
 import { Provider } from "./tree-context";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -66,9 +66,8 @@ var Tree = function Tree(props) {
     onDragLeave = props.onDragLeave,
     onDragOver = props.onDragOver,
     onDragStart = props.onDragStart,
-    keepCache = props.keepCache,
+    propsDatum = props.datum,
     rest = _objectWithoutProperties(props, _excluded);
-  var prevData = usePrevious(data);
   var _useTree = useTree({
       mode: mode,
       value: value,
@@ -85,7 +84,7 @@ var Tree = function Tree(props) {
       childrenKey: childrenKey,
       keygen: keygen,
       onExpand: onExpandProp,
-      keepCache: keepCache
+      datum: propsDatum
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -186,16 +185,6 @@ var Tree = function Tree(props) {
   useEffect(function () {
     handleUpdateExpanded(expanded);
   }, [expanded]);
-  useEffect(function () {
-    if (!prevData) return;
-    if (prevData !== data && dataUpdate) {
-      datum.setData(data);
-    }
-  }, [data]);
-  useEffect(function () {
-    if (!value) return;
-    datum.setValue(value);
-  }, [value]);
   useEffect(function () {
     if (getDatum) getDatum(datum);
   }, []);

package/esm/tree-select/tree-select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-select.d.ts","sourceRoot":"","sources":["tree-select.tsx"],"names":[],"mappings":";AACA,OAAO,EAQL,YAAY,EAEb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAc,MAAM,oBAAoB,CAAC;AAcjE,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,YAAY,EAAE,CAAC;AAIhE,QAAA,MAAM,UAAU,wGA8mBf,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"tree-select.d.ts","sourceRoot":"","sources":["tree-select.tsx"],"names":[],"mappings":";AACA,OAAO,EAQL,YAAY,EAEb,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,eAAe,EAAc,MAAM,oBAAoB,CAAC;AAajE,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,YAAY,EAAE,CAAC;AAIhE,QAAA,MAAM,UAAU,wGA8oBf,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/esm/tree-select/tree-select.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 React, { useRef, useEffect, useState } from 'react';
-import { util, usePersistFn, useTiled, usePopup, useTreeSelect, useFilter, useRender } from '@sheinx/hooks';
+import { util, usePersistFn, useTiled, usePopup, useTreeSelect, useFilter, useTree } from '@sheinx/hooks';
 import classNames from 'classnames';
 import { AbsoluteList } from "../absolute-list";
 import useInnerTitle from "../common/use-inner-title";
@@ -32,7 +32,6 @@ var preventDefault = function preventDefault(e) {
 var TreeSelect = function TreeSelect(props0) {
   var _jssStyle$treeSelect;
   var props = useWithFormConfig(props0);
-  var render = useRender();
   var _useConfig = useConfig(),
     locale = _useConfig.locale;
   var jssStyle = props.jssStyle,
@@ -40,9 +39,11 @@ var TreeSelect = function TreeSelect(props0) {
     size = props.size,
     valueProp = props.value,
     defaultValue = props.defaultValue,
-    data = props.data,
+    _props$data = props.data,
+    data = _props$data === void 0 ? [] : _props$data,
     multiple = props.multiple,
-    mode = props.mode,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 1 : _props$mode,
     _props$line = props.line,
     line = _props$line === void 0 ? false : _props$line,
     innerTitle = props.innerTitle,
@@ -102,9 +103,12 @@ var TreeSelect = function TreeSelect(props0) {
     width: width
   }, style);
   var showInput = util.isFunc(props.onAdvancedFilter || onFilterProp);
-  var datum = useRef();
   var blurEvent = useRef();
   var inputRef = useRef();
+  var _useRef = useRef({
+      cachedMap: new Map()
+    }),
+    context = _useRef.current;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     focused = _useState2[0],
@@ -114,7 +118,8 @@ var TreeSelect = function TreeSelect(props0) {
       onChange: onChangeProp,
       defaultValue: defaultValue,
       control: 'value' in props,
-      filterSameChange: filterSameChange
+      filterSameChange: filterSameChange,
+      multiple: multiple
     }),
     value = _useTreeSelect.value,
     onChange = _useTreeSelect.onChange;
@@ -145,6 +150,23 @@ var TreeSelect = function TreeSelect(props0) {
     onFilter = _useFilter.onFilter,
     onClearCreatedData = _useFilter.onClearCreatedData,
     setInputText = _useFilter.setInputText;
+  var controlExpanded = 'expanded' in props || expanded !== null && expanded !== void 0 && expanded.length ? expanded : undefined;
+  var _useTree = useTree({
+      mode: mode,
+      value: value,
+      data: data,
+      unmatch: unmatch,
+      disabled: disabled,
+      childrenKey: childrenKey,
+      keygen: keygen,
+      onExpand: onExpand,
+      expanded: controlExpanded,
+      defaultExpanded: defaultExpanded,
+      defaultExpandAll: defaultExpandAll,
+      isControlled: controlExpanded !== undefined
+    }),
+    datum = _useTree.datum,
+    onExpandTree = _useTree.onExpand;
   var renderMoreIcon = function renderMoreIcon() {
     return Icons.treeSelect.More;
   };
@@ -195,10 +217,6 @@ var TreeSelect = function TreeSelect(props0) {
     jssStyle: props.jssStyle
   });
   var rootClass = classNames(className, isEmpty && styles.wrapperEmpty, styles === null || styles === void 0 ? void 0 : styles.wrapper, open && (styles === null || styles === void 0 ? void 0 : styles.wrapperOpen), disabled === true && (styles === null || styles === void 0 ? void 0 : styles.wrapperDisabled), !!open && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), disabled !== true && focused && (styles === null || styles === void 0 ? void 0 : styles.wrapperFocus), innerTitle && (styles === null || styles === void 0 ? void 0 : styles.wrapperInnerTitle), size === 'small' && (styles === null || styles === void 0 ? void 0 : styles.wrapperSmall), size === 'large' && (styles === null || styles === void 0 ? void 0 : styles.wrapperLarge), (!!props.error || props.status === 'error') && (styles === null || styles === void 0 ? void 0 : styles.wrapperError), clearable && (styles === null || styles === void 0 ? void 0 : styles.clearable), !border && (styles === null || styles === void 0 ? void 0 : styles.wrapperNoBorder), !!underline && (styles === null || styles === void 0 ? void 0 : styles.wrapperUnderline), _defineProperty({}, styles === null || styles === void 0 ? void 0 : styles.multiple, multiple));
-  var bindTreeDatum = function bindTreeDatum(treeDatum) {
-    datum.current = treeDatum;
-    render();
-  };
   var getRenderItem = function getRenderItem(data, expanded, active, id) {
     return typeof renderItemProp === 'function' ? renderItemProp(data, expanded, active, id) : data[renderItemProp];
   };
@@ -254,9 +272,9 @@ var TreeSelect = function TreeSelect(props0) {
   };
   var handleClear = function handleClear(e) {
     e.stopPropagation();
-    if (!datum.current) return;
-    datum.current.setValue([]);
-    onChange(multiple ? [] : '');
+    if (!datum) return;
+    datum.setValue([]);
+    onChange(multiple ? [] : ['']);
     if (onChangeAddition) {
       onChangeAddition({
         data: multiple ? [] : null
@@ -264,9 +282,6 @@ var TreeSelect = function TreeSelect(props0) {
     }
     if (open) closePop();
   };
-  var handleExpand = function handleExpand(expands) {
-    onExpand === null || onExpand === void 0 || onExpand(expands);
-  };
   var renderClearable = function renderClearable() {
     if (!multiple !== undefined && !showArrow) return null;
     var defaultIcon = multiple ? Icons.treeSelect.More : Icons.treeSelect.DropdownArrow;
@@ -296,37 +311,43 @@ var TreeSelect = function TreeSelect(props0) {
       children: defaultIcon
     });
   };
+  var getDataById = usePersistFn(function (id) {
+    if (!props.noCache) {
+      if (context.cachedMap.has(id)) {
+        return context.cachedMap.get(id);
+      }
+    }
+    if (!datum) return undefined;
+    var origin = datum === null || datum === void 0 ? void 0 : datum.getDataById(id);
+    if (!props.noCache && !(datum !== null && datum !== void 0 && datum.isUnMatched(origin))) {
+      context.cachedMap.set(id, origin);
+    }
+    return origin;
+  });
   var getDataByValues = function getDataByValues(values) {
-    if (!datum.current || !values) return [];
-    return datum.current.getDataByValues(values);
+    if (!datum || !values) return [];
+    return datum.getDataByValues(values);
   };
   var getDataByValuesRef = function getDataByValuesRef(values) {
-    var _datum$current2;
     if (util.isArray(values)) {
       return values.map(function (id) {
-        var _datum$current;
-        return (_datum$current = datum.current) === null || _datum$current === void 0 ? void 0 : _datum$current.getDataById(id);
+        return datum === null || datum === void 0 ? void 0 : datum.getDataById(id);
       });
     }
-    return (_datum$current2 = datum.current) === null || _datum$current2 === void 0 ? void 0 : _datum$current2.getDataById(values);
+    return datum === null || datum === void 0 ? void 0 : datum.getDataById(values);
   };
   var getValue = function getValue() {
-    if (!datum.current) return;
-    var nextValue = datum.current.getValue();
+    if (!datum) return;
+    var nextValue = datum.getValue();
     if (multiple) return nextValue;
-    return nextValue.length ? nextValue[0] : '';
-  };
-  var getValueArray = function getValueArray(value) {
-    if (!value) return [];
-    if (!Array.isArray(value)) return [value];
-    return value;
+    if (nextValue.length === 0) return [];
+    return [nextValue[0]];
   };
   var getContentClass = function getContentClass(data) {
-    var _datum$current3, _datum$current4;
-    if (!datum.current) return '';
-    var key = datum.current.getKey(data);
-    var isDisabled = (_datum$current3 = datum.current) === null || _datum$current3 === void 0 ? void 0 : _datum$current3.isDisabled(key);
-    var isCheck = (_datum$current4 = datum.current) === null || _datum$current4 === void 0 ? void 0 : _datum$current4.getChecked(key);
+    if (!datum) return '';
+    var key = datum.getKey(data);
+    var isDisabled = datum === null || datum === void 0 ? void 0 : datum.isDisabled(key);
+    var isCheck = datum === null || datum === void 0 ? void 0 : datum.getChecked(key);
     if (isDisabled) {
       return classNames(styles.optionDisabled);
     }
@@ -357,46 +378,62 @@ var TreeSelect = function TreeSelect(props0) {
     onTiledFilter === null || onTiledFilter === void 0 || onTiledFilter(trim ? text.trim() : text);
   };
   var handleChange = function handleChange(item, id) {
-    var _datum$current5;
-    if (!datum.current) return;
-    if (disabled === true || (_datum$current5 = datum.current) !== null && _datum$current5 !== void 0 && _datum$current5.isDisabled(id)) return;
-    var currentData = datum.current.getDataById(id);
+    if (disabled === true || datum !== null && datum !== void 0 && datum.isDisabled(id)) return;
+    var currentData = datum.getDataById(id);
     if (!multiple) {
-      datum.current.setValue([]);
-      datum.current.set(datum.current.getKey(item), 1);
+      datum.setValue([]);
+      datum.set(datum.getKey(item), 1);
     }
     var nextValue = getValue();
     if (onChange) {
-      onChange(nextValue, currentData, id ? (datum.current.getPath(id) || {}).path : undefined);
+      onChange(nextValue, currentData, id ? (datum.getPath(id) || {}).path : undefined);
     }
     if (typeof onChangeAddition === 'function') {
       onChangeAddition({
         data: getDataByValues(nextValue),
-        checked: multiple ? datum.current.get(id) : undefined,
+        checked: multiple ? datum.get(id) : undefined,
         current: currentData
       });
     }
   };
-  var handleTreeChange = function handleTreeChange(item, id) {
+  var handleTreeClick = function handleTreeClick(item, id) {
     handleChange(item, id);
-    if (!multiple) closePop();
+    closePop();
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    if (!datum.current) return;
-    var dataKey = util.isUnMatchedData(item) ? item.value : datum.current.getKey(item, key, index);
-    var isDisabled = datum.current.isDisabled(dataKey);
+  var handleTreeChange = function handleTreeChange(_value, id) {
+    var item = datum.getDataById(id);
+    handleChange(item, id);
+  };
+  var handleRemove = function handleRemove(item, key) {
+    if (!datum) return;
+    var dataKey = key !== null && key !== void 0 ? key : util.isUnMatchedData(item) ? item.value : datum.getKey(item);
+    var isDisabled = datum.isDisabled(dataKey);
     if (isDisabled) return;
-    datum.current.set(dataKey, 0);
-    handleChange(item, datum.current.getKey(item, key, index));
+    datum.set(dataKey, 0);
+    handleChange(item, dataKey);
   };
 
   // innerTitle 模式
   var renderInnerTitle = useInnerTitle({
-    open: open || !!value,
+    open: open || !!(value && value.length),
     size: size,
     jssStyle: jssStyle,
     innerTitle: innerTitle
   });
+  var getResultByValue = usePersistFn(function (arr) {
+    var result = (Array.isArray(arr) ? arr : [arr]).map(function (id) {
+      return getDataById(id);
+    }).filter(function (item) {
+      return item !== undefined;
+    });
+    return result;
+  });
+  var getResultValue = function getResultValue() {
+    if (!multiple && Array.isArray(value)) {
+      return value[0];
+    }
+    return value;
+  };
   var renderResult = function renderResult() {
     var result = /*#__PURE__*/_jsx("div", {
       className: classNames(styles === null || styles === void 0 ? void 0 : styles.result),
@@ -404,13 +441,11 @@ var TreeSelect = function TreeSelect(props0) {
         trim: trim,
         jssStyle: jssStyle,
         size: size,
-        value: value,
-        data: tiledData,
+        value: getResultValue(),
+        data: data,
         focus: open,
         keygen: keygen,
-        disabled: disabled
-        // maxLength={maxLength}
-        ,
+        disabled: disabled,
         compressed: compressed,
         compressedBound: compressedBound,
         compressedClassName: compressedClassName,
@@ -429,7 +464,7 @@ var TreeSelect = function TreeSelect(props0) {
         onRef: inputRef,
         checkUnMatched: checkUnMatched,
         onClearCreatedData: onClearCreatedData,
-        getDataByValues: getDataByValues,
+        getDataByValues: getResultByValue,
         onRemove: handleRemove,
         classes: styles,
         setInputText: setInputText
@@ -485,14 +520,13 @@ var TreeSelect = function TreeSelect(props0) {
     if (multiple) {
       treeProps.onChange = handleTreeChange;
     } else {
-      treeProps.onClick = handleTreeChange;
+      treeProps.onClick = handleTreeClick;
       treeProps.renderItem = renderActive;
       treeProps.active = value;
     }
     if ('expanded' in props) {
       treeProps.expanded = expanded;
     }
-    var nextValue = getValueArray(value);
     return /*#__PURE__*/_jsx("div", {
       className: classNames(styles.tree),
       style: {
@@ -500,30 +534,28 @@ var TreeSelect = function TreeSelect(props0) {
       },
       children: /*#__PURE__*/_jsx(Tree, _objectSpread(_objectSpread({
         jssStyle: jssStyle,
-        getDatum: bindTreeDatum,
         renderItem: renderItem
       }, treeProps), {}, {
-        keepCache: !props.noCache,
         line: line,
         mode: mode,
         data: tiledData,
         keygen: keygen,
         unmatch: unmatch,
-        value: nextValue,
+        value: value,
         loader: loader,
-        expanded: 'expanded' in props || expanded !== null && expanded !== void 0 && expanded.length ? expanded : undefined,
+        onExpand: onExpandTree,
+        expanded: controlExpanded,
+        defaultExpandAll: defaultExpandAll,
         expandIcons: tiledExpandIcons,
         disabled: disabled,
         parentClickExpand: parentClickExpand,
-        defaultExpanded: defaultExpanded,
-        defaultExpandAll: defaultExpandAll,
         contentClass: getContentClass,
-        onExpand: handleExpand
+        datum: datum
       }))
     });
   };
   useEffect(function () {
-    if (getComponentRef && datum.current) {
+    if (getComponentRef && datum) {
       if (util.isFunc(getComponentRef)) {
         getComponentRef({
           getDataByValues: getDataByValuesRef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sheinx/base",
-  "version": "3.0.10",
+  "version": "3.0.11",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -10,7 +10,7 @@
   "module": "./esm/index.js",
   "typings": "./cjs/index.d.ts",
   "dependencies": {
-    "@sheinx/hooks": "3.0.10",
+    "@sheinx/hooks": "3.0.11",
     "immer": "^10.0.0",
     "classnames": "^2.0.0",
     "@shined/reactive": "^0.1.2"