From a00f87582d7aef48d4e2d6017198686f581eb5e8 Mon Sep 17 00:00:00 2001 From: Syngnat Date: Wed, 4 Feb 2026 12:23:41 +0800 Subject: [PATCH] =?UTF-8?q?=20=F0=9F=90=9B=20fix(table):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=99=9A=E6=8B=9F=E8=A1=A8=E5=85=A8=E9=80=89=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=E5=B9=B6=E5=AE=8C=E5=96=84=E5=AF=BC=E5=87=BA/?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=83=BD=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 表头自定义组件保留 width，virtual 模式下选择列正常显示 - 新增后端 ExportQuery，导出当前页/选中行避免长字段 IPC 截断 - 筛选支持更多操作符并统一 WHERE 生成逻辑 Close #57 Close #56 --- frontend/src/components/DataGrid.tsx | 247 +++++++++++++++++++++++-- frontend/src/components/DataViewer.tsx | 47 +---- frontend/src/utils/sql.ts | 173 +++++++++++++++++ frontend/wailsjs/go/app/App.d.ts | 2 + frontend/wailsjs/go/app/App.js | 4 + internal/app/methods_file.go | 192 ++++++++++--------- 6 files changed, 518 insertions(+), 147 deletions(-) create mode 100644 frontend/src/utils/sql.ts diff --git a/frontend/src/components/DataGrid.tsx b/frontend/src/components/DataGrid.tsx index 7fff8e7..04b1f37 100644 --- a/frontend/src/components/DataGrid.tsx +++ b/frontend/src/components/DataGrid.tsx @@ -3,10 +3,11 @@ import { Table, message, Input, Button, Dropdown, MenuProps, Form, Pagination, S import type { SortOrder } from 'antd/es/table/interface'; import { ReloadOutlined, ImportOutlined, ExportOutlined, DownOutlined, PlusOutlined, DeleteOutlined, SaveOutlined, UndoOutlined, FilterOutlined, CloseOutlined, ConsoleSqlOutlined, FileTextOutlined, CopyOutlined, ClearOutlined, EditOutlined } from '@ant-design/icons'; import Editor from '@monaco-editor/react'; -import { ImportData, ExportTable, ExportData, ApplyChanges } from '../../wailsjs/go/app/App'; +import { ImportData, ExportTable, ExportData, ExportQuery, ApplyChanges } from '../../wailsjs/go/app/App'; import { useStore } from '../store'; import { v4 as uuidv4 } from 'uuid'; import 'react-resizable/css/styles.css'; +import { buildWhereSQL, escapeLiteral, quoteIdentPart, quoteQualifiedIdent } from '../utils/sql'; // 内部行标识字段：避免与真实业务字段（如 `key` 列）冲突。 export const GONAVI_ROW_KEY = '__gonavi_row_key__'; @@ -56,12 +57,19 @@ const looksLikeJsonText = (text: string): boolean => { const ResizableTitle = (props: any) => { const { onResizeStart, width, ...restProps } = props; + const nextStyle = { ...(restProps.style || {}) } as React.CSSProperties; + if (width) { + nextStyle.width = width; + } + + // 注意：virtual table 模式下，rc-table 会依赖 header cell 的 width 样式来渲染选择列。 + // 若这里丢失 width，可能导致左上角“全选”checkbox 不显示。 if (!width || typeof onResizeStart !== 'function') { - return ; + return ; } return ( - + {restProps.children} = ({ const [deletedRowKeys, setDeletedRowKeys] = useState>(new Set()); // Filter State - const [filterConditions, setFilterConditions] = useState<{ id: number, column: string, op: string, value: string }[]>([]); + const [filterConditions, setFilterConditions] = useState<{ id: number, column: string, op: string, value: string, value2?: string }[]>([]); const [nextFilterId, setNextFilterId] = useState(1); const selectedRowKeysRef = useRef(selectedRowKeys); @@ -866,11 +874,98 @@ const DataGrid: React.FC = ({ copyToClipboard(lines.join('\n')); }, [getTargets, copyToClipboard]); + const buildConnConfig = useCallback(() => { + if (!connectionId) return null; + const conn = connections.find(c => c.id === connectionId); + if (!conn) return null; + return { + ...conn.config, + port: Number(conn.config.port), + password: conn.config.password || "", + database: conn.config.database || "", + useSSH: conn.config.useSSH || false, + ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" } + }; + }, [connections, connectionId]); + + const exportByQuery = useCallback(async (sql: string, format: string, defaultName: string) => { + const config = buildConnConfig(); + if (!config) return; + const hide = message.loading(`正在导出...`, 0); + const res = await ExportQuery(config as any, dbName || '', sql, defaultName || 'export', format); + hide(); + if (res.success) { + message.success("导出成功"); + } else if (res.message !== "Cancelled") { + message.error("导出失败: " + res.message); + } + }, [buildConnConfig, dbName]); + + const buildPkWhereSql = useCallback((rows: any[], dbType: string) => { + if (!tableName || pkColumns.length === 0) return ''; + const targets = (rows || []).filter(Boolean); + if (targets.length === 0) return ''; + + const clauses: string[] = []; + for (const r of targets) { + const andParts: string[] = []; + for (const pk of pkColumns) { + const col = quoteIdentPart(dbType, pk); + const v = r?.[pk]; + if (v === null || v === undefined) return ''; + andParts.push(`${col} = '${escapeLiteral(String(v))}'`); + } + if (andParts.length === pkColumns.length) { + clauses.push(`(${andParts.join(' AND ')})`); + } + } + if (clauses.length === 0) return ''; + return clauses.join(' OR '); + }, [pkColumns, tableName]); + + const buildCurrentPageSql = useCallback((dbType: string) => { + if (!tableName || !pagination) return ''; + const whereSQL = buildWhereSQL(dbType, filterConditions); + let sql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`; + if (sortInfo && sortInfo.order) { + sql += ` ORDER BY ${quoteIdentPart(dbType, sortInfo.columnKey)} ${sortInfo.order === 'ascend' ? 'ASC' : 'DESC'}`; + } + const offset = (pagination.current - 1) * pagination.pageSize; + sql += ` LIMIT ${pagination.pageSize} OFFSET ${offset}`; + return sql; + }, [tableName, pagination, filterConditions, sortInfo]); + // Context Menu Export const handleExportSelected = useCallback(async (format: string, record: any) => { const records = getTargets(record); - await exportData(records, format); - }, [getTargets]); + if (!connectionId || !tableName) { + await exportData(records, format); + return; + } + + // 有未提交修改时，优先按界面数据导出，避免与数据库不一致。 + if (hasChanges) { + message.warning("当前存在未提交修改，导出将按界面数据生成；如需完整长字段建议先提交后再导出。"); + await exportData(records, format); + return; + } + + const config = buildConnConfig(); + if (!config) { + await exportData(records, format); + return; + } + + const dbType = config.type || ''; + const pkWhere = buildPkWhereSql(records, dbType); + if (!pkWhere) { + await exportData(records, format); + return; + } + + const sql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} WHERE ${pkWhere}`; + await exportByQuery(sql, format, tableName || 'export'); + }, [getTargets, connectionId, tableName, hasChanges, exportData, buildConnConfig, buildPkWhereSql, exportByQuery]); // Export const handleExport = async (format: string) => { @@ -879,7 +974,7 @@ const DataGrid: React.FC = ({ // 1. Export Selected if (selectedRowKeys.length > 0) { const selectedRows = displayData.filter(d => selectedRowKeys.includes(d?.[GONAVI_ROW_KEY])); - await exportData(selectedRows, format); + await handleExportSelected(format, selectedRows[0]); return; } @@ -888,9 +983,8 @@ const DataGrid: React.FC = ({ let instance: any; const handleAll = async () => { instance.destroy(); - const conn = connections.find(c => c.id === connectionId); - if (!conn) return; - const config = { ...conn.config, port: Number(conn.config.port), password: conn.config.password || "", database: conn.config.database || "", useSSH: conn.config.useSSH || false, ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" } }; + const config = buildConnConfig(); + if (!config) return; const hide = message.loading(`正在导出全部数据...`, 0); const res = await ExportTable(config as any, dbName || '', tableName, format); hide(); @@ -898,7 +992,25 @@ const DataGrid: React.FC = ({ }; const handlePage = async () => { instance.destroy(); - await exportData(displayData, format); + if (hasChanges) { + message.warning("当前存在未提交修改，导出将按界面数据生成；如需完整长字段建议先提交后再导出。"); + await exportData(displayData, format); + return; + } + + const config = buildConnConfig(); + if (!config) { + await exportData(displayData, format); + return; + } + + const sql = buildCurrentPageSql(config.type || ''); + if (!sql) { + await exportData(displayData, format); + return; + } + + await exportByQuery(sql, format, tableName || 'export'); }; instance = modal.info({ @@ -921,21 +1033,64 @@ const DataGrid: React.FC = ({ const handleImport = async () => { if (!connectionId || !tableName) return; - const conn = connections.find(c => c.id === connectionId); - if (!conn) return; - const config = { ...conn.config, port: Number(conn.config.port), password: conn.config.password || "", database: conn.config.database || "", useSSH: conn.config.useSSH || false, ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" } }; + const config = buildConnConfig(); + if (!config) return; const res = await ImportData(config as any, dbName || '', tableName); if (res.success) { message.success(res.message); if (onReload) onReload(); } else if (res.message !== "Cancelled") { message.error("Import Failed: " + res.message); } }; // Filters + const filterOpOptions = useMemo(() => ([ + { value: '=', label: '=' }, + { value: '!=', label: '!=' }, + { value: '<', label: '<' }, + { value: '<=', label: '<=' }, + { value: '>', label: '>' }, + { value: '>=', label: '>=' }, + { value: 'CONTAINS', label: '包含' }, + { value: 'NOT_CONTAINS', label: '不包含' }, + { value: 'STARTS_WITH', label: '开始以' }, + { value: 'NOT_STARTS_WITH', label: '不是开始于' }, + { value: 'ENDS_WITH', label: '结束以' }, + { value: 'NOT_ENDS_WITH', label: '不是结束于' }, + { value: 'IS_NULL', label: '是 null' }, + { value: 'IS_NOT_NULL', label: '不是 null' }, + { value: 'IS_EMPTY', label: '是空的' }, + { value: 'IS_NOT_EMPTY', label: '不是空的' }, + { value: 'BETWEEN', label: '介于' }, + { value: 'NOT_BETWEEN', label: '不介于' }, + { value: 'IN', label: '在列表' }, + { value: 'NOT_IN', label: '不在列表' }, + { value: 'CUSTOM', label: '[自定义]' }, + ]), []); + + const isNoValueOp = useCallback((op: string) => ( + op === 'IS_NULL' || op === 'IS_NOT_NULL' || op === 'IS_EMPTY' || op === 'IS_NOT_EMPTY' + ), []); + const isBetweenOp = useCallback((op: string) => op === 'BETWEEN' || op === 'NOT_BETWEEN', []); + const isListOp = useCallback((op: string) => op === 'IN' || op === 'NOT_IN', []); + const addFilter = () => { - setFilterConditions([...filterConditions, { id: nextFilterId, column: columnNames[0] || '', op: '=', value: '' }]); + setFilterConditions([...filterConditions, { id: nextFilterId, column: columnNames[0] || '', op: '=', value: '', value2: '' }]); setNextFilterId(nextFilterId + 1); }; const updateFilter = (id: number, field: string, val: string) => { - setFilterConditions(prev => prev.map(c => c.id === id ? { ...c, [field]: val } : c)); + setFilterConditions(prev => prev.map(c => { + if (c.id !== id) return c; + const next: any = { ...c, [field]: val }; + if (field === 'op') { + if (isNoValueOp(val)) { + next.value = ''; + next.value2 = ''; + } else if (isBetweenOp(val)) { + if (typeof next.value2 !== 'string') next.value2 = ''; + } else { + next.value2 = ''; + } + } + return next; + })); }; const removeFilter = (id: number) => { setFilterConditions(prev => prev.filter(c => c.id !== id)); @@ -1012,10 +1167,62 @@ const DataGrid: React.FC = ({ {showFilter && (
{filterConditions.map(cond => ( -
- updateFilter(cond.id, 'op', v)} options={[{ value: '=', label: '=' }, { value: 'LIKE', label: '包含' }]} /> - updateFilter(cond.id, 'value', e.target.value)} /> +
+ updateFilter(cond.id, 'op', v)} + options={filterOpOptions as any} + /> + + {cond.op === 'CUSTOM' ? ( + updateFilter(cond.id, 'value', e.target.value)} + placeholder="输入自定义 WHERE 表达式（不需要再写 WHERE），例如：status IN ('A','B')" + /> + ) : isListOp(cond.op) ? ( + updateFilter(cond.id, 'value', e.target.value)} + placeholder="多个值用逗号或换行分隔" + /> + ) : isBetweenOp(cond.op) ? ( + <> + updateFilter(cond.id, 'value', e.target.value)} + placeholder="开始值" + /> + updateFilter(cond.id, 'value2', e.target.value)} + placeholder="结束值" + /> + + ) : isNoValueOp(cond.op) ? ( + + ) : ( + updateFilter(cond.id, 'value', e.target.value)} + /> + )} +
))} diff --git a/frontend/src/components/DataViewer.tsx b/frontend/src/components/DataViewer.tsx index 33a5a56..41601ab 100644 --- a/frontend/src/components/DataViewer.tsx +++ b/frontend/src/components/DataViewer.tsx @@ -4,6 +4,7 @@ import { TabData, ColumnDefinition } from '../types'; import { useStore } from '../store'; import { DBQuery, DBGetColumns } from '../../wailsjs/go/app/App'; import DataGrid, { GONAVI_ROW_KEY } from './DataGrid'; +import { buildWhereSQL, quoteIdentPart, quoteQualifiedIdent } from '../utils/sql'; const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => { const [data, setData] = useState([]); @@ -55,54 +56,18 @@ const DataViewer: React.FC<{ tab: TabData }> = ({ tab }) => { ssh: conn.config.ssh || { host: "", port: 22, user: "", password: "", keyPath: "" } }; - const normalizeIdentPart = (ident: string) => { - let raw = (ident || '').trim(); - if (!raw) return raw; - const first = raw[0]; - const last = raw[raw.length - 1]; - if ((first === '"' && last === '"') || (first === '`' && last === '`')) { - raw = raw.slice(1, -1).trim(); - } - // 防御：如果传入已包含引号（例如 `"schema"."table"` 的拆分结果），移除残留引号再重新安全转义。 - raw = raw.replace(/["`]/g, '').trim(); - return raw; - }; - - const quoteIdentPart = (ident: string) => { - const raw = normalizeIdentPart(ident); - if (!raw) return raw; - if (config.type === 'mysql') return `\`${raw.replace(/`/g, '``')}\``; - return `"${raw.replace(/"/g, '""')}"`; - }; - const quoteQualifiedIdent = (ident: string) => { - const raw = (ident || '').trim(); - if (!raw) return raw; - const parts = raw.split('.').map(normalizeIdentPart).filter(Boolean); - if (parts.length <= 1) return quoteIdentPart(raw); - return parts.map(quoteIdentPart).join('.'); - }; - const escapeLiteral = (val: string) => val.replace(/'/g, "''"); + const dbType = config.type || ''; const dbName = tab.dbName || ''; const tableName = tab.tableName || ''; - const whereParts: string[] = []; - filterConditions.forEach(cond => { - if (cond.column && cond.value) { - if (cond.op === 'LIKE') { - whereParts.push(`${quoteIdentPart(cond.column)} LIKE '%${escapeLiteral(cond.value)}%'`); - } else { - whereParts.push(`${quoteIdentPart(cond.column)} ${cond.op} '${escapeLiteral(cond.value)}'`); - } - } - }); - const whereSQL = whereParts.length > 0 ? `WHERE ${whereParts.join(' AND ')}` : ""; + const whereSQL = buildWhereSQL(dbType, filterConditions); - const countSql = `SELECT COUNT(*) as total FROM ${quoteQualifiedIdent(tableName)} ${whereSQL}`; + const countSql = `SELECT COUNT(*) as total FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`; - let sql = `SELECT * FROM ${quoteQualifiedIdent(tableName)} ${whereSQL}`; + let sql = `SELECT * FROM ${quoteQualifiedIdent(dbType, tableName)} ${whereSQL}`; if (sortInfo && sortInfo.order) { - sql += ` ORDER BY ${quoteIdentPart(sortInfo.columnKey)} ${sortInfo.order === 'ascend' ? 'ASC' : 'DESC'}`; + sql += ` ORDER BY ${quoteIdentPart(dbType, sortInfo.columnKey)} ${sortInfo.order === 'ascend' ? 'ASC' : 'DESC'}`; } const offset = (page - 1) * size; // 大表性能：打开表不阻塞在 COUNT(*)，先通过多取 1 条判断是否还有下一页；总数在后台统计并异步回填。 diff --git a/frontend/src/utils/sql.ts b/frontend/src/utils/sql.ts new file mode 100644 index 0000000..fc458dd --- /dev/null +++ b/frontend/src/utils/sql.ts @@ -0,0 +1,173 @@ +export type FilterCondition = { + id?: number; + column?: string; + op?: string; + value?: string; + value2?: string; +}; + +const normalizeIdentPart = (ident: string) => { + let raw = (ident || '').trim(); + if (!raw) return raw; + const first = raw[0]; + const last = raw[raw.length - 1]; + if ((first === '"' && last === '"') || (first === '`' && last === '`')) { + raw = raw.slice(1, -1).trim(); + } + raw = raw.replace(/["`]/g, '').trim(); + return raw; +}; + +export const quoteIdentPart = (dbType: string, ident: string) => { + const raw = normalizeIdentPart(ident); + if (!raw) return raw; + if ((dbType || '').toLowerCase() === 'mysql') return `\`${raw.replace(/`/g, '``')}\``; + return `"${raw.replace(/"/g, '""')}"`; +}; + +export const quoteQualifiedIdent = (dbType: string, ident: string) => { + const raw = (ident || '').trim(); + if (!raw) return raw; + const parts = raw.split('.').map(normalizeIdentPart).filter(Boolean); + if (parts.length <= 1) return quoteIdentPart(dbType, raw); + return parts.map(p => quoteIdentPart(dbType, p)).join('.'); +}; + +export const escapeLiteral = (val: string) => (val || '').replace(/'/g, "''"); + +export const parseListValues = (val: string) => { + const raw = (val || '').trim(); + if (!raw) return []; + return raw + .split(/[\n,，]+/) + .map(s => s.trim()) + .filter(Boolean); +}; + +export const buildWhereSQL = (dbType: string, conditions: FilterCondition[]) => { + const whereParts: string[] = []; + + (conditions || []).forEach((cond) => { + const op = (cond?.op || '').trim(); + const column = (cond?.column || '').trim(); + const value = (cond?.value ?? '').toString(); + const value2 = (cond?.value2 ?? '').toString(); + + if (op === 'CUSTOM') { + const expr = value.trim(); + if (expr) whereParts.push(`(${expr})`); + return; + } + + if (!column) return; + + const col = quoteIdentPart(dbType, column); + + switch (op) { + case 'IS_NULL': + whereParts.push(`${col} IS NULL`); + return; + case 'IS_NOT_NULL': + whereParts.push(`${col} IS NOT NULL`); + return; + case 'IS_EMPTY': + // 兼容：空值通常理解为 NULL 或空字符串 + whereParts.push(`(${col} IS NULL OR ${col} = '')`); + return; + case 'IS_NOT_EMPTY': + whereParts.push(`(${col} IS NOT NULL AND ${col} <> '')`); + return; + case 'BETWEEN': { + const v1 = value.trim(); + const v2 = value2.trim(); + if (!v1 || !v2) return; + whereParts.push(`${col} BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`); + return; + } + case 'NOT_BETWEEN': { + const v1 = value.trim(); + const v2 = value2.trim(); + if (!v1 || !v2) return; + whereParts.push(`${col} NOT BETWEEN '${escapeLiteral(v1)}' AND '${escapeLiteral(v2)}'`); + return; + } + case 'IN': { + const items = parseListValues(value); + if (items.length === 0) return; + const list = items.map(v => `'${escapeLiteral(v)}'`).join(', '); + whereParts.push(`${col} IN (${list})`); + return; + } + case 'NOT_IN': { + const items = parseListValues(value); + if (items.length === 0) return; + const list = items.map(v => `'${escapeLiteral(v)}'`).join(', '); + whereParts.push(`${col} NOT IN (${list})`); + return; + } + case 'CONTAINS': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} LIKE '%${escapeLiteral(v)}%'`); + return; + } + case 'NOT_CONTAINS': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} NOT LIKE '%${escapeLiteral(v)}%'`); + return; + } + case 'STARTS_WITH': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} LIKE '${escapeLiteral(v)}%'`); + return; + } + case 'NOT_STARTS_WITH': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} NOT LIKE '${escapeLiteral(v)}%'`); + return; + } + case 'ENDS_WITH': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} LIKE '%${escapeLiteral(v)}'`); + return; + } + case 'NOT_ENDS_WITH': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} NOT LIKE '%${escapeLiteral(v)}'`); + return; + } + case '=': + case '!=': + case '<': + case '<=': + case '>': + case '>=': { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} ${op} '${escapeLiteral(v)}'`); + return; + } + default: { + // 兼容旧值：LIKE + if (op.toUpperCase() === 'LIKE') { + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} LIKE '%${escapeLiteral(v)}%'`); + return; + } + + const v = value.trim(); + if (!v) return; + whereParts.push(`${col} ${op} '${escapeLiteral(v)}'`); + } + } + }); + + return whereParts.length > 0 ? `WHERE ${whereParts.join(' AND ')}` : ''; +}; + diff --git a/frontend/wailsjs/go/app/App.d.ts b/frontend/wailsjs/go/app/App.d.ts index 9d91802..5b59389 100755 --- a/frontend/wailsjs/go/app/App.d.ts +++ b/frontend/wailsjs/go/app/App.d.ts @@ -37,6 +37,8 @@ export function ExportData(arg1:Array>,arg2:Array,ar export function ExportDatabaseSQL(arg1:connection.ConnectionConfig,arg2:string,arg3:boolean):Promise; +export function ExportQuery(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string,arg5:string):Promise; + export function ExportTable(arg1:connection.ConnectionConfig,arg2:string,arg3:string,arg4:string):Promise; export function ExportTablesSQL(arg1:connection.ConnectionConfig,arg2:string,arg3:Array,arg4:boolean):Promise; diff --git a/frontend/wailsjs/go/app/App.js b/frontend/wailsjs/go/app/App.js index cf0859b..2151c65 100755 --- a/frontend/wailsjs/go/app/App.js +++ b/frontend/wailsjs/go/app/App.js @@ -70,6 +70,10 @@ export function ExportDatabaseSQL(arg1, arg2, arg3) { return window['go']['app']['App']['ExportDatabaseSQL'](arg1, arg2, arg3); } +export function ExportQuery(arg1, arg2, arg3, arg4, arg5) { + return window['go']['app']['App']['ExportQuery'](arg1, arg2, arg3, arg4, arg5); +} + export function ExportTable(arg1, arg2, arg3, arg4) { return window['go']['app']['App']['ExportTable'](arg1, arg2, arg3, arg4); } diff --git a/internal/app/methods_file.go b/internal/app/methods_file.go index 7654799..4dadb54 100644 --- a/internal/app/methods_file.go +++ b/internal/app/methods_file.go @@ -260,70 +260,8 @@ data, columns, err := dbInst.Query(query) return connection.QueryResult{Success: false, Message: err.Error()} } defer f.Close() - - var csvWriter *csv.Writer - var jsonEncoder *json.Encoder - var isJsonFirstRow = true - - switch format { - case "csv", "xlsx": - f.Write([]byte{0xEF, 0xBB, 0xBF}) - csvWriter = csv.NewWriter(f) - defer csvWriter.Flush() - if err := csvWriter.Write(columns); err != nil { - return connection.QueryResult{Success: false, Message: err.Error()} - } - case "json": - f.WriteString("[\n") - jsonEncoder = json.NewEncoder(f) - jsonEncoder.SetIndent(" ", " ") - case "md": - fmt.Fprintf(f, "| %s |\n", strings.Join(columns, " | ")) - seps := make([]string, len(columns)) - for i := range seps { - seps[i] = "---" - } - fmt.Fprintf(f, "| %s |\n", strings.Join(seps, " | ")) - default: - return connection.QueryResult{Success: false, Message: "Unsupported format: " + format} - } - - for _, rowMap := range data { - record := make([]string, len(columns)) - for i, col := range columns { - val := rowMap[col] - if val == nil { - record[i] = "NULL" - } else { - s := fmt.Sprintf("%v", val) - if format == "md" { - s = strings.ReplaceAll(s, "|", "\\|") - s = strings.ReplaceAll(s, "\n", "
") - } - record[i] = s - } - } - - switch format { - case "csv", "xlsx": - if err := csvWriter.Write(record); err != nil { - return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} - } - case "json": - if !isJsonFirstRow { - f.WriteString(",\n") - } - if err := jsonEncoder.Encode(rowMap); err != nil { - return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} - } - isJsonFirstRow = false - case "md": - fmt.Fprintf(f, "| %s |\n", strings.Join(record, " | ")) - } - } - - if format == "json" { - f.WriteString("\n]") + if err := writeRowsToFile(f, data, columns, format); err != nil { + return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} } return connection.QueryResult{Success: true, Message: "Export successful"} @@ -675,33 +613,101 @@ func (a *App) ExportData(data []map[string]interface{}, columns []string, defaul return connection.QueryResult{Success: false, Message: err.Error()} } defer f.Close() + if err := writeRowsToFile(f, data, columns, format); err != nil { + return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} + } + + return connection.QueryResult{Success: true, Message: "Export successful"} +} + +// ExportQuery exports by executing the provided SELECT query on backend side. +// This avoids frontend IPC payload limits when exporting very large/long-text columns (e.g. base64). +func (a *App) ExportQuery(config connection.ConnectionConfig, dbName string, query string, defaultName string, format string) connection.QueryResult { + query = strings.TrimSpace(query) + if query == "" { + return connection.QueryResult{Success: false, Message: "query required"} + } + + if defaultName == "" { + defaultName = "export" + } + + filename, err := runtime.SaveFileDialog(a.ctx, runtime.SaveDialogOptions{ + Title: "Export Query Result", + DefaultFilename: fmt.Sprintf("%s.%s", defaultName, strings.ToLower(format)), + }) + if err != nil || filename == "" { + return connection.QueryResult{Success: false, Message: "Cancelled"} + } + + runConfig := normalizeRunConfig(config, dbName) + dbInst, err := a.getDatabase(runConfig) + if err != nil { + return connection.QueryResult{Success: false, Message: err.Error()} + } + + query = sanitizeSQLForPgLike(runConfig.Type, query) + lowerQuery := strings.ToLower(strings.TrimSpace(query)) + if !(strings.HasPrefix(lowerQuery, "select") || strings.HasPrefix(lowerQuery, "with")) { + return connection.QueryResult{Success: false, Message: "Only SELECT/WITH queries are supported"} + } + + data, columns, err := dbInst.Query(query) + if err != nil { + return connection.QueryResult{Success: false, Message: err.Error()} + } + + f, err := os.Create(filename) + if err != nil { + return connection.QueryResult{Success: false, Message: err.Error()} + } + defer f.Close() + + if err := writeRowsToFile(f, data, columns, format); err != nil { + return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} + } + + return connection.QueryResult{Success: true, Message: "Export successful"} +} + +func writeRowsToFile(f *os.File, data []map[string]interface{}, columns []string, format string) error { + format = strings.ToLower(strings.TrimSpace(format)) + if f == nil { + return fmt.Errorf("file required") + } - format = strings.ToLower(format) var csvWriter *csv.Writer var jsonEncoder *json.Encoder - var isJsonFirstRow = true + isJsonFirstRow := true switch format { case "csv", "xlsx": - f.Write([]byte{0xEF, 0xBB, 0xBF}) + if _, err := f.Write([]byte{0xEF, 0xBB, 0xBF}); err != nil { + return err + } csvWriter = csv.NewWriter(f) - defer csvWriter.Flush() if err := csvWriter.Write(columns); err != nil { - return connection.QueryResult{Success: false, Message: err.Error()} + return err } case "json": - f.WriteString("[\n") + if _, err := f.WriteString("[\n"); err != nil { + return err + } jsonEncoder = json.NewEncoder(f) jsonEncoder.SetIndent(" ", " ") case "md": - fmt.Fprintf(f, "| %s |\n", strings.Join(columns, " | ")) + if _, err := fmt.Fprintf(f, "| %s |\n", strings.Join(columns, " | ")); err != nil { + return err + } seps := make([]string, len(columns)) for i := range seps { seps[i] = "---" } - fmt.Fprintf(f, "| %s |\n", strings.Join(seps, " | ")) + if _, err := fmt.Fprintf(f, "| %s |\n", strings.Join(seps, " | ")); err != nil { + return err + } default: - return connection.QueryResult{Success: false, Message: "Unsupported format: " + format} + return fmt.Errorf("unsupported format: %s", format) } for _, rowMap := range data { @@ -710,37 +716,51 @@ func (a *App) ExportData(data []map[string]interface{}, columns []string, defaul val := rowMap[col] if val == nil { record[i] = "NULL" - } else { - s := fmt.Sprintf("%v", val) - if format == "md" { - s = strings.ReplaceAll(s, "|", "\\|") - s = strings.ReplaceAll(s, "\n", "
") - } - record[i] = s + continue } + + s := fmt.Sprintf("%v", val) + if format == "md" { + s = strings.ReplaceAll(s, "|", "\\|") + s = strings.ReplaceAll(s, "\n", "
") + } + record[i] = s } switch format { case "csv", "xlsx": if err := csvWriter.Write(record); err != nil { - return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} + return err } case "json": if !isJsonFirstRow { - f.WriteString(",\n") + if _, err := f.WriteString(",\n"); err != nil { + return err + } } if err := jsonEncoder.Encode(rowMap); err != nil { - return connection.QueryResult{Success: false, Message: "Write error: " + err.Error()} + return err } isJsonFirstRow = false case "md": - fmt.Fprintf(f, "| %s |\n", strings.Join(record, " | ")) + if _, err := fmt.Fprintf(f, "| %s |\n", strings.Join(record, " | ")); err != nil { + return err + } + } + } + + if format == "csv" || format == "xlsx" { + csvWriter.Flush() + if err := csvWriter.Error(); err != nil { + return err } } if format == "json" { - f.WriteString("\n]") + if _, err := f.WriteString("\n]"); err != nil { + return err + } } - return connection.QueryResult{Success: true, Message: "Export successful"} + return nil }