diff --git a/apps/web-antd/src/views/monitor/logininfor/index.vue b/apps/web-antd/src/views/monitor/logininfor/index.vue
index 996a0c7a..54d270cb 100644
--- a/apps/web-antd/src/views/monitor/logininfor/index.vue
+++ b/apps/web-antd/src/views/monitor/logininfor/index.vue
@@ -18,7 +18,7 @@ import {
loginInfoRemove,
userUnlock,
} from '#/api/monitor/logininfo';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { useBlobExport } from '#/utils/file/export';
import { confirmDeleteModal } from '#/utils/modal';
import { columns, querySchema } from './data';
@@ -134,15 +134,14 @@ async function handleUnlock() {
tableApi.grid.clearCheckboxRow();
}
-function handleDownloadExcel() {
- commonDownloadExcel(
- loginInfoExport,
- '登录日志',
- tableApi.formApi.form.values,
- {
- fieldMappingTime: formOptions.fieldMappingTime,
- },
- );
+const { exportBlob, exportLoading, buildExportFileName } =
+ useBlobExport(loginInfoExport);
+async function handleExport() {
+ // 构建表单请求参数
+ const formValues = await tableApi.formApi.getValues();
+ // 文件名
+ const fileName = buildExportFileName('登录日志');
+ exportBlob({ data: formValues, fileName });
}
@@ -159,7 +158,9 @@ function handleDownloadExcel() {
{{ $t('pages.common.export') }}
diff --git a/apps/web-antd/src/views/monitor/operlog/index.vue b/apps/web-antd/src/views/monitor/operlog/index.vue
index e2165f4b..19064723 100644
--- a/apps/web-antd/src/views/monitor/operlog/index.vue
+++ b/apps/web-antd/src/views/monitor/operlog/index.vue
@@ -21,7 +21,7 @@ import {
operLogExport,
operLogList,
} from '#/api/monitor/operlog';
-import { commonDownloadExcel } from '#/utils/file/download';
+import { useBlobExport } from '#/utils/file/export';
import { confirmDeleteModal } from '#/utils/modal';
import { columns, querySchema } from './data';
@@ -135,10 +135,14 @@ async function handleDelete() {
});
}
-function handleDownloadExcel() {
- commonDownloadExcel(operLogExport, '操作日志', tableApi.formApi.form.values, {
- fieldMappingTime: formOptions.fieldMappingTime,
- });
+const { exportBlob, exportLoading, buildExportFileName } =
+ useBlobExport(operLogExport);
+async function handleExport() {
+ // 构建表单请求参数
+ const formValues = await tableApi.formApi.getValues();
+ // 文件名
+ const fileName = buildExportFileName('操作日志');
+ exportBlob({ data: formValues, fileName });
}
@@ -155,7 +159,9 @@ function handleDownloadExcel() {
{{ $t('pages.common.export') }}