@hi-ui/check-cascader 4.2.7 → 4.3.1-alpha.0

package/lib/cjs/CheckCascader.js

@@ -78,9 +78,13 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     tagInputProps = _a.tagInputProps,
     _a$size = _a.size,
     size = _a$size === void 0 ? 'md' : _a$size,
+    prefix = _a.prefix,
+    suffix = _a.suffix,
     renderExtraFooter = _a.renderExtraFooter,
     dropdownColumnRender = _a.dropdownColumnRender,
-    rest = tslib.__rest(_a, ["prefixCls", "className", "defaultValue", "value", "onChange", "data", "placeholder", "clearable", "onSelect", "expandTrigger", "disabled", "emptyContent", "changeOnSelect", "render", "displayRender", "checkCascaded", "searchPlaceholder", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "overlayClassName", "type", "checkedMode", "visible", "onOpen", "onClose", "tagInputProps", "size", "renderExtraFooter", "dropdownColumnRender"]);
+    customRender = _a.customRender,
+    fieldNames = _a.fieldNames,
+    rest = tslib.__rest(_a, ["prefixCls", "className", "defaultValue", "value", "onChange", "data", "placeholder", "clearable", "onSelect", "expandTrigger", "disabled", "emptyContent", "changeOnSelect", "render", "displayRender", "checkCascaded", "searchPlaceholder", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "overlayClassName", "type", "checkedMode", "visible", "onOpen", "onClose", "tagInputProps", "size", "prefix", "suffix", "renderExtraFooter", "dropdownColumnRender", "customRender", "fieldNames"]);
   var i18n = core.useLocaleContext();
   var placeholder = typeAssertion.isUndef(placeholderProp) ? i18n.get('checkCascader.placeholder') : placeholderProp;
   var flatted = type === 'flatted';
@@ -96,8 +100,8 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     cascaderData = _useCache[0],
     setCascaderData = _useCache[1];
   var flattedData = React.useMemo(function () {
-    return index$1.flattenTreeData(cascaderData);
-  }, [cascaderData]);
+    return index$1.flattenTreeData(cascaderData, fieldNames);
+  }, [cascaderData, fieldNames]);
   var _useUncontrolledState = useUncontrolledState.useUncontrolledState(defaultValue, valueProp, onChange),
     _value = _useUncontrolledState[0],
     tryChangeValue = _useUncontrolledState[1];
@@ -190,6 +194,13 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     titleRender: proxyTitleRender
   };
   var cls = classname.cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
+  var selectedItems = React.useMemo(function () {
+    return value.map(function (selectedId) {
+      return flattedData.find(function (item) {
+        return item.id === selectedId;
+      });
+    });
+  }, [value, flattedData]);
   return /*#__PURE__*/React__default["default"].createElement(picker.Picker, Object.assign({
     ref: ref,
     className: cls,
@@ -210,13 +221,14 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     scrollable: false,
     footer: typeAssertion.isFunction(renderExtraFooter) && renderExtraFooter(),
     onSearch: funcUtils.callAllFuncs(onSearchProp, onSearch),
-    trigger: /*#__PURE__*/React__default["default"].createElement(tagInput.TagInputMock, Object.assign({}, tagInputProps, {
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItems) : customRender : ( /*#__PURE__*/React__default["default"].createElement(tagInput.TagInputMock, Object.assign({}, tagInputProps, {
       size: size,
       clearable: clearable,
       placeholder: placeholder,
       // @ts-ignore
       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,
       appearance: appearance,
       value: value,
@@ -224,7 +236,7 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       onChange: proxyOnChange,
       data: flattedData,
       invalid: invalid
-    }))
+    })))
   }), typeAssertion.isArrayNonEmpty(selectProps.data) ? ( /*#__PURE__*/React__default["default"].createElement(CheckCascaderMenuList.CheckCascaderMenuList, {
     disabled: disabled,
     value: value,

package/lib/cjs/utils/index.js

@@ -101,10 +101,13 @@ function getCascaderItemEventData(node, requiredProps) {
  */
 var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData, allowCheck) {
   var keySet = new Set(checkedIds);
+  var flattenDataMap = new Map(flattenData.map(function (node) {
+    return [node.id, node];
+  }));
   switch (type) {
     case 'CHILD':
       return checkedIds.filter(function (id) {
-        var node = treeUtils.fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           var children = node.children;
           if (typeAssertion.isArrayNonEmpty(children)) {
@@ -120,7 +123,7 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
       });
     case 'PARENT':
       return checkedIds.filter(function (id) {
-        var node = treeUtils.fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = treeUtils.getNodeAncestors(node);

package/lib/esm/CheckCascader.js

@@ -66,9 +66,13 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
     tagInputProps = _a.tagInputProps,
     _a$size = _a.size,
     size = _a$size === void 0 ? 'md' : _a$size,
+    prefix = _a.prefix,
+    suffix = _a.suffix,
     renderExtraFooter = _a.renderExtraFooter,
     dropdownColumnRender = _a.dropdownColumnRender,
-    rest = __rest(_a, ["prefixCls", "className", "defaultValue", "value", "onChange", "data", "placeholder", "clearable", "onSelect", "expandTrigger", "disabled", "emptyContent", "changeOnSelect", "render", "displayRender", "checkCascaded", "searchPlaceholder", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "overlayClassName", "type", "checkedMode", "visible", "onOpen", "onClose", "tagInputProps", "size", "renderExtraFooter", "dropdownColumnRender"]);
+    customRender = _a.customRender,
+    fieldNames = _a.fieldNames,
+    rest = __rest(_a, ["prefixCls", "className", "defaultValue", "value", "onChange", "data", "placeholder", "clearable", "onSelect", "expandTrigger", "disabled", "emptyContent", "changeOnSelect", "render", "displayRender", "checkCascaded", "searchPlaceholder", "onLoadChildren", "appearance", "invalid", "filterOption", "searchable", "onSearch", "overlayClassName", "type", "checkedMode", "visible", "onOpen", "onClose", "tagInputProps", "size", "prefix", "suffix", "renderExtraFooter", "dropdownColumnRender", "customRender", "fieldNames"]);
   var i18n = useLocaleContext();
   var placeholder = isUndef(placeholderProp) ? i18n.get('checkCascader.placeholder') : placeholderProp;
   var flatted = type === 'flatted';
@@ -84,8 +88,8 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
     cascaderData = _useCache[0],
     setCascaderData = _useCache[1];
   var flattedData = useMemo(function () {
-    return flattenTreeData(cascaderData);
-  }, [cascaderData]);
+    return flattenTreeData(cascaderData, fieldNames);
+  }, [cascaderData, fieldNames]);
   var _useUncontrolledState = useUncontrolledState(defaultValue, valueProp, onChange),
     _value = _useUncontrolledState[0],
     tryChangeValue = _useUncontrolledState[1];
@@ -178,6 +182,13 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
     titleRender: proxyTitleRender
   };
   var cls = cx(prefixCls, className, prefixCls + "--" + (menuVisible ? 'open' : 'closed'));
+  var selectedItems = useMemo(function () {
+    return value.map(function (selectedId) {
+      return flattedData.find(function (item) {
+        return item.id === selectedId;
+      });
+    });
+  }, [value, flattedData]);
   return /*#__PURE__*/React.createElement(Picker, Object.assign({
     ref: ref,
     className: cls,
@@ -198,13 +209,14 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
     scrollable: false,
     footer: isFunction(renderExtraFooter) && renderExtraFooter(),
     onSearch: callAllFuncs(onSearchProp, onSearch),
-    trigger: /*#__PURE__*/React.createElement(TagInputMock, Object.assign({}, tagInputProps, {
+    trigger: customRender ? typeof customRender === 'function' ? customRender(selectedItems) : customRender : ( /*#__PURE__*/React.createElement(TagInputMock, Object.assign({}, tagInputProps, {
       size: size,
       clearable: clearable,
       placeholder: placeholder,
       // @ts-ignore
       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,
       appearance: appearance,
       value: value,
@@ -212,7 +224,7 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
       onChange: proxyOnChange,
       data: flattedData,
       invalid: invalid
-    }))
+    })))
   }), isArrayNonEmpty(selectProps.data) ? ( /*#__PURE__*/React.createElement(CheckCascaderMenuList, {
     disabled: disabled,
     value: value,

package/lib/esm/utils/index.js

@@ -7,7 +7,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { baseFlattenTree, getTopDownAncestors, fFindNodeById, getNodeAncestors, findNestedChildren } from '@hi-ui/tree-utils';
+import { baseFlattenTree, getTopDownAncestors, getNodeAncestors, findNestedChildren } from '@hi-ui/tree-utils';
 import { isArrayNonEmpty } from '@hi-ui/type-assertion';
 
 /**
@@ -96,10 +96,13 @@ function getCascaderItemEventData(node, requiredProps) {
  */
 var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData, allowCheck) {
   var keySet = new Set(checkedIds);
+  var flattenDataMap = new Map(flattenData.map(function (node) {
+    return [node.id, node];
+  }));
   switch (type) {
     case 'CHILD':
       return checkedIds.filter(function (id) {
-        var node = fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           var children = node.children;
           if (isArrayNonEmpty(children)) {
@@ -115,7 +118,7 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
       });
     case 'PARENT':
       return checkedIds.filter(function (id) {
-        var node = fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = getNodeAncestors(node);

package/lib/types/CheckCascader.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { CheckCascaderDataItem, CheckCascaderExpandTriggerEnum, CheckCascaderItemEventData, FlattedCheckCascaderDataItem } from './types';
 import { PickerProps } from '@hi-ui/picker';
 import { TagInputMockProps } from '@hi-ui/tag-input';
-import { HiBaseAppearanceEnum, HiBaseSizeEnum } from '@hi-ui/core';
+import { HiBaseAppearanceEnum, HiBaseFieldNames, HiBaseSizeEnum } from '@hi-ui/core';
 /**
  * 多项级联选择器
  */
@@ -12,6 +12,10 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger' | 'scrol
      * 设置选择项数据源
      */
     data: CheckCascaderDataItem[];
+    /**
+     * 设置 data 中字段对应的 key
+     */
+    fieldNames?: HiBaseFieldNames;
     /**
      * 设置当前多选值
      */
@@ -108,6 +112,14 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger' | 'scrol
      * 设置尺寸
      */
     size?: HiBaseSizeEnum;
+    /**
+     * 选择框前置内容
+     */
+    prefix?: React.ReactNode;
+    /**
+     * 选择框后置内容
+     */
+    suffix?: React.ReactNode;
     /**
      * 自定义下拉菜单底部渲染
      */
@@ -116,4 +128,8 @@ export interface CheckCascaderProps extends Omit<PickerProps, 'trigger' | 'scrol
      * 自定义下拉菜单每列渲染
      */
     dropdownColumnRender?: (menu: React.ReactElement, level: number) => React.ReactNode;
+    /**
+     * 自定义触发器
+     */
+    customRender?: React.ReactNode | ((selectItems: (FlattedCheckCascaderDataItem | undefined)[]) => React.ReactNode);
 }

package/package.json

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

package/CHANGELOG.md

@@ -1,158 +0,0 @@
-# @hi-ui/check-cascader
-
-## 4.2.7
-
-### Patch Changes
-
-- [#2791](https://github.com/XiaoMi/hiui/pull/2791) [`1a00f9fc4`](https://github.com/XiaoMi/hiui/commit/1a00f9fc4a44619059d7852e846b54fedbd56715) Thanks [@zyprepare](https://github.com/zyprepare)! - build: style-inject(node 环境下有问题) 替换为 @hi-ui/style-inject
-
-- Updated dependencies [[`1a00f9fc4`](https://github.com/XiaoMi/hiui/commit/1a00f9fc4a44619059d7852e846b54fedbd56715)]:
-  - @hi-ui/env@4.0.5
-  - @hi-ui/icons@4.0.19
-  - @hi-ui/checkbox@4.0.10
-  - @hi-ui/input@4.1.1
-  - @hi-ui/picker@4.1.6
-  - @hi-ui/popper@4.1.5
-  - @hi-ui/spinner@4.0.9
-  - @hi-ui/tag-input@4.1.1
-  - @hi-ui/array-utils@4.0.5
-  - @hi-ui/classname@4.0.5
-
-## 4.2.6
-
-### Patch Changes
-
-- [#2752](https://github.com/XiaoMi/hiui/pull/2752) [`8cc7d032a`](https://github.com/XiaoMi/hiui/commit/8cc7d032aff1aa62099e71e2e1a3ca3a9a226e30) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修复 PARENT 和 CHILD 模式在搜索场景下 id 丢失问题
-
-- Updated dependencies [[`a9b9c93fc`](https://github.com/XiaoMi/hiui/commit/a9b9c93fc3a3fea60d14052a5afeef9daf7efa1b), [`b3a13135c`](https://github.com/XiaoMi/hiui/commit/b3a13135c77e75291d5864ff7fcf63ddb2ff46b8), [`ca008e4ae`](https://github.com/XiaoMi/hiui/commit/ca008e4ae9753bc1f11efcdcbf09121d1ef07b56)]:
-  - @hi-ui/input@4.1.0
-  - @hi-ui/tag-input@4.1.0
-  - @hi-ui/tree-utils@4.1.6
-
-## 4.2.5
-
-### Patch Changes
-
-- build: rollup2 构建
-- Updated dependencies
-  - @hi-ui/core@4.0.8
-  - @hi-ui/use-check@4.0.5
-  - @hi-ui/use-data-source@4.0.4
-  - @hi-ui/use-latest@4.0.4
-  - @hi-ui/use-merge-refs@4.0.4
-  - @hi-ui/use-outside-click@4.0.4
-  - @hi-ui/use-search-mode@4.1.4
-  - @hi-ui/use-toggle@4.0.4
-  - @hi-ui/use-uncontrolled-state@4.0.4
-  - @hi-ui/icons@4.0.18
-  - @hi-ui/checkbox@4.0.8
-  - @hi-ui/input@4.0.13
-  - @hi-ui/picker@4.1.4
-  - @hi-ui/popper@4.1.3
-  - @hi-ui/spinner@4.0.8
-  - @hi-ui/tag-input@4.0.10
-  - @hi-ui/array-utils@4.0.4
-  - @hi-ui/classname@4.0.4
-  - @hi-ui/env@4.0.4
-  - @hi-ui/func-utils@4.0.4
-  - @hi-ui/times@4.0.4
-  - @hi-ui/tree-utils@4.1.4
-  - @hi-ui/type-assertion@4.0.4
-
-## 4.2.4
-
-### Patch Changes
-
-- fix: 修复 rollup3 打包 cjs 模块问题
-- Updated dependencies
-  - @hi-ui/env@4.0.3
-  - @hi-ui/core@4.0.7
-  - @hi-ui/use-check@4.0.4
-  - @hi-ui/use-data-source@4.0.3
-  - @hi-ui/use-latest@4.0.3
-  - @hi-ui/use-merge-refs@4.0.3
-  - @hi-ui/use-outside-click@4.0.3
-  - @hi-ui/use-search-mode@4.1.3
-  - @hi-ui/use-toggle@4.0.3
-  - @hi-ui/use-uncontrolled-state@4.0.3
-  - @hi-ui/icons@4.0.17
-  - @hi-ui/checkbox@4.0.7
-  - @hi-ui/input@4.0.12
-  - @hi-ui/picker@4.1.3
-  - @hi-ui/popper@4.1.2
-  - @hi-ui/spinner@4.0.7
-  - @hi-ui/tag-input@4.0.9
-  - @hi-ui/array-utils@4.0.3
-  - @hi-ui/classname@4.0.3
-  - @hi-ui/func-utils@4.0.3
-  - @hi-ui/times@4.0.3
-  - @hi-ui/tree-utils@4.1.3
-  - @hi-ui/type-assertion@4.0.3
-
-## 4.2.3
-
-### Patch Changes
-
-- [#2672](https://github.com/XiaoMi/hiui/pull/2672) [`1ebe27830`](https://github.com/XiaoMi/hiui/commit/1ebe2783098b3a8cd980bd10076d67635463800e) Thanks [@zyprepare](https://github.com/zyprepare)! - build: 升级到 rollup3,重新构建发布组件
-
-- Updated dependencies [[`1ebe27830`](https://github.com/XiaoMi/hiui/commit/1ebe2783098b3a8cd980bd10076d67635463800e)]:
-  - @hi-ui/core@4.0.6
-  - @hi-ui/use-check@4.0.3
-  - @hi-ui/use-data-source@4.0.2
-  - @hi-ui/use-latest@4.0.2
-  - @hi-ui/use-merge-refs@4.0.2
-  - @hi-ui/use-outside-click@4.0.2
-  - @hi-ui/use-search-mode@4.1.2
-  - @hi-ui/use-toggle@4.0.2
-  - @hi-ui/use-uncontrolled-state@4.0.2
-  - @hi-ui/icons@4.0.16
-  - @hi-ui/checkbox@4.0.6
-  - @hi-ui/input@4.0.11
-  - @hi-ui/picker@4.1.2
-  - @hi-ui/popper@4.1.1
-  - @hi-ui/spinner@4.0.6
-  - @hi-ui/tag-input@4.0.8
-  - @hi-ui/array-utils@4.0.2
-  - @hi-ui/classname@4.0.2
-  - @hi-ui/env@4.0.2
-  - @hi-ui/func-utils@4.0.2
-  - @hi-ui/times@4.0.2
-  - @hi-ui/tree-utils@4.1.2
-  - @hi-ui/type-assertion@4.0.2
-
-## 4.2.2
-
-### Patch Changes
-
-- [#2653](https://github.com/XiaoMi/hiui/pull/2653) [`b477d91db`](https://github.com/XiaoMi/hiui/commit/b477d91db15bbc92c8712a9a771af5b332779315) Thanks [@zyprepare](https://github.com/zyprepare)! - chore: 更新使用到的 G40 颜色值
-
-- Updated dependencies [[`b477d91db`](https://github.com/XiaoMi/hiui/commit/b477d91db15bbc92c8712a9a771af5b332779315)]:
-  - @hi-ui/input@4.0.10
-  - @hi-ui/tag-input@4.0.7
-
-## 4.2.1
-
-### Patch Changes
-
-- [#2612](https://github.com/XiaoMi/hiui/pull/2612) [`832360b54`](https://github.com/XiaoMi/hiui/commit/832360b54231983148858b12707087c6b6fbac87) Thanks [@zyprepare](https://github.com/zyprepare)! - fix: 修改下拉菜单高度为 32px
-
-## 4.2.0
-
-### Minor Changes
-
-- [#2606](https://github.com/XiaoMi/hiui/pull/2606) [`9be456ec0`](https://github.com/XiaoMi/hiui/commit/9be456ec092031eab5ab6097f8276cde0bd4721d) Thanks [@zyprepare](https://github.com/zyprepare)! - feat: 增加 renderExtraFooter 和 dropdownColumnRender api
-
-- [#2602](https://github.com/XiaoMi/hiui/pull/2602) [`ad0d14abd`](https://github.com/XiaoMi/hiui/commit/ad0d14abdaf3ab2d5b79d649e7886ee90d1c941a) Thanks [@zyprepare](https://github.com/zyprepare)! - feat: add size api
-
-## 4.1.0
-
-### Minor Changes
-
-- [#2531](https://github.com/XiaoMi/hiui/pull/2531) [`0a9d90ac5`](https://github.com/XiaoMi/hiui/commit/0a9d90ac53bdf66aa2b83b698b58d2cdeb98d912) Thanks [@zyprepare](https://github.com/zyprepare)! - feat: 增加 tagInputProps API,支持显示内容高度自适应
-
-### Patch Changes
-
-- Updated dependencies [[`bd5940eba`](https://github.com/XiaoMi/hiui/commit/bd5940eba7d7a80aa676f37bb804ea27544864d2), [`0a9d90ac5`](https://github.com/XiaoMi/hiui/commit/0a9d90ac53bdf66aa2b83b698b58d2cdeb98d912)]:
-  - @hi-ui/picker@4.1.1
-  - @hi-ui/popper@4.0.5
-  - @hi-ui/tag-input@4.0.6