Merge b7d0242 into fdda882

IDuxFE · Jul 25, 2023 · ca4963c · ca4963c
2 parents fdda882 + b7d0242
commit ca4963c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/packages/pro/search/src/ProSearch.tsx b/packages/pro/search/src/ProSearch.tsx
@@ -64,11 +64,14 @@ export default defineComponent({
     const tempSegmentInputRef = ref<HTMLInputElement>()
 
     const searchValueContext = useSearchValues(props)
-    const { searchValues, searchValueEmpty } = searchValueContext
+    const { searchValues } = searchValueContext
     const resolvedSearchFieldsContext = useResolvedSearchFields(props, mergedPrefixCls, dateConfig)
     const { fieldKeyMap } = resolvedSearchFieldsContext
     const searchStateContext = useSearchStates(props, fieldKeyMap, searchValueContext)
-    const { initSearchStates, clearSearchState, updateSearchValues, isSegmentVisible } = searchStateContext
+    const { searchStates, initSearchStates, clearSearchState, updateSearchValues, isSegmentVisible } =
+      searchStateContext
+
+    const searchStateEmpty = computed(() => !searchStates.value || searchStates.value.length <= 0)
 
     const errors = useSearchItemErrors(props, searchValues)
     const searchItems = useSearchItems(fieldKeyMap, searchStateContext.searchStates, errors)
@@ -196,11 +199,11 @@ export default defineComponent({
                 getKey={item => item.key ?? 'name-select'}
                 maxLabel={focused.value ? Number.MAX_SAFE_INTEGER : props.maxLabel}
               />
-              {searchValueEmpty.value && !isActive.value && (
+              {searchStateEmpty.value && !isActive.value && (
                 <span class={`${prefixCls}-placeholder`}>{placeholder.value}</span>
               )}
             </div>
-            {!searchValueEmpty.value && clearable.value && !props.disabled && (
+            {!searchStateEmpty.value && clearable.value && !props.disabled && (
               <div
                 class={`${prefixCls}-clear-icon`}
                 onMousedown={handleClearBtnMouseDown}

diff --git a/packages/pro/search/src/composables/useSearchValues.ts b/packages/pro/search/src/composables/useSearchValues.ts
@@ -6,26 +6,22 @@
  */
 
 import type { ProSearchProps, SearchValue } from '../types'
-
-import { type ComputedRef, computed } from 'vue'
+import type { ComputedRef } from 'vue'
 
 import { useControlledProp } from '@idux/cdk/utils'
 
 export interface SearchValueContext {
   searchValues: ComputedRef<SearchValue[] | undefined>
-  searchValueEmpty: ComputedRef<boolean>
   setSearchValues: (values: SearchValue[]) => void
 }
 
 export const tempSearchStateKey = 'temp'
 
 export function useSearchValues(props: ProSearchProps): SearchValueContext {
   const [searchValues, setSearchValues] = useControlledProp(props, 'value')
-  const searchValueEmpty = computed(() => !searchValues.value || searchValues.value.length <= 0)
 
   return {
     searchValues,
-    searchValueEmpty,
     setSearchValues,
   }
 }