From 66ce9a368e557a591f9076420a3008d226f07eca Mon Sep 17 00:00:00 2001
From: t8y2 <1156263951@qq.com>
Date: Thu, 28 May 2026 00:00:03 +0800
Subject: [PATCH] feat(grid): always show sort button in column header
 regardless of compact mode

Previously when compactColumnHeaderActions was enabled, the sort button was
hidden inside a dropdown menu, requiring two clicks to sort. Now the sort
button is always visible, while formatter and local filter remain in the
dropdown when compact mode is on.
---
 apps/desktop/src/components/grid/DataGrid.vue | 34 +++----------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue
index 6b83627552..8ff8e31a2c 100644
--- a/apps/desktop/src/components/grid/DataGrid.vue
+++ b/apps/desktop/src/components/grid/DataGrid.vue
@@ -4272,7 +4272,6 @@ defineExpose({
                               </span>
                             </span>
                             <button
-                              v-if="!compactColumnHeaderActions"
                               type="button"
                               class="flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted hover:text-foreground"
                               :class="
@@ -4310,12 +4309,10 @@ defineExpose({
                                   type="button"
                                   class="flex h-4 w-4 shrink-0 items-center justify-center rounded text-muted-foreground hover:bg-muted hover:text-foreground"
                                   :class="
-                                    sortCol === col && sortColIndex === actualColumnIndex(colIdx)
-                                      ? 'text-primary opacity-100'
-                                      : columnHasFormatter(actualColumnIndex(colIdx)) ||
-                                          localFilterActive(actualColumnIndex(colIdx))
-                                        ? 'text-primary opacity-90'
-                                        : 'opacity-80'
+                                    columnHasFormatter(actualColumnIndex(colIdx)) ||
+                                    localFilterActive(actualColumnIndex(colIdx))
+                                      ? 'text-primary opacity-90'
+                                      : 'opacity-80'
                                   "
                                   :title="t('grid.columnActions')"
                                   @click.stop
@@ -4329,29 +4326,6 @@ defineExpose({
                                 @click.stop
                                 @keydown.stop
                               >
-                                <DropdownMenuItem
-                                  class="gap-1 px-1.5 py-0.5 text-xs"
-                                  @click="applyHeaderSort(col, actualColumnIndex(colIdx), 'asc')"
-                                >
-                                  <ArrowUp class="h-3 w-3" />
-                                  {{ t("grid.sortAscending") }}
-                                </DropdownMenuItem>
-                                <DropdownMenuItem
-                                  class="gap-1 px-1.5 py-0.5 text-xs"
-                                  @click="applyHeaderSort(col, actualColumnIndex(colIdx), 'desc')"
-                                >
-                                  <ArrowDown class="h-3 w-3" />
-                                  {{ t("grid.sortDescending") }}
-                                </DropdownMenuItem>
-                                <DropdownMenuItem
-                                  class="gap-1 px-1.5 py-0.5 text-xs"
-                                  :disabled="!sortCol"
-                                  @click="applyHeaderSort(col, actualColumnIndex(colIdx), null)"
-                                >
-                                  <ArrowUpDown class="h-3 w-3" />
-                                  {{ t("grid.clearSort") }}
-                                </DropdownMenuItem>
-                                <DropdownMenuSeparator />
                                 <DropdownMenuItem
                                   class="gap-1 px-1.5 py-0.5 text-xs"
                                   :disabled="!formatterKeyForColumn(col)"