@hi-ui/cascader 4.2.0 → 4.3.1

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @hi-ui/cascader
 
+## 4.3.1
+
+### Patch Changes
+
+- [#2994](https://github.com/XiaoMi/hiui/pull/2994) [`4d6b26507`](https://github.com/XiaoMi/hiui/commit/4d6b26507479030686d5da65e1bec8b353b80bfa) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修复 keyword 设置后数据没有过滤的问题
+
+## 4.3.0
+
+### Minor Changes
+
+- [#2921](https://github.com/XiaoMi/hiui/pull/2921) [`c6d9225c5`](https://github.com/XiaoMi/hiui/commit/c6d9225c5f09484344159e31af93f7ae147566bb) Thanks [@yang-x20](https://github.com/yang-x20)! - feat: 新增自定义触发器
+
+- [#2824](https://github.com/XiaoMi/hiui/pull/2824) [`912c60b7b`](https://github.com/XiaoMi/hiui/commit/912c60b7b0f19a8386ec1de30fe6440e3963f288) Thanks [@xiamiao1121](https://github.com/xiamiao1121)! - feat: 支持前置后置内容
+
 ## 4.2.0
 
 ### Minor Changes

package/lib/cjs/Cascader.js

@@ -67,6 +67,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     invalid = props.invalid,
     filterOption = props.filterOption,
     searchableProp = props.searchable,
+    keywordProp = props.keyword,
     onSearchProp = props.onSearch,
     titleRender = props.render,
     overlayClassName = props.overlayClassName,
@@ -77,13 +78,16 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     visible = props.visible,
     _props$size = props.size,
     size = _props$size === void 0 ? 'md' : _props$size,
+    prefix = props.prefix,
+    suffix = props.suffix,
     onOpen = props.onOpen,
     onClose = props.onClose,
     renderExtraFooter = props.renderExtraFooter,
     dropdownColumnRender = props.dropdownColumnRender,
     _props$closeOnSelect = props.closeOnSelect,
     closeOnSelect = _props$closeOnSelect === void 0 ? true : _props$closeOnSelect,
-    rest = tslib.__rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "onOpen", "onClose", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect"]);
+    customRender = props.customRender,
+    rest = tslib.__rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "keyword", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "prefix", "suffix", "onOpen", "onClose", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect", "customRender"]);
   var i18n = core.useLocaleContext();
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('cascader.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useToggle.useUncontrolledToggle({
@@ -141,6 +145,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
 
   var _useSearchMode = useSearchMode.useSearchMode({
       searchable: searchableProp,
+      keyword: keywordProp,
       strategies: [customSearchStrategy, upMatchSearchStrategy]
     }),
     stateInSearch = _useSearchMode.state,
@@ -237,13 +242,15 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     searchable: searchable,
     scrollable: false,
     footer: typeAssertion.isFunction(renderExtraFooter) && renderExtraFooter(),
+    keyword: keywordProp,
     onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
-    trigger: /*#__PURE__*/React__default["default"].createElement(input.MockInput, {
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItem) : customRender : ( /*#__PURE__*/React__default["default"].createElement(input.MockInput, {
       size: size,
       clearable: clearable,
       placeholder: placeholder,
       displayRender: displayRender,
-      suffix: menuVisible ? /*#__PURE__*/React__default["default"].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.DownOutlined, null),
+      prefix: prefix,
+      suffix: [menuVisible ? /*#__PURE__*/React__default["default"].createElement(icons.UpOutlined, null) : /*#__PURE__*/React__default["default"].createElement(icons.DownOutlined, null), suffix],
       focused: menuVisible,
       value: value[value.length - 1],
       onChange: function onChange() {
@@ -252,7 +259,7 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       data: mergedData,
       invalid: invalid,
       appearance: appearance
-    })
+    }))
   }), typeAssertion.isArrayNonEmpty(showData) ? /*#__PURE__*/React__default["default"].createElement(CascaderMenuList.CascaderMenuList, null) : null));
 });
 if (env.__DEV__) {

package/lib/esm/Cascader.js

@@ -54,6 +54,7 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     invalid = props.invalid,
     filterOption = props.filterOption,
     searchableProp = props.searchable,
+    keywordProp = props.keyword,
     onSearchProp = props.onSearch,
     titleRender = props.render,
     overlayClassName = props.overlayClassName,
@@ -64,13 +65,16 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     visible = props.visible,
     _props$size = props.size,
     size = _props$size === void 0 ? 'md' : _props$size,
+    prefix = props.prefix,
+    suffix = props.suffix,
     onOpen = props.onOpen,
     onClose = props.onClose,
     renderExtraFooter = props.renderExtraFooter,
     dropdownColumnRender = props.dropdownColumnRender,
     _props$closeOnSelect = props.closeOnSelect,
     closeOnSelect = _props$closeOnSelect === void 0 ? true : _props$closeOnSelect,
-    rest = __rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "onOpen", "onClose", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect"]);
+    customRender = props.customRender,
+    rest = __rest(props, ["prefixCls", "className", "placeholder", "disabled", "clearable", "type", "fieldNames", "expandTrigger", "displayRender", "onSelect", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "keyword", "onSearch", "render", "overlayClassName", "data", "flattedSearchResult", "visible", "size", "prefix", "suffix", "onOpen", "onClose", "renderExtraFooter", "dropdownColumnRender", "closeOnSelect", "customRender"]);
   var i18n = useLocaleContext();
   var placeholder = isUndef(placeholderProp) ? i18n.get('cascader.placeholder') : placeholderProp;
   var _useUncontrolledToggl = useUncontrolledToggle({
@@ -128,6 +132,7 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
 
   var _useSearchMode = useSearchMode({
       searchable: searchableProp,
+      keyword: keywordProp,
       strategies: [customSearchStrategy, upMatchSearchStrategy]
     }),
     stateInSearch = _useSearchMode.state,
@@ -224,13 +229,15 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
     searchable: searchable,
     scrollable: false,
     footer: isFunction(renderExtraFooter) && renderExtraFooter(),
+    keyword: keywordProp,
     onSearch: callAllFuncs(onSearchProp, onSearch),
-    trigger: /*#__PURE__*/React.createElement(MockInput, {
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItem) : customRender : ( /*#__PURE__*/React.createElement(MockInput, {
       size: size,
       clearable: clearable,
       placeholder: placeholder,
       displayRender: displayRender,
-      suffix: menuVisible ? /*#__PURE__*/React.createElement(UpOutlined, null) : /*#__PURE__*/React.createElement(DownOutlined, null),
+      prefix: prefix,
+      suffix: [menuVisible ? /*#__PURE__*/React.createElement(UpOutlined, null) : /*#__PURE__*/React.createElement(DownOutlined, null), suffix],
       focused: menuVisible,
       value: value[value.length - 1],
       onChange: function onChange() {
@@ -239,7 +246,7 @@ var Cascader = /*#__PURE__*/forwardRef(function (props, ref) {
       data: mergedData,
       invalid: invalid,
       appearance: appearance
-    })
+    }))
   }), isArrayNonEmpty(showData) ? /*#__PURE__*/React.createElement(CascaderMenuList, null) : null));
 });
 if (__DEV__) {

package/lib/types/Cascader.d.ts

@@ -77,4 +77,16 @@ export interface CascaderProps extends Omit<PickerProps, 'data' | 'onChange' | '
      * 设置尺寸
      */
     size?: HiBaseSizeEnum;
+    /**
+     * 选择框前置内容
+     */
+    prefix?: React.ReactNode;
+    /**
+     * 选择框后置内容
+     */
+    suffix?: React.ReactNode;
+    /**
+     * 自定义触发器
+     */
+    customRender?: React.ReactNode | ((selectedItem: CascaderItemEventData | null) => React.ReactNode);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/cascader",
-  "version": "4.2.0",
+  "version": "4.3.1",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",