fix: select onchange params (#3305)

Tencent · Dec 31, 2024 · 0768c12 · 0768c12
1 parent 1a4d630
commit 0768c12
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/select/base/Select.tsx b/src/select/base/Select.tsx
@@ -196,14 +196,22 @@ const Select = forwardRefWithStatics(
         .filter((option) => !option.checkAll && !option.disabled)
         .map((option) => (valueType === 'object' ? option : option[keys?.value || 'value']));
 
-      const { currentSelectedOptions } = getSelectedOptions(values, multiple, valueType, keys, tmpPropOptions);
+      const { currentSelectedOptions, allSelectedValue } = getSelectedOptions(
+        values,
+        multiple,
+        valueType,
+        keys,
+        tmpPropOptions,
+      );
 
       const checkAllValue =
-        !checkAll && currentSelectedOptions.length !== (props.value as Array<SelectOption>)?.length
-          ? currentSelectedOptions
-          : [];
+        !checkAll && allSelectedValue.length !== (props.value as Array<SelectOption>)?.length ? allSelectedValue : [];
 
-      onChange?.(checkAllValue, { e, trigger: checkAll ? 'check' : 'uncheck', selectedOptions: checkAllValue });
+      onChange?.(checkAllValue, {
+        e,
+        trigger: checkAll ? 'check' : 'uncheck',
+        selectedOptions: currentSelectedOptions,
+      });
     };
 
     // 选中 Popup 某项

diff --git a/src/select/util/helper.ts b/src/select/util/helper.ts
@@ -199,23 +199,29 @@ export const getSelectedOptions = (
   let currentSelectedOptions = [];
   // 当前选中的选项
   let currentOption: SelectOption;
+  // 全选值
+  let allSelectedValue: Array<SelectValue>;
   if (multiple) {
     currentSelectedOptions = isObjectType
       ? (value as Array<SelectValue>)
-      : tmpPropOptions
-          ?.filter?.((v) => (value as Array<string | number>).includes?.(v[keys?.value || 'value']))
-          .map((v) => v[keys?.value || 'value']);
+      : tmpPropOptions?.filter?.((v) => (value as Array<string | number>).includes?.(v[keys?.value || 'value']));
+
+    allSelectedValue = isObjectType
+      ? currentSelectedOptions
+      : currentSelectedOptions?.map((v) => v[keys?.value || 'value']);
+
     currentOption = isObjectType
       ? (value as Array<SelectValue>).find((v) => v[keys?.value || 'value'] === selectedValue)
       : currentSelectedOptions?.find((option) => option[keys?.value || 'value'] === selectedValue);
   } else {
     currentSelectedOptions = isObjectType
       ? [value]
       : tmpPropOptions?.filter?.((v) => value === v[keys?.value || 'value']) || [];
+    allSelectedValue = currentSelectedOptions;
     currentOption = isObjectType
       ? value
       : currentSelectedOptions?.find((option) => option[keys?.value || 'value'] === selectedValue);
   }
 
-  return { currentSelectedOptions, currentOption };
+  return { currentSelectedOptions, currentOption, allSelectedValue };
 };