fix: [select] 修复onDeselect回调事件触发时机错误问题 fix kingdee#949

kobehhh · Nov 26, 2024 · a9e808a · a9e808a
1 parent 9d9d88f
commit a9e808a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/components/select/option.tsx b/components/select/option.tsx
@@ -57,11 +57,13 @@ const InternalOption: React.ForwardRefRenderFunction<unknown, ISelectOptionProps
   })
   const handleClick = (e: React.MouseEvent<HTMLDivElement>) => {
     e.preventDefault()
+    let newVal = isSelected
     if (optionProps.disabled || value === undefined) return
     if (isMultiple) {
-      setSelected(!isSelected)
+      newVal = !isSelected
+      setSelected(newVal)
     }
-    onChangeSelect && onChangeSelect(value, children, isSelected)
+    onChangeSelect && onChangeSelect(value, children, newVal)
   }
   const handleOnMouseEnter = () => {
     onChangeActiveIndex && onChangeActiveIndex(index)

diff --git a/components/select/select.tsx b/components/select/select.tsx
@@ -863,7 +863,11 @@ const InternalSelect: React.ForwardRefRenderFunction<ISelectProps<SelectValue>>
         if (!item) return
         const key = item.props?.value || item.value
         const label = item.props?.children || item.label
-        handleOption(key, label, true)
+        let flag = true
+        if (isMultiple) {
+          flag = !mulOptions?.some((item: any) => item.value === key)
+        }
+        handleOption(key, label, flag)
         // search
         if (searchValue) {
           setActiveIndex(