Merge a2d90c3 into 97bdafb

IDuxFE · Aug 10, 2023 · 66fb191 · 66fb191
2 parents 97bdafb + a2d90c3
commit 66fb191
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/packages/pro/search/src/components/quickSelect/QuickSelectItem.tsx b/packages/pro/search/src/components/quickSelect/QuickSelectItem.tsx
@@ -25,6 +25,7 @@ export default defineComponent({
       convertStateToValue,
       createSearchState,
       getSearchStatesByFieldKey,
+      removeSearchState,
       updateSegmentValue,
       updateSearchValues,
       tempSegmentInputRef,
@@ -65,6 +66,12 @@ export default defineComponent({
 
     const confirmValue = (value: unknown) => {
       let searchStateKey = searchState.value?.key
+
+      if (!value && searchStateKey) {
+        removeSearchState(searchStateKey)
+        return
+      }
+
       if (!searchState.value) {
         searchStateKey = createSearchState(props.searchField.key, {
           value,

diff --git a/packages/pro/search/src/components/segment/SegmentInput.tsx b/packages/pro/search/src/components/segment/SegmentInput.tsx
@@ -184,9 +184,9 @@ function useSegmentScroll(
 ): ComputedRef<SegmentScroll> {
   const [segmentScroll, setSegmentScroll] = useState<SegmentScroll>({ left: 0, right: 0 }, true)
 
-  let listenerStops: (() => void)[]
+  let listenerStops: (() => void)[] | undefined
   const stopListen = () => {
-    listenerStops.forEach(stop => stop())
+    listenerStops?.forEach(stop => stop())
   }
 
   const getScrolls = (): SegmentScroll => {