From b7d02426b1e3179249b5f2dc7bb1568e0c7360b3 Mon Sep 17 00:00:00 2001 From: sallerli1 Date: Tue, 25 Jul 2023 20:48:32 +0800 Subject: [PATCH] fix(pro:search): empty state should be determined by search states --- packages/pro/search/src/ProSearch.tsx | 11 +++++++---- .../pro/search/src/composables/useSearchValues.ts | 6 +----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/packages/pro/search/src/ProSearch.tsx b/packages/pro/search/src/ProSearch.tsx index 4ec2c91ef..b8047d9af 100644 --- a/packages/pro/search/src/ProSearch.tsx +++ b/packages/pro/search/src/ProSearch.tsx @@ -64,11 +64,14 @@ export default defineComponent({ const tempSegmentInputRef = ref() 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 && ( {placeholder.value} )} - {!searchValueEmpty.value && clearable.value && !props.disabled && ( + {!searchStateEmpty.value && clearable.value && !props.disabled && (
- searchValueEmpty: ComputedRef setSearchValues: (values: SearchValue[]) => void } @@ -21,11 +19,9 @@ 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, } }