kailong321200875 hace 1 año
padre
commit
a00d76e414

+ 1 - 1
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 }

+ 2 - 1
src/components/Search/src/Search.vue

@@ -225,7 +225,8 @@ const defaultExpose = {
   setSchema,
   setValues,
   delSchema,
-  addSchema
+  addSchema,
+  getFormData
 }
 
 onMounted(() => {

+ 1 - 1
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
     }
   }
 

+ 4 - 2
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)
 }