fix(check-cascader): 修复checkedMode="PARENT"模式下搜索后子节点无法勾选的问题 (#2993)

* fix(check-cascader): 优化搜索算法 * fix(check-cascader): 修复 checkedMode="PARENT"模式下搜索后子节点无法选中问题 (#2992)
XiaoMi · Sep 13, 2024 · 102d01a · 102d01a
1 parent 6eb73ce
commit 102d01a
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 3 deletions.
diff --git a/.changeset/breezy-berries-marry.md b/.changeset/breezy-berries-marry.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/check-cascader": patch
+---
+
+fix: 优化搜索算法
diff --git a/.changeset/grumpy-tips-peel.md b/.changeset/grumpy-tips-peel.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/check-cascader": patch
+---
+
+fix: 修复 checkedMode="PARENT"模式下搜索后子节点无法选中问题
diff --git a/.changeset/lovely-suns-breathe.md b/.changeset/lovely-suns-breathe.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+fix(check-cascader): 优化搜索算法
diff --git a/.changeset/silver-bulldogs-provide.md b/.changeset/silver-bulldogs-provide.md
@@ -0,0 +1,5 @@
+---
+"@hi-ui/hiui": patch
+---
+
+fix(check-cascader): 修复 checkedMode="PARENT"模式下搜索后子节点无法选中问题
diff --git a/packages/ui/check-cascader/src/CheckCascader.tsx b/packages/ui/check-cascader/src/CheckCascader.tsx
@@ -291,6 +291,7 @@ export const CheckCascader = forwardRef<HTMLDivElement | null, CheckCascaderProp
             flatted={flatted || !!searchValue}
             // @ts-ignore
             flattedData={selectProps.data}
+            originalFlattedData={flattedData}
             data={cascaderData}
             onChangeData={setCascaderData}
             checkedMode={checkedMode}

diff --git a/packages/ui/check-cascader/src/CheckCascaderMenuList.tsx b/packages/ui/check-cascader/src/CheckCascaderMenuList.tsx
@@ -29,6 +29,7 @@ export const CheckCascaderMenuList = forwardRef<HTMLDivElement | null, CascaderM
       children,
       data,
       flattedData,
+      originalFlattedData,
       onChangeData,
       value: valueProp,
       defaultValue = NOOP_ARRAY,
@@ -59,7 +60,7 @@ export const CheckCascaderMenuList = forwardRef<HTMLDivElement | null, CascaderM
     const [onOptionCheck, isCheckedId, isSemiCheckedId] = useCheck(
       checkedMode,
       disabled,
-      flattedData,
+      originalFlattedData,
       defaultValue,
       valueProp,
       ({ checkedIds, semiCheckedIds }, target, shouldChecked) => {
@@ -164,6 +165,11 @@ export interface CascaderMenusProps {
    * 设置选择项数据源
    */
   flattedData: FlattedCheckCascaderDataItem[]
+  /**
+   * 未被过滤的选择项数据源，Hotfix：https://github.com/XiaoMi/hiui/issues/2992
+   * @private
+   */
+  originalFlattedData: FlattedCheckCascaderDataItem[]
   /**
    * 设置当前多选值
    */

diff --git a/packages/ui/check-cascader/src/utils/index.ts b/packages/ui/check-cascader/src/utils/index.ts
@@ -122,11 +122,12 @@ export const processCheckedIds = (
   allowCheck: (node: any) => boolean
 ) => {
   const keySet = new Set(checkedIds)
+  const flattenDataMap = new Map(flattenData.map((node: any) => [node.id, node]))
 
   switch (type) {
     case 'CHILD':
       return checkedIds.filter((id) => {
-        const node = fFindNodeById(flattenData, id)
+        const node = flattenDataMap.get(id) as any
 
         if (node) {
           const { children } = node
@@ -144,7 +145,8 @@ export const processCheckedIds = (
 
     case 'PARENT':
       return checkedIds.filter((id) => {
-        const node = fFindNodeById(flattenData, id) as any
+        const node = flattenDataMap.get(id) as any
+
         if (node) {
           // 向上递归遍历是否被勾选
           const ancestors = getNodeAncestors(node)