diff --git a/src/components/Search/index.ts b/src/components/Search/index.ts index 68e74b4..696ad84 100644 --- a/src/components/Search/index.ts +++ b/src/components/Search/index.ts @@ -9,7 +9,7 @@ export interface SearchExpose { delSchema: (field: string) => void addSchema: (formSchema: FormSchema, index?: number) => void setSchema: (schemaProps: FormSetProps[]) => void - formModel: Recordable + getFormData: () => Promise } export { Search } diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue index 5a15b4f..480bc8d 100644 --- a/src/components/Search/src/Search.vue +++ b/src/components/Search/src/Search.vue @@ -225,7 +225,8 @@ const defaultExpose = { setSchema, setValues, delSchema, - addSchema + addSchema, + getFormData } onMounted(() => { diff --git a/src/hooks/web/useSearch.ts b/src/hooks/web/useSearch.ts index c3503ee..788c49f 100644 --- a/src/hooks/web/useSearch.ts +++ b/src/hooks/web/useSearch.ts @@ -80,7 +80,7 @@ export const useSearch = () => { */ getFormData: async (): Promise => { const search = await getSearch() - return search?.formModel as T + return search?.getFormData() as T } } diff --git a/src/views/Components/Search.vue b/src/views/Components/Search.vue index 8c7f0ad..0cc9154 100644 --- a/src/views/Components/Search.vue +++ b/src/views/Components/Search.vue @@ -10,7 +10,7 @@ import { useSearch } from '@/hooks/web/useSearch' const { t } = useI18n() const { searchRegister, searchMethods } = useSearch() -const { setSchema, setProps, setValues } = searchMethods +const { setSchema, setProps, setValues, getFormData } = searchMethods const treeSelectData = [ { @@ -252,7 +252,9 @@ const getDictOne = async () => { } } -const handleSearch = (data: any) => { +const handleSearch = async (data: any) => { + const formData = await getFormData() + console.log(formData) console.log(data) }