@xizs/nuxt-antui 0.0.27 → 0.0.29

package/app/components/global/Form.tsx

@@ -92,7 +92,7 @@ export class Form {
           }
         }
 
-        expose({ submit, loading })
+        expose({ submit, loading,formData })
 
         return () => (
           <AForm

package/app/components/global/FormTable2.tsx

@@ -188,7 +188,7 @@ export default defineComponent({
         let pagination =reactive({
             page:1,
             pageSize:20,
-            total:0
+            total:10
         })
 
 
@@ -214,8 +214,8 @@ export default defineComponent({
             }
             console.log(res)
             pagination.total = res.meta.pagination.total
-            pagination.pageSize = res.meta.pagination.per_page
-            pagination.page = res.meta.pagination.current_page
+            pagination.pageSize = res.meta.pagination.per_page||res.meta.pagination.perPage
+            pagination.page = res.meta.pagination.current_page||res.meta.pagination.currentPage
             props.attribute.reqData = res
             props.attribute.metaTableData = JSON.parse(JSON.stringify(res.list))
             props.attribute.tableData = res.list

package/app/composables/modal.ts

@@ -59,44 +59,47 @@ export const FormModal = (params: FormModalParamsType) => {
     let submit: () => void
 
 
-    let control = NormalModal(h(defineComponent({
-        setup() {
-            const { t: $t } = useI18n()
-            let formRef = ref(null)
-            let loading = ref(false)
-
-            onMounted(() => {
-                submit = async () => {
-                    loading.value = true
-                    try {
-                        await formRef.value.submit()
-                    } finally {
-
-                        loading.value = false
+    return new Promise((resolve, reject) => {
+        let control = NormalModal(h(defineComponent({
+            setup() {
+                const { t: $t } = useI18n()
+                let formRef = ref(null)
+                let loading = ref(false)
+
+                onMounted(() => {
+                    submit = async () => {
+                        loading.value = true
+                        try {
+                            await formRef.value.submit()
+                        } finally {
+
+                            loading.value = false
+                        }
                     }
-                }
-                // loading = formRef.value.loading
-            })
+                    // loading = formRef.value.loading
+                    resolve({...formRef.value})
+                })
 
-            return () => h(AModal, {
-                title: $t(params.title),
-                width: params.width,
-                okText: $t('提交'),
-                cancelText: $t('取消'),
-                confirmLoading: loading.value,
-                onOk: async () => {
-                    await submit()
-                    control.close()
-                }
-            }, h(Form, {
-                ref: formRef,
-                form: params.form,
-                defaultFormData: params.defaultFormData,
-                submit: params.submit,
-                showSubmit: false
-            }))
-        }
-    })))
+                return () => h(AModal, {
+                    title: $t(params.title),
+                    width: params.width,
+                    okText: $t('提交'),
+                    cancelText: $t('取消'),
+                    confirmLoading: loading.value,
+                    onOk: async () => {
+                        await submit()
+                        control.close()
+                    }
+                }, h(Form, {
+                    ref: formRef,
+                    form: params.form,
+                    defaultFormData: params.defaultFormData,
+                    submit: params.submit,
+                    showSubmit: false
+                }))
+            }
+        })))
+    })
 }
 
 export const MModal = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xizs/nuxt-antui",
   "type": "module",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",