From ce2b8f58372eccd4d989eaff1a6c15c30034a3b4 Mon Sep 17 00:00:00 2001
From: wx <645899409@qq.com>
Date: Fri, 17 May 2024 13:25:28 +0800
Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/basicTable/BasicTable.vue      | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
index 8b6f102..34c36ba 100644
--- a/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
+++ b/src/components/secondaryScreen/secondMap/components/basicTable/BasicTable.vue
@@ -1,6 +1,7 @@
 <template>
     <a-table
         class="ant-table-striped"
+        :loading="tableLoading"
         :dataSource="dataSource"
         :columns="columns"
         :scroll="{ y: '56vh' }"
@@ -38,6 +39,7 @@
     //分页相关
     const current = ref(1);
     const pageSize = ref(10);
+    const tableLoading = ref(false);
     const total = ref(0);
     const deptId = ref();
     const paginationProp = ref({
@@ -69,17 +71,19 @@
     const dataSource = ref([]);
 
     async function getRecords() {
-        if (!props.api) {
-            setDataSource([{ name: '张三', department: '公司机关', sex: '男' }]);
-            return;
-        }
-        const { code, result } = await props.api({ ...props.apiParams, pageSize: pageSize.value, pageNo: current.value });
-        if (code == 200) {
-            if (props.afterFetch && isFunction(props.afterFetch)) {
-                return props.afterFetch({ result, setPage: setPage, setDataSource: setDataSource });
-            } else {
-                dataSource.value = result?.records;
+        try {
+            tableLoading.value = true;
+            const { code, result } = await props.api({ ...props.apiParams, pageSize: pageSize.value, pageNo: current.value });
+            if (code == 200) {
+                if (props.afterFetch && isFunction(props.afterFetch)) {
+                    dataSource.value = props.afterFetch({ result, setPage: setPage, setDataSource: setDataSource });
+                } else {
+                    dataSource.value = result?.records;
+                }
+                paginationProp.value = { ...paginationProp.value, ...result };
             }
+        } finally {
+            tableLoading.value = false;
         }
     }