fix(comp:select): the onSearch should be called when the intput is cl…

…ear (#1577)
IDuxFE · Jun 27, 2023 · ab4e4b0 · ab4e4b0
1 parent d8b9aed
commit ab4e4b0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/packages/components/_private/selector/src/Selector.tsx b/packages/components/_private/selector/src/Selector.tsx
@@ -124,6 +124,7 @@ export default defineComponent({
       }
       evt.stopPropagation()
       callEmit(props.onClear, evt)
+      mergedSearchable.value && callEmit(props.onSearch, '')
     }
 
     provide(selectorToken, {

diff --git a/packages/components/cascader/src/Cascader.tsx b/packages/components/cascader/src/Cascader.tsx
@@ -96,7 +96,6 @@ export default defineComponent({
       selectedStateContext.handleSelect(key)
     }
     const handleClear = (evt: MouseEvent) => {
-      evt.stopPropagation()
       setValue([])
       callEmit(props.onClear, evt)
     }
@@ -157,7 +156,10 @@ export default defineComponent({
       setInputValue(value)
       props.searchable && callEmit(props.onSearch, value)
     }
-    const handleSearchClear = () => setInputValue('')
+    const handleSearchClear = () => {
+      setInputValue('')
+      props.searchable && callEmit(props.onSearch, '')
+    }
     const renderContent = () => {
       const { searchable, overlayRender } = props
       const searchValue = inputValue.value

diff --git a/packages/components/notification/src/types.ts b/packages/components/notification/src/types.ts
@@ -10,9 +10,6 @@ import type { ExtractInnerPropTypes, ExtractPublicPropTypes, MaybeArray, VKey }
 import type { ButtonProps } from '@idux/components/button'
 import type { DefineComponent, HTMLAttributes, PropType, VNode, VNodeProps } from 'vue'
 
-// 挑出部分必填的属性
-type PickRequire<T, U extends keyof T> = Pick<T, Exclude<keyof T, U>> & Required<Pick<T, U>>
-
 export interface NotificationButtonProps<K = VKey> extends ButtonProps {
   key?: K
   text?: string | VNode
@@ -69,8 +66,8 @@ export type NotificationComponent = DefineComponent<
 export type NotificationInstance = InstanceType<DefineComponent<NotificationProps>>
 
 // 通过useNotification的配置
-export interface NotificationOptions<K = VKey> extends PickRequire<NotificationProps, 'title' | 'content'> {
-  key: K
+export interface NotificationOptions<K = VKey> extends NotificationProps {
+  key?: K
   contentProps?: Record<string, unknown> | VNodeProps
   onDestroy?: (key: K) => void
 }

diff --git a/packages/components/select/src/Select.tsx b/packages/components/select/src/Select.tsx
@@ -185,7 +185,10 @@ export default defineComponent({
           setInputValue(value)
           props.searchable && callEmit(props.onSearch, value)
         }
-        const handleSearchClear = () => setInputValue('')
+        const handleSearchClear = () => {
+          setInputValue('')
+          props.searchable && callEmit(props.onSearch, '')
+        }
 
         children.unshift(
           <div class={`${mergedPrefixCls.value}-overlay-search-wrapper`}>

diff --git a/packages/components/tree-select/src/composables/useSelectedState.ts b/packages/components/tree-select/src/composables/useSelectedState.ts
@@ -58,7 +58,6 @@ export function useSelectedState(
   }
 
   const handleClear = (evt: MouseEvent) => {
-    evt.stopPropagation()
     setValue([])
     callEmit(props.onClear, evt)
   }

diff --git a/packages/components/tree-select/src/content/Content.tsx b/packages/components/tree-select/src/content/Content.tsx
@@ -128,7 +128,10 @@ export default defineComponent({
       setInputValue(value)
       props.searchable && callEmit(props.onSearch, value)
     }
-    const handleClear = () => setInputValue('')
+    const handleClear = () => {
+      setInputValue('')
+      props.searchable && callEmit(props.onSearch, '')
+    }
 
     return () => {
       const {