diff --git a/shield-plugin-postgres/static/er.js b/shield-plugin-postgres/static/er.js index 3001813..168c992 100644 --- a/shield-plugin-postgres/static/er.js +++ b/shield-plugin-postgres/static/er.js @@ -180,23 +180,79 @@ if (erData) { fitToView(); applySvgTransform(); collabSendViewport(); } }; - window.exportERSvg = function() { + // Build a standalone, content-fitted SVG string shared by all export formats + function buildExportSvg() { const svg = document.querySelector('#erCanvas svg'); - if (!svg) return; + if (!svg) return null; + const bb = getContentBounds(); + if (bb.w === 0 || bb.h === 0) return null; const clone = svg.cloneNode(true); const g = clone.querySelector('g'); if (g) g.removeAttribute('transform'); - const bb = getContentBounds(); const p = 30; clone.setAttribute('viewBox', (bb.x-p)+' '+(bb.y-p)+' '+(bb.w+p*2)+' '+(bb.h+p*2)); clone.setAttribute('width', bb.w + p * 2); clone.setAttribute('height', bb.h + p * 2); clone.setAttribute('xmlns', 'http://www.w3.org/2000/svg'); - const blob = new Blob([clone.outerHTML], { type: 'image/svg+xml' }); + clone.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); + return { svgString: clone.outerHTML, bb: bb, padding: p }; + } + + function triggerDownload(blob, filename) { const url = URL.createObjectURL(blob); const a = document.createElement('a'); - a.href = url; a.download = 'er-diagram.svg'; a.click(); - URL.revokeObjectURL(url); + a.href = url; + a.download = filename; + a.click(); + setTimeout(() => URL.revokeObjectURL(url), 0); + } + + window.exportERSvg = function() { + const built = buildExportSvg(); + if (!built) { showToast('Nothing to export', 'warning'); return; } + triggerDownload(new Blob([built.svgString], { type: 'image/svg+xml;charset=utf-8' }), 'er-diagram.svg'); + showToast('SVG exported', 'success'); + }; + + // Rasterize the diagram to PNG (transparent) or JPG (white background) + window.exportERImage = function(format) { + const built = buildExportSvg(); + if (!built) { showToast('Nothing to export', 'warning'); return; } + + const SCALE = 2; // retina-sharp bitmap + const w = (built.bb.w + built.padding * 2) * SCALE; + const h = (built.bb.h + built.padding * 2) * SCALE; + + const url = URL.createObjectURL(new Blob([built.svgString], { type: 'image/svg+xml;charset=utf-8' })); + const img = new Image(); + + img.onload = function() { + const canvas = document.createElement('canvas'); + canvas.width = Math.ceil(w); + canvas.height = Math.ceil(h); + const ctx = canvas.getContext('2d'); + if (format === 'jpg') { + ctx.fillStyle = '#ffffff'; // JPG has no alpha — force a white backdrop + ctx.fillRect(0, 0, canvas.width, canvas.height); + } + ctx.drawImage(img, 0, 0, canvas.width, canvas.height); + URL.revokeObjectURL(url); + + const mime = format === 'jpg' ? 'image/jpeg' : 'image/png'; + const quality = format === 'jpg' ? 0.92 : undefined; // ignored for PNG + canvas.toBlob(function(blob) { + if (!blob) { showToast('Export failed', 'error'); return; } + triggerDownload(blob, 'er-diagram.' + format); + showToast((format === 'jpg' ? 'JPG' : 'PNG') + ' exported', 'success'); + }, mime, quality); + }; + + img.onerror = function() { + URL.revokeObjectURL(url); + showToast('Failed to render diagram', 'error'); + }; + + img.src = url; }; // ════════════════════════════════════════════ diff --git a/shield-plugin-postgres/static/index.html b/shield-plugin-postgres/static/index.html index c516cfc..5ea231a 100644 --- a/shield-plugin-postgres/static/index.html +++ b/shield-plugin-postgres/static/index.html @@ -637,7 +637,7 @@ - + @@ -1988,6 +1988,7 @@

${esc(schema)}.${esc(table)}

function showExportMenu(schema, table, btn) { closeExportMenu(); + closeERExportMenu(); // keep the two dropdowns mutually exclusive const menu = document.createElement('div'); menu.className = 'export-dropdown'; menu.id = 'exportDropdown'; @@ -2015,6 +2016,38 @@

${esc(schema)}.${esc(table)}

if (m) m.remove(); } +// ER diagram image export (SVG / PNG / JPG) — see exportERSvg/exportERImage in er.js +function showERExportMenu(btn) { + closeExportMenu(); // keep the two dropdowns mutually exclusive + if (document.getElementById('erExportDropdown')) { closeERExportMenu(); return; } + const menu = document.createElement('div'); + menu.className = 'export-dropdown'; + menu.id = 'erExportDropdown'; + menu.innerHTML = ` +
+ ▦ SVG (vector) +
+
+ ▣ PNG (2x, transparent) +
+
+ ▢ JPG (2x, white) +
+ `; + const rect = btn.getBoundingClientRect(); + menu.style.position = 'fixed'; + menu.style.top = (rect.bottom + 2) + 'px'; + menu.style.left = rect.left + 'px'; + menu.style.zIndex = '9999'; + document.body.appendChild(menu); + setTimeout(() => document.addEventListener('click', closeERExportMenu, {once: true}), 0); +} + +function closeERExportMenu() { + const m = document.getElementById('erExportDropdown'); + if (m) m.remove(); +} + // ══════════════════════════════════════════════ // Modal System // ══════════════════════════════════════════════ diff --git a/shield-plugin-postgres/vscode-extension/CHANGELOG.md b/shield-plugin-postgres/vscode-extension/CHANGELOG.md index a95f47d..187c382 100644 --- a/shield-plugin-postgres/vscode-extension/CHANGELOG.md +++ b/shield-plugin-postgres/vscode-extension/CHANGELOG.md @@ -6,4 +6,14 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how ## [Unreleased] +## [0.1.2] - 2026-10-10 + +### Added + +- ER Diagram: PNG and JPG export. The toolbar `SVG` button is now an `Export` + dropdown offering SVG (vector), PNG (2x, transparent background) and + JPG (2x, white background). + +## [0.1.1] + - Initial release \ No newline at end of file diff --git a/shield-plugin-postgres/vscode-extension/README.md b/shield-plugin-postgres/vscode-extension/README.md index c1901cd..0661077 100644 --- a/shield-plugin-postgres/vscode-extension/README.md +++ b/shield-plugin-postgres/vscode-extension/README.md @@ -9,7 +9,7 @@ Shield CLI – PostgreSQL Web Client with ER Diagram and Collaboration Features - 💻 Execute SQL queries with syntax-aware results - 🎨 Visual table/column/index management (create, drop) - ✏️ Insert, edit, delete rows via Web UI -- 📊 **Interactive ER Diagram** — visual schema explorer with drag-and-drop FK management +- 📊 **Interactive ER Diagram** — visual schema explorer with drag-and-drop FK management; export to SVG, PNG, or JPG - 🔒 Read-only mode with frontend + backend enforcement - 📤 CSV export, cell copy, column sorting - 🔌 Connection management (add, edit, remove connections) @@ -86,6 +86,10 @@ npm test ## 📖 Release Notes +### Version 0.1.2 + +- ✅ PNG and JPG export for the ER Diagram (`Export` dropdown in the ER toolbar) + ### Version 0.0.1 (Initial Release) - ✅ Core PostgreSQL Web Client functionality diff --git a/shield-plugin-postgres/vscode-extension/package-lock.json b/shield-plugin-postgres/vscode-extension/package-lock.json index 0d0cfb0..0a9408e 100644 --- a/shield-plugin-postgres/vscode-extension/package-lock.json +++ b/shield-plugin-postgres/vscode-extension/package-lock.json @@ -1,12 +1,12 @@ { "name": "shield-postgresql", - "version": "0.0.1", + "version": "0.1.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "shield-postgresql", - "version": "0.0.1", + "version": "0.1.2", "devDependencies": { "@types/mocha": "^10.0.10", "@types/node": "22.x", diff --git a/shield-plugin-postgres/vscode-extension/package.json b/shield-plugin-postgres/vscode-extension/package.json index bb5f6b0..6d04cc1 100644 --- a/shield-plugin-postgres/vscode-extension/package.json +++ b/shield-plugin-postgres/vscode-extension/package.json @@ -2,7 +2,7 @@ "name": "shield-postgresql", "displayName": "Shield CLI PostgreSQL", "description": "Shield CLI – PostgreSQL Web Client with ER Diagram and Collaboration Features for VS Code", - "version": "0.1.1", + "version": "0.1.2", "publisher": "ShieldCLI", "engines": { "vscode": "^1.107.0" diff --git a/shield-plugin-postgres/vscode-extension/shield-postgresql-0.0.1.vsix b/shield-plugin-postgres/vscode-extension/shield-postgresql-0.1.2.vsix similarity index 59% rename from shield-plugin-postgres/vscode-extension/shield-postgresql-0.0.1.vsix rename to shield-plugin-postgres/vscode-extension/shield-postgresql-0.1.2.vsix index f239e2e..07633ea 100644 Binary files a/shield-plugin-postgres/vscode-extension/shield-postgresql-0.0.1.vsix and b/shield-plugin-postgres/vscode-extension/shield-postgresql-0.1.2.vsix differ