fix: kailong321200875#427

kailong321200875 · kailong321200875 · commit a00d76e4149b · 2024-03-04T09:05:40.000+08:00
diff --git 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: <T = Recordable>() => Promise<T>
 }
 
 export { Search }
diff --git 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
@@ -80,7 +80,7 @@ export const useSearch = () => {
      */
     getFormData: async <T = Recordable>(): Promise<T> => {
       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
@@ -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)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export interface SearchExpose {`
`9`	`9`	`delSchema: (field: string) => void`
`10`	`10`	`addSchema: (formSchema: FormSchema, index?: number) => void`
`11`	`11`	`setSchema: (schemaProps: FormSetProps[]) => void`
`12`		`- formModel: Recordable`
	`12`	`+ getFormData: <T = Recordable>() => Promise<T>`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export { Search }`
Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,8 @@ const defaultExpose = {`
`225`	`225`	`setSchema,`
`226`	`226`	`setValues,`
`227`	`227`	`delSchema,`
`228`		`- addSchema`
	`228`	`+ addSchema,`
	`229`	`+ getFormData`
`229`	`230`	`}`
`230`	`231`
`231`	`232`	`onMounted(() => {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ export const useSearch = () => {`
`80`	`80`	`*/`
`81`	`81`	`getFormData: async <T = Recordable>(): Promise<T> => {`
`82`	`82`	`const search = await getSearch()`
`83`		`- return search?.formModel as T`
	`83`	`+ return search?.getFormData() as T`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import { useSearch } from '@/hooks/web/useSearch'`
`10`	`10`	`const { t } = useI18n()`
`11`	`11`
`12`	`12`	`const { searchRegister, searchMethods } = useSearch()`
`13`		`-const { setSchema, setProps, setValues } = searchMethods`
	`13`	`+const { setSchema, setProps, setValues, getFormData } = searchMethods`
`14`	`14`
`15`	`15`	`const treeSelectData = [`
`16`	`16`	`{`
`@@ -252,7 +252,9 @@ const getDictOne = async () => {`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`-const handleSearch = (data: any) => {`
	`255`	`+const handleSearch = async (data: any) => {`
	`256`	`+ const formData = await getFormData()`
	`257`	`+ console.log(formData)`
`256`	`258`	`console.log(data)`
`257`	`259`	`}`
`258`	`260`