diff --git a/package.json b/package.json index 820d1bd8..fd1b89b7 100644 --- a/package.json +++ b/package.json @@ -142,7 +142,6 @@ "electron": "^17.0.1", "electron-builder": "^22.14.11", "electron-devtools-installer": "^3.2.0", - "electron-rebuild": "^3.2.7", "eslint": "^7.32.0", "eslint-config-standard": "^16.0.3", "eslint-plugin-import": "^2.24.2", diff --git a/src/renderer/components/WorkspaceAddConnectionPanel.vue b/src/renderer/components/WorkspaceAddConnectionPanel.vue index d16b2ed9..276f2d48 100644 --- a/src/renderer/components/WorkspaceAddConnectionPanel.vue +++ b/src/renderer/components/WorkspaceAddConnectionPanel.vue @@ -45,19 +45,6 @@ > -
-
- -
-
- -
-
@@ -74,6 +61,19 @@
+
+
+ +
+
+ +
+
diff --git a/src/renderer/components/WorkspaceEditConnectionPanel.vue b/src/renderer/components/WorkspaceEditConnectionPanel.vue index 4cd04512..ec413f43 100644 --- a/src/renderer/components/WorkspaceEditConnectionPanel.vue +++ b/src/renderer/components/WorkspaceEditConnectionPanel.vue @@ -45,19 +45,6 @@ >
-
-
- -
-
- -
-
@@ -74,6 +61,19 @@
+
+
+ +
+
+ +
+
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js index 1ee3b26b..8b24be5b 100644 --- a/src/renderer/i18n/en-US.js +++ b/src/renderer/i18n/en-US.js @@ -127,7 +127,7 @@ module.exports = { disable: 'Disable', commit: 'Commit', rollback: 'Rollback', - connectionString: 'Conn String' + connectionString: 'Connection string' }, message: { appWelcome: 'Welcome to Antares SQL Client!', diff --git a/src/renderer/ipc-api/Connection.js b/src/renderer/ipc-api/Connection.js index c6dad0f9..12f1ccce 100644 --- a/src/renderer/ipc-api/Connection.js +++ b/src/renderer/ipc-api/Connection.js @@ -4,22 +4,21 @@ import { ipcRenderer } from 'electron'; import connStringConstruct from '../libs/connStringDecode'; export default class { - static makeTest(params) { + static makeTest (params) { params = connStringConstruct(params); return ipcRenderer.invoke('test-connection', params); } - static checkConnection(params) { - params = connStringConstruct(params); - return ipcRenderer.invoke('check-connection', params); - } - - static connect(params) { + static connect (params) { params = connStringConstruct(params); return ipcRenderer.invoke('connect', params); } - static disconnect(uid) { + static checkConnection (uid) { + return ipcRenderer.invoke('check-connection', uid); + } + + static disconnect (uid) { return ipcRenderer.invoke('disconnect', uid); } } diff --git a/src/renderer/libs/connStringDecode.js b/src/renderer/libs/connStringDecode.js index a270f1cf..fb9b169d 100644 --- a/src/renderer/libs/connStringDecode.js +++ b/src/renderer/libs/connStringDecode.js @@ -68,8 +68,6 @@ const onlineConnectionString = (stringArgs, args) => { const port = defaultPort; - console.log(userName, password, host, dbName, port); - const client = args.client ? args.client : scheme; args.client = client;