fix(cascader): logical error in setting and verifying value

Tencent · Dec 27, 2024 · aac22bb · aac22bb
1 parent b27a222
commit aac22bb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/cascader/core/helper.ts b/src/cascader/core/helper.ts
@@ -28,7 +28,7 @@ export function getSingleContent(cascaderContext: CascaderContextType): string {
   }
   const path = node && node[0].getPath();
   if (path && path.length) {
-    return showAllLevels ? path.map((node: TreeNode) => node.label).join(' / ') : path[path.length - 1].label;
+    return showAllLevels ? path.map((node: TreeNode) => node.label).join(' / ') : path.at(-1).label;
   }
   return value as string;
 }
@@ -118,10 +118,11 @@ export const getCascaderValue = (value: CascaderValue, valueType: TdCascaderProp
   if (valueType === 'single') {
     return value;
   }
+  const val = value as Array<CascaderValue>;
   if (multiple) {
-    return (value as Array<CascaderValue>).map((item: TreeNodeValue[]) => item[item.length - 1]);
+    return val.map((item: TreeNodeValue[]) => item.at(-1));
   }
-  return value[(value as Array<CascaderValue>).length - 1];
+  return val.at(-1);
 };
 
 /**
@@ -142,6 +143,6 @@ export function isEmptyValues(value: unknown): boolean {
  * @returns boolean
  */
 export function isValueInvalid(value: CascaderValue, cascaderContext: CascaderContextType) {
-  const { multiple, showAllLevels } = cascaderContext;
-  return (multiple && !isArray(value)) || (!multiple && isArray(value) && !showAllLevels);
+  const { multiple, showAllLevels, valueType } = cascaderContext;
+  return (multiple && !isArray(value)) || (!multiple && isArray(value) && valueType === 'single' && !showAllLevels);
 }
diff --git a/src/cascader/hooks.ts b/src/cascader/hooks.ts
@@ -51,6 +51,7 @@ export const useContext = (
         showAllLevels,
         minCollapsedNum,
         valueType,
+        modelValue,
       } = props;
       return {
         value: statusContext.scopeVal,
@@ -72,7 +73,7 @@ export const useContext = (
           statusContext.treeNodes = nodes;
         },
         setValue: (val: CascaderValue, source: CascaderChangeSource, node?: TreeNodeModel) => {
-          if (isEqual(val, statusContext.scopeVal)) return;
+          if (isEqual(val, modelValue)) return;
           setInnerValue(val, { source, node });
         },
         setVisible: setPopupVisible,