mirror of
https://github.com/Fabio286/antares.git
synced 2025-06-05 21:59:22 +02:00
Compare commits
156 Commits
Author | SHA1 | Date | |
---|---|---|---|
fe9817bf31 | |||
ddb7ead083 | |||
9d8c21244b | |||
d934ae1e6c | |||
68f8d48064 | |||
e7e491340a | |||
e8447e5655 | |||
6decba316c | |||
2b5e1e7b39 | |||
a124f04661 | |||
|
3ee4ab4d84 | ||
174aa3c508 | |||
729edd40a6 | |||
c7ab3b77a2 | |||
5624b3b2d7 | |||
4c16d8c61f | |||
|
9aca89477f | ||
0e80e823d0 | |||
ff4bc6c39b | |||
b4e1e9ac26 | |||
f177c7f1f1 | |||
6a67c27915 | |||
374cedba2b | |||
|
de8097c297 | ||
6fa430adf6 | |||
0e7b93c2df | |||
843c15e428 | |||
2982b6cb96 | |||
c08946e932 | |||
55c1604e7f | |||
d64fbbad0f | |||
|
c88d734bc0 | ||
|
99d94ea92c | ||
e4f620c5a1 | |||
99f9a9e188 | |||
|
2236c8fe75 | ||
b9a097e2f5 | |||
|
966446afd6 | ||
|
b681adc632 | ||
15d0158993 | |||
e76d324810 | |||
|
897795ddbb | ||
|
c32f463ea5 | ||
|
25e1ba4384 | ||
|
a71ae05c6f | ||
1bd26ceaa6 | |||
56a0361ed2 | |||
|
c0dd3e0941 | ||
|
33ab5d7491 | ||
72e6a23fd6 | |||
|
fd129a2ad1 | ||
2c63cbc4e8 | |||
c9a33936a0 | |||
a6bdf69a28 | |||
dd971d70e0 | |||
669d7e8d4d | |||
02f204a01d | |||
|
023d7aa92d | ||
4ca40c07d6 | |||
cf5247bf35 | |||
19db29663b | |||
d010d5aa8f | |||
0a1f50a9b9 | |||
e7da5a7040 | |||
2d126d521c | |||
0fca70ebec | |||
36358584fd | |||
672896414e | |||
b06bafe06c | |||
4fe9dfc4d7 | |||
7af178a1e4 | |||
212b2bdba9 | |||
72accb7b0e | |||
321b387083 | |||
ece6c6401d | |||
5a028a4ea2 | |||
83f9b12be0 | |||
1c1403f586 | |||
038cf68253 | |||
3580faebba | |||
ae312efbbc | |||
8e422e3f07 | |||
7d1967a609 | |||
7ff8e2149e | |||
1b5cc315dd | |||
27566c1dfa | |||
03777a2ea3 | |||
d91251d7cb | |||
0827a04d61 | |||
2c8509ff41 | |||
76df6319c2 | |||
e6f6a022d1 | |||
95bb41e9db | |||
7ab84bde57 | |||
d190a2dd61 | |||
d8a298fd20 | |||
369622d5af | |||
a40d722d7c | |||
440f74dfc1 | |||
8621ca5333 | |||
24edc82b1b | |||
0a2124f2c2 | |||
a8521317a5 | |||
88408da745 | |||
d52b7af297 | |||
e4a4696dd3 | |||
f0255c0065 | |||
9991173685 | |||
|
874dc6298b | ||
5b1b8cf4cc | |||
a521274d01 | |||
86e4c1d58f | |||
ba5a1b68ab | |||
2c45bce1ee | |||
|
2e05fa4bdc | ||
dd9c089d27 | |||
e6955550fa | |||
fe39c1d388 | |||
d114f8a651 | |||
84168d1d75 | |||
498a9b48e2 | |||
01f607cd40 | |||
efe134a059 | |||
40cb4dd98d | |||
a142d3c4d7 | |||
89da957a49 | |||
05c2f9836c | |||
ebc325ae0c | |||
39326eb52e | |||
df681147aa | |||
ffc645ba5e | |||
1fb1205319 | |||
c90ab0e880 | |||
9dc700e13e | |||
6950d0ce5a | |||
4df14c3693 | |||
c05be8304f | |||
31c575dad9 | |||
040657d5ca | |||
5043fafa93 | |||
8eb127e458 | |||
d044a02cb7 | |||
8cb2c197c8 | |||
c50d17e82b | |||
|
7c186d2dee | ||
0f219cf9b7 | |||
75c5a34095 | |||
48877534d1 | |||
c22413fde9 | |||
77ab8d8a03 | |||
4fc4ddd1d6 | |||
49b63bc6f2 | |||
44bb75bc60 | |||
8bb5bb93cf | |||
da25823868 | |||
e29d86b409 |
@@ -174,6 +174,25 @@
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "brdtheo",
|
||||
"name": "Théo Billardey",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/48206778?v=4",
|
||||
"profile": "https://codepen.io/theo-billardey",
|
||||
"contributions": [
|
||||
"translation"
|
||||
]
|
||||
},
|
||||
{
|
||||
"login": "dyaskur",
|
||||
"name": "Muhammad Dyas Yaskur",
|
||||
"avatar_url": "https://avatars.githubusercontent.com/u/9539970?v=4",
|
||||
"profile": "http://yaskur.net",
|
||||
"contributions": [
|
||||
"translation",
|
||||
"code"
|
||||
]
|
||||
}
|
||||
],
|
||||
"contributorsPerLine": 7,
|
||||
|
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -11,7 +11,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
os: [macos-latest, ubuntu-latest, windows-latest]
|
||||
os: [macos-11, ubuntu-20.04, windows-latest]
|
||||
|
||||
steps:
|
||||
- name: Check out Git repository
|
||||
|
2
.github/workflows/create-artifact-linux.yml
vendored
2
.github/workflows/create-artifact-linux.yml
vendored
@@ -5,7 +5,7 @@ on:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
runs-on: ubuntu-20.04
|
||||
steps:
|
||||
- name: Check out Git repository
|
||||
uses: actions/checkout@v3
|
||||
|
31
.github/workflows/create-artifact-macos.yml
vendored
Normal file
31
.github/workflows/create-artifact-macos.yml
vendored
Normal file
@@ -0,0 +1,31 @@
|
||||
name: Create artifact [MAC]
|
||||
|
||||
on:
|
||||
workflow_dispatch: {}
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: macos-latest
|
||||
steps:
|
||||
- name: Check out Git repository
|
||||
uses: actions/checkout@v3
|
||||
|
||||
- name: Install Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
node-version: 16
|
||||
|
||||
- name: npm install & build
|
||||
run: |
|
||||
npm install
|
||||
npm run build
|
||||
|
||||
- name: Upload Artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: macos-build
|
||||
retention-days: 3
|
||||
path: |
|
||||
build
|
||||
!build/*-unpacked
|
||||
!build/.icon-ico
|
@@ -1,4 +1,4 @@
|
||||
name: Test end-to-end [LINUX]
|
||||
name: Test end-to-end [WINDOWS]
|
||||
|
||||
on: push
|
||||
|
||||
@@ -8,7 +8,7 @@ jobs:
|
||||
|
||||
strategy:
|
||||
matrix:
|
||||
os: [ubuntu-latest]
|
||||
os: [windows-latest]
|
||||
|
||||
steps:
|
||||
- name: Check out Git repository
|
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"extends": [
|
||||
"stylelint-config-standard"
|
||||
"stylelint-config-standard",
|
||||
"stylelint-config-recommended-vue"
|
||||
],
|
||||
"fix": true,
|
||||
"formatter": "verbose",
|
||||
|
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@@ -5,7 +5,6 @@
|
||||
"name": "Electron: Main",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"port": 9222,
|
||||
"protocol": "inspector",
|
||||
"request": "attach",
|
||||
"sourceMaps": true,
|
||||
"type": "node",
|
||||
@@ -23,7 +22,6 @@
|
||||
"name": "Electron: Worker",
|
||||
"cwd": "${workspaceFolder}",
|
||||
"port": 9224,
|
||||
"protocol": "inspector",
|
||||
"request": "attach",
|
||||
"sourceMaps": true,
|
||||
"type": "node",
|
||||
|
5
.vscode/settings.json
vendored
5
.vscode/settings.json
vendored
@@ -5,9 +5,12 @@
|
||||
"MySQL",
|
||||
"PostgreSQL",
|
||||
"SQLite",
|
||||
"Firebird SQL",
|
||||
"Windows",
|
||||
"translation",
|
||||
"Linux"
|
||||
"Linux",
|
||||
"MacOS",
|
||||
"deps"
|
||||
],
|
||||
"svg.preview.background": "transparent"
|
||||
}
|
181
CHANGELOG.md
181
CHANGELOG.md
@@ -2,6 +2,187 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
### [0.7.4](https://github.com/antares-sql/antares/compare/v0.7.3...v0.7.4) (2023-02-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* tables sort in sidebar ([ddb7ead](https://github.com/antares-sql/antares/commit/ddb7ead0832708713ba4bb2717661b8b93a47e3f))
|
||||
|
||||
### [0.7.3](https://github.com/antares-sql/antares/compare/v0.7.2...v0.7.3) (2023-02-09)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **SQLite:** added support to INTEGER UNSIGNED ([e7e4913](https://github.com/antares-sql/antares/commit/e7e491340a037b64d6d8e538376415779d54332e))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* longtext edit modal opens when it shouldn't, fixes [#524](https://github.com/antares-sql/antares/issues/524) ([6decba3](https://github.com/antares-sql/antares/commit/6decba316ca46106520cb4dba44409ceb4a4af75))
|
||||
* select of table type stuck when editing an unknown type ([e8447e5](https://github.com/antares-sql/antares/commit/e8447e56551871a200517bdaa747ae215ad83cf4))
|
||||
* **SQLite:** error with integer timestamp fields ([2b5e1e7](https://github.com/antares-sql/antares/commit/2b5e1e7b39c25f536b6139a4d01b9f7f17069ea8))
|
||||
* **SQLite:** triggers disappear after editing related table, fixes [#523](https://github.com/antares-sql/antares/issues/523) ([d934ae1](https://github.com/antares-sql/antares/commit/d934ae1e6c0747698b4973d9cad217379076a6cf))
|
||||
|
||||
### [0.7.2](https://github.com/antares-sql/antares/compare/v0.7.1...v0.7.2) (2023-01-22)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* add copy shortcut and default copy type setting ([9aca894](https://github.com/antares-sql/antares/commit/9aca89477f1fd7b7f55f1e5c290d495c46f61d8e))
|
||||
* connection info icons in footer ([ff4bc6c](https://github.com/antares-sql/antares/commit/ff4bc6c39b05a827cebde84466814cf246908208))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* allow comments in queies, fixes [#519](https://github.com/antares-sql/antares/issues/519) ([c7ab3b7](https://github.com/antares-sql/antares/commit/c7ab3b77a22e85cee6fb93064eaad5a8e8ad9fd2))
|
||||
* **SQLite:** exception saving tables without INT fields length ([0e80e82](https://github.com/antares-sql/antares/commit/0e80e823d059dfe24995b5848d88cc84235e6275))
|
||||
* ssh connection closed after idle time, fixes [#425](https://github.com/antares-sql/antares/issues/425) ([6fa430a](https://github.com/antares-sql/antares/commit/6fa430adf68013a9d0a093031f56dd741bdc0299))
|
||||
|
||||
### [0.7.1](https://github.com/antares-sql/antares/compare/v0.7.0...v0.7.1) (2022-12-23)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* Copy rows as html table, so we can paste it to spreadsheet ([c32f463](https://github.com/antares-sql/antares/commit/c32f463ea5ac3f54cba32929f77442f1e0ba934a))
|
||||
* option to disable selected query execution, closes [#477](https://github.com/antares-sql/antares/issues/477) ([1bd26ce](https://github.com/antares-sql/antares/commit/1bd26ceaa68fe66f26c76b3b60fa6eeccea91729))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* bahasa indonesia typos ([897795d](https://github.com/antares-sql/antares/commit/897795ddbb4ade2652b0471f18288b8b3aaf0eb9))
|
||||
* connection default icon not change after client change ([a6bdf69](https://github.com/antares-sql/antares/commit/a6bdf69a281c8614c41274b6dc2f3563aa89c57e))
|
||||
* context submenu outside view when near the edge, fixes [#506](https://github.com/antares-sql/antares/issues/506) ([c08946e](https://github.com/antares-sql/antares/commit/c08946e932884e5f0253df2545f98315ab7e5219))
|
||||
* **i18n:** add missing keys for french translation ([fd129a2](https://github.com/antares-sql/antares/commit/fd129a2ad1c3401372c9172b38f4406254d134df))
|
||||
* **MySQL:** not every connection gets read-only option ([843c15e](https://github.com/antares-sql/antares/commit/843c15e428c4a0412f19a93ab05d2fcbb60da09b))
|
||||
* **UI:** white background dragging connections inside folder on Linux ([dd971d7](https://github.com/antares-sql/antares/commit/dd971d70e04faf0d5b239586b12e4a9a42407433))
|
||||
* white background dragging connections or tabs on Linux, fixes [#486](https://github.com/antares-sql/antares/issues/486) ([669d7e8](https://github.com/antares-sql/antares/commit/669d7e8d4d062ed5bdafe1d5cde8ec51a2f68b26))
|
||||
|
||||
## [0.7.0](https://github.com/antares-sql/antares/compare/v0.6.0...v0.7.0) (2022-11-30)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **UI:** connections customization ([212b2bd](https://github.com/antares-sql/antares/commit/212b2bdba933db1af22967a057d64f41c96b9930))
|
||||
* **UI:** folders customization ([72accb7](https://github.com/antares-sql/antares/commit/72accb7b0e62977dde2c82312aee5b9d025e5182))
|
||||
* **UI:** folders implementation ([ece6c64](https://github.com/antares-sql/antares/commit/ece6c6401def4a9b42280f23efaa038b9ad98de8))
|
||||
* **UI:** footer color based on folder color ([4fe9dfc](https://github.com/antares-sql/antares/commit/4fe9dfc4d7ca19a798b8a8a74d979ab88aebeaac))
|
||||
* **UI:** new settimgbar tooltips ([6728964](https://github.com/antares-sql/antares/commit/672896414e901635c83ca037663e355a31ce013b))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* deletion of connections inside folder ([b06bafe](https://github.com/antares-sql/antares/commit/b06bafe06c060233ebe901979b9fc4455a25cb89))
|
||||
* missing sidebar data after update ([0a1f50a](https://github.com/antares-sql/antares/commit/0a1f50a9b92c9705784b93f14be40a01a78cb0da))
|
||||
* **UI:** folder to folder drag glitches ([0fca70e](https://github.com/antares-sql/antares/commit/0fca70ebec1af3d594db4e1ce159e52e12224850))
|
||||
* **UI:** wrong copnnection icons color with light theme ([d010d5a](https://github.com/antares-sql/antares/commit/d010d5aa8f07a5def1183567ee767fd144696ed3))
|
||||
* wrong position moving elements outside folder ([7af178a](https://github.com/antares-sql/antares/commit/7af178a1e400876e6c45dbe31a198a12d29227a8))
|
||||
|
||||
## [0.6.0](https://github.com/antares-sql/antares/compare/v0.5.19...v0.6.0) (2022-11-18)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **Firebird SQL:** connections pool ([76df631](https://github.com/antares-sql/antares/commit/76df6319c242ea42f93d4e5d811d96ec2c282aa8))
|
||||
* **Firebird SQL:** display table content and query results ([95bb41e](https://github.com/antares-sql/antares/commit/95bb41e9db255a780aae1ae32ce4a53ee3bab20e))
|
||||
* **Firebird SQL:** manual commit mode ([27566c1](https://github.com/antares-sql/antares/commit/27566c1dfae55f72d3f870c50410e5ecda256037))
|
||||
* **Firebird SQL:** procedure add/edit/delete support ([ae312ef](https://github.com/antares-sql/antares/commit/ae312efbbc3a9941380477b9849bdd8edc5b9fbf))
|
||||
* **Firebird SQL:** support to blob fields ([0827a04](https://github.com/antares-sql/antares/commit/0827a04d61af75b4366394e5f0289df461d02c98))
|
||||
* **Firebird SQL:** support to indexes and foreign keys ([2c8509f](https://github.com/antares-sql/antares/commit/2c8509ff4173fbebeff92ab472a37edd3d80a2ac))
|
||||
* **Firebird SQL:** table add/edit/delete support ([1b5cc31](https://github.com/antares-sql/antares/commit/1b5cc315dddca6b753fb6fe6e196e29441ffed79))
|
||||
* **Firebird SQL:** trigger add/edit/delete support ([8e422e3](https://github.com/antares-sql/antares/commit/8e422e3f07323f388523621a05f0403a87f19e47))
|
||||
* **Firebird SQL:** view add/edit/delete support ([7d1967a](https://github.com/antares-sql/antares/commit/7d1967a60977b2ce1095a37b7135f429a83f163d))
|
||||
* support to text blob fields ([e6f6a02](https://github.com/antares-sql/antares/commit/e6f6a022d1a5bbc3f5303f635a2115813601c61a))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **Firebird SQL:** connection pool issue ([7ff8e21](https://github.com/antares-sql/antares/commit/7ff8e2149ef911a235b4a1dcc329775af1d2a72b))
|
||||
* incomplete list of collations, fixes [#478](https://github.com/antares-sql/antares/issues/478) ([1c1403f](https://github.com/antares-sql/antares/commit/1c1403f58641f7b5f8a7c29fc430673ffa88f969))
|
||||
* loss of precision updating BIGINT values, fixes [#467](https://github.com/antares-sql/antares/issues/467) ([d190a2d](https://github.com/antares-sql/antares/commit/d190a2dd61040d1748dfb97403f9d56015d938fe))
|
||||
|
||||
### [0.5.19](https://github.com/antares-sql/antares/compare/v0.5.18...v0.5.19) (2022-10-22)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* context menu option to fill cell with random values ([0a2124f](https://github.com/antares-sql/antares/commit/0a2124f2c2bdadc7c753db11d1e29f8acb9ddcac))
|
||||
* uuid fill for string cells ([24edc82](https://github.com/antares-sql/antares/commit/24edc82b1be7299a09df18611b2a0ba361a6b46f))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* app stuck inserting a random value if field length high ([440f74d](https://github.com/antares-sql/antares/commit/440f74dfc1f4942ba585b9bdae7517fe6ab04a81))
|
||||
* error joining tables with different schema ([88408da](https://github.com/antares-sql/antares/commit/88408da745e45c70de977bc4270e5f61825be65f))
|
||||
* **SQLite:** save boolean as integer to improve compativility, fixes [#463](https://github.com/antares-sql/antares/issues/463) ([d52b7af](https://github.com/antares-sql/antares/commit/d52b7af2978bc8beafd2d22078c72abb62e9e532))
|
||||
* unable to edit text fields if value is NULL, fixes [#466](https://github.com/antares-sql/antares/issues/466) ([8621ca5](https://github.com/antares-sql/antares/commit/8621ca5333b5c51dc7a2ea1fcc0c5ec7f752a00a))
|
||||
|
||||
### [0.5.18](https://github.com/antares-sql/antares/compare/v0.5.17...v0.5.18) (2022-10-14)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **PostgreSQL:** UUID random generation option on UUID fields, closes [#424](https://github.com/antares-sql/antares/issues/424) ([a521274](https://github.com/antares-sql/antares/commit/a521274d01031c1411bbbb136369802d43368089))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* auto-scroll on sidebar not working, fixes [#447](https://github.com/antares-sql/antares/issues/447) ([dd9c089](https://github.com/antares-sql/antares/commit/dd9c089d27c61ab76d49887c7de2849cbb6e88a6))
|
||||
* trackpad horizontal scroll on tabs not working properly ([ba5a1b6](https://github.com/antares-sql/antares/commit/ba5a1b68ab2d56777a5c94eede26e9bded5819e6))
|
||||
|
||||
### [0.5.17](https://github.com/antares-sql/antares/compare/v0.5.16...v0.5.17) (2022-09-22)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* added more editor font sizes, closes [#440](https://github.com/antares-sql/antares/issues/440) ([d114f8a](https://github.com/antares-sql/antares/commit/d114f8a65164f702b23175095e6fc2b021e0e038))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* "run or reload" shortcut triggers on all connections open ([01f607c](https://github.com/antares-sql/antares/commit/01f607cd40c18ab0f9761b2a05705a966aaae43a))
|
||||
* cant run procedures with parameters from leftbar ([efe134a](https://github.com/antares-sql/antares/commit/efe134a059700ca87333dc6e66166d6ec8d289e8))
|
||||
* editor font size doesn't change on new tabs, fixes [#442](https://github.com/antares-sql/antares/issues/442) ([84168d1](https://github.com/antares-sql/antares/commit/84168d1d75460acc2c844bfece7d85f0c977e74c))
|
||||
* empty definer when editing a view, fixes [#437](https://github.com/antares-sql/antares/issues/437) ([498a9b4](https://github.com/antares-sql/antares/commit/498a9b48e25ee061960f5f649c953cdaf6ff1a58))
|
||||
* **MacOS:** empty options on macos menubar ([a142d3c](https://github.com/antares-sql/antares/commit/a142d3c4d77e31375dfbea148eec54ce1f635192))
|
||||
|
||||
### [0.5.16](https://github.com/antares-sql/antares/compare/v0.5.15...v0.5.16) (2022-08-26)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* CTRL+Right/Left not working on text editor, closes [#427](https://github.com/antares-sql/antares/issues/427) ([ffc645b](https://github.com/antares-sql/antares/commit/ffc645ba5efb1c52670096e4f8c7f992b7335dae))
|
||||
* issue updating datetime cells with null value, closes [#423](https://github.com/antares-sql/antares/issues/423) ([ebc325a](https://github.com/antares-sql/antares/commit/ebc325ae0c656dca2eb8f7544ab271beaee9b47e))
|
||||
* ts exceptions ([df68114](https://github.com/antares-sql/antares/commit/df681147aaf0bfca69f3ffdc474cc1846541b1d8))
|
||||
* **UI:** editor themes group not visible in select element ([9dc700e](https://github.com/antares-sql/antares/commit/9dc700e13ea65bb8c6feac4ff4ffeadd32053614))
|
||||
* **UI:** wrong position of fields resizable area ([c90ab0e](https://github.com/antares-sql/antares/commit/c90ab0e8807ff30a9ab58e9aa3515cf427dd6e86))
|
||||
* unable to set null or delete rows without primary key ([39326eb](https://github.com/antares-sql/antares/commit/39326eb52e038728b5419d4a8de8024c7ead3002))
|
||||
|
||||
### [0.5.15](https://github.com/antares-sql/antares/compare/v0.5.14...v0.5.15) (2022-08-17)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* ability to add new shortcuts ([d044a02](https://github.com/antares-sql/antares/commit/d044a02cb79a9d06aadc34cdbf6e81da84360559))
|
||||
* ability to edit shortcuts ([8eb127e](https://github.com/antares-sql/antares/commit/8eb127e45838bc01ba12f0740fec077fcd975532))
|
||||
* added more events in shortcuts setting ([5043faf](https://github.com/antares-sql/antares/commit/5043fafa934844ebc2f59cabcec830c6a4d5ca8e))
|
||||
* delete shortcuts and restore defaults ([c22413f](https://github.com/antares-sql/antares/commit/c22413fde9dfe5501a5f220070cfe552a318c70b))
|
||||
* dynamic shortcut suggestions on empty query tabs ([4df14c3](https://github.com/antares-sql/antares/commit/4df14c3693955bd7801b4b99103fca85f00f3e8c))
|
||||
* list of available shortcuts in settings window ([44bb75b](https://github.com/antares-sql/antares/commit/44bb75bc60d7d31bbd99a9ba57f30fd354f7581c))
|
||||
* **UI:** connection name on left bar, closes [#382](https://github.com/antares-sql/antares/issues/382) [#414](https://github.com/antares-sql/antares/issues/414) ([4887753](https://github.com/antares-sql/antares/commit/48877534d1a41d351b267c0dab925046ca984179))
|
||||
* **UI:** shortcuts setting UI improved ([49b63bc](https://github.com/antares-sql/antares/commit/49b63bc6f28fc6031e6a892d0a48cd35ae2f26cd))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* startup exception ([c50d17e](https://github.com/antares-sql/antares/commit/c50d17e82b7fd337d4037ddf646cd1a8fc765bae))
|
||||
|
||||
|
||||
### Improvements
|
||||
|
||||
* improved keypress detector ([0f219cf](https://github.com/antares-sql/antares/commit/0f219cf9b796b4369c609fb0e8e3b84346a30b07))
|
||||
* **translation:** updated italian translation ([c05be83](https://github.com/antares-sql/antares/commit/c05be8304f3cf299cf338f67c00184305e022919))
|
||||
|
||||
### [0.5.14](https://github.com/antares-sql/antares/compare/v0.5.13...v0.5.14) (2022-08-09)
|
||||
|
||||
|
||||
|
59
README.md
59
README.md
@@ -12,7 +12,7 @@
|
||||
Antares is an SQL client based on [Electron.js](https://github.com/electron/electron) and [Vue.js](https://github.com/vuejs/vue) that aims to become a useful tool, especially for developers.
|
||||
Our target is to support as many databases as possible, and all major operating systems, including the ARM versions.
|
||||
|
||||
**At the moment this application is in development state, many features will come in future updates**, and supports only MySQL/MariaDB, PostgreSQL and SQLite.
|
||||
**At the moment this application is in development state, many features will come in future updates**, and supports only MySQL/MariaDB, PostgreSQL, SQLite and Firebird SQL.
|
||||
However, there are all the features necessary to have a pleasant database management experience, so give it a chance and send us your feedback, we would really appreciate it.
|
||||
We are actively working on it, hoping to provide new cool features, improvements and fixes as soon as possible.
|
||||
|
||||
@@ -34,6 +34,7 @@ We are actively working on it, hoping to provide new cool features, improvements
|
||||
- SSH tunnel support.
|
||||
- Manual commit mode.
|
||||
- Import and export database dumps.
|
||||
- Customizable keyboard shortcuts.
|
||||
- Dark and light theme.
|
||||
- Editor themes.
|
||||
|
||||
@@ -83,8 +84,8 @@ This is a roadmap with major features will come in near future.
|
||||
- [x] MySQL/MariaDB
|
||||
- [x] PostgreSQL
|
||||
- [x] SQLite
|
||||
- [ ] MSSQL
|
||||
- [ ] OracleDB
|
||||
- [x] Firebird SQL
|
||||
- [ ] SQL Server
|
||||
- [ ] More...
|
||||
|
||||
### Operating Systems
|
||||
@@ -115,30 +116,34 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
|
||||
<!-- prettier-ignore-start -->
|
||||
<!-- markdownlint-disable -->
|
||||
<table>
|
||||
<tr>
|
||||
<td align="center"><a href="https://fabiodistasio.it/"><img src="https://avatars.githubusercontent.com/u/31471771?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Fabio Di Stasio</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=Fabio286" title="Code">💻</a> <a href="#translation-Fabio286" title="Translation">🌍</a> <a href="https://github.com/antares-sql/antares/commits?author=Fabio286" title="Documentation">📖</a></td>
|
||||
<td align="center"><a href="https://www.linkedin.com/in/giulioganci/"><img src="https://avatars.githubusercontent.com/u/4192159?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Giulio Ganci</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=toriphes" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://christianratz.de/"><img src="https://avatars.githubusercontent.com/u/2630316?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Christian Ratz</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=digitalgopnik" title="Code">💻</a> <a href="#translation-digitalgopnik" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://reverb6821.github.io/"><img src="https://avatars.githubusercontent.com/u/55198803?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Giuseppe Gigliotti</b></sub></a><br /><a href="#translation-reverb6821" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/Mohd-PH"><img src="https://avatars.githubusercontent.com/u/9362157?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Mohd-PH</b></sub></a><br /><a href="#translation-Mohd-PH" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/hongkfui"><img src="https://avatars.githubusercontent.com/u/37477191?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hongkfui</b></sub></a><br /><a href="#translation-hongkfui" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/MrAnyx"><img src="https://avatars.githubusercontent.com/u/44176707?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Robin</b></sub></a><br /><a href="#translation-MrAnyx" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/daeleduardo"><img src="https://avatars.githubusercontent.com/u/8599078?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel Eduardo</b></sub></a><br /><a href="#translation-daeleduardo" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://ngoquocdat.com/"><img src="https://avatars.githubusercontent.com/u/56961917?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ngô Quốc Đạt</b></sub></a><br /><a href="#translation-datlechin" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/IsamuSugi"><img src="https://avatars.githubusercontent.com/u/7746658?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Isamu Sugiura</b></sub></a><br /><a href="#translation-IsamuSugi" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="http://rsacchetto.nexxontech.it/"><img src="https://avatars.githubusercontent.com/u/18429412?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Riccardo Sacchetto</b></sub></a><br /><a href="#platform-Occhioverde" title="Packaging/porting to new platform">📦</a></td>
|
||||
<td align="center"><a href="https://kilianstallinger.com"><img src="https://avatars.githubusercontent.com/u/5290318?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kilian Stallinger</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=kilianstallz" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/wenj91"><img src="https://avatars.githubusercontent.com/u/12549338?v=4?s=100" width="100px;" alt=""/><br /><sub><b>文杰</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=wenj91" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/goYou"><img src="https://avatars.githubusercontent.com/u/62732795?v=4?s=100" width="100px;" alt=""/><br /><sub><b>goYou</b></sub></a><br /><a href="#translation-goYou" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/raliqala"><img src="https://avatars.githubusercontent.com/u/30502407?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Topollo</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=raliqala" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/SmileYzn"><img src="https://avatars.githubusercontent.com/u/5851851?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Cleverson</b></sub></a><br /><a href="#translation-SmileYzn" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/fredatgithub"><img src="https://avatars.githubusercontent.com/u/6720055?v=4?s=100" width="100px;" alt=""/><br /><sub><b>fred</b></sub></a><br /><a href="#translation-fredatgithub" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/xak666"><img src="https://avatars.githubusercontent.com/u/38811437?v=4?s=100" width="100px;" alt=""/><br /><sub><b>xaka_xak</b></sub></a><br /><a href="#translation-xak666" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td align="center"><a href="https://fabiodistasio.it/"><img src="https://avatars.githubusercontent.com/u/31471771?v=4?s=100" width="100px;" alt="Fabio Di Stasio"/><br /><sub><b>Fabio Di Stasio</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=Fabio286" title="Code">💻</a> <a href="#translation-Fabio286" title="Translation">🌍</a> <a href="https://github.com/antares-sql/antares/commits?author=Fabio286" title="Documentation">📖</a></td>
|
||||
<td align="center"><a href="https://www.linkedin.com/in/giulioganci/"><img src="https://avatars.githubusercontent.com/u/4192159?v=4?s=100" width="100px;" alt="Giulio Ganci"/><br /><sub><b>Giulio Ganci</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=toriphes" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://christianratz.de/"><img src="https://avatars.githubusercontent.com/u/2630316?v=4?s=100" width="100px;" alt="Christian Ratz"/><br /><sub><b>Christian Ratz</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=digitalgopnik" title="Code">💻</a> <a href="#translation-digitalgopnik" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://reverb6821.github.io/"><img src="https://avatars.githubusercontent.com/u/55198803?v=4?s=100" width="100px;" alt="Giuseppe Gigliotti"/><br /><sub><b>Giuseppe Gigliotti</b></sub></a><br /><a href="#translation-reverb6821" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/Mohd-PH"><img src="https://avatars.githubusercontent.com/u/9362157?v=4?s=100" width="100px;" alt="Mohd-PH"/><br /><sub><b>Mohd-PH</b></sub></a><br /><a href="#translation-Mohd-PH" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/hongkfui"><img src="https://avatars.githubusercontent.com/u/37477191?v=4?s=100" width="100px;" alt="hongkfui"/><br /><sub><b>hongkfui</b></sub></a><br /><a href="#translation-hongkfui" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/MrAnyx"><img src="https://avatars.githubusercontent.com/u/44176707?v=4?s=100" width="100px;" alt="Robin"/><br /><sub><b>Robin</b></sub></a><br /><a href="#translation-MrAnyx" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/daeleduardo"><img src="https://avatars.githubusercontent.com/u/8599078?v=4?s=100" width="100px;" alt="Daniel Eduardo"/><br /><sub><b>Daniel Eduardo</b></sub></a><br /><a href="#translation-daeleduardo" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://ngoquocdat.com/"><img src="https://avatars.githubusercontent.com/u/56961917?v=4?s=100" width="100px;" alt="Ngô Quốc Đạt"/><br /><sub><b>Ngô Quốc Đạt</b></sub></a><br /><a href="#translation-datlechin" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/IsamuSugi"><img src="https://avatars.githubusercontent.com/u/7746658?v=4?s=100" width="100px;" alt="Isamu Sugiura"/><br /><sub><b>Isamu Sugiura</b></sub></a><br /><a href="#translation-IsamuSugi" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="http://rsacchetto.nexxontech.it/"><img src="https://avatars.githubusercontent.com/u/18429412?v=4?s=100" width="100px;" alt="Riccardo Sacchetto"/><br /><sub><b>Riccardo Sacchetto</b></sub></a><br /><a href="#platform-Occhioverde" title="Packaging/porting to new platform">📦</a></td>
|
||||
<td align="center"><a href="https://kilianstallinger.com"><img src="https://avatars.githubusercontent.com/u/5290318?v=4?s=100" width="100px;" alt="Kilian Stallinger"/><br /><sub><b>Kilian Stallinger</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=kilianstallz" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/wenj91"><img src="https://avatars.githubusercontent.com/u/12549338?v=4?s=100" width="100px;" alt="文杰"/><br /><sub><b>文杰</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=wenj91" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/goYou"><img src="https://avatars.githubusercontent.com/u/62732795?v=4?s=100" width="100px;" alt="goYou"/><br /><sub><b>goYou</b></sub></a><br /><a href="#translation-goYou" title="Translation">🌍</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td align="center"><a href="https://github.com/raliqala"><img src="https://avatars.githubusercontent.com/u/30502407?v=4?s=100" width="100px;" alt="Topollo"/><br /><sub><b>Topollo</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=raliqala" title="Code">💻</a></td>
|
||||
<td align="center"><a href="https://github.com/SmileYzn"><img src="https://avatars.githubusercontent.com/u/5851851?v=4?s=100" width="100px;" alt="Cleverson"/><br /><sub><b>Cleverson</b></sub></a><br /><a href="#translation-SmileYzn" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/fredatgithub"><img src="https://avatars.githubusercontent.com/u/6720055?v=4?s=100" width="100px;" alt="fred"/><br /><sub><b>fred</b></sub></a><br /><a href="#translation-fredatgithub" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://github.com/xak666"><img src="https://avatars.githubusercontent.com/u/38811437?v=4?s=100" width="100px;" alt="xaka_xak"/><br /><sub><b>xaka_xak</b></sub></a><br /><a href="#translation-xak666" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="https://codepen.io/theo-billardey"><img src="https://avatars.githubusercontent.com/u/48206778?v=4?s=100" width="100px;" alt="Théo Billardey"/><br /><sub><b>Théo Billardey</b></sub></a><br /><a href="#translation-brdtheo" title="Translation">🌍</a></td>
|
||||
<td align="center"><a href="http://yaskur.net"><img src="https://avatars.githubusercontent.com/u/9539970?v=4?s=100" width="100px;" alt="Muhammad Dyas Yaskur"/><br /><sub><b>Muhammad Dyas Yaskur</b></sub></a><br /><a href="#translation-dyaskur" title="Translation">🌍</a> <a href="https://github.com/antares-sql/antares/commits?author=dyaskur" title="Code">💻</a></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<!-- markdownlint-restore -->
|
||||
|
16183
package-lock.json
generated
16183
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
50
package.json
50
package.json
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "antares",
|
||||
"productName": "Antares",
|
||||
"version": "0.5.14",
|
||||
"version": "0.7.4",
|
||||
"description": "A modern, fast and productivity driven SQL client with a focus in UX.",
|
||||
"license": "MIT",
|
||||
"repository": "https://github.com/antares-sql/antares.git",
|
||||
@@ -121,44 +121,47 @@
|
||||
"dependencies": {
|
||||
"@electron/remote": "~2.0.1",
|
||||
"@faker-js/faker": "~6.1.2",
|
||||
"@mdi/font": "~7.0.96",
|
||||
"@mdi/font": "~7.1.96",
|
||||
"@turf/helpers": "~6.5.0",
|
||||
"@vueuse/core": "~8.7.5",
|
||||
"ace-builds": "~1.8.1",
|
||||
"better-sqlite3": "~7.5.1",
|
||||
"ace-builds": "~1.14.0",
|
||||
"better-sqlite3": "~8.0.0",
|
||||
"electron-log": "~4.4.1",
|
||||
"electron-store": "~8.0.1",
|
||||
"electron-store": "~8.1.0",
|
||||
"electron-updater": "~4.6.5",
|
||||
"electron-window-state": "~5.0.3",
|
||||
"encoding": "~0.1.13",
|
||||
"floating-vue": "~2.0.0-beta.20",
|
||||
"leaflet": "~1.7.1",
|
||||
"marked": "~4.0.0",
|
||||
"marked": "~4.0.19",
|
||||
"moment": "~2.29.4",
|
||||
"mysql2": "~2.3.2",
|
||||
"node-firebird": "~1.1.4",
|
||||
"pg": "~8.7.1",
|
||||
"pg-connection-string": "~2.5.0",
|
||||
"pg-query-stream": "~4.2.3",
|
||||
"pgsql-ast-parser": "~7.2.1",
|
||||
"pinia": "~2.0.13",
|
||||
"pinia": "~2.0.28",
|
||||
"source-map-support": "~0.5.20",
|
||||
"spectre.css": "~0.5.9",
|
||||
"sql-formatter": "~8.2.0",
|
||||
"sql-formatter": "~12.0.3",
|
||||
"ssh2-promise": "~1.0.2",
|
||||
"v-mask": "~2.3.0",
|
||||
"vue": "~3.2.37",
|
||||
"vue-i18n": "~9.2.0",
|
||||
"vue": "~3.2.45",
|
||||
"vue-i18n": "~9.2.2",
|
||||
"vuedraggable": "~4.1.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@babel/eslint-parser": "~7.15.7",
|
||||
"@babel/preset-env": "~7.15.8",
|
||||
"@babel/preset-typescript": "~7.16.7",
|
||||
"@playwright/test": "~1.21.1",
|
||||
"@playwright/test": "~1.28.1",
|
||||
"@types/better-sqlite3": "~7.5.0",
|
||||
"@types/leaflet": "~1.7.9",
|
||||
"@types/marked": "~4.0.3",
|
||||
"@types/marked": "~4.0.7",
|
||||
"@types/node": "~17.0.23",
|
||||
"@types/pg": "~8.6.5",
|
||||
"@types/ssh2": "~1.11.6",
|
||||
"@typescript-eslint/eslint-plugin": "~5.18.0",
|
||||
"@typescript-eslint/parser": "~5.18.0",
|
||||
"@vue/compiler-sfc": "~3.2.33",
|
||||
@@ -167,8 +170,8 @@
|
||||
"chalk": "~4.1.2",
|
||||
"cross-env": "~7.0.2",
|
||||
"css-loader": "~6.5.0",
|
||||
"electron": "~19.0.5",
|
||||
"electron-builder": "~23.0.3",
|
||||
"electron": "~22.0.3",
|
||||
"electron-builder": "~22.10.3",
|
||||
"eslint": "~7.32.0",
|
||||
"eslint-config-standard": "~16.0.3",
|
||||
"eslint-plugin-import": "~2.24.2",
|
||||
@@ -179,17 +182,19 @@
|
||||
"html-webpack-plugin": "~5.5.0",
|
||||
"mini-css-extract-plugin": "~2.4.5",
|
||||
"node-loader": "~2.0.0",
|
||||
"playwright": "~1.21.1",
|
||||
"playwright-core": "~1.21.1",
|
||||
"playwright": "~1.28.1",
|
||||
"playwright-core": "~1.28.1",
|
||||
"postcss-html": "~1.5.0",
|
||||
"progress-webpack-plugin": "~1.0.12",
|
||||
"rimraf": "~3.0.2",
|
||||
"sass": "~1.42.1",
|
||||
"sass-loader": "~12.3.0",
|
||||
"standard-version": "~9.3.1",
|
||||
"style-loader": "~3.3.1",
|
||||
"stylelint": "~13.13.1",
|
||||
"stylelint-config-standard": "~22.0.0",
|
||||
"stylelint-scss": "~3.21.0",
|
||||
"stylelint": "~14.9.1",
|
||||
"stylelint-config-recommended-vue": "~1.4.0",
|
||||
"stylelint-config-standard": "~26.0.0",
|
||||
"stylelint-scss": "~4.3.0",
|
||||
"tree-kill": "~1.2.2",
|
||||
"ts-loader": "~9.2.8",
|
||||
"typescript": "~4.6.3",
|
||||
@@ -198,7 +203,12 @@
|
||||
"vue-loader": "~16.8.3",
|
||||
"webpack": "~5.72.0",
|
||||
"webpack-cli": "~4.9.1",
|
||||
"webpack-dev-server": "~4.4.0",
|
||||
"webpack-dev-server": "~4.11.1",
|
||||
"xvfb-maybe": "~0.2.1"
|
||||
},
|
||||
"overrides": {
|
||||
"ssh2-promise": {
|
||||
"ssh2": "github:Fabio286/ssh2"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -114,7 +114,6 @@ function startRenderer (callback) {
|
||||
});
|
||||
|
||||
const server = new WebpackDevServer(compiler, {
|
||||
hot: true,
|
||||
port: 9080,
|
||||
client: {
|
||||
overlay: true,
|
||||
|
@@ -1,4 +1,5 @@
|
||||
// @ts-check
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-nocheck
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
const https = require('https');
|
||||
|
@@ -1,3 +1,4 @@
|
||||
/* eslint-disable @typescript-eslint/no-explicit-any */
|
||||
export default class {
|
||||
static get _methods () {
|
||||
return [
|
||||
@@ -139,7 +140,7 @@ export default class {
|
||||
{ name: 'arrayElement', group: 'random', types: ['string'] },
|
||||
{ name: 'arrayElements', group: 'random', types: ['string'] },
|
||||
{ name: 'objectElement', group: 'random', types: ['string'] },
|
||||
{ name: 'uuid', group: 'random', types: ['string'] },
|
||||
{ name: 'uuid', group: 'random', types: ['string', 'uuid'] },
|
||||
{ name: 'boolean', group: 'random', types: ['string'] },
|
||||
{ name: 'word', group: 'random', types: ['string'] },
|
||||
{ name: 'words', group: 'random', types: ['string'] },
|
||||
@@ -180,7 +181,7 @@ export default class {
|
||||
acc[curr.group] = new Set(curr.types);
|
||||
|
||||
return acc;
|
||||
}, {});
|
||||
}, {} as any);
|
||||
|
||||
const groupsArr = [];
|
||||
|
||||
@@ -198,12 +199,12 @@ export default class {
|
||||
});
|
||||
}
|
||||
|
||||
static getGroupsByType (type) {
|
||||
static getGroupsByType (type: string) {
|
||||
if (!type) return [];
|
||||
return this.getGroups().filter(group => group.types.includes(type));
|
||||
}
|
||||
|
||||
static getMethods ({ type, group }) {
|
||||
static getMethods ({ type, group }: {type: string; group: string}) {
|
||||
return this._methods.filter(method => method.group === group && method.types.includes(type)).sort((a, b) => {
|
||||
if (a.name < b.name)
|
||||
return -1;
|
||||
|
@@ -1,10 +1,14 @@
|
||||
import { Customizations } from '../interfaces/customizations';
|
||||
|
||||
// Everything OFF
|
||||
export const defaults: Customizations = {
|
||||
// Defaults
|
||||
defaultPort: null,
|
||||
defaultUser: null,
|
||||
defaultDatabase: null,
|
||||
dataTypes: [],
|
||||
indexTypes: [],
|
||||
foreignActions: [],
|
||||
// Core
|
||||
database: false,
|
||||
collations: false,
|
||||
@@ -45,9 +49,9 @@ export const defaults: Customizations = {
|
||||
exportByChunks: false,
|
||||
schemaImport: false,
|
||||
tableSettings: false,
|
||||
tableOptions: false,
|
||||
tableArray: false,
|
||||
tableRealCount: false,
|
||||
tableDuplicate: false,
|
||||
viewSettings: false,
|
||||
triggerSettings: false,
|
||||
triggerFunctionSettings: false,
|
||||
@@ -73,6 +77,7 @@ export const defaults: Customizations = {
|
||||
procedureDataAccess: false,
|
||||
procedureSql: null,
|
||||
procedureContext: false,
|
||||
procedureContextValues: [],
|
||||
procedureLanguage: false,
|
||||
functionDeterministic: false,
|
||||
functionDataAccess: false,
|
||||
|
63
src/common/customizations/firebird.ts
Normal file
63
src/common/customizations/firebird.ts
Normal file
@@ -0,0 +1,63 @@
|
||||
import { Customizations } from '../interfaces/customizations';
|
||||
import { defaults } from './defaults';
|
||||
import firebirdTypes from '../data-types/firebird';
|
||||
|
||||
export const customizations: Customizations = {
|
||||
...defaults,
|
||||
// Defaults
|
||||
defaultPort: 3050,
|
||||
defaultUser: 'SYSDBA',
|
||||
defaultDatabase: null,
|
||||
dataTypes: firebirdTypes,
|
||||
indexTypes: [
|
||||
'PRIMARY',
|
||||
// 'CHECK',
|
||||
'UNIQUE'
|
||||
],
|
||||
foreignActions: [
|
||||
'RESTRICT',
|
||||
'NO ACTION',
|
||||
'CASCADE',
|
||||
'SET NULL',
|
||||
'SET DEFAULT'
|
||||
],
|
||||
// Core
|
||||
database: true,
|
||||
collations: false,
|
||||
engines: false,
|
||||
connectionSchema: false,
|
||||
sslConnection: false,
|
||||
sshConnection: false,
|
||||
fileConnection: false,
|
||||
cancelQueries: false,
|
||||
// Tools
|
||||
processesList: false,
|
||||
usersManagement: false,
|
||||
variables: false,
|
||||
// Structure
|
||||
schemas: false,
|
||||
tables: true,
|
||||
views: true,
|
||||
triggers: true,
|
||||
routines: true,
|
||||
functions: false,
|
||||
// Settings
|
||||
elementsWrapper: '"',
|
||||
stringsWrapper: '\'',
|
||||
tableAdd: true,
|
||||
tableSettings: true,
|
||||
tableRealCount: true,
|
||||
viewAdd: true,
|
||||
viewSettings: true,
|
||||
triggerAdd: true,
|
||||
triggerMultipleEvents: true,
|
||||
triggerSql: 'BEGIN\r\n\r\nEND',
|
||||
routineAdd: true,
|
||||
procedureContext: true,
|
||||
procedureContextValues: ['IN', 'OUT'],
|
||||
procedureSql: 'BEGIN\r\n\r\nEND',
|
||||
parametersLength: true,
|
||||
indexes: true,
|
||||
foreigns: true,
|
||||
nullable: true
|
||||
};
|
@@ -1,16 +1,19 @@
|
||||
import * as mysql from 'common/customizations/mysql';
|
||||
import * as postgresql from 'common/customizations/postgresql';
|
||||
import * as sqlite from 'common/customizations/sqlite';
|
||||
import * as firebird from 'common/customizations/firebird';
|
||||
import { Customizations } from 'common/interfaces/customizations';
|
||||
|
||||
export default {
|
||||
maria: mysql.customizations,
|
||||
mysql: mysql.customizations,
|
||||
pg: postgresql.customizations,
|
||||
sqlite: sqlite.customizations
|
||||
sqlite: sqlite.customizations,
|
||||
firebird: firebird.customizations
|
||||
} as {
|
||||
maria: Customizations;
|
||||
mysql: Customizations;
|
||||
pg: Customizations;
|
||||
sqlite: Customizations;
|
||||
firebird: Customizations;
|
||||
};
|
||||
|
@@ -1,5 +1,6 @@
|
||||
import { Customizations } from '../interfaces/customizations';
|
||||
import { defaults } from './defaults';
|
||||
import mysqlTypes from '../data-types/mysql';
|
||||
|
||||
export const customizations: Customizations = {
|
||||
...defaults,
|
||||
@@ -7,6 +8,19 @@ export const customizations: Customizations = {
|
||||
defaultPort: 3306,
|
||||
defaultUser: 'root',
|
||||
defaultDatabase: null,
|
||||
dataTypes: mysqlTypes,
|
||||
indexTypes: [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE',
|
||||
'FULLTEXT'
|
||||
],
|
||||
foreignActions: [
|
||||
'RESTRICT',
|
||||
'CASCADE',
|
||||
'SET NULL',
|
||||
'NO ACTION'
|
||||
],
|
||||
// Core
|
||||
connectionSchema: true,
|
||||
collations: true,
|
||||
@@ -29,6 +43,7 @@ export const customizations: Customizations = {
|
||||
stringsWrapper: '"',
|
||||
tableAdd: true,
|
||||
tableTruncateDisableFKCheck: true,
|
||||
tableDuplicate: true,
|
||||
viewAdd: true,
|
||||
triggerAdd: true,
|
||||
routineAdd: true,
|
||||
@@ -51,7 +66,6 @@ export const customizations: Customizations = {
|
||||
unsigned: true,
|
||||
nullable: true,
|
||||
zerofill: true,
|
||||
tableOptions: true,
|
||||
autoIncrement: true,
|
||||
comment: true,
|
||||
collation: true,
|
||||
@@ -64,6 +78,7 @@ export const customizations: Customizations = {
|
||||
procedureDataAccess: true,
|
||||
procedureSql: 'BEGIN\r\n\r\nEND',
|
||||
procedureContext: true,
|
||||
procedureContextValues: ['IN', 'OUT', 'INOUT'],
|
||||
triggerSql: 'BEGIN\r\n\r\nEND',
|
||||
functionDeterministic: true,
|
||||
functionDataAccess: true,
|
||||
|
@@ -1,5 +1,6 @@
|
||||
import { Customizations } from '../interfaces/customizations';
|
||||
import { defaults } from './defaults';
|
||||
import postgresqlTypes from '../data-types/postgresql';
|
||||
|
||||
export const customizations: Customizations = {
|
||||
...defaults,
|
||||
@@ -7,6 +8,18 @@ export const customizations: Customizations = {
|
||||
defaultPort: 5432,
|
||||
defaultUser: 'postgres',
|
||||
defaultDatabase: 'postgres',
|
||||
dataTypes: postgresqlTypes,
|
||||
indexTypes: [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE'
|
||||
],
|
||||
foreignActions: [
|
||||
'RESTRICT',
|
||||
'CASCADE',
|
||||
'SET NULL',
|
||||
'NO ACTION'
|
||||
],
|
||||
// Core
|
||||
database: true,
|
||||
sslConnection: true,
|
||||
@@ -26,6 +39,7 @@ export const customizations: Customizations = {
|
||||
elementsWrapper: '"',
|
||||
stringsWrapper: '\'',
|
||||
tableAdd: true,
|
||||
tableDuplicate: true,
|
||||
viewAdd: true,
|
||||
triggerAdd: true,
|
||||
triggerFunctionAdd: true,
|
||||
@@ -47,6 +61,7 @@ export const customizations: Customizations = {
|
||||
tableArray: true,
|
||||
procedureSql: '$procedure$\r\n\r\n$procedure$',
|
||||
procedureContext: true,
|
||||
procedureContextValues: ['IN', 'OUT', 'INOUT'],
|
||||
procedureLanguage: true,
|
||||
functionSql: '$function$\r\n\r\n$function$',
|
||||
triggerFunctionSql: '$function$\r\nBEGIN\r\n\r\nEND\r\n$function$',
|
||||
|
@@ -1,8 +1,21 @@
|
||||
import { Customizations } from '../interfaces/customizations';
|
||||
import { defaults } from './defaults';
|
||||
import sqliteTypes from '../data-types/sqlite';
|
||||
|
||||
export const customizations: Customizations = {
|
||||
...defaults,
|
||||
dataTypes: sqliteTypes,
|
||||
indexTypes: [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE'
|
||||
],
|
||||
foreignActions: [
|
||||
'RESTRICT',
|
||||
'CASCADE',
|
||||
'SET NULL',
|
||||
'NO ACTION'
|
||||
],
|
||||
// Core
|
||||
fileConnection: true,
|
||||
// Structure
|
||||
@@ -14,6 +27,7 @@ export const customizations: Customizations = {
|
||||
elementsWrapper: '"',
|
||||
stringsWrapper: '\'',
|
||||
tableAdd: true,
|
||||
tableDuplicate: true,
|
||||
viewAdd: true,
|
||||
triggerAdd: true,
|
||||
schemaEdit: false,
|
||||
|
136
src/common/data-types/firebird.ts
Normal file
136
src/common/data-types/firebird.ts
Normal file
@@ -0,0 +1,136 @@
|
||||
import { TypesGroup } from 'common/interfaces/antares';
|
||||
|
||||
export default [
|
||||
{
|
||||
group: 'integer',
|
||||
types: [
|
||||
{
|
||||
name: 'SMALLINT',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
},
|
||||
{
|
||||
name: 'INTEGER',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
},
|
||||
{
|
||||
name: 'BIGINT',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
group: 'float',
|
||||
types: [
|
||||
{
|
||||
name: 'DECIMAL',
|
||||
length: true,
|
||||
scale: true,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'NUMERIC',
|
||||
length: true,
|
||||
scale: true,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'FLOAT',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'DOUBLE PRECISION',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
group: 'string',
|
||||
types: [
|
||||
{
|
||||
name: 'CHAR',
|
||||
length: true,
|
||||
collation: true,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'VARCHAR',
|
||||
length: true,
|
||||
collation: true,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'BLOB-TEXT',
|
||||
length: false,
|
||||
collation: true,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
group: 'binary',
|
||||
types: [
|
||||
{
|
||||
name: 'BLOB',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'CHAR-BINARY',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
group: 'time',
|
||||
types: [
|
||||
{
|
||||
name: 'DATE',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'TIME',
|
||||
length: true,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
},
|
||||
{
|
||||
name: 'TIMESTAMP',
|
||||
length: false,
|
||||
collation: false,
|
||||
unsigned: false,
|
||||
zerofill: false
|
||||
}
|
||||
]
|
||||
}
|
||||
] as TypesGroup[];
|
@@ -6,7 +6,7 @@ export default [
|
||||
types: [
|
||||
{
|
||||
name: 'INT',
|
||||
length: true,
|
||||
length: 10,
|
||||
collation: false,
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
@@ -18,6 +18,13 @@ export default [
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
},
|
||||
{
|
||||
name: 'INTEGER UNSIGNED',
|
||||
length: true,
|
||||
collation: false,
|
||||
unsigned: true,
|
||||
zerofill: true
|
||||
},
|
||||
{
|
||||
name: 'BIGINT',
|
||||
length: true,
|
||||
|
@@ -10,7 +10,8 @@ export const LONG_TEXT = [
|
||||
'MEDIUMTEXT',
|
||||
'LONGTEXT',
|
||||
'JSON',
|
||||
'VARBINARY'
|
||||
'VARBINARY',
|
||||
'BLOB-TEXT'
|
||||
];
|
||||
|
||||
export const ARRAY = [
|
||||
@@ -29,14 +30,14 @@ export const NUMBER = [
|
||||
'SMALLINT',
|
||||
'MEDIUMINT',
|
||||
'BIGINT',
|
||||
'DECIMAL',
|
||||
'NUMERIC',
|
||||
'INTEGER',
|
||||
'SMALLSERIAL',
|
||||
'SERIAL',
|
||||
'BIGSERIAL',
|
||||
'OID',
|
||||
'XID'
|
||||
'XID',
|
||||
'INT64'
|
||||
];
|
||||
|
||||
export const FLOAT = [
|
||||
@@ -48,6 +49,12 @@ export const FLOAT = [
|
||||
'MONEY'
|
||||
];
|
||||
|
||||
export const IS_BIGINT = [
|
||||
'BIGINT',
|
||||
'BIGSERIAL',
|
||||
'DOUBLE PRECISION'
|
||||
];
|
||||
|
||||
export const BOOLEAN = [
|
||||
'BOOL',
|
||||
'BOOLEAN'
|
||||
@@ -78,7 +85,9 @@ export const BLOB = [
|
||||
'TINYBLOB',
|
||||
'MEDIUMBLOB',
|
||||
'LONGBLOB',
|
||||
'BYTEA'
|
||||
'LONG_BLOB',
|
||||
'BYTEA',
|
||||
'CHAR-BINARY'
|
||||
];
|
||||
|
||||
export const BIT = [
|
||||
@@ -86,6 +95,14 @@ export const BIT = [
|
||||
'BIT VARYING'
|
||||
];
|
||||
|
||||
export const BINARY = [
|
||||
'BINARY'
|
||||
];
|
||||
|
||||
export const UUID = [
|
||||
'UUID'
|
||||
];
|
||||
|
||||
export const SPATIAL = [
|
||||
'POINT',
|
||||
'LINESTRING',
|
||||
|
@@ -1,6 +0,0 @@
|
||||
export default [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE',
|
||||
'FULLTEXT'
|
||||
];
|
@@ -1,5 +0,0 @@
|
||||
export default [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE'
|
||||
];
|
@@ -1,5 +0,0 @@
|
||||
export default [
|
||||
'PRIMARY',
|
||||
'INDEX',
|
||||
'UNIQUE'
|
||||
];
|
@@ -8,9 +8,10 @@ import SSHConfig from 'ssh2-promise/lib/sshConfig';
|
||||
import { MySQLClient } from '../../main/libs/clients/MySQLClient';
|
||||
import { PostgreSQLClient } from '../../main/libs/clients/PostgreSQLClient';
|
||||
import { SQLiteClient } from '../../main/libs/clients/SQLiteClient';
|
||||
import { FirebirdSQLClient } from 'src/main/libs/clients/FirebirdSQLClient';
|
||||
|
||||
export type Client = MySQLClient | PostgreSQLClient | SQLiteClient
|
||||
export type ClientCode = 'mysql' | 'maria' | 'pg' | 'sqlite'
|
||||
export type Client = MySQLClient | PostgreSQLClient | SQLiteClient | FirebirdSQLClient
|
||||
export type ClientCode = 'mysql' | 'maria' | 'pg' | 'sqlite' | 'firebird'
|
||||
export type Exporter = MysqlExporter | PostgreSQLExporter
|
||||
export type Importer = MySQLImporter | PostgreSQLImporter
|
||||
|
||||
@@ -84,13 +85,11 @@ export interface TableInfos {
|
||||
name: string;
|
||||
type: string;
|
||||
rows: number;
|
||||
created: Date;
|
||||
updated: Date;
|
||||
engine: string;
|
||||
comment: string;
|
||||
size: number | false;
|
||||
autoIncrement: number;
|
||||
collation: string;
|
||||
autoIncrement?: boolean;
|
||||
}
|
||||
|
||||
export type TableOptions = Partial<TableInfos>;
|
||||
|
@@ -1,8 +1,13 @@
|
||||
import { TypesGroup } from './antares';
|
||||
|
||||
export interface Customizations {
|
||||
// Defaults
|
||||
defaultPort?: number;
|
||||
defaultUser?: string;
|
||||
defaultDatabase?: string;
|
||||
dataTypes?: TypesGroup[];
|
||||
indexTypes?: string[];
|
||||
foreignActions?: string[];
|
||||
// Core
|
||||
database?: boolean;
|
||||
collations?: boolean;
|
||||
@@ -30,7 +35,7 @@ export interface Customizations {
|
||||
stringsWrapper: string;
|
||||
tableAdd?: boolean;
|
||||
tableSettings?: boolean;
|
||||
tableOptions?: boolean;
|
||||
tableDuplicate?: boolean;
|
||||
tableArray?: boolean;
|
||||
tableRealCount?: boolean;
|
||||
tableTruncateDisableFKCheck?: boolean;
|
||||
@@ -71,6 +76,7 @@ export interface Customizations {
|
||||
procedureDataAccess?: boolean;
|
||||
procedureSql?: string;
|
||||
procedureContext?: boolean;
|
||||
procedureContextValues?: string[];
|
||||
procedureLanguage?: boolean;
|
||||
functionDeterministic?: boolean;
|
||||
functionDataAccess?: boolean;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
export function bufferToBase64 (buf: Buffer) {
|
||||
const binstr = Array.prototype.map.call(buf, ch => {
|
||||
const binstr = Array.prototype.map.call(buf, (ch: number) => {
|
||||
return String.fromCharCode(ch);
|
||||
}).join('');
|
||||
return Buffer.from(binstr, 'binary').toString('base64');
|
||||
|
@@ -176,7 +176,7 @@ function isMD (str: string) {
|
||||
}
|
||||
|
||||
export function langDetector (str: string) {
|
||||
if (!str.trim().length)
|
||||
if (!str || !str.trim().length)
|
||||
return 'text';
|
||||
if (isJSON(str))
|
||||
return 'json';
|
||||
|
@@ -1,3 +1,3 @@
|
||||
export function uidGen (prefix?: string) {
|
||||
return (prefix ? `${prefix}:` : '') + Math.random().toString(36).substr(2, 9).toUpperCase();
|
||||
return (prefix ? `${prefix}:` : '') + Math.random().toString(36).substring(2, 11).toUpperCase();
|
||||
}
|
||||
|
@@ -1,69 +1,138 @@
|
||||
export const shortcutEvents: { [key: string]: { l18n: string; l18nParam?: string | number; context?: 'tab' }} = {
|
||||
'run-or-reload': { l18n: 'message.runOrReload', context: 'tab' },
|
||||
'open-new-tab': { l18n: 'message.openNewTab', context: 'tab' },
|
||||
'close-tab': { l18n: 'message.closeTab', context: 'tab' },
|
||||
'format-query': { l18n: 'message.formatQuery', context: 'tab' },
|
||||
'kill-query': { l18n: 'message.killQuery', context: 'tab' },
|
||||
'query-history': { l18n: 'message.queryHistory', context: 'tab' },
|
||||
'clear-query': { l18n: 'message.clearQuery', context: 'tab' },
|
||||
'next-tab': { l18n: 'message.nextTab' },
|
||||
'prev-tab': { l18n: 'message.previousTab' },
|
||||
'open-all-connections': { l18n: 'message.openAllConnections' },
|
||||
'open-filter': { l18n: 'message.openFilter' },
|
||||
'next-page': { l18n: 'message.nextResultsPage' },
|
||||
'prev-page': { l18n: 'message.previousResultsPage' },
|
||||
'toggle-console': { l18n: 'message.toggleConsole' },
|
||||
'save-content': { l18n: 'message.saveContent' },
|
||||
'create-connection': { l18n: 'message.createNewConnection' },
|
||||
'open-settings': { l18n: 'message.openSettings' },
|
||||
'open-scratchpad': { l18n: 'message.openScratchpad' }
|
||||
};
|
||||
|
||||
interface ShortcutRecord {
|
||||
event: string;
|
||||
keys: Electron.Accelerator[];
|
||||
description: string;
|
||||
keys: Electron.Accelerator[] | string[];
|
||||
/** Needed for default shortcuts */
|
||||
os: NodeJS.Platform[];
|
||||
}
|
||||
|
||||
/**
|
||||
* Default shortcuts
|
||||
*/
|
||||
const shortcuts: ShortcutRecord[] = [
|
||||
{
|
||||
event: 'run-or-reload',
|
||||
keys: ['F5'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'save-content',
|
||||
keys: ['CommandOrControl+S'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'kill-query',
|
||||
keys: ['CommandOrControl+K'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'format-query',
|
||||
keys: ['CommandOrControl+B'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'clear-query',
|
||||
keys: ['CommandOrControl+Alt+W'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'query-history',
|
||||
keys: ['CommandOrControl+G'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'open-new-tab',
|
||||
keys: ['CommandOrControl+T'],
|
||||
description: 'Open a new query tab',
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'close-tab',
|
||||
keys: ['CommandOrControl+W'],
|
||||
description: 'Close tab',
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'next-tab',
|
||||
keys: ['Alt+CommandOrControl+Right', 'CommandOrControl+PageDown'],
|
||||
description: 'Next tab',
|
||||
keys: ['Alt+CommandOrControl+Right'],
|
||||
os: ['darwin', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'prev-tab',
|
||||
keys: ['Alt+CommandOrControl+Left', 'CommandOrControl+PageUp'],
|
||||
description: 'Previous tab',
|
||||
keys: ['Alt+CommandOrControl+Left'],
|
||||
os: ['darwin', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'next-tab',
|
||||
keys: ['CommandOrControl+PageDown'],
|
||||
description: 'Next tab',
|
||||
os: ['linux']
|
||||
os: ['linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'prev-tab',
|
||||
keys: ['CommandOrControl+PageUp'],
|
||||
description: 'Previous tab',
|
||||
os: ['linux']
|
||||
os: ['linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'open-connections-modal',
|
||||
event: 'open-filter',
|
||||
keys: ['CommandOrControl+F'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'next-page',
|
||||
keys: ['CommandOrControl+Right'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'prev-page',
|
||||
keys: ['CommandOrControl+Left'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'open-all-connections',
|
||||
keys: ['Shift+CommandOrControl+Space'],
|
||||
description: 'Show all connections',
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'toggle-console',
|
||||
keys: ['CommandOrControl+F12', 'CommandOrControl+`'],
|
||||
description: 'Toggle console',
|
||||
keys: ['CommandOrControl+F12'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
},
|
||||
{
|
||||
event: 'toggle-console',
|
||||
keys: ['CommandOrControl+`'],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
}
|
||||
];
|
||||
|
||||
for (let i = 1; i <= 9; i++) {
|
||||
shortcuts.push(
|
||||
{
|
||||
event: `select-tab-${i}`,
|
||||
keys: [`CommandOrControl+${i}`],
|
||||
description: `Select tab number ${i}`,
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
});
|
||||
shortcutEvents[`select-tab-${i}`] = {
|
||||
l18n: 'message.selectTabNumber',
|
||||
l18nParam: i
|
||||
};
|
||||
|
||||
shortcuts.push({
|
||||
event: `select-tab-${i}`,
|
||||
keys: [`CommandOrControl+${i}`],
|
||||
os: ['darwin', 'linux', 'win32']
|
||||
});
|
||||
}
|
||||
|
||||
export { shortcuts, ShortcutRecord };
|
||||
|
@@ -1,4 +1,5 @@
|
||||
import { app, ipcMain, dialog } from 'electron';
|
||||
import { ShortcutRegister } from '../libs/ShortcutRegister';
|
||||
|
||||
export default () => {
|
||||
ipcMain.on('close-app', () => {
|
||||
@@ -12,4 +13,24 @@ export default () => {
|
||||
ipcMain.handle('get-download-dir-path', () => {
|
||||
return app.getPath('downloads');
|
||||
});
|
||||
|
||||
ipcMain.handle('resotre-default-shortcuts', () => {
|
||||
const shortCutRegister = ShortcutRegister.getInstance();
|
||||
shortCutRegister.restoreDefaults();
|
||||
});
|
||||
|
||||
ipcMain.handle('reload-shortcuts', () => {
|
||||
const shortCutRegister = ShortcutRegister.getInstance();
|
||||
shortCutRegister.reload();
|
||||
});
|
||||
|
||||
ipcMain.handle('update-shortcuts', (event, shortcuts) => {
|
||||
const shortCutRegister = ShortcutRegister.getInstance();
|
||||
shortCutRegister.updateShortcuts(shortcuts);
|
||||
});
|
||||
|
||||
ipcMain.handle('unregister-shortcuts', () => {
|
||||
const shortCutRegister = ShortcutRegister.getInstance();
|
||||
shortCutRegister.unregister();
|
||||
});
|
||||
};
|
||||
|
@@ -61,7 +61,11 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
});
|
||||
await connection.connect();
|
||||
|
||||
await connection.select('1+1').run();
|
||||
if (conn.client === 'firebird')
|
||||
connection.raw('SELECT rdb$get_context(\'SYSTEM\', \'DB_NAME\') FROM rdb$database');
|
||||
else
|
||||
await connection.select('1+1').run();
|
||||
|
||||
connection.destroy();
|
||||
|
||||
return { status: 'success' };
|
||||
|
@@ -62,7 +62,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
|
||||
ipcMain.handle('get-structure', async (event, params) => {
|
||||
try {
|
||||
const structure = await connections[params.uid].getStructure(
|
||||
const structure: unknown = await connections[params.uid].getStructure(
|
||||
params.schemas
|
||||
);
|
||||
|
||||
@@ -97,7 +97,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
|
||||
ipcMain.handle('get-engines', async (event, uid) => {
|
||||
try {
|
||||
const result = await connections[uid].getEngines();
|
||||
const result: unknown = await connections[uid].getEngines();
|
||||
|
||||
return { status: 'success', response: result };
|
||||
}
|
||||
@@ -160,8 +160,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
details: true,
|
||||
schema,
|
||||
tabUid,
|
||||
autocommit,
|
||||
comments: false
|
||||
autocommit
|
||||
});
|
||||
|
||||
return { status: 'success', response: result };
|
||||
|
@@ -5,7 +5,7 @@ import { ipcMain } from 'electron';
|
||||
import { faker } from '@faker-js/faker';
|
||||
import * as moment from 'moment';
|
||||
import { sqlEscaper } from 'common/libs/sqlUtils';
|
||||
import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BLOB, BIT, DATE, DATETIME } from 'common/fieldTypes';
|
||||
import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BLOB, BIT, DATE, DATETIME, BOOLEAN } from 'common/fieldTypes';
|
||||
import customizations from 'common/customizations';
|
||||
|
||||
export default (connections: {[key: string]: antares.Client}) => {
|
||||
@@ -105,6 +105,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
break;
|
||||
case 'pg':
|
||||
case 'sqlite':
|
||||
case 'firebird':
|
||||
escapedParam = `'${params.content.replaceAll('\'', '\'\'')}'`;
|
||||
break;
|
||||
}
|
||||
@@ -124,6 +125,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
escapedParam = `0x${fileBlob.toString('hex')}`;
|
||||
break;
|
||||
case 'pg':
|
||||
case 'firebird':
|
||||
fileBlob = fs.readFileSync(params.content);
|
||||
escapedParam = `decode('${fileBlob.toString('hex')}', 'hex')`;
|
||||
break;
|
||||
@@ -141,6 +143,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
escapedParam = '\'\'';
|
||||
break;
|
||||
case 'pg':
|
||||
case 'firebird':
|
||||
escapedParam = 'decode(\'\', \'hex\')';
|
||||
break;
|
||||
case 'sqlite':
|
||||
@@ -153,6 +156,19 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
escapedParam = `b'${sqlEscaper(params.content)}'`;
|
||||
reload = true;
|
||||
}
|
||||
else if (BOOLEAN.includes(params.type)) {
|
||||
switch (connections[params.uid]._client) {
|
||||
case 'mysql':
|
||||
case 'maria':
|
||||
case 'pg':
|
||||
case 'firebird':
|
||||
escapedParam = params.content;
|
||||
break;
|
||||
case 'sqlite':
|
||||
escapedParam = Number(params.content === 'true');
|
||||
break;
|
||||
}
|
||||
}
|
||||
else if (params.content === null)
|
||||
escapedParam = 'NULL';
|
||||
else
|
||||
@@ -177,7 +193,10 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
if (typeof orgRow[key] === 'string')
|
||||
orgRow[key] = `'${orgRow[key]}'`;
|
||||
|
||||
orgRow[key] = `= ${orgRow[key]}`;
|
||||
if (orgRow[key] === null)
|
||||
orgRow[key] = `IS ${orgRow[key]}`;
|
||||
else
|
||||
orgRow[key] = `= ${orgRow[key]}`;
|
||||
}
|
||||
|
||||
await connections[params.uid]
|
||||
@@ -208,10 +227,11 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
}).join(',');
|
||||
|
||||
try {
|
||||
const result = await connections[params.uid]
|
||||
const result: unknown = await connections[params.uid]
|
||||
.schema(params.schema)
|
||||
.delete(params.table)
|
||||
.where({ [params.primary]: `IN (${idString})` })
|
||||
.limit(params.rows.length)
|
||||
.run();
|
||||
|
||||
return { status: 'success', response: result };
|
||||
@@ -270,6 +290,7 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
break;
|
||||
case 'pg':
|
||||
case 'sqlite':
|
||||
case 'firebird':
|
||||
escapedParam = `'${params.row[key].value.replaceAll('\'', '\'\'')}'`;
|
||||
break;
|
||||
}
|
||||
@@ -367,7 +388,20 @@ export default (connections: {[key: string]: antares.Client}) => {
|
||||
if (description)
|
||||
query.select(`LEFT(${description}, 20) AS foreign_description`);
|
||||
|
||||
const results = await query.run();
|
||||
const results = await query.run<{[key: string]: string}>();
|
||||
|
||||
const parsedResults: {[key: string]: string}[] = [];
|
||||
|
||||
for (const row of results.rows) {
|
||||
const remappedRow: {[key: string]: string} = {};
|
||||
|
||||
for (const key in row)
|
||||
remappedRow[key.toLowerCase()] = row[key];// Thanks Firebird -.-
|
||||
|
||||
parsedResults.push(remappedRow);
|
||||
}
|
||||
|
||||
results.rows = parsedResults;
|
||||
|
||||
return { status: 'success', response: results };
|
||||
}
|
||||
|
@@ -16,7 +16,7 @@ const queryLogger = ({ sql, cUid }: {sql: string; cUid: string}) => {
|
||||
/**
|
||||
* As Simple As Possible Query Builder Core
|
||||
*/
|
||||
export class AntaresCore {
|
||||
export abstract class AntaresCore {
|
||||
_client: antares.ClientCode;
|
||||
protected _cUid: string
|
||||
protected _params: mysql.ConnectionOptions | pg.ClientConfig | { databasePath: string; readonly: boolean};
|
||||
|
@@ -2,6 +2,7 @@ import * as antares from 'common/interfaces/antares';
|
||||
import { MySQLClient } from './clients/MySQLClient';
|
||||
import { PostgreSQLClient } from './clients/PostgreSQLClient';
|
||||
import { SQLiteClient } from './clients/SQLiteClient';
|
||||
import { FirebirdSQLClient } from './clients/FirebirdSQLClient';
|
||||
|
||||
export class ClientsFactory {
|
||||
static getClient (args: antares.ClientParams) {
|
||||
@@ -13,6 +14,8 @@ export class ClientsFactory {
|
||||
return new PostgreSQLClient(args);
|
||||
case 'sqlite':
|
||||
return new SQLiteClient(args);
|
||||
case 'firebird':
|
||||
return new FirebirdSQLClient(args);
|
||||
default:
|
||||
throw new Error(`Unknown database client: ${args.client}`);
|
||||
}
|
||||
|
139
src/main/libs/ShortcutRegister.ts
Normal file
139
src/main/libs/ShortcutRegister.ts
Normal file
@@ -0,0 +1,139 @@
|
||||
import { BrowserWindow, globalShortcut, Menu, MenuItem, MenuItemConstructorOptions } from 'electron';
|
||||
import * as Store from 'electron-store';
|
||||
import { ShortcutRecord, shortcuts } from 'common/shortcuts';
|
||||
|
||||
const shortcutsStore = new Store({ name: 'shortcuts' });
|
||||
const isDevelopment = process.env.NODE_ENV !== 'production';
|
||||
const defaultShortcuts = shortcuts.filter(s => s.os.includes(process.platform));
|
||||
|
||||
export type ShortcutMode = 'local' | 'global'
|
||||
export type OsMenu = {
|
||||
[key in NodeJS.Platform]?: MenuItemConstructorOptions[];
|
||||
};
|
||||
|
||||
export class ShortcutRegister {
|
||||
private _shortcuts: ShortcutRecord[];
|
||||
private _mainWindow: BrowserWindow;
|
||||
private _menu: Menu;
|
||||
private _menuTemplate: OsMenu;
|
||||
private _mode: ShortcutMode;
|
||||
private static _instance: ShortcutRegister;
|
||||
|
||||
private constructor (args: { mainWindow: BrowserWindow; menuTemplate?: OsMenu; mode: ShortcutMode }) {
|
||||
this._mainWindow = args.mainWindow;
|
||||
this._menuTemplate = args.menuTemplate || {};
|
||||
this._mode = args.mode;
|
||||
this.shortcuts = shortcutsStore.get('shortcuts', defaultShortcuts) as ShortcutRecord[];
|
||||
}
|
||||
|
||||
public static getInstance (args?: { mainWindow?: BrowserWindow; menuTemplate?: OsMenu; mode?: ShortcutMode }) {
|
||||
if (!ShortcutRegister._instance && args.menuTemplate !== undefined && args.mode !== undefined) {
|
||||
ShortcutRegister._instance = new ShortcutRegister({
|
||||
mainWindow: args.mainWindow,
|
||||
menuTemplate: args.menuTemplate,
|
||||
mode: args.mode
|
||||
});
|
||||
}
|
||||
|
||||
return ShortcutRegister._instance;
|
||||
}
|
||||
|
||||
get shortcuts () {
|
||||
return this._shortcuts;
|
||||
}
|
||||
|
||||
private set shortcuts (value: ShortcutRecord[]) {
|
||||
this._shortcuts = value;
|
||||
shortcutsStore.set('shortcuts', value);
|
||||
}
|
||||
|
||||
init () {
|
||||
this._mainWindow.webContents.send('update-shortcuts', this.shortcuts);
|
||||
|
||||
this.buildBaseMenu();
|
||||
|
||||
if (this._mode === 'global')
|
||||
this.setGlobalShortcuts();
|
||||
else if (this._mode === 'local')
|
||||
this.setLocalShortcuts();
|
||||
else
|
||||
throw new Error(`Unknown mode "${this._mode}"`);
|
||||
|
||||
Menu.setApplicationMenu(this._menu);
|
||||
}
|
||||
|
||||
private buildBaseMenu () {
|
||||
if (Object.keys(this._menuTemplate).includes(process.platform))
|
||||
this._menu = Menu.buildFromTemplate(this._menuTemplate[process.platform]);
|
||||
else
|
||||
this._menu = new Menu();
|
||||
}
|
||||
|
||||
private setLocalShortcuts () {
|
||||
for (const shortcut of this.shortcuts) {
|
||||
if (shortcut.os.includes(process.platform)) {
|
||||
for (const key of shortcut.keys) {
|
||||
try {
|
||||
this._menu.append(new MenuItem({
|
||||
label: 'Shortcuts',
|
||||
visible: false,
|
||||
submenu: [{
|
||||
label: String(key),
|
||||
accelerator: key,
|
||||
visible: false,
|
||||
click: () => {
|
||||
this._mainWindow.webContents.send(shortcut.event);
|
||||
if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
|
||||
}
|
||||
}]
|
||||
}));
|
||||
}
|
||||
catch (error) {
|
||||
if (isDevelopment) console.log(error);
|
||||
this.restoreDefaults();
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private setGlobalShortcuts () {
|
||||
for (const shortcut of this.shortcuts) {
|
||||
if (shortcut.os.includes(process.platform)) {
|
||||
for (const key of shortcut.keys) {
|
||||
try {
|
||||
globalShortcut.register(key, () => {
|
||||
this._mainWindow.webContents.send(shortcut.event);
|
||||
if (isDevelopment) console.log('GLOBAL EVENT:', shortcut);
|
||||
});
|
||||
}
|
||||
catch (error) {
|
||||
if (isDevelopment) console.log(error);
|
||||
this.restoreDefaults();
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
reload () {
|
||||
this.unregister();
|
||||
this.init();
|
||||
}
|
||||
|
||||
updateShortcuts (shortcuts: ShortcutRecord[]) {
|
||||
this.shortcuts = shortcuts;
|
||||
this.reload();
|
||||
}
|
||||
|
||||
restoreDefaults () {
|
||||
this.shortcuts = defaultShortcuts;
|
||||
this.reload();
|
||||
}
|
||||
|
||||
unregister () {
|
||||
if (this._mode === 'global') globalShortcut.unregisterAll();
|
||||
}
|
||||
}
|
1247
src/main/libs/clients/FirebirdSQLClient.ts
Normal file
1247
src/main/libs/clients/FirebirdSQLClient.ts
Normal file
File diff suppressed because it is too large
Load Diff
@@ -147,7 +147,14 @@ export class MySQLClient extends AntaresCore {
|
||||
|
||||
if (this._params.ssh) {
|
||||
try {
|
||||
this._ssh = new SSH2Promise({ ...this._params.ssh });
|
||||
if (this._params.ssh.password === '') delete this._params.ssh.password;
|
||||
if (this._params.ssh.passphrase === '') delete this._params.ssh.passphrase;
|
||||
|
||||
this._ssh = new SSH2Promise({
|
||||
...this._params.ssh,
|
||||
keepaliveInterval: 30*60*1000,
|
||||
debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
|
||||
});
|
||||
|
||||
const tunnel = await this._ssh.addTunnel({
|
||||
remoteAddr: this._params.host,
|
||||
@@ -225,6 +232,9 @@ export class MySQLClient extends AntaresCore {
|
||||
if (hasAnsiQuotes)
|
||||
await connection.query(`SET SESSION sql_mode = '${sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
|
||||
|
||||
if (this._params.readonly)
|
||||
await connection.query('SET SESSION TRANSACTION READ ONLY');
|
||||
|
||||
connection.on('connection', conn => {
|
||||
if (this._params.readonly)
|
||||
conn.query('SET SESSION TRANSACTION READ ONLY');
|
||||
@@ -244,25 +254,15 @@ export class MySQLClient extends AntaresCore {
|
||||
async getStructure (schemas: Set<string>) {
|
||||
/* eslint-disable camelcase */
|
||||
interface ShowTableResult {
|
||||
Db?: string;
|
||||
Name: string;
|
||||
Engine: string;
|
||||
Version: number;
|
||||
Row_format: string;
|
||||
Rows: number;
|
||||
Avg_row_length: number;
|
||||
Data_length: number;
|
||||
Max_data_length: number;
|
||||
Index_length: number;
|
||||
Data_free: number;
|
||||
Auto_increment: number;
|
||||
Create_time: Date;
|
||||
Update_time: Date;
|
||||
Check_time?: number;
|
||||
Collation: string;
|
||||
Checksum?: number;
|
||||
Create_options: string;
|
||||
Comment: string;
|
||||
TABLE_SCHEMA?: string;
|
||||
TABLE_NAME: string;
|
||||
TABLE_TYPE: string;
|
||||
TABLE_ROWS: number;
|
||||
ENGINE: string;
|
||||
DATA_LENGTH: number;
|
||||
INDEX_LENGTH: number;
|
||||
TABLE_COLLATION: string;
|
||||
TABLE_COMMENT: string;
|
||||
}
|
||||
|
||||
interface ShowTriggersResult {
|
||||
@@ -299,10 +299,25 @@ export class MySQLClient extends AntaresCore {
|
||||
for (const db of filteredDatabases) {
|
||||
if (!schemas.has(db.Database)) continue;
|
||||
|
||||
let { rows: tables } = await this.raw<antares.QueryResult<ShowTableResult>>(`SHOW TABLE STATUS FROM \`${db.Database}\``);
|
||||
let { rows: tables } = await this.raw<antares.QueryResult<ShowTableResult>>(`
|
||||
SELECT
|
||||
TABLE_NAME,
|
||||
TABLE_TYPE,
|
||||
ENGINE,
|
||||
DATA_LENGTH,
|
||||
INDEX_LENGTH,
|
||||
TABLE_COMMENT,
|
||||
TABLE_COLLATION,
|
||||
CREATE_TIME,
|
||||
UPDATE_TIME
|
||||
FROM information_schema.TABLES
|
||||
WHERE TABLE_SCHEMA = "${db.Database}"
|
||||
ORDER BY TABLE_NAME
|
||||
`);
|
||||
|
||||
if (tables.length) {
|
||||
tables = tables.map(table => {
|
||||
table.Db = db.Database;
|
||||
table.TABLE_SCHEMA = db.Database;
|
||||
return table;
|
||||
});
|
||||
tablesArr.push(...tables);
|
||||
@@ -321,9 +336,9 @@ export class MySQLClient extends AntaresCore {
|
||||
return filteredDatabases.map(db => {
|
||||
if (schemas.has(db.Database)) {
|
||||
// TABLES
|
||||
const remappedTables: antares.TableInfos[] = tablesArr.filter(table => table.Db === db.Database).map(table => {
|
||||
const remappedTables: antares.TableInfos[] = tablesArr.filter(table => table.TABLE_SCHEMA === db.Database).map(table => {
|
||||
let tableType;
|
||||
switch (table.Comment) {
|
||||
switch (table.TABLE_TYPE) {
|
||||
case 'VIEW':
|
||||
tableType = 'view';
|
||||
break;
|
||||
@@ -332,20 +347,17 @@ export class MySQLClient extends AntaresCore {
|
||||
break;
|
||||
}
|
||||
|
||||
const tableSize = Number(table.Data_length) + Number(table.Index_length);
|
||||
const tableSize = Number(table.DATA_LENGTH) + Number(table.INDEX_LENGTH);
|
||||
schemaSize += tableSize;
|
||||
|
||||
return {
|
||||
name: table.Name,
|
||||
name: table.TABLE_NAME,
|
||||
type: tableType,
|
||||
rows: table.Rows,
|
||||
created: table.Create_time,
|
||||
updated: table.Update_time,
|
||||
engine: table.Engine,
|
||||
comment: table.Comment,
|
||||
rows: table.TABLE_ROWS,
|
||||
engine: table.ENGINE,
|
||||
comment: table.TABLE_COMMENT,
|
||||
size: tableSize,
|
||||
autoIncrement: table.Auto_increment,
|
||||
collation: table.Collation
|
||||
collation: table.TABLE_COLLATION
|
||||
};
|
||||
});
|
||||
|
||||
@@ -469,7 +481,12 @@ export class MySQLClient extends AntaresCore {
|
||||
.orderBy({ ORDINAL_POSITION: 'ASC' })
|
||||
.run<TableColumnsResult>();
|
||||
|
||||
const { rows: fields } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
|
||||
let fields: CreateTableResult[] = [];
|
||||
try {
|
||||
const { rows } = await this.raw<antares.QueryResult<CreateTableResult>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
|
||||
fields = rows;
|
||||
}
|
||||
catch (_) {}
|
||||
|
||||
const remappedFields = fields.map(row => {
|
||||
if (!row['Create Table']) return false;
|
||||
@@ -940,7 +957,7 @@ export class MySQLClient extends AntaresCore {
|
||||
|
||||
return {
|
||||
algorithm: algorithm[0]['Create View'].match(/(?<=CREATE ALGORITHM=).*?(?=\s)/gs)[0],
|
||||
definer: viewInfo[0].DEFINER,
|
||||
definer: viewInfo[0].DEFINER.split('@').map((str: string) => `\`${str}\``).join('@'),
|
||||
security: viewInfo[0].SECURITY_TYPE,
|
||||
updateOption: viewInfo[0].CHECK_OPTION === 'NONE' ? '' : viewInfo[0].CHECK_OPTION,
|
||||
sql: viewInfo[0].VIEW_DEFINITION,
|
||||
@@ -1588,7 +1605,8 @@ export class MySQLClient extends AntaresCore {
|
||||
let timeStop: Date;
|
||||
let keysArr: antares.QueryForeign[] = [];
|
||||
|
||||
const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
|
||||
connection.query({ sql: query, nestTables }).then(async ([response, fields]) => {
|
||||
timeStop = new Date();
|
||||
const queryResult = response;
|
||||
@@ -1598,7 +1616,7 @@ export class MySQLClient extends AntaresCore {
|
||||
if (!field || Array.isArray(field))
|
||||
return undefined;
|
||||
|
||||
const type = this._getType(field);
|
||||
const type = this._getType(field as undefined);
|
||||
|
||||
return {
|
||||
name: field.orgName,
|
||||
|
@@ -162,7 +162,11 @@ export class PostgreSQLClient extends AntaresCore {
|
||||
|
||||
if (this._params.ssh) {
|
||||
try {
|
||||
this._ssh = new SSH2Promise({ ...this._params.ssh });
|
||||
this._ssh = new SSH2Promise({
|
||||
...this._params.ssh,
|
||||
keepaliveInterval: 30*60*1000,
|
||||
debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
|
||||
});
|
||||
|
||||
const tunnel = await this._ssh.addTunnel({
|
||||
remoteAddr: this._params.host,
|
||||
@@ -540,11 +544,7 @@ export class PostgreSQLClient extends AntaresCore {
|
||||
return {
|
||||
name: row.constraint_name,
|
||||
column: row.column_name,
|
||||
indexType: null as null,
|
||||
type: row.constraint_type,
|
||||
cardinality: null as null,
|
||||
comment: '',
|
||||
indexComment: ''
|
||||
type: row.constraint_type
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -1426,7 +1426,8 @@ export class PostgreSQLClient extends AntaresCore {
|
||||
let timeStop: Date;
|
||||
let keysArr: antares.QueryForeign[] = [];
|
||||
|
||||
const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
|
||||
(async () => {
|
||||
try {
|
||||
const res = await connection.query({ rowMode: args.nest ? 'array' : null, text: query });
|
||||
|
@@ -217,11 +217,7 @@ export class SQLiteClient extends AntaresCore {
|
||||
remappedIndexes.push({
|
||||
name: 'PRIMARY',
|
||||
column: key.name,
|
||||
indexType: null as never,
|
||||
type: 'PRIMARY',
|
||||
cardinality: null as never,
|
||||
comment: '',
|
||||
indexComment: ''
|
||||
type: 'PRIMARY'
|
||||
});
|
||||
}
|
||||
|
||||
@@ -348,6 +344,20 @@ export class SQLiteClient extends AntaresCore {
|
||||
|
||||
const tmpName = `Antares_${table}_tmp`;
|
||||
await this.raw(`CREATE TABLE "${tmpName}" AS SELECT * FROM "${table}"`);
|
||||
|
||||
// Get table triggers before drop
|
||||
const { rows: triggers } = await this.raw(`SELECT * FROM "${schema}".sqlite_master WHERE type='trigger' AND tbl_name = '${table}'`);
|
||||
const remappedTriggers = triggers.map((row) => {
|
||||
return {
|
||||
schema,
|
||||
sql: row.sql.match(/(BEGIN|begin)(.*)(END|end)/gs)[0],
|
||||
name: row.name,
|
||||
table: row.sql.match(/(?<=ON `).*?(?=`)/gs)[0],
|
||||
activation: row.sql.match(/(BEFORE|AFTER)/gs)[0],
|
||||
event: row.sql.match(/(INSERT|UPDATE|DELETE)/gs)[0]
|
||||
};
|
||||
});
|
||||
|
||||
await this.dropTable(params);
|
||||
|
||||
const createTableParams = {
|
||||
@@ -380,6 +390,11 @@ export class SQLiteClient extends AntaresCore {
|
||||
await this.raw(`INSERT INTO "${createTableParams.options.name}" (${insertFields.join(',')}) SELECT ${selectFields.join(',')} FROM "${tmpName}"`);
|
||||
|
||||
await this.dropTable({ schema: schema, table: tmpName });
|
||||
|
||||
// Recreates triggers
|
||||
for (const trigger of remappedTriggers)
|
||||
await this.createTrigger(trigger);
|
||||
|
||||
await this.raw('PRAGMA foreign_keys = 1');
|
||||
await this.raw('COMMIT');
|
||||
}
|
||||
@@ -628,7 +643,8 @@ export class SQLiteClient extends AntaresCore {
|
||||
let timeStop;
|
||||
const keysArr: antares.QueryForeign[] = [];
|
||||
|
||||
const { rows, report, fields, keys, duration } = await new Promise((resolve, reject) => {
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const { rows, report, fields, keys, duration }: any = await new Promise((resolve, reject) => {
|
||||
(async () => {
|
||||
let queryRunResult: sqlite.RunResult;
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
@@ -675,8 +691,8 @@ export class SQLiteClient extends AntaresCore {
|
||||
|
||||
if ([...TIME, ...DATETIME].includes(parsedType)) {
|
||||
const firstNotNull = queryAllResult.find(res => res[field.name] !== null);
|
||||
if (firstNotNull && firstNotNull[field.name].includes('.'))
|
||||
length = firstNotNull[field.name].split('.').pop().length;
|
||||
if (firstNotNull && String(firstNotNull[field.name]).includes('.'))
|
||||
length = String(firstNotNull[field.name]).split('.').pop().length;
|
||||
}
|
||||
|
||||
return {
|
||||
|
@@ -1,16 +1,15 @@
|
||||
import { app, BrowserWindow, globalShortcut, nativeImage, Menu, ipcMain } from 'electron';
|
||||
import { app, BrowserWindow, nativeImage, ipcMain } from 'electron';
|
||||
import * as path from 'path';
|
||||
import * as Store from 'electron-store';
|
||||
import * as windowStateKeeper from 'electron-window-state';
|
||||
import * as remoteMain from '@electron/remote/main';
|
||||
|
||||
import ipcHandlers from './ipc-handlers';
|
||||
import { shortcuts } from 'common/shortcuts';
|
||||
import { OsMenu, ShortcutRegister } from './libs/ShortcutRegister';
|
||||
|
||||
Store.initRenderer();
|
||||
const persistentStore = new Store({ name: 'settings' });
|
||||
|
||||
const appTheme = persistentStore.get('application_theme');
|
||||
const settingsStore = new Store({ name: 'settings' });
|
||||
const appTheme = settingsStore.get('application_theme');
|
||||
const isDevelopment = process.env.NODE_ENV !== 'production';
|
||||
const isMacOS = process.platform === 'darwin';
|
||||
const isLinux = process.platform === 'linux';
|
||||
@@ -38,6 +37,7 @@ async function createMainWindow () {
|
||||
webPreferences: {
|
||||
nodeIntegration: true,
|
||||
contextIsolation: false,
|
||||
devTools: isDevelopment,
|
||||
spellcheck: false
|
||||
},
|
||||
autoHideMenuBar: true,
|
||||
@@ -86,7 +86,7 @@ else {
|
||||
ipcHandlers();
|
||||
|
||||
ipcMain.on('refresh-theme-settings', () => {
|
||||
const appTheme = persistentStore.get('application_theme');
|
||||
const appTheme = settingsStore.get('application_theme');
|
||||
if (isWindows && mainWindow) {
|
||||
mainWindow.setTitleBarOverlay({
|
||||
color: appTheme === 'dark' ? '#3f3f3f' : '#fff',
|
||||
@@ -124,8 +124,8 @@ else {
|
||||
if (isWindows)
|
||||
mainWindow.show();
|
||||
|
||||
if (isDevelopment)
|
||||
mainWindow.webContents.openDevTools();
|
||||
// if (isDevelopment)
|
||||
// mainWindow.webContents.openDevTools();
|
||||
|
||||
process.on('uncaughtException', error => {
|
||||
mainWindow.webContents.send('unhandled-exception', error);
|
||||
@@ -143,40 +143,11 @@ else {
|
||||
window.webContents.session.loadExtension(extensionPath, { allowFileAccess: true }).catch(console.error);
|
||||
}
|
||||
});
|
||||
|
||||
app.on('browser-window-focus', () => {
|
||||
// Send registered shortcut events to window
|
||||
for (const shortcut of shortcuts) {
|
||||
if (shortcut.os.includes(process.platform)) {
|
||||
for (const key of shortcut.keys) {
|
||||
globalShortcut.register(key, () => {
|
||||
mainWindow.webContents.send(shortcut.event);
|
||||
if (isDevelopment) console.log('EVENT:', shortcut);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (isDevelopment) { // Dev shortcuts
|
||||
globalShortcut.register('Shift+CommandOrControl+F5', () => {
|
||||
mainWindow.reload();
|
||||
});
|
||||
globalShortcut.register('Shift+CommandOrControl+F12', () => {
|
||||
mainWindow.webContents.openDevTools();
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
app.on('browser-window-blur', () => {
|
||||
globalShortcut.unregisterAll();
|
||||
});
|
||||
}
|
||||
|
||||
function createAppMenu () {
|
||||
let menu: Electron.Menu = null;
|
||||
|
||||
if (isMacOS) {
|
||||
menu = Menu.buildFromTemplate([
|
||||
const menuTemplate: OsMenu = {
|
||||
darwin: [
|
||||
{
|
||||
label: app.name,
|
||||
submenu: [
|
||||
@@ -207,10 +178,11 @@ function createAppMenu () {
|
||||
{
|
||||
role: 'windowMenu'
|
||||
}
|
||||
]);
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
Menu.setApplicationMenu(menu);
|
||||
const shortCutRegister = ShortcutRegister.getInstance({ mainWindow, menuTemplate, mode: 'local' });
|
||||
shortCutRegister.init();
|
||||
}
|
||||
|
||||
function saveWindowState () {
|
||||
|
@@ -67,10 +67,6 @@ const { changeApplicationTheme } = settingsStore;
|
||||
|
||||
const isAllConnectionsModal: Ref<boolean> = ref(false);
|
||||
|
||||
ipcRenderer.on('open-connections-modal', () => {
|
||||
isAllConnectionsModal.value = true;
|
||||
});
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
setTimeout(() => {
|
||||
changeApplicationTheme(applicationTheme.value);// Forces persistentStore to save on file and mail process
|
||||
@@ -78,6 +74,22 @@ document.addEventListener('DOMContentLoaded', () => {
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
ipcRenderer.on('open-all-connections', () => {
|
||||
isAllConnectionsModal.value = true;
|
||||
});
|
||||
|
||||
ipcRenderer.on('open-scratchpad', () => {
|
||||
isScratchpad.value = true;
|
||||
});
|
||||
|
||||
ipcRenderer.on('open-settings', () => {
|
||||
isSettingModal.value = true;
|
||||
});
|
||||
|
||||
ipcRenderer.on('create-connection', () => {
|
||||
workspacesStore.selectWorkspace('NEW');
|
||||
});
|
||||
|
||||
ipcRenderer.send('check-for-updates');
|
||||
checkVersionUpdate();
|
||||
|
||||
|
@@ -68,6 +68,10 @@ const props = defineProps({
|
||||
disableAutofocus: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
closeOnConfirm: {
|
||||
type: Boolean,
|
||||
default: true
|
||||
}
|
||||
});
|
||||
const emit = defineEmits(['confirm', 'hide']);
|
||||
@@ -90,7 +94,7 @@ const modalSizeClass = computed(() => {
|
||||
|
||||
const confirmModal = () => {
|
||||
emit('confirm');
|
||||
hideModal();
|
||||
if (props.closeOnConfirm) hideModal();
|
||||
};
|
||||
|
||||
const hideModal = () => {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="context" :class="{'bottom': isBottom}">
|
||||
<div class="context" :class="[{ 'bottom': isBottom }, { 'right': isRight }]">
|
||||
<a
|
||||
class="context-overlay"
|
||||
@click="close"
|
||||
@@ -19,9 +19,10 @@
|
||||
import { computed, onBeforeUnmount, onMounted, Ref, ref } from 'vue';
|
||||
|
||||
const contextContent: Ref<HTMLDivElement> = ref(null);
|
||||
const contextSize: Ref<DOMRect> = ref(null);
|
||||
const contextSize: Ref<{height: number; width: number; subHeight?: number; subWidth?: number}> = ref(null);
|
||||
const isBottom: Ref<boolean> = ref(false);
|
||||
const props = defineProps<{contextEvent: MouseEvent}>();
|
||||
const isRight: Ref<boolean> = ref(false);
|
||||
const props = defineProps<{ contextEvent: MouseEvent }>();
|
||||
const emit = defineEmits(['close-context']);
|
||||
|
||||
const position = computed(() => {
|
||||
@@ -39,8 +40,16 @@ const position = computed(() => {
|
||||
isBottom.value = true;
|
||||
}
|
||||
|
||||
if (clientX + contextSize.value.width + 5 >= window.innerWidth)
|
||||
if (clientY + contextSize.value.subHeight + contextSize.value.height >= window.innerHeight)
|
||||
isBottom.value = true;
|
||||
|
||||
if (clientX + contextSize.value.width + 5 >= window.innerWidth) {
|
||||
leftCord = `${clientX - contextSize.value.width}px`;
|
||||
isRight.value = true;
|
||||
}
|
||||
|
||||
if (clientX + contextSize.value.subWidth + contextSize.value.width >= window.innerWidth)
|
||||
isRight.value = true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,8 +71,20 @@ const onKey = (e: KeyboardEvent) => {
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (contextContent.value)
|
||||
if (contextContent.value) {
|
||||
contextSize.value = contextContent.value.getBoundingClientRect();
|
||||
|
||||
const submenus = contextContent.value.querySelectorAll<HTMLDivElement>('.context-submenu');
|
||||
|
||||
for (const submenu of submenus) {
|
||||
const submenuSize = submenu.getBoundingClientRect();
|
||||
|
||||
if (!contextSize.value.subHeight || submenuSize.height > contextSize.value.subHeight)
|
||||
contextSize.value.subHeight = submenuSize.height;
|
||||
if (!contextSize.value.subWidth || submenuSize.width > contextSize.value.subWidth)
|
||||
contextSize.value.subWidth = submenuSize.width;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
@@ -73,88 +94,94 @@ onBeforeUnmount(() => {
|
||||
|
||||
<style lang="scss">
|
||||
.context {
|
||||
display: flex;
|
||||
font-size: 16px;
|
||||
z-index: 400;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
height: 100vh;
|
||||
right: 0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
display: flex;
|
||||
font-size: 16px;
|
||||
z-index: 400;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
height: 100vh;
|
||||
right: 0;
|
||||
top: 0;
|
||||
left: 0;
|
||||
bottom: 0;
|
||||
|
||||
&:not(.bottom) .context-submenu {
|
||||
top: -0.2rem;
|
||||
}
|
||||
&:not(.bottom) .context-submenu {
|
||||
top: -0.2rem;
|
||||
}
|
||||
|
||||
&.bottom .context-submenu {
|
||||
bottom: -0.2rem;
|
||||
}
|
||||
&.bottom .context-submenu {
|
||||
bottom: -0.2rem;
|
||||
}
|
||||
|
||||
.context-container {
|
||||
min-width: 100px;
|
||||
z-index: 10;
|
||||
padding: 0;
|
||||
background: #1d1d1d;
|
||||
border-radius: $border-radius;
|
||||
border: 1px solid $bg-color-light-dark;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: absolute;
|
||||
pointer-events: initial;
|
||||
&:not(.right) .context-submenu {
|
||||
left: 100%;
|
||||
}
|
||||
|
||||
.context-element {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 0.2rem;
|
||||
padding: 0.1rem 0.3rem;
|
||||
&.right .context-submenu {
|
||||
right: 100%;
|
||||
}
|
||||
|
||||
.context-container {
|
||||
min-width: 100px;
|
||||
z-index: 10;
|
||||
padding: 0;
|
||||
background: #1d1d1d;
|
||||
border-radius: $border-radius;
|
||||
cursor: pointer;
|
||||
justify-content: space-between;
|
||||
position: relative;
|
||||
white-space: nowrap;
|
||||
border: 1px solid $bg-color-light-dark;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
position: absolute;
|
||||
pointer-events: initial;
|
||||
|
||||
.context-submenu {
|
||||
border-radius: $border-radius;
|
||||
border: 1px solid $bg-color-light-dark;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
transition: opacity 0.2s;
|
||||
position: absolute;
|
||||
left: 100%;
|
||||
min-width: 100px;
|
||||
background: #1d1d1d;
|
||||
.context-element {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin: 0.2rem;
|
||||
padding: 0.1rem 0.3rem;
|
||||
border-radius: $border-radius;
|
||||
cursor: pointer;
|
||||
justify-content: space-between;
|
||||
position: relative;
|
||||
white-space: nowrap;
|
||||
|
||||
.context-submenu {
|
||||
border-radius: $border-radius;
|
||||
border: 1px solid $bg-color-light-dark;
|
||||
opacity: 0;
|
||||
visibility: hidden;
|
||||
transition: opacity 0.2s;
|
||||
position: absolute;
|
||||
min-width: 100px;
|
||||
background: #1d1d1d;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.context-submenu {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.context-submenu {
|
||||
display: block;
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.context-overlay {
|
||||
background: transparent;
|
||||
bottom: 0;
|
||||
cursor: default;
|
||||
display: block;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
.context-overlay {
|
||||
background: transparent;
|
||||
bottom: 0;
|
||||
cursor: default;
|
||||
display: block;
|
||||
left: 0;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.disabled {
|
||||
pointer-events: none;
|
||||
filter: grayscale(100%);
|
||||
opacity: 0.5;
|
||||
pointer-events: none;
|
||||
filter: grayscale(100%);
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
@@ -51,14 +51,17 @@ watch(editorTheme, () => {
|
||||
|
||||
watch(editorFontSize, () => {
|
||||
const sizes = {
|
||||
small: 12,
|
||||
medium: 14,
|
||||
large: 16
|
||||
xsmall: '10px',
|
||||
small: '12px',
|
||||
medium: '14px',
|
||||
large: '16px',
|
||||
xlarge: '18px',
|
||||
xxlarge: '20px'
|
||||
};
|
||||
|
||||
if (editor) {
|
||||
editor.setOptions({
|
||||
fontSize: sizes[editorFontSize.value as undefined as 'small' | 'medium' | 'large']
|
||||
fontSize: sizes[editorFontSize.value]
|
||||
});
|
||||
}
|
||||
});
|
||||
|
@@ -7,7 +7,7 @@
|
||||
:option-label="(opt: any) => opt.name === 'manual' ? t('message.manualValue') : t(`faker.${opt.name}`)"
|
||||
option-track-by="name"
|
||||
:disabled="!isChecked"
|
||||
style="flex-grow: 0;"
|
||||
:style="'flex-grow: 0;'"
|
||||
@change="onChange"
|
||||
/>
|
||||
|
||||
@@ -87,7 +87,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, PropType, Ref, ref, watch } from 'vue';
|
||||
import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT } from 'common/fieldTypes';
|
||||
import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT, UUID, IS_BIGINT } from 'common/fieldTypes';
|
||||
import BaseUploadInput from '@/components/BaseUploadInput.vue';
|
||||
import ForeignKeySelect from '@/components/ForeignKeySelect.vue';
|
||||
import FakerMethods from 'common/FakerMethods';
|
||||
@@ -126,6 +126,8 @@ const fakerGroups = computed(() => {
|
||||
localType.value = 'datetime';
|
||||
else if (TIME.includes(props.type))
|
||||
localType.value = 'time';
|
||||
else if (UUID.includes(props.type))
|
||||
localType.value = 'uuid';
|
||||
else
|
||||
localType.value = 'none';
|
||||
|
||||
@@ -144,8 +146,12 @@ const inputProps = () => {
|
||||
if ([...TEXT, ...LONG_TEXT].includes(props.type))
|
||||
return { type: 'text', mask: false };
|
||||
|
||||
if ([...NUMBER, ...FLOAT].includes(props.type))
|
||||
return { type: 'number', mask: false };
|
||||
if ([...NUMBER, ...FLOAT].includes(props.type)) {
|
||||
if (IS_BIGINT.includes(props.type))
|
||||
return { type: 'text', mask: false };
|
||||
else
|
||||
return { type: 'number', mask: false };
|
||||
}
|
||||
|
||||
if (TIME.includes(props.type)) {
|
||||
let timeMask = '##:##:##';
|
||||
|
122
src/renderer/components/KeyPressDetector.vue
Normal file
122
src/renderer/components/KeyPressDetector.vue
Normal file
@@ -0,0 +1,122 @@
|
||||
<template>
|
||||
<div class="form-group has-icon-right m-0">
|
||||
<input
|
||||
class="form-input"
|
||||
type="text"
|
||||
:value="pressedKeys"
|
||||
:placeholder="t('message.registerAShortcut')"
|
||||
@focus="isFocus = true"
|
||||
@blur="isFocus = false"
|
||||
@keydown.prevent.stop="onKey"
|
||||
>
|
||||
<i class="form-icon mdi mdi-keyboard-outline mdi-24px" />
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { computed, PropType, Ref, ref, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import Application from '@/ipc-api/Application';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const emit = defineEmits(['update:modelValue']);
|
||||
|
||||
const isMacOS = process.platform === 'darwin';
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: String as PropType<string | Electron.Accelerator>
|
||||
});
|
||||
|
||||
const isFocus = ref(false);
|
||||
const keyboardEvent: Ref<KeyboardEvent> = ref(null);
|
||||
|
||||
const pressedKeys = computed(() => {
|
||||
const keys: string[] = [];
|
||||
const singleKeysToIgnore = ['Dead', 'Backspace', 'ArrotLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'];
|
||||
const specialKeys = ['Control', 'Alt', 'AltGraph', 'Shift', 'Meta', 'CapsLock', 'ContextMenu', 'Escape'];
|
||||
const keysFromCode = ['Space', 'Minus', 'Equal', 'Slash', 'Quote', 'Semicolon', 'Comma', 'Period', 'Backslash', 'BracketLeft', 'BracketRight'];
|
||||
|
||||
if (props.modelValue && !keyboardEvent.value)
|
||||
return props.modelValue;
|
||||
else if (keyboardEvent.value) {
|
||||
if (keyboardEvent.value.altKey)
|
||||
keys.push('Alt');
|
||||
if (keyboardEvent.value.ctrlKey)
|
||||
keys.push('Control');
|
||||
if (keyboardEvent.value.metaKey && isMacOS)
|
||||
keys.push('Command');
|
||||
if (keyboardEvent.value.shiftKey && keys.length)
|
||||
keys.push('Shift');
|
||||
if (keyboardEvent.value.code) {
|
||||
if (keys.length === 0 && (keyboardEvent.value.key.length === 1 || singleKeysToIgnore.includes(keyboardEvent.value.key)))
|
||||
return t('message.invalidShortcutMessage');
|
||||
else if (!specialKeys.includes(keyboardEvent.value.key)) {
|
||||
if (keyboardEvent.value.key === 'Dead') {
|
||||
keys.push(keyboardEvent.value.code
|
||||
.replace('Digit', '')
|
||||
.replace('Key', '')
|
||||
.replace('Quote', '\'')
|
||||
.replace('Backquote', '`'));
|
||||
}
|
||||
else if (keysFromCode.includes(keyboardEvent.value.code) || keyboardEvent.value.code.includes('Digit')) {
|
||||
keys.push(keyboardEvent.value.code
|
||||
.replace('Quote', '\'')
|
||||
.replace('Semicolon', ';')
|
||||
.replace('Slash', '/')
|
||||
.replace('Backslash', '\\')
|
||||
.replace('BracketLeft', '[')
|
||||
.replace('BracketRight', ']')
|
||||
.replace('Comma', ',')
|
||||
.replace('Period', '.')
|
||||
.replace('Minus', '-')
|
||||
.replace('Equal', '=')
|
||||
.replace('Digit', '')
|
||||
.replace('Key', ''));
|
||||
}
|
||||
else {
|
||||
keys.push(keyboardEvent.value.key.length === 1
|
||||
? keyboardEvent.value.key.toUpperCase()
|
||||
: keyboardEvent.value.key
|
||||
.replace('Arrow', '')
|
||||
);
|
||||
}
|
||||
}
|
||||
else
|
||||
return t('message.invalidShortcutMessage');
|
||||
}
|
||||
}
|
||||
|
||||
return keys.join('+');
|
||||
});
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
e.stopPropagation();
|
||||
e.preventDefault();
|
||||
keyboardEvent.value = e;
|
||||
};
|
||||
|
||||
watch(pressedKeys, (value) => {
|
||||
if (value !== t('message.invalidShortcutMessage'))
|
||||
emit('update:modelValue', pressedKeys.value);
|
||||
});
|
||||
|
||||
watch(isFocus, (val) => {
|
||||
if (val)
|
||||
Application.unregisterShortcuts();
|
||||
else
|
||||
Application.reloadShortcuts();
|
||||
});
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.has-icon-right {
|
||||
.form-input {
|
||||
padding-right: 1.8rem;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
caret-color: transparent;
|
||||
}
|
||||
.form-icon {
|
||||
right: 0.4rem;
|
||||
}
|
||||
}
|
||||
</style>
|
@@ -55,20 +55,7 @@
|
||||
<div class="panel-subtitle">
|
||||
{{ clients.get(connection.client) || connection.client }}
|
||||
</div>
|
||||
<div class="all-connections-buttons p-absolute d-flex" style="top: 0; right: 0;">
|
||||
<i
|
||||
v-if="connection.isPinned"
|
||||
class="all-connections-pinned mdi mdi-18px"
|
||||
:class="connectionHover === connection.uid ? 'mdi-pin-off' : 'mdi-pin'"
|
||||
:title="t('word.unpin')"
|
||||
@click.stop="unpinConnection(connection.uid)"
|
||||
/>
|
||||
<i
|
||||
v-else
|
||||
class="all-connections-pin mdi mdi-18px mdi-pin mdi-rotate-45"
|
||||
:title="t('word.pin')"
|
||||
@click.stop="pinConnection(connection.uid)"
|
||||
/>
|
||||
<div class="all-connections-buttons p-absolute d-flex" :style="'top: 0; right: 0;'">
|
||||
<i
|
||||
class="all-connections-delete mdi mdi-delete mdi-18px ml-2"
|
||||
:title="t('word.delete')"
|
||||
@@ -112,7 +99,7 @@
|
||||
</div>
|
||||
<div class="panel-footer text-center py-0">
|
||||
<div v-if="connection.ssl" class="chip bg-success mt-2">
|
||||
<i class="mdi mdi-lock mdi-18px mr-1" />
|
||||
<i class="mdi mdi-shield-key mdi-18px mr-1" />
|
||||
SSL
|
||||
</div>
|
||||
<div v-if="connection.ssh" class="chip bg-success mt-2">
|
||||
@@ -126,7 +113,7 @@
|
||||
key="trick"
|
||||
readonly
|
||||
class="p-absolute"
|
||||
style="width: 1px; height: 1px; opacity: 0;"
|
||||
:style="'width: 1px; height: 1px; opacity: 0;'"
|
||||
type="text"
|
||||
>
|
||||
<!-- workaround for useFocusTrap $lastFocusable -->
|
||||
@@ -171,15 +158,12 @@ const connectionsStore = useConnectionsStore();
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
|
||||
const { connections,
|
||||
pinnedConnections,
|
||||
lastConnections
|
||||
} = storeToRefs(connectionsStore);
|
||||
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
|
||||
|
||||
const {
|
||||
getConnectionName,
|
||||
pinConnection,
|
||||
unpinConnection,
|
||||
deleteConnection
|
||||
} = connectionsStore;
|
||||
const { selectWorkspace } = workspacesStore;
|
||||
@@ -206,13 +190,10 @@ const sortedConnections = computed(() => {
|
||||
const connTime = lastConnections.value.find((lc) => lc.uid === c.uid)?.time || 0;
|
||||
return {
|
||||
...c,
|
||||
time: connTime,
|
||||
isPinned: pinnedConnections.value.has(c.uid)
|
||||
time: connTime
|
||||
};
|
||||
})
|
||||
.sort((a, b) => {
|
||||
if (a.isPinned < b.isPinned) return 1;
|
||||
if (a.isPinned > b.isPinned) return -1;
|
||||
if (a.time < b.time) return 1;
|
||||
if (a.time > b.time) return -1;
|
||||
return 0;
|
||||
|
195
src/renderer/components/ModalConnectionAppearence.vue
Normal file
195
src/renderer/components/ModalConnectionAppearence.vue
Normal file
@@ -0,0 +1,195 @@
|
||||
<template>
|
||||
<Teleport to="#window-content">
|
||||
<div class="modal active">
|
||||
<a class="modal-overlay" @click.stop="closeModal" />
|
||||
<div ref="trapRef" class="modal-container p-0">
|
||||
<div class="modal-header pl-2">
|
||||
<div class="modal-title h6">
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-brush-variant mr-1" />
|
||||
<span class="cut-text">{{ t('message.editConnectionAppearence') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="btn btn-clear c-hand" @click.stop="closeModal" />
|
||||
</div>
|
||||
<div class="modal-body pb-0">
|
||||
<div class="content">
|
||||
<form class="form-horizontal">
|
||||
<div class="form-group mb-4">
|
||||
<div class="col-3">
|
||||
<label class="form-label">{{ t('word.label') }}</label>
|
||||
</div>
|
||||
<div class="col-9">
|
||||
<input
|
||||
ref="firstInput"
|
||||
v-model="localConnection.name"
|
||||
class="form-input"
|
||||
type="text"
|
||||
:placeholder="getConnectionName(localConnection.uid)"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-3">
|
||||
<label class="form-label">{{ t('word.icon') }}</label>
|
||||
</div>
|
||||
<div class="col-9 icons-wrapper">
|
||||
<div
|
||||
v-for="icon in icons"
|
||||
:key="icon.name"
|
||||
class="icon-box"
|
||||
:title="icon.name"
|
||||
:class="[icon.code ? `mdi ${icon.code} mdi-36px` : `dbi dbi-${connection.client}`, {'selected': localConnection.icon === icon.code}]"
|
||||
@click="localConnection.icon = icon.code"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-primary mr-2" @click.stop="editFolderAppearence">
|
||||
{{ t('word.update') }}
|
||||
</button>
|
||||
<button class="btn btn-link" @click.stop="closeModal">
|
||||
{{ t('word.close') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Teleport>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onBeforeUnmount, PropType, Ref, ref } from 'vue';
|
||||
import { useFocusTrap } from '@/composables/useFocusTrap';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { SidebarElement, useConnectionsStore } from '@/stores/connections';
|
||||
import { unproxify } from '@/libs/unproxify';
|
||||
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const props = defineProps({
|
||||
connection: {
|
||||
type: Object as PropType<SidebarElement>,
|
||||
required: true
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['close']);
|
||||
|
||||
const { updateConnectionOrder, getConnectionName } = connectionsStore;
|
||||
|
||||
const icons = [
|
||||
{ name: 'default', code: null },
|
||||
|
||||
// Symbols
|
||||
{ name: 'account-group', code: 'mdi-account-group-outline' },
|
||||
{ name: 'cloud', code: 'mdi-cloud-outline' },
|
||||
{ name: 'key-chain', code: 'mdi-key-chain-variant' },
|
||||
{ name: 'lightning-bolt', code: 'mdi-lightning-bolt' },
|
||||
{ name: 'map-marker', code: 'mdi-map-marker-radius-outline' },
|
||||
{ name: 'api', code: 'mdi-api' },
|
||||
{ name: 'chart-line', code: 'mdi-chart-line' },
|
||||
{ name: 'chat', code: 'mdi-chat-outline' },
|
||||
{ name: 'bug', code: 'mdi-bug-outline' },
|
||||
{ name: 'shield', code: 'mdi-shield-outline' },
|
||||
{ name: 'cart', code: 'mdi-cart-variant' },
|
||||
{ name: 'bank', code: 'mdi-bank-outline' },
|
||||
{ name: 'receipt', code: 'mdi-receipt-text-outline' },
|
||||
{ name: 'raspberry-pi', code: 'mdi-raspberry-pi' },
|
||||
{ name: 'book', code: 'mdi-book-outline' },
|
||||
{ name: 'web', code: 'mdi-web' },
|
||||
{ name: 'multimedia', code: 'mdi-multimedia' },
|
||||
{ name: 'qr-code', code: 'mdi-qrcode' },
|
||||
{ name: 'flask', code: 'mdi-flask-outline' },
|
||||
{ name: 'memory', code: 'mdi-memory' },
|
||||
{ name: 'cube', code: 'mdi-cube-outline' },
|
||||
{ name: 'weather', code: 'mdi-weather-partly-snowy-rainy' },
|
||||
{ name: 'controller', code: 'mdi-controller' },
|
||||
{ name: 'home-group', code: 'mdi-home-group' },
|
||||
|
||||
// Vehicles
|
||||
{ name: 'truck', code: 'mdi-truck-outline' },
|
||||
{ name: 'car', code: 'mdi-car' },
|
||||
{ name: 'motorbike', code: 'mdi-atv' },
|
||||
{ name: 'train', code: 'mdi-train' },
|
||||
{ name: 'airplane', code: 'mdi-airplane' },
|
||||
{ name: 'ferry', code: 'mdi-ferry' },
|
||||
|
||||
// Brand
|
||||
{ name: 'docker', code: 'mdi-docker' },
|
||||
{ name: 'open-source', code: 'mdi-open-source-initiative' },
|
||||
{ name: 'aws', code: 'mdi-aws' },
|
||||
{ name: 'google-cloud', code: 'mdi-google-cloud' },
|
||||
{ name: 'microsoft-azure', code: 'mdi-microsoft-azure' },
|
||||
{ name: 'linux', code: 'mdi-linux' },
|
||||
{ name: 'microsoft-windows', code: 'mdi-microsoft-windows' },
|
||||
{ name: 'apple', code: 'mdi-apple' },
|
||||
{ name: 'android', code: 'mdi-android' }
|
||||
];
|
||||
|
||||
const { trapRef } = useFocusTrap();
|
||||
|
||||
const firstInput: Ref<HTMLInputElement> = ref(null);
|
||||
const localConnection: Ref<SidebarElement> = ref(unproxify(props.connection));
|
||||
|
||||
const editFolderAppearence = () => {
|
||||
updateConnectionOrder(localConnection.value);
|
||||
closeModal();
|
||||
};
|
||||
|
||||
const closeModal = () => emit('close');
|
||||
|
||||
const onKey =(e: KeyboardEvent) => {
|
||||
e.stopPropagation();
|
||||
if (e.key === 'Escape')
|
||||
closeModal();
|
||||
};
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.modal-container {
|
||||
max-width: 360px;
|
||||
}
|
||||
|
||||
.icons-wrapper{
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, 40px);
|
||||
gap: 5px;
|
||||
|
||||
.icon-box {
|
||||
height: 40px;
|
||||
width: 40px;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
outline: 2px solid $primary-color;
|
||||
border-radius: 8px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.theme-light {
|
||||
.icons-wrapper {
|
||||
.dbi {
|
||||
filter: invert(100%) opacity(.8);
|
||||
|
||||
&.selected {
|
||||
outline-color: #1c96d6;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
@@ -40,6 +40,7 @@
|
||||
v-model="database.collation"
|
||||
class="form-select"
|
||||
:options="collations"
|
||||
:max-visible-options="1000"
|
||||
option-label="collation"
|
||||
option-track-by="collation"
|
||||
/>
|
||||
@@ -163,7 +164,7 @@ onBeforeUnmount(() => {
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.modal-container {
|
||||
max-width: 360px;
|
||||
}
|
||||
|
152
src/renderer/components/ModalFolderAppearence.vue
Normal file
152
src/renderer/components/ModalFolderAppearence.vue
Normal file
@@ -0,0 +1,152 @@
|
||||
<template>
|
||||
<Teleport to="#window-content">
|
||||
<div class="modal active">
|
||||
<a class="modal-overlay" @click.stop="closeModal" />
|
||||
<div ref="trapRef" class="modal-container p-0">
|
||||
<div class="modal-header pl-2">
|
||||
<div class="modal-title h6">
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-folder-edit mr-1" />
|
||||
<span class="cut-text">{{ t('message.editFolder') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<a class="btn btn-clear c-hand" @click.stop="closeModal" />
|
||||
</div>
|
||||
<div class="modal-body pb-0">
|
||||
<div class="content">
|
||||
<form class="form-horizontal">
|
||||
<div class="form-group mb-4">
|
||||
<div class="col-3">
|
||||
<label class="form-label">{{ t('word.name') }}</label>
|
||||
</div>
|
||||
<div class="col-9">
|
||||
<input
|
||||
ref="firstInput"
|
||||
v-model="localFolder.name"
|
||||
class="form-input"
|
||||
type="text"
|
||||
required
|
||||
:placeholder="t('message.folderName')"
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<div class="col-3">
|
||||
<label class="form-label">{{ t('word.color') }}</label>
|
||||
</div>
|
||||
<div class="col-9 color-wrapper">
|
||||
<div
|
||||
v-for="color in colorPalette"
|
||||
:key="color.name"
|
||||
class="color-box"
|
||||
:title="color.name"
|
||||
:style="`background-color: ${color.hex}`"
|
||||
@click="localFolder.color = color.hex"
|
||||
>
|
||||
<i v-if="localFolder.color === color.hex" class="mdi mdi-check" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-primary mr-2" @click.stop="editFolderAppearence">
|
||||
{{ t('word.update') }}
|
||||
</button>
|
||||
<button class="btn btn-link" @click.stop="closeModal">
|
||||
{{ t('word.close') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</Teleport>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { onBeforeUnmount, PropType, Ref, ref } from 'vue';
|
||||
import { useFocusTrap } from '@/composables/useFocusTrap';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { SidebarElement, useConnectionsStore } from '@/stores/connections';
|
||||
import { unproxify } from '@/libs/unproxify';
|
||||
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const props = defineProps({
|
||||
folder: {
|
||||
type: Object as PropType<SidebarElement>,
|
||||
required: true
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['close']);
|
||||
|
||||
const { updateConnectionOrder } = connectionsStore;
|
||||
|
||||
const colorPalette = [
|
||||
{ name: 'default', hex: '#E36929' },
|
||||
{ name: 'grape-fruit', hex: '#ED5565' },
|
||||
{ name: 'rose', hex: '#E3242B' },
|
||||
{ name: 'fire', hex: '#FDA50F' },
|
||||
{ name: 'sunflower', hex: '#FFCE54' },
|
||||
{ name: 'moss', hex: '#8A985E' },
|
||||
{ name: 'grass', hex: '#6DCD05' },
|
||||
{ name: 'emerald', hex: '#038835' },
|
||||
{ name: 'mint', hex: '#48CFAD' },
|
||||
{ name: 'aqua', hex: '#4FC1E9' },
|
||||
{ name: 'royal-lblue', hex: '#4169E1' },
|
||||
{ name: 'blue-jeans', hex: '#5D9CEC' },
|
||||
{ name: 'stone', hex: '#59788E' },
|
||||
{ name: 'lavander', hex: '#AC92EC' },
|
||||
{ name: 'pink-rose', hex: '#EC87C0' },
|
||||
{ name: 'smoke', hex: '#BEBDB8' },
|
||||
{ name: 'slate', hex: '#757C88' }
|
||||
];
|
||||
|
||||
const { trapRef } = useFocusTrap();
|
||||
|
||||
const firstInput: Ref<HTMLInputElement> = ref(null);
|
||||
const localFolder: Ref<SidebarElement> = ref(unproxify(props.folder));
|
||||
|
||||
const editFolderAppearence = () => {
|
||||
updateConnectionOrder(localFolder.value);
|
||||
closeModal();
|
||||
};
|
||||
|
||||
const closeModal = () => emit('close');
|
||||
|
||||
const onKey =(e: KeyboardEvent) => {
|
||||
e.stopPropagation();
|
||||
if (e.key === 'Escape')
|
||||
closeModal();
|
||||
};
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.modal-container {
|
||||
max-width: 360px;
|
||||
}
|
||||
|
||||
.color-wrapper{
|
||||
display: grid;
|
||||
grid-template-columns: repeat(auto-fill, 20px);
|
||||
gap: 5px;
|
||||
|
||||
.color-box {
|
||||
height: 20px;
|
||||
width: 20px;
|
||||
border-radius: 4px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
</style>
|
@@ -39,6 +39,7 @@
|
||||
v-model="database.collation"
|
||||
class="form-select"
|
||||
:options="collations"
|
||||
:max-visible-options="1000"
|
||||
option-label="collation"
|
||||
option-track-by="collation"
|
||||
/>
|
||||
@@ -142,7 +143,7 @@ onBeforeUnmount(() => {
|
||||
});
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style scoped lang="scss">
|
||||
.modal-container {
|
||||
max-width: 360px;
|
||||
}
|
||||
|
@@ -29,7 +29,7 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm mr-0 pr-1 d-flex"
|
||||
:class="{'loading':isQuering}"
|
||||
:title="`${t('word.refresh')} (F5)`"
|
||||
:title="`${t('word.refresh')}`"
|
||||
@click="getProcessesList"
|
||||
>
|
||||
<i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh mr-1" />
|
||||
@@ -135,6 +135,7 @@
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Component, computed, onBeforeUnmount, onMounted, onUpdated, Prop, Ref, ref } from 'vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
import { ConnectionParams } from 'common/interfaces/antares';
|
||||
import { exportRows } from '../libs/exportRows';
|
||||
import { useNotificationsStore } from '@/stores/notifications';
|
||||
@@ -326,10 +327,10 @@ const onKey = (e:KeyboardEvent) => {
|
||||
e.stopPropagation();
|
||||
if (e.key === 'Escape')
|
||||
closeModal();
|
||||
if (e.key === 'F5')
|
||||
getProcessesList();
|
||||
};
|
||||
|
||||
ipcRenderer.on('run-or-reload', getProcessesList);
|
||||
|
||||
window.addEventListener('keydown', onKey, { capture: true });
|
||||
|
||||
onMounted(() => {
|
||||
@@ -348,6 +349,8 @@ onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey, { capture: true });
|
||||
window.removeEventListener('resize', resizeResults);
|
||||
clearInterval(refreshInterval.value);
|
||||
|
||||
ipcRenderer.removeListener('run-or-reload', getProcessesList);
|
||||
});
|
||||
|
||||
defineExpose({ refreshScroller });
|
||||
|
@@ -30,6 +30,13 @@
|
||||
>
|
||||
<a class="tab-link">{{ t('word.themes') }}</a>
|
||||
</li>
|
||||
<li
|
||||
class="tab-item c-hand"
|
||||
:class="{'active': selectedTab === 'shortcuts'}"
|
||||
@click="selectTab('shortcuts')"
|
||||
>
|
||||
<a class="tab-link">{{ t('word.shortcuts') }}</a>
|
||||
</li>
|
||||
<li
|
||||
v-if="updateStatus !== 'disabled'"
|
||||
class="tab-item c-hand"
|
||||
@@ -79,7 +86,7 @@
|
||||
/>
|
||||
</div>
|
||||
<div class="col-4 col-sm-12 px-2 p-vcentered">
|
||||
<small class="d-block" style="line-height: 1.1; font-size: 70%;">
|
||||
<small class="d-block" :style="'line-height: 1.1; font-size: 70%;'">
|
||||
{{ t('message.missingOrIncompleteTranslation') }}<br>
|
||||
<a class="text-bold c-hand" @click="openOutside('https://github.com/antares-sql/antares/wiki/Translate-Antares')">{{ t('message.findOutHowToContribute') }}</a>
|
||||
</small>
|
||||
@@ -189,6 +196,41 @@
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group column col-12 mb-0">
|
||||
<div class="col-5 col-sm-12">
|
||||
<label class="form-label">
|
||||
{{ t('message.executeSelectedQuery') }}
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-3 col-sm-12">
|
||||
<label class="form-switch d-inline-block" @click.prevent="toggleExecuteSelected">
|
||||
<input type="checkbox" :checked="selectedExecuteSelected">
|
||||
<i class="form-icon" />
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="column col-12 h6 mt-4 text-uppercase mb-1">
|
||||
{{ t('word.resultsTable') }}
|
||||
</div>
|
||||
<div class="column col-12 col-sm-12 columns">
|
||||
<div class="form-group column col-12">
|
||||
<div class="col-5 col-sm-12">
|
||||
<label class="form-label">
|
||||
{{ t('message.defaultCopyType') }}
|
||||
</label>
|
||||
</div>
|
||||
<div class="col-3 col-sm-12">
|
||||
<BaseSelect
|
||||
v-model="defaultCopyType"
|
||||
class="form-select"
|
||||
:options="copyTypes"
|
||||
option-track-by="code"
|
||||
option-label="name"
|
||||
@change="changeDefaultCopyType(defaultCopyType)"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
@@ -232,7 +274,7 @@
|
||||
<div class="column col-12 h6 text-uppercase mb-2 mt-4">
|
||||
{{ t('message.editorTheme') }}
|
||||
</div>
|
||||
<div class="column col-6 h5 mb-4">
|
||||
<div class="column col-5 h5 mb-4">
|
||||
<BaseSelect
|
||||
v-model="localEditorTheme"
|
||||
class="form-select"
|
||||
@@ -244,28 +286,49 @@
|
||||
@change="changeEditorTheme(localEditorTheme)"
|
||||
/>
|
||||
</div>
|
||||
<div class="column col-6 mb-4">
|
||||
<div class="column col-7 mb-4">
|
||||
<div class="btn-group btn-group-block">
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'xsmall'}"
|
||||
@click="changeEditorFontSize('xsmall')"
|
||||
>
|
||||
10px
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'small'}"
|
||||
@click="changeEditorFontSize('small')"
|
||||
>
|
||||
{{ t('word.small') }}
|
||||
12px
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'medium'}"
|
||||
@click="changeEditorFontSize('medium')"
|
||||
>
|
||||
{{ t('word.medium') }}
|
||||
14px
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'large'}"
|
||||
@click="changeEditorFontSize('large')"
|
||||
>
|
||||
{{ t('word.large') }}
|
||||
16px
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'xlarge'}"
|
||||
@click="changeEditorFontSize('xlarge')"
|
||||
>
|
||||
18px
|
||||
</button>
|
||||
<button
|
||||
class="btn btn-dark cut-text"
|
||||
:class="{'active': editorFontSize === 'xxlarge'}"
|
||||
@click="changeEditorFontSize('xxlarge')"
|
||||
>
|
||||
20px
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -282,6 +345,9 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-show="selectedTab === 'shortcuts'" class="panel-body py-4">
|
||||
<ModalSettingsShortcuts />
|
||||
</div>
|
||||
<div v-show="selectedTab === 'update'" class="panel-body py-4">
|
||||
<ModalSettingsUpdate />
|
||||
</div>
|
||||
@@ -326,6 +392,7 @@ import { useFocusTrap } from '@/composables/useFocusTrap';
|
||||
import { localesNames } from '@/i18n/supported-locales';
|
||||
import ModalSettingsUpdate from '@/components/ModalSettingsUpdate.vue';
|
||||
import ModalSettingsChangelog from '@/components/ModalSettingsChangelog.vue';
|
||||
import ModalSettingsShortcuts from '@/components/ModalSettingsShortcuts.vue';
|
||||
import BaseTextEditor from '@/components/BaseTextEditor.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { AvailableLocale } from '@/i18n';
|
||||
@@ -347,6 +414,8 @@ const {
|
||||
dataTabLimit: pageSize,
|
||||
autoComplete: selectedAutoComplete,
|
||||
lineWrap: selectedLineWrap,
|
||||
executeSelected: selectedExecuteSelected,
|
||||
defaultCopyType: selectedCopyType,
|
||||
notificationsTimeout,
|
||||
restoreTabs,
|
||||
disableBlur,
|
||||
@@ -366,10 +435,12 @@ const {
|
||||
changeDisableScratchpad,
|
||||
changeAutoComplete,
|
||||
changeLineWrap,
|
||||
changeExecuteSelected,
|
||||
changeApplicationTheme,
|
||||
changeEditorTheme,
|
||||
changeEditorFontSize,
|
||||
updateNotificationsTimeout
|
||||
updateNotificationsTimeout,
|
||||
changeDefaultCopyType
|
||||
} = settingsStore;
|
||||
const {
|
||||
hideSettingModal: closeModal,
|
||||
@@ -384,7 +455,30 @@ const contributors = process.env.APP_CONTRIBUTORS;
|
||||
const appLogo = require('../images/logo.svg');
|
||||
const darkPreview = require('../images/dark.png');
|
||||
const lightPreview = require('../images/light.png');
|
||||
const editorThemes= [
|
||||
const exampleQuery = `-- This is an example
|
||||
SELECT
|
||||
employee.id,
|
||||
employee.first_name,
|
||||
employee.last_name,
|
||||
SUM(DATEDIFF("SECOND", call.start, call.end)) AS call_duration
|
||||
FROM call
|
||||
INNER JOIN employee ON call.employee_id = employee.id
|
||||
GROUP BY
|
||||
employee.id,
|
||||
employee.first_name,
|
||||
employee.last_name
|
||||
ORDER BY
|
||||
employee.id ASC;
|
||||
`;
|
||||
|
||||
const localLocale: Ref<AvailableLocale> = ref(null);
|
||||
const defaultCopyType: Ref<string> = ref(null);
|
||||
const localPageSize: Ref<number> = ref(null);
|
||||
const localTimeout: Ref<number> = ref(null);
|
||||
const localEditorTheme: Ref<string> = ref(null);
|
||||
const selectedTab: Ref<string> = ref('general');
|
||||
|
||||
const editorThemes = computed(() => [
|
||||
{
|
||||
group: t('word.light'),
|
||||
themes: [
|
||||
@@ -432,28 +526,7 @@ const editorThemes= [
|
||||
{ code: 'vibrant_ink', name: 'Vibrant Ink' }
|
||||
]
|
||||
}
|
||||
];
|
||||
const exampleQuery = `-- This is an example
|
||||
SELECT
|
||||
employee.id,
|
||||
employee.first_name,
|
||||
employee.last_name,
|
||||
SUM(DATEDIFF("SECOND", call.start, call.end)) AS call_duration
|
||||
FROM call
|
||||
INNER JOIN employee ON call.employee_id = employee.id
|
||||
GROUP BY
|
||||
employee.id,
|
||||
employee.first_name,
|
||||
employee.last_name
|
||||
ORDER BY
|
||||
employee.id ASC;
|
||||
`;
|
||||
|
||||
const localLocale: Ref<AvailableLocale> = ref(null);
|
||||
const localPageSize: Ref<number> = ref(null);
|
||||
const localTimeout: Ref<number> = ref(null);
|
||||
const localEditorTheme: Ref<string> = ref(null);
|
||||
const selectedTab: Ref<string> = ref('general');
|
||||
]);
|
||||
|
||||
const locales = computed(() => {
|
||||
const locales = [];
|
||||
@@ -463,6 +536,14 @@ const locales = computed(() => {
|
||||
return locales;
|
||||
});
|
||||
|
||||
const copyTypes = computed(() => [
|
||||
{ code: 'cell', name: t('word.cell') },
|
||||
{ code: 'html', name: t('word.table') },
|
||||
{ code: 'json', name: 'JSON' },
|
||||
{ code: 'csv', name: 'CSV' },
|
||||
{ code: 'sql', name: 'SQL insert' }
|
||||
]);
|
||||
|
||||
const hasUpdates = computed(() => ['available', 'downloading', 'downloaded', 'link'].includes(updateStatus.value));
|
||||
|
||||
const workspace = computed(() => {
|
||||
@@ -517,7 +598,12 @@ const toggleLineWrap = () => {
|
||||
changeLineWrap(!selectedLineWrap.value);
|
||||
};
|
||||
|
||||
const toggleExecuteSelected = () => {
|
||||
changeExecuteSelected(!selectedExecuteSelected.value);
|
||||
};
|
||||
|
||||
localLocale.value = selectedLocale.value;
|
||||
defaultCopyType.value = selectedCopyType.value;
|
||||
localPageSize.value = pageSize.value as number;
|
||||
localTimeout.value = notificationsTimeout.value as number;
|
||||
localEditorTheme.value = editorTheme.value as string;
|
||||
|
313
src/renderer/components/ModalSettingsShortcuts.vue
Normal file
313
src/renderer/components/ModalSettingsShortcuts.vue
Normal file
@@ -0,0 +1,313 @@
|
||||
<template>
|
||||
<div class="p-relative">
|
||||
<div class="shortcuts-tools pb-2 px-2">
|
||||
<button class="btn btn-dark btn-sm d-flex ml-2" @click="showAddModal">
|
||||
<i class="mdi mdi-24px mdi-plus mr-1" /><span>{{ t('message.addShortcut') }}</span>
|
||||
</button>
|
||||
<button class="btn btn-dark btn-sm d-flex ml-2" @click="isConfirmRestoreModal = true">
|
||||
<i class="mdi mdi-24px mdi-undo mr-1" /><span>{{ t('message.restoreDefaults') }}</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="container workspace-query-results">
|
||||
<div class="table table-hover">
|
||||
<div class="thead">
|
||||
<div class="tr text-uppercase">
|
||||
<div class="th no-border">
|
||||
<div>
|
||||
{{ t('word.event') }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="th no-border" style="width: 100%;">
|
||||
<div>
|
||||
{{ t('word.key', 2) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="th no-border" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="tbody">
|
||||
<div
|
||||
v-for="(shortcut, i) in shortcuts"
|
||||
:key="i"
|
||||
class="tr"
|
||||
tabindex="0"
|
||||
>
|
||||
<div class="td py-1">
|
||||
{{ t(shortcutEvents[shortcut.event].l18n, {param: shortcutEvents[shortcut.event].l18nParam}) }}
|
||||
</div>
|
||||
<div
|
||||
class="td py-1"
|
||||
style="border-right: 0;"
|
||||
v-html="parseKeys(shortcut.keys)"
|
||||
/>
|
||||
<div class="td py-1 pr-2">
|
||||
<button class="shortcut-button btn btn-link btn-sm d-flex p-0 px-1 mr-2" @click="showEditModal({...shortcut, index: i})">
|
||||
<span>{{ t('word.edit') }}</span><i class="mdi mdi-pencil ml-1" />
|
||||
</button>
|
||||
<button class="shortcut-button btn btn-link btn-sm d-flex p-0 px-1" @click="showDeleteModal(shortcut)">
|
||||
<span>{{ t('word.delete') }}</span><i class="mdi mdi-delete-outline ml-1" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<Teleport to="#window-content">
|
||||
<ConfirmModal
|
||||
v-if="isConfirmAddModal"
|
||||
:disable-autofocus="true"
|
||||
:confirm-text="t('word.save')"
|
||||
:close-on-confirm="false"
|
||||
@confirm="addShortcut"
|
||||
@hide="closeAddModal"
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-plus mr-1" /> {{ t('message.addShortcut') }}
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
<div class="mb-2">
|
||||
<div class="form-group">
|
||||
<label class="form-label">{{ t('word.event') }}</label>
|
||||
<BaseSelect
|
||||
v-model="shortcutToAdd.event"
|
||||
class="form-select"
|
||||
:options="eventOptions"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-2">
|
||||
<div class="form-group">
|
||||
<label class="form-label">{{ t('word.key', 2) }}</label>
|
||||
<KeyPressDetector v-model="typedShortcut" />
|
||||
</div>
|
||||
</div>
|
||||
<small v-if="doesShortcutExists" class="text-warning">{{ t('message.shortcutAlreadyExists') }}</small>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
|
||||
<ConfirmModal
|
||||
v-if="isConfirmEditModal"
|
||||
:disable-autofocus="true"
|
||||
:confirm-text="t('word.save')"
|
||||
:close-on-confirm="false"
|
||||
@confirm="editShortcut"
|
||||
@hide="closeEditModal"
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-plus mr-1" /> {{ t('message.editShortcut') }}
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
<div class="mb-2">
|
||||
<div class="form-group">
|
||||
<label class="form-label">{{ t('word.event') }}</label>
|
||||
<BaseSelect
|
||||
v-model="shortcutToEdit.event"
|
||||
class="form-select"
|
||||
:options="eventOptions"
|
||||
:disabled="true"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-2">
|
||||
<div class="form-group">
|
||||
<label class="form-label">{{ t('word.key', 2) }}</label>
|
||||
<KeyPressDetector v-model="shortcutToEdit.keys[0]" />
|
||||
</div>
|
||||
</div>
|
||||
<small v-if="doesShortcutExists" class="text-warning">{{ t('message.shortcutAlreadyExists') }}</small>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
|
||||
<ConfirmModal
|
||||
v-if="isConfirmDeleteModal"
|
||||
:disable-autofocus="true"
|
||||
@confirm="deleteShortcut"
|
||||
@hide="isConfirmDeleteModal = false"
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-delete mr-1" /> {{ t('message.deleteShortcut') }}
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
<div class="mb-2">
|
||||
{{ t('message.deleteCorfirm') }} <b>{{ t(shortcutEvents[shortcutToDelete.event].l18n, {param: shortcutEvents[shortcutToDelete.event].l18nParam}) }} (<span v-html="parseKeys(shortcutToDelete.keys)" />)</b>?
|
||||
</div>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
|
||||
<ConfirmModal
|
||||
v-if="isConfirmRestoreModal"
|
||||
:disable-autofocus="true"
|
||||
@confirm="restoreDefaults"
|
||||
@hide="isConfirmRestoreModal = false"
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-undo mr-1" /> {{ t('message.restoreDefaults') }}
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
<div class="mb-2">
|
||||
{{ t('message.restoreDefaultsQuestion') }}
|
||||
</div>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
</Teleport>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { Ref, ref, watch } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useSettingsStore } from '@/stores/settings';
|
||||
import KeyPressDetector from './KeyPressDetector.vue';
|
||||
import Application from '@/ipc-api/Application';
|
||||
import { shortcutEvents, ShortcutRecord } from 'common/shortcuts';
|
||||
import ConfirmModal from '@/components/BaseConfirmModal.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { computed } from '@vue/reactivity';
|
||||
import { useFilters } from '@/composables/useFilters';
|
||||
|
||||
const { parseKeys } = useFilters();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const isMacOS = process.platform === 'darwin';
|
||||
|
||||
const isConfirmRestoreModal = ref(false);
|
||||
const isConfirmAddModal = ref(false);
|
||||
const isConfirmEditModal = ref(false);
|
||||
const isConfirmDeleteModal = ref(false);
|
||||
const doesShortcutExists = ref(false);
|
||||
const shortcutToAdd: Ref<ShortcutRecord> = ref({ event: undefined, keys: [], os: [process.platform] });
|
||||
const shortcutToEdit: Ref<ShortcutRecord & { index: number }> = ref(null);
|
||||
const shortcutToDelete: Ref<ShortcutRecord> = ref(null);
|
||||
const typedShortcut = ref('');
|
||||
|
||||
const settingsStore = useSettingsStore();
|
||||
const { shortcuts } = storeToRefs(settingsStore);
|
||||
|
||||
const eventOptions = computed(() => {
|
||||
return Object.keys(shortcutEvents)
|
||||
.map(key => {
|
||||
return { value: key, label: t(shortcutEvents[key].l18n, { param: shortcutEvents[key].l18nParam }) };
|
||||
})
|
||||
.sort((a, b) => {
|
||||
if (a.label < b.label) return -1;
|
||||
if (a.label > b.label) return 1;
|
||||
return 0;
|
||||
});
|
||||
});
|
||||
|
||||
const restoreDefaults = () => {
|
||||
isConfirmRestoreModal.value = false;
|
||||
return Application.restoreDefaultShortcuts();
|
||||
};
|
||||
|
||||
const showAddModal = () => {
|
||||
shortcutToAdd.value.event = eventOptions.value[0].value;
|
||||
isConfirmAddModal.value = true;
|
||||
};
|
||||
|
||||
const closeAddModal = () => {
|
||||
typedShortcut.value = '';
|
||||
doesShortcutExists.value = false;
|
||||
shortcutToAdd.value = { event: undefined, keys: [], os: [process.platform] };
|
||||
isConfirmAddModal.value = false;
|
||||
};
|
||||
|
||||
const showEditModal = (shortcut: ShortcutRecord & { index: number }) => {
|
||||
shortcut = {
|
||||
...shortcut,
|
||||
keys: [shortcut.keys[0].replaceAll('CommandOrControl', isMacOS ? 'Command' : 'Control')]
|
||||
};
|
||||
shortcutToEdit.value = shortcut;
|
||||
isConfirmEditModal.value = true;
|
||||
};
|
||||
|
||||
const editShortcut = () => {
|
||||
const index = shortcutToEdit.value.index;
|
||||
delete shortcutToEdit.value.index;
|
||||
shortcutToEdit.value.index = undefined;
|
||||
|
||||
shortcuts.value[index] = shortcutToEdit.value;
|
||||
|
||||
isConfirmEditModal.value = false;
|
||||
return Application.updateShortcuts(shortcuts.value);
|
||||
};
|
||||
|
||||
const closeEditModal = () => {
|
||||
typedShortcut.value = '';
|
||||
doesShortcutExists.value = false;
|
||||
shortcutToEdit.value = null;
|
||||
isConfirmEditModal.value = false;
|
||||
};
|
||||
|
||||
const addShortcut = () => {
|
||||
if (!typedShortcut.value.length || doesShortcutExists.value) return;
|
||||
shortcutToAdd.value.keys = [typedShortcut.value.replaceAll(isMacOS ? 'Command' : 'Control', 'CommandOrControl')];
|
||||
const filteredShortcuts = [shortcutToAdd.value, ...shortcuts.value];
|
||||
|
||||
isConfirmAddModal.value = false;
|
||||
return Application.updateShortcuts(filteredShortcuts);
|
||||
};
|
||||
|
||||
const showDeleteModal = (shortcut: ShortcutRecord) => {
|
||||
isConfirmDeleteModal.value = true;
|
||||
shortcutToDelete.value = shortcut;
|
||||
};
|
||||
|
||||
const deleteShortcut = () => {
|
||||
const filteredShortcuts = shortcuts.value.filter(s => (
|
||||
shortcutToDelete.value.keys.toString() !== s.keys.toString()
|
||||
));
|
||||
|
||||
isConfirmDeleteModal.value = false;
|
||||
return Application.updateShortcuts(filteredShortcuts);
|
||||
};
|
||||
|
||||
watch(typedShortcut, () => {
|
||||
doesShortcutExists.value = shortcuts.value.some(s => (
|
||||
s.keys.some(k => (
|
||||
k.replaceAll('CommandOrControl', isMacOS ? 'Command' : 'Control') === typedShortcut.value
|
||||
))
|
||||
));
|
||||
});
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.table {
|
||||
.tr {
|
||||
.td {
|
||||
border-right: 3px solid;
|
||||
border-bottom: 3px solid;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
.shortcut-button {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.shortcut-button {
|
||||
font-size: 0.7rem;
|
||||
height: 1rem;
|
||||
line-height: 1rem;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.shortcuts-tools {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
}
|
||||
</style>
|
@@ -34,6 +34,15 @@ const {
|
||||
lineWrap
|
||||
} = storeToRefs(settingsStore);
|
||||
|
||||
const sizes = {
|
||||
xsmall: '10px',
|
||||
small: '12px',
|
||||
medium: '14px',
|
||||
large: '16px',
|
||||
xlarge: '18px',
|
||||
xxlarge: '20px'
|
||||
};
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: String,
|
||||
workspace: Object as Prop<Workspace>,
|
||||
@@ -231,7 +240,9 @@ watch(() => tablesInQuery.value.length, () => {
|
||||
});
|
||||
|
||||
fields.value = localFields;
|
||||
setCustomCompleter();
|
||||
setTimeout(() => {
|
||||
setCustomCompleter();
|
||||
}, 100);
|
||||
});
|
||||
|
||||
watch(editorTheme, () => {
|
||||
@@ -240,12 +251,6 @@ watch(editorTheme, () => {
|
||||
});
|
||||
|
||||
watch(editorFontSize, () => {
|
||||
const sizes = {
|
||||
small: '12px',
|
||||
medium: '14px',
|
||||
large: '16px'
|
||||
};
|
||||
|
||||
if (editor.value) {
|
||||
editor.value.setOptions({
|
||||
fontSize: sizes[editorFontSize.value]
|
||||
@@ -305,7 +310,8 @@ onMounted(() => {
|
||||
enableBasicAutocompletion: true,
|
||||
wrap: lineWrap.value,
|
||||
enableSnippets: true,
|
||||
enableLiveAutocompletion: autoComplete.value
|
||||
enableLiveAutocompletion: autoComplete.value,
|
||||
fontSize: sizes[editorFontSize.value]
|
||||
});
|
||||
|
||||
if (!baseCompleter.value.length)
|
||||
|
218
src/renderer/components/SettingBarConnections.vue
Normal file
218
src/renderer/components/SettingBarConnections.vue
Normal file
@@ -0,0 +1,218 @@
|
||||
<template>
|
||||
<Draggable
|
||||
:list="localList"
|
||||
item-key="'uid'"
|
||||
ghost-class="ghost"
|
||||
:group="{ name: 'connections', pull: 'clone' }"
|
||||
:swap-threshold="0.3"
|
||||
@start="emit('start', $event)"
|
||||
@end="emit('end', $event)"
|
||||
@change="emit('update:modelValue', localList)"
|
||||
>
|
||||
<template #item="{ element }">
|
||||
<li
|
||||
v-if="element.isFolder || !folderedConnections.includes(element.uid)"
|
||||
:draggable="true"
|
||||
:class="{'folder': element.isFolder}"
|
||||
@dragstart="draggedElement = element.uid"
|
||||
@dragend="dragEnd"
|
||||
@contextmenu.prevent="emit('context', $event, element)"
|
||||
>
|
||||
<div
|
||||
v-if="!element.isFolder && !folderedConnections.includes(element.uid)"
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: getConnectionName(element.uid)
|
||||
}"
|
||||
class="settingbar-element btn btn-link"
|
||||
:class="{ 'selected': element.uid === selectedWorkspace && coveredElement !== element.uid }"
|
||||
placement="right"
|
||||
strategy="fixed"
|
||||
@click.stop="selectWorkspace(element.uid)"
|
||||
>
|
||||
<!-- Creates a new folder -->
|
||||
<SettingBarConnections
|
||||
v-if="draggedElement && !foldersUid.includes(draggedElement)"
|
||||
class="drag-area"
|
||||
:class="[{'folder-preview': coveredElement === element.uid && draggedElement !== coveredElement}]"
|
||||
:list="dummyNested"
|
||||
@dragenter="coveredElement = element.uid"
|
||||
@dragleave="coveredElement = false"
|
||||
@change="createFolder"
|
||||
/>
|
||||
<i v-if="coveredElement === element.uid && draggedElement !== coveredElement" class="settingbar-element-icon mdi mdi-folder-plus mdi-36px" />
|
||||
<template v-else>
|
||||
<div class="settingbar-element-icon-wrapper">
|
||||
<i
|
||||
class="settingbar-element-icon dbi"
|
||||
:class="[element.icon ? `mdi ${element.icon} mdi-36px`: `dbi-${element.client}`, getStatusBadge(element.uid)]"
|
||||
/>
|
||||
<small class="settingbar-element-name">{{ element.name || getConnectionName(element.uid) }}</small>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<SettingBarConnectionsFolder
|
||||
v-else-if="element.isFolder"
|
||||
:key="`${element.uid}-${element.connections.length}`"
|
||||
:folder="element"
|
||||
:covered-element="coveredElement"
|
||||
:dragged-element="draggedElement"
|
||||
:folder-drag="folderDrag"
|
||||
@select-workspace="selectWorkspace"
|
||||
@covered="coveredElement = element.uid"
|
||||
@uncovered="coveredElement = false"
|
||||
@folder-sort="emit('update:modelValue', localList)"
|
||||
@folder-drag="folderDrag = $event"
|
||||
@context="emit('context', $event.event, $event.content)"
|
||||
/>
|
||||
</li>
|
||||
</template>
|
||||
</Draggable>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { computed, PropType, Ref, ref, watch } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import * as Draggable from 'vuedraggable';
|
||||
import { SidebarElement, useConnectionsStore } from '@/stores/connections';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import SettingBarConnectionsFolder from '@/components/SettingBarConnectionsFolder.vue';
|
||||
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
|
||||
const { getFolders: folders } = storeToRefs(connectionsStore);
|
||||
|
||||
const { getWorkspace, selectWorkspace } = workspacesStore;
|
||||
const { getConnectionName, addFolder } = connectionsStore;
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
type: Array as PropType<SidebarElement[]>,
|
||||
default: () => []
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['start', 'end', 'move', 'context', 'update:modelValue']);
|
||||
|
||||
const localList = ref(props.modelValue);
|
||||
const dummyNested = ref([]);
|
||||
const draggedElement: Ref<string | false> = ref(false);
|
||||
const coveredElement: Ref<string | false> = ref(false);
|
||||
const folderDrag = ref(false);
|
||||
|
||||
const foldersUid = computed(() => folders.value.reduce<string[]>((acc, curr) => {
|
||||
acc.push(curr.uid);
|
||||
return acc;
|
||||
}, []));
|
||||
const folderedConnections = computed(() => {
|
||||
return folders.value.reduce<string[]>((acc, curr) => {
|
||||
acc = [...acc, ...curr.connections];
|
||||
return acc;
|
||||
}, []);
|
||||
});
|
||||
|
||||
const dragEnd = () => {
|
||||
coveredElement.value = false;
|
||||
draggedElement.value = false;
|
||||
};
|
||||
|
||||
const createFolder = ({ added }: {added: { element: SidebarElement }}) => {
|
||||
if (typeof coveredElement.value === 'string' && !added.element.isFolder) {
|
||||
// Create folder
|
||||
addFolder({
|
||||
after: coveredElement.value,
|
||||
connections: [coveredElement.value, added.element.uid]
|
||||
});
|
||||
|
||||
coveredElement.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const getStatusBadge = (uid: string) => {
|
||||
if (getWorkspace(uid)) {
|
||||
const status = getWorkspace(uid).connectionStatus;
|
||||
|
||||
switch (status) {
|
||||
case 'connected':
|
||||
return 'badge badge-connected';
|
||||
case 'connecting':
|
||||
return 'badge badge-connecting';
|
||||
case 'failed':
|
||||
return 'badge badge-failed';
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
watch(() => dummyNested.value.length, () => {
|
||||
dummyNested.value = [];
|
||||
});
|
||||
|
||||
watch(() => props.modelValue, (value) => {
|
||||
localList.value = value;
|
||||
folderDrag.value = false;// Prenent some edge cases
|
||||
});
|
||||
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.drag-area {
|
||||
background-color: transparent;
|
||||
z-index: 10;
|
||||
position: absolute;
|
||||
left: 20px;
|
||||
top: 20px;
|
||||
right: 20px;
|
||||
bottom: 20px;
|
||||
transition: all .2s;
|
||||
|
||||
&.folder-preview {
|
||||
border: 2px dotted;
|
||||
border-radius: 15px;
|
||||
left: 5px;
|
||||
top: 5px;
|
||||
right: 5px;
|
||||
bottom: 5px;
|
||||
}
|
||||
|
||||
li {
|
||||
display: none!important;
|
||||
}
|
||||
}
|
||||
|
||||
.ghost:not(.folder) {
|
||||
height: $settingbar-width;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 4px;
|
||||
position: relative;
|
||||
transition: opacity .2s;
|
||||
|
||||
.settingbar-element {
|
||||
border-radius: 15px!important;
|
||||
background: rgba($color: #fff, $alpha: 0.1);
|
||||
|
||||
.settingbar-element-name {
|
||||
position: absolute;
|
||||
bottom: 5px;
|
||||
left: 3px!important;
|
||||
text-align: center!important;
|
||||
font-size: 65%;
|
||||
font-style: normal;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.settingbar-element-icon {
|
||||
display: flex;
|
||||
color: $body-font-color-dark;
|
||||
}
|
||||
</style>
|
451
src/renderer/components/SettingBarConnectionsFolder.vue
Normal file
451
src/renderer/components/SettingBarConnectionsFolder.vue
Normal file
@@ -0,0 +1,451 @@
|
||||
<template>
|
||||
<div
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: folder.name,
|
||||
disabled: isOpen || !folder.name
|
||||
}"
|
||||
class="settingbar-element folder btn btn-link p-1"
|
||||
:class="[{ 'selected-inside': hasSelectedInside && !isOpen }]"
|
||||
:style="isOpen ? `height: auto; opacity: 1;` : null"
|
||||
>
|
||||
<Draggable
|
||||
class="folder-container"
|
||||
:item-key="((item: string) => localList.indexOf(item))"
|
||||
:class="[{'opened': isOpen}]"
|
||||
:style="[
|
||||
`background: ${folder.color};`,
|
||||
isOpen ? `max-height: ${60*(folder.connections.length+1)}px` : 'max-height: 60px',
|
||||
!isOpen || folderDrag ? `overflow: hidden;` : ''
|
||||
]"
|
||||
:list="localList"
|
||||
ghost-class="ghost"
|
||||
:group="{ name: 'connections', put: folderDrag ? undefined : 'clone' }"
|
||||
@start="dragStart"
|
||||
@end="dragStop"
|
||||
>
|
||||
<template #header>
|
||||
<div
|
||||
v-if="!isOpen"
|
||||
class="folder-overlay"
|
||||
@click="openFolder"
|
||||
@contextmenu.stop="emit('context', {event: $event, content: folder})"
|
||||
/>
|
||||
<div
|
||||
v-if="isOpen"
|
||||
class="folder-icon"
|
||||
:style="`color: ${folder.color};`"
|
||||
@click="closeFolder"
|
||||
>
|
||||
<i class="folder-icon-open mdi mdi-folder-open mdi-36px" />
|
||||
<i class="folder-icon-close mdi mdi-folder mdi-36px" />
|
||||
</div>
|
||||
</template>
|
||||
<template #item="{ element }">
|
||||
<div
|
||||
:key="element"
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: getConnectionName(element)
|
||||
}"
|
||||
class="folder-element"
|
||||
:class="{ 'selected': element === selectedWorkspace }"
|
||||
@click="emit('select-workspace', element)"
|
||||
@contextmenu.stop="emit('context', {event: $event, content: getConnectionOrderByUid(element)})"
|
||||
>
|
||||
<i
|
||||
class="folder-element-icon dbi"
|
||||
:class="[getConnectionOrderByUid(element)?.icon ? `mdi ${getConnectionOrderByUid(element).icon}`: `dbi-${getConnectionOrderByUid(element)?.client}`, getStatusBadge(element)]"
|
||||
/>
|
||||
<small v-if="isOpen" class="folder-element-name">{{ getConnectionOrderByUid(element)?.name || getConnectionName(element) }}</small>
|
||||
</div>
|
||||
</template>
|
||||
</Draggable>
|
||||
<SettingBarConnections
|
||||
v-if="draggedElement && !foldersUid.includes(draggedElement)"
|
||||
class="drag-area"
|
||||
:class="[{'folder-preview': coveredElement === folder.uid && draggedElement !== coveredElement}]"
|
||||
:list="dummyNested"
|
||||
:swap-threshold="1"
|
||||
@dragenter="emit('covered')"
|
||||
@dragleave="emit('uncovered')"
|
||||
@change="addIntoFolder"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
import { computed, PropType, ref, watch } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import * as Draggable from 'vuedraggable';
|
||||
import { SidebarElement, useConnectionsStore } from '@/stores/connections';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import SettingBarConnections from '@/components/SettingBarConnections.vue';
|
||||
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const { getFolders: folders } = storeToRefs(connectionsStore);
|
||||
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
|
||||
|
||||
const { getWorkspace } = workspacesStore;
|
||||
const { getConnectionOrderByUid, getConnectionName, addToFolder } = connectionsStore;
|
||||
|
||||
const foldersOpened = JSON.parse(localStorage.getItem('opened-folders')) || [];
|
||||
|
||||
const props = defineProps({
|
||||
folder: {
|
||||
type: Object as PropType<SidebarElement>,
|
||||
required: true
|
||||
},
|
||||
folderDrag: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
draggedElement: {
|
||||
type: [String, Boolean] as PropType<string | false>,
|
||||
required: true
|
||||
},
|
||||
coveredElement: {
|
||||
type: [String, Boolean] as PropType<string | false>,
|
||||
required: true
|
||||
}
|
||||
});
|
||||
|
||||
const emit = defineEmits(['context', 'covered', 'uncovered', 'select-workspace', 'folder-sort', 'folder-drag']);
|
||||
|
||||
const isOpen = ref(foldersOpened.includes(props.folder.uid));
|
||||
const localList = ref(props.folder.connections);
|
||||
const dummyNested = ref([]);
|
||||
|
||||
const hasSelectedInside = computed(() => localList.value.includes(selectedWorkspace.value));
|
||||
|
||||
const foldersUid = computed(() => folders.value.reduce<string[]>((acc, curr) => {
|
||||
acc.push(curr.uid);
|
||||
return acc;
|
||||
}, []));
|
||||
|
||||
const addIntoFolder = ({ added }: {added: { element: SidebarElement }}) => {
|
||||
if (typeof props.coveredElement === 'string' && !added.element.isFolder) {
|
||||
addToFolder({
|
||||
folder: props.coveredElement,
|
||||
connection: added.element.uid
|
||||
});
|
||||
|
||||
emit('uncovered');
|
||||
}
|
||||
};
|
||||
|
||||
const getStatusBadge = (uid: string) => {
|
||||
if (getWorkspace(uid)) {
|
||||
const status = getWorkspace(uid).connectionStatus;
|
||||
|
||||
switch (status) {
|
||||
case 'connected':
|
||||
return 'badge badge-connected';
|
||||
case 'connecting':
|
||||
return 'badge badge-connecting';
|
||||
case 'failed':
|
||||
return 'badge badge-failed';
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const openFolder = () => {
|
||||
isOpen.value = true;
|
||||
const opened: string[] = JSON.parse(localStorage.getItem('opened-folders')) || [];
|
||||
opened.push(props.folder.uid);
|
||||
localStorage.setItem('opened-folders', JSON.stringify(opened));
|
||||
};
|
||||
|
||||
const closeFolder = () => {
|
||||
isOpen.value = false;
|
||||
let opened: string[] = JSON.parse(localStorage.getItem('opened-folders')) || [];
|
||||
opened = opened.filter(uid => uid !== props.folder.uid);
|
||||
localStorage.setItem('opened-folders', JSON.stringify(opened));
|
||||
};
|
||||
|
||||
const dragStart = () => {
|
||||
emit('folder-drag', true);
|
||||
};
|
||||
|
||||
const dragStop = () => {
|
||||
emit('folder-drag', false);
|
||||
};
|
||||
|
||||
watch(() => dummyNested.value.length, () => {
|
||||
dummyNested.value = [];
|
||||
});
|
||||
|
||||
emit('folder-sort');// To apply changes on component key change
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
.folder {
|
||||
position: relative;
|
||||
&.selected-inside {
|
||||
opacity: 1!important;
|
||||
|
||||
&::after {
|
||||
height: 2.5rem;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
&::after {
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 3px;
|
||||
transition: height 0.2s;
|
||||
background-color: rgba($color: #fff, $alpha: 0.8);
|
||||
border-radius: $border-radius;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
|
||||
.folder-container {
|
||||
display: grid;
|
||||
grid-template-columns: auto auto;
|
||||
grid-template-rows: 50%;
|
||||
gap: 4px;
|
||||
padding: 4px;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
border-radius: 15px;
|
||||
transition: background .3s;
|
||||
color: $body-font-color-dark;
|
||||
|
||||
&::before {
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 3px;
|
||||
transition: height 0.2s;
|
||||
background-color: rgba($color: #fff, $alpha: 0.8);
|
||||
border-radius: $border-radius;
|
||||
position: absolute;
|
||||
left: -11px;
|
||||
}
|
||||
|
||||
.folder-element-icon {
|
||||
margin: 0 auto;
|
||||
|
||||
&.badge::after {
|
||||
top: 10px;
|
||||
right: 0px;
|
||||
position: absolute;
|
||||
display: none;
|
||||
}
|
||||
|
||||
&.badge-update::after {
|
||||
bottom: initial;
|
||||
}
|
||||
}
|
||||
|
||||
&.opened {
|
||||
gap: 4px 6px;
|
||||
grid-template-columns: auto;
|
||||
grid-template-rows: auto;
|
||||
background: rgba($color: #fff, $alpha: 0.1)!important;
|
||||
transition: max-height .1s;
|
||||
|
||||
.folder-element {
|
||||
opacity: .6;
|
||||
height: 2.5rem;
|
||||
max-width: initial;
|
||||
max-height: initial;
|
||||
background: transparent;
|
||||
|
||||
&.ghost {
|
||||
background: $bg-color-light-dark;
|
||||
&.selected::before {
|
||||
height: 0;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
&.selected {
|
||||
opacity: 1;
|
||||
|
||||
&::before {
|
||||
height: 2.5rem;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
|
||||
&::before {
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 3px;
|
||||
transition: height 0.2s;
|
||||
background-color: rgba($color: #fff, $alpha: 0.8);
|
||||
border-radius: $border-radius;
|
||||
position: absolute;
|
||||
left: -11px;
|
||||
}
|
||||
|
||||
.folder-element-icon {
|
||||
margin: 0 auto;
|
||||
font-size: 36px;
|
||||
display: flex;
|
||||
|
||||
&.badge::after {
|
||||
top: 14px;
|
||||
right: -4px;
|
||||
position: absolute;
|
||||
display: block;
|
||||
}
|
||||
|
||||
&.badge-update::after {
|
||||
bottom: initial;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.folder-icon {
|
||||
height: 2.5rem;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-bottom: 3px;
|
||||
position: relative;
|
||||
transition: opacity .2s;
|
||||
|
||||
.folder-icon-open {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.folder-icon-close {
|
||||
display: none;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
|
||||
.folder-icon-open {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.folder-icon-close {
|
||||
display: block;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.folder-overlay {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
z-index: 10;
|
||||
}
|
||||
|
||||
.folder-element {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: center;
|
||||
max-width: 23px;
|
||||
max-height: 23px;
|
||||
margin-bottom: 3px;
|
||||
position: relative;
|
||||
transition: opacity .2s;
|
||||
background: $bg-color-light-dark;
|
||||
border-radius: 8px;
|
||||
|
||||
&.ghost {
|
||||
margin:0 ;
|
||||
margin-bottom: 3px;
|
||||
height: 2.5rem;
|
||||
}
|
||||
|
||||
&:hover, &.selected {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.folder-element-icon {
|
||||
transition: margin .2s;
|
||||
}
|
||||
|
||||
.folder-element-name {
|
||||
position: absolute;
|
||||
max-width: 90%;
|
||||
bottom: 0;
|
||||
font-size: 65%;
|
||||
font-style: normal;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
line-height: 1;
|
||||
transition: bottom .2s;
|
||||
}
|
||||
}
|
||||
|
||||
&:not(.opened){
|
||||
.folder-element {
|
||||
|
||||
.folder-element-icon {
|
||||
width: 21px;
|
||||
height: 21px;
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ghost {
|
||||
border-radius: 15px!important;
|
||||
background: rgba($color: #fff, $alpha: 0.1);
|
||||
|
||||
&.folder-element {
|
||||
height: $settingbar-width;
|
||||
border-radius: 15px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin: 4px;
|
||||
position: relative;
|
||||
transition: opacity .2s;
|
||||
|
||||
&:hover, &.selected {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.folder-element-icon {
|
||||
margin: 0 auto;
|
||||
font-size: 36px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&.badge::after {
|
||||
top: 5px;
|
||||
right: -4px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
&.badge-update::after {
|
||||
bottom: initial;
|
||||
}
|
||||
}
|
||||
|
||||
.folder-element-name {
|
||||
position: absolute;
|
||||
max-width: 90%;
|
||||
bottom: 5px;
|
||||
text-align: center;
|
||||
font-size: 65%;
|
||||
font-style: normal;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
@@ -3,20 +3,6 @@
|
||||
:context-event="contextEvent"
|
||||
@close-context="$emit('close-context')"
|
||||
>
|
||||
<div
|
||||
v-if="isPinned"
|
||||
class="context-element"
|
||||
@click="unpin"
|
||||
>
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-pin-off text-light pr-1" /> {{ t('word.unpin') }}</span>
|
||||
</div>
|
||||
<div
|
||||
v-else
|
||||
class="context-element"
|
||||
@click="pin"
|
||||
>
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-pin mdi-rotate-45 text-light pr-1" /> {{ t('word.pin') }}</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="isConnected"
|
||||
class="context-element"
|
||||
@@ -24,9 +10,16 @@
|
||||
>
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-power text-light pr-1" /> {{ t('word.disconnect') }}</span>
|
||||
</div>
|
||||
<div class="context-element" @click="duplicateConnection">
|
||||
<div
|
||||
v-if="!contextConnection.isFolder"
|
||||
class="context-element"
|
||||
@click="duplicateConnection"
|
||||
>
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-content-duplicate text-light pr-1" /> {{ t('word.duplicate') }}</span>
|
||||
</div>
|
||||
<div class="context-element" @click.stop="showAppearenceModal">
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-brush-variant text-light pr-1" /> {{ t('word.appearence') }}</span>
|
||||
</div>
|
||||
<div class="context-element" @click="showConfirmModal">
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ t('word.delete') }}</span>
|
||||
</div>
|
||||
@@ -38,7 +31,7 @@
|
||||
>
|
||||
<template #header>
|
||||
<div class="d-flex">
|
||||
<i class="mdi mdi-24px mdi-server-remove mr-1" /> {{ t('message.deleteConnection') }}
|
||||
<i class="mdi mdi-24px mr-1" :class="[contextConnection.isFolder ? 'mdi-folder-remove' : 'mdi-server-remove']" /> {{ t(contextConnection.isFolder ? 'message.deleteFolder' : 'message.deleteConnection') }}
|
||||
</div>
|
||||
</template>
|
||||
<template #body>
|
||||
@@ -47,6 +40,16 @@
|
||||
</div>
|
||||
</template>
|
||||
</ConfirmModal>
|
||||
<ModalFolderAppearence
|
||||
v-if="isFolderEdit"
|
||||
:folder="contextConnection"
|
||||
@close="hideAppearenceModal"
|
||||
/>
|
||||
<ModalConnectionAppearence
|
||||
v-if="isConnectionEdit"
|
||||
:connection="contextConnection"
|
||||
@close="hideAppearenceModal"
|
||||
/>
|
||||
</BaseContextMenu>
|
||||
</template>
|
||||
|
||||
@@ -55,26 +58,24 @@ import { computed, Prop, ref } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { uidGen } from 'common/libs/uidGen';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useConnectionsStore } from '@/stores/connections';
|
||||
import { SidebarElement, useConnectionsStore } from '@/stores/connections';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import BaseContextMenu from '@/components/BaseContextMenu.vue';
|
||||
import ConfirmModal from '@/components/BaseConfirmModal.vue';
|
||||
import { ConnectionParams } from 'common/interfaces/antares';
|
||||
import ModalFolderAppearence from '@/components/ModalFolderAppearence.vue';
|
||||
import ModalConnectionAppearence from '@/components/ModalConnectionAppearence.vue';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const {
|
||||
getConnectionByUid,
|
||||
getConnectionName,
|
||||
addConnection,
|
||||
deleteConnection,
|
||||
pinConnection,
|
||||
unpinConnection
|
||||
deleteConnection
|
||||
} = connectionsStore;
|
||||
|
||||
const { pinnedConnections } = storeToRefs(connectionsStore);
|
||||
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
|
||||
|
||||
@@ -86,16 +87,17 @@ const {
|
||||
|
||||
const props = defineProps({
|
||||
contextEvent: MouseEvent,
|
||||
contextConnection: Object as Prop<ConnectionParams>
|
||||
contextConnection: Object as Prop<SidebarElement>
|
||||
});
|
||||
|
||||
const emit = defineEmits(['close-context']);
|
||||
|
||||
const isConfirmModal = ref(false);
|
||||
const isFolderEdit = ref(false);
|
||||
const isConnectionEdit = ref(false);
|
||||
|
||||
const connectionName = computed(() => getConnectionName(props.contextConnection.uid));
|
||||
const isConnected = computed(() => getWorkspace(props.contextConnection.uid).connectionStatus === 'connected');
|
||||
const isPinned = computed(() => pinnedConnections.value.has(props.contextConnection.uid));
|
||||
const connectionName = computed(() => props.contextConnection.name || getConnectionName(props.contextConnection.uid) || t('word.folder', 1));
|
||||
const isConnected = computed(() => getWorkspace(props.contextConnection.uid)?.connectionStatus === 'connected');
|
||||
|
||||
const confirmDeleteConnection = () => {
|
||||
if (selectedWorkspace.value === props.contextConnection.uid)
|
||||
@@ -105,7 +107,7 @@ const confirmDeleteConnection = () => {
|
||||
};
|
||||
|
||||
const duplicateConnection = () => {
|
||||
let connectionCopy = Object.assign({}, props.contextConnection);
|
||||
let connectionCopy = getConnectionByUid(props.contextConnection.uid);
|
||||
connectionCopy = {
|
||||
...connectionCopy,
|
||||
uid: uidGen('C'),
|
||||
@@ -116,6 +118,19 @@ const duplicateConnection = () => {
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const showAppearenceModal = () => {
|
||||
if (props.contextConnection.isFolder)
|
||||
isFolderEdit.value = true;
|
||||
else
|
||||
isConnectionEdit.value = true;
|
||||
};
|
||||
|
||||
const hideAppearenceModal = () => {
|
||||
isConnectionEdit.value = false;
|
||||
isFolderEdit.value = false;
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const showConfirmModal = () => {
|
||||
isConfirmModal.value = true;
|
||||
};
|
||||
@@ -125,16 +140,6 @@ const hideConfirmModal = () => {
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const pin = () => {
|
||||
pinConnection(props.contextConnection.uid);
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const unpin = () => {
|
||||
unpinConnection(props.contextConnection.uid);
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const disconnect = () => {
|
||||
disconnectWorkspace(props.contextConnection.uid);
|
||||
closeContext();
|
||||
|
@@ -1,18 +1,34 @@
|
||||
<template>
|
||||
<div id="footer" class="text-light">
|
||||
<div
|
||||
id="footer"
|
||||
:class="[lightColors.includes(footerColor) ? 'text-dark' : 'text-light']"
|
||||
:style="`background-color: ${footerColor};`"
|
||||
>
|
||||
<div class="footer-left-elements">
|
||||
<ul class="footer-elements">
|
||||
<li class="footer-element">
|
||||
<i class="mdi mdi-18px mdi-database mr-1" />
|
||||
<small>{{ versionString }}</small>
|
||||
</li>
|
||||
<li v-if="connectionInfos && connectionInfos.readonly" class="footer-element">
|
||||
<i class="mdi mdi-18px mdi-lock mr-1" />
|
||||
<small>{{ t('message.readOnlyMode') }}</small>
|
||||
</li>
|
||||
<li v-if="connectionInfos && connectionInfos.ssl" class="footer-element">
|
||||
<i class="mdi mdi-18px mdi-shield-key mr-1" />
|
||||
<small>SSL</small>
|
||||
</li>
|
||||
<li v-if="connectionInfos && connectionInfos.ssh" class="footer-element">
|
||||
<i class="mdi mdi-18px mdi-console-network mr-1" />
|
||||
<small>SSH</small>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="footer-right-elements">
|
||||
<ul class="footer-elements">
|
||||
<li
|
||||
v-if="workspace?.connectionStatus === 'connected' "
|
||||
v-if="workspace?.connectionStatus === 'connected'"
|
||||
class="footer-element footer-link"
|
||||
@click="toggleConsole()"
|
||||
>
|
||||
@@ -50,6 +66,7 @@ import { useApplicationStore } from '@/stores/application';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import { computed, ComputedRef } from 'vue';
|
||||
import { useConsoleStore } from '@/stores/console';
|
||||
import { useConnectionsStore } from '@/stores/connections';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -62,14 +79,20 @@ interface DatabaseInfos {// TODO: temp
|
||||
|
||||
const applicationStore = useApplicationStore();
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
const connectionsStore = useConnectionsStore();
|
||||
|
||||
const lightColors = ['#FFCE54', '#FDA50F', '#BEBDB8', '#48CFAD'];
|
||||
|
||||
const { getSelected: workspaceUid } = storeToRefs(workspacesStore);
|
||||
const { toggleConsole } = useConsoleStore();
|
||||
|
||||
const { showSettingModal } = applicationStore;
|
||||
const { getWorkspace } = workspacesStore;
|
||||
const { getConnectionFolder, getConnectionByUid } = connectionsStore;
|
||||
|
||||
const workspace = computed(() => getWorkspace(workspaceUid.value));
|
||||
const footerColor = computed(() => getConnectionFolder(workspaceUid.value)?.color || '#E36929');
|
||||
const connectionInfos = computed(() => getConnectionByUid(workspaceUid.value));
|
||||
const version: ComputedRef<DatabaseInfos> = computed(() => {
|
||||
return getWorkspace(workspaceUid.value) ? workspace.value.version : null;
|
||||
});
|
||||
|
@@ -8,41 +8,10 @@
|
||||
@close-context="isContext = false"
|
||||
/>
|
||||
<ul class="settingbar-elements">
|
||||
<Draggable
|
||||
v-model="pinnedConnectionsArr"
|
||||
:item-key="'uid'"
|
||||
@start="isDragging = true"
|
||||
@end="dragStop"
|
||||
>
|
||||
<template #item="{element}">
|
||||
<li
|
||||
:draggable="true"
|
||||
class="settingbar-element btn btn-link ex-tooltip"
|
||||
:class="{'selected': element.uid === selectedWorkspace}"
|
||||
@click.stop="selectWorkspace(element.uid)"
|
||||
@contextmenu.prevent="contextMenu($event, element)"
|
||||
@mouseover.self="tooltipPosition"
|
||||
>
|
||||
<i class="settingbar-element-icon dbi" :class="[`dbi-${element.client}`, getStatusBadge(element.uid), (pinnedConnections.has(element.uid) ? 'settingbar-element-pin' : false)]" />
|
||||
<span v-if="!isDragging && !isScrolling" class="ex-tooltip-content">{{ getConnectionName(element.uid) }}</span>
|
||||
</li>
|
||||
</template>
|
||||
</Draggable>
|
||||
|
||||
<div v-if="pinnedConnectionsArr.length" class="divider" />
|
||||
|
||||
<li
|
||||
v-for="connection in unpinnedConnectionsArr"
|
||||
:key="connection.uid"
|
||||
class="settingbar-element btn btn-link ex-tooltip"
|
||||
:class="{'selected': connection.uid === selectedWorkspace}"
|
||||
@click.stop="selectWorkspace(connection.uid)"
|
||||
@contextmenu.prevent="contextMenu($event, connection)"
|
||||
@mouseover.self="tooltipPosition"
|
||||
>
|
||||
<i class="settingbar-element-icon dbi" :class="[`dbi-${connection.client}`, getStatusBadge(connection.uid)]" />
|
||||
<span v-if="!isDragging && !isScrolling" class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
|
||||
</li>
|
||||
<SettingBarConnections
|
||||
v-model="connectionsArr"
|
||||
@context="contextMenu"
|
||||
/>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -50,21 +19,31 @@
|
||||
<ul class="settingbar-elements">
|
||||
<li
|
||||
v-if="isScrollable"
|
||||
class="settingbar-element btn btn-link ex-tooltip"
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: t('message.allConnections')
|
||||
}"
|
||||
class="settingbar-element btn btn-link"
|
||||
@click="emit('show-connections-modal')"
|
||||
@mouseover.self="tooltipPosition"
|
||||
>
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-dots-horizontal text-light" />
|
||||
<span class="ex-tooltip-content">{{ t('message.allConnections') }} (Shift+CTRL+Space)</span>
|
||||
<div class="settingbar-element-icon-wrapper">
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-dots-horizontal text-light" />
|
||||
</div>
|
||||
</li>
|
||||
<li
|
||||
class="settingbar-element btn btn-link ex-tooltip"
|
||||
:class="{'selected': 'NEW' === selectedWorkspace}"
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: t('message.addConnection')
|
||||
}"
|
||||
class="settingbar-element btn btn-link"
|
||||
:class="{ 'selected': 'NEW' === selectedWorkspace }"
|
||||
@click="selectWorkspace('NEW')"
|
||||
@mouseover.self="tooltipPosition"
|
||||
>
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-plus text-light" />
|
||||
<span class="ex-tooltip-content">{{ t('message.addConnection') }}</span>
|
||||
<div class="settingbar-element-icon-wrapper">
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-plus text-light" />
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -73,15 +52,29 @@
|
||||
<ul class="settingbar-elements">
|
||||
<li
|
||||
v-if="!disableScratchpad"
|
||||
class="settingbar-element btn btn-link ex-tooltip"
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: t('word.scratchpad')
|
||||
}"
|
||||
class="settingbar-element btn btn-link"
|
||||
@click="showScratchpad"
|
||||
>
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-notebook-edit-outline text-light" />
|
||||
<span class="ex-tooltip-content">{{ t('word.scratchpad') }}</span>
|
||||
</li>
|
||||
<li class="settingbar-element btn btn-link ex-tooltip" @click="showSettingModal('general')">
|
||||
<i class="settingbar-element-icon mdi mdi-24px mdi-cog text-light" :class="{' badge badge-update': hasUpdates}" />
|
||||
<span class="ex-tooltip-content">{{ t('word.settings') }}</span>
|
||||
<li
|
||||
v-tooltip="{
|
||||
strategy: 'fixed',
|
||||
placement: 'right',
|
||||
content: t('word.settings')
|
||||
}"
|
||||
class="settingbar-element btn btn-link"
|
||||
@click="showSettingModal('general')"
|
||||
>
|
||||
<i
|
||||
class="settingbar-element-icon mdi mdi-24px mdi-cog text-light"
|
||||
:class="{ ' badge badge-update': hasUpdates }"
|
||||
/>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -92,16 +85,16 @@
|
||||
import { ref, Ref, computed, watch } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useApplicationStore } from '@/stores/application';
|
||||
import { useConnectionsStore } from '@/stores/connections';
|
||||
import { useConnectionsStore, SidebarElement } from '@/stores/connections';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import { useSettingsStore } from '@/stores/settings';
|
||||
import * as Draggable from 'vuedraggable';
|
||||
import SettingBarContext from '@/components/SettingBarContext.vue';
|
||||
import { ConnectionParams } from 'common/interfaces/antares';
|
||||
import { useElementBounding, useScroll } from '@vueuse/core';
|
||||
import SettingBarConnections from '@/components/SettingBarConnections.vue';
|
||||
import { useElementBounding } from '@vueuse/core';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
const { t } = useI18n();
|
||||
localStorage.setItem('opened-folders', '[]');
|
||||
|
||||
const applicationStore = useApplicationStore();
|
||||
const connectionsStore = useConnectionsStore();
|
||||
@@ -109,122 +102,42 @@ const workspacesStore = useWorkspacesStore();
|
||||
const settingsStore = useSettingsStore();
|
||||
|
||||
const { updateStatus } = storeToRefs(applicationStore);
|
||||
const { connections: storedConnections, pinnedConnections, lastConnections } = storeToRefs(connectionsStore);
|
||||
const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
|
||||
const { connectionsOrder } = storeToRefs(connectionsStore);
|
||||
const { disableScratchpad } = storeToRefs(settingsStore);
|
||||
|
||||
const { showSettingModal, showScratchpad } = applicationStore;
|
||||
const { getConnectionName, updatePinnedConnections } = connectionsStore;
|
||||
const { getWorkspace, selectWorkspace } = workspacesStore;
|
||||
const { updateConnectionsOrder, initConnectionsOrder } = connectionsStore;
|
||||
const { selectWorkspace } = workspacesStore;
|
||||
|
||||
const emit = defineEmits(['show-connections-modal']);
|
||||
|
||||
const isLinux = process.platform === 'linux';
|
||||
|
||||
const sidebarConnections: Ref<HTMLDivElement> = ref(null);
|
||||
const isContext: Ref<boolean> = ref(false);
|
||||
const isDragging: Ref<boolean> = ref(false);
|
||||
const isScrollable: Ref<boolean> = ref(false);
|
||||
const isScrolling = ref(useScroll(sidebarConnections)?.isScrolling);
|
||||
const contextEvent: Ref<MouseEvent> = ref(null);
|
||||
const contextConnection: Ref<ConnectionParams> = ref(null);
|
||||
const contextConnection: Ref<SidebarElement> = ref(null);
|
||||
const sidebarConnectionsHeight = ref(useElementBounding(sidebarConnections)?.height);
|
||||
|
||||
const pinnedConnectionsArr = computed({
|
||||
get: () => [...pinnedConnections.value].map(c => storedConnections.value.find(sc => sc.uid === c)).filter(Boolean),
|
||||
set: (value: ConnectionParams[]) => {
|
||||
const pinnedUid = value.reduce((acc, curr) => {
|
||||
acc.push(curr.uid);
|
||||
return acc;
|
||||
}, []);
|
||||
|
||||
updatePinnedConnections(pinnedUid);
|
||||
const connectionsArr = computed({
|
||||
get: () => connectionsOrder.value,
|
||||
set: (value: SidebarElement[]) => {
|
||||
updateConnectionsOrder(value);
|
||||
}
|
||||
});
|
||||
|
||||
const unpinnedConnectionsArr = computed(() => {
|
||||
return storedConnections.value
|
||||
.filter(c => !pinnedConnections.value.has(c.uid))
|
||||
.map(c => {
|
||||
const connTime = lastConnections.value.find((lc) => lc.uid === c.uid)?.time || 0;
|
||||
return { ...c, time: connTime };
|
||||
})
|
||||
.sort((a, b) => {
|
||||
if (a.time < b.time) return 1;
|
||||
else if (a.time > b.time) return -1;
|
||||
return 0;
|
||||
});
|
||||
});
|
||||
|
||||
const hasUpdates = computed(() => ['available', 'downloading', 'downloaded', 'link'].includes(updateStatus.value));
|
||||
|
||||
const contextMenu = (event: MouseEvent, connection: ConnectionParams) => {
|
||||
const contextMenu = (event: MouseEvent, connection: SidebarElement) => {
|
||||
contextEvent.value = event;
|
||||
contextConnection.value = connection;
|
||||
isContext.value = true;
|
||||
};
|
||||
|
||||
const tooltipPosition = (e: Event) => {
|
||||
const el = (e.target ? e.target : e) as unknown as HTMLElement;
|
||||
const tooltip = el.querySelector<HTMLElement>('.ex-tooltip-content');
|
||||
if (tooltip) {
|
||||
const fromTop = isLinux
|
||||
? window.scrollY + el.getBoundingClientRect().top + (el.offsetHeight / 4)
|
||||
: window.scrollY + el.getBoundingClientRect().top - (el.offsetHeight / 4);
|
||||
tooltip.style.top = `${fromTop}px`;
|
||||
}
|
||||
};
|
||||
|
||||
const getStatusBadge = (uid: string) => {
|
||||
if (getWorkspace(uid)) {
|
||||
const status = getWorkspace(uid).connectionStatus;
|
||||
|
||||
switch (status) {
|
||||
case 'connected':
|
||||
return 'badge badge-connected';
|
||||
case 'connecting':
|
||||
return 'badge badge-connecting';
|
||||
case 'failed':
|
||||
return 'badge badge-failed';
|
||||
default:
|
||||
return '';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const dragStop = (e: any) => {
|
||||
isDragging.value = false;
|
||||
|
||||
setTimeout(() => {
|
||||
tooltipPosition(e.originalEvent.target.parentNode);
|
||||
}, 200);
|
||||
};
|
||||
|
||||
watch(sidebarConnectionsHeight, (value) => {
|
||||
isScrollable.value = value < sidebarConnections.value.scrollHeight;
|
||||
});
|
||||
|
||||
watch(unpinnedConnectionsArr, (newVal, oldVal) => {
|
||||
if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
|
||||
setTimeout(() => {
|
||||
const element = document.querySelector<HTMLElement>('.settingbar-element.selected');
|
||||
if (element) {
|
||||
const rect = element.getBoundingClientRect();
|
||||
const elemTop = rect.top;
|
||||
const elemBottom = rect.bottom;
|
||||
const isVisible = (elemTop >= 0) && (elemBottom <= window.innerHeight);
|
||||
|
||||
if (!isVisible) {
|
||||
element.setAttribute('tabindex', '-1');
|
||||
element.focus();
|
||||
element.removeAttribute('tabindex');
|
||||
}
|
||||
}
|
||||
}, 50);
|
||||
}
|
||||
});
|
||||
|
||||
watch(selectedWorkspace, (newVal, oldVal) => {
|
||||
if (newVal !== oldVal) {
|
||||
setTimeout(() => {
|
||||
@@ -237,137 +150,143 @@ watch(selectedWorkspace, (newVal, oldVal) => {
|
||||
}, 150);
|
||||
}
|
||||
});
|
||||
|
||||
if (!connectionsArr.value.length)
|
||||
initConnectionsOrder();
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
#settingbar {
|
||||
width: $settingbar-width;
|
||||
height: calc(100vh - #{$excluding-size});
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
// justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0;
|
||||
z-index: 9;
|
||||
#settingbar {
|
||||
width: $settingbar-width;
|
||||
height: calc(100vh - #{$excluding-size});
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
// justify-content: space-between;
|
||||
align-items: center;
|
||||
padding: 0;
|
||||
z-index: 9;
|
||||
|
||||
.settingbar-top-elements {
|
||||
.settingbar-top-elements {
|
||||
overflow-x: hidden;
|
||||
overflow-y: overlay;
|
||||
// max-height: calc((100vh - 3.5rem) - #{$excluding-size});
|
||||
|
||||
&::-webkit-scrollbar {
|
||||
width: 3px;
|
||||
width: 3px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.settingbar-bottom-elements {
|
||||
.settingbar-bottom-elements {
|
||||
z-index: 1;
|
||||
margin-top: auto;
|
||||
}
|
||||
}
|
||||
|
||||
.settingbar-elements {
|
||||
.settingbar-elements {
|
||||
list-style: none;
|
||||
text-align: center;
|
||||
width: $settingbar-width;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
|
||||
li {
|
||||
margin: 0;
|
||||
background: $bg-color-light-dark;
|
||||
|
||||
&.ghost {
|
||||
border-radius: $border-radius;
|
||||
|
||||
.settingbar-element {
|
||||
&.selected::before {
|
||||
height: 0;
|
||||
width: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.settingbar-element {
|
||||
height: $settingbar-width;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
opacity: 0.5;
|
||||
transition: opacity 0.2s;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: flex-start;
|
||||
border-radius: 0;
|
||||
padding: 0;
|
||||
height: $settingbar-width;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
opacity: 0.6;
|
||||
transition: opacity 0.2s;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 0;
|
||||
padding: 0;
|
||||
position: relative;
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&.selected {
|
||||
opacity: 1;
|
||||
&.selected {
|
||||
opacity: 1;
|
||||
|
||||
&::before {
|
||||
height: $settingbar-width;
|
||||
}
|
||||
}
|
||||
&::before {
|
||||
height: calc(#{$settingbar-width} - 0.4rem);
|
||||
}
|
||||
}
|
||||
|
||||
&::before {
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 3px;
|
||||
transition: height 0.2s;
|
||||
background-color: $primary-color;
|
||||
border-radius: $border-radius;
|
||||
}
|
||||
&::before {
|
||||
content: "";
|
||||
height: 0;
|
||||
width: 3px;
|
||||
transition: height 0.2s;
|
||||
background-color: rgba($color: #fff, $alpha: 0.8);
|
||||
border-radius: $border-radius;
|
||||
}
|
||||
|
||||
.settingbar-element-icon {
|
||||
margin: 0 auto;
|
||||
.settingbar-element-icon-wrapper{
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 100%;
|
||||
|
||||
&.badge::after {
|
||||
bottom: -10px;
|
||||
right: 0;
|
||||
position: absolute;
|
||||
}
|
||||
.settingbar-element-icon {
|
||||
&.badge::after {
|
||||
top: 10px;
|
||||
right: -6px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
&.badge-update::after {
|
||||
bottom: initial;
|
||||
}
|
||||
}
|
||||
&.badge-update::after {
|
||||
bottom: initial;
|
||||
}
|
||||
}
|
||||
|
||||
.settingbar-element-pin {
|
||||
margin: 0 auto;
|
||||
.settingbar-element-name {
|
||||
font-size: 65%;
|
||||
max-width: 90%;
|
||||
font-style: normal;
|
||||
display: block;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
width: calc($settingbar-width - 15px);
|
||||
line-height: 1.1;
|
||||
color: rgba($body-font-color-dark, 0.8);
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
&::before {
|
||||
font: normal normal normal 14px/1 "Material Design Icons";
|
||||
content: "\F0403";
|
||||
color: $body-font-color-dark;
|
||||
transform: rotate(45deg);
|
||||
opacity: 0.25;
|
||||
bottom: -8px;
|
||||
left: -4px;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
.settingbar-element-pin {// <- Dead
|
||||
margin: 0 auto;
|
||||
|
||||
&::before {
|
||||
font: normal normal normal 14px/1 "Material Design Icons";
|
||||
content: "\F0403";
|
||||
color: $body-font-color-dark;
|
||||
transform: rotate(45deg);
|
||||
opacity: 0.25;
|
||||
top: -8px;
|
||||
left: -10px;
|
||||
position: absolute;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.ex-tooltip {// Because both overflow-x: visible and overflow-y:auto are evil!!!
|
||||
.ex-tooltip-content {
|
||||
z-index: 999;
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
display: block;
|
||||
position: absolute;
|
||||
text-align: center;
|
||||
margin: 0 0 0 calc(#{$settingbar-width} - 5px);
|
||||
left: 0;
|
||||
padding: 0.2rem 0.4rem;
|
||||
font-size: 0.7rem;
|
||||
background: rgba(48, 55, 66, 0.95);
|
||||
border-radius: $border-radius;
|
||||
color: #fff;
|
||||
max-width: 320px;
|
||||
pointer-events: none;
|
||||
text-overflow: ellipsis;
|
||||
overflow: hidden;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
|
||||
&.sortable-chosen {
|
||||
.ex-tooltip-content {
|
||||
opacity: 0 !important;
|
||||
}
|
||||
}
|
||||
|
||||
&:hover:not(.selected) .ex-tooltip-content {
|
||||
visibility: visible;
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
@@ -30,7 +30,7 @@
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-refresh" />
|
||||
</div>
|
||||
<div v-if="isWindows" style="width: 140px;" />
|
||||
<div v-if="isWindows" :style="'width: 140px;'" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -67,7 +67,7 @@ const windowTitle = computed(() => {
|
||||
|
||||
const connectionName = getConnectionName(selectedWorkspace.value);
|
||||
const workspace = getWorkspace(selectedWorkspace.value);
|
||||
const breadcrumbs = Object.values(workspace.breadcrumbs).filter(breadcrumb => breadcrumb) || [workspace.client];
|
||||
const breadcrumbs = workspace ? Object.values(workspace.breadcrumbs).filter(breadcrumb => breadcrumb) || [workspace.client] : [];
|
||||
|
||||
return [connectionName, ...breadcrumbs].join(' • ');
|
||||
});
|
||||
|
@@ -326,7 +326,7 @@
|
||||
v-if="tab.type ==='query'"
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:connection="connection"
|
||||
/>
|
||||
<WorkspaceTabTable
|
||||
@@ -334,7 +334,7 @@
|
||||
v-once
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:table="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
:element-type="tab.elementType"
|
||||
@@ -344,14 +344,14 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
<WorkspaceTabPropsTable
|
||||
v-else-if="tab.type === 'table-props'"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:table="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -360,13 +360,13 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
<WorkspaceTabPropsView
|
||||
v-else-if="tab.type === 'view-props'"
|
||||
:tab-uid="tab.uid"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:connection="connection"
|
||||
:view="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
@@ -376,7 +376,7 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -384,7 +384,7 @@
|
||||
v-else-if="['temp-trigger-props', 'trigger-props'].includes(tab.type)"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -393,7 +393,7 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -401,7 +401,7 @@
|
||||
v-else-if="['temp-trigger-function-props', 'trigger-function-props'].includes(tab.type)"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:function="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -410,7 +410,7 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -418,7 +418,7 @@
|
||||
v-else-if="['temp-routine-props', 'routine-props'].includes(tab.type)"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:routine="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -427,7 +427,7 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -435,7 +435,7 @@
|
||||
v-else-if="['temp-function-props', 'function-props'].includes(tab.type)"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:function="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -444,7 +444,7 @@
|
||||
:tab-uid="tab.uid"
|
||||
:tab="tab"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:trigger="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -452,7 +452,7 @@
|
||||
v-else-if="['temp-scheduler-props', 'scheduler-props'].includes(tab.type)"
|
||||
:tab-uid="tab.uid"
|
||||
:connection="connection"
|
||||
:is-selected="selectedTab === tab.uid"
|
||||
:is-selected="selectedTab === tab.uid && isSelected"
|
||||
:scheduler="tab.elementName"
|
||||
:schema="tab.schema"
|
||||
/>
|
||||
@@ -638,6 +638,8 @@ const hideProcessesModal = () => {
|
||||
const addWheelEvent = () => {
|
||||
if (!hasWheelEvent.value) {
|
||||
tabWrap.value.$el.addEventListener('wheel', (e: WheelEvent) => {
|
||||
if (e.deltaX !== 0) return; // If trackpad horizontal scroll
|
||||
|
||||
if (e.deltaY > 0) tabWrap.value.$el.scrollLeft += 50;
|
||||
else tabWrap.value.$el.scrollLeft -= 50;
|
||||
});
|
||||
|
@@ -415,7 +415,8 @@ const clients = [
|
||||
{ name: 'MySQL', slug: 'mysql' },
|
||||
{ name: 'MariaDB', slug: 'maria' },
|
||||
{ name: 'PostgreSQL', slug: 'pg' },
|
||||
{ name: 'SQLite', slug: 'sqlite' }
|
||||
{ name: 'SQLite', slug: 'sqlite' },
|
||||
{ name: 'Firebird SQL (experimental)', slug: 'firebird' }
|
||||
];
|
||||
|
||||
const connection = ref({
|
||||
@@ -553,7 +554,7 @@ setDefaults();
|
||||
|
||||
setTimeout(() => {
|
||||
if (firstInput.value) firstInput.value.focus();
|
||||
}, 20);
|
||||
}, 200);
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
|
@@ -428,7 +428,8 @@ const clients = [
|
||||
{ name: 'MySQL', slug: 'mysql' },
|
||||
{ name: 'MariaDB', slug: 'maria' },
|
||||
{ name: 'PostgreSQL', slug: 'pg' },
|
||||
{ name: 'SQLite', slug: 'sqlite' }
|
||||
{ name: 'SQLite', slug: 'sqlite' },
|
||||
{ name: 'Firebird SQL (experimental)', slug: 'firebird' }
|
||||
];
|
||||
|
||||
const firstInput: Ref<HTMLInputElement> = ref(null);
|
||||
|
@@ -7,7 +7,7 @@
|
||||
{{ t('message.noOpenTabs') }}
|
||||
</p>
|
||||
<div class="empty-action">
|
||||
<button class="btn btn-gray d-flex" @click="emit('new-tab')">
|
||||
<button class="btn btn-primary d-flex" @click="emit('new-tab')">
|
||||
<i class="mdi mdi-24px mdi-tab-plus mr-2" />
|
||||
{{ t('message.openNewTab') }}
|
||||
</button>
|
||||
@@ -45,7 +45,7 @@ const workspace = computed(() => {
|
||||
changeBreadcrumbs({ schema: workspace.value.breadcrumbs.schema });
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style lang="scss" scoped>
|
||||
.empty {
|
||||
height: 100%;
|
||||
border-radius: 0;
|
||||
|
@@ -188,8 +188,6 @@ const deleteMisc = async () => {
|
||||
break;
|
||||
}
|
||||
|
||||
console.log(res);
|
||||
|
||||
const { status, response } = res;
|
||||
|
||||
if (status === 'success') {
|
||||
@@ -219,7 +217,7 @@ const runElementCheck = () => {
|
||||
};
|
||||
|
||||
const runElement = (params: string[]) => {
|
||||
if (props.selectedMisc.type === 'procedure')
|
||||
if (['procedure', 'routine'].includes(props.selectedMisc.type))
|
||||
runRoutine(params);
|
||||
else if (props.selectedMisc.type === 'function')
|
||||
runFunction(params);
|
||||
@@ -260,6 +258,9 @@ const runRoutine = (params?: string[]) => {
|
||||
case 'pg':
|
||||
sql = `CALL ${localElement.value.name}(${params.join(',')})`;
|
||||
break;
|
||||
case 'firebird':
|
||||
sql = `EXECUTE PROCEDURE "${localElement.value.name}"(${params.join(',')})`;
|
||||
break;
|
||||
// case 'mssql':
|
||||
// sql = `EXEC ${localElement.value.name} ${params.join(',')}`;
|
||||
// break;
|
||||
|
@@ -25,7 +25,6 @@
|
||||
<ul class="menu menu-nav pt-0">
|
||||
<li
|
||||
v-for="table of filteredTables"
|
||||
:ref="breadcrumbs.schema === database.name && [breadcrumbs.table, breadcrumbs.view].includes(table.name) ? 'explorebarSelected' : ''"
|
||||
:key="table.name"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && [breadcrumbs.table, breadcrumbs.view].includes(table.name)}"
|
||||
@@ -69,7 +68,6 @@
|
||||
<li
|
||||
v-for="trigger of filteredTriggers"
|
||||
:key="trigger.name"
|
||||
:ref="breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name ? 'explorebarSelected' : ''"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.trigger === trigger.name}"
|
||||
@mousedown.left="selectMisc({schema: database.name, misc: trigger, type: 'trigger'})"
|
||||
@@ -111,7 +109,6 @@
|
||||
<li
|
||||
v-for="(routine, i) of filteredProcedures"
|
||||
:key="`${routine.name}-${i}`"
|
||||
:ref="breadcrumbs.schema === database.name && breadcrumbs.routine === routine.name ? 'explorebarSelected' : ''"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.routine === routine.name}"
|
||||
@mousedown.left="selectMisc({schema: database.name, misc: routine, type: 'routine'})"
|
||||
@@ -145,7 +142,6 @@
|
||||
<li
|
||||
v-for="(func, i) of filteredTriggerFunctions"
|
||||
:key="`${func.name}-${i}`"
|
||||
:ref="breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name ? 'explorebarSelected' : ''"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.triggerFunction === func.name}"
|
||||
@mousedown.left="selectMisc({schema: database.name, misc: func, type: 'triggerFunction'})"
|
||||
@@ -179,7 +175,6 @@
|
||||
<li
|
||||
v-for="(func, i) of filteredFunctions"
|
||||
:key="`${func.name}-${i}`"
|
||||
:ref="breadcrumbs.schema === database.name && breadcrumbs.function === func.name ? 'explorebarSelected' : ''"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.function === func.name}"
|
||||
@mousedown.left="selectMisc({schema: database.name, misc: func, type: 'function'})"
|
||||
@@ -213,7 +208,6 @@
|
||||
<li
|
||||
v-for="scheduler of filteredSchedulers"
|
||||
:key="scheduler.name"
|
||||
:ref="breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name ? 'explorebarSelected' : ''"
|
||||
class="menu-item"
|
||||
:class="{'selected': breadcrumbs.schema === database.name && breadcrumbs.scheduler === scheduler.name}"
|
||||
@mousedown.left="selectMisc({schema: database.name, misc: scheduler, type: 'scheduler'})"
|
||||
@@ -281,7 +275,6 @@ const {
|
||||
} = workspacesStore;
|
||||
|
||||
const schemaAccordion: Ref<HTMLDetailsElement> = ref(null);
|
||||
const explorebarSelected: Ref<HTMLElement[]> = ref(null);
|
||||
const isLoading = ref(false);
|
||||
|
||||
const searchTerm = computed(() => {
|
||||
@@ -340,7 +333,8 @@ const maxSize = computed(() => {
|
||||
watch(breadcrumbs, (newVal, oldVal) => {
|
||||
if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
|
||||
setTimeout(() => {
|
||||
const element = explorebarSelected.value ? explorebarSelected.value[0] : null;
|
||||
const element = document.querySelector<HTMLElement>('.workspace-explorebar-database .selected');
|
||||
|
||||
if (element) {
|
||||
const rect = element.getBoundingClientRect();
|
||||
const elemTop = rect.top;
|
||||
@@ -353,7 +347,7 @@ watch(breadcrumbs, (newVal, oldVal) => {
|
||||
element.removeAttribute('tabindex');
|
||||
}
|
||||
}
|
||||
}, 50);
|
||||
}, 100);
|
||||
}
|
||||
});
|
||||
|
||||
|
@@ -18,7 +18,7 @@
|
||||
<span class="d-flex"><i class="mdi mdi-18px mdi-tune-vertical-variant text-light pr-1" /> {{ t('word.settings') }}</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedTable && selectedTable.type === 'table'"
|
||||
v-if="selectedTable && selectedTable.type === 'table' && customizations.tableDuplicate"
|
||||
class="context-element"
|
||||
@click="duplicateTable"
|
||||
>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -189,6 +188,7 @@ import WorkspaceTabPropsFunctionParamsModal from '@/components/WorkspaceTabProps
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { FunctionInfos, FunctionParam } from 'common/interfaces/antares';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -300,14 +300,10 @@ const hideParamsModal = () => {
|
||||
isParamsModal.value = false;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
@@ -341,19 +337,19 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -161,6 +160,7 @@ import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsR
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { FunctionParam } from 'common/interfaces/antares';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -272,14 +272,10 @@ const hideParamsModal = () => {
|
||||
isParamsModal.value = false;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
@@ -295,7 +291,7 @@ watch(consoleHeight, () => {
|
||||
});
|
||||
|
||||
originalRoutine.value = {
|
||||
sql: customizations.value.functionSql,
|
||||
sql: customizations.value.procedureSql,
|
||||
language: customizations.value.languages ? customizations.value.languages[0] : null,
|
||||
name: '',
|
||||
definer: '',
|
||||
@@ -313,19 +309,19 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -138,6 +137,7 @@ import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import WorkspaceTabPropsSchedulerTimingModal from '@/components/WorkspaceTabPropsSchedulerTimingModal.vue';
|
||||
import Schedulers from '@/ipc-api/Schedulers';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -259,14 +259,10 @@ const timingUpdate = (options: EventInfos) => {
|
||||
localScheduler.value = options;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
@@ -298,19 +294,19 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged || !isValid"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -91,6 +90,7 @@
|
||||
<BaseSelect
|
||||
v-model="localOptions.collation"
|
||||
:options="workspace.collations"
|
||||
:max-visible-options="1000"
|
||||
option-label="collation"
|
||||
option-track-by="collation"
|
||||
class="form-select"
|
||||
@@ -175,6 +175,7 @@ import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTa
|
||||
import WorkspaceTabNewTableEmptyState from '@/components/WorkspaceTabNewTableEmptyState.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ConnectionParams, TableField, TableForeign, TableIndex, TableOptions } from 'common/interfaces/antares';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -311,9 +312,10 @@ const clearChanges = () => {
|
||||
};
|
||||
|
||||
const addField = () => {
|
||||
const uid = uidGen();
|
||||
localFields.value.push({
|
||||
_antares_id: uidGen(),
|
||||
name: `${t('word.field', 1)}_${++newFieldsCounter.value}`,
|
||||
_antares_id: uid,
|
||||
name: `${t('word.field', 1)}_${uid.substring(0, 4)}`,
|
||||
key: '',
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
type: (workspace.value.dataTypes[0] as any).types[0].name,
|
||||
@@ -420,14 +422,10 @@ const foreignsUpdate = (foreigns: TableForeign[]) => {
|
||||
localKeyUsage.value = foreigns;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
@@ -447,18 +445,19 @@ tableOptions.value = {
|
||||
};
|
||||
|
||||
localOptions.value = JSON.parse(JSON.stringify(tableOptions.value));
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -126,6 +125,7 @@ import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import Triggers from '@/ipc-api/Triggers';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -268,18 +268,20 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
if (val) changeBreadcrumbs({ schema: props.schema });
|
||||
if (val) {
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
}
|
||||
});
|
||||
|
||||
watch(isChanged, (val) => {
|
||||
@@ -305,12 +307,12 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
@@ -323,6 +325,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -105,6 +104,7 @@ import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import Functions from '@/ipc-api/Functions';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -203,14 +203,10 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
originalFunction.value = {
|
||||
@@ -237,12 +233,12 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
@@ -255,6 +251,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -115,6 +114,7 @@ import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import Views from '@/ipc-api/Views';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -216,14 +216,10 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.isSelected, (val) => {
|
||||
@@ -259,12 +255,12 @@ setTimeout(() => {
|
||||
resizeQueryEditor();
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
if (props.isSelected)
|
||||
changeBreadcrumbs({ schema: props.schema });
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
|
||||
setTimeout(() => {
|
||||
firstInput.value.focus();
|
||||
}, 100);
|
||||
@@ -277,7 +273,7 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -207,6 +206,7 @@ import Functions from '@/ipc-api/Functions';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { AlterFunctionParams, FunctionInfos, FunctionParam } from 'common/interfaces/antares';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -407,14 +407,10 @@ const hideAskParamsModal = () => {
|
||||
isAskingParameters.value = false;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.keyCode === 83) { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -457,11 +453,12 @@ watch(consoleHeight, () => {
|
||||
(async () => {
|
||||
await getFunctionData();
|
||||
queryEditor.value.editor.session.setValue(localFunction.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -469,6 +466,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -179,6 +178,7 @@ import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import WorkspaceTabPropsRoutineParamsModal from '@/components/WorkspaceTabPropsRoutineParamsModal.vue';
|
||||
import ModalAskParameters from '@/components/ModalAskParameters.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -351,6 +351,9 @@ const runRoutine = (params?: string[]) => {
|
||||
case 'pg':
|
||||
sql = `CALL ${originalRoutine.value.name}(${params.join(',')})`;
|
||||
break;
|
||||
case 'firebird':
|
||||
sql = `EXECUTE PROCEDURE "${originalRoutine.value.name}"(${params.join(',')})`;
|
||||
break;
|
||||
case 'mssql':
|
||||
sql = `EXEC ${originalRoutine.value.name} ${params.join(',')}`;
|
||||
break;
|
||||
@@ -377,14 +380,10 @@ const hideAskParamsModal = () => {
|
||||
isAskingParameters.value = false;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -427,11 +426,12 @@ watch(consoleHeight, () => {
|
||||
(async () => {
|
||||
await getRoutineData();
|
||||
queryEditor.value.editor.session.setValue(localRoutine.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -439,7 +439,7 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
@@ -118,29 +118,17 @@
|
||||
{{ t('word.context') }}
|
||||
</label>
|
||||
<div class="column">
|
||||
<label class="form-radio">
|
||||
<label
|
||||
v-for="condext in customizations.procedureContextValues"
|
||||
:key="condext"
|
||||
class="form-radio"
|
||||
>
|
||||
<input
|
||||
v-model="selectedParamObj.context"
|
||||
type="radio"
|
||||
name="context"
|
||||
value="IN"
|
||||
> <i class="form-icon" /> IN
|
||||
</label>
|
||||
<label class="form-radio">
|
||||
<input
|
||||
v-model="selectedParamObj.context"
|
||||
type="radio"
|
||||
value="OUT"
|
||||
name="context"
|
||||
> <i class="form-icon" /> OUT
|
||||
</label>
|
||||
<label class="form-radio">
|
||||
<input
|
||||
v-model="selectedParamObj.context"
|
||||
type="radio"
|
||||
value="INOUT"
|
||||
name="context"
|
||||
> <i class="form-icon" /> INOUT
|
||||
:value="condext"
|
||||
> <i class="form-icon" /> {{ condext }}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -136,6 +135,7 @@ import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import WorkspaceTabPropsSchedulerTimingModal from '@/components/WorkspaceTabPropsSchedulerTimingModal.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import Schedulers from '@/ipc-api/Schedulers';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -295,14 +295,10 @@ const timingUpdate = (options: EventInfos) => {
|
||||
localScheduler.value = options;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -345,11 +341,12 @@ watch(consoleHeight, () => {
|
||||
(async () => {
|
||||
await getSchedulerData();
|
||||
queryEditor.value.editor.session.setValue(localScheduler.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -357,7 +354,7 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -104,6 +103,7 @@
|
||||
<BaseSelect
|
||||
v-model="localOptions.collation"
|
||||
:options="workspace.collations"
|
||||
:max-visible-options="1000"
|
||||
option-label="collation"
|
||||
option-track-by="collation"
|
||||
class="form-select"
|
||||
@@ -173,7 +173,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Component, computed, onBeforeUnmount, Ref, ref, watch } from 'vue';
|
||||
import { Component, computed, onBeforeUnmount, onMounted, Ref, ref, watch } from 'vue';
|
||||
import { AlterTableParams, TableField, TableForeign, TableIndex, TableInfos, TableOptions } from 'common/interfaces/antares';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
@@ -186,6 +186,7 @@ import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import WorkspaceTabPropsTableFields from '@/components/WorkspaceTabPropsTableFields.vue';
|
||||
import WorkspaceTabPropsTableIndexesModal from '@/components/WorkspaceTabPropsTableIndexesModal.vue';
|
||||
import WorkspaceTabPropsTableForeignModal from '@/components/WorkspaceTabPropsTableForeignModal.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -300,7 +301,7 @@ const getFieldsData = async () => {
|
||||
field.defaultType = 'noval';
|
||||
else if (field.default === 'NULL')
|
||||
field.defaultType = 'null';
|
||||
else if (isNaN(+field.default) && field.default.charAt(0) !== '\'')
|
||||
else if (typeof field.default === 'string' && isNaN(+field.default) && field.default.charAt(0) !== '\'')
|
||||
field.defaultType = 'expression';
|
||||
else {
|
||||
field.defaultType = 'custom';
|
||||
@@ -323,11 +324,13 @@ const getFieldsData = async () => {
|
||||
const { status, response } = await Tables.getTableIndexes(params);
|
||||
|
||||
if (status === 'success') {
|
||||
const indexesObj = response.reduce((acc: {[key: string]: TableIndex[]}, curr: TableIndex) => {
|
||||
acc[curr.name] = acc[curr.name] || [];
|
||||
acc[curr.name].push(curr);
|
||||
return acc;
|
||||
}, {});
|
||||
const indexesObj = response
|
||||
.filter((index: TableIndex) => index.type !== 'FOREIGN KEY')
|
||||
.reduce((acc: {[key: string]: TableIndex[]}, curr: TableIndex) => {
|
||||
acc[curr.name] = acc[curr.name] || [];
|
||||
acc[curr.name].push(curr);
|
||||
return acc;
|
||||
}, {});
|
||||
|
||||
originalIndexes.value = Object.keys(indexesObj).map(index => {
|
||||
return {
|
||||
@@ -529,9 +532,10 @@ const clearChanges = () => {
|
||||
};
|
||||
|
||||
const addField = () => {
|
||||
const uid = uidGen();
|
||||
localFields.value.push({
|
||||
_antares_id: uidGen(),
|
||||
name: `${t('word.field', 1)}_${++newFieldsCounter.value}`,
|
||||
_antares_id: uid,
|
||||
name: `${t('word.field', 1)}_${uid.substring(0, 4)}`,
|
||||
key: '',
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
type: (workspace.value.dataTypes[0] as any).types[0].name,
|
||||
@@ -646,14 +650,10 @@ const foreignsUpdate = (foreigns: TableForeign[]) => {
|
||||
localKeyUsage.value = foreigns;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, () => {
|
||||
@@ -684,9 +684,12 @@ watch(isChanged, (val) => {
|
||||
});
|
||||
|
||||
getFieldsData();
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
onMounted(() => {
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -113,7 +113,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="form-label col-3 pt-0">
|
||||
<label class="form-label col-3">
|
||||
{{ t('message.referenceTable') }}
|
||||
</label>
|
||||
<div class="column">
|
||||
@@ -219,13 +219,8 @@ const foreignProxy = ref([]);
|
||||
const selectedForeignID = ref('');
|
||||
const modalInnerHeight = ref(400);
|
||||
const refFields = ref({} as {[key: string]: TableField[]});
|
||||
const foreignActions = [
|
||||
'RESTRICT',
|
||||
'CASCADE',
|
||||
'SET NULL',
|
||||
'NO ACTION'
|
||||
];
|
||||
|
||||
const foreignActions = computed(() => props.workspace.customizations.foreignActions);
|
||||
const selectedForeignObj = computed(() => foreignProxy.value.find(foreign => foreign._antares_id === selectedForeignID.value));
|
||||
const isChanged = computed(() => JSON.stringify(props.localKeyUsage) !== JSON.stringify(foreignProxy.value));
|
||||
|
||||
@@ -254,16 +249,17 @@ const getModalInnerHeight = () => {
|
||||
};
|
||||
|
||||
const addForeign = () => {
|
||||
const uid = uidGen();
|
||||
foreignProxy.value = [...foreignProxy.value, {
|
||||
_antares_id: uidGen(),
|
||||
constraintName: `FK_${uidGen()}`,
|
||||
_antares_id: uid,
|
||||
constraintName: `FK_${uid.substring(0, 4)}`,
|
||||
refSchema: props.schema,
|
||||
table: props.table,
|
||||
refTable: '',
|
||||
field: '',
|
||||
refField: '',
|
||||
onUpdate: foreignActions[0],
|
||||
onDelete: foreignActions[0]
|
||||
onUpdate: foreignActions.value[0],
|
||||
onDelete: foreignActions.value[0]
|
||||
}];
|
||||
|
||||
if (foreignProxy.value.length === 1)
|
||||
@@ -271,6 +267,7 @@ const addForeign = () => {
|
||||
|
||||
setTimeout(() => {
|
||||
indexesPanel.value.scrollTop = indexesPanel.value.scrollHeight + 60;
|
||||
selectedForeignID.value = uid;
|
||||
}, 20);
|
||||
};
|
||||
|
||||
|
@@ -92,7 +92,7 @@
|
||||
<BaseSelect
|
||||
v-model="selectedIndexObj.type"
|
||||
:options="indexTypes"
|
||||
:option-disabled="(opt: any) => opt === 'PRIMARY'"
|
||||
:option-disabled="(opt: any) => opt === 'PRIMARY' && hasPrimary"
|
||||
class="form-select"
|
||||
/>
|
||||
</div>
|
||||
@@ -160,6 +160,7 @@ const modalInnerHeight = ref(400);
|
||||
|
||||
const selectedIndexObj = computed(() => indexesProxy.value.find(index => index._antares_id === selectedIndexID.value));
|
||||
const isChanged = computed(() => JSON.stringify(props.localIndexes) !== JSON.stringify(indexesProxy.value));
|
||||
const hasPrimary = computed(() => indexesProxy.value.some(index => ['PRIMARY', 'PRIMARY KEY'].includes(index.type)));
|
||||
|
||||
const confirmIndexesChange = () => {
|
||||
indexesProxy.value = indexesProxy.value.filter(index => index.fields.length);
|
||||
@@ -179,15 +180,12 @@ const getModalInnerHeight = () => {
|
||||
};
|
||||
|
||||
const addIndex = () => {
|
||||
const uid = uidGen();
|
||||
indexesProxy.value = [...indexesProxy.value, {
|
||||
_antares_id: uidGen(),
|
||||
name: 'NEW_INDEX',
|
||||
_antares_id: uid,
|
||||
name: `INDEX_${uid.substring(0, 4)}`,
|
||||
fields: [],
|
||||
type: 'INDEX',
|
||||
comment: '',
|
||||
indexType: 'BTREE',
|
||||
indexComment: '',
|
||||
cardinality: 0
|
||||
type: props.workspace.customizations.primaryAsIndex ? props.indexTypes[0] : props.indexTypes[1]
|
||||
}];
|
||||
|
||||
if (indexesProxy.value.length === 1)
|
||||
@@ -195,6 +193,7 @@ const addIndex = () => {
|
||||
|
||||
setTimeout(() => {
|
||||
indexesPanel.value.scrollTop = indexesPanel.value.scrollHeight + 60;
|
||||
selectedIndexID.value = uid;
|
||||
}, 20);
|
||||
};
|
||||
|
||||
|
@@ -212,6 +212,7 @@
|
||||
:options="collations"
|
||||
option-label="collation"
|
||||
option-track-by="collation"
|
||||
:max-visible-options="1000"
|
||||
class="form-select small-select pl-1 pr-4 editable-field"
|
||||
@blur="editOFF"
|
||||
/>
|
||||
@@ -409,7 +410,7 @@ const types = computed(() => {
|
||||
const types = [...props.dataTypes];
|
||||
if (!isInDataTypes.value)
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(types as any).unshift({ name: props.row });
|
||||
(types as any).unshift({ name: props.row.type });
|
||||
|
||||
return types;
|
||||
});
|
||||
@@ -501,8 +502,8 @@ const editOFF = () => {
|
||||
localRow.value.enumValues = '';
|
||||
|
||||
if (fieldType.value.length) {
|
||||
if (['integer', 'float', 'binary', 'spatial'].includes(fieldType.value.group)) localRow.value.numLength = 11;
|
||||
if (['string'].includes(fieldType.value.group)) localRow.value.charLength = 15;
|
||||
if (['integer', 'float', 'binary', 'spatial'].includes(fieldType.value.group)) localRow.value.numLength = 10;
|
||||
if (['string'].includes(fieldType.value.group)) localRow.value.charLength = 20;
|
||||
if (['time'].includes(fieldType.value.group)) localRow.value.datePrecision = 0;
|
||||
if (['other'].includes(fieldType.value.group)) localRow.value.enumValues = '\'valA\',\'valB\'';
|
||||
}
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -126,6 +125,7 @@ import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import Triggers from '@/ipc-api/Triggers';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
type TriggerEventName = 'INSERT' | 'UPDATE' | 'DELETE'
|
||||
|
||||
@@ -318,14 +318,10 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -359,11 +355,12 @@ watch(consoleHeight, () => {
|
||||
(async () => {
|
||||
await getTriggerData();
|
||||
queryEditor.value.editor.session.setValue(localTrigger.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -371,6 +368,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -93,6 +92,7 @@ import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import Functions from '@/ipc-api/Functions';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { AlterFunctionParams, TriggerFunctionInfos } from 'common/interfaces/antares';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -223,14 +223,10 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -264,11 +260,12 @@ watch(isChanged, (val) => {
|
||||
(async () => {
|
||||
await getFunctionData();
|
||||
queryEditor.value.editor.session.setValue(localFunction.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -276,6 +273,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -7,7 +7,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:disabled="!isChanged"
|
||||
:class="{'loading':isSaving}"
|
||||
title="CTRL+S"
|
||||
@click="saveChanges"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-content-save mr-1" />
|
||||
@@ -112,6 +111,7 @@ import BaseLoader from '@/components/BaseLoader.vue';
|
||||
import QueryEditor from '@/components/QueryEditor.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import Views from '@/ipc-api/Views';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -245,14 +245,10 @@ const resizeQueryEditor = () => {
|
||||
}
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.ctrlKey && e.key === 's') { // CTRL + S
|
||||
if (isChanged.value)
|
||||
saveChanges();
|
||||
}
|
||||
}
|
||||
const saveContentListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen && isChanged.value)
|
||||
saveChanges();
|
||||
};
|
||||
|
||||
watch(() => props.schema, async () => {
|
||||
@@ -288,11 +284,12 @@ watch(isChanged, (val) => {
|
||||
(async () => {
|
||||
await getViewData();
|
||||
queryEditor.value.editor.session.setValue(localView.value.sql);
|
||||
window.addEventListener('keydown', onKey);
|
||||
})();
|
||||
|
||||
onMounted(() => {
|
||||
window.addEventListener('resize', resizeQueryEditor);
|
||||
|
||||
ipcRenderer.on('save-content', saveContentListener);
|
||||
});
|
||||
|
||||
onUnmounted(() => {
|
||||
@@ -300,6 +297,6 @@ onUnmounted(() => {
|
||||
});
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
ipcRenderer.removeListener('save-content', saveContentListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -3,11 +3,6 @@
|
||||
v-show="isSelected"
|
||||
class="workspace-query-tab column col-12 columns col-gapless no-outline p-0"
|
||||
tabindex="0"
|
||||
@keydown.f5="runQuery(query)"
|
||||
@keydown.k="killTabQuery"
|
||||
@keydown.ctrl.alt.w="clear"
|
||||
@keydown.ctrl.b="beautify"
|
||||
@keydown.ctrl.g="openHistoryModal"
|
||||
>
|
||||
<div class="workspace-query-runner column col-12">
|
||||
<QueryEditor
|
||||
@@ -40,7 +35,6 @@
|
||||
class="btn btn-primary btn-sm"
|
||||
:class="{'loading':isQuering}"
|
||||
:disabled="!query"
|
||||
title="F5"
|
||||
@click="runQuery(query)"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-play pr-1" />
|
||||
@@ -68,7 +62,6 @@
|
||||
<button
|
||||
class="btn btn-link btn-sm mr-0"
|
||||
:disabled="!query || isQuering"
|
||||
title="CTRL+W"
|
||||
@click="clear()"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-delete-sweep pr-1" />
|
||||
@@ -80,7 +73,6 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm"
|
||||
:disabled="!query || isQuering"
|
||||
title="CTRL+B"
|
||||
@click="beautify()"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-brush pr-1" />
|
||||
@@ -89,7 +81,6 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm"
|
||||
:disabled="isQuering"
|
||||
title="CTRL+G"
|
||||
@click="openHistoryModal()"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-history pr-1" />
|
||||
@@ -206,6 +197,8 @@ import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable.vue';
|
||||
import WorkspaceTabQueryEmptyState from '@/components/WorkspaceTabQueryEmptyState.vue';
|
||||
import ModalHistory from '@/components/ModalHistory.vue';
|
||||
import BaseSelect from '@/components/BaseSelect.vue';
|
||||
import { ipcRenderer } from 'electron';
|
||||
import { useSettingsStore } from '@/stores/settings';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -230,6 +223,7 @@ const { addNotification } = useNotificationsStore();
|
||||
const workspacesStore = useWorkspacesStore();
|
||||
|
||||
const { consoleHeight } = storeToRefs(useConsoleStore());
|
||||
const { executeSelected } = storeToRefs(useSettingsStore());
|
||||
|
||||
const {
|
||||
getWorkspace,
|
||||
@@ -298,8 +292,10 @@ const runQuery = async (query: string) => {
|
||||
if (!query || isQuering.value) return;
|
||||
isQuering.value = true;
|
||||
|
||||
const selectedQuery = queryEditor.value.editor.getSelectedText();
|
||||
if (selectedQuery) query = selectedQuery;
|
||||
if (executeSelected.value) {
|
||||
const selectedQuery = queryEditor.value.editor.getSelectedText();
|
||||
if (selectedQuery) query = selectedQuery;
|
||||
}
|
||||
|
||||
clearTabData();
|
||||
queryTable.value.resetSort();
|
||||
@@ -427,7 +423,8 @@ const beautify = () => {
|
||||
const formattedQuery = format(query.value, {
|
||||
language,
|
||||
uppercase: true
|
||||
});
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
} as any);
|
||||
queryEditor.value.editor.session.setValue(formattedQuery);
|
||||
}
|
||||
};
|
||||
@@ -499,12 +496,47 @@ selectedSchema.value = props.tab.schema || breadcrumbsSchema.value;
|
||||
if (!databaseSchemas.value.includes(selectedSchema.value))
|
||||
selectedSchema.value = null;
|
||||
|
||||
// window.addEventListener('keydown', onKey);
|
||||
window.addEventListener('resize', onWindowResize);
|
||||
|
||||
const reloadListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
runQuery(query.value);
|
||||
};
|
||||
|
||||
const formatListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
beautify();
|
||||
};
|
||||
|
||||
const killQueryListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
killTabQuery();
|
||||
};
|
||||
|
||||
const clearQueryListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
clear();
|
||||
};
|
||||
|
||||
const historyListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
openHistoryModal();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
const localResizer = resizer.value;
|
||||
|
||||
ipcRenderer.on('run-or-reload', reloadListener);
|
||||
ipcRenderer.on('format-query', formatListener);
|
||||
ipcRenderer.on('kill-query', killQueryListener);
|
||||
ipcRenderer.on('clear-query', clearQueryListener);
|
||||
ipcRenderer.on('query-history', historyListener);
|
||||
|
||||
localResizer.addEventListener('mousedown', (e: MouseEvent) => {
|
||||
e.preventDefault();
|
||||
|
||||
@@ -518,12 +550,17 @@ onMounted(() => {
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('resize', onWindowResize);
|
||||
// window.removeEventListener('keydown', onKey);
|
||||
const params = {
|
||||
uid: props.connection.uid,
|
||||
tabUid: props.tab.uid
|
||||
};
|
||||
Schema.destroyConnectionToCommit(params);
|
||||
|
||||
ipcRenderer.removeListener('run-or-reload', reloadListener);
|
||||
ipcRenderer.removeListener('format-query', formatListener);
|
||||
ipcRenderer.removeListener('kill-query', killQueryListener);
|
||||
ipcRenderer.removeListener('clear-query', clearQueryListener);
|
||||
ipcRenderer.removeListener('query-history', historyListener);
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -2,49 +2,21 @@
|
||||
<div class="container">
|
||||
<div class="columns">
|
||||
<div class="column col-16 text-right">
|
||||
<div class="mb-4">
|
||||
{{ t('message.runQuery') }}
|
||||
</div>
|
||||
<div v-if="customizations.cancelQueries" class="mb-4">
|
||||
{{ t('message.killQuery') }}
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
{{ t('word.format') }}
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
{{ t('word.clear') }}
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
{{ t('word.history') }}
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
{{ t('message.openNewTab') }}
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
{{ t('message.closeTab') }}
|
||||
<div
|
||||
v-for="(shortcut, i) in tabShortcuts"
|
||||
:key="i"
|
||||
class="mb-4"
|
||||
>
|
||||
{{ t(shortcutEvents[shortcut.event].l18n, {param: shortcutEvents[shortcut.event].l18nParam}) }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="column col-16">
|
||||
<div class="mb-4">
|
||||
<code>F5</code>
|
||||
</div>
|
||||
<div v-if="customizations.cancelQueries" class="mb-4">
|
||||
<code>CTRL</code> + <code>K</code>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<code>CTRL</code> + <code>B</code>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<code>CTRL</code> + <code>ALT</code> + <code>W</code>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<code>CTRL</code> + <code>G</code>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<code>CTRL</code> + <code>T</code>
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<code>CTRL</code> + <code>W</code>
|
||||
<div
|
||||
v-for="(shortcut, i) in tabShortcuts"
|
||||
:key="i"
|
||||
class="mb-4"
|
||||
>
|
||||
<span v-html="parseKeys(shortcut.keys)" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -52,12 +24,22 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed } from 'vue';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { useSettingsStore } from '@/stores/settings';
|
||||
import { shortcutEvents } from 'common/shortcuts';
|
||||
import { useFilters } from '@/composables/useFilters';
|
||||
|
||||
const { parseKeys } = useFilters();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
defineProps({
|
||||
customizations: Object
|
||||
const settingsStore = useSettingsStore();
|
||||
const { shortcuts } = storeToRefs(settingsStore);
|
||||
|
||||
const tabShortcuts = computed(() => {
|
||||
return shortcuts.value.filter(s => shortcutEvents[s.event].context === 'tab');
|
||||
});
|
||||
</script>
|
||||
|
||||
|
@@ -18,6 +18,7 @@
|
||||
@show-delete-modal="showDeleteConfirmModal"
|
||||
@set-null="setNull"
|
||||
@copy-cell="copyCell"
|
||||
@fill-cell="fillCell"
|
||||
@copy-row="copyRow"
|
||||
@duplicate-row="duplicateRow"
|
||||
@close-context="closeContext"
|
||||
@@ -122,7 +123,7 @@ import { useSettingsStore } from '@/stores/settings';
|
||||
import { useWorkspacesStore } from '@/stores/workspaces';
|
||||
import { useConsoleStore } from '@/stores/console';
|
||||
import { exportRows } from '../libs/exportRows';
|
||||
import { TEXT, LONG_TEXT, BLOB } from 'common/fieldTypes';
|
||||
import { TEXT, LONG_TEXT, BLOB, DATE, DATETIME, TIME } from 'common/fieldTypes';
|
||||
import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
|
||||
import WorkspaceTabQueryTableRow from '@/components/WorkspaceTabQueryTableRow.vue';
|
||||
import TableContext from '@/components/WorkspaceTabQueryTableContext.vue';
|
||||
@@ -133,6 +134,7 @@ import { TableField, QueryResult } from 'common/interfaces/antares';
|
||||
import { TableUpdateParams } from 'common/interfaces/tableApis';
|
||||
import { jsonToSqlInsert } from 'common/libs/sqlUtils';
|
||||
import { unproxify } from '@/libs/unproxify';
|
||||
import faker from '@faker-js/faker';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
@@ -140,7 +142,7 @@ const settingsStore = useSettingsStore();
|
||||
const consoleStore = useConsoleStore();
|
||||
const { getWorkspace } = useWorkspacesStore();
|
||||
|
||||
const { dataTabLimit: pageSize } = storeToRefs(settingsStore);
|
||||
const { dataTabLimit: pageSize, defaultCopyType } = storeToRefs(settingsStore);
|
||||
|
||||
const { consoleHeight } = storeToRefs(consoleStore);
|
||||
|
||||
@@ -268,6 +270,8 @@ const keyName = (key: string) => {
|
||||
return 'UNIQUE';
|
||||
case 'mul':
|
||||
return 'INDEX';
|
||||
case 'fk':
|
||||
return 'REFERENCES';
|
||||
default:
|
||||
return 'UNKNOWN ' + key;
|
||||
}
|
||||
@@ -377,7 +381,7 @@ const deleteSelected = () => {
|
||||
});
|
||||
|
||||
const params = {
|
||||
primary: primaryField.value.name,
|
||||
primary: primaryField.value?.name,
|
||||
schema: getSchema(resultsetIndex.value),
|
||||
table: getTable(resultsetIndex.value),
|
||||
rows
|
||||
@@ -389,7 +393,7 @@ const setNull = () => {
|
||||
const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
|
||||
|
||||
const params = {
|
||||
primary: primaryField.value.name,
|
||||
primary: primaryField.value?.name,
|
||||
schema: getSchema(resultsetIndex.value),
|
||||
table: getTable(resultsetIndex.value),
|
||||
id: getPrimaryValue(row),
|
||||
@@ -461,6 +465,89 @@ const copyRow = (format: string) => {
|
||||
|
||||
navigator.clipboard.writeText(csv.join('\n'));
|
||||
}
|
||||
else if (format === 'html') {
|
||||
const arrayContent = new Array<string[]>();
|
||||
if (!Array.isArray(contentToCopy)) contentToCopy = [contentToCopy];
|
||||
|
||||
for (const row of contentToCopy)
|
||||
arrayContent.push(Object.values(row));
|
||||
|
||||
const htmlContent = createHtmlTable(arrayContent);
|
||||
const htmlBlob = new Blob([htmlContent.outerHTML], { type: 'text/html' });
|
||||
const textBlob = new Blob([arrayContent.map(row => row.join('\t')).join('\n')], { type: 'text/plain' });
|
||||
const data = [new ClipboardItem({
|
||||
'text/plain': textBlob,
|
||||
'text/html': htmlBlob
|
||||
})];
|
||||
|
||||
navigator.clipboard.write(data);
|
||||
}
|
||||
};
|
||||
|
||||
const createHtmlTable = (tableData: Array<string[]>) => {
|
||||
const table = document.createElement('table');
|
||||
const tableBody = document.createElement('tbody');
|
||||
tableData.forEach(function (rowData: Array<string>) {
|
||||
const row = document.createElement('tr');
|
||||
|
||||
rowData.forEach(function (cellData: string) {
|
||||
const cell = document.createElement('td');
|
||||
cell.appendChild(document.createTextNode(cellData));
|
||||
row.appendChild(cell);
|
||||
});
|
||||
|
||||
tableBody.appendChild(row);
|
||||
});
|
||||
|
||||
table.appendChild(tableBody);
|
||||
return table;
|
||||
};
|
||||
|
||||
const fillCell = (event: { name: string; group: string; type: string }) => {
|
||||
const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
|
||||
let fakeValue;
|
||||
let datePrecision = '';
|
||||
|
||||
if (['datetime', 'time'].includes(event.group)) {
|
||||
for (let i = 0; i < selectedCell.value.length; i++)
|
||||
datePrecision += i === 0 ? '.S' : 'S';
|
||||
}
|
||||
|
||||
if (event.group === 'custom') {
|
||||
if (event.type === 'time' && event.name === 'now')
|
||||
fakeValue = moment().format(`HH:mm:ss${datePrecision}`);
|
||||
else if (event.type === 'time' && event.name === 'random')
|
||||
fakeValue = moment(faker.date.recent()).format(`HH:mm:ss${datePrecision}`);
|
||||
else if (event.type === 'datetime' && event.name === 'now')
|
||||
fakeValue = moment().format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
|
||||
}
|
||||
else {
|
||||
fakeValue = (faker as any)[event.group][event.name]();
|
||||
if (['string', 'number'].includes(typeof fakeValue)) {
|
||||
if (typeof fakeValue === 'number')
|
||||
fakeValue = String(fakeValue);
|
||||
|
||||
if (selectedCell.value.length)
|
||||
fakeValue = fakeValue.substring(0, selectedCell.value.length < 1024 ? Number(selectedCell.value.length) : 1024);
|
||||
}
|
||||
else if ([...DATE, ...DATETIME].includes(selectedCell.value.type))
|
||||
fakeValue = moment(fakeValue).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`);
|
||||
else if (TIME.includes(selectedCell.value.type))
|
||||
fakeValue = moment(fakeValue).format(`HH:mm:ss${datePrecision}`);
|
||||
}
|
||||
|
||||
const params = {
|
||||
primary: primaryField.value?.name,
|
||||
schema: getSchema(resultsetIndex.value),
|
||||
table: getTable(resultsetIndex.value),
|
||||
id: getPrimaryValue(row),
|
||||
row,
|
||||
orgRow: row,
|
||||
field: selectedCell.value.field,
|
||||
content: fakeValue
|
||||
};
|
||||
|
||||
emit('update-field', params);
|
||||
};
|
||||
|
||||
const duplicateRow = () => {
|
||||
@@ -529,11 +616,11 @@ const deselectRows = (e: Event) => {
|
||||
if (!isDeleteConfirmModal.value)
|
||||
selectedRows.value = [];
|
||||
|
||||
selectedField.value = null;
|
||||
|
||||
if (e.type === 'blur')
|
||||
hasFocus.value = false;
|
||||
}
|
||||
|
||||
selectedField.value = null;
|
||||
};
|
||||
|
||||
const contextMenu = (event: MouseEvent, cell: any) => {
|
||||
@@ -610,8 +697,20 @@ const onKey = async (e: KeyboardEvent) => {
|
||||
if ((e.ctrlKey || e.metaKey) && e.code === 'KeyA' && !e.altKey)
|
||||
selectAllRows(e);
|
||||
|
||||
if ((e.ctrlKey || e.metaKey) && e.code === 'KeyC' && !e.altKey) {
|
||||
const copyType = defaultCopyType.value;
|
||||
if (selectedRows.value.length >= 1) {
|
||||
if (selectedRows.value.length === 1 && copyType === 'cell')
|
||||
await navigator.clipboard.writeText(scrollElement.value.querySelector('.td.selected').innerText);
|
||||
else if (selectedRows.value.length > 1 && copyType === 'cell')
|
||||
copyRow('html');
|
||||
else
|
||||
copyRow(copyType);
|
||||
}
|
||||
}
|
||||
|
||||
// row navigation stuff
|
||||
if ((e.code.includes('Arrow') || e.code === 'Tab') && sortedResults.value.length > 0 && !e.altKey) {
|
||||
if (!(e.ctrlKey || e.metaKey) && (e.code.includes('Arrow') || e.code === 'Tab') && sortedResults.value.length > 0 && !e.altKey) {
|
||||
e.preventDefault();
|
||||
|
||||
const aviableFields= Object.keys(sortedResults.value[0]).slice(0, -1); // removes _antares_id
|
||||
|
@@ -16,6 +16,11 @@
|
||||
<i class="mdi mdi-18px mdi-numeric-0 mdi-rotate-90 text-light pr-1" /> {{ t('word.cell', 1) }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="context-element" @click="copyRow('html')">
|
||||
<span class="d-flex">
|
||||
<i class="mdi mdi-18px mdi-table-row text-light pr-1" /> {{ t('word.row', selectedRows.length) }} ({{ t('word.table') }})
|
||||
</span>
|
||||
</div>
|
||||
<div class="context-element" @click="copyRow('json')">
|
||||
<span class="d-flex">
|
||||
<i class="mdi mdi-18px mdi-table-row text-light pr-1" /> {{ t('word.row', selectedRows.length) }} (JSON)
|
||||
@@ -42,6 +47,27 @@
|
||||
<i class="mdi mdi-18px mdi-content-duplicate text-light pr-1" /> {{ t('word.duplicate') }}
|
||||
</span>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedRows.length === 1 && selectedCell.isEditable && mode === 'table' && fakerGroup"
|
||||
class="context-element"
|
||||
>
|
||||
<span class="d-flex">
|
||||
<i class="mdi mdi-18px mdi-auto-fix text-light pr-1" /> {{ t('message.fillCell') }}
|
||||
</span>
|
||||
<i class="mdi mdi-18px mdi-chevron-right text-light pl-1" />
|
||||
<div class="context-submenu">
|
||||
<div
|
||||
v-for="method in fakerMethods[fakerGroup]"
|
||||
:key="method.name"
|
||||
class="context-element"
|
||||
@click="fillCell(method)"
|
||||
>
|
||||
<span class="d-flex">
|
||||
{{ t(`faker.${method.name}`) }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
v-if="selectedRows.length === 1 && selectedCell.isEditable"
|
||||
class="context-element"
|
||||
@@ -64,13 +90,14 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Prop } from 'vue';
|
||||
import { computed, Prop } from 'vue';
|
||||
import BaseContextMenu from '@/components/BaseContextMenu.vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, UUID } from 'common/fieldTypes';
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
defineProps({
|
||||
const props = defineProps({
|
||||
contextEvent: MouseEvent,
|
||||
selectedRows: Array,
|
||||
selectedCell: Object,
|
||||
@@ -83,9 +110,62 @@ const emit = defineEmits([
|
||||
'set-null',
|
||||
'copy-cell',
|
||||
'copy-row',
|
||||
'duplicate-row'
|
||||
'duplicate-row',
|
||||
'fill-cell'
|
||||
]);
|
||||
|
||||
const fakerMethods = {
|
||||
string: [
|
||||
{ name: 'word', group: 'lorem' },
|
||||
{ name: 'text', group: 'lorem' },
|
||||
{ name: 'firstName', group: 'name' },
|
||||
{ name: 'lastName', group: 'name' },
|
||||
{ name: 'jobTitle', group: 'name' },
|
||||
{ name: 'phoneNumber', group: 'phone' },
|
||||
{ name: 'exampleEmail', group: 'internet' },
|
||||
{ name: 'ip', group: 'internet' },
|
||||
{ name: 'domainName', group: 'internet' },
|
||||
{ name: 'color', group: 'internet' },
|
||||
{ name: 'uuid', group: 'random' }
|
||||
],
|
||||
number: [
|
||||
{ name: 'number', group: 'random' }
|
||||
],
|
||||
float: [
|
||||
{ name: 'float', group: 'random' },
|
||||
{ name: 'amount', group: 'finance' }
|
||||
],
|
||||
datetime: [
|
||||
{ name: 'now', group: 'custom' },
|
||||
{ name: 'past', group: 'date' },
|
||||
{ name: 'future', group: 'date' }
|
||||
],
|
||||
time: [
|
||||
{ name: 'now', group: 'custom' },
|
||||
{ name: 'random', group: 'custom' }
|
||||
],
|
||||
uuid: [
|
||||
{ name: 'uuid', group: 'random' }
|
||||
]
|
||||
};
|
||||
|
||||
const fakerGroup = computed(() => {
|
||||
if ([...TEXT, ...LONG_TEXT].includes(props.selectedCell.type))
|
||||
return 'string';
|
||||
else if (NUMBER.includes(props.selectedCell.type))
|
||||
return 'number';
|
||||
else if (FLOAT.includes(props.selectedCell.type))
|
||||
return 'float';
|
||||
else if ([...DATE, ...DATETIME].includes(props.selectedCell.type))
|
||||
return 'datetime';
|
||||
else if (TIME.includes(props.selectedCell.type))
|
||||
return 'time';
|
||||
else if (UUID.includes(props.selectedCell.type))
|
||||
return 'uuid';
|
||||
else
|
||||
return false;
|
||||
});
|
||||
|
||||
const showConfirmModal = () => {
|
||||
emit('show-delete-modal');
|
||||
};
|
||||
@@ -113,4 +193,9 @@ const duplicateRow = () => {
|
||||
emit('duplicate-row');
|
||||
closeContext();
|
||||
};
|
||||
|
||||
const fillCell = (method: {name: string; group: string}) => {
|
||||
emit('fill-cell', { ...method, type: fakerGroup.value });
|
||||
closeContext();
|
||||
};
|
||||
</script>
|
||||
|
@@ -11,7 +11,12 @@
|
||||
:class="{selected: selectedCell === cKey}"
|
||||
@click="selectRow($event, cKey)"
|
||||
|
||||
@contextmenu.prevent="openContext($event, { id: row._antares_id, orgField: cKey })"
|
||||
@contextmenu.prevent="openContext($event, {
|
||||
id: row._antares_id,
|
||||
orgField: cKey,
|
||||
type: fields[cKey].type,
|
||||
length: fields[cKey].charLength || fields[cKey].length
|
||||
})"
|
||||
>
|
||||
<template v-if="cKey !== '_antares_id'">
|
||||
<span
|
||||
@@ -212,9 +217,11 @@ import {
|
||||
DATETIME,
|
||||
BLOB,
|
||||
BIT,
|
||||
BINARY,
|
||||
HAS_TIMEZONE,
|
||||
SPATIAL,
|
||||
IS_MULTI_SPATIAL
|
||||
IS_MULTI_SPATIAL,
|
||||
IS_BIGINT
|
||||
} from 'common/fieldTypes';
|
||||
import ConfirmModal from '@/components/BaseConfirmModal.vue';
|
||||
import TextEditor from '@/components/BaseTextEditor.vue';
|
||||
@@ -275,8 +282,12 @@ const inputProps = computed(() => {
|
||||
if ([...TEXT, ...LONG_TEXT].includes(editingType.value))
|
||||
return { type: 'text', mask: false };
|
||||
|
||||
if ([...NUMBER, ...FLOAT].includes(editingType.value))
|
||||
return { type: 'number', mask: false };
|
||||
if ([...NUMBER, ...FLOAT].includes(editingType.value)) {
|
||||
if (IS_BIGINT.includes(editingType.value))
|
||||
return { type: 'text', mask: false };
|
||||
else
|
||||
return { type: 'number', mask: false };
|
||||
}
|
||||
|
||||
if (TIME.includes(editingType.value)) {
|
||||
let timeMask = '##:##:##';
|
||||
@@ -379,6 +390,9 @@ const editON = async (field: string) => {
|
||||
|
||||
const content = props.row[field];
|
||||
const type = props.fields[field].type.toUpperCase();
|
||||
|
||||
if (BINARY.includes(type)) return;
|
||||
|
||||
originalContent.value = typeFormat(content, type, props.fields[field].length);
|
||||
editingType.value = type;
|
||||
editingField.value = field;
|
||||
@@ -442,7 +456,7 @@ const editOFF = () => {
|
||||
let content;
|
||||
if (!BLOB.includes(editingType.value)) {
|
||||
if ([...DATETIME, ...TIME].includes(editingType.value)) {
|
||||
if (editingContent.value.substring(editingContent.value.length - 1) === '.')
|
||||
if (editingContent.value !== null && editingContent.value.substring(editingContent.value.length - 1) === '.')
|
||||
editingContent.value = editingContent.value.slice(0, -1);
|
||||
}
|
||||
|
||||
@@ -526,7 +540,14 @@ const getKeyUsage = (keyName: string) => {
|
||||
return props.keyUsage.find(key => key.field === keyName);
|
||||
};
|
||||
|
||||
const openContext = (event: MouseEvent, payload: { id: string; field?: string; orgField: string; isEditable?: boolean }) => {
|
||||
const openContext = (event: MouseEvent, payload: {
|
||||
id: string;
|
||||
field?: string;
|
||||
orgField: string;
|
||||
isEditable?: boolean;
|
||||
type: string;
|
||||
length: number | false;
|
||||
}) => {
|
||||
payload.field = props.fields[payload.orgField].name;// Ensures field name only
|
||||
payload.isEditable = isEditable.value;
|
||||
emit('contextmenu', event, payload);
|
||||
@@ -582,6 +603,9 @@ const typeFormat = (val: string | number | Date | number[], type: string, precis
|
||||
return parseInt(bitString).toString().padStart(Number(precision), '0');
|
||||
}
|
||||
|
||||
if (BINARY.includes(type))
|
||||
return Buffer.from(val as number[]).toString('hex');
|
||||
|
||||
if (ARRAY.includes(type)) {
|
||||
if (Array.isArray(val))
|
||||
return JSON.stringify(val).replaceAll('[', '{').replaceAll(']', '}');
|
||||
|
@@ -8,7 +8,7 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm mr-0 pr-1"
|
||||
:class="{'loading':isQuering}"
|
||||
:title="`${t('word.refresh')} (F5)`"
|
||||
:title="`${t('word.refresh')}`"
|
||||
@click="reloadTable"
|
||||
>
|
||||
<i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh mr-1" />
|
||||
@@ -35,7 +35,7 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm mr-0"
|
||||
:disabled="isQuering || page === 1"
|
||||
title="CTRL+ᐊ"
|
||||
:title="t('message.previousResultsPage')"
|
||||
@click="pageChange('prev')"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-skip-previous" />
|
||||
@@ -61,7 +61,7 @@
|
||||
<button
|
||||
class="btn btn-dark btn-sm mr-0"
|
||||
:disabled="isQuering || (results.length && results[0].rows.length < limit)"
|
||||
title="CTRL+ᐅ"
|
||||
:title="t('message.nextResultsPage')"
|
||||
@click="pageChange('next')"
|
||||
>
|
||||
<i class="mdi mdi-24px mdi-skip-next" />
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
<button
|
||||
class="btn btn-sm"
|
||||
:title="`${t('word.filter')} (CTRL+F)`"
|
||||
:title="t('word.filter')"
|
||||
:class="{'btn-primary': isSearch, 'btn-dark': !isSearch}"
|
||||
@click="isSearch = !isSearch"
|
||||
>
|
||||
@@ -190,6 +190,7 @@ import ModalFakerRows from '@/components/ModalFakerRows.vue';
|
||||
import { ConnectionParams } from 'common/interfaces/antares';
|
||||
import { TableFilterClausole } from 'common/interfaces/tableApis';
|
||||
import { useFilters } from '@/composables/useFilters';
|
||||
import { ipcRenderer } from 'electron';
|
||||
|
||||
const { localeString } = useFilters();
|
||||
|
||||
@@ -342,7 +343,6 @@ const pageChange = (direction: 'prev' | 'next') => {
|
||||
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
const showFakerModal = (row?: any) => {
|
||||
console.log(row);
|
||||
if (isQuering.value) return;
|
||||
isFakerModal.value = true;
|
||||
rowToDuplicate.value = row;
|
||||
@@ -353,23 +353,6 @@ const hideFakerModal = () => {
|
||||
rowToDuplicate.value = null;
|
||||
};
|
||||
|
||||
const onKey = (e: KeyboardEvent) => {
|
||||
if (props.isSelected) {
|
||||
e.stopPropagation();
|
||||
if (e.key === 'F5')
|
||||
reloadTable();
|
||||
|
||||
if (e.ctrlKey || e.metaKey) {
|
||||
if (e.key === 'ArrowRight')
|
||||
pageChange('next');
|
||||
if (e.key === 'ArrowLeft')
|
||||
pageChange('prev');
|
||||
if (e.key === 'f')
|
||||
isSearch.value = !isSearch.value;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const setRefreshInterval = () => {
|
||||
if (refreshInterval.value)
|
||||
clearInterval(refreshInterval.value);
|
||||
@@ -401,6 +384,30 @@ const updateFilters = (clausoles: TableFilterClausole[]) => {
|
||||
getTableData();
|
||||
};
|
||||
|
||||
const reloadListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
reloadTable();
|
||||
};
|
||||
|
||||
const openFilterListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
isSearch.value = !isSearch.value;
|
||||
};
|
||||
|
||||
const nextPageListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
pageChange('next');
|
||||
};
|
||||
|
||||
const prevPageListener = () => {
|
||||
const hasModalOpen = !!document.querySelectorAll('.modal.active').length;
|
||||
if (props.isSelected && !hasModalOpen)
|
||||
pageChange('prev');
|
||||
};
|
||||
|
||||
const hasApproximately = computed(() => {
|
||||
return results.value.length &&
|
||||
results.value[0].rows &&
|
||||
@@ -457,10 +464,17 @@ watch(isSearch, (val) => {
|
||||
});
|
||||
|
||||
getTableData();
|
||||
window.addEventListener('keydown', onKey);
|
||||
|
||||
ipcRenderer.on('run-or-reload', reloadListener);
|
||||
ipcRenderer.on('open-filter', openFilterListener);
|
||||
ipcRenderer.on('next-page', nextPageListener);
|
||||
ipcRenderer.on('prev-page', prevPageListener);
|
||||
|
||||
onBeforeUnmount(() => {
|
||||
window.removeEventListener('keydown', onKey);
|
||||
clearInterval(refreshInterval.value);
|
||||
ipcRenderer.removeListener('run-or-reload', reloadListener);
|
||||
ipcRenderer.removeListener('open-filter', openFilterListener);
|
||||
ipcRenderer.removeListener('next-page', nextPageListener);
|
||||
ipcRenderer.removeListener('prev-page', prevPageListener);
|
||||
});
|
||||
</script>
|
||||
|
@@ -28,11 +28,24 @@ export function useFilters () {
|
||||
return `(${num})`;
|
||||
};
|
||||
|
||||
const parseKeys = (keys: {[key: number]: string}[]) => {
|
||||
const isMacOS = process.platform === 'darwin';
|
||||
return (keys as string[]).map(k => (
|
||||
k.split('+')
|
||||
.map(sk => (
|
||||
`<code class="text-bold">${sk}</code>`
|
||||
)))
|
||||
.join('+')
|
||||
.replaceAll('CommandOrControl', isMacOS ? 'Command' : 'Control')
|
||||
).join(', ');
|
||||
};
|
||||
|
||||
return {
|
||||
cutText,
|
||||
formatDate,
|
||||
wrapNumber,
|
||||
lastPart,
|
||||
localeString
|
||||
localeString,
|
||||
parseKeys
|
||||
};
|
||||
}
|
||||
|
@@ -142,7 +142,14 @@ export const enUS = {
|
||||
contributors: 'Contributors',
|
||||
pin: 'Pin',
|
||||
unpin: 'Unpin',
|
||||
console: 'Console'
|
||||
console: 'Console',
|
||||
shortcuts: 'Shortcuts',
|
||||
folder: 'Folder | Folders',
|
||||
appearence: 'Appearence',
|
||||
color: 'Color',
|
||||
label: 'Label',
|
||||
icon: 'Icon',
|
||||
resultsTable: 'Results table'
|
||||
},
|
||||
message: {
|
||||
appWelcome: 'Welcome to Antares SQL Client!',
|
||||
@@ -298,7 +305,37 @@ export const enUS = {
|
||||
allConnections: 'All connections',
|
||||
searchForConnections: 'Search for connections',
|
||||
disableScratchpad: 'Disable scratchpad',
|
||||
reportABug: 'Report a bug'
|
||||
reportABug: 'Report a bug',
|
||||
nextTab: 'Next tab',
|
||||
previousTab: 'Previous tab',
|
||||
selectTabNumber: 'Select tab number {param}',
|
||||
toggleConsole: 'Toggle console',
|
||||
addShortcut: 'Add shortcut',
|
||||
editShortcut: 'Edit shortcut',
|
||||
deleteShortcut: 'Delete shortcut',
|
||||
restoreDefaults: 'Restore defaults',
|
||||
restoreDefaultsQuestion: 'Do you confirm to restore default values?',
|
||||
registerAShortcut: 'Register a shortcut',
|
||||
invalidShortcutMessage: 'Invalid combination, continue to type',
|
||||
shortcutAlreadyExists: 'Shortcut already exists',
|
||||
saveContent: 'Save content',
|
||||
openAllConnections: 'Open all connections',
|
||||
openSettings: 'Open settings',
|
||||
openScratchpad: 'Open scratchpad',
|
||||
runOrReload: 'Run or reload',
|
||||
formatQuery: 'Format query',
|
||||
queryHistory: 'Query history',
|
||||
clearQuery: 'Clear query',
|
||||
openFilter: 'Open filter',
|
||||
nextResultsPage: 'Next results page',
|
||||
previousResultsPage: 'Previous results page',
|
||||
fillCell: 'Fill cell',
|
||||
editFolder: 'Edit folder',
|
||||
folderName: 'Folder name',
|
||||
deleteFolder: 'Delete folder',
|
||||
editConnectionAppearence: 'Edit connection appearence',
|
||||
executeSelectedQuery: 'Execute selected query',
|
||||
defaultCopyType: 'Default copy type'
|
||||
},
|
||||
faker: {
|
||||
address: 'Address',
|
||||
@@ -364,6 +401,7 @@ export const enUS = {
|
||||
collation: 'Collation',
|
||||
engine: 'Engine',
|
||||
past: 'Past',
|
||||
now: 'Now',
|
||||
future: 'Future',
|
||||
between: 'Between',
|
||||
recent: 'Recent',
|
||||
|
@@ -13,23 +13,23 @@ export const frFR = {
|
||||
port: 'Port',
|
||||
user: 'Utilisateur',
|
||||
password: 'Mot de passe',
|
||||
credentials: 'Credentials',
|
||||
credentials: 'Identifiants',
|
||||
connect: 'Connexion',
|
||||
connected: 'Connecté',
|
||||
disconnect: 'Déconnection',
|
||||
disconnected: 'Déconnecté',
|
||||
refresh: 'Rafrechir',
|
||||
refresh: 'Rafraîchir',
|
||||
settings: 'Paramètres',
|
||||
general: 'Général',
|
||||
themes: 'Thèmes',
|
||||
update: 'Mise à jour',
|
||||
about: 'A propos de',
|
||||
about: 'À propos de',
|
||||
language: 'Langage',
|
||||
version: 'Version',
|
||||
donate: 'Faire une donation',
|
||||
run: 'Lancer',
|
||||
run: 'Éxécuter',
|
||||
schema: 'Schéma',
|
||||
results: 'Resultats',
|
||||
results: 'Résultats',
|
||||
size: 'Taille',
|
||||
seconds: 'Secondes',
|
||||
type: 'Type',
|
||||
@@ -44,14 +44,14 @@ export const frFR = {
|
||||
collation: 'Langage',
|
||||
clear: 'Effacer',
|
||||
options: 'Options',
|
||||
autoRefresh: 'Auto-rafraichissemnt',
|
||||
autoRefresh: 'Auto-rafraîchissemnt',
|
||||
indexes: 'Indexs',
|
||||
foreignKeys: 'Clefs étrangères',
|
||||
foreignKeys: 'Clés étrangères',
|
||||
length: 'Longueur',
|
||||
unsigned: 'non signé',
|
||||
default: 'Par défault',
|
||||
default: 'Par défaut',
|
||||
comment: 'Commentaire',
|
||||
key: 'Clef | Clefs',
|
||||
key: 'Clé | Clés',
|
||||
order: 'Ordre',
|
||||
expression: 'Expression',
|
||||
autoIncrement: 'Auto Incrémentation',
|
||||
@@ -63,11 +63,11 @@ export const frFR = {
|
||||
discard: 'Jeter',
|
||||
stay: 'Rester',
|
||||
author: 'Auteur',
|
||||
light: 'Léger',
|
||||
light: 'Clair',
|
||||
dark: 'Sombre',
|
||||
autoCompletion: 'Auto Completion',
|
||||
autoCompletion: 'Prédiction Automatique',
|
||||
application: 'Application',
|
||||
editor: 'Editor',
|
||||
editor: 'Éditeur',
|
||||
view: 'Vue',
|
||||
definer: 'Définisseur',
|
||||
algorithme: 'Algorithme',
|
||||
@@ -83,10 +83,10 @@ export const frFR = {
|
||||
import: 'Import',
|
||||
returns: 'Retourne',
|
||||
timing: 'Temps',
|
||||
state: 'Etat',
|
||||
execution: 'Exécution',
|
||||
state: 'État',
|
||||
execution: 'Éxécution',
|
||||
starts: 'Commence',
|
||||
ends: 'Fini',
|
||||
ends: 'Termine',
|
||||
ssl: 'SSL',
|
||||
privateKey: 'Clé privée',
|
||||
certificate: 'Certificat',
|
||||
@@ -95,7 +95,7 @@ export const frFR = {
|
||||
upload: 'Téléverser',
|
||||
browse: 'Naviguer',
|
||||
faker: 'Imposteur',
|
||||
sshTunnel: 'SSH tunnel',
|
||||
sshTunnel: 'Tunnel SSH',
|
||||
content: 'Contenu',
|
||||
cut: 'Couper',
|
||||
copy: 'Copier',
|
||||
@@ -116,7 +116,7 @@ export const frFR = {
|
||||
cell: 'Cellule | Cellules',
|
||||
triggerFunction: 'Fonction de déclenchement | Fonctions de déclenchement',
|
||||
all: 'Tout',
|
||||
duplicate: 'Double',
|
||||
duplicate: 'Dupliquer',
|
||||
routine: 'Routine',
|
||||
new: 'Nouveau',
|
||||
history: 'Passé',
|
||||
@@ -139,7 +139,8 @@ export const frFR = {
|
||||
commit: 'Appliquer',
|
||||
rollback: 'Retour arrière',
|
||||
connectionString: 'Chaîne de connexion',
|
||||
contributors: 'Contributeurs'
|
||||
contributors: 'Contributeurs',
|
||||
shortcuts: 'Raccourcis'
|
||||
},
|
||||
message: {
|
||||
appWelcome: 'Bienvenue dans le client SQL Antares!',
|
||||
@@ -179,8 +180,8 @@ export const frFR = {
|
||||
editDatabase: 'Editer la base de données',
|
||||
clearChanges: 'Effacer les modifications',
|
||||
addNewField: 'Ajouter un nouveau champ',
|
||||
manageIndexes: 'Gère les index',
|
||||
manageForeignKeys: 'Gère les clés étrangères',
|
||||
manageIndexes: 'Gérer les index',
|
||||
manageForeignKeys: 'Gérer les clés étrangères',
|
||||
allowNull: 'Autoriser NULL',
|
||||
zeroFill: 'Remplissage avec zéro',
|
||||
customValue: 'Valeur personnalisée',
|
||||
@@ -208,11 +209,11 @@ export const frFR = {
|
||||
selectStatement: 'Sélectionner un état',
|
||||
triggerStatement: 'Déclencher un état',
|
||||
sqlSecurity: 'Sécurité SQL',
|
||||
updateOption: 'Mide à jour d\'une option',
|
||||
updateOption: 'Mise à jour d\'une option',
|
||||
deleteView: 'Effacer une vue',
|
||||
createNewView: 'Créer une nouvelle vue',
|
||||
deleteTrigger: 'Effacer un déclencheur',
|
||||
createNewTrigger: 'Cr"er un nouveau déclencheur',
|
||||
createNewTrigger: 'Créer un nouveau déclencheur',
|
||||
currentUser: 'utilisateur courant',
|
||||
routineBody: 'Corps de la routine',
|
||||
dataAccess: 'Accès aux données',
|
||||
@@ -232,7 +233,7 @@ export const frFR = {
|
||||
tableFiller: 'Remplisseur de table',
|
||||
fakeDataLanguage: 'Language de données fausses',
|
||||
searchForElements: 'Rechercher des éléments',
|
||||
selectAll: 'Tout séélectionner',
|
||||
selectAll: 'Tout sélectionner',
|
||||
queryDuration: 'Temps de requêtage',
|
||||
includeBetaUpdates: 'Inclure les mises à jour beta',
|
||||
setNull: 'Définir comme NULL',
|
||||
@@ -287,7 +288,10 @@ export const frFR = {
|
||||
ourputFormat: 'Format de sortie',
|
||||
singleFile: 'Seul fichier avec l\'extension {ext}',
|
||||
zipCompressedFile: 'Fichier compréssé avec l\'extension {ext}',
|
||||
disableBlur: 'Désactiver le floue'
|
||||
disableBlur: 'Désactiver le floue',
|
||||
missingOrIncompleteTranslation: 'Traduction manquante ou incomplète?',
|
||||
findOutHowToContribute: 'Trouver comment contribuer',
|
||||
disableScratchpad: 'Désactiver le bloc-notes'
|
||||
},
|
||||
faker: {
|
||||
address: 'Adresse',
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user