@kdcloudjs/kdesign 1.7.17 → 1.7.18

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.16
+ *   @kdcloudjs/kdesign v1.7.17
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -6186,7 +6186,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _excluded = ["mode", "style", "options", "bordered", "disabled", "children", "loadData", "clearIcon", "className", "fieldNames", "placeholder", "defaultValue", "maxTagPlaceholder", "displayRender", "expandTrigger", "changeOnSelect", "dropdownRender", "notFoundContent", "getPopupContainer", "defaultPopupVisible", "onPopupVisibleChange", "onPopperVisibleChange", "prefixCls"];
+var _excluded = ["mode", "style", "options", "bordered", "disabled", "children", "loadData", "clearIcon", "className", "fieldNames", "placeholder", "defaultValue", "maxTagPlaceholder", "displayRender", "expandTrigger", "changeOnSelect", "dropdownRender", "notFoundContent", "getPopupContainer", "defaultPopupVisible", "onPopupVisibleChange", "onPopperVisibleChange", "prefixCls", "allowClear", "popupPlacement", "maxTagCount"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
@@ -6245,37 +6245,40 @@ var Cascader = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.forwar
     onPopupVisibleChange = allProps.onPopupVisibleChange,
     onPopperVisibleChange = allProps.onPopperVisibleChange,
     customPrefixcls = allProps.prefixCls,
+    customAllowClear = allProps.allowClear,
+    popupPlacement = allProps.popupPlacement,
+    maxTagCount = allProps.maxTagCount,
     otherProps = _babel_runtime_helpers_objectWithoutProperties__WEBPACK_IMPORTED_MODULE_4___default()(allProps, _excluded);
 
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'cascader', customPrefixcls);
-  var pickerRef = react__WEBPACK_IMPORTED_MODULE_17___default.a.useRef();
-  var triggerRef = react__WEBPACK_IMPORTED_MODULE_17___default.a.useRef();
-  var wrapperRef = react__WEBPACK_IMPORTED_MODULE_17___default.a.useRef();
+  var pickerRef = Object(react__WEBPACK_IMPORTED_MODULE_17__["useRef"])();
+  var triggerRef = Object(react__WEBPACK_IMPORTED_MODULE_17__["useRef"])();
+  var wrapperRef = Object(react__WEBPACK_IMPORTED_MODULE_17__["useRef"])();
   var mergeRef = ref || pickerRef;
-  var _React$useState = react__WEBPACK_IMPORTED_MODULE_17___default.a.useState(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
-    _React$useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_React$useState, 2),
-    visible = _React$useState2[0],
-    setVisible = _React$useState2[1];
+  var _useState = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])(!!props.popperVisible || !!props.popupVisible || defaultPopupVisible),
+    _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   react__WEBPACK_IMPORTED_MODULE_17___default.a.useEffect(function () {
     setVisible(!!props.popperVisible || !!props.popupVisible);
   }, [props.popperVisible, props.popupVisible]);
-  var _React$useState3 = react__WEBPACK_IMPORTED_MODULE_17___default.a.useState([options]),
-    _React$useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_React$useState3, 2),
-    menus = _React$useState4[0],
-    setMenus = _React$useState4[1];
-  var _React$useState5 = react__WEBPACK_IMPORTED_MODULE_17___default.a.useState([]),
-    _React$useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_React$useState5, 2),
-    currentOptions = _React$useState6[0],
-    setCurrentOptions = _React$useState6[1];
-  var _React$useState7 = react__WEBPACK_IMPORTED_MODULE_17___default.a.useState([]),
-    _React$useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_React$useState7, 2),
-    selectedOptions = _React$useState8[0],
-    setSelectedOptions = _React$useState8[1];
-  var _React$useState9 = react__WEBPACK_IMPORTED_MODULE_17___default.a.useState(props.value || defaultValue || []),
-    _React$useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_React$useState9, 2),
-    value = _React$useState10[0],
-    setValue = _React$useState10[1];
+  var _useState3 = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])([options]),
+    _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState3, 2),
+    menus = _useState4[0],
+    setMenus = _useState4[1];
+  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])([]),
+    _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState5, 2),
+    currentOptions = _useState6[0],
+    setCurrentOptions = _useState6[1];
+  var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])([]),
+    _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState7, 2),
+    selectedOptions = _useState8[0],
+    setSelectedOptions = _useState8[1];
+  var _useState9 = Object(react__WEBPACK_IMPORTED_MODULE_17__["useState"])(props.value || defaultValue || []),
+    _useState10 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState9, 2),
+    value = _useState10[0],
+    setValue = _useState10[1];
   react__WEBPACK_IMPORTED_MODULE_17___default.a.useEffect(function () {
     props.value && setValue(props.value);
   }, [props.value]);
@@ -6377,37 +6380,10 @@ var Cascader = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.forwar
       });
     });
   }, [currentOptions, isMultiple]);
-  var allowClear = allProps.allowClear && value.length > 0;
-  var locatorProps = {
-    style: style,
-    tabIndex: 0,
-    className: classnames__WEBPACK_IMPORTED_MODULE_18___default()("".concat(prefixCls, "-picker"), className, {
-      expand: visible,
-      allowClear: allowClear,
-      disabled: disabled
-    })
-  };
+  var allowClear = customAllowClear && value.length > 0;
   var handleClear = function handleClear() {
     onChange([]);
   };
-  var inputProps = {
-    value: value,
-    placeholder: placeholder,
-    readOnly: true,
-    disabled: disabled,
-    className: classnames__WEBPACK_IMPORTED_MODULE_18___default()("".concat(prefixCls, "-picker-input"), {
-      expand: visible
-    }),
-    suffix: props.suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_24__["default"], {
-      type: "arrow-down",
-      className: classnames__WEBPACK_IMPORTED_MODULE_18___default()({
-        expand: visible
-      })
-    })
-  };
-  if (bordered) {
-    inputProps.borderType = 'bordered';
-  }
   var renderSuffix = function renderSuffix() {
     var _classNames;
     var suffixIcon = allProps.suffixIcon;
@@ -6445,8 +6421,6 @@ var Cascader = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.forwar
   };
   var renderMultiple = function renderMultiple() {
     var _classNames3, _classNames4;
-    var maxTagCount = allProps.maxTagCount,
-      maxTagPlaceholder = allProps.maxTagPlaceholder;
     var multipleCls = classnames__WEBPACK_IMPORTED_MODULE_18___default()((_classNames3 = {
       disabled: disabled
     }, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames3, "".concat(prefixCls, "-multiple"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames3, "".concat(prefixCls, "-bordered"), bordered), _classNames3));
@@ -6485,19 +6459,44 @@ var Cascader = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.forwar
     }, renderSuffix())));
   };
   var renderSingle = function renderSingle() {
-    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("span", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, locatorProps, {
+    var inputProps = {
+      value: value,
+      placeholder: placeholder,
+      readOnly: true,
+      borderType: bordered ? 'bordered' : 'underline',
+      disabled: disabled,
+      className: classnames__WEBPACK_IMPORTED_MODULE_18___default()("".concat(prefixCls, "-picker-input"), {
+        expand: visible
+      }),
+      suffix: props.suffixIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_24__["default"], {
+        type: "arrow-down",
+        className: classnames__WEBPACK_IMPORTED_MODULE_18___default()({
+          expand: visible
+        })
+      })
+    };
+    var singleProps = {
+      style: style,
+      tabIndex: 0,
+      className: classnames__WEBPACK_IMPORTED_MODULE_18___default()("".concat(prefixCls, "-picker"), className, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()({
+        expand: visible,
+        allowClear: allowClear,
+        disabled: disabled
+      }, "".concat(prefixCls, "-bordered"), bordered))
+    };
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, singleProps, {
       ref: mergeRef
     }, otherProps), react__WEBPACK_IMPORTED_MODULE_17___default.a.Children.count(children) === 1 && children.type ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.cloneElement(children, {
       ref: triggerRef
-    }) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_17___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("span", {
+    }) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_17___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("div", {
       ref: triggerRef
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_input__WEBPACK_IMPORTED_MODULE_23__["default"], inputProps), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement("span", {
       className: "".concat(prefixCls, "-picker-label")
-    }, labels !== null && labels !== void 0 && labels.length ? displayRender(labels, currentOptions) : '')), allowClear && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_24__["default"], {
+    }, labels !== null && labels !== void 0 && labels.length ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_24__["default"], {
       type: "close-solid",
       className: "".concat(prefixCls, "-picker-close"),
       onClick: handleClear
-    })));
+    }))));
   };
   var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
   var onExpend = function onExpend(index, opt, opts) {
@@ -6609,7 +6608,7 @@ var Cascader = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_17___default.a.forwar
     trigger: 'click',
     getPopupContainer: getPopupContainer,
     prefixCls: "".concat(prefixCls, "-menus"),
-    placement: allProps.popperPlacement || allProps.popupPlacement,
+    placement: allProps.popperPlacement || popupPlacement,
     popperClassName: allProps.popperClassName || allProps.popupClassName,
     getTriggerElement: function getTriggerElement() {
       return triggerRef.current;
@@ -15658,6 +15657,7 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["forwardRef"](fu
     onItemClick = allProps.onItemClick,
     defaultVisible = allProps.defaultVisible,
     onVisibleChange = allProps.onVisibleChange,
+    trigger = allProps.trigger,
     customPrefixcls = allProps.prefixCls;
 
   // className前缀
@@ -15669,10 +15669,23 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["forwardRef"](fu
   react__WEBPACK_IMPORTED_MODULE_11__["useEffect"](function () {
     setVisible(!!props.visible);
   }, [props.visible]);
+  var handleVisibleChange = function handleVisibleChange(visible) {
+    props.visible === undefined && setVisible(visible);
+    onVisibleChange && onVisibleChange(visible);
+  };
   var child = children && (children === null || children === void 0 ? void 0 : (_children$type = children.type) === null || _children$type === void 0 ? void 0 : _children$type.displayName) === 'Input' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("span", {
     className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-trigger"), "".concat(prefixCls, "-trigger-container")),
     ref: ref
-  }, children) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["cloneElement"](react__WEBPACK_IMPORTED_MODULE_11__["Children"].only(children), {
+  }, trigger === 'focus' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["cloneElement"](react__WEBPACK_IMPORTED_MODULE_11__["Children"].only(children), {
+    onFocus: function onFocus(e) {
+      children.props.onFocus && children.props.onFocus(e);
+      handleVisibleChange(true);
+    },
+    onBlur: function onBlur(e) {
+      children.props.onBlur && children.props.onBlur(e);
+      handleVisibleChange(false);
+    }
+  }) : children) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["cloneElement"](react__WEBPACK_IMPORTED_MODULE_11__["Children"].only(children), {
     ref: children.ref || ref,
     className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(prefixCls, "-trigger"), children.props.className, {
       disabled: disabled
@@ -15739,10 +15752,6 @@ var Dropdown = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["forwardRef"](fu
       role: "menuitem"
     }, href === undefined || disabled ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("span", null, label) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("a", alinkProps, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11__["createElement"]("span", null, label)));
   }));
-  var handleVisibleChange = function handleVisibleChange(visible) {
-    props.visible === undefined && setVisible(visible);
-    onVisibleChange && onVisibleChange(visible);
-  };
   var popperProps = _objectSpread(_objectSpread({}, allProps), {}, {
     visible: visible,
     prefixCls: prefixCls,
@@ -20902,6 +20911,7 @@ var ClearableInput = function ClearableInput(props) {
     inputCount = props.inputCount,
     count = props.count,
     status = props.status;
+  var fixRef = Object(react__WEBPACK_IMPORTED_MODULE_3__["useRef"])(null);
   var _useState = Object(react__WEBPACK_IMPORTED_MODULE_3__["useState"])(false),
     _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_1___default()(_useState, 2),
     isMouseEnter = _useState2[0],
@@ -20916,6 +20926,11 @@ var ClearableInput = function ClearableInput(props) {
     e.stopPropagation();
     e.preventDefault();
   };
+  var clickHandle = function clickHandle(e) {
+    var _fixRef$current, _fixRef$current$query;
+    e.stopPropagation();
+    (_fixRef$current = fixRef.current) === null || _fixRef$current === void 0 ? void 0 : (_fixRef$current$query = _fixRef$current.querySelector('input')) === null || _fixRef$current$query === void 0 ? void 0 : _fixRef$current$query.focus();
+  };
   var renderClearIcon = function renderClearIcon() {
     var _classNames;
     if (!allowClear) {
@@ -20957,7 +20972,9 @@ var ClearableInput = function ClearableInput(props) {
     var inputWrapperClasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()((_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-focused"), focused && !disabled), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-error"), status === 'error'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(prefixCls, "-wrapper-disabled"), disabled), _classNames2), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()({}, className, className && !addonBefore && !addonAfter));
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       className: inputWrapperClasses,
+      ref: fixRef,
       style: style,
+      onClick: clickHandle,
       onMouseEnter: mouseEnterHandle,
       onMouseLeave: mouseLeaveHandle
     }, prefixNode, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.cloneElement(originElement, {
@@ -28275,9 +28292,12 @@ var InternalOption = function InternalOption(props, ref) {
     }
     onChangeSelect && onChangeSelect(value, children, isSelected);
   };
-  var handleOnMouseMove = function handleOnMouseMove() {
+  var handleOnMouseEnter = function handleOnMouseEnter() {
     onChangeActiveIndex && onChangeActiveIndex(index);
   };
+  var handleOnMouseLeave = function handleOnMouseLeave() {
+    onChangeActiveIndex && onChangeActiveIndex(-1);
+  };
   var titleText = title || (_babel_runtime_helpers_typeof__WEBPACK_IMPORTED_MODULE_0___default()(children) !== 'object' ? children : null);
   var checkStyle = {
     minHeight: '22px',
@@ -28288,7 +28308,8 @@ var InternalOption = function InternalOption(props, ref) {
     className: optionCls,
     title: titleText,
     onClick: handleClick,
-    onMouseMove: handleOnMouseMove
+    onMouseEnter: handleOnMouseEnter,
+    onMouseLeave: handleOnMouseLeave
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
     className: contentCls
   }, isMultiple ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_15__["Checkbox"], {
@@ -28433,7 +28454,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     children = selectProps.children,
     options = selectProps.options,
     placeholder = selectProps.placeholder,
-    dropdownStyle = selectProps.dropdownStyle,
+    _selectProps$dropdown = selectProps.dropdownStyle,
+    dropdownStyle = _selectProps$dropdown === void 0 ? {} : _selectProps$dropdown,
     style = selectProps.style,
     clearIcon = selectProps.clearIcon,
     filterOption = selectProps.filterOption,
@@ -28462,6 +28484,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     selectMulOpts: []
   }); // 多选ref已选中项
   var measureRef = Object(react__WEBPACK_IMPORTED_MODULE_19__["useRef"])(null);
+  var clearRef = Object(react__WEBPACK_IMPORTED_MODULE_19__["useRef"])(null);
   var _useState = Object(react__WEBPACK_IMPORTED_MODULE_19__["useState"])([]),
     _useState2 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState, 2),
     mulOptions = _useState2[0],
@@ -28506,7 +28529,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   var multipleFooterCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-multiple-footer"), true));
 
   // 多选，单选公共样式
-  var commCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()((_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-show-search"), isShowSearch), _classNames6));
+  var commCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()((_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames6, "".concat(selectPrefixCls, "-show-search"), isShowSearch && focusd), _classNames6));
   Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
     if (typeof props.visible !== 'undefined') {
       setOptionShow(props.visible);
@@ -28670,6 +28693,9 @@ var InternalSelect = function InternalSelect(props, ref) {
     if (isMultiple) {
       var _searchRef$current;
       (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.focus();
+    } else {
+      var _searchRef$current2;
+      (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.blur();
     }
     var optionsObj = obj.props ? obj.props : obj || {};
     if (value !== undefined) {
@@ -28832,17 +28858,17 @@ var InternalSelect = function InternalSelect(props, ref) {
   var renderSuffix = function renderSuffix() {
     var _classNames7;
     var suffixIcon = selectProps.suffixIcon;
-    var selectedVal = multipleRef.current.selectedVal;
     // 选择器下拉icon样式
     var arrowIconCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()((_classNames7 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
-    var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '') || searchValue);
+    var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (singleVal !== null && singleVal !== void 0 ? singleVal : '') !== '') || searchValue);
     var clearIconCls = classnames__WEBPACK_IMPORTED_MODULE_22___default()(_babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(selectPrefixCls, "-icon-clear"), true));
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, iconShow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
       onClick: handleReset,
       onMouseDown: function onMouseDown(e) {
         return e.preventDefault();
       },
-      className: clearIconCls
+      className: clearIconCls,
+      ref: clearRef
     }, clearIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_26__["Icon"], {
       type: "close-solid"
     })), showArrow && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("span", {
@@ -28899,8 +28925,8 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
   Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
     if (isShowSearch && autoFocus && !disabled) {
-      var _searchRef$current2;
-      (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.focus();
+      var _searchRef$current3;
+      (_searchRef$current3 = searchRef.current) === null || _searchRef$current3 === void 0 ? void 0 : _searchRef$current3.focus();
     }
   }, [isShowSearch, autoFocus, disabled]);
   var optionsListRef = react__WEBPACK_IMPORTED_MODULE_19___default.a.useRef(null);
@@ -28939,9 +28965,6 @@ var InternalSelect = function InternalSelect(props, ref) {
       maxHeight: listHeight || '300px'
     };
     // 下拉框style属性
-    var dropDownStyle = _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_6___default()({
-      width: style === null || style === void 0 ? void 0 : style.width
-    }, dropdownStyle);
     var checkboxStyle = {
       height: '30px',
       background: 'none'
@@ -28950,7 +28973,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var checked = mulOptions.length === filledOptions.length;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement(react__WEBPACK_IMPORTED_MODULE_19___default.a.Fragment, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
       className: dropDownCls,
-      style: dropDownStyle,
+      style: dropdownStyle,
       ref: dropDownRef
     }, !dropdownRender && childrenToRender.length > 0 && dropRender(eleOptionList, heightStyle), renderNotContent(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", null, dropdownRender && dropdownRender(dropRender(childrenToRender, heightStyle))), isMultiple && realChildren.length > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_19___default.a.createElement("div", {
       className: multipleFooterCls
@@ -29116,7 +29139,18 @@ var InternalSelect = function InternalSelect(props, ref) {
       onDropdownVisibleChange && onDropdownVisibleChange(true);
     }
   }, [optionShow]);
-  var _useState13 = Object(react__WEBPACK_IMPORTED_MODULE_19__["useState"])(getActiveIndex(0)),
+  Object(react__WEBPACK_IMPORTED_MODULE_19__["useEffect"])(function () {
+    var _clearRef$current;
+    var fn = function fn(e) {
+      e.stopPropagation();
+    };
+    (_clearRef$current = clearRef.current) === null || _clearRef$current === void 0 ? void 0 : _clearRef$current.addEventListener('mouseup', fn);
+    return function () {
+      var _clearRef$current2;
+      (_clearRef$current2 = clearRef.current) === null || _clearRef$current2 === void 0 ? void 0 : _clearRef$current2.removeEventListener('mouseup', fn);
+    };
+  }, [singleVal, mulOptions]);
+  var _useState13 = Object(react__WEBPACK_IMPORTED_MODULE_19__["useState"])(isShowSearch ? getActiveIndex(0) : -1),
     _useState14 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_9___default()(_useState13, 2),
     activeIndex = _useState14[0],
     setActiveIndex = _useState14[1];
@@ -29195,12 +29229,12 @@ var InternalSelect = function InternalSelect(props, ref) {
       className: selectionCls,
       tabIndex: disabled ? -1 : 0,
       onFocus: function onFocus() {
-        var _searchRef$current3;
-        return (_searchRef$current3 = searchRef.current) === null || _searchRef$current3 === void 0 ? void 0 : _searchRef$current3.focus();
+        var _searchRef$current4;
+        return (_searchRef$current4 = searchRef.current) === null || _searchRef$current4 === void 0 ? void 0 : _searchRef$current4.focus();
       },
       onBlur: function onBlur() {
-        var _searchRef$current4;
-        return (_searchRef$current4 = searchRef.current) === null || _searchRef$current4 === void 0 ? void 0 : _searchRef$current4.blur();
+        var _searchRef$current5;
+        return (_searchRef$current5 = searchRef.current) === null || _searchRef$current5 === void 0 ? void 0 : _searchRef$current5.blur();
       },
       onKeyDown: onInternalKeyDown
     }, !isMultiple ? renderSingle() : renderMultiple()));
@@ -29210,13 +29244,19 @@ var InternalSelect = function InternalSelect(props, ref) {
       var _selectRef$current;
       var _selectRef$current$ge = (_selectRef$current = selectRef.current) === null || _selectRef$current === void 0 ? void 0 : _selectRef$current.getBoundingClientRect(),
         width = _selectRef$current$ge.width;
-      return _objectSpread({
-        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || (width > 75 ? width : 75),
+      return _objectSpread(_objectSpread({
+        minWidth: width,
+        maxWidth: 600
+      }, dropdownStyle), {}, {
+        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || 'auto',
         zIndex: 1050
       }, popperStyle);
     }
   };
   var handleVisibleChange = function handleVisibleChange(visible) {
+    if (!visible) {
+      setActiveIndex(isShowSearch ? getActiveIndex(0) : -1);
+    }
     if (visible !== optionShow) {
       props.visible === undefined && setOptionShow(visible);
       onVisibleChange && onVisibleChange(visible);