@vtx/components 4.0.0-beta.69 → 4.0.0-beta.70

package/es/vtx-select/index.js

@@ -1,3 +1,5 @@
+var _excluded = ["value", "mode", "size", "onChange", "maxTagCount", "maxTagTextLength", "maxTagPlaceholder", "showAll", "selectStyle", "selectAll", "selectSearchAll", "defaultBindBodyToPopupContainer", "customEnumText", "showSearch", "optionFilterProp", "onSearch"],
+  _excluded2 = ["onSearch", "optionFilterProp"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -9,6 +11,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -59,16 +63,25 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _props$defaultBindBod = props.defaultBindBodyToPopupContainer,
     defaultBindBodyToPopupContainer = _props$defaultBindBod === void 0 ? true : _props$defaultBindBod,
     _props$customEnumText = props.customEnumText,
-    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText;
+    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
+    showSearch = props.showSearch,
+    optionFilterProp = props.optionFilterProp,
+    _onSearch = props.onSearch,
+    rest = _objectWithoutProperties(props, _excluded);
   var TextEnum = _objectSpread({
     selectAllText: intl.getMessage('select.selectAll', '全选'),
     defaultPlaceholderText: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
     emptyDescriptionText: intl.getMessage('select.empty', '暂无数据')
   }, customEnumText);
+  var _useContext = useContext(VtxProvider),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('select', props.prefixCls);
+  var _useStyle = useStyle(prefixCls),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
   useEffect(function () {
     if ((mode === 'multiple' || mode === 'tags') && elRef.current) {
       var element = elRef.current;
-
       // 立即设置一次
       setPopWidth(element.clientWidth);
 
@@ -93,24 +106,47 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       };
     }
   }, [mode]);
-  var newChildren = props.children ? Array.isArray(props.children) ? props.children : [props.children] : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
+  var newChildren = props.children ? React.Children.toArray(props.children) : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
     return _objectSpread(_objectSpread({}, v), {}, {
       key: v.value,
-      props: {
+      props: _objectSpread(_objectSpread({}, v), {}, {
         children: v.label
-      }
+      })
     });
   })) || [];
+  var getOptionValue = function getOptionValue(item) {
+    var _ref, _itemProps$value;
+    var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
+    return (_ref = (_itemProps$value = itemProps.value) !== null && _itemProps$value !== void 0 ? _itemProps$value : item.value) !== null && _ref !== void 0 ? _ref : item.key;
+  };
+  var getOptionLabel = function getOptionLabel(item) {
+    var _ref2, _itemProps$children;
+    var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
+    return (_ref2 = (_itemProps$children = itemProps.children) !== null && _itemProps$children !== void 0 ? _itemProps$children : itemProps.label) !== null && _ref2 !== void 0 ? _ref2 : item.label;
+  };
+  var getSelectedValue = function getSelectedValue(item) {
+    if (isObject(item)) {
+      var _item$value;
+      return (_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : item.key;
+    }
+    return item;
+  };
+  var normalizedOptions = newChildren.map(function (item) {
+    return {
+      value: getOptionValue(item),
+      label: getOptionLabel(item),
+      raw: item
+    };
+  });
   var getContent = function getContent() {
     var child = {};
-    newChildren.forEach(function (item) {
-      var _item$props;
-      child[item.key] = item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.children;
+    normalizedOptions.forEach(function (item) {
+      child[item.value] = item.label;
     });
     var getChildren = function getChildren() {
       var child = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var value = arguments.length > 1 ? arguments[1] : undefined;
-      var key = isObject(value) ? value.key : value;
+      var key = getSelectedValue(value);
       return child[key] || '';
     };
     return /*#__PURE__*/_jsx("div", {
@@ -126,10 +162,13 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             e.preventDefault();
             var valueClone = _toConsumableArray(value);
             valueClone.splice(index, 1);
-            var options = newChildren.filter(function (ite) {
-              return valueClone.includes(ite.props.value);
+            var selectedValueSet = new Set(valueClone.map(getSelectedValue));
+            var options = normalizedOptions.filter(function (ite) {
+              return selectedValueSet.has(ite.value);
+            }).map(function (ite) {
+              return ite.raw;
             });
-            _onChange(valueClone, options);
+            _onChange && _onChange(valueClone, options);
           },
           children: /*#__PURE__*/_jsx(Tooltip, {
             title: name,
@@ -142,17 +181,51 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       })
     });
   };
-  var newProps = _objectSpread(_objectSpread({
-    showSearch: {
-      optionFilterProp: ['label', 'children']
-    },
+  var defaultOptionFilterProp = ['label', 'children'];
+  var handleSearch = function handleSearch(value) {
+    setSearchValue(value ? String(value).toLowerCase() : '');
+    _onSearch && _onSearch(value);
+  };
+  var getSearchProps = function getSearchProps() {
+    if (showSearch && _typeof(showSearch) === 'object') {
+      var showSearchOnSearch = showSearch.onSearch,
+        showSearchOptionFilterProp = showSearch.optionFilterProp,
+        searchConfig = _objectWithoutProperties(showSearch, _excluded2);
+      return {
+        showSearch: _objectSpread(_objectSpread({}, searchConfig), {}, {
+          optionFilterProp: showSearchOptionFilterProp || optionFilterProp || defaultOptionFilterProp,
+          onSearch: function onSearch(value) {
+            setSearchValue(value ? String(value).toLowerCase() : '');
+            showSearchOnSearch && showSearchOnSearch(value);
+            _onSearch && _onSearch(value);
+          }
+        })
+      };
+    }
+    return {
+      showSearch: showSearch === undefined ? true : showSearch,
+      optionFilterProp: optionFilterProp || defaultOptionFilterProp
+    };
+  };
+  var newProps = _objectSpread(_objectSpread(_objectSpread({}, getSearchProps()), {}, {
     placeholder: TextEnum.defaultPlaceholderText,
-    allowClear: true
-  }, props), {}, {
-    onSearch: function onSearch(value) {
-      setSearchValue(value ? String(value).toLowerCase() : '');
-      props.onSearch && props.onSearch(value);
-    },
+    allowClear: true,
+    value: value,
+    mode: mode,
+    size: size,
+    //同步button大小
+    onChange: _onChange,
+    maxTagCount: maxTagCount,
+    maxTagTextLength: maxTagTextLength,
+    maxTagPlaceholder: maxTagPlaceholder,
+    showAll: showAll,
+    //是否显示全部选项
+    selectStyle: selectStyle,
+    selectAll: selectAll,
+    selectSearchAll: selectSearchAll,
+    defaultBindBodyToPopupContainer: defaultBindBodyToPopupContainer
+  }, rest), {}, {
+    onSearch: handleSearch,
     onBlur: function onBlur(e) {
       setSearchValue('');
       props.onBlur && props.onBlur(e);
@@ -181,7 +254,7 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
                   if (e.target.checked) {
                     var tempChildren = newChildren.filter(function (item) {
                       if (selectSearchAll && searchValue) {
-                        return String(item.props.children).toLowerCase().indexOf(searchValue) > -1;
+                        return String(getOptionLabel(item)).toLowerCase().indexOf(searchValue) > -1;
                       }
                       return true;
                     });
@@ -189,13 +262,13 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
                     if (props.labelInValue) {
                       keys = tempChildren.map(function (item) {
                         return {
-                          label: item.props.children,
-                          value: item.key
+                          label: getOptionLabel(item),
+                          value: getOptionValue(item)
                         };
                       });
                     } else {
                       keys = tempChildren.map(function (item) {
-                        return item.key;
+                        return getOptionValue(item);
                       });
                     }
                     _onChange && _onChange(keys, tempChildren);
@@ -215,12 +288,6 @@ var VtxSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       });
     }
   }
-  var _useContext = useContext(VtxProvider),
-    getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('select', props.prefixCls);
-  var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
   return wrapSSR( /*#__PURE__*/_jsx("div", {
     className: classnames(prefixCls, hashId, _defineProperty({}, "".concat(prefixCls, "-multi"), mode == 'multiple' || mode == 'tags')),
     id: elId.current,

package/lib/vtx-select/index.js

@@ -1,6 +1,5 @@
 "use strict";
 
-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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -14,9 +13,12 @@ var _vtxIcon = _interopRequireDefault(require("../vtx-icon"));
 var _utils = require("../utils");
 var _vtxProvider = require("../vtx-provider");
 var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["value", "mode", "size", "onChange", "maxTagCount", "maxTagTextLength", "maxTagPlaceholder", "showAll", "selectStyle", "selectAll", "selectSearchAll", "defaultBindBodyToPopupContainer", "customEnumText", "showSearch", "optionFilterProp", "onSearch"],
+  _excluded2 = ["onSearch", "optionFilterProp"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -27,6 +29,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -67,16 +71,25 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
     _props$defaultBindBod = props.defaultBindBodyToPopupContainer,
     defaultBindBodyToPopupContainer = _props$defaultBindBod === void 0 ? true : _props$defaultBindBod,
     _props$customEnumText = props.customEnumText,
-    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText;
+    customEnumText = _props$customEnumText === void 0 ? {} : _props$customEnumText,
+    showSearch = props.showSearch,
+    optionFilterProp = props.optionFilterProp,
+    _onSearch = props.onSearch,
+    rest = _objectWithoutProperties(props, _excluded);
   var TextEnum = _objectSpread({
     selectAllText: intl.getMessage('select.selectAll', '全选'),
     defaultPlaceholderText: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
     emptyDescriptionText: intl.getMessage('select.empty', '暂无数据')
   }, customEnumText);
+  var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
+    getPrefixCls = _useContext.getPrefixCls;
+  var prefixCls = getPrefixCls('select', props.prefixCls);
+  var _useStyle = (0, _style.useStyle)(prefixCls),
+    wrapSSR = _useStyle.wrapSSR,
+    hashId = _useStyle.hashId;
   (0, _react.useEffect)(function () {
     if ((mode === 'multiple' || mode === 'tags') && elRef.current) {
       var element = elRef.current;
-
       // 立即设置一次
       setPopWidth(element.clientWidth);
 
@@ -101,24 +114,47 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       };
     }
   }, [mode]);
-  var newChildren = props.children ? Array.isArray(props.children) ? props.children : [props.children] : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
+  var newChildren = props.children ? _react.default.Children.toArray(props.children) : ((_props$options = props.options) === null || _props$options === void 0 ? void 0 : _props$options.map(function (v) {
     return _objectSpread(_objectSpread({}, v), {}, {
       key: v.value,
-      props: {
+      props: _objectSpread(_objectSpread({}, v), {}, {
         children: v.label
-      }
+      })
     });
   })) || [];
+  var getOptionValue = function getOptionValue(item) {
+    var _ref, _itemProps$value;
+    var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
+    return (_ref = (_itemProps$value = itemProps.value) !== null && _itemProps$value !== void 0 ? _itemProps$value : item.value) !== null && _ref !== void 0 ? _ref : item.key;
+  };
+  var getOptionLabel = function getOptionLabel(item) {
+    var _ref2, _itemProps$children;
+    var itemProps = (item === null || item === void 0 ? void 0 : item.props) || {};
+    return (_ref2 = (_itemProps$children = itemProps.children) !== null && _itemProps$children !== void 0 ? _itemProps$children : itemProps.label) !== null && _ref2 !== void 0 ? _ref2 : item.label;
+  };
+  var getSelectedValue = function getSelectedValue(item) {
+    if ((0, _utils.isObject)(item)) {
+      var _item$value;
+      return (_item$value = item.value) !== null && _item$value !== void 0 ? _item$value : item.key;
+    }
+    return item;
+  };
+  var normalizedOptions = newChildren.map(function (item) {
+    return {
+      value: getOptionValue(item),
+      label: getOptionLabel(item),
+      raw: item
+    };
+  });
   var getContent = function getContent() {
     var child = {};
-    newChildren.forEach(function (item) {
-      var _item$props;
-      child[item.key] = item === null || item === void 0 || (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.children;
+    normalizedOptions.forEach(function (item) {
+      child[item.value] = item.label;
     });
     var getChildren = function getChildren() {
       var child = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var value = arguments.length > 1 ? arguments[1] : undefined;
-      var key = (0, _utils.isObject)(value) ? value.key : value;
+      var key = getSelectedValue(value);
       return child[key] || '';
     };
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -134,10 +170,13 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
             e.preventDefault();
             var valueClone = _toConsumableArray(value);
             valueClone.splice(index, 1);
-            var options = newChildren.filter(function (ite) {
-              return valueClone.includes(ite.props.value);
+            var selectedValueSet = new Set(valueClone.map(getSelectedValue));
+            var options = normalizedOptions.filter(function (ite) {
+              return selectedValueSet.has(ite.value);
+            }).map(function (ite) {
+              return ite.raw;
             });
-            _onChange(valueClone, options);
+            _onChange && _onChange(valueClone, options);
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
             title: name,
@@ -150,17 +189,51 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       })
     });
   };
-  var newProps = _objectSpread(_objectSpread({
-    showSearch: {
-      optionFilterProp: ['label', 'children']
-    },
+  var defaultOptionFilterProp = ['label', 'children'];
+  var handleSearch = function handleSearch(value) {
+    setSearchValue(value ? String(value).toLowerCase() : '');
+    _onSearch && _onSearch(value);
+  };
+  var getSearchProps = function getSearchProps() {
+    if (showSearch && _typeof(showSearch) === 'object') {
+      var showSearchOnSearch = showSearch.onSearch,
+        showSearchOptionFilterProp = showSearch.optionFilterProp,
+        searchConfig = _objectWithoutProperties(showSearch, _excluded2);
+      return {
+        showSearch: _objectSpread(_objectSpread({}, searchConfig), {}, {
+          optionFilterProp: showSearchOptionFilterProp || optionFilterProp || defaultOptionFilterProp,
+          onSearch: function onSearch(value) {
+            setSearchValue(value ? String(value).toLowerCase() : '');
+            showSearchOnSearch && showSearchOnSearch(value);
+            _onSearch && _onSearch(value);
+          }
+        })
+      };
+    }
+    return {
+      showSearch: showSearch === undefined ? true : showSearch,
+      optionFilterProp: optionFilterProp || defaultOptionFilterProp
+    };
+  };
+  var newProps = _objectSpread(_objectSpread(_objectSpread({}, getSearchProps()), {}, {
     placeholder: TextEnum.defaultPlaceholderText,
-    allowClear: true
-  }, props), {}, {
-    onSearch: function onSearch(value) {
-      setSearchValue(value ? String(value).toLowerCase() : '');
-      props.onSearch && props.onSearch(value);
-    },
+    allowClear: true,
+    value: value,
+    mode: mode,
+    size: size,
+    //同步button大小
+    onChange: _onChange,
+    maxTagCount: maxTagCount,
+    maxTagTextLength: maxTagTextLength,
+    maxTagPlaceholder: maxTagPlaceholder,
+    showAll: showAll,
+    //是否显示全部选项
+    selectStyle: selectStyle,
+    selectAll: selectAll,
+    selectSearchAll: selectSearchAll,
+    defaultBindBodyToPopupContainer: defaultBindBodyToPopupContainer
+  }, rest), {}, {
+    onSearch: handleSearch,
     onBlur: function onBlur(e) {
       setSearchValue('');
       props.onBlur && props.onBlur(e);
@@ -189,7 +262,7 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
                   if (e.target.checked) {
                     var tempChildren = newChildren.filter(function (item) {
                       if (selectSearchAll && searchValue) {
-                        return String(item.props.children).toLowerCase().indexOf(searchValue) > -1;
+                        return String(getOptionLabel(item)).toLowerCase().indexOf(searchValue) > -1;
                       }
                       return true;
                     });
@@ -197,13 +270,13 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
                     if (props.labelInValue) {
                       keys = tempChildren.map(function (item) {
                         return {
-                          label: item.props.children,
-                          value: item.key
+                          label: getOptionLabel(item),
+                          value: getOptionValue(item)
                         };
                       });
                     } else {
                       keys = tempChildren.map(function (item) {
-                        return item.key;
+                        return getOptionValue(item);
                       });
                     }
                     _onChange && _onChange(keys, tempChildren);
@@ -223,12 +296,6 @@ var VtxSelect = exports.VtxSelect = /*#__PURE__*/(0, _react.forwardRef)(function
       });
     }
   }
-  var _useContext = (0, _react.useContext)(_vtxProvider.VtxProvider),
-    getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('select', props.prefixCls);
-  var _useStyle = (0, _style.useStyle)(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames2.default)(prefixCls, hashId, _defineProperty({}, "".concat(prefixCls, "-multi"), mode == 'multiple' || mode == 'tags')),
     id: elId.current,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vtx/components",
-  "version": "4.0.0-beta.69",
+  "version": "4.0.0-beta.70",
   "description": "React components for Vortex",
   "keywords": [
     "react",
@@ -12,6 +12,34 @@
     "es"
   ],
   "main": "lib/index.js",
+  "scripts": {
+    "start": "dumi dev",
+    "compile": "father build",
+    "build": "father build",
+    "bootstrap": "node ./scripts/bootstrap.mjs",
+    "changelog": "node ./scripts/changelogs.mjs",
+    "checkPublish": "npm run sync:tnpm && node ./scripts/checkPublish.mjs && npm run sync:tnpm",
+    "deploy": "cross-env SITE_DEPLOY='TRUE' npm run site && gh-pages -d ./dist",
+    "dumi": "cross-env SITE_DEPLOY='TRUE' dumi build",
+    "docs": "node ./scripts/docs.mjs",
+    "docs:dev": "pnpm docs dev",
+    "docs:build": "pnpm docs build",
+    "docs:preview": "pnpm docs preview",
+    "docs:create": "pnpm docs create",
+    "docs:check": "pnpm docs check",
+    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx  --fix ./ && npm run tsc",
+    "prettier": "prettier --write \"**/**.{js,jsx,tsx,ts,less,md,yaml,json}\" --log-level warn",
+    "createRelease": "node ./scripts/createRelease.mjs",
+    "site": "npm run build && cross-env SITE_DEPLOY='TRUE' dumi build",
+    "sync:tnpm": "node -e 'import(\"./scripts/syncTNPM.mjs\").then(m => m.default())'",
+    "test": "cross-env TZ=UTC vitest run",
+    "test:coverage": "cross-env TZ=UTC TEST_LOG=none vitest run --coverage",
+    "test:ui": "cross-env TZ=UTC vitest --ui",
+    "test:update": "cross-env TZ=UTC  vitest -u",
+    "tsc": "tsc --noEmit",
+    "publish:beta": "npm publish --tag beta",
+    "update:deps": "pnpm up --latest"
+  },
   "homepage": "https://git.cloudhw.cn:3443/front-end/react-components.git",
   "bugs": "https://git.cloudhw.cn:3443/front-end/react-components/-/issues",
   "repository": {
@@ -200,39 +228,12 @@
     "@vtx/utils": "^1.0.25"
   },
   "peerDependenciesName": "声明宿主依赖",
+  "packageManager": "pnpm@9.6.0",
   "publishConfig": {
     "access": "public"
   },
   "gitHooks": {
     "pre-commit": "pretty-quick --staged",
     "commit-msg": "fabric verify-commit"
-  },
-  "scripts": {
-    "start": "dumi dev",
-    "compile": "father build",
-    "build": "father build",
-    "bootstrap": "node ./scripts/bootstrap.mjs",
-    "changelog": "node ./scripts/changelogs.mjs",
-    "checkPublish": "npm run sync:tnpm && node ./scripts/checkPublish.mjs && npm run sync:tnpm",
-    "deploy": "cross-env SITE_DEPLOY='TRUE' npm run site && gh-pages -d ./dist",
-    "dumi": "cross-env SITE_DEPLOY='TRUE' dumi build",
-    "docs": "node ./scripts/docs.mjs",
-    "docs:dev": "pnpm docs dev",
-    "docs:build": "pnpm docs build",
-    "docs:preview": "pnpm docs preview",
-    "docs:create": "pnpm docs create",
-    "docs:check": "pnpm docs check",
-    "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx  --fix ./ && npm run tsc",
-    "prettier": "prettier --write \"**/**.{js,jsx,tsx,ts,less,md,yaml,json}\" --log-level warn",
-    "createRelease": "node ./scripts/createRelease.mjs",
-    "site": "npm run build && cross-env SITE_DEPLOY='TRUE' dumi build",
-    "sync:tnpm": "node -e 'import(\"./scripts/syncTNPM.mjs\").then(m => m.default())'",
-    "test": "cross-env TZ=UTC vitest run",
-    "test:coverage": "cross-env TZ=UTC TEST_LOG=none vitest run --coverage",
-    "test:ui": "cross-env TZ=UTC vitest --ui",
-    "test:update": "cross-env TZ=UTC  vitest -u",
-    "tsc": "tsc --noEmit",
-    "publish:beta": "npm publish --tag beta",
-    "update:deps": "pnpm up --latest"
   }
 }