shineout 3.0.10 → 3.0.11

package/cjs/index.js

@@ -476,5 +476,5 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // 此文件由脚本自动生成，请勿直接修改。
 // This file was generated automatically by a script. Please do not modify it directly.
 var _default = exports.default = {
-  version: '3.0.10'
+  version: '3.0.11'
 };

package/dist/shineout.js

@@ -12019,7 +12019,7 @@ var handleStyle = function handleStyle(style) {
 };
 /* harmony default export */ var jss_style_handleStyle = (handleStyle);
 ;// CONCATENATED MODULE: ../shineout-style/src/version.ts
-/* harmony default export */ var version = ('3.0.10');
+/* harmony default export */ var version = ('3.0.11');
 ;// CONCATENATED MODULE: ../shineout-style/src/jss-style/index.tsx
 
 
@@ -30285,12 +30285,13 @@ var Checkbox = function Checkbox(props) {
 
 
 function useInputAble(props) {
+  var _props$value;
   var valuePo = props.value,
     onChange = props.onChange,
     control = props.control,
     beforeChange = props.beforeChange,
     delay = props.delay;
-  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(props.value || props.defaultValue),
+  var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)((_props$value = props.value) !== null && _props$value !== void 0 ? _props$value : props.defaultValue),
     _useState2 = slicedToArray_default()(_useState, 2),
     stateValue = _useState2[0],
     changeStateValue = _useState2[1];
@@ -33720,14 +33721,15 @@ var useTree = function useTree(props) {
     mode = props.mode,
     activeProp = props.active,
     expandedProp = props.expanded,
+    _props$dataUpdate = props.dataUpdate,
+    dataUpdate = _props$dataUpdate === void 0 ? true : _props$dataUpdate,
     _props$defaultExpande = props.defaultExpanded,
     defaultExpanded = _props$defaultExpande === void 0 ? [] : _props$defaultExpande,
     defaultExpandAll = props.defaultExpandAll,
     disabledProps = props.disabled,
     unmatch = props.unmatch,
     isControlled = props.isControlled,
-    onExpandProp = props.onExpand,
-    keepCache = props.keepCache;
+    onExpandProp = props.onExpand;
   var _useInputAble = useInputAble({
       value: expandedProp,
       defaultValue: defaultExpanded,
@@ -33764,7 +33766,7 @@ var useTree = function useTree(props) {
   var bindNode = function bindNode(id, update) {
     context.updateMap.set(id, update);
     var isActive = activeProp === id;
-    var expandeds = expanded || defaultExpanded;
+    var expandeds = expanded;
     if (defaultExpandAll) {
       return {
         active: isActive,
@@ -33849,16 +33851,8 @@ var useTree = function useTree(props) {
     return checked;
   };
   var getDataById = function getDataById(id) {
-    if (keepCache) {
-      if (!context.valueDataCache) {
-        context.valueDataCache = new Map();
-      }
-      var cache = context.valueDataCache.get(id);
-      if (cache !== undefined) return cache;
-    }
     var oroginData = context.dataMap.get(id);
     if (oroginData) {
-      if (keepCache) context.valueDataCache.set(id, oroginData);
       return oroginData;
     }
     if (!unmatch) return null;
@@ -33873,6 +33867,9 @@ var useTree = function useTree(props) {
     }
     return getDataById(values);
   };
+  var isUnMatched = usePersistFn(function (data) {
+    return isUnMatchedData(data);
+  });
   var setValueMap = function setValueMap(id, checked) {
     context.valueMap.set(id, checked);
     var update = context.forceUpdateMap.get(id);
@@ -34065,14 +34062,17 @@ var useTree = function useTree(props) {
     }
   }, []);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    setValue(value);
+    if (props.datum) return;
+    if (!dataUpdate) return;
     setData(data);
   }, [data]);
+  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
+    if (props.datum) return;
+    setValue(value);
+  }, [value]);
   var datum = use_latest_obj({
     get: get,
     set: set,
-    childrenKey: childrenKey,
-    data: data,
     getPath: getPath,
     getValue: getValue,
     getChecked: getChecked,
@@ -34085,13 +34085,16 @@ var useTree = function useTree(props) {
     getDataById: getDataById,
     bindUpdate: bindUpdate,
     unBindUpdate: unBindUpdate,
+    isUnMatched: isUnMatched,
+    childrenKey: childrenKey,
+    data: data,
     pathMap: context.pathMap,
     dataMap: context.dataMap,
     valueMap: context.valueMap,
     updateMap: context.updateMap
   });
   return {
-    datum: datum,
+    datum: props.datum || datum,
     expanded: expanded,
     onExpand: onExpand
   };
@@ -35157,7 +35160,6 @@ var More = function More(props) {
 var result_isObject = is_isObject,
   result_isEmpty = is_isEmpty,
   result_isNumber = isNumber,
-  result_getKey = getKey,
   result_isUnMatchedData = isUnMatchedData,
   result_isFunc = isFunc,
   result_isArray = isArray;
@@ -35194,7 +35196,7 @@ var result_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,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(-1),
     _useState2 = slicedToArray_default()(_useState, 2),
     more = _useState2[0],
@@ -35270,20 +35272,9 @@ var result_Result = function Result(props) {
       })
     }, 'input');
   };
-  var renderResultItem = function renderResultItem(item, index, nodes) {
-    var key;
-    if (result_isUnMatchedData(item)) {
-      if (result_isFunc(keygen)) {
-        key = keygen(item.value, index);
-        if (key === undefined) key = index;
-      } else {
-        key = item.value;
-      }
-    } else {
-      key = result_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 (isFunc(disabled)) {
@@ -35293,7 +35284,7 @@ var result_Result = function Result(props) {
     }
     var resultClassName;
     if (isFunc(props.resultClassName)) {
-      resultClassName = props.resultClassName(key);
+      resultClassName = props.resultClassName(result_isUnMatchedData(item) ? item.value : item);
     } else {
       resultClassName = props.resultClassName;
     }
@@ -35303,8 +35294,9 @@ var result_Result = function Result(props) {
     var content = renderResultContent(item, index, nodes);
     if (!content) return null;
     if (renderResultContentProp) {
+      // cascader 不渲染tag
       return renderResultContentProp(objectSpread2_default()({
-        key: key,
+        key: index,
         size: size,
         disabled: isDisabled,
         className: classnames_default()(styles.tag, styles.hideTag, resultClassName),
@@ -35330,7 +35322,7 @@ var result_Result = function Result(props) {
       type: disabled === true ? 'dark' : undefined
     })), {}, {
       children: content
-    }), key);
+    }), index);
   };
   var renderNbsp = function renderNbsp() {
     return /*#__PURE__*/(0,jsx_runtime.jsx)((external_root_React_commonjs2_react_commonjs_react_amd_react_default()).Fragment, {
@@ -35361,22 +35353,28 @@ var result_Result = function Result(props) {
       children: content
     }, 'single');
   };
+  var getValueArr = function getValueArr(v) {
+    return (result_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 && 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,jsx_runtime.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,jsx_runtime.jsx)("span", {
           className: classnames_default()(styles.tag, styles.hideTag),
           children: "/"
         }, "separator-".concat(i))];
       }
-      return renderResultItem(v, i, values);
+      return renderResultItem(d, i, datas, v);
     });
     return result;
   };
@@ -35782,8 +35780,8 @@ var Cascader = function Cascader(props0) {
     if (!path) return;
     handlePathChange(id, null, path);
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    var dataKey = isUnMatchedData(item) ? item.value : datum.getKey(item, key, index);
+  var handleRemove = function handleRemove(item, key) {
+    var dataKey = key !== null && key !== void 0 ? key : isUnMatchedData(item) ? item.value : datum.getKey(item);
     var isDisabled = datum.isDisabled(dataKey);
     if (isDisabled) return;
     datum.set(dataKey, 0);
@@ -47360,7 +47358,7 @@ var Root = function Root(props) {
 
 
 
-var tree_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 tree_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"];
 
 
 
@@ -47414,9 +47412,8 @@ var Tree = function Tree(props) {
     onDragLeave = props.onDragLeave,
     onDragOver = props.onDragOver,
     onDragStart = props.onDragStart,
-    keepCache = props.keepCache,
+    propsDatum = props.datum,
     rest = objectWithoutProperties_default()(props, tree_excluded);
-  var prevData = usePrevious(data);
   var _useTree = use_tree({
       mode: mode,
       value: value,
@@ -47433,7 +47430,7 @@ var Tree = function Tree(props) {
       childrenKey: childrenKey,
       keygen: keygen,
       onExpand: onExpandProp,
-      keepCache: keepCache
+      datum: propsDatum
     }),
     datum = _useTree.datum,
     expanded = _useTree.expanded,
@@ -47534,16 +47531,6 @@ var Tree = function Tree(props) {
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     handleUpdateExpanded(expanded);
   }, [expanded]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!prevData) return;
-    if (prevData !== data && dataUpdate) {
-      datum.setData(data);
-    }
-  }, [data]);
-  (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (!value) return;
-    datum.setValue(value);
-  }, [value]);
   (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
     if (getDatum) getDatum(datum);
   }, []);
@@ -57176,13 +57163,17 @@ src_tree_tree_0.displayName = 'ShineoutTree';
 /* harmony default export */ var src_tree_0 = (src_tree_tree_0);
 ;// CONCATENATED MODULE: ../hooks/src/components/use-treeselect/use-treeselect.ts
 
+
+
+
 var useTreeSelect = function useTreeSelect(props) {
   var valueProp = props.value,
     defaultValue = props.defaultValue,
     control = props.control,
     beforeChange = props.beforeChange,
     onChangeProp = props.onChange,
-    filterSameChange = props.filterSameChange;
+    filterSameChange = props.filterSameChange,
+    multiple = props.multiple;
   var _useInputAble = useInputAble({
       value: valueProp,
       control: control,
@@ -57193,9 +57184,27 @@ var useTreeSelect = function useTreeSelect(props) {
     }),
     value = _useInputAble.value,
     onChange = _useInputAble.onChange;
+  var valueArr = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useMemo)(function () {
+    if (value === undefined || value === null || value === '') return [];
+    return Array.isArray(value) ? value : [value];
+  }, [value, multiple]);
+  var handleChange = use_persist_fn(function (v) {
+    for (var _len = arguments.length, reset = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      reset[_key - 1] = arguments[_key];
+    }
+    if (!multiple && isArray(v)) {
+      onChange === null || onChange === void 0 || onChange.apply(void 0, [v[0]].concat(reset));
+    }
+    if (multiple && !isArray(v)) {
+      if (v === undefined || v === null) {
+        onChange === null || onChange === void 0 || onChange.apply(void 0, [[]].concat(reset));
+      } else onChange === null || onChange === void 0 || onChange.apply(void 0, [[v]].concat(reset));
+    }
+    onChange === null || onChange === void 0 || onChange.apply(void 0, [v].concat(reset));
+  });
   return {
-    value: value,
-    onChange: onChange
+    value: valueArr,
+    onChange: handleChange
   };
 };
 /* harmony default export */ var use_treeselect = (useTreeSelect);
@@ -57225,7 +57234,6 @@ var tree_select_preventDefault = function preventDefault(e) {
 var TreeSelect = function TreeSelect(props0) {
   var _jssStyle$treeSelect;
   var props = use_with_form_config(props0);
-  var render = useRender();
   var _useConfig = useConfig(),
     locale = _useConfig.locale;
   var jssStyle = props.jssStyle,
@@ -57233,9 +57241,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,
@@ -57295,9 +57305,12 @@ var TreeSelect = function TreeSelect(props0) {
     width: width
   }, style);
   var showInput = isFunc(props.onAdvancedFilter || onFilterProp);
-  var datum = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var blurEvent = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
   var inputRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)();
+  var _useRef = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useRef)({
+      cachedMap: new Map()
+    }),
+    context = _useRef.current;
   var _useState = (0,external_root_React_commonjs2_react_commonjs_react_amd_react_.useState)(false),
     _useState2 = slicedToArray_default()(_useState, 2),
     focused = _useState2[0],
@@ -57307,7 +57320,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;
@@ -57338,6 +57352,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 = use_tree({
+      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_config.treeSelect.More;
   };
@@ -57388,10 +57419,6 @@ var TreeSelect = function TreeSelect(props0) {
     jssStyle: props.jssStyle
   });
   var rootClass = 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_default()({}, 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];
   };
@@ -57447,9 +57474,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
@@ -57457,9 +57484,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_config.treeSelect.More : icons_config.treeSelect.DropdownArrow;
@@ -57489,37 +57513,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 (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_default()(styles.optionDisabled);
     }
@@ -57550,46 +57580,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);
+    closePop();
+  };
+  var handleTreeChange = function handleTreeChange(_value, id) {
+    var item = datum.getDataById(id);
     handleChange(item, id);
-    if (!multiple) closePop();
   };
-  var handleRemove = function handleRemove(item, key, index) {
-    if (!datum.current) return;
-    var dataKey = isUnMatchedData(item) ? item.value : datum.current.getKey(item, key, index);
-    var isDisabled = datum.current.isDisabled(dataKey);
+  var handleRemove = function handleRemove(item, key) {
+    if (!datum) return;
+    var dataKey = key !== null && key !== void 0 ? key : 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 = use_inner_title({
-    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__*/(0,jsx_runtime.jsx)("div", {
       className: classnames_default()(styles === null || styles === void 0 ? void 0 : styles.result),
@@ -57597,13 +57643,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,
@@ -57622,7 +57666,7 @@ var TreeSelect = function TreeSelect(props0) {
         onRef: inputRef,
         checkUnMatched: checkUnMatched,
         onClearCreatedData: onClearCreatedData,
-        getDataByValues: getDataByValues,
+        getDataByValues: getResultByValue,
         onRemove: handleRemove,
         classes: styles,
         setInputText: setInputText
@@ -57678,14 +57722,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,jsx_runtime.jsx)("div", {
       className: classnames_default()(styles.tree),
       style: {
@@ -57693,30 +57736,28 @@ var TreeSelect = function TreeSelect(props0) {
       },
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(src_tree_tree, objectSpread2_default()(objectSpread2_default()({
         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,external_root_React_commonjs2_react_commonjs_react_amd_react_.useEffect)(function () {
-    if (getComponentRef && datum.current) {
+    if (getComponentRef && datum) {
       if (isFunc(getComponentRef)) {
         getComponentRef({
           getDataByValues: getDataByValuesRef
@@ -61334,7 +61375,7 @@ var upload_interface = __webpack_require__(4412);
 
 
 /* harmony default export */ var src_0 = ({
-  version: '3.0.10'
+  version: '3.0.11'
 });
 }();
 /******/ 	return __webpack_exports__;