github/dbx
4
0
Fork 0
mirror of https://github.com/t8y2/dbx.git synced 2026-10-24 03:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(grid): 调整列排序菜单顺序，数据库排序置顶

Browse Source
This commit is contained in:
t8y2
2026-06-26 15:05:31 +08:00
parent 49e79eb934
commit 5ffac129e0
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/desktop/src/components/grid/DataGrid.vue
+16 -16
View File
@@ -366,24 +366,11 @@ function columnIsSorted(column: string, columnIndex: number): boolean {
function sortMenuItems(column: string, columnIndex: number) {
return [
{
label: t("grid.sortCurrentPageAscending"),
value: "local-asc",
icon: ArrowUp,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "asc" && sortMode.value === "local",
},
{
label: t("grid.sortCurrentPageDescending"),
value: "local-desc",
icon: ArrowDown,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "desc" && sortMode.value === "local",
},
{
label: t("grid.sortDatabaseAscending"),
value: "database-asc",
icon: Database,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "asc" && sortMode.value === "database",
separatorBefore: true,
},
{
label: t("grid.sortDatabaseDescending"),
@@ -391,6 +378,19 @@ function sortMenuItems(column: string, columnIndex: number) {
icon: Database,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "desc" && sortMode.value === "database",
},
{
label: t("grid.sortCurrentPageAscending"),
value: "local-asc",
icon: ArrowUp,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "asc" && sortMode.value === "local",
separatorBefore: true,
},
{
label: t("grid.sortCurrentPageDescending"),
value: "local-desc",
icon: ArrowDown,
checked: columnIsSorted(column, columnIndex) && sortDir.value === "desc" && sortMode.value === "local",
},
{
label: t("grid.clearSort"),
value: "clear",
@@ -6485,11 +6485,11 @@ const gridContextMenuItems = computed<ContextMenuItem[]>(() => {
// 2. Column sort & filter
if (contextColumn.value) {
items.push(
{ label: t("grid.sortCurrentPageAscending"), action: () => applyContextSort("asc", "local"), icon: ArrowUp },
{ label: t("grid.sortCurrentPageDescending"), action: () => applyContextSort("desc", "local"), icon: ArrowDown },
{ label: "", separator: true },
{ label: t("grid.sortDatabaseAscending"), action: () => applyContextSort("asc", "database"), icon: Database },
{ label: t("grid.sortDatabaseDescending"), action: () => applyContextSort("desc", "database"), icon: Database },
{ label: "", separator: true },
{ label: t("grid.sortCurrentPageAscending"), action: () => applyContextSort("asc", "local"), icon: ArrowUp },
{ label: t("grid.sortCurrentPageDescending"), action: () => applyContextSort("desc", "local"), icon: ArrowDown },
);
if (sortCol.value) {
items.push({ label: t("grid.clearSort"), action: () => applyContextSort(null, sortMode.value), icon: ArrowUpDown });