Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

chore: support multiple-select keyboard shortcut (#19153)

ecmadaoe635c6cce6c7
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
index d039c3abd2..c7837ec9be 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/TableCell.vue
@@ -93,8 +93,8 @@ const { getBinaryFormat, setBinaryFormat } = useBinaryFormatContext();
const {
state: selectionState,
disabled: selectionDisabled,
- selectCell,
- selectRow,
+ toggleSelectCell,
+ toggleSelectRow,
} = useSelectionContext();
const wrapperRef = ref<HTMLDivElement>();
const cellRef = ref<HTMLDivElement>();
@@ -228,9 +228,9 @@ const handleClick = (e: MouseEvent) => {
}
// If the user is holding the ctrl/cmd key, select the row.
if (e.ctrlKey || e.metaKey) {
- selectRow(props.rowIndex);
+ toggleSelectRow(props.rowIndex);
} else {
- selectCell(props.rowIndex, props.colIndex);
+ toggleSelectCell(props.rowIndex, props.colIndex);
}
e.stopPropagation();
};
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
index 91aa93d14f..2a8e68b974 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/VirtualDataTable.vue
@@ -48,7 +48,7 @@
selectionState.columns.includes(columnIndex),
}"
v-bind="tableResize.getColumnProps(columnIndex + 1)"
- @click.stop="selectColumn(columnIndex)"
+ @click="e => handleSelectColumn(e, columnIndex)"
>
<div class="flex items-center overflow-hidden">
<span class="flex flex-row items-center select-none">
@@ -133,7 +133,7 @@
'border-r': true,
'border-b': true,
'bg-accent/10! dark:bg-accent/40!': activeRowIndex === rowIndex,
- 'bg-accent/20! dark:bg-accent/40!': selectionState.rows.includes(rowIndex)
+ 'bg-accent/20! dark:bg-accent/40!': selectionState.columns.length === 0 && selectionState.rows.includes(rowIndex)
}"
:data-col-index="0"
:style="{
@@ -162,9 +162,7 @@
rowIndex
),
}"
- @click.prevent.stop="
- selectRow(rowIndex)
- "
+ @click="e => handleSelectRow(e, rowIndex)"
></div>
</div>
@@ -211,8 +209,9 @@
<script lang="ts" setup>
import { useWindowSize, watchDebounced } from "@vueuse/core";
+import { head, last } from "lodash-es";
import { NPerformantEllipsis, NVirtualList } from "naive-ui";
-import { nextTick, onMounted, onUnmounted, ref } from "vue";
+import { computed, nextTick, onMounted, onUnmounted, ref } from "vue";
import { DEBOUNCE_SEARCH_DELAY } from "@/types";
import type { Database } from "@/types/proto-es/v1/database_service_pb";
import type { MaskingReason } from "@/types/proto-es/v1/sql_service_pb";
@@ -271,8 +270,9 @@ const handleHeaderClick = (columnIndex: number) => {
const {
state: selectionState,
disabled: selectionDisabled,
- selectColumn,
- selectRow,
+ toggleSelectColumn,
+ toggleSelectRow,
+ deselect,
} = useSelectionContext();
const containerRef = ref<HTMLDivElement>();
const tableRef = ref<HTMLTableElement>();
@@ -299,6 +299,64 @@ const getRowCellContent = (columnIndex: number): string | undefined => {
return undefined;
};
+const hasRowSelect = computed(() => {
+ return (
+ selectionState.value.columns.length === 0 &&
+ selectionState.value.rows.length > 0
+ );
+});
+
+const handleSelectRow = (e: MouseEvent, index: number) => {
+ e.stopPropagation();
+
+ if ((e.metaKey || e.ctrlKey) && hasRowSelect.value) {
+ const firstRowIndex = head(selectionState.value.rows);
+ const lastRowIndex = last(selectionState.value.rows);
+ if (lastRowIndex !== undefined && index > lastRowIndex) {
+ for (let i = lastRowIndex + 1; i <= index; i++) {
+ toggleSelectRow(i);
+ }
+ } else if (firstRowIndex !== undefined && index < firstRowIndex) {
+ deselect();
+ for (let i = index; i <= firstRowIndex; i++) {
+ toggleSelectRow(i);
+ }
+ }
+ return;
+ }
+
+ toggleSelectRow(index);
+};
+
+const hasColumnSelect = computed(() => {
+ return (
+ selectionState.value.columns.length > 0 &&
+ selectionState.value.rows.length === 0
+ );
+});
+
+const handleSelectColumn = (e: MouseEvent, index: number) => {
+ e.stopPropagation();
+
+ if ((e.metaKey || e.ctrlKey) && hasColumnSelect.value) {
+ const firstColumnIndex = head(selectionState.value.columns);
+ const lastColumnIndex = last(selectionState.value.columns);
+ if (lastColumnIndex !== undefined && index > lastColumnIndex) {
+ for (let i = lastColumnIndex + 1; i <= index; i++) {
+ toggleSelectColumn(i);
+ }
+ } else if (firstColumnIndex !== undefined && index < firstColumnIndex) {
+ deselect();
+ for (let i = index; i <= firstColumnIndex; i++) {
+ toggleSelectColumn(i);
+ }
+ }
+ return;
+ }
+
+ toggleSelectColumn(index);
+};
+
const tableResize = useTableColumnWidthLogic({
tableRef,
containerRef,
diff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
index 7895d92a63..b54084a972 100644
--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/DataTable/common/selection-logic.ts
@@ -32,9 +32,9 @@ export type SelectionState = {
export type SelectionContext = {
state: Ref<SelectionState>;
disabled: Ref<boolean>;
- selectRow: (row: number) => void;
- selectColumn: (column: number) => void;
- selectCell: (row: number, column: number) => void;
+ toggleSelectRow: (row: number) => void;
+ toggleSelectColumn: (column: number) => void;
+ toggleSelectCell: (row: number, column: number) => void;
deselect: () => void;
copy: () => boolean;
};
@@ -69,14 +69,18 @@ export const provideSelectionContext = ({
const isCellSelected = computed(
() => state.value.rows.length === 1 && state.value.columns.length === 1
);
- const selectRow = (row: number) => {
+
+ const deselect = () => {
+ state.value = {
+ rows: [],
+ columns: [],
+ };
+ };
+
+ const toggleSelectRow = (row: number) => {
if (disabled.value) return;
if (isCellSelected.value) {
- state.value = {
- rows: [row],
- columns: [],
- };
- return;
+ deselect();
}
state.value = {
rows: sortBy(
@@ -87,14 +91,11 @@ export const provideSelectionContext = ({
columns: [],
};
};
- const selectColumn = (column: number) => {
+
+ const toggleSelectColumn = (column: number) => {
if (disabled.value) return;
if (isCellSelected.value) {
- state.value = {
- rows: [],
- columns: [column],
- };
- return;
+ deselect();
}
state.value = {
rows: [],
@@ -105,7 +106,8 @@ export const provideSelectionContext = ({
),
};
};
- const selectCell = (row: number, column: number) => {
+
+ const toggleSelectCell = (row: number, column: number) => {
if (disabled.value) return;
if (
state.value.rows.includes(row) &&
@@ -119,12 +121,6 @@ export const provideSelectionContext = ({
columns: [column],
};
};
- const deselect = () => {
- state.value = {
- rows: [],
- columns: [],
- };
- };
useEventListener("click", (e) => {
if (copying.value) return;
@@ -177,7 +173,8 @@ export const provideSelectionContext = ({
};
const getValues = () => {
- if (state.value.rows.length === 1 && state.value.columns.length === 1) {
+ if (isCellSelected.value) {
+ // single cell selected
const row = rows.value[state.value.rows[0]];
if (!row) {
return "";
@@ -193,7 +190,18 @@ export const provideSelectionContext = ({
colIndex: state.value.columns[0],
rowIndex: state.value.rows[0],
});
- } else if (state.value.rows.length > 0) {
+ }
+
+ // build column name
+ let columnNames = ["index", ...columns.value.map((c) => c.name)];
+ if (state.value.columns.length > 0) {
+ columnNames = state.value.columns.map(
+ (columnIndex) => columns.value[columnIndex]?.name ?? ""
+ );
+ }
+
+ if (state.value.rows.length > 0) {
+ // multi-rows selected
const data: QueryRow[] = [];
for (const rowIndex of state.value.rows) {
const d = rows.value[rowIndex].item;
@@ -205,7 +213,8 @@ export const provideSelectionContext = ({
if (data.length === 0) {
return "";
}
- return data
+
+ const value = data
.map((row, rowIdx) => {
return row.values
.map((cell, colIdx) => {
@@ -218,7 +227,12 @@ export const provideSelectionContext = ({
.join("\t");
})
.join("\n");
- } else if (state.value.columns.length > 0) {
+
+ return `${columnNames.join("\t")}\n${value}`;
+ }
+
+ if (state.value.columns.length > 0) {
+ // multi-columns selected
const values: RowValue[][] = [];
for (const row of rows.value) {
const cells: RowValue[] = [];
@@ -232,7 +246,7 @@ export const provideSelectionContext = ({
if (values.length === 0) {
return "";
}
- return values
+ const value = values
.map((cells, rowIdx) =>
cells
.map((cell, colIdx) => {
@@ -245,6 +259,8 @@ export const provideSelectionContext = ({
.join("\t")
)
.join("\n");
+
+ return `${columnNames.join("\t")}\n${value}`;
}
return "";
@@ -305,9 +321,9 @@ export const provideSelectionContext = ({
const context: SelectionContext = {
state,
disabled,
- selectRow,
- selectColumn,
- selectCell,
+ toggleSelectRow,
+ toggleSelectColumn,
+ toggleSelectCell,
deselect,
copy,
};