From fd6d5177efb6161aab01f9e108eda60df6c7d8c4 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 19 Aug 2020 16:25:42 +0200 Subject: [PATCH] fix: wrong table height calc in some cases --- package.json | 12 ++++++------ src/main/ipc-handlers/connection.js | 6 +++--- src/renderer/components/BaseContextMenu.vue | 2 +- src/renderer/components/WorkspaceQueryTable.vue | 2 +- src/renderer/ipc-api/Connection.js | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a5dec34e..e072c087 100644 --- a/package.json +++ b/package.json @@ -50,17 +50,17 @@ "dependencies": { "@mdi/font": "^5.5.55", "codemirror": "^5.56.0", - "electron-log": "^4.2.2", + "electron-log": "^4.2.4", "electron-updater": "^4.3.4", - "lodash": "^4.17.19", + "lodash": "^4.17.20", "moment": "^2.27.0", "mssql": "^6.2.1", "mysql": "^2.18.1", - "pg": "^8.3.0", + "pg": "^8.3.2", "source-map-support": "^0.5.16", "spectre.css": "^0.5.9", "vue-click-outside": "^1.1.0", - "vue-i18n": "^8.20.0", + "vue-i18n": "^8.21.0", "vue-the-mask": "^0.11.1", "vuedraggable": "^2.24.0", "vuex": "^3.5.1", @@ -69,12 +69,12 @@ "devDependencies": { "babel-eslint": "^10.1.0", "cross-env": "^7.0.2", - "electron": "^9.1.2", + "electron": "^9.2.1", "electron-builder": "^22.8.0", "electron-devtools-installer": "^3.1.1", "electron-webpack": "^2.8.2", "electron-webpack-vue": "^2.4.0", - "eslint": "^7.6.0", + "eslint": "^7.7.0", "eslint-config-standard": "^14.1.1", "eslint-plugin-import": "^2.22.0", "eslint-plugin-node": "^11.1.0", diff --git a/src/main/ipc-handlers/connection.js b/src/main/ipc-handlers/connection.js index e1e7bfd9..f3768342 100644 --- a/src/main/ipc-handlers/connection.js +++ b/src/main/ipc-handlers/connection.js @@ -4,8 +4,8 @@ import { AntaresConnector } from '../libs/AntaresConnector'; import InformationSchema from '../models/InformationSchema'; import Generic from '../models/Generic'; -export default (connections) => { - ipcMain.handle('testConnection', async (event, conn) => { +export default connections => { + ipcMain.handle('test-connection', async (event, conn) => { const Connection = new AntaresConnector({ client: conn.client, params: { @@ -28,7 +28,7 @@ export default (connections) => { } }); - ipcMain.handle('checkConnection', async (event, uid) => { + ipcMain.handle('check-connection', async (event, uid) => { return uid in connections; }); diff --git a/src/renderer/components/BaseContextMenu.vue b/src/renderer/components/BaseContextMenu.vue index 2a958080..0c277d99 100644 --- a/src/renderer/components/BaseContextMenu.vue +++ b/src/renderer/components/BaseContextMenu.vue @@ -46,8 +46,8 @@ export default { justify-content: center; align-items: center; overflow: hidden; - padding: 0.4rem; position: fixed; + height: 100vh; right: 0; top: 0; left: 0; diff --git a/src/renderer/components/WorkspaceQueryTable.vue b/src/renderer/components/WorkspaceQueryTable.vue index f8c618fd..bdf3d8f7 100644 --- a/src/renderer/components/WorkspaceQueryTable.vue +++ b/src/renderer/components/WorkspaceQueryTable.vue @@ -180,7 +180,7 @@ export default { }, resizeResults () { if (this.$refs.resultTable) { - const el = this.$refs.table; + const el = this.$refs.tableWrapper; if (el) { const footer = document.getElementById('footer'); diff --git a/src/renderer/ipc-api/Connection.js b/src/renderer/ipc-api/Connection.js index 6be3c706..9ff0561f 100644 --- a/src/renderer/ipc-api/Connection.js +++ b/src/renderer/ipc-api/Connection.js @@ -3,11 +3,11 @@ import { ipcRenderer } from 'electron'; export default class { static makeTest (params) { - return ipcRenderer.invoke('testConnection', params); + return ipcRenderer.invoke('test-connection', params); } static checkConnection (params) { - return ipcRenderer.invoke('checkConnection', params); + return ipcRenderer.invoke('check-connection', params); } static connect (params) {