@xizs/nuxt-antui 0.0.46 → 0.0.48

package/app/components/global/FormTable2.tsx

@@ -194,6 +194,8 @@ export default defineComponent({
             total:10
         })
 
+        let exportLoading = ref(false)
+
 
         let _isInitLoad = props.isInitLoad
         const tableData = asyncReactive<any[]>(async () => {
@@ -215,9 +217,9 @@ export default defineComponent({
                     } 
                 }
             }
-            pagination.total = res.meta?.pagination?.total
-            pagination.pageSize = res.meta?.pagination?.per_page||res.meta?.pagination?.perPage
-            pagination.page = res.meta?.pagination?.current_page||res.meta?.pagination?.currentPage
+            pagination.total = res.meta?.pagination?.total??0
+            pagination.pageSize = res.meta?.pagination?.per_page??res.meta?.pagination?.perPage??0
+            pagination.page = res.meta?.pagination?.current_page??res.meta?.pagination?.currentPage??1
             props.attribute.reqData = res
             props.attribute.metaTableData = JSON.parse(JSON.stringify(res.list))
             props.attribute.tableData = res.list
@@ -253,17 +255,14 @@ export default defineComponent({
                     <div class="flex gap-2">
                         {props.form?.option?.search !== false && <AButton type="primary" onClick={()=>tableData.load()}>{$t('搜索')}</AButton>}
                         {props.form?.option?.reset  !== false && <AButton onClick={() => patch(metaForm,form.value,true)}>{$t('重置')}</AButton>}
-                        {props.form?.option?.export === true && <AButton type="primary" onClick={()=>{
-                            // props.form.export?.(form.value)
+                        {props.form?.option?.export === true && <AButton type="primary" loading={exportLoading.value} onClick={()=>{
+                            exportLoading.value=true
                             exportExcel(props.title??'导出', props.table.columns,async (page,pageSize)=>{
                                 let res = await props.data?.({ ...form.value, ...{page,pageSize} })
                                 return res.list??res
-
-                                // let subName = subList.value.find(item => item.value == attribute?.form.subId)?.label
-                                // let res = await req.get('/system/live-record/variety/list', { query: {page,pageSize,...form.value} })
-                                // return res.list
+                            }).finally(()=>{
+                                exportLoading.value=false
                             })
-
                         }}>{$t('导出')}</AButton>}
                     </div> 
 

package/package.json

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