From d70a1231b0056d1d067270488cdb1a029a2b29d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= <eryajf@163.com>
Date: Thu, 27 Aug 2026 12:18:42 +0800
Subject: [PATCH] feat(xlsx): add optional auto filter to xlsx export

---
 .../components/export/XlsxHeaderDialog.vue    | 49 +++++++-----
 .../export/__tests__/XlsxHeaderDialog.spec.ts | 10 +--
 .../src/components/objects/ObjectBrowser.vue  | 24 +++---
 .../__tests__/ObjectBrowserExport.spec.ts     | 10 +--
 .../__tests__/useDataGridExport.xlsx.spec.ts  | 12 ++-
 .../useSidebarTreeExportRuntime.spec.ts       |  6 +-
 .../src/composables/useDataGridExport.ts      | 80 +++++++++++--------
 .../useSidebarTreeExportRuntime.ts            | 22 ++---
 apps/desktop/src/i18n/locales/en.ts           |  3 +
 apps/desktop/src/i18n/locales/es.ts           |  3 +
 apps/desktop/src/i18n/locales/it.ts           |  3 +
 apps/desktop/src/i18n/locales/ja.ts           |  3 +
 apps/desktop/src/i18n/locales/ko.ts           |  3 +
 apps/desktop/src/i18n/locales/pt-BR.ts        |  3 +
 apps/desktop/src/i18n/locales/zh-CN.ts        |  3 +
 apps/desktop/src/i18n/locales/zh-TW.ts        |  3 +
 apps/desktop/src/lib/backend/http.ts          | 16 +++-
 apps/desktop/src/lib/backend/tauri.ts         | 17 +++-
 apps/desktop/src/lib/export/xlsxExport.ts     |  6 +-
 apps/desktop/src/lib/export/xlsxHeader.ts     |  5 ++
 crates/dbx-core/src/query_result_export.rs    |  4 +
 crates/dbx-core/src/table_export.rs           | 15 ++++
 crates/dbx-core/src/xlsx_export.rs            | 80 ++++++++++++++-----
 .../live_clickhouse_query_result_export.rs    |  1 +
 crates/dbx-core/tests/live_mysql57.rs         |  2 +
 .../live_postgres_query_result_export.rs      |  6 ++
 .../tests/live_sqlserver_completion.rs        |  1 +
 .../live_sqlserver_query_result_export.rs     |  1 +
 src-tauri/src/commands/xlsx_export.rs         | 13 ++-
 29 files changed, 285 insertions(+), 119 deletions(-)

diff --git a/apps/desktop/src/components/export/XlsxHeaderDialog.vue b/apps/desktop/src/components/export/XlsxHeaderDialog.vue
index f2267e6cd3..e96fbfe27b 100644
--- a/apps/desktop/src/components/export/XlsxHeaderDialog.vue
+++ b/apps/desktop/src/components/export/XlsxHeaderDialog.vue
@@ -3,21 +3,25 @@ import { ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
 import { Button } from "@/components/ui/button";
-import type { XlsxHeaderMode } from "@/lib/export/xlsxHeader";
+import type { XlsxExportOptions, XlsxHeaderMode } from "@/lib/export/xlsxHeader";
 
 const { t } = useI18n();
 
+const props = withDefaults(defineProps<{ showHeaderOptions?: boolean }>(), {
+  showHeaderOptions: true,
+});
 const open = defineModel<boolean>("open", { default: false });
 const selected = ref<XlsxHeaderMode>("name");
+const autoFilter = ref(false);
 
 const emit = defineEmits<{
-  confirm: [mode: XlsxHeaderMode];
+  confirm: [options: XlsxExportOptions];
   cancel: [];
 }>();
 
 function onConfirm() {
   open.value = false;
-  emit("confirm", selected.value);
+  emit("confirm", { headerMode: selected.value, autoFilter: autoFilter.value });
 }
 
 function onCancel() {
@@ -34,22 +38,31 @@ function onOpenChange(value: boolean) {
   <Dialog v-model:open="open" @update:open="onOpenChange">
     <DialogContent class="sm:max-w-sm" @interact-outside.prevent>
       <DialogHeader>
-        <DialogTitle>{{ t("grid.xlsxHeaderTitle") }}</DialogTitle>
+        <DialogTitle>{{ t("grid.xlsxExportTitle") }}</DialogTitle>
       </DialogHeader>
-      <div class="py-2">
-        <p class="text-sm text-muted-foreground mb-3">{{ t("grid.xlsxHeaderPrompt") }}</p>
-        <div class="flex flex-col gap-3">
-          <label class="flex items-center gap-2 cursor-pointer">
-            <input type="radio" v-model="selected" value="name" class="h-4 w-4" />
-            <span class="text-sm">{{ t("grid.xlsxHeaderOriginal") }}</span>
-          </label>
-          <label class="flex items-center gap-2 cursor-pointer">
-            <input type="radio" v-model="selected" value="comment" class="h-4 w-4" />
-            <span class="text-sm">{{ t("grid.xlsxHeaderComment") }}</span>
-          </label>
-          <label class="flex items-center gap-2 cursor-pointer">
-            <input type="radio" v-model="selected" value="name-comment" class="h-4 w-4" />
-            <span class="text-sm">{{ t("grid.xlsxHeaderNameAndComment") }}</span>
+      <div class="space-y-5 py-2">
+        <div v-if="props.showHeaderOptions">
+          <p class="mb-3 text-sm text-muted-foreground">{{ t("grid.xlsxHeaderPrompt") }}</p>
+          <div class="flex flex-col gap-3">
+            <label class="flex items-center gap-2 cursor-pointer">
+              <input type="radio" v-model="selected" value="name" class="h-4 w-4" />
+              <span class="text-sm">{{ t("grid.xlsxHeaderOriginal") }}</span>
+            </label>
+            <label class="flex items-center gap-2 cursor-pointer">
+              <input type="radio" v-model="selected" value="comment" class="h-4 w-4" />
+              <span class="text-sm">{{ t("grid.xlsxHeaderComment") }}</span>
+            </label>
+            <label class="flex items-center gap-2 cursor-pointer">
+              <input type="radio" v-model="selected" value="name-comment" class="h-4 w-4" />
+              <span class="text-sm">{{ t("grid.xlsxHeaderNameAndComment") }}</span>
+            </label>
+          </div>
+        </div>
+        <div class="space-y-3">
+          <p class="text-sm text-muted-foreground">{{ t("grid.xlsxFilterPrompt") }}</p>
+          <label class="flex cursor-pointer items-center gap-2">
+            <input v-model="autoFilter" type="checkbox" class="h-4 w-4" />
+            <span class="text-sm">{{ t("grid.xlsxIncludeAutoFilter") }}</span>
           </label>
         </div>
       </div>
diff --git a/apps/desktop/src/components/export/__tests__/XlsxHeaderDialog.spec.ts b/apps/desktop/src/components/export/__tests__/XlsxHeaderDialog.spec.ts
index 4236202773..f6fa04bf1a 100644
--- a/apps/desktop/src/components/export/__tests__/XlsxHeaderDialog.spec.ts
+++ b/apps/desktop/src/components/export/__tests__/XlsxHeaderDialog.spec.ts
@@ -31,14 +31,14 @@ describe("XlsxHeaderDialog", () => {
     app.unmount();
   });
 
-  it("emits the combined name and comment mode", async () => {
+  it("emits the selected header mode and filter option", async () => {
     const container = document.createElement("div");
     document.body.appendChild(container);
-    let selectedMode = "";
+    let selectedOptions: { headerMode: string; autoFilter: boolean } | undefined;
     const app = createApp(XlsxHeaderDialog, {
       open: true,
-      onConfirm: (mode: string) => {
-        selectedMode = mode;
+      onConfirm: (options: { headerMode: string; autoFilter: boolean }) => {
+        selectedOptions = options;
       },
     });
     app.use(i18n);
@@ -50,7 +50,7 @@ describe("XlsxHeaderDialog", () => {
     document.querySelector<HTMLButtonElement>("[data-xlsx-header-confirm]")!.click();
     await nextTick();
 
-    expect(selectedMode).toBe("name-comment");
+    expect(selectedOptions).toEqual({ headerMode: "name-comment", autoFilter: false });
     app.unmount();
   });
 });
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index b1eb50d5bb..b14ad84565 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -85,7 +85,7 @@ import { buildExecutableObjectSourceStatements, buildRoutineRenameObjectSourceSt
 import { buildRenameObjectSql, supportsObjectRename } from "@/lib/table/objectRenameSql";
 import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
 import { generateDatabaseExportId } from "@/lib/export/databaseExport";
-import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
+import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxExportOptions, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
 import { copyToClipboard, eventTargetAllowsAppClipboardShortcut } from "@/lib/common/clipboard";
 import {
   defaultPasteTableMode,
@@ -1999,16 +1999,17 @@ async function exportData(row: ObjectBrowserRow, format: "csv" | "json" | "sql")
   else await exportTableData(row, format);
 }
 
-function showObjectBrowserXlsxHeaderDialog(hasComments: boolean): Promise<XlsxHeaderMode | null> {
-  if (!hasComments) return Promise.resolve("name");
+function showObjectBrowserXlsxHeaderDialog(hasComments: boolean): Promise<XlsxExportOptions | null> {
+  if (typeof document === "undefined") return Promise.resolve({ headerMode: "name", autoFilter: false });
 
   return new Promise((resolve) => {
     const container = document.createElement("div");
     document.body.appendChild(container);
     const app = createApp(XlsxHeaderDialog, {
       open: true,
-      onConfirm: (mode: XlsxHeaderMode) => {
-        resolve(mode);
+      showHeaderOptions: hasComments,
+      onConfirm: (exportOptions: XlsxExportOptions) => {
+        resolve(exportOptions);
         app.unmount();
         document.body.removeChild(container);
       },
@@ -2025,22 +2026,20 @@ function showObjectBrowserXlsxHeaderDialog(hasComments: boolean): Promise<XlsxHe
 
 async function exportDataXlsx(row: ObjectBrowserRow) {
   const schema = row.schema || selectedSchema.value;
-  let headerMode: XlsxHeaderMode = "name";
   let columnInfos: ColumnInfo[] | undefined;
 
   try {
     columnInfos = await api.getColumns(props.connection.id, props.database, schema || props.database, row.name, props.catalog);
-    const result = await showObjectBrowserXlsxHeaderDialog(hasXlsxHeaderComments(columnInfos.map((column) => column.comment)));
-    if (result === null) return;
-    headerMode = result;
   } catch {
     // Export still works with field-name headers when column metadata is unavailable.
   }
 
-  await exportTableData(row, "xlsx", columnInfos, headerMode);
+  const exportOptions = await showObjectBrowserXlsxHeaderDialog(hasXlsxHeaderComments(columnInfos?.map((column) => column.comment)));
+  if (exportOptions === null) return;
+  await exportTableData(row, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter);
 }
 
-async function exportTableData(row: ObjectBrowserRow, format: "csv" | "xlsx" | "sql", columnInfos?: ColumnInfo[], headerMode: XlsxHeaderMode = "name") {
+async function exportTableData(row: ObjectBrowserRow, format: "csv" | "xlsx" | "sql", columnInfos?: ColumnInfo[], headerMode: XlsxHeaderMode = "name", autoFilter = true) {
   const schema = row.schema || selectedSchema.value;
 
   // Save dialog first
@@ -2080,7 +2079,7 @@ async function exportTableData(row: ObjectBrowserRow, format: "csv" | "xlsx" | "
       } else {
         const comments = result.columns.map((name) => columnInfos?.find((column) => column.name.toLocaleLowerCase() === name.toLocaleLowerCase())?.comment);
         const headerOverrides = buildXlsxHeaderOverrides(result.columns, comments, headerMode);
-        await api.exportQueryResultXlsx(filePath, row.name, result.columns, result.column_types ?? result.columns.map(() => ""), headerOverrides, result.rows);
+        await api.exportQueryResultXlsx(filePath, row.name, result.columns, result.column_types ?? result.columns.map(() => ""), headerOverrides, result.rows, undefined, autoFilter);
       }
       toast(t("grid.exported"));
       return;
@@ -2116,6 +2115,7 @@ async function exportTableData(row: ObjectBrowserRow, format: "csv" | "xlsx" | "
       format,
       columns,
       columnComments: format === "xlsx" ? columnComments : undefined,
+      autoFilter: format === "xlsx" ? autoFilter : undefined,
       batchSize: settingsStore.editorSettings.exportBatchSize,
       skipCount: format === "sql",
       rowLimit,
diff --git a/apps/desktop/src/components/objects/__tests__/ObjectBrowserExport.spec.ts b/apps/desktop/src/components/objects/__tests__/ObjectBrowserExport.spec.ts
index 4368508393..35dc73a75a 100644
--- a/apps/desktop/src/components/objects/__tests__/ObjectBrowserExport.spec.ts
+++ b/apps/desktop/src/components/objects/__tests__/ObjectBrowserExport.spec.ts
@@ -17,19 +17,19 @@ function functionBody(name: string): string {
 }
 
 describe("ObjectBrowser XLSX export", () => {
-  it("asks for a header mode before opening the save dialog when comments exist", () => {
+  it("asks for export options before opening the save dialog", () => {
     const dialog = functionBody("showObjectBrowserXlsxHeaderDialog");
     const exportDataXlsx = functionBody("exportDataXlsx");
 
-    expect(dialog).toContain('if (!hasComments) return Promise.resolve("name")');
-    expect(exportDataXlsx).toContain("hasXlsxHeaderComments(columnInfos.map((column) => column.comment))");
-    expect(exportDataXlsx.indexOf("await showObjectBrowserXlsxHeaderDialog(")).toBeLessThan(exportDataXlsx.indexOf('await exportTableData(row, "xlsx", columnInfos, headerMode)'));
+    expect(dialog).toContain("showHeaderOptions: hasComments");
+    expect(exportDataXlsx).toContain("hasXlsxHeaderComments(columnInfos?.map((column) => column.comment))");
+    expect(exportDataXlsx.indexOf("await showObjectBrowserXlsxHeaderDialog(")).toBeLessThan(exportDataXlsx.indexOf('await exportTableData(row, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter)'));
   });
 
   it("falls back to field-name headers when column metadata is unavailable", () => {
     const exportDataXlsx = functionBody("exportDataXlsx");
 
     expect(exportDataXlsx).toContain("catch {\n    // Export still works with field-name headers when column metadata is unavailable.\n  }");
-    expect(exportDataXlsx).toContain('await exportTableData(row, "xlsx", columnInfos, headerMode)');
+    expect(exportDataXlsx).toContain('await exportTableData(row, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter)');
   });
 });
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
index d8884d441c..acb79e5f92 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.xlsx.spec.ts
@@ -13,8 +13,8 @@ const mocks = vi.hoisted(() => ({
 vi.mock("@/components/export/XlsxHeaderDialog.vue", () => ({
   default: {
     emits: ["confirm"],
-    mounted(this: { $emit: (event: string, value: string) => void }) {
-      queueMicrotask(() => this.$emit("confirm", "name-comment"));
+    mounted(this: { $emit: (event: string, value: { headerMode: string; autoFilter: boolean }) => void }) {
+      queueMicrotask(() => this.$emit("confirm", { headerMode: "name-comment", autoFilter: false }));
     },
     render() {
       return null;
@@ -125,7 +125,11 @@ describe("useDataGridExport XLSX headers", () => {
 
     await state.exportAllResultsXlsx();
 
-    expect(mocks.exportQueryResultsXlsx).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining([expect.objectContaining({ sheetName: "Ids", columnComments: ["id (Identifier)"] }), expect.objectContaining({ sheetName: "Names", columnComments: ["name (Display name)"] })]));
+    expect(mocks.exportQueryResultsXlsx).toHaveBeenCalledWith(
+      expect.any(String),
+      expect.arrayContaining([expect.objectContaining({ sheetName: "Ids", columnComments: ["id (Identifier)"], autoFilter: false }), expect.objectContaining({ sheetName: "Names", columnComments: ["name (Display name)"], autoFilter: false })]),
+      false,
+    );
   });
 
   it("uses ordinal result comments when single-table metadata is unavailable", async () => {
@@ -137,6 +141,6 @@ describe("useDataGridExport XLSX headers", () => {
 
     await state.exportAllResultsXlsx();
 
-    expect(mocks.exportQueryResultsXlsx).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining([expect.objectContaining({ sheetName: "Ids", columnComments: ["id (Joined identifier)"] })]));
+    expect(mocks.exportQueryResultsXlsx).toHaveBeenCalledWith(expect.any(String), expect.arrayContaining([expect.objectContaining({ sheetName: "Ids", columnComments: ["id (Joined identifier)"], autoFilter: false })]), false);
   });
 });
diff --git a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
index 7023266d36..80ae883960 100644
--- a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.spec.ts
@@ -151,20 +151,20 @@ describe("useSidebarTreeExportRuntime", () => {
     expect(showStructurePreviewDialog.value).toBe(true);
   });
 
-  it("prompts for the header mode before it opens the save dialog when comments exist", () => {
+  it("prompts for export options before it opens the save dialog", () => {
     const exportDataXlsx = functionBody("exportDataXlsx");
 
     expect(source).toContain('import XlsxHeaderDialog from "@/components/export/XlsxHeaderDialog.vue"');
     expect(exportDataXlsx).toContain("await api.getColumns(");
     expect(exportDataXlsx).toContain("hasXlsxHeaderComments(columnInfos?.map((column) => column.comment))");
-    expect(exportDataXlsx.indexOf("await showSidebarTreeXlsxHeaderDialog(")).toBeLessThan(exportDataXlsx.indexOf('await exportTableData(target, "xlsx", columnInfos, headerMode)'));
+    expect(exportDataXlsx.indexOf("await showSidebarTreeXlsxHeaderDialog(")).toBeLessThan(exportDataXlsx.indexOf('await exportTableData(target, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter)'));
   });
 
   it("falls back to field-name headers when column metadata is unavailable", () => {
     const exportDataXlsx = functionBody("exportDataXlsx");
 
     expect(exportDataXlsx).toContain("catch {\n      // Export still works with field-name headers when column metadata is unavailable.\n    }");
-    expect(exportDataXlsx).toContain('await exportTableData(target, "xlsx", columnInfos, headerMode)');
+    expect(exportDataXlsx).toContain('await exportTableData(target, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter)');
   });
 
   it("sends the selected mode's header overrides to both XLSX export paths", () => {
diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts
index 6b0584d034..6873e166c5 100644
--- a/apps/desktop/src/composables/useDataGridExport.ts
+++ b/apps/desktop/src/composables/useDataGridExport.ts
@@ -27,7 +27,7 @@ import { formatTemporalRowsForExport } from "@/lib/dataGrid/columnFormatter";
 import { translateBackendError } from "@/i18n/backend-errors";
 import XlsxHeaderDialog from "@/components/export/XlsxHeaderDialog.vue";
 import i18n from "@/i18n";
-import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
+import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxExportOptions, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
 
 /**
  * Format metadata for backend table exports. Each entry maps a format key
@@ -292,16 +292,17 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
     return targetColumns.map((column) => commentsByName.get(column.toLocaleLowerCase()));
   }
 
-  function showXlsxHeaderDialog(): Promise<XlsxHeaderMode | null> {
-    if (!hasXlsxHeaderComments(allXlsxColumnComments.value) && !hasXlsxHeaderComments(visibleXlsxColumnComments.value)) return Promise.resolve("name");
+  function showXlsxHeaderDialog(): Promise<XlsxExportOptions | null> {
+    if (typeof document === "undefined") return Promise.resolve({ headerMode: "name", autoFilter: false });
 
     return new Promise((resolve) => {
       const container = document.createElement("div");
       document.body.appendChild(container);
       const app = createApp(XlsxHeaderDialog, {
         open: true,
-        onConfirm: (mode: XlsxHeaderMode) => {
-          resolve(mode);
+        showHeaderOptions: hasXlsxHeaderComments(allXlsxColumnComments.value) || hasXlsxHeaderComments(visibleXlsxColumnComments.value),
+        onConfirm: (exportOptions: XlsxExportOptions) => {
+          resolve(exportOptions);
           app.unmount();
           document.body.removeChild(container);
         },
@@ -402,24 +403,29 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
     return resultExportSql?.value || sql.value;
   }
 
-  async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean) {
+  async function writeXlsxResult(outputPath: string, result: { columns: string[]; columnTypes: string[]; columnComments?: (string | null)[]; rows: CellValue[][] }, includeSqlSheet: boolean, autoFilter: boolean) {
     const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet([{ sql: currentExportSql() || "" }]) : undefined;
     const rightAlign = useSettingsStore().editorSettings.numericColumnRightAlign;
     if (!sqlWorksheet) {
-      await api.exportQueryResultXlsx(outputPath, currentXlsxSheetName(), result.columns, result.columnTypes, result.columnComments, result.rows, rightAlign);
+      await api.exportQueryResultXlsx(outputPath, currentXlsxSheetName(), result.columns, result.columnTypes, result.columnComments, result.rows, rightAlign, autoFilter);
       return;
     }
-    await api.exportQueryResultsXlsx(outputPath, [
-      {
-        sheetName: currentXlsxSheetName(),
-        columns: result.columns,
-        columnTypes: result.columnTypes,
-        columnComments: result.columnComments,
-        rows: result.rows,
-        numericColumnRightAlign: rightAlign,
-      },
-      sqlWorksheet,
-    ]);
+    await api.exportQueryResultsXlsx(
+      outputPath,
+      [
+        {
+          sheetName: currentXlsxSheetName(),
+          columns: result.columns,
+          columnTypes: result.columnTypes,
+          columnComments: result.columnComments,
+          rows: result.rows,
+          numericColumnRightAlign: rightAlign,
+          autoFilter,
+        },
+        { ...sqlWorksheet, autoFilter },
+      ],
+      autoFilter,
+    );
   }
 
   function targetedRows(): RowItem[] {
@@ -910,13 +916,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
   }
 
   async function exportXlsxResult(rowIds: number[] | undefined, includeSqlSheet: boolean) {
-    const headerMode = await showXlsxHeaderDialog();
-    if (headerMode === null) return;
+    const exportOptions = await showXlsxHeaderDialog();
+    if (exportOptions === null) return;
 
     await runExclusiveExport(async () => {
       try {
-        if (await exportQueryResultViaBackend("xlsx", rowIds, includeSqlSheet, headerMode)) return;
-        if (await exportFullTableDataViaBackend("xlsx", rowIds, headerMode)) return;
+        if (await exportQueryResultViaBackend("xlsx", rowIds, includeSqlSheet, exportOptions.headerMode, exportOptions.autoFilter)) return;
+        if (await exportFullTableDataViaBackend("xlsx", rowIds, exportOptions.headerMode, exportOptions.autoFilter)) return;
 
         let outputPath = exportFileName("export", "xlsx");
         if (isTauriRuntime()) {
@@ -958,7 +964,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
           },
           true,
           true,
-          headerMode,
+          exportOptions.headerMode,
         );
         if (needsFullExport && exportProgressState) {
           exportProgressState.value = {
@@ -968,7 +974,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
             totalRows: result.rows.length,
           };
         }
-        await writeXlsxResult(outputPath, result, includeSqlSheet);
+        await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter);
         if (needsFullExport && exportProgressState) {
           exportProgressState.value = {
             ...exportProgressState.value,
@@ -1001,8 +1007,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
   }
 
   async function exportCurrentPageXlsxResult(includeSqlSheet: boolean) {
-    const headerMode = await showXlsxHeaderDialog();
-    if (headerMode === null) return;
+    const exportOptions = await showXlsxHeaderDialog();
+    if (exportOptions === null) return;
 
     await runExclusiveExport(async () => {
       try {
@@ -1016,8 +1022,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
           if (!path) return;
           outputPath = path as string;
         }
-        const result = await resultToExport(undefined, undefined, false, true, headerMode);
-        await writeXlsxResult(outputPath, result, includeSqlSheet);
+        const result = await resultToExport(undefined, undefined, false, true, exportOptions.headerMode);
+        await writeXlsxResult(outputPath, result, includeSqlSheet, exportOptions.autoFilter);
         toast(t("grid.exported"));
       } catch (e: any) {
         toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000);
@@ -1034,8 +1040,8 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
   }
 
   async function exportAllResultsXlsxResult(includeSqlSheet: boolean) {
-    const headerMode = await showXlsxHeaderDialog();
-    if (headerMode === null) return;
+    const exportOptions = await showXlsxHeaderDialog();
+    if (exportOptions === null) return;
 
     await runExclusiveExport(async () => {
       try {
@@ -1059,12 +1065,13 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
           sheetName: sheet.sheetName,
           columns: sheet.result.columns,
           columnTypes: sheet.result.column_types ?? [],
-          columnComments: buildXlsxHeaderOverrides(sheet.result.columns, commentsForExportColumns(sheet.result.columns), headerMode),
+          columnComments: buildXlsxHeaderOverrides(sheet.result.columns, commentsForExportColumns(sheet.result.columns), exportOptions.headerMode),
           rows: formatTemporalRowsForExport(sheet.result.rows, sheet.result.column_types ?? [], exportPattern),
           numericColumnRightAlign: rightAlign,
+          autoFilter: exportOptions.autoFilter,
         }));
         const sqlWorksheet = includeSqlSheet ? buildXlsxSqlWorksheet(sheets.map((sheet) => ({ resultName: sheet.sheetName, sql: sheet.sql || sheet.result.sourceStatement || "" }))) : undefined;
-        await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, sqlWorksheet] : worksheets);
+        await api.exportQueryResultsXlsx(outputPath, sqlWorksheet ? [...worksheets, { ...sqlWorksheet, autoFilter: exportOptions.autoFilter }] : worksheets, exportOptions.autoFilter);
         toast(t("grid.exported"));
       } catch (e: any) {
         toast(t("grid.exportFailed", { message: translateBackendError(t, e) }), 5000);
@@ -1080,7 +1087,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
     await exportAllResultsXlsxResult(true);
   }
 
-  async function exportFullTableDataViaBackend(format: "csv" | "xlsx" | "json" | "markdown" | "sql" | "txt", rowIds?: number[], headerMode: XlsxHeaderMode = "name"): Promise<boolean> {
+  async function exportFullTableDataViaBackend(format: "csv" | "xlsx" | "json" | "markdown" | "sql" | "txt", rowIds?: number[], headerMode: XlsxHeaderMode = "name", autoFilter = true): Promise<boolean> {
     const meta = tableMeta.value;
     // The backend table exporter currently builds two-part table names. External
     // Doris/StarRocks catalogs need the data-tab paginator's three-part SQL.
@@ -1150,6 +1157,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
           rowLimit,
           dateTimeFormat: editorSettings.globalDateTimeExportFormat || undefined,
           numericColumnRightAlign: editorSettings.numericColumnRightAlign ?? true,
+          autoFilter: format === "xlsx" ? autoFilter : undefined,
         },
         (progress) => {
           if (exportProgressState) {
@@ -1177,7 +1185,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
     return true;
   }
 
-  async function exportQueryResultViaBackend(format: "csv" | "xlsx" | "txt" | "sql", rowIds?: number[], includeSqlSheet = false, headerMode: XlsxHeaderMode = "name"): Promise<boolean> {
+  async function exportQueryResultViaBackend(format: "csv" | "xlsx" | "txt" | "sql", rowIds?: number[], includeSqlSheet = false, headerMode: XlsxHeaderMode = "name", autoFilter = true): Promise<boolean> {
     if (rowIds !== undefined || context.value !== "results" || !queryResultExportRequest) {
       return false;
     }
@@ -1210,7 +1218,9 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
       exportColumnTypes: format === "sql" ? allColumnTypes.value?.map((type) => type ?? null) : undefined,
     });
     const columnComments = format === "xlsx" ? buildXlsxHeaderOverrides(allColumns.value, allXlsxColumnComments.value, headerMode) : undefined;
-    const request = baseRequest ? { ...baseRequest, dateTimeFormat: useSettingsStore().editorSettings.globalDateTimeExportFormat || undefined, numericColumnRightAlign: useSettingsStore().editorSettings.numericColumnRightAlign ?? true, columnComments } : undefined;
+    const request = baseRequest
+      ? { ...baseRequest, dateTimeFormat: useSettingsStore().editorSettings.globalDateTimeExportFormat || undefined, numericColumnRightAlign: useSettingsStore().editorSettings.numericColumnRightAlign ?? true, columnComments, autoFilter: format === "xlsx" ? autoFilter : undefined }
+      : undefined;
     if (!request) throw new Error("Unable to build query result export request");
 
     if (exportProgressState) {
diff --git a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
index e598c6b712..2d428abf0e 100644
--- a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
@@ -16,7 +16,7 @@ import { translateBackendError } from "@/i18n/backend-errors";
 import { sidebarStructureExportTargets } from "@/lib/sidebar/sidebarExportRuntime";
 import { fetchTableDataForExport } from "@/lib/table/tableDataExport";
 import XlsxHeaderDialog from "@/components/export/XlsxHeaderDialog.vue";
-import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
+import { buildXlsxHeaderOverrides, hasXlsxHeaderComments, type XlsxExportOptions, type XlsxHeaderMode } from "@/lib/export/xlsxHeader";
 import { isLoadingStructurePreview, showStructureDocCopyDialog, showStructurePreviewDialog, structureDocCopyText, structureDocCopyTitle, structurePreviewDefaultFileName, structurePreviewError, structurePreviewSql, structurePreviewTitle } from "@/components/sidebar/sidebarTreeDialogState";
 
 type StructureCopyFormat = "tsv" | "markdown";
@@ -255,16 +255,17 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
     }
   }
 
-  function showSidebarTreeXlsxHeaderDialog(hasComments: boolean): Promise<XlsxHeaderMode | null> {
-    if (!hasComments) return Promise.resolve("name");
+  function showSidebarTreeXlsxHeaderDialog(hasComments: boolean): Promise<XlsxExportOptions | null> {
+    if (typeof document === "undefined") return Promise.resolve({ headerMode: "name", autoFilter: false });
 
     return new Promise((resolve) => {
       const container = document.createElement("div");
       document.body.appendChild(container);
       const app = createApp(XlsxHeaderDialog, {
         open: true,
-        onConfirm: (mode: XlsxHeaderMode) => {
-          resolve(mode);
+        showHeaderOptions: hasComments,
+        onConfirm: (exportOptions: XlsxExportOptions) => {
+          resolve(exportOptions);
           app.unmount();
           document.body.removeChild(container);
         },
@@ -304,7 +305,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
     };
   }
 
-  async function exportTableData(target: SidebarTableExportTarget, format: "csv" | "xlsx" | "sql", columnInfos?: ColumnInfo[], headerMode: XlsxHeaderMode = "name") {
+  async function exportTableData(target: SidebarTableExportTarget, format: "csv" | "xlsx" | "sql", columnInfos?: ColumnInfo[], headerMode: XlsxHeaderMode = "name", autoFilter = true) {
     const { connectionId, database } = target;
 
     let task: ExportTask | null = null;
@@ -341,7 +342,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
         } else {
           const comments = result.columns.map((name) => exportColumnInfos?.find((column) => column.name.toLocaleLowerCase() === name.toLocaleLowerCase())?.comment);
           const headerOverrides = buildXlsxHeaderOverrides(result.columns, comments, headerMode);
-          await api.exportQueryResultXlsx(outputPath, target.tableName, result.columns, result.column_types ?? result.columns.map(() => ""), headerOverrides, result.rows);
+          await api.exportQueryResultXlsx(outputPath, target.tableName, result.columns, result.column_types ?? result.columns.map(() => ""), headerOverrides, result.rows, undefined, autoFilter);
         }
         currentTask.status = "Done";
         currentTask.rowsExported = result.rows.length;
@@ -368,6 +369,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
         format,
         columns: queryColumns,
         columnComments,
+        autoFilter: format === "xlsx" ? autoFilter : undefined,
         primaryKeys,
         batchSize: target.batchSize,
         skipCount: format === "sql",
@@ -408,9 +410,9 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
       // Export still works with field-name headers when column metadata is unavailable.
     }
 
-    const headerMode = await showSidebarTreeXlsxHeaderDialog(hasXlsxHeaderComments(columnInfos?.map((column) => column.comment)));
-    if (headerMode === null) return;
-    await exportTableData(target, "xlsx", columnInfos, headerMode);
+    const exportOptions = await showSidebarTreeXlsxHeaderDialog(hasXlsxHeaderComments(columnInfos?.map((column) => column.comment)));
+    if (exportOptions === null) return;
+    await exportTableData(target, "xlsx", columnInfos, exportOptions.headerMode, exportOptions.autoFilter);
   }
 
   return {
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index eb5378ba76..17984854ec 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -1651,10 +1651,13 @@ export default {
     exported: "Exported",
     exportFailed: "Export failed: {message}",
     xlsxHeaderTitle: "Header Format",
+    xlsxExportTitle: "Export Options",
     xlsxHeaderPrompt: "Choose the header format for the exported Excel file:",
     xlsxHeaderOriginal: "Use column names as headers",
     xlsxHeaderComment: "Use column comments as headers",
     xlsxHeaderNameAndComment: "Use column names and comments as headers",
+    xlsxFilterPrompt: "Choose whether the exported Excel file includes filters:",
+    xlsxIncludeAutoFilter: "Include filters",
     copied: "Copied",
     copyFailed: "Copy failed: {message}",
     previewSqlEmpty: "No pending SQL changes to preview",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 6660505134..84dca12f73 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -2046,10 +2046,13 @@ export default withEnglishFallback({
     batchAppendPasteEmpty: "No hay filas nuevas en el portapapeles.",
     batchAppendPasteReadonlyColumn: "Los datos pegados contienen columnas no editables.",
     xlsxHeaderTitle: "Formato de encabezado",
+    xlsxExportTitle: "Opciones de exportacion",
     xlsxHeaderPrompt: "Seleccione el formato de encabezado al exportar a Excel:",
     xlsxHeaderOriginal: "Encabezado usando nombres de campos",
     xlsxHeaderComment: "Encabezado usando comentarios",
     xlsxHeaderNameAndComment: "Encabezado usando nombres de campos y comentarios",
+    xlsxFilterPrompt: "Seleccione si el Excel exportado incluye filtros:",
+    xlsxIncludeAutoFilter: "Incluir filtros",
     jumpToPage: "Ir a la página",
     importBinaryValue: "Importar desde archivo",
     binaryImportApplied: "Se importaron {count} bytes, que se escribirán en la base de datos al guardar los cambios.",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index b9d2fdc131..da1db7f8f8 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -2044,10 +2044,13 @@ export default withEnglishFallback({
     batchAppendPasteEmpty: "Negli appunti non ci sono righe da aggiungere.",
     batchAppendPasteReadonlyColumn: "I dati incollati contengono colonne non modificabili.",
     xlsxHeaderTitle: "Formato intestazione",
+    xlsxExportTitle: "Opzioni di esportazione",
     xlsxHeaderPrompt: "Seleziona il formato dell'intestazione da utilizzare per l'esportazione in Excel:",
     xlsxHeaderOriginal: "Intestazione con nome campo",
     xlsxHeaderComment: "Intestazione con commento",
     xlsxHeaderNameAndComment: "Intestazione con nome campo e commento",
+    xlsxFilterPrompt: "Scegli se il file Excel esportato include filtri:",
+    xlsxIncludeAutoFilter: "Includi filtri",
     jumpToPage: "Vai alla pagina",
     importBinaryValue: "Importa da file",
     binaryImportApplied: "Importati {count} byte, scritti nel database dopo il salvataggio delle modifiche.",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index f4b78bd6f8..107015bdb7 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -2066,10 +2066,13 @@ export default withEnglishFallback({
     batchAppendPasteEmpty: "クリップボードに追加可能な行がありません。",
     batchAppendPasteReadonlyColumn: "貼り付けたデータに編集不可能な列が含まれています。",
     xlsxHeaderTitle: "ヘッダー形式",
+    xlsxExportTitle: "エクスポートオプション",
     xlsxHeaderPrompt: "Excel エクスポート時に使用するヘッダー形式を選択してください：",
     xlsxHeaderOriginal: "ヘッダーにフィールド名を使用",
     xlsxHeaderComment: "ヘッダーにコメントを使用",
     xlsxHeaderNameAndComment: "ヘッダーにフィールド名とコメントを使用",
+    xlsxFilterPrompt: "エクスポートする Excel にフィルターを含めるか選択してください：",
+    xlsxIncludeAutoFilter: "フィルターを含める",
     searchMode: "検索モード",
     searchModeHint: "Ctrl+F 検索時に一致する行をフィルタリングするか、全行を表示したまま一致箇所をハイライトするかを選択します。",
     searchModeFilter: "フィルター",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index 70d9506885..f2b3273a00 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -1955,6 +1955,9 @@ export default withEnglishFallback({
     sortUnsupported: "이 SQL은 전체 결과 정렬을 지원하지 않습니다. 단일 SELECT 쿼리로 다시 시도하세요.",
     truncatedHint: "{count}행 로드 후 결과가 잘렸습니다. 로드된 데이터를 탐색하려면 푸터 페이지 매김을 사용하세요. 전체 결과를 내보내면 데이터베이스 쿼리를 다시 실행합니다.",
     victoriaMetricsTruncatedHint: "결과가 로드 한도를 초과하여 처음 {count}행만 로드했습니다. 페이지당 행 수는 로드된 데이터만 나눠 표시합니다. 전체 결과를 가져오려면 시간 범위를 줄이거나 필터를 추가하세요.",
+    xlsxExportTitle: "내보내기 옵션",
+    xlsxFilterPrompt: "내보낸 Excel에 필터를 포함할지 선택하십시오:",
+    xlsxIncludeAutoFilter: "필터 포함",
   },
   exportProgress: {
     streamingUnsupported: "이 쿼리는 스트리밍 내보내기를 지원하지 않습니다. 쿼리를 단순화하거나 지원되는 드라이버를 사용하세요.",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 26fd6c8c55..2984d43083 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -2046,10 +2046,13 @@ export default withEnglishFallback({
     batchAppendPasteEmpty: "Não há linhas para adicionar na área de transferência.",
     batchAppendPasteReadonlyColumn: "Os dados colados contêm colunas não editáveis.",
     xlsxHeaderTitle: "Formato do cabeçalho",
+    xlsxExportTitle: "Opcoes de exportacao",
     xlsxHeaderPrompt: "Selecione o formato do cabeçalho a ser usado ao exportar Excel:",
     xlsxHeaderOriginal: "Cabeçalho usa nome do campo",
     xlsxHeaderComment: "Cabeçalho usa comentário",
     xlsxHeaderNameAndComment: "Cabeçalho usa nome do campo e comentário",
+    xlsxFilterPrompt: "Selecione se o Excel exportado inclui filtros:",
+    xlsxIncludeAutoFilter: "Incluir filtros",
     jumpToPage: "Ir para a página",
     importBinaryValue: "Importar do arquivo",
     binaryImportApplied: "{count} bytes importados, gravados no banco de dados após salvar as alterações.",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index 4e001c333c..8e1babdfde 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -1575,10 +1575,13 @@ export default withEnglishFallback({
     exported: "导出完成",
     exportFailed: "导出失败：{message}",
     xlsxHeaderTitle: "表头格式",
+    xlsxExportTitle: "导出选项",
     xlsxHeaderPrompt: "请选择导出 Excel 时使用的表头格式：",
     xlsxHeaderOriginal: "表头使用字段名称",
     xlsxHeaderComment: "表头使用注释",
     xlsxHeaderNameAndComment: "表头使用字段名称 + 注释",
+    xlsxFilterPrompt: "请选择是否在导出的 Excel 中包含筛选：",
+    xlsxIncludeAutoFilter: "包含筛选",
     copied: "已复制",
     cut: "已剪切",
     copyFailed: "复制失败：{message}",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index a337f3ac31..c1ea83e8d7 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -2050,10 +2050,13 @@ export default withEnglishFallback({
     batchAppendPasteEmpty: "剪貼簿中沒有可新增的行。",
     batchAppendPasteReadonlyColumn: "貼上的資料包含不可編輯的列。",
     xlsxHeaderTitle: "表頭格式",
+    xlsxExportTitle: "匯出選項",
     xlsxHeaderPrompt: "請選擇匯出 Excel 時使用的表頭格式：",
     xlsxHeaderOriginal: "表頭使用欄位名稱",
     xlsxHeaderComment: "表頭使用註解",
     xlsxHeaderNameAndComment: "表頭使用欄位名稱 + 註解",
+    xlsxFilterPrompt: "請選擇匯出的 Excel 是否包含篩選：",
+    xlsxIncludeAutoFilter: "包含篩選",
     cut: "已剪下",
   },
   exportProgress: {
diff --git a/apps/desktop/src/lib/backend/http.ts b/apps/desktop/src/lib/backend/http.ts
index b12aaa41d3..3f5023dbcc 100644
--- a/apps/desktop/src/lib/backend/http.ts
+++ b/apps/desktop/src/lib/backend/http.ts
@@ -2535,7 +2535,16 @@ function downloadTextFile(filePath: string, fallbackFileName: string, content: s
   URL.revokeObjectURL(url);
 }
 
-export async function exportQueryResultXlsx(filePath: string, sheetName: string | undefined, columns: string[], columnTypes: string[], columnComments: readonly (string | null)[] | undefined, rows: readonly (readonly XlsxCellValue[])[], numericColumnRightAlign?: boolean): Promise<void> {
+export async function exportQueryResultXlsx(
+  filePath: string,
+  sheetName: string | undefined,
+  columns: string[],
+  columnTypes: string[],
+  columnComments: readonly (string | null)[] | undefined,
+  rows: readonly (readonly XlsxCellValue[])[],
+  numericColumnRightAlign?: boolean,
+  autoFilter?: boolean,
+): Promise<void> {
   const { buildXlsxWorkbook } = await import("@/lib/export/xlsxExport");
   const workbook = buildXlsxWorkbook({
     sheetName: sheetName || "Export",
@@ -2544,6 +2553,7 @@ export async function exportQueryResultXlsx(filePath: string, sheetName: string
     columnComments,
     rows,
     numericColumnRightAlign,
+    autoFilter,
   });
   const fileName = filePath.split(/[\\/]/).pop() || "export.xlsx";
   const blob = new Blob([new Uint8Array(workbook)], {
@@ -2566,10 +2576,12 @@ export async function exportQueryResultsXlsx(
     columnComments?: readonly (string | null)[];
     rows: readonly (readonly XlsxCellValue[])[];
     numericColumnRightAlign?: boolean;
+    autoFilter?: boolean;
   }[],
+  autoFilter?: boolean,
 ): Promise<void> {
   const { buildXlsxWorkbookMulti } = await import("@/lib/export/xlsxExport");
-  const workbook = buildXlsxWorkbookMulti(worksheets);
+  const workbook = buildXlsxWorkbookMulti(autoFilter === undefined ? worksheets : worksheets.map((worksheet) => ({ ...worksheet, autoFilter })));
   const fileName = filePath.split(/[\\/]/).pop() || "export.xlsx";
   const blob = new Blob([new Uint8Array(workbook)], {
     type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
diff --git a/apps/desktop/src/lib/backend/tauri.ts b/apps/desktop/src/lib/backend/tauri.ts
index 0c90b2b2e5..e4d51945d6 100644
--- a/apps/desktop/src/lib/backend/tauri.ts
+++ b/apps/desktop/src/lib/backend/tauri.ts
@@ -4659,6 +4659,7 @@ export interface TableExportRequest {
   rowLimit?: number | null;
   dateTimeFormat?: string;
   numericColumnRightAlign?: boolean;
+  autoFilter?: boolean;
 }
 
 export interface TableCsvExportOptions {
@@ -4707,6 +4708,7 @@ export interface QueryResultExportRequest {
   exportColumnTypes?: Array<string | null | undefined>;
   numericColumnRightAlign?: boolean;
   columnComments?: Array<string | null> | null;
+  autoFilter?: boolean;
   identifierQuote?: string;
 }
 
@@ -4846,7 +4848,16 @@ export async function exportTableDataCsv(options: TableCsvExportOptions): Promis
   return invoke("export_table_data_csv", { request: options });
 }
 
-export async function exportQueryResultXlsx(filePath: string, sheetName: string | undefined, columns: string[], columnTypes: string[], columnComments: readonly (string | null)[] | undefined, rows: readonly (readonly XlsxCellValue[])[], numericColumnRightAlign?: boolean): Promise<void> {
+export async function exportQueryResultXlsx(
+  filePath: string,
+  sheetName: string | undefined,
+  columns: string[],
+  columnTypes: string[],
+  columnComments: readonly (string | null)[] | undefined,
+  rows: readonly (readonly XlsxCellValue[])[],
+  numericColumnRightAlign?: boolean,
+  autoFilter?: boolean,
+): Promise<void> {
   return invoke("export_query_result_xlsx", {
     request: {
       filePath,
@@ -4856,6 +4867,7 @@ export async function exportQueryResultXlsx(filePath: string, sheetName: string
       columnComments,
       rows,
       numericColumnRightAlign,
+      autoFilter,
     },
   });
 }
@@ -4869,12 +4881,15 @@ export async function exportQueryResultsXlsx(
     columnComments?: readonly (string | null)[];
     rows: readonly (readonly XlsxCellValue[])[];
     numericColumnRightAlign?: boolean;
+    autoFilter?: boolean;
   }[],
+  autoFilter?: boolean,
 ): Promise<void> {
   return invoke("export_query_results_xlsx", {
     request: {
       filePath,
       worksheets,
+      autoFilter,
     },
   });
 }
diff --git a/apps/desktop/src/lib/export/xlsxExport.ts b/apps/desktop/src/lib/export/xlsxExport.ts
index a13bedc258..11b62b76b1 100644
--- a/apps/desktop/src/lib/export/xlsxExport.ts
+++ b/apps/desktop/src/lib/export/xlsxExport.ts
@@ -9,6 +9,7 @@ export interface XlsxWorksheetData {
   columnComments?: readonly (string | null)[] | undefined;
   rows: readonly (readonly XlsxCellValue[])[];
   numericColumnRightAlign?: boolean;
+  autoFilter?: boolean;
 }
 
 interface XlsxWorksheetSegment {
@@ -174,14 +175,15 @@ function worksheetXml(segment: XlsxWorksheetSegment): string {
     return `<row r="${excelRowIndex}">${cells}</row>`;
   }).join("");
 
+  const autoFilterXml = data.autoFilter === false ? "" : `\n  <autoFilter ref="${range}"/>`;
+
   return `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
   <dimension ref="${range}"/>
   <sheetViews><sheetView workbookViewId="0"><pane ySplit="1" topLeftCell="A2" activePane="bottomLeft" state="frozen"/></sheetView></sheetViews>
   <sheetFormatPr defaultRowHeight="15"/>
   <cols>${colsXml}</cols>
-  <sheetData>${headerXml}${bodyXml}</sheetData>
-  <autoFilter ref="${range}"/>
+  <sheetData>${headerXml}${bodyXml}</sheetData>${autoFilterXml}
 </worksheet>`;
 }
 
diff --git a/apps/desktop/src/lib/export/xlsxHeader.ts b/apps/desktop/src/lib/export/xlsxHeader.ts
index 52d034cf1a..afd86c8c3c 100644
--- a/apps/desktop/src/lib/export/xlsxHeader.ts
+++ b/apps/desktop/src/lib/export/xlsxHeader.ts
@@ -1,5 +1,10 @@
 export type XlsxHeaderMode = "name" | "comment" | "name-comment";
 
+export interface XlsxExportOptions {
+  headerMode: XlsxHeaderMode;
+  autoFilter: boolean;
+}
+
 export function hasXlsxHeaderComments(comments: readonly (string | null | undefined)[] | undefined): boolean {
   return comments?.some((comment) => !!comment?.trim()) ?? false;
 }
diff --git a/crates/dbx-core/src/query_result_export.rs b/crates/dbx-core/src/query_result_export.rs
index 11c14da4b4..3eb8555ce4 100644
--- a/crates/dbx-core/src/query_result_export.rs
+++ b/crates/dbx-core/src/query_result_export.rs
@@ -106,6 +106,8 @@ pub struct QueryResultExportRequest {
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub column_comments: Option<Vec<Option<String>>>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub auto_filter: Option<bool>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub identifier_quote: Option<String>,
 }
 
@@ -236,6 +238,7 @@ fn start_query_result_xlsx_workbook<W: Write + Seek>(
         &trailing_sheets,
         request.date_time_format.as_deref(),
         request.numeric_column_right_align,
+        request.auto_filter.unwrap_or(true),
     )
 }
 
@@ -1917,6 +1920,7 @@ mod tests {
             export_column_types: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
             identifier_quote: None,
         }
     }
diff --git a/crates/dbx-core/src/table_export.rs b/crates/dbx-core/src/table_export.rs
index 190c35990c..31c8485ded 100644
--- a/crates/dbx-core/src/table_export.rs
+++ b/crates/dbx-core/src/table_export.rs
@@ -68,6 +68,8 @@ pub struct TableExportRequest {
     pub numeric_column_right_align: bool,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub column_comments: Option<Vec<Option<String>>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub auto_filter: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -1050,6 +1052,7 @@ async fn try_export_native_table_stream(
                 &[],
                 request.date_time_format.as_deref(),
                 request.numeric_column_right_align,
+                request.auto_filter.unwrap_or(true),
             )?;
             let result = stream_native_table_rows(
                 state,
@@ -1705,6 +1708,7 @@ async fn export_table_data_core_inner(
                 &[],
                 request.date_time_format.as_deref(),
                 request.numeric_column_right_align,
+                request.auto_filter.unwrap_or(true),
             )?;
 
             loop {
@@ -2200,6 +2204,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
 
         ExternalDriverExportFixture { state, request, calls, output, dir }
@@ -2373,6 +2378,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref());
         let columns = vec!["Time".to_string(), "root.test.device2.temperature".to_string()];
@@ -2428,6 +2434,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref());
         let columns = vec!["tImE".to_string(), "temperature".to_string()];
@@ -2461,6 +2468,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref());
         let error = table_export_query_columns(&request, &context, &["TIME".to_string()]).unwrap_err();
@@ -2489,6 +2497,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Iotdb, None, request.schema.as_deref());
         let columns = vec![
@@ -2525,6 +2534,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let columns = vec!["Time".to_string(), "value".to_string()];
 
@@ -2573,6 +2583,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Oracle, None, request.schema.as_deref());
 
@@ -2615,6 +2626,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let columns = vec!["id".to_string(), "payload".to_string()];
         let primary_keys = vec!["id".to_string()];
@@ -2685,6 +2697,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let columns = vec!["id".to_string(), "DisplayName".to_string()];
         let primary_keys = vec!["id".to_string()];
@@ -2737,6 +2750,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let columns = vec!["id".to_string(), "geom".to_string(), "name".to_string()];
         let column_types = vec![Some("int".to_string()), Some("geometry".to_string()), Some("varchar".to_string())];
@@ -2791,6 +2805,7 @@ mod tests {
             date_time_format: None,
             numeric_column_right_align: false,
             column_comments: None,
+            auto_filter: None,
         };
         let context = table_export_sql_context(DatabaseType::Oracle, None, request.schema.as_deref());
         let sql = table_cursor_sql(&request, &context, &columns, &[], &primary_keys);
diff --git a/crates/dbx-core/src/xlsx_export.rs b/crates/dbx-core/src/xlsx_export.rs
index ed0229c1d5..859ac1e3b9 100644
--- a/crates/dbx-core/src/xlsx_export.rs
+++ b/crates/dbx-core/src/xlsx_export.rs
@@ -131,6 +131,7 @@ pub struct StreamingXlsxWriter<W: Write + Seek> {
     column_comments: Vec<Option<String>>,
     date_time_format: Option<String>,
     numeric_right_align: bool,
+    auto_filter: bool,
     row_buffer: String,
 }
 
@@ -229,7 +230,7 @@ pub(crate) fn start_streaming_xlsx_workbook<W: Write + Seek>(
     columns: &[String],
     column_types: &[String],
 ) -> Result<StreamingXlsxWriter<W>, String> {
-    start_streaming_xlsx_workbook_with_options(writer, sheet_name, columns, column_types, &[], &[], None, false)
+    start_streaming_xlsx_workbook_with_options(writer, sheet_name, columns, column_types, &[], &[], None, false, true)
 }
 
 #[cfg(test)]
@@ -249,6 +250,7 @@ pub(crate) fn start_streaming_xlsx_workbook_with_trailing_sheets<W: Write + Seek
         trailing_sheets,
         None,
         false,
+        true,
     )
 }
 
@@ -265,6 +267,7 @@ fn start_xlsx_writer_inner<W: Write + Seek>(
     trailing_sheets: &[XlsxWorksheetData],
     date_time_format: Option<&str>,
     numeric_right_align: bool,
+    auto_filter: bool,
     max_data_rows_per_sheet: usize,
 ) -> Result<StreamingXlsxWriter<W>, String> {
     let width_cache = estimate_header_widths(columns, column_comments);
@@ -306,6 +309,7 @@ fn start_xlsx_writer_inner<W: Write + Seek>(
         column_comments: column_comments.to_vec(),
         date_time_format: date_time_format.map(str::to_string),
         numeric_right_align,
+        auto_filter,
         row_buffer: String::with_capacity(columns.len().saturating_mul(48)),
     })
 }
@@ -319,6 +323,7 @@ pub(crate) fn start_streaming_xlsx_workbook_with_options<W: Write + Seek>(
     trailing_sheets: &[XlsxWorksheetData],
     date_time_format: Option<&str>,
     numeric_right_align: bool,
+    auto_filter: bool,
 ) -> Result<StreamingXlsxWriter<W>, String> {
     start_xlsx_writer_inner(
         writer,
@@ -329,6 +334,7 @@ pub(crate) fn start_streaming_xlsx_workbook_with_options<W: Write + Seek>(
         trailing_sheets,
         date_time_format,
         numeric_right_align,
+        auto_filter,
         XLSX_MAX_DATA_ROWS,
     )
 }
@@ -351,6 +357,7 @@ pub(crate) fn start_streaming_xlsx_workbook_with_max_rows<W: Write + Seek>(
         trailing_sheets,
         None,
         false,
+        true,
         max_data_rows_per_sheet,
     )
 }
@@ -380,14 +387,12 @@ impl<W: Write + Seek> StreamingXlsxWriter<W> {
         Ok(())
     }
 
-    /// Close the currently open data sheet XML: writes `</sheetData>`,
-    /// `<autoFilter>` and `</worksheet>`.
+    /// Close the currently open data sheet XML, optionally writing `<autoFilter>`.
     fn finish_current_sheet(&mut self) -> Result<(), String> {
         let row_count = self.next_row_number.saturating_sub(1);
         let range = sheet_range(self.columns.len(), row_count);
-        self.zip
-            .write_all(format!("</sheetData><autoFilter ref=\"{range}\"/></worksheet>").as_bytes())
-            .map_err(|err| err.to_string())
+        let auto_filter = if self.auto_filter { format!("<autoFilter ref=\"{range}\"/>") } else { String::new() };
+        self.zip.write_all(format!("</sheetData>{auto_filter}</worksheet>").as_bytes()).map_err(|err| err.to_string())
     }
 
     /// Start a new data sheet, reusing the same header row, column widths and
@@ -446,7 +451,7 @@ impl<W: Write + Seek> StreamingXlsxWriter<W> {
                 rows: &sheet.rows,
                 numeric_column_right_align: sheet.numeric_column_right_align,
             };
-            write_worksheet_xml(&mut self.zip, &segment)?;
+            write_worksheet_xml(&mut self.zip, &segment, self.auto_filter)?;
         }
 
         // 3. Write metadata files. These appear AFTER sheet data in the ZIP
@@ -774,7 +779,7 @@ fn push_typed_cell_xml(
     push_cell_xml(output, value, row_index, col_index, style);
 }
 
-fn write_worksheet_xml<W: Write>(writer: &mut W, segment: &WorksheetSegment) -> Result<(), String> {
+fn write_worksheet_xml<W: Write>(writer: &mut W, segment: &WorksheetSegment, auto_filter: bool) -> Result<(), String> {
     let total_rows = segment.rows.len() + 1;
     let range = sheet_range(segment.columns.len(), total_rows);
     let widths = estimate_column_widths(segment.columns, segment.column_comments, segment.rows);
@@ -817,9 +822,8 @@ fn write_worksheet_xml<W: Write>(writer: &mut W, segment: &WorksheetSegment) ->
         writer.write_all(row_buffer.as_bytes()).map_err(|err| err.to_string())?;
     }
 
-    writer
-        .write_all(format!("</sheetData><autoFilter ref=\"{range}\"/></worksheet>").as_bytes())
-        .map_err(|err| err.to_string())
+    let auto_filter = if auto_filter { format!("<autoFilter ref=\"{range}\"/>") } else { String::new() };
+    writer.write_all(format!("</sheetData>{auto_filter}</worksheet>").as_bytes()).map_err(|err| err.to_string())
 }
 
 fn content_types_xml_for_sheet_count(sheet_count: usize) -> String {
@@ -1077,11 +1081,25 @@ fn split_sheets_for_max_rows<'a>(
 }
 
 pub fn build_xlsx_workbook(data: &XlsxWorksheetData) -> Result<Vec<u8>, String> {
-    build_xlsx_workbook_multi(std::slice::from_ref(data))
+    build_xlsx_workbook_with_auto_filter(data, true)
 }
 
 pub fn build_xlsx_workbook_multi(sheets: &[XlsxWorksheetData]) -> Result<Vec<u8>, String> {
-    build_xlsx_workbook_multi_with_max_rows(sheets, XLSX_MAX_DATA_ROWS)
+    build_xlsx_workbook_multi_with_auto_filter(sheets, true)
+}
+
+pub fn build_xlsx_workbook_with_auto_filter(data: &XlsxWorksheetData, auto_filter: bool) -> Result<Vec<u8>, String> {
+    build_xlsx_workbook_multi_with_auto_filter(std::slice::from_ref(data), auto_filter)
+}
+
+pub fn build_xlsx_workbook_multi_with_auto_filter(
+    sheets: &[XlsxWorksheetData],
+    auto_filter: bool,
+) -> Result<Vec<u8>, String> {
+    if auto_filter {
+        return build_xlsx_workbook_multi_with_max_rows(sheets, XLSX_MAX_DATA_ROWS);
+    }
+    build_xlsx_workbook_multi_with_max_rows_and_auto_filter(sheets, XLSX_MAX_DATA_ROWS, auto_filter)
 }
 
 /// Build an in-memory XLSX workbook with an explicit per-sheet data-row limit.
@@ -1091,6 +1109,14 @@ pub fn build_xlsx_workbook_multi(sheets: &[XlsxWorksheetData]) -> Result<Vec<u8>
 pub(crate) fn build_xlsx_workbook_multi_with_max_rows(
     sheets: &[XlsxWorksheetData],
     max_data_rows_per_sheet: usize,
+) -> Result<Vec<u8>, String> {
+    build_xlsx_workbook_multi_with_max_rows_and_auto_filter(sheets, max_data_rows_per_sheet, true)
+}
+
+fn build_xlsx_workbook_multi_with_max_rows_and_auto_filter(
+    sheets: &[XlsxWorksheetData],
+    max_data_rows_per_sheet: usize,
+    auto_filter: bool,
 ) -> Result<Vec<u8>, String> {
     if sheets.is_empty() {
         return Err("At least one worksheet is required".to_string());
@@ -1115,7 +1141,7 @@ pub(crate) fn build_xlsx_workbook_multi_with_max_rows(
     }
     for (index, segment) in segments.iter().enumerate() {
         zip.start_file(format!("xl/worksheets/sheet{}.xml", index + 1), options).map_err(|err| err.to_string())?;
-        write_worksheet_xml(&mut zip, segment)?;
+        write_worksheet_xml(&mut zip, segment, auto_filter)?;
     }
 
     let output = zip.finish().map_err(|err| err.to_string())?;
@@ -1125,10 +1151,10 @@ pub(crate) fn build_xlsx_workbook_multi_with_max_rows(
 #[cfg(test)]
 mod tests {
     use super::{
-        build_xlsx_workbook, build_xlsx_workbook_multi, build_xlsx_workbook_multi_with_max_rows,
-        is_numeric_column_type, start_streaming_xlsx_workbook, start_streaming_xlsx_workbook_with_max_rows,
-        start_streaming_xlsx_workbook_with_options, start_streaming_xlsx_workbook_with_trailing_sheets,
-        write_worksheet_xml, WorksheetSegment, XlsxWorksheetData,
+        build_xlsx_workbook, build_xlsx_workbook_multi, build_xlsx_workbook_multi_with_auto_filter,
+        build_xlsx_workbook_multi_with_max_rows, is_numeric_column_type, start_streaming_xlsx_workbook,
+        start_streaming_xlsx_workbook_with_max_rows, start_streaming_xlsx_workbook_with_options,
+        start_streaming_xlsx_workbook_with_trailing_sheets, write_worksheet_xml, WorksheetSegment, XlsxWorksheetData,
     };
     use calamine::{open_workbook_auto, Reader};
     use serde_json::{json, Value};
@@ -1205,6 +1231,21 @@ mod tests {
         assert_all_entries_deflated(&workbook);
     }
 
+    #[test]
+    fn omits_auto_filter_when_disabled() {
+        let worksheet = XlsxWorksheetData {
+            sheet_name: Some("Users".to_string()),
+            columns: vec!["id".to_string()],
+            column_types: vec![],
+            column_comments: vec![],
+            rows: vec![vec![json!(1)]],
+            numeric_column_right_align: false,
+        };
+        let workbook = build_xlsx_workbook_multi_with_auto_filter(&[worksheet], false).expect("build workbook");
+
+        assert!(!read_zip_entry(&workbook, "xl/worksheets/sheet1.xml").contains("<autoFilter"));
+    }
+
     #[test]
     fn writes_safe_numeric_strings_as_numbers_for_numeric_columns() {
         let workbook = build_xlsx_workbook(&XlsxWorksheetData {
@@ -1481,6 +1522,7 @@ mod tests {
                 &[],
                 Some("YYYY/MM/DD HH:mm:ss.SSS"),
                 false,
+                true,
             )
             .expect("start workbook");
             writer.write_row(&[json!("2024/02/25 13:02:15.125")]).expect("write temporal row");
@@ -1949,7 +1991,7 @@ mod tests {
         };
         let mut stats = WriteStats::default();
 
-        write_worksheet_xml(&mut stats, &segment).expect("write large worksheet");
+        write_worksheet_xml(&mut stats, &segment, true).expect("write large worksheet");
 
         assert!(stats.bytes_written > 10_000_000, "expected realistic worksheet size, got {}", stats.bytes_written);
         assert!(
diff --git a/crates/dbx-core/tests/live_clickhouse_query_result_export.rs b/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
index 4221f3df1e..7afcc789fb 100644
--- a/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
+++ b/crates/dbx-core/tests/live_clickhouse_query_result_export.rs
@@ -104,6 +104,7 @@ async fn live_clickhouse_query_result_export_xlsx_streams_random_order_query_onc
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
diff --git a/crates/dbx-core/tests/live_mysql57.rs b/crates/dbx-core/tests/live_mysql57.rs
index eb7f1ebc23..552a71851c 100644
--- a/crates/dbx-core/tests/live_mysql57.rs
+++ b/crates/dbx-core/tests/live_mysql57.rs
@@ -477,6 +477,7 @@ async fn live_mysql_query_result_export_xlsx_streams_single_query_without_duplic
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
@@ -568,6 +569,7 @@ async fn live_mysql_xlsx_export_can_outlive_query_timeout_while_rows_keep_arrivi
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
diff --git a/crates/dbx-core/tests/live_postgres_query_result_export.rs b/crates/dbx-core/tests/live_postgres_query_result_export.rs
index 832e012ced..3f837bd123 100644
--- a/crates/dbx-core/tests/live_postgres_query_result_export.rs
+++ b/crates/dbx-core/tests/live_postgres_query_result_export.rs
@@ -146,6 +146,7 @@ async fn live_postgres_query_result_export_uses_single_streamed_query() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
@@ -227,6 +228,7 @@ async fn live_postgres_query_result_xlsx_preserves_temporal_cell_types() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
@@ -297,6 +299,7 @@ async fn live_postgres_numeric_xlsx_ignores_fractional_trailing_zeros() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: true,
     };
@@ -372,6 +375,7 @@ async fn live_postgres_truncated_batch_result_export_replays_safe_temp_setup() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
@@ -449,6 +453,7 @@ async fn live_postgres_xlsx_export_can_outlive_query_timeout_while_rows_keep_arr
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
@@ -517,6 +522,7 @@ async fn live_postgres_stream_still_times_out_without_progress_and_recovers() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
diff --git a/crates/dbx-core/tests/live_sqlserver_completion.rs b/crates/dbx-core/tests/live_sqlserver_completion.rs
index 4eb5053035..a2afb0377f 100644
--- a/crates/dbx-core/tests/live_sqlserver_completion.rs
+++ b/crates/dbx-core/tests/live_sqlserver_completion.rs
@@ -1205,6 +1205,7 @@ async fn live_sqlserver_query_result_export_streams_cte_query_to_csv() {
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
diff --git a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
index 9bdfc271df..456b9da7a9 100644
--- a/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
+++ b/crates/dbx-core/tests/live_sqlserver_query_result_export.rs
@@ -121,6 +121,7 @@ async fn live_sqlserver_xlsx_export_can_outlive_query_timeout_while_rows_keep_ar
         export_table_name: None,
         export_column_types: None,
         column_comments: None,
+        auto_filter: None,
         identifier_quote: None,
         numeric_column_right_align: false,
     };
diff --git a/src-tauri/src/commands/xlsx_export.rs b/src-tauri/src/commands/xlsx_export.rs
index 4938516f0c..9aad51b84f 100644
--- a/src-tauri/src/commands/xlsx_export.rs
+++ b/src-tauri/src/commands/xlsx_export.rs
@@ -1,4 +1,6 @@
-use dbx_core::xlsx_export::{build_xlsx_workbook, build_xlsx_workbook_multi, XlsxWorksheetData};
+use dbx_core::xlsx_export::{
+    build_xlsx_workbook_multi_with_auto_filter, build_xlsx_workbook_with_auto_filter, XlsxWorksheetData,
+};
 use serde::Deserialize;
 use serde_json::Value;
 
@@ -15,6 +17,8 @@ pub struct QueryResultXlsxExportRequest {
     pub rows: Vec<Vec<Value>>,
     #[serde(default)]
     pub numeric_column_right_align: bool,
+    #[serde(default)]
+    pub auto_filter: Option<bool>,
 }
 
 #[derive(Debug, Clone, Deserialize)]
@@ -22,6 +26,8 @@ pub struct QueryResultXlsxExportRequest {
 pub struct QueryResultsXlsxExportRequest {
     pub file_path: String,
     pub worksheets: Vec<XlsxWorksheetData>,
+    #[serde(default)]
+    pub auto_filter: Option<bool>,
 }
 
 #[tauri::command]
@@ -39,7 +45,7 @@ pub async fn export_query_result_xlsx(request: QueryResultXlsxExportRequest) ->
         if !data.numeric_column_right_align {
             data.numeric_column_right_align = false;
         }
-        let workbook = build_xlsx_workbook(&data)?;
+        let workbook = build_xlsx_workbook_with_auto_filter(&data, request.auto_filter.unwrap_or(true))?;
         std::fs::write(&request.file_path, workbook).map_err(|err| err.to_string())
     })
     .await
@@ -49,7 +55,8 @@ pub async fn export_query_result_xlsx(request: QueryResultXlsxExportRequest) ->
 #[tauri::command]
 pub async fn export_query_results_xlsx(request: QueryResultsXlsxExportRequest) -> Result<(), String> {
     tauri::async_runtime::spawn_blocking(move || {
-        let workbook = build_xlsx_workbook_multi(&request.worksheets)?;
+        let workbook =
+            build_xlsx_workbook_multi_with_auto_filter(&request.worksheets, request.auto_filter.unwrap_or(true))?;
         std::fs::write(&request.file_path, workbook).map_err(|err| err.to_string())
     })
     .await