Merge c3f2c32 into b8cada3

IDuxFE · May 18, 2023 · dc4610e · dc4610e
2 parents b8cada3 + c3f2c32
commit dc4610e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/packages/pro/search/src/ProSearch.tsx b/packages/pro/search/src/ProSearch.tsx
@@ -143,9 +143,11 @@ export default defineComponent({
     }
     const handleSearchBtnMouseDown = (evt: MouseEvent) => {
       evt.preventDefault()
+      evt.stopImmediatePropagation()
     }
     const handleClearBtnMouseDown = (evt: MouseEvent) => {
       evt.preventDefault()
+      evt.stopImmediatePropagation()
     }
 
     provide(proSearchContext, {

diff --git a/packages/pro/search/src/composables/useSegmentStates.ts b/packages/pro/search/src/composables/useSegmentStates.ts
@@ -188,13 +188,14 @@ export function useSegmentStates(
   }
   const confirmSearchItem = () => {
     const key = props.searchItem!.key
-    const validateRes = validateSearchState(key)
-    const searchValue = convertStateToValue(key)
 
     Object.entries(segmentStates.value).forEach(([name, state]) => {
       updateSegmentValue(state.value, name, key)
     })
 
+    const validateRes = validateSearchState(key)
+    const searchValue = convertStateToValue(key)
+
     if (!validateRes) {
       removeSearchState(key)
     } else {