From cf86d7f3b4fadafb472008fa16aaa57b33195d1b Mon Sep 17 00:00:00 2001 From: t8y2 <1156263951@qq.com> Date: Mon, 18 May 2026 17:46:42 +0800 Subject: [PATCH] fix(grid): keep save actions visible --- apps/desktop/src/components/grid/DataGrid.vue | 16 +++-- apps/desktop/src/lib/dataGridSaveUi.ts | 18 ++++++ packages/app-tests/dataGridSaveUi.test.ts | 58 ++++++++++++++++++- 3 files changed, 87 insertions(+), 5 deletions(-) diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index 7c8fa30c7..fdf6dede2 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -103,7 +103,7 @@ import { } from "@/lib/columnFormatter"; import { isCancelSearchShortcut, isFocusSearchShortcut } from "@/lib/keyboardShortcuts"; import { dataGridHeaderContentWidth, scrollbarGutterWidth } from "@/lib/dataGridScrollGutter"; -import { dataGridSaveActionMode } from "@/lib/dataGridSaveUi"; +import { dataGridSaveActionMode, dataGridSaveToolbarState } from "@/lib/dataGridSaveUi"; import { appendColumnValueFilterCondition, buildColumnValueFilterCondition } from "@/lib/dataGridColumnFilter"; import { filterColumnVisibilityOptions, @@ -1335,6 +1335,14 @@ const saveActionMode = computed(() => useTransaction: !!useTransaction.value, }), ); +const saveToolbarState = computed(() => + dataGridSaveToolbarState({ + editable: props.editable, + hasSaveTarget: !!props.tableMeta || !!props.customSave, + hasPendingChanges: hasPendingChanges.value, + isSaving: isSaving.value, + }), +); function canEditRowItem(item: RowItem | undefined): boolean { return !!props.editable && !!item && !item.isDeleted && (item.isNew || canEditExistingRows.value); @@ -2711,14 +2719,14 @@ defineExpose({ {{ t("grid.transactionActive") }} -