feat(query): add configurable result tab naming

This commit is contained in:
二丫讲梵 authored and GitHub committed 2026-09-30 21:16:39 +08:00
1 parent 87546f8e4f
commit 3ddb926c5a
26 files changed
+332 -39

No files matched your search

@@ -92,6 +92,7 @@ import {
type DataGridFilterEditorView,
type DataGridToolbarLayout,
type MultiStatementDefaultView,
type ResultTabNamingMode,
type OpenTabsRestoreMode,
type AppCloseUnsavedTabsMode,
type SidebarObjectInfoMode,
@@ -732,6 +733,8 @@ const editShowColumnCommentsInHeader = ref(settingsStore.editorSettings.showColu
const editShowColumnTypesInHeader = ref(settingsStore.editorSettings.showColumnTypesInHeader);
const editShowColumnHeaderTooltips = ref(settingsStore.editorSettings.showColumnHeaderTooltips);
const editShowResultSourceDatabase = ref(settingsStore.editorSettings.showResultSourceDatabase);
const editResultTabNamingMode = ref<ResultTabNamingMode>(settingsStore.editorSettings.resultTabNamingMode);
const editResultTabPreferComments = ref(settingsStore.editorSettings.resultTabPreferComments);
const editDataGridShowTransposeFieldMetadata = ref(settingsStore.editorSettings.dataGridShowTransposeFieldMetadata);
const editColorizeDataGridCellTypes = ref(settingsStore.editorSettings.colorizeDataGridCellTypes);
const editShowIndexIndicatorsInHeader = ref(settingsStore.editorSettings.showIndexIndicatorsInHeader);
@@ -1082,6 +1085,8 @@ function currentEditorSettingsDraft(): EditorSettingsDraft {
showColumnTypesInHeader: editShowColumnTypesInHeader.value,
showColumnHeaderTooltips: editShowColumnHeaderTooltips.value,
showResultSourceDatabase: editShowResultSourceDatabase.value,
resultTabNamingMode: editResultTabNamingMode.value,
resultTabPreferComments: editResultTabPreferComments.value,
dataGridShowTransposeFieldMetadata: editDataGridShowTransposeFieldMetadata.value,
colorizeDataGridCellTypes: editColorizeDataGridCellTypes.value,
dataGridTypeColorSchemes: editDataGridTypeColorSchemes.value,
@@ -1748,6 +1753,8 @@ function syncEditorSettingsDraftFromStore() {
editShowColumnTypesInHeader.value = settingsStore.editorSettings.showColumnTypesInHeader;
editShowColumnHeaderTooltips.value = settingsStore.editorSettings.showColumnHeaderTooltips;
editShowResultSourceDatabase.value = settingsStore.editorSettings.showResultSourceDatabase;
editResultTabNamingMode.value = settingsStore.editorSettings.resultTabNamingMode;
editResultTabPreferComments.value = settingsStore.editorSettings.resultTabPreferComments;
editDataGridShowTransposeFieldMetadata.value = settingsStore.editorSettings.dataGridShowTransposeFieldMetadata;
editColorizeDataGridCellTypes.value = settingsStore.editorSettings.colorizeDataGridCellTypes;
editDataGridTypeColorSchemes.value = cloneDataGridTypeColorSchemes(settingsStore.editorSettings.dataGridTypeColorSchemes);
@@ -1889,6 +1896,8 @@ const editorSettingsDraftRefs: EditorSettingsDraftRefMap = {
showColumnTypesInHeader: editShowColumnTypesInHeader,
showColumnHeaderTooltips: editShowColumnHeaderTooltips,
showResultSourceDatabase: editShowResultSourceDatabase,
resultTabNamingMode: editResultTabNamingMode,
resultTabPreferComments: editResultTabPreferComments,
dataGridShowTransposeFieldMetadata: editDataGridShowTransposeFieldMetadata,
colorizeDataGridCellTypes: editColorizeDataGridCellTypes,
dataGridTypeColorSchemes: editDataGridTypeColorSchemes,
@@ -2442,6 +2451,8 @@ function resetDefaultsForTab(tab: SettingsCategory) {
editShowColumnTypesInHeader.value = DEFAULT_EDITOR_SETTINGS.showColumnTypesInHeader;
editShowColumnHeaderTooltips.value = DEFAULT_EDITOR_SETTINGS.showColumnHeaderTooltips;
editShowResultSourceDatabase.value = DEFAULT_EDITOR_SETTINGS.showResultSourceDatabase;
editResultTabNamingMode.value = DEFAULT_EDITOR_SETTINGS.resultTabNamingMode;
editResultTabPreferComments.value = DEFAULT_EDITOR_SETTINGS.resultTabPreferComments;
editDataGridShowTransposeFieldMetadata.value = DEFAULT_EDITOR_SETTINGS.dataGridShowTransposeFieldMetadata;
editColorizeDataGridCellTypes.value = DEFAULT_EDITOR_SETTINGS.colorizeDataGridCellTypes;
// Back to the built-in palette, but keep the user's saved schemes available.
@@ -8467,16 +8478,43 @@ onUnmounted(() => {
</div>
<Switch id="show-column-header-tooltips" v-model="editShowColumnHeaderTooltips" />
</div>
<div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
<div class="space-y-1">
<Label for="show-result-source-database">
{{ t("settings.showResultSourceDatabase") }}
</Label>
<p class="text-xs text-muted-foreground">
{{ t("settings.showResultSourceDatabaseDescription") }}
</p>
<div class="settings-item space-y-3 rounded-md border bg-muted/20 p-3">
<div class="flex items-center justify-between gap-4">
<div class="min-w-0 space-y-1">
<Label>{{ t("settings.resultTabNamingMode") }}</Label>
<p class="text-xs text-muted-foreground">
{{ t("settings.resultTabNamingModeDescription") }}
</p>
</div>
<Select v-model="editResultTabNamingMode">
<SelectTrigger class="h-8 w-48 shrink-0">
<SelectValue :placeholder="t('settings.resultTabNamingMode')" />
</SelectTrigger>
<SelectContent>
<SelectItem value="source">{{ t("settings.resultTabNamingModeSource") }}</SelectItem>
<SelectItem value="ordinal">{{ t("settings.resultTabNamingModeOrdinal") }}</SelectItem>
<SelectItem value="comment">{{ t("settings.resultTabNamingModeComment") }}</SelectItem>
</SelectContent>
</Select>
</div>
<div v-if="editResultTabNamingMode === 'source'" class="flex items-center justify-between gap-4 border-t border-border/60 pt-3">
<div class="space-y-1 pl-1">
<Label for="result-tab-prefer-comments">{{ t("settings.resultTabPreferComments") }}</Label>
<p class="text-xs text-muted-foreground">{{ t("settings.resultTabPreferCommentsDescription") }}</p>
</div>
<Switch id="result-tab-prefer-comments" v-model="editResultTabPreferComments" />
</div>
<div v-if="editResultTabNamingMode === 'source'" class="flex items-center justify-between gap-4 border-t border-border/60 pt-3">
<div class="space-y-1 pl-1">
<Label for="show-result-source-database">
{{ t("settings.showResultSourceDatabase") }}
</Label>
<p class="text-xs text-muted-foreground">
{{ t("settings.showResultSourceDatabaseDescription") }}
</p>
</div>
<Switch id="show-result-source-database" v-model="editShowResultSourceDatabase" />
</div>
<Switch id="show-result-source-database" v-model="editShowResultSourceDatabase" />
</div>
<div class="settings-item flex items-center justify-between gap-4 rounded-md border bg-muted/20 px-3 py-2">
<div class="space-y-1">
@@ -501,8 +501,12 @@ const activeQueryError = computed(() => {
const hasQueryOutput = computed(() => tabHasQueryOutput(props.activeTab));
// 结果集页签/列表的名称是否带库名,由编辑器设置控制(默认带库名)
const includeResultSourceDatabase = computed(() => settingsStore.editorSettings.showResultSourceDatabase);
const visibleResultItems = computed(() => tabularResultItems(props.activeTab.results ?? (props.activeTab.result ? [props.activeTab.result] : undefined), { includeSourceDatabase: includeResultSourceDatabase.value }));
const tabularResults = computed(() => tabularResultItems(props.activeTab.results, { includeSourceDatabase: includeResultSourceDatabase.value }));
const resultTabNamingMode = computed(() => settingsStore.editorSettings.resultTabNamingMode);
const preferResultTabComments = computed(() => settingsStore.editorSettings.resultTabPreferComments);
const visibleResultItems = computed(() =>
tabularResultItems(props.activeTab.results ?? (props.activeTab.result ? [props.activeTab.result] : undefined), { includeSourceDatabase: includeResultSourceDatabase.value, namingMode: resultTabNamingMode.value, preferComments: preferResultTabComments.value }),
);
const tabularResults = computed(() => tabularResultItems(props.activeTab.results, { includeSourceDatabase: includeResultSourceDatabase.value, namingMode: resultTabNamingMode.value, preferComments: preferResultTabComments.value }));
const allResultExportSheets = computed(() =>
tabularResults.value.map((item) => ({
sheetName: item.label || t("tabs.resultN", { n: item.n }),
@@ -514,10 +518,13 @@ const allResultExportSheets = computed(() =>
const resultRuns = computed(() =>
resultRunItems(props.activeTab, {
includeSourceDatabase: includeResultSourceDatabase.value,
namingMode: resultTabNamingMode.value,
preferComments: preferResultTabComments.value,
database: props.activeTab.database,
databaseType: activeEffectiveDatabaseType.value,
}),
);
const resultRunFallbackLabel = (sequence: number) => t(resultTabNamingMode.value === "ordinal" ? "tabs.resultN" : "tabs.runN", { n: sequence });
const activeResultGridCacheKey = computed(() => resultGridCacheKey(props.activeTab));
const activeResultGridColumnWidthCacheKey = computed(() => resultGridColumnWidthCacheKey(props.activeTab));
const activeResultGridInstanceKey = computed(() => resultGridInstanceKey(props.activeTab));
@@ -1824,7 +1831,7 @@ defineExpose({
@keydown="onResultRunTabKeydown($event, runIndex)"
>
<Pin v-if="run.pinned" class="h-3 w-3 shrink-0 fill-current text-primary" />
{{ run.title || run.sourceLabel || t("tabs.runN", { n: run.sequence }) }}
{{ run.title || run.sourceLabel || resultRunFallbackLabel(run.sequence) }}
</button>
<button
type="button"
@@ -1844,7 +1851,7 @@ defineExpose({
<DropdownMenu>
<DropdownMenuTrigger as-child>
<Button variant="ghost" size="sm" class="h-6 max-w-48 gap-1 px-2 text-xs">
<span class="min-w-0 truncate">{{ activeResultRunItem ? activeResultRunItem.title || activeResultRunItem.sourceLabel || t("tabs.runN", { n: activeResultRunItem.sequence }) : t("tabs.resultRuns") }}</span>
<span class="min-w-0 truncate">{{ activeResultRunItem ? activeResultRunItem.title || activeResultRunItem.sourceLabel || resultRunFallbackLabel(activeResultRunItem.sequence) : t("tabs.resultRuns") }}</span>
<ChevronDown class="h-3.5 w-3.5 shrink-0" />
</Button>
</DropdownMenuTrigger>
@@ -1854,7 +1861,7 @@ defineExpose({
<Check v-if="run.active" class="h-3.5 w-3.5 shrink-0" />
<span v-else class="h-3.5 w-3.5 shrink-0" />
<Pin v-if="run.pinned" class="h-3 w-3 shrink-0 fill-current text-primary" />
<span class="min-w-0 flex-1 truncate">{{ run.title || run.sourceLabel || t("tabs.runN", { n: run.sequence }) }}</span>
<span class="min-w-0 flex-1 truncate">{{ run.title || run.sourceLabel || resultRunFallbackLabel(run.sequence) }}</span>
<button
type="button"
class="inline-flex h-5 w-5 shrink-0 items-center justify-center rounded-sm text-muted-foreground hover:bg-accent hover:text-foreground"