From 7b4d68a164a8fe2fefe79675942c087645bbbec0 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Wed, 28 Jan 2026 19:41:50 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=20useBlobExport=20=E9=92=A9=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除旧的 commonDownloadExcel 函数，统一使用 useBlobExport 钩子处理文件导出
- 在用户导入模板、请假申请和字典类型页面中替换导出逻辑
- 移除 demo 页面未使用的导出按钮和相关导入
- 为导出按钮添加加载状态，提升用户体验
---
 apps/web-antd/src/views/demo/demo/index.vue   | 15 +-----------
 .../views/system/dict/type/index-refactor.vue | 20 +++++++++++-----
 .../views/system/user/user-import-modal.vue   | 11 +++++++--
 .../src/views/workflow/leave/index.vue        | 24 ++++++++++---------
 4 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/apps/web-antd/src/views/demo/demo/index.vue b/apps/web-antd/src/views/demo/demo/index.vue
index 5467c30e..8aeb390f 100644
--- a/apps/web-antd/src/views/demo/demo/index.vue
+++ b/apps/web-antd/src/views/demo/demo/index.vue
@@ -12,9 +12,8 @@ import { getPopupContainer } from '@vben/utils';
 import { Popconfirm, Space } from 'antdv-next';
 
 import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
-import { commonDownloadExcel } from '#/utils/file/download';
 
-import { demoExport, demoList, demoRemove } from './api';
+import { demoList, demoRemove } from './api';
 import { columns, querySchema } from './data';
 import demoModal from './demo-modal.vue';
 
@@ -105,18 +104,6 @@ function handleMultiDelete() {
       </template>
       <template #toolbar-tools>
         <Space>
-          <a-button
-            v-access:code="['system:demo:export']"
-            @click="
-              commonDownloadExcel(
-                demoExport,
-                '测试单数据',
-                tableApi.formApi.form.values,
-              )
-            "
-          >
-            {{ $t('pages.common.export') }}
-          </a-button>
           <a-button
             :disabled="!vxeCheckboxChecked(tableApi)"
             danger
diff --git a/apps/web-antd/src/views/system/dict/type/index-refactor.vue b/apps/web-antd/src/views/system/dict/type/index-refactor.vue
index 13d77386..4fdf251a 100644
--- a/apps/web-antd/src/views/system/dict/type/index-refactor.vue
+++ b/apps/web-antd/src/views/system/dict/type/index-refactor.vue
@@ -24,7 +24,7 @@ import {
   dictTypeRemove,
   refreshDictTypeCache,
 } from '#/api/system/dict/dict-type';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { useBlobExport } from '#/utils/file/export';
 
 import { emitter } from '../mitt';
 import dictTypeModal from './dict-type-modal.vue';
@@ -109,10 +109,6 @@ async function handleReset() {
   await tableApi.query();
 }
 
-function handleDownloadExcel() {
-  commonDownloadExcel(dictTypeExport, '字典类型数据');
-}
-
 function handleRefreshCache() {
   window.modal.confirm({
     title: '提示',
@@ -127,6 +123,16 @@ function handleRefreshCache() {
   });
 }
 
+const { exportBlob, exportLoading, buildExportFileName } =
+  useBlobExport(dictTypeExport);
+async function handleExport() {
+  // 构建表单请求参数
+  const formValues = await tableApi.formApi.getValues();
+  // 文件名
+  const fileName = buildExportFileName('字典类型数据');
+  exportBlob({ data: formValues, fileName });
+}
+
 const lastDictType = ref<string>('');
 const currentRowId = ref<null | number | string>(null);
 function handleRowClick(row: DictType) {
@@ -184,7 +190,9 @@ watch(searchValue, (value) => {
           <a-button
             v-access:code="['system:dict:export']"
             :icon="h(ExportOutlined)"
-            @click="handleDownloadExcel"
+            @click="handleExport"
+            :disabled="exportLoading"
+            :loading="exportLoading"
           />
         </Tooltip>
         <Tooltip :title="$t('pages.common.add')">
diff --git a/apps/web-antd/src/views/system/user/user-import-modal.vue b/apps/web-antd/src/views/system/user/user-import-modal.vue
index 81ecad73..0c78d665 100644
--- a/apps/web-antd/src/views/system/user/user-import-modal.vue
+++ b/apps/web-antd/src/views/system/user/user-import-modal.vue
@@ -9,7 +9,7 @@ import { InboxOutlined } from '@antdv-next/icons';
 import { Switch, Upload } from 'antdv-next';
 
 import { downloadImportTemplate, userImportData } from '#/api/system/user';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { useBlobExport } from '#/utils/file/export';
 
 const emit = defineEmits<{ reload: [] }>();
 
@@ -62,6 +62,11 @@ function handleCancel() {
   fileList.value = [];
   checked.value = false;
 }
+
+const { exportBlob, exportLoading } = useBlobExport(downloadImportTemplate);
+async function handleExport() {
+  exportBlob({ data: {}, fileName: '用户导入模板.xlsx' });
+}
 </script>
 
 <template>
@@ -89,7 +94,9 @@ function handleCancel() {
         <span>允许导入xlsx, xls文件</span>
         <a-button
           type="link"
-          @click="commonDownloadExcel(downloadImportTemplate, '用户导入模板')"
+          :loading="exportLoading"
+          :disabled="exportLoading"
+          @click="handleExport"
         >
           <div class="flex items-center gap-[4px]">
             <span class="icon-[vscode-icons--file-type-excel]"></span>
diff --git a/apps/web-antd/src/views/workflow/leave/index.vue b/apps/web-antd/src/views/workflow/leave/index.vue
index bf966263..e4c901e4 100644
--- a/apps/web-antd/src/views/workflow/leave/index.vue
+++ b/apps/web-antd/src/views/workflow/leave/index.vue
@@ -11,7 +11,7 @@ import { Popconfirm, Space } from 'antdv-next';
 
 import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import { cancelProcessApply } from '#/api/workflow/instance';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { useBlobExport } from '#/utils/file/export';
 
 import { applyModal, flowInfoModal } from '../components';
 import { leaveExport, leaveList, leaveRemove } from './api';
@@ -135,16 +135,16 @@ function handleMultiDelete() {
   });
 }
 
-function handleDownloadExcel() {
-  commonDownloadExcel(
-    leaveExport,
-    '请假申请数据',
-    tableApi.formApi.form.values,
-    {
-      fieldMappingTime: formOptions.fieldMappingTime,
-    },
-  );
+const { exportBlob, exportLoading, buildExportFileName } =
+  useBlobExport(leaveExport);
+async function handleExport() {
+  // 构建表单请求参数
+  const formValues = await tableApi.formApi.getValues();
+  // 文件名
+  const fileName = buildExportFileName('请假申请数据');
+  exportBlob({ data: formValues, fileName });
 }
+
 const [FlowInfoModal, flowInfoModalApi] = useVbenModal({
   connectedComponent: flowInfoModal,
 });
@@ -162,7 +162,9 @@ function handleInfo(row: Required<LeaveForm>) {
         <Space>
           <a-button
             v-access:code="['workflow:leave:export']"
-            @click="handleDownloadExcel"
+            :loading="exportLoading"
+            :disabled="exportLoading"
+            @click="handleExport"
           >
             {{ $t('pages.common.export') }}
           </a-button>