From 2107f77081093805f3ef8b90c525f84aba2a7c74 Mon Sep 17 00:00:00 2001
From: zxr <271055687@qq.com>
Date: Mon, 29 Jun 2026 10:42:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=EF=BC=9A=20=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8C=89=E9=92=AE=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/data-table/index.vue   | 71 +++++++++++++++++-------
 src/components/search-table/index.vue | 80 +++++++++++++--------------
 2 files changed, 89 insertions(+), 62 deletions(-)

diff --git a/src/components/data-table/index.vue b/src/components/data-table/index.vue
index d5e5e6b..2156a01 100644
--- a/src/components/data-table/index.vue
+++ b/src/components/data-table/index.vue
@@ -51,27 +51,37 @@
       </a-col>
     </a-row>
 
-    <!-- 表格 -->
-    <a-table
-      row-key="id"
-      :loading="loading"
-      :pagination="pagination"
-      :columns="cloneColumns"
-      :data="data"
-      :bordered="bordered"
-      :size="size"
-      :row-selection="rowSelection"
-      :scroll="scroll"
-      @page-change="onPageChange"
-      @page-size-change="onPageSizeChange"
-      @selection-change="onSelectionChange"
-      @row-click="onRowClick"
+    <!-- 表格主体：状态占位与表格分离，工具栏始终展示 -->
+    <PageState
+      :status="status"
+      :loading-text="loadingText"
+      :empty-text="emptyText"
+      :error-text="errorText"
+      :partial-text="partialText"
+      @retry="emit('retry')"
     >
-      <!-- 动态插槽：根据 columns 的 slotName 动态渲染 -->
-      <template v-for="col in slotColumns" :key="col.dataIndex" #[String(col.slotName)]="slotProps">
-        <slot :name="col.slotName" v-bind="slotProps" />
-      </template>
-    </a-table>
+      <a-table
+        v-if="status === 'success' || status === 'partial'"
+        row-key="id"
+        :loading="loading"
+        :pagination="pagination"
+        :columns="cloneColumns"
+        :data="data"
+        :bordered="bordered"
+        :size="size"
+        :row-selection="rowSelection"
+        :scroll="scroll"
+        @page-change="onPageChange"
+        @page-size-change="onPageSizeChange"
+        @selection-change="onSelectionChange"
+        @row-click="onRowClick"
+      >
+        <!-- 动态插槽：根据 columns 的 slotName 动态渲染 -->
+        <template v-for="col in slotColumns" :key="col.dataIndex" #[String(col.slotName)]="slotProps">
+          <slot :name="col.slotName" v-bind="slotProps" />
+        </template>
+      </a-table>
+    </PageState>
   </div>
 </template>
 
@@ -140,6 +150,26 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  status: {
+    type: String as PropType<'loading' | 'empty' | 'error' | 'success' | 'partial' | 'unauthorized'>,
+    default: 'success',
+  },
+  loadingText: {
+    type: String,
+    default: '加载中',
+  },
+  emptyText: {
+    type: String,
+    default: '暂无数据',
+  },
+  errorText: {
+    type: String,
+    default: '数据暂时不可用，请稍后重试。',
+  },
+  partialText: {
+    type: String,
+    default: '部分数据加载失败，当前页面展示可用数据。',
+  },
   downloadButtonText: {
     type: String,
     default: '下载',
@@ -167,6 +197,7 @@ const emit = defineEmits<{
   (e: 'download'): void
   (e: 'density-change', size: SizeProps): void
   (e: 'column-change', columns: TableColumnData[]): void
+  (e: 'retry'): void
 }>()
 
 const size = ref<SizeProps>('medium')
diff --git a/src/components/search-table/index.vue b/src/components/search-table/index.vue
index 4c524ec..1c72325 100644
--- a/src/components/search-table/index.vue
+++ b/src/components/search-table/index.vue
@@ -19,54 +19,50 @@
 
       <a-divider style="margin-top: 0" />
 
-      <!-- 数据表格 -->
-      <PageState
+      <!-- 数据表格：工具栏始终展示，表格主体随状态切换 -->
+      <DataTable
+        :data="data"
+        :columns="columns"
+        :loading="loading"
+        :pagination="pagination"
+        :bordered="bordered"
+        :row-selection="rowSelection"
+        :scroll="responsiveScroll"
+        :show-toolbar="showToolbar"
+        :show-download="showDownload"
+        :show-refresh="showRefresh"
+        :show-density="showDensity"
+        :show-column-setting="showColumnSetting"
+        :download-button-text="downloadButtonText"
+        :refresh-tooltip-text="refreshTooltipText"
+        :density-tooltip-text="densityTooltipText"
+        :column-setting-tooltip-text="columnSettingTooltipText"
         :status="stateStatus"
+        :loading-text="loadingText"
         :empty-text="emptyText"
         :error-text="errorText"
         :partial-text="partialText"
-        :loading-text="loadingText"
+        @page-change="handlePageChange"
+        @page-size-change="handlePageSizeChange"
+        @selection-change="handleSelectionChange"
+        @row-click="handleRowClick"
+        @refresh="handleRefresh"
+        @download="handleDownload"
+        @density-change="handleDensityChange"
+        @column-change="handleColumnChange"
         @retry="handleRefresh"
       >
-        <DataTable
-          v-if="stateStatus !== 'empty' && stateStatus !== 'error' && stateStatus !== 'unauthorized'"
-          :data="data"
-          :columns="columns"
-          :loading="loading"
-          :pagination="pagination"
-          :bordered="bordered"
-          :row-selection="rowSelection"
-          :scroll="responsiveScroll"
-          :show-toolbar="showToolbar"
-          :show-download="showDownload"
-          :show-refresh="showRefresh"
-          :show-density="showDensity"
-          :show-column-setting="showColumnSetting"
-          :download-button-text="downloadButtonText"
-          :refresh-tooltip-text="refreshTooltipText"
-          :density-tooltip-text="densityTooltipText"
-          :column-setting-tooltip-text="columnSettingTooltipText"
-          @page-change="handlePageChange"
-          @page-size-change="handlePageSizeChange"
-          @selection-change="handleSelectionChange"
-          @row-click="handleRowClick"
-          @refresh="handleRefresh"
-          @download="handleDownload"
-          @density-change="handleDensityChange"
-          @column-change="handleColumnChange"
-        >
-          <template #toolbar-left>
-            <slot name="toolbar-left" />
-          </template>
-          <template #toolbar-right>
-            <slot name="toolbar-right" />
-          </template>
-          <!-- 动态插槽透传 -->
-          <template v-for="col in slotColumns" :key="col.dataIndex" #[String(col.slotName)]="slotProps">
-            <slot :name="col.slotName" v-bind="slotProps" />
-          </template>
-        </DataTable>
-      </PageState>
+        <template #toolbar-left>
+          <slot name="toolbar-left" />
+        </template>
+        <template #toolbar-right>
+          <slot name="toolbar-right" />
+        </template>
+        <!-- 动态插槽透传 -->
+        <template v-for="col in slotColumns" :key="col.dataIndex" #[String(col.slotName)]="slotProps">
+          <slot :name="col.slotName" v-bind="slotProps" />
+        </template>
+      </DataTable>
     </a-card>
   </div>
 </template>