tdesign-react 0.18.1 → 0.18.2

package/es/select/base/PopupContent.js

@@ -1,37 +1,49 @@
 /**
- * tdesign v0.18.1
+ * tdesign v0.18.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-b05711f1.js';
-import { _ as _slicedToArray } from '../../_chunks/dep-24340815.js';
+import { _ as _objectWithoutProperties } from '../../_chunks/dep-016d27a7.js';
+import { _ as _defineProperty } from '../../_chunks/dep-efe7433b.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-2f008905.js';
 import React__default, { Children, isValidElement, cloneElement } from 'react';
 import { useLocaleReceiver } from '../../locale/LocalReceiver.js';
 import { getSelectValueArr } from '../util/helper.js';
 import useConfig from '../../_util/useConfig.js';
 import Option from './Option.js';
-import '../../_chunks/dep-d056abc2.js';
+import '../../_chunks/dep-6a5b1968.js';
 import '../../config-provider/index.js';
 import '../../config-provider/ConfigProvider.js';
-import '../../_chunks/dep-79c7181c.js';
 import '../../config-provider/ConfigContext.js';
 import '../../locale/zh_CN.js';
-import '../../_chunks/dep-222f3011.js';
+import '../../_chunks/dep-2eeaa58b.js';
 import 'lodash';
 import './OptionGroup.js';
 import 'classnames';
-import '../../_chunks/dep-cbd5adc9.js';
-import '../../_chunks/dep-9052d175.js';
-import '../../_chunks/dep-2f74dba2.js';
-import '../../_chunks/dep-45dee455.js';
-import '../../_chunks/dep-7e897399.js';
-import '../../_chunks/dep-8bc12c0f.js';
-import '../../_chunks/dep-776ae9a7.js';
-import '../../_chunks/dep-66287469.js';
+import '../../_chunks/dep-462edfd5.js';
+import '../../_chunks/dep-cb80da27.js';
+import '../../_chunks/dep-b6ff8559.js';
+import '../../_chunks/dep-1189939f.js';
+import '../../_chunks/dep-f3eac264.js';
+import '../../_chunks/dep-e507e9db.js';
+import '../../_chunks/dep-9ad4f4b7.js';
+import '../../_chunks/dep-4e491803.js';
+import '../../_chunks/dep-b6158110.js';
+import '../../_chunks/dep-744f52b3.js';
+import '../../_chunks/dep-9d2e7b62.js';
+import '../../_chunks/dep-e83a1558.js';
+import '../../_chunks/dep-83646039.js';
+import '../../_chunks/dep-504203df.js';
+import '../../_chunks/dep-74a044dc.js';
+import '../../_chunks/dep-47afb0bc.js';
+import '../../_chunks/dep-ed9505a3.js';
+import '../../_chunks/dep-43869d17.js';
 import '../../_util/useRipple.js';
 import '../../_util/setStyle.js';
 
+var _excluded = ["value", "label", "disabled"];
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -48,7 +60,9 @@ var PopupContent = function PopupContent(props) {
       empty = props.empty,
       loadingText = props.loadingText,
       loading = props.loading,
-      valueType = props.valueType;
+      valueType = props.valueType,
+      children = props.children,
+      keys = props.keys;
 
   var _useLocaleReceiver = useLocaleReceiver("select"),
       _useLocaleReceiver2 = _slicedToArray(_useLocaleReceiver, 2),
@@ -60,15 +74,35 @@ var PopupContent = function PopupContent(props) {
   var _useConfig = useConfig(),
       classPrefix = _useConfig.classPrefix;
 
-  if (!props.children && !props.options) return null;
+  if (!children && !props.options) return null;
 
   var onSelect = function onSelect(selectedValue, _ref) {
     var label = _ref.label,
-        selected = _ref.selected;
+        selected = _ref.selected,
+        restData = _ref.restData;
 
     if (selectedValue) {
+      var isValObj = valueType === "object";
+      var objVal = {};
+
+      if (isValObj) {
+        objVal = _objectSpread({}, restData);
+
+        if (!(keys !== null && keys !== void 0 && keys.label)) {
+          Object.assign(objVal, {
+            label: label
+          });
+        }
+
+        if (!(keys !== null && keys !== void 0 && keys.value)) {
+          Object.assign(objVal, {
+            value: selectedValue
+          });
+        }
+      }
+
       if (multiple) {
-        var values = getSelectValueArr(value, selectedValue, label, selected, valueType);
+        var values = getSelectValueArr(value, selectedValue, selected, valueType, keys, objVal);
         onChange(values, {
           label: label
         });
@@ -76,7 +110,8 @@ var PopupContent = function PopupContent(props) {
           return setShowPopup(true);
         });
       } else {
-        onChange(selectedValue, {
+        var selectVal = valueType === "object" ? objVal : selectedValue;
+        onChange(selectVal, {
           label: label
         });
         setShowPopup(!showPopup);
@@ -84,7 +119,7 @@ var PopupContent = function PopupContent(props) {
     }
   };
 
-  var childrenWithProps = Children.map(props.children, function (child) {
+  var childrenWithProps = Children.map(children, function (child) {
     if ( /*#__PURE__*/isValidElement(child)) {
       var addedProps = {
         size: size,
@@ -104,7 +139,9 @@ var PopupContent = function PopupContent(props) {
       return /* @__PURE__ */React__default.createElement("ul", null, options.map(function (_ref2, index) {
         var optionValue = _ref2.value,
             label = _ref2.label,
-            disabled = _ref2.disabled;
+            disabled = _ref2.disabled,
+            restData = _objectWithoutProperties(_ref2, _excluded);
+
         return /* @__PURE__ */React__default.createElement(Option, {
           key: index,
           max: max,
@@ -114,7 +151,9 @@ var PopupContent = function PopupContent(props) {
           selectedValue: value,
           multiple: multiple,
           size: size,
-          disabled: disabled
+          disabled: disabled,
+          restData: restData,
+          keys: keys
         });
       }));
     }

package/es/select/base/PopupContent.js.map

@@ -1 +1 @@
-{"version":3,"file":"PopupContent.js","sources":["../../../src/select/base/PopupContent.tsx"],"sourcesContent":["import React, { Children, isValidElement, cloneElement } from 'react';\nimport { useLocaleReceiver } from '../../locale/LocalReceiver';\nimport { getSelectValueArr } from '../util/helper';\nimport { TdSelectProps, SelectValue } from '../../_type/components/select';\nimport useConfig from '../../_util/useConfig';\nimport Option, { SelectOptionProps } from './Option';\n\ninterface SelectPopupProps\n  extends Pick<\n    TdSelectProps,\n    'value' | 'size' | 'multiple' | 'empty' | 'options' | 'max' | 'loadingText' | 'loading' | 'valueType'\n  > {\n  onChange?: (value: SelectValue, context?: { label?: string | number }) => void;\n  /**\n   * 是否展示popup\n   */\n  showPopup: boolean;\n  /**\n   * 控制popup展示的函数\n   */\n  setShowPopup: (show: boolean) => void;\n  children?: React.ReactNode;\n}\n\nconst PopupContent = (props: SelectPopupProps) => {\n  const {\n    onChange,\n    value,\n    size,\n    max,\n    multiple,\n    showPopup,\n    setShowPopup,\n    options,\n    empty,\n    loadingText,\n    loading,\n    valueType,\n  } = props;\n\n  // 国际化文本初始化\n  const [local, t] = useLocaleReceiver('select');\n  const emptyText = t(local.empty);\n\n  const { classPrefix } = useConfig();\n  if (!props.children && !props.options) return null;\n\n  const onSelect: SelectOptionProps['onSelect'] = (selectedValue, { label, selected }) => {\n    if (selectedValue) {\n      if (multiple) {\n        const values = getSelectValueArr(value, selectedValue, label, selected, valueType);\n        onChange(values, { label });\n        requestAnimationFrame(() => setShowPopup(true));\n      } else {\n        onChange(selectedValue, { label });\n        setShowPopup(!showPopup);\n      }\n    }\n  };\n\n  const childrenWithProps = Children.map(props.children, (child) => {\n    if (isValidElement(child)) {\n      const addedProps = { size, max, multiple, selectedValue: value, onSelect };\n      return cloneElement(child, { ...addedProps });\n    }\n    return child;\n  });\n\n  // 渲染 options\n  const renderOptions = () => {\n    if (options) {\n      // 通过options API配置的\n      return (\n        <ul>\n          {options.map(({ value: optionValue, label, disabled }, index) => (\n            <Option\n              key={index}\n              max={max}\n              label={label}\n              value={optionValue}\n              onSelect={onSelect}\n              selectedValue={value}\n              multiple={multiple}\n              size={size}\n              disabled={disabled}\n            />\n          ))}\n        </ul>\n      );\n    }\n    return <ul>{childrenWithProps}</ul>;\n  };\n\n  const isEmpty = (Array.isArray(childrenWithProps) && !childrenWithProps.length) || (options && options.length === 0);\n\n  if (isEmpty) {\n    return <div className={`${classPrefix}-select-empty`}>{empty ? empty : <p>{emptyText}</p>}</div>;\n  }\n\n  if (loading) {\n    return <div className={`${classPrefix}-select-loading-tips`}>{loadingText}</div>;\n  }\n  return <div>{renderOptions()}</div>;\n};\n\nexport default PopupContent;\n"],"names":["PopupContent","props","onChange","value","size","max","multiple","showPopup","setShowPopup","options","empty","loadingText","loading","valueType","useLocaleReceiver","local","t","emptyText","useConfig","classPrefix","children","onSelect","selectedValue","label","selected","values","getSelectValueArr","childrenWithProps","Children","map","child","isValidElement","addedProps","cloneElement","renderOptions","index","optionValue","disabled","Option","key","isEmpty","Array","isArray","length","className"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAwBMA,eAAe,SAAfA,YAAe,CAACC,KAAD,EAA6B;MAE9CC,WAYED,MAZFC;MACAC,QAWEF,MAXFE;MACAC,OAUEH,MAVFG;MACAC,MASEJ,MATFI;MACAC,WAQEL,MARFK;MACAC,YAOEN,MAPFM;MACAC,eAMEP,MANFO;MACAC,UAKER,MALFQ;MACAC,QAIET,MAJFS;MACAC,cAGEV,MAHFU;MACAC,UAEEX,MAFFW;MACAC,YACEZ,MADFY;;2BAIiBC,kBAAkB;;MAA9BC;MAAOC;;MACRC,YAAYD,EAAED,MAAML;;mBAEFQ;MAAhBC,yBAAAA;;MACJ,CAAClB,MAAMmB,QAAP,IAAmB,CAACnB,MAAMQ,gBAAgB;;MAExCY,WAA0C,SAA1CA,QAA0C,CAACC,aAAD,QAAwC;AAAA,QAAtBC,KAAsB,QAAtBA,KAAsB;AAAA,QAAfC,QAAe,QAAfA,QAAe;;QAClFF,eAAe;UACbhB,UAAU;YACNmB,SAASC,kBAAkBvB,OAAOmB,eAAeC,OAAOC,UAAUX;iBAC/DY,QAAQ;AAAEF,UAAAA,OAAAA;AAAF;8BACK;AAAA,iBAAMf,aAAa,KAAnB;AAAA;aACjB;iBACIc,eAAe;AAAEC,UAAAA,OAAAA;AAAF;qBACX,CAAChB;;;;;MAKdoB,oBAAoBC,SAASC,GAAT,CAAa5B,MAAMmB,QAAnB,EAA6B,UAACU,KAAD,EAAW;sBAC5DC,eAAeD,QAAQ;UACnBE,aAAa;AAAE5B,QAAAA,MAAAA,IAAF;AAAQC,QAAAA,KAAAA,GAAR;AAAaC,QAAAA,UAAAA,QAAb;AAAuBgB,QAAAA,eAAenB,KAAtC;AAA6CkB,QAAAA,UAAAA;AAA7C;0BACZY,aAAaH,yBAAYE;;;WAE3BF;GALiB;;MASpBI,gBAAgB,SAAhBA,aAAgB,GAAM;QACtBzB,SAAS;yDAGR,MAAD,MACGA,QAAQoB,GAAR,CAAY,iBAA0CM,KAA1C;AAAA,YAAUC,WAAV,SAAGjC,KAAH;AAAA,YAAuBoB,KAAvB,SAAuBA,KAAvB;AAAA,YAA8Bc,QAA9B,SAA8BA,QAA9B;AAAA,2DACVC,QAAD;AACEC,UAAAA,KAAKJ,KADP;AAEE9B,UAAAA,KAAAA,GAFF;AAGEkB,UAAAA,OAAAA,KAHF;AAIEpB,UAAAA,OAAOiC,WAJT;AAKEf,UAAAA,UAAAA,QALF;AAMEC,UAAAA,eAAenB,KANjB;AAOEG,UAAAA,UAAAA,QAPF;AAQEF,UAAAA,MAAAA,IARF;AASEiC,UAAAA,UAAAA;AATF,UADW;AAAA,OAAZ;;;uDAgBC,MAAD,MAAKV;;;MAGRa,UAAWC,MAAMC,OAAN,CAAcf,iBAAd,KAAoC,CAACA,kBAAkBgB,MAAvD,IAAmElC,WAAWA,QAAQkC,MAAR,KAAmB;;MAE9GH,SAAS;uDACH,OAAD;AAAKI,MAAAA,qBAAczB;AAAnB,OAAgDT,QAAQA,oDAAS,KAAD,MAAIO;;;MAGzEL,SAAS;uDACH,OAAD;AAAKgC,MAAAA,qBAAczB;AAAnB,OAAuDR;;;qDAExD,OAAD,MAAMuB;;;;;"}
+{"version":3,"file":"PopupContent.js","sources":["../../../src/select/base/PopupContent.tsx"],"sourcesContent":["import React, { Children, isValidElement, cloneElement } from 'react';\nimport { useLocaleReceiver } from '../../locale/LocalReceiver';\nimport { getSelectValueArr } from '../util/helper';\nimport { TdSelectProps, SelectValue, TdOptionProps } from '../../_type/components/select';\nimport useConfig from '../../_util/useConfig';\nimport Option, { SelectOptionProps } from './Option';\n\ntype OptionsType = TdOptionProps[];\n\ninterface SelectPopupProps\n  extends Pick<\n    TdSelectProps,\n    'value' | 'size' | 'multiple' | 'empty' | 'options' | 'max' | 'loadingText' | 'loading' | 'valueType' | 'keys'\n  > {\n  onChange?: (value: SelectValue, context?: { label?: string | number; restData?: Record<string, any> }) => void;\n  /**\n   * 是否展示popup\n   */\n  showPopup: boolean;\n  /**\n   * 控制popup展示的函数\n   */\n  setShowPopup: (show: boolean) => void;\n  children?: React.ReactNode;\n}\n\nconst PopupContent = (props: SelectPopupProps) => {\n  const {\n    onChange,\n    value,\n    size,\n    max,\n    multiple,\n    showPopup,\n    setShowPopup,\n    options,\n    empty,\n    loadingText,\n    loading,\n    valueType,\n    children,\n    keys,\n  } = props;\n\n  // 国际化文本初始化\n  const [local, t] = useLocaleReceiver('select');\n  const emptyText = t(local.empty);\n\n  const { classPrefix } = useConfig();\n  if (!children && !props.options) return null;\n\n  const onSelect: SelectOptionProps['onSelect'] = (selectedValue, { label, selected, restData }) => {\n    if (selectedValue) {\n      const isValObj = valueType === 'object';\n      let objVal = {};\n      if (isValObj) {\n        objVal = { ...restData };\n        if (!keys?.label) {\n          Object.assign(objVal, { label });\n        }\n        if (!keys?.value) {\n          Object.assign(objVal, { value: selectedValue });\n        }\n      }\n\n      if (multiple) {\n        // calc multiple select values\n        const values = getSelectValueArr(value, selectedValue, selected, valueType, keys, objVal);\n        onChange(values, { label });\n        requestAnimationFrame(() => setShowPopup(true));\n      } else {\n        // calc single select value\n        const selectVal = valueType === 'object' ? objVal : selectedValue;\n\n        onChange(selectVal, { label });\n        setShowPopup(!showPopup);\n      }\n    }\n  };\n\n  const childrenWithProps = Children.map(children, (child) => {\n    if (isValidElement(child)) {\n      const addedProps = { size, max, multiple, selectedValue: value, onSelect };\n      return cloneElement(child, { ...addedProps });\n    }\n    return child;\n  });\n\n  // 渲染 options\n  const renderOptions = () => {\n    if (options) {\n      // 通过options API配置的\n      return (\n        <ul>\n          {(options as OptionsType).map(({ value: optionValue, label, disabled, ...restData }, index) => (\n            <Option\n              key={index}\n              max={max}\n              label={label}\n              value={optionValue}\n              onSelect={onSelect}\n              selectedValue={value}\n              multiple={multiple}\n              size={size}\n              disabled={disabled}\n              restData={restData}\n              keys={keys}\n            />\n          ))}\n        </ul>\n      );\n    }\n    return <ul>{childrenWithProps}</ul>;\n  };\n\n  const isEmpty = (Array.isArray(childrenWithProps) && !childrenWithProps.length) || (options && options.length === 0);\n\n  if (isEmpty) {\n    return <div className={`${classPrefix}-select-empty`}>{empty ? empty : <p>{emptyText}</p>}</div>;\n  }\n\n  if (loading) {\n    return <div className={`${classPrefix}-select-loading-tips`}>{loadingText}</div>;\n  }\n  return <div>{renderOptions()}</div>;\n};\n\nexport default PopupContent;\n"],"names":["PopupContent","props","onChange","value","size","max","multiple","showPopup","setShowPopup","options","empty","loadingText","loading","valueType","children","keys","useLocaleReceiver","local","t","emptyText","useConfig","classPrefix","onSelect","selectedValue","label","selected","restData","isValObj","objVal","assign","values","getSelectValueArr","selectVal","childrenWithProps","Children","map","child","isValidElement","addedProps","cloneElement","renderOptions","index","optionValue","disabled","Option","key","isEmpty","Array","isArray","length","className"],"mappings":"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"}

package/es/select/base/Select.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SelectOptionProps } from './Option';
 import { TdSelectProps } from '../../_type/components/select';
 import { StyledProps } from '../../_type';
 export interface SelectProps extends TdSelectProps, StyledProps {
@@ -6,7 +7,7 @@ export interface SelectProps extends TdSelectProps, StyledProps {
 }
 declare const Select: React.FunctionComponent<SelectProps & React.RefAttributes<HTMLDivElement>> & {
     displayName: string;
-    Option: (props: import("./Option").SelectOptionProps) => JSX.Element;
+    Option: (props: SelectOptionProps) => JSX.Element;
     OptionGroup: (props: import("./OptionGroup").SelectGOptionGroupProps) => JSX.Element;
 };
 export default Select;

package/es/select/base/Select.js

@@ -1,15 +1,17 @@
 /**
- * tdesign v0.18.1
+ * tdesign v0.18.2
  * (c) 2021 tdesign
  * @license MIT
  */
 
-import { _ as _defineProperty } from '../../_chunks/dep-b05711f1.js';
-import { _ as _slicedToArray } from '../../_chunks/dep-24340815.js';
+import { _ as _defineProperty } from '../../_chunks/dep-efe7433b.js';
+import { _ as _slicedToArray } from '../../_chunks/dep-2f008905.js';
 import React__default, { useState, useRef, useEffect } from 'react';
+import { CloseCircleFilledIcon } from 'tdesign-icons-react';
 import classNames from 'classnames';
-import { get, isFunction, isString } from 'lodash';
-import { LoadingIcon, CloseCircleFilledIcon } from 'tdesign-icons-react';
+import { i as isFunction_1 } from '../../_chunks/dep-83646039.js';
+import { g as get_1 } from '../../_chunks/dep-b6158110.js';
+import { i as isString_1 } from '../../_chunks/dep-e507e9db.js';
 import { useLocaleReceiver } from '../../locale/LocalReceiver.js';
 import useConfig from '../../_util/useConfig.js';
 import composeRefs from '../../_util/composeRefs.js';
@@ -18,47 +20,60 @@ import forwardRefWithStatics from '../../_util/forwardRefWithStatics.js';
 import { getLabel, getSelectValueArr, getMultipleTags } from '../util/helper.js';
 import noop from '../../_util/noop.js';
 import FakeArrow from '../../common/FakeArrow.js';
+import { Loading } from '../../loading/index.js';
 import { Input } from '../../input/index.js';
 import { Popup } from '../../popup/index.js';
 import { Tag } from '../../tag/index.js';
 import Option from './Option.js';
 import OptionGroup from './OptionGroup.js';
 import PopupContent from './PopupContent.js';
-import '../../_chunks/dep-d056abc2.js';
+import '../../_chunks/dep-6a5b1968.js';
+import '../../_chunks/dep-cb80da27.js';
+import '../../_chunks/dep-b6ff8559.js';
+import '../../_chunks/dep-1189939f.js';
+import '../../_chunks/dep-504203df.js';
+import '../../_chunks/dep-74a044dc.js';
+import '../../_chunks/dep-744f52b3.js';
+import '../../_chunks/dep-9ad4f4b7.js';
+import '../../_chunks/dep-4e491803.js';
+import '../../_chunks/dep-9d2e7b62.js';
+import '../../_chunks/dep-f3eac264.js';
+import '../../_chunks/dep-e83a1558.js';
+import '../../_chunks/dep-47afb0bc.js';
+import '../../_chunks/dep-ed9505a3.js';
+import '../../_chunks/dep-43869d17.js';
 import '../../config-provider/index.js';
 import '../../config-provider/ConfigProvider.js';
-import '../../_chunks/dep-79c7181c.js';
+import '../../_chunks/dep-016d27a7.js';
 import '../../config-provider/ConfigContext.js';
 import '../../locale/zh_CN.js';
 import '../../_util/useDefault.js';
 import 'hoist-non-react-statics';
-import '../../_chunks/dep-222f3011.js';
+import '../../_chunks/dep-2eeaa58b.js';
+import 'lodash';
+import '../../loading/loading.js';
+import 'react-dom';
+import '../../_util/dom.js';
+import 'raf';
+import '../../_util/easing.js';
+import '../../common/Portal.js';
+import '../../_chunks/dep-65c183dc.js';
+import './style/css.js';
+import '../../_type/components/loading/index.js';
 import '../../input/Input.js';
-import '../../_chunks/dep-53a5fcb7.js';
-import '../../_chunks/dep-9052d175.js';
-import '../../_chunks/dep-2f74dba2.js';
-import '../../_chunks/dep-45dee455.js';
-import '../../_chunks/dep-b78554de.js';
-import '../../_chunks/dep-c7c70ac0.js';
 import '../../input/InputGroup.js';
-import './style/css.js';
 import '../../_type/components/input/index.js';
 import '../../popup/Popup.js';
 import 'react-popper';
 import '../../_util/usePrevious.js';
 import '../../popup/Portal.js';
-import 'react-dom';
 import '../../popup/useTriggerProps.js';
 import '../../_util/useClickOutside.js';
 import '../../_type/components/popup/index.js';
 import '../../tag/Tag.js';
 import '../../tag/CheckTag.js';
 import '../../_type/components/tag/index.js';
-import '../../_chunks/dep-cbd5adc9.js';
-import '../../_chunks/dep-7e897399.js';
-import '../../_chunks/dep-8bc12c0f.js';
-import '../../_chunks/dep-776ae9a7.js';
-import '../../_chunks/dep-66287469.js';
+import '../../_chunks/dep-462edfd5.js';
 import '../../_util/useRipple.js';
 import '../../_util/setStyle.js';
 
@@ -111,7 +126,12 @@ var Select = forwardRefWithStatics(function (props, ref) {
       _useDefaultValue$valu = _useDefaultValue.valueType,
       valueType = _useDefaultValue$valu === void 0 ? "value" : _useDefaultValue$valu,
       keys = _useDefaultValue.keys,
-      children = _useDefaultValue.children;
+      children = _useDefaultValue.children,
+      collapsedItems = _useDefaultValue.collapsedItems,
+      minCollapsedNum = _useDefaultValue.minCollapsedNum,
+      valueDisplay = _useDefaultValue.valueDisplay,
+      _onEnter = _useDefaultValue.onEnter,
+      onVisibleChange = _useDefaultValue.onVisibleChange;
 
   var _useConfig = useConfig(),
       classPrefix = _useConfig.classPrefix;
@@ -144,14 +164,15 @@ var Select = forwardRefWithStatics(function (props, ref) {
       width = _useState10[0],
       setWidth = _useState10[1];
 
+  var selectRef = useRef(null);
+  var overlayRef = useRef(null);
+
   if (value) {
-    selectedLabel = getLabel(children, value, currentOptions);
+    selectedLabel = getLabel(children, value, currentOptions, keys);
   }
 
-  var selectRef = useRef(null);
-  var overlayRef = useRef(null);
   useEffect(function () {
-    if (showPopup && selectRef && selectRef.current) {
+    if (showPopup && selectRef !== null && selectRef !== void 0 && selectRef.current) {
       var _overlayRef$current, _overlayRef$current$g, _overlayRef$current$g2;
 
       var domRect = selectRef.current.getBoundingClientRect();
@@ -160,23 +181,18 @@ var Select = forwardRefWithStatics(function (props, ref) {
       setWidth(width2);
     }
   }, [showPopup]);
+  useEffect(function () {
+    onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(showPopup);
+  }, [showPopup, onVisibleChange]);
   useEffect(function () {
     if (keys) {
       var transformedOptions = options.map(function (option) {
         return _objectSpread(_objectSpread({}, option), {}, {
-          value: get(option, (keys === null || keys === void 0 ? void 0 : keys.value) || "value"),
-          label: get(option, (keys === null || keys === void 0 ? void 0 : keys.label) || "label")
+          value: get_1(option, (keys === null || keys === void 0 ? void 0 : keys.value) || "value"),
+          label: get_1(option, (keys === null || keys === void 0 ? void 0 : keys.label) || "label")
         });
       });
       setCurrentOptions(transformedOptions);
-    } else if (children && Array.isArray(children)) {
-      var optionFromChild = children.reduce(function (acc, item) {
-        return acc.concat({
-          value: item.props.value,
-          label: item.props.label || item.props.children
-        });
-      }, []);
-      setCurrentOptions(optionFromChild);
     } else {
       setCurrentOptions(options);
     }
@@ -200,14 +216,14 @@ var Select = forwardRefWithStatics(function (props, ref) {
     return function () {
       document.removeEventListener("click", listener);
     };
-  }, [showPopup]);
+  }, [showPopup, onVisibleChange]);
 
   var removeTag = function removeTag(event, selectValue, tagData) {
     event.stopPropagation();
-    var values = getSelectValueArr(value, selectValue, "", true, valueType);
+    var values = getSelectValueArr(value, selectValue, true, valueType, keys);
     onChange(values);
 
-    if (isFunction(onRemove)) {
+    if (isFunction_1(onRemove)) {
       onRemove({
         value: tagData.value,
         data: tagData,
@@ -218,22 +234,13 @@ var Select = forwardRefWithStatics(function (props, ref) {
 
   var handleChange = function handleChange(value2, _ref) {
     var label = _ref.label;
-
-    if (multiple) {
-      onChange(value2);
-    } else {
-      var selectVal = valueType === "object" ? {
-        label: label,
-        value: value2
-      } : value2;
-      onChange(selectVal);
-    }
+    onChange(value2);
 
     if (filterable) {
       setInputVal(!multiple || reserveKeyword && multiple ? label : "");
     }
 
-    if (creatable && isFunction(onCreate)) {
+    if (creatable && isFunction_1(onCreate)) {
       if (options.filter(function (option) {
         return option.value === value2;
       }).length === 0) {
@@ -250,7 +257,7 @@ var Select = forwardRefWithStatics(function (props, ref) {
       return;
     }
 
-    if (filter && isFunction(filter)) {
+    if (filter && isFunction_1(filter)) {
       filteredOptions = Array.isArray(options) && options.filter(function (option) {
         return filter(value2, option);
       });
@@ -274,7 +281,7 @@ var Select = forwardRefWithStatics(function (props, ref) {
   var handleInputChange = function handleInputChange(value2) {
     setInputVal(value2);
 
-    if (isFunction(onSearch)) {
+    if (isFunction_1(onSearch)) {
       onSearch(value2);
       return;
     }
@@ -292,15 +299,29 @@ var Select = forwardRefWithStatics(function (props, ref) {
       var optionValue = [];
 
       if (valueType === "value") {
-        optionValue = currentOptions.filter(function (option) {
-          return value.includes(option.value);
-        });
-        tags = getMultipleTags(optionValue);
+        if (currentOptions) {
+          optionValue = currentOptions.filter(function (option) {
+            return value.includes(option === null || option === void 0 ? void 0 : option.value);
+          });
+        }
+
+        if (children && Array.isArray(children)) {
+          optionValue = children.reduce(function (acc, item) {
+            return acc.concat({
+              value: item.props.value,
+              label: item.props.label || item.props.children
+            });
+          }, []).filter(function (option) {
+            return value.includes(option === null || option === void 0 ? void 0 : option.value);
+          });
+        }
+
+        tags = getMultipleTags(optionValue, keys);
       } else {
-        tags = getMultipleTags(value);
+        tags = getMultipleTags(value, keys);
       }
 
-      if (tags.length > 0) return tags.map(function (item) {
+      if (tags.length > 0) return /* @__PURE__ */React__default.createElement(React__default.Fragment, null, tags.slice(0, minCollapsedNum).map(function (item) {
         return /* @__PURE__ */React__default.createElement(Tag, {
           closable: !disabled,
           key: item.value,
@@ -308,9 +329,12 @@ var Select = forwardRefWithStatics(function (props, ref) {
             var e = _ref2.e;
             return removeTag(e, item.value, item);
           },
-          disabled: disabled
+          disabled: disabled,
+          size: size
         }, item.label);
-      });
+      }), collapsedItems, minCollapsedNum && tags.length - minCollapsedNum > 0 && !collapsedItems ? /* @__PURE__ */React__default.createElement(Tag, {
+        size: size
+      }, " ", "+".concat(tags.length - minCollapsedNum)) : null);
       return !filterable ? defaultLabel : null;
     }
 
@@ -320,18 +344,25 @@ var Select = forwardRefWithStatics(function (props, ref) {
   var renderInput = function renderInput() {
     var isEmpty = !value || Array.isArray(value) && value.length === 0;
     return /* @__PURE__ */React__default.createElement(Input, {
-      value: isString(inputVal) ? inputVal : selectedLabel,
+      value: isString_1(inputVal) ? inputVal : selectedLabel,
       placeholder: isEmpty ? placeholder || "-\u8BF7\u9009\u62E9-" : void 0,
       className: "".concat(name, "-input"),
       onChange: handleInputChange,
-      onFocus: function onFocus(v, context) {
-        return isFunction(_onFocus) && _onFocus({
+      onFocus: function onFocus(_, context) {
+        return _onFocus === null || _onFocus === void 0 ? void 0 : _onFocus({
           value: value,
           e: context === null || context === void 0 ? void 0 : context.e
         });
       },
-      onBlur: function onBlur(v, context) {
-        return isFunction(_onBlur) && _onBlur({
+      onBlur: function onBlur(_, context) {
+        return _onBlur === null || _onBlur === void 0 ? void 0 : _onBlur({
+          value: value,
+          e: context === null || context === void 0 ? void 0 : context.e
+        });
+      },
+      onEnter: function onEnter(_, context) {
+        return _onEnter === null || _onEnter === void 0 ? void 0 : _onEnter({
+          inputValue: inputVal,
           value: value,
           e: context === null || context === void 0 ? void 0 : context.e
         });
@@ -363,8 +394,10 @@ var Select = forwardRefWithStatics(function (props, ref) {
 
   var renderSuffixIcon = function renderSuffixIcon() {
     if (loading) {
-      return /* @__PURE__ */React__default.createElement(LoadingIcon, {
-        className: classNames(className, "".concat(name, "-right-icon"))
+      return /* @__PURE__ */React__default.createElement(Loading, {
+        className: classNames(className, "".concat(name, "-right-icon"), "".concat(name, "-active-icon")),
+        loading: true,
+        size: "small"
       });
     }
 
@@ -395,17 +428,25 @@ var Select = forwardRefWithStatics(function (props, ref) {
     max: max,
     loadingText: loadingText,
     loading: loading,
-    valueType: valueType
+    valueType: valueType,
+    keys: keys
   };
 
   var renderContent = function renderContent() {
     return /* @__PURE__ */React__default.createElement(PopupContent, _objectSpread({}, popupContentProps), children);
   };
 
-  var selectDropdownClass = classNames(className, "".concat(name, "-dropdown"), "".concat(classPrefix, "-popup"), "narrow-scrollbar");
-  var overlayStyle = {
-    width: width ? "".concat(width, "px") : "none"
+  var renderMultipleInput = function renderMultipleInput() {
+    if (valueDisplay) {
+      return valueDisplay({
+        value: value,
+        onClose: removeTag
+      }) || defaultLabel;
+    }
+
+    return renderMultipleTags();
   };
+
   return /* @__PURE__ */React__default.createElement("div", {
     className: "".concat(name, "-wrap"),
     style: _objectSpread({}, style),
@@ -419,8 +460,10 @@ var Select = forwardRefWithStatics(function (props, ref) {
     content: renderContent(),
     placement: "bottom-left",
     visible: showPopup,
-    overlayStyle: overlayStyle,
-    overlayClassName: selectDropdownClass,
+    overlayStyle: {
+      width: width ? "".concat(width, "px") : "none"
+    },
+    overlayClassName: classNames(className, "".concat(name, "-dropdown"), "".concat(classPrefix, "-popup"), "narrow-scrollbar"),
     destroyOnClose: true,
     className: "".concat(name, "-popup-reference")
   }, popupProps), {}, {
@@ -434,7 +477,7 @@ var Select = forwardRefWithStatics(function (props, ref) {
     onClick: onInputClick
   }, /* @__PURE__ */React__default.createElement("span", {
     className: "".concat(name, "-left-icon")
-  }, prefixIcon), multiple && renderMultipleTags(), filterable && renderInput(), !multiple && !filterable && defaultLabel, renderSuffixIcon())));
+  }, prefixIcon), multiple ? renderMultipleInput() : null, filterable && renderInput(), !multiple && !filterable && defaultLabel, renderSuffixIcon())));
 }, {
   displayName: "Select",
   Option: Option,