diff --git a/apps/desktop/src/components/grid/DataGrid.vue b/apps/desktop/src/components/grid/DataGrid.vue index c9bc9116d7..8125ff3b42 100644 --- a/apps/desktop/src/components/grid/DataGrid.vue +++ b/apps/desktop/src/components/grid/DataGrid.vue @@ -408,6 +408,7 @@ const contextHeaderColumn = ref(null); const contextHeaderColumnIndex = ref(null); const detailCell = ref<{ rowIndex: number; col: number } | null>(null); const hoveredDetailCell = ref<{ rowIndex: number; col: number } | null>(null); +const quickDownloadMenuCell = ref<{ rowIndex: number; col: number } | null>(null); const showCellDetail = ref(false); const activeCellDetailTab = ref(defaultCellDetailTab()); const cellDetailDialogOpen = ref(false); @@ -1719,7 +1720,10 @@ function onScrollerScroll(e: Event) { } watch(isScrolling, (scrolling) => { - if (scrolling) hoveredDetailCell.value = null; + if (scrolling) { + hoveredDetailCell.value = null; + quickDownloadMenuCell.value = null; + } }); initColumnWidths(); @@ -2367,10 +2371,26 @@ function onCellMouseleave(rowIndex: number, actualColIdx: number) { } } +function quickDownloadMenuOpenFor(rowIndex: number, actualColIdx: number): boolean { + return quickDownloadMenuCell.value?.rowIndex === rowIndex && quickDownloadMenuCell.value.col === actualColIdx; +} + +function handleQuickDownloadMenuOpenChange(open: boolean, rowIndex: number, actualColIdx: number) { + if (open) { + quickDownloadMenuCell.value = { rowIndex, col: actualColIdx }; + hoveredDetailCell.value = { rowIndex, col: actualColIdx }; + return; + } + if (quickDownloadMenuOpenFor(rowIndex, actualColIdx)) { + quickDownloadMenuCell.value = null; + } +} + function cellDetailButtonVisible(rowIndex: number, actualColIdx: number) { if (isScrolling.value) return false; return ( (hoveredDetailCell.value?.rowIndex === rowIndex && hoveredDetailCell.value.col === actualColIdx) || + quickDownloadMenuOpenFor(rowIndex, actualColIdx) || (showCellDetail.value && detailCell.value?.rowIndex === rowIndex && detailCell.value.col === actualColIdx) ); } @@ -3349,7 +3369,8 @@ const canvasEditingCellStyle = computed(() => { const canvasDetailButtonCell = computed(() => { if (!useCanvasGridRows.value || isScrolling.value) return null; - const target = hoveredDetailCell.value ?? (showCellDetail.value ? detailCell.value : null); + const target = + hoveredDetailCell.value ?? quickDownloadMenuCell.value ?? (showCellDetail.value ? detailCell.value : null); if (!target || !cellDetailButtonVisible(target.rowIndex, target.col)) return null; const visibleColIdx = visibleColumnIndexes.value.indexOf(target.col); if (visibleColIdx < 0) return null; @@ -3357,15 +3378,18 @@ const canvasDetailButtonCell = computed(() => { if (!rect) return null; const visibleLeft = Math.max(DATA_GRID_ROW_NUM_WIDTH, rect.left); const visibleRight = Math.min(canvasViewportWidth.value, rect.left + rect.width); - if (rect.top < 0 || rect.top > canvasViewportHeight.value - 1 || visibleRight - visibleLeft < 24) return null; - return { rowIndex: target.rowIndex, visibleColIdx, actualColIdx: target.col, rect }; + const canQuickDownload = canQuickDownloadCellValue(target.rowIndex, target.col); + const minWidth = canQuickDownload ? 46 : 24; + if (rect.top < 0 || rect.top > canvasViewportHeight.value - 1 || visibleRight - visibleLeft < minWidth) return null; + return { rowIndex: target.rowIndex, visibleColIdx, actualColIdx: target.col, rect, canQuickDownload }; }); const canvasDetailButtonStyle = computed(() => { const cell = canvasDetailButtonCell.value; if (!cell) return {}; + const actionWidth = cell.canQuickDownload ? 44 : 22; return { - left: `${cell.rect.left + cell.rect.width - 22}px`, + left: `${Math.max(DATA_GRID_ROW_NUM_WIDTH, cell.rect.left + cell.rect.width - actionWidth)}px`, top: `${cell.rect.top + 2}px`, }; }); @@ -4022,6 +4046,14 @@ function canDownloadDetailBinaryValue(detail: DataGridCellDetail | null): boolea return !!detail && canDownloadBinaryCellValue(detail.value, detail.type); } +function canQuickDownloadCellValue(rowIndex: number, columnIndex: number): boolean { + return canDownloadDetailBinaryValue(cellDetailFor(rowIndex, columnIndex)); +} + +function downloadCellBinaryValue(rowIndex: number, columnIndex: number, mode: BinaryCellDownloadMode) { + void downloadDetailBinaryValue(cellDetailFor(rowIndex, columnIndex), mode); +} + async function downloadDetailBinaryValue(detail: DataGridCellDetail | null, mode: BinaryCellDownloadMode) { if (!detail || !canDownloadDetailBinaryValue(detail)) return; try { @@ -5858,15 +5890,47 @@ const gridContextMenuItems = computed(() => {
@@ -6465,24 +6529,68 @@ const gridContextMenuItems = computed(() => { @keydown.stop="onEditKeydown" />
- + + + + + + + {{ t(`grid.binaryDownload.${mode}`) }} + + + + + @@ -6597,17 +6705,49 @@ const gridContextMenuItems = computed(() => {