From 5806b19fb1cd5209f0445f83b8cf31ac3a1a27d8 Mon Sep 17 00:00:00 2001 From: tiny-craft <137850705+tiny-craft@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:49:53 +0800 Subject: [PATCH] perf: ask for close relevant connections before edit --- .../src/components/content/ContentPane.vue | 4 +- .../components/content/ContentValueTab.vue | 29 ++-- .../src/components/dialogs/NewKeyDialog.vue | 1 - frontend/src/components/icons/Filter.vue | 11 +- .../src/components/sidebar/BrowserPane.vue | 53 +++++- .../src/components/sidebar/ConnectionPane.vue | 2 +- .../src/components/sidebar/ConnectionTree.vue | 13 +- frontend/src/langs/en.json | 1 + frontend/src/langs/zh-cn.json | 1 + frontend/src/stores/dialog.js | 5 +- frontend/wailsjs/go/main/App.d.ts | 2 +- frontend/wailsjs/go/main/App.js | 2 +- frontend/wailsjs/go/models.ts | 152 ++++++++++++------ .../go/services/connectionService.d.ts | 116 +++++-------- .../wailsjs/go/services/connectionService.js | 80 ++++++--- .../go/storage/PreferencesStorage.d.ts | 12 -- .../wailsjs/go/storage/PreferencesStorage.js | 23 --- frontend/wailsjs/runtime/runtime.d.ts | 120 +++++++------- frontend/wailsjs/runtime/runtime.js | 100 ++++++------ 19 files changed, 403 insertions(+), 324 deletions(-) delete mode 100755 frontend/wailsjs/go/storage/PreferencesStorage.d.ts delete mode 100755 frontend/wailsjs/go/storage/PreferencesStorage.js diff --git a/frontend/src/components/content/ContentPane.vue b/frontend/src/components/content/ContentPane.vue index 7ee19a7..4ab25d0 100644 --- a/frontend/src/components/content/ContentPane.vue +++ b/frontend/src/components/content/ContentPane.vue @@ -1,5 +1,5 @@ @@ -64,7 +63,7 @@ const onCloseTab = (idx, key) => {
{ } &_selected { - border-top: #409eff 4px solid !important; + border-top: v-bind('themeVars.primaryColor') 4px solid !important; background-color: #ffffff; color: #303133; } diff --git a/frontend/src/components/dialogs/NewKeyDialog.vue b/frontend/src/components/dialogs/NewKeyDialog.vue index 365341e..b5f53b5 100644 --- a/frontend/src/components/dialogs/NewKeyDialog.vue +++ b/frontend/src/components/dialogs/NewKeyDialog.vue @@ -65,7 +65,6 @@ watch( if (visible) { const { prefix, server, db } = dialogStore.newKeyParam newForm.server = server - newForm.db = db newForm.key = isEmpty(prefix) ? '' : prefix newForm.type = options.value[0].value newForm.ttl = -1 diff --git a/frontend/src/components/icons/Filter.vue b/frontend/src/components/icons/Filter.vue index b7e4997..5e786e8 100644 --- a/frontend/src/components/icons/Filter.vue +++ b/frontend/src/components/icons/Filter.vue @@ -1,4 +1,11 @@ - + diff --git a/frontend/src/components/sidebar/BrowserPane.vue b/frontend/src/components/sidebar/BrowserPane.vue index bdd1cee..18f454a 100644 --- a/frontend/src/components/sidebar/BrowserPane.vue +++ b/frontend/src/components/sidebar/BrowserPane.vue @@ -4,7 +4,7 @@ import AddLink from '../icons/AddLink.vue' import BrowserTree from './BrowserTree.vue' import IconButton from '../common/IconButton.vue' import useTabStore from '../../stores/tab.js' -import { computed } from 'vue' +import { computed, reactive } from 'vue' import { get } from 'lodash' import Delete from '../icons/Delete.vue' import Refresh from '../icons/Refresh.vue' @@ -12,6 +12,9 @@ import useDialogStore from '../../stores/dialog.js' import { useConfirmDialog } from '../../utils/confirm_dialog.js' import { useI18n } from 'vue-i18n' import useConnectionStore from '../../stores/connections.js' +import Filter from '../icons/Filter.vue' +import { types } from '../../consts/support_redis_type.js' +import Search from '../icons/Search.vue' const themeVars = useThemeVars() const dialogStore = useDialogStore() @@ -27,7 +30,7 @@ const currentSelect = computed(() => { }) const onNewKey = () => { - const { server, db, key } = currentSelect.value + const { server, key, db = 0 } = currentSelect.value dialogStore.openNewKeyDialog(key, server, db) } @@ -51,16 +54,57 @@ const onRefresh = () => { message.success(i18n.t('reload_succ')) }) } + +const filterForm = reactive({ + showFilter: false, + type: '', + pattern: '', +}) + +const filterTypeOptions = computed(() => { + const options = Object.keys(types).map((t) => ({ + value: t, + label: t, + })) + options.splice(0, 0, { + value: '', + label: i18n.t('all'), + }) + return options +}) diff --git a/frontend/src/components/sidebar/ConnectionPane.vue b/frontend/src/components/sidebar/ConnectionPane.vue index c4c8e73..b220678 100644 --- a/frontend/src/components/sidebar/ConnectionPane.vue +++ b/frontend/src/components/sidebar/ConnectionPane.vue @@ -50,7 +50,7 @@ const onDisconnectAll = () => { />
diff --git a/frontend/src/components/sidebar/ConnectionTree.vue b/frontend/src/components/sidebar/ConnectionTree.vue index b3700f5..114201d 100644 --- a/frontend/src/components/sidebar/ConnectionTree.vue +++ b/frontend/src/components/sidebar/ConnectionTree.vue @@ -238,7 +238,18 @@ const handleSelectContextMenu = (key) => { openConnection(name).then(() => {}) break case 'server_edit': - dialogStore.openEditDialog(name) + // ask for close relevant connections before edit + if (connectionStore.isConnected(name)) { + confirmDialog.warning(i18n.t('edit_close_confirm'), () => { + connectionStore.closeConnection(name).then((success) => { + if (success) { + dialogStore.openEditDialog(name) + } + }) + }) + } else { + dialogStore.openEditDialog(name) + } break case 'server_remove': removeConnection(name) diff --git a/frontend/src/langs/en.json b/frontend/src/langs/en.json index d8701c1..bf01f8b 100644 --- a/frontend/src/langs/en.json +++ b/frontend/src/langs/en.json @@ -13,6 +13,7 @@ "filter": "Filter", "sort_conn": "Resort Connections", "close_confirm": "Confirm close this tab and connection", + "edit_close_confirm": "Please close the relevant connections before editing. Do you want to continue?", "opening_connection": "Opening Connection...", "remove_tip": "{type} \"{name}\" will be deleted", "ttl": "TTL", diff --git a/frontend/src/langs/zh-cn.json b/frontend/src/langs/zh-cn.json index c83541a..2065f14 100644 --- a/frontend/src/langs/zh-cn.json +++ b/frontend/src/langs/zh-cn.json @@ -13,6 +13,7 @@ "filter": "筛选", "sort_conn": "调整连接顺序", "close_confirm": "是否关闭当前连接", + "edit_close_confirm": "编辑前需要关闭相关连接,是否继续", "opening_connection": "正在打开连接...", "remove_tip": "{type} \"{name}\" 将会被删除", "ttl": "TTL", diff --git a/frontend/src/stores/dialog.js b/frontend/src/stores/dialog.js index 88ace03..f50dc06 100644 --- a/frontend/src/stores/dialog.js +++ b/frontend/src/stores/dialog.js @@ -58,7 +58,6 @@ const useDialogStore = defineStore('dialog', { }, async openEditDialog(name) { - console.log('open edit dialog:' + name) const connStore = useConnectionStore() const profile = await connStore.getConnectionProfile(name) this.connParam = profile || connStore.newDefaultConnection(name) @@ -112,8 +111,8 @@ const useDialogStore = defineStore('dialog', { /** * * @param {string} prefix - * @param {number} server - * @param {string} db + * @param {string} server + * @param {number} db */ openNewKeyDialog(prefix, server, db) { this.newKeyParam.prefix = prefix diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts index 74062c5..02a3bb9 100755 --- a/frontend/wailsjs/go/main/App.d.ts +++ b/frontend/wailsjs/go/main/App.d.ts @@ -1,4 +1,4 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT -export function Greet(arg1: string): Promise +export function Greet(arg1:string):Promise; diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js index 128f6e5..c71ae77 100755 --- a/frontend/wailsjs/go/main/App.js +++ b/frontend/wailsjs/go/main/App.js @@ -3,5 +3,5 @@ // This file is automatically generated. DO NOT EDIT export function Greet(arg1) { - return window['go']['main']['App']['Greet'](arg1) + return window['go']['main']['App']['Greet'](arg1); } diff --git a/frontend/wailsjs/go/models.ts b/frontend/wailsjs/go/models.ts index 9fbb0e9..f8c096c 100755 --- a/frontend/wailsjs/go/models.ts +++ b/frontend/wailsjs/go/models.ts @@ -1,51 +1,107 @@ export namespace types { - export class Connection { - group: string - name: string - addr: string - port: number - username: string - password: string - defaultFilter: string - keySeparator: string - connTimeout: number - execTimeout: number - markColor: string + + export class Connection { + name: string; + group?: string; + addr?: string; + port?: number; + username?: string; + password?: string; + defaultFilter?: string; + keySeparator?: string; + connTimeout?: number; + execTimeout?: number; + markColor?: string; + type?: string; + connections?: Connection[]; + + static createFrom(source: any = {}) { + return new Connection(source); + } + + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.name = source["name"]; + this.group = source["group"]; + this.addr = source["addr"]; + this.port = source["port"]; + this.username = source["username"]; + this.password = source["password"]; + this.defaultFilter = source["defaultFilter"]; + this.keySeparator = source["keySeparator"]; + this.connTimeout = source["connTimeout"]; + this.execTimeout = source["execTimeout"]; + this.markColor = source["markColor"]; + this.type = source["type"]; + this.connections = this.convertValues(source["connections"], Connection); + } + + convertValues(a: any, classs: any, asMap: boolean = false): any { + if (!a) { + return a; + } + if (a.slice) { + return (a as any[]).map(elem => this.convertValues(elem, classs)); + } else if ("object" === typeof a) { + if (asMap) { + for (const key of Object.keys(a)) { + a[key] = new classs(a[key]); + } + return a; + } + return new classs(a); + } + return a; + } + } + export class ConnectionConfig { + name: string; + group?: string; + addr?: string; + port?: number; + username?: string; + password?: string; + defaultFilter?: string; + keySeparator?: string; + connTimeout?: number; + execTimeout?: number; + markColor?: string; + + static createFrom(source: any = {}) { + return new ConnectionConfig(source); + } + + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.name = source["name"]; + this.group = source["group"]; + this.addr = source["addr"]; + this.port = source["port"]; + this.username = source["username"]; + this.password = source["password"]; + this.defaultFilter = source["defaultFilter"]; + this.keySeparator = source["keySeparator"]; + this.connTimeout = source["connTimeout"]; + this.execTimeout = source["execTimeout"]; + this.markColor = source["markColor"]; + } + } + export class JSResp { + success: boolean; + msg: string; + data?: any; + + static createFrom(source: any = {}) { + return new JSResp(source); + } + + constructor(source: any = {}) { + if ('string' === typeof source) source = JSON.parse(source); + this.success = source["success"]; + this.msg = source["msg"]; + this.data = source["data"]; + } + } - constructor(source: any = {}) { - if ('string' === typeof source) source = JSON.parse(source) - this.group = source['group'] - this.name = source['name'] - this.addr = source['addr'] - this.port = source['port'] - this.username = source['username'] - this.password = source['password'] - this.defaultFilter = source['defaultFilter'] - this.keySeparator = source['keySeparator'] - this.connTimeout = source['connTimeout'] - this.execTimeout = source['execTimeout'] - this.markColor = source['markColor'] - } - - static createFrom(source: any = {}) { - return new Connection(source) - } - } - - export class JSResp { - success: boolean - msg: string - data?: any - - constructor(source: any = {}) { - if ('string' === typeof source) source = JSON.parse(source) - this.success = source['success'] - this.msg = source['msg'] - this.data = source['data'] - } - - static createFrom(source: any = {}) { - return new JSResp(source) - } - } } + diff --git a/frontend/wailsjs/go/services/connectionService.d.ts b/frontend/wailsjs/go/services/connectionService.d.ts index 10af116..c3561b8 100755 --- a/frontend/wailsjs/go/services/connectionService.d.ts +++ b/frontend/wailsjs/go/services/connectionService.d.ts @@ -1,98 +1,64 @@ // Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL // This file is automatically generated. DO NOT EDIT -import { context, types } from '../models' +import {types} from '../models'; +import {context} from '../models'; -export function AddHashField( - arg1: string, - arg2: number, - arg3: string, - arg4: number, - arg5: Array -): Promise +export function AddHashField(arg1:string,arg2:number,arg3:string,arg4:number,arg5:Array):Promise; -export function AddListItem( - arg1: string, - arg2: number, - arg3: string, - arg4: number, - arg5: Array -): Promise +export function AddListItem(arg1:string,arg2:number,arg3:string,arg4:number,arg5:Array):Promise; -export function AddZSetValue( - arg1: string, - arg2: number, - arg3: string, - arg4: number, - arg5: { - [key: string]: number - } -): Promise +export function AddZSetValue(arg1:string,arg2:number,arg3:string,arg4:number,arg5:{[key: string]: number}):Promise; -export function CloseConnection(arg1: string): Promise +export function CloseConnection(arg1:string):Promise; -export function GetKeyValue(arg1: string, arg2: number, arg3: string): Promise +export function CreateGroup(arg1:string):Promise; -export function ListConnection(): Promise +export function DeleteConnection(arg1:string):Promise; -export function OpenConnection(arg1: string): Promise +export function DeleteGroup(arg1:string,arg2:boolean):Promise; -export function OpenDatabase(arg1: string, arg2: number): Promise +export function DeleteKey(arg1:string,arg2:number,arg3:string):Promise; -export function RemoveKey(arg1: string, arg2: number, arg3: string): Promise +export function GetCmdHistory(arg1:number,arg2:number):Promise; -export function RenameKey(arg1: string, arg2: number, arg3: string, arg4: string): Promise +export function GetConnection(arg1:string):Promise; -export function SaveConnection(arg1: types.Connection, arg2: boolean): Promise +export function GetKeyValue(arg1:string,arg2:number,arg3:string):Promise; -export function SetHashValue( - arg1: string, - arg2: number, - arg3: string, - arg4: string, - arg5: string, - arg6: string -): Promise +export function ListConnection():Promise; -export function SetKeyTTL(arg1: string, arg2: number, arg3: string, arg4: number): Promise +export function OpenConnection(arg1:string):Promise; -export function SetKeyValue( - arg1: string, - arg2: number, - arg3: string, - arg4: string, - arg5: any, - arg6: number -): Promise +export function OpenDatabase(arg1:string,arg2:number):Promise; -export function SetListItem(arg1: string, arg2: number, arg3: string, arg4: number, arg5: string): Promise +export function RenameGroup(arg1:string,arg2:string):Promise; -export function SetSetItem( - arg1: string, - arg2: number, - arg3: string, - arg4: boolean, - arg5: Array -): Promise +export function RenameKey(arg1:string,arg2:number,arg3:string,arg4:string):Promise; -export function Start(arg1: context.Context): Promise +export function SaveConnection(arg1:string,arg2:types.ConnectionConfig):Promise; -export function Stop(arg1: context.Context): Promise +export function SaveSortedConnection(arg1:types.Connections):Promise; -export function TestConnection(arg1: string, arg2: number, arg3: string, arg4: string): Promise +export function ScanKeys(arg1:string,arg2:number,arg3:string):Promise; -export function UpdateSetItem( - arg1: string, - arg2: number, - arg3: string, - arg4: string, - arg5: string -): Promise +export function ServerInfo(arg1:string):Promise; -export function UpdateZSetValue( - arg1: string, - arg2: number, - arg3: string, - arg4: string, - arg5: string, - arg6: number -): Promise +export function SetHashValue(arg1:string,arg2:number,arg3:string,arg4:string,arg5:string,arg6:string):Promise; + +export function SetKeyTTL(arg1:string,arg2:number,arg3:string,arg4:number):Promise; + +export function SetKeyValue(arg1:string,arg2:number,arg3:string,arg4:string,arg5:any,arg6:number):Promise; + +export function SetListItem(arg1:string,arg2:number,arg3:string,arg4:number,arg5:string):Promise; + +export function SetSetItem(arg1:string,arg2:number,arg3:string,arg4:boolean,arg5:Array):Promise; + +export function Start(arg1:context.Context):Promise; + +export function Stop(arg1:context.Context):Promise; + +export function TestConnection(arg1:string,arg2:number,arg3:string,arg4:string):Promise; + +export function UpdateSetItem(arg1:string,arg2:number,arg3:string,arg4:string,arg5:string):Promise; + +export function UpdateZSetValue(arg1:string,arg2:number,arg3:string,arg4:string,arg5:string,arg6:number):Promise; diff --git a/frontend/wailsjs/go/services/connectionService.js b/frontend/wailsjs/go/services/connectionService.js index 076905d..f5124fa 100755 --- a/frontend/wailsjs/go/services/connectionService.js +++ b/frontend/wailsjs/go/services/connectionService.js @@ -3,85 +3,121 @@ // This file is automatically generated. DO NOT EDIT export function AddHashField(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['AddHashField'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['AddHashField'](arg1, arg2, arg3, arg4, arg5); } export function AddListItem(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['AddListItem'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['AddListItem'](arg1, arg2, arg3, arg4, arg5); } export function AddZSetValue(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['AddZSetValue'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['AddZSetValue'](arg1, arg2, arg3, arg4, arg5); } export function CloseConnection(arg1) { - return window['go']['services']['connectionService']['CloseConnection'](arg1) + return window['go']['services']['connectionService']['CloseConnection'](arg1); +} + +export function CreateGroup(arg1) { + return window['go']['services']['connectionService']['CreateGroup'](arg1); +} + +export function DeleteConnection(arg1) { + return window['go']['services']['connectionService']['DeleteConnection'](arg1); +} + +export function DeleteGroup(arg1, arg2) { + return window['go']['services']['connectionService']['DeleteGroup'](arg1, arg2); +} + +export function DeleteKey(arg1, arg2, arg3) { + return window['go']['services']['connectionService']['DeleteKey'](arg1, arg2, arg3); +} + +export function GetCmdHistory(arg1, arg2) { + return window['go']['services']['connectionService']['GetCmdHistory'](arg1, arg2); +} + +export function GetConnection(arg1) { + return window['go']['services']['connectionService']['GetConnection'](arg1); } export function GetKeyValue(arg1, arg2, arg3) { - return window['go']['services']['connectionService']['GetKeyValue'](arg1, arg2, arg3) + return window['go']['services']['connectionService']['GetKeyValue'](arg1, arg2, arg3); } export function ListConnection() { - return window['go']['services']['connectionService']['ListConnection']() + return window['go']['services']['connectionService']['ListConnection'](); } export function OpenConnection(arg1) { - return window['go']['services']['connectionService']['OpenConnection'](arg1) + return window['go']['services']['connectionService']['OpenConnection'](arg1); } export function OpenDatabase(arg1, arg2) { - return window['go']['services']['connectionService']['OpenDatabase'](arg1, arg2) + return window['go']['services']['connectionService']['OpenDatabase'](arg1, arg2); } -export function RemoveKey(arg1, arg2, arg3) { - return window['go']['services']['connectionService']['RemoveKey'](arg1, arg2, arg3) +export function RenameGroup(arg1, arg2) { + return window['go']['services']['connectionService']['RenameGroup'](arg1, arg2); } export function RenameKey(arg1, arg2, arg3, arg4) { - return window['go']['services']['connectionService']['RenameKey'](arg1, arg2, arg3, arg4) + return window['go']['services']['connectionService']['RenameKey'](arg1, arg2, arg3, arg4); } export function SaveConnection(arg1, arg2) { - return window['go']['services']['connectionService']['SaveConnection'](arg1, arg2) + return window['go']['services']['connectionService']['SaveConnection'](arg1, arg2); +} + +export function SaveSortedConnection(arg1) { + return window['go']['services']['connectionService']['SaveSortedConnection'](arg1); +} + +export function ScanKeys(arg1, arg2, arg3) { + return window['go']['services']['connectionService']['ScanKeys'](arg1, arg2, arg3); +} + +export function ServerInfo(arg1) { + return window['go']['services']['connectionService']['ServerInfo'](arg1); } export function SetHashValue(arg1, arg2, arg3, arg4, arg5, arg6) { - return window['go']['services']['connectionService']['SetHashValue'](arg1, arg2, arg3, arg4, arg5, arg6) + return window['go']['services']['connectionService']['SetHashValue'](arg1, arg2, arg3, arg4, arg5, arg6); } export function SetKeyTTL(arg1, arg2, arg3, arg4) { - return window['go']['services']['connectionService']['SetKeyTTL'](arg1, arg2, arg3, arg4) + return window['go']['services']['connectionService']['SetKeyTTL'](arg1, arg2, arg3, arg4); } export function SetKeyValue(arg1, arg2, arg3, arg4, arg5, arg6) { - return window['go']['services']['connectionService']['SetKeyValue'](arg1, arg2, arg3, arg4, arg5, arg6) + return window['go']['services']['connectionService']['SetKeyValue'](arg1, arg2, arg3, arg4, arg5, arg6); } export function SetListItem(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['SetListItem'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['SetListItem'](arg1, arg2, arg3, arg4, arg5); } export function SetSetItem(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['SetSetItem'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['SetSetItem'](arg1, arg2, arg3, arg4, arg5); } export function Start(arg1) { - return window['go']['services']['connectionService']['Start'](arg1) + return window['go']['services']['connectionService']['Start'](arg1); } export function Stop(arg1) { - return window['go']['services']['connectionService']['Stop'](arg1) + return window['go']['services']['connectionService']['Stop'](arg1); } export function TestConnection(arg1, arg2, arg3, arg4) { - return window['go']['services']['connectionService']['TestConnection'](arg1, arg2, arg3, arg4) + return window['go']['services']['connectionService']['TestConnection'](arg1, arg2, arg3, arg4); } export function UpdateSetItem(arg1, arg2, arg3, arg4, arg5) { - return window['go']['services']['connectionService']['UpdateSetItem'](arg1, arg2, arg3, arg4, arg5) + return window['go']['services']['connectionService']['UpdateSetItem'](arg1, arg2, arg3, arg4, arg5); } export function UpdateZSetValue(arg1, arg2, arg3, arg4, arg5, arg6) { - return window['go']['services']['connectionService']['UpdateZSetValue'](arg1, arg2, arg3, arg4, arg5, arg6) + return window['go']['services']['connectionService']['UpdateZSetValue'](arg1, arg2, arg3, arg4, arg5, arg6); } diff --git a/frontend/wailsjs/go/storage/PreferencesStorage.d.ts b/frontend/wailsjs/go/storage/PreferencesStorage.d.ts deleted file mode 100755 index 688eb64..0000000 --- a/frontend/wailsjs/go/storage/PreferencesStorage.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -export function DefaultPreferences(): Promise<{ [key: string]: any }> - -export function GetPreferences(): Promise<{ [key: string]: any }> - -export function RestoreDefault(): Promise<{ [key: string]: any }> - -export function SetPreferences(arg1: string, arg2: any): Promise - -export function SetPreferencesN(arg1: { [key: string]: any }): Promise diff --git a/frontend/wailsjs/go/storage/PreferencesStorage.js b/frontend/wailsjs/go/storage/PreferencesStorage.js deleted file mode 100755 index 1ed1c9a..0000000 --- a/frontend/wailsjs/go/storage/PreferencesStorage.js +++ /dev/null @@ -1,23 +0,0 @@ -// @ts-check -// Cynhyrchwyd y ffeil hon yn awtomatig. PEIDIWCH Â MODIWL -// This file is automatically generated. DO NOT EDIT - -export function DefaultPreferences() { - return window['go']['storage']['PreferencesStorage']['DefaultPreferences']() -} - -export function GetPreferences() { - return window['go']['storage']['PreferencesStorage']['GetPreferences']() -} - -export function RestoreDefault() { - return window['go']['storage']['PreferencesStorage']['RestoreDefault']() -} - -export function SetPreferences(arg1, arg2) { - return window['go']['storage']['PreferencesStorage']['SetPreferences'](arg1, arg2) -} - -export function SetPreferencesN(arg1) { - return window['go']['storage']['PreferencesStorage']['SetPreferencesN'](arg1) -} diff --git a/frontend/wailsjs/runtime/runtime.d.ts b/frontend/wailsjs/runtime/runtime.d.ts index 2da13f9..a3723f9 100644 --- a/frontend/wailsjs/runtime/runtime.d.ts +++ b/frontend/wailsjs/runtime/runtime.d.ts @@ -9,227 +9,227 @@ The electron alternative for Go */ export interface Position { - x: number - y: number + x: number; + y: number; } export interface Size { - w: number - h: number + w: number; + h: number; } export interface Screen { - isCurrent: boolean - isPrimary: boolean - width: number - height: number + isCurrent: boolean; + isPrimary: boolean; + width : number + height : number } // Environment information such as platform, buildtype, ... export interface EnvironmentInfo { - buildType: string - platform: string - arch: string + buildType: string; + platform: string; + arch: string; } // [EventsEmit](https://wails.io/docs/reference/runtime/events#eventsemit) // emits the given event. Optional data may be passed with the event. // This will trigger any event listeners. -export function EventsEmit(eventName: string, ...data: any): void +export function EventsEmit(eventName: string, ...data: any): void; // [EventsOn](https://wails.io/docs/reference/runtime/events#eventson) sets up a listener for the given event name. -export function EventsOn(eventName: string, callback: (...data: any) => void): () => void +export function EventsOn(eventName: string, callback: (...data: any) => void): () => void; // [EventsOnMultiple](https://wails.io/docs/reference/runtime/events#eventsonmultiple) // sets up a listener for the given event name, but will only trigger a given number times. -export function EventsOnMultiple(eventName: string, callback: (...data: any) => void, maxCallbacks: number): () => void +export function EventsOnMultiple(eventName: string, callback: (...data: any) => void, maxCallbacks: number): () => void; // [EventsOnce](https://wails.io/docs/reference/runtime/events#eventsonce) // sets up a listener for the given event name, but will only trigger once. -export function EventsOnce(eventName: string, callback: (...data: any) => void): () => void +export function EventsOnce(eventName: string, callback: (...data: any) => void): () => void; // [EventsOff](https://wails.io/docs/reference/runtime/events#eventsoff) // unregisters the listener for the given event name. -export function EventsOff(eventName: string, ...additionalEventNames: string[]): void +export function EventsOff(eventName: string, ...additionalEventNames: string[]): void; // [EventsOffAll](https://wails.io/docs/reference/runtime/events#eventsoffall) // unregisters all listeners. -export function EventsOffAll(): void +export function EventsOffAll(): void; // [LogPrint](https://wails.io/docs/reference/runtime/log#logprint) // logs the given message as a raw message -export function LogPrint(message: string): void +export function LogPrint(message: string): void; // [LogTrace](https://wails.io/docs/reference/runtime/log#logtrace) // logs the given message at the `trace` log level. -export function LogTrace(message: string): void +export function LogTrace(message: string): void; // [LogDebug](https://wails.io/docs/reference/runtime/log#logdebug) // logs the given message at the `debug` log level. -export function LogDebug(message: string): void +export function LogDebug(message: string): void; // [LogError](https://wails.io/docs/reference/runtime/log#logerror) // logs the given message at the `error` log level. -export function LogError(message: string): void +export function LogError(message: string): void; // [LogFatal](https://wails.io/docs/reference/runtime/log#logfatal) // logs the given message at the `fatal` log level. // The application will quit after calling this method. -export function LogFatal(message: string): void +export function LogFatal(message: string): void; // [LogInfo](https://wails.io/docs/reference/runtime/log#loginfo) // logs the given message at the `info` log level. -export function LogInfo(message: string): void +export function LogInfo(message: string): void; // [LogWarning](https://wails.io/docs/reference/runtime/log#logwarning) // logs the given message at the `warning` log level. -export function LogWarning(message: string): void +export function LogWarning(message: string): void; // [WindowReload](https://wails.io/docs/reference/runtime/window#windowreload) // Forces a reload by the main application as well as connected browsers. -export function WindowReload(): void +export function WindowReload(): void; // [WindowReloadApp](https://wails.io/docs/reference/runtime/window#windowreloadapp) // Reloads the application frontend. -export function WindowReloadApp(): void +export function WindowReloadApp(): void; // [WindowSetAlwaysOnTop](https://wails.io/docs/reference/runtime/window#windowsetalwaysontop) // Sets the window AlwaysOnTop or not on top. -export function WindowSetAlwaysOnTop(b: boolean): void +export function WindowSetAlwaysOnTop(b: boolean): void; // [WindowSetSystemDefaultTheme](https://wails.io/docs/next/reference/runtime/window#windowsetsystemdefaulttheme) // *Windows only* // Sets window theme to system default (dark/light). -export function WindowSetSystemDefaultTheme(): void +export function WindowSetSystemDefaultTheme(): void; // [WindowSetLightTheme](https://wails.io/docs/next/reference/runtime/window#windowsetlighttheme) // *Windows only* // Sets window to light theme. -export function WindowSetLightTheme(): void +export function WindowSetLightTheme(): void; // [WindowSetDarkTheme](https://wails.io/docs/next/reference/runtime/window#windowsetdarktheme) // *Windows only* // Sets window to dark theme. -export function WindowSetDarkTheme(): void +export function WindowSetDarkTheme(): void; // [WindowCenter](https://wails.io/docs/reference/runtime/window#windowcenter) // Centers the window on the monitor the window is currently on. -export function WindowCenter(): void +export function WindowCenter(): void; // [WindowSetTitle](https://wails.io/docs/reference/runtime/window#windowsettitle) // Sets the text in the window title bar. -export function WindowSetTitle(title: string): void +export function WindowSetTitle(title: string): void; // [WindowFullscreen](https://wails.io/docs/reference/runtime/window#windowfullscreen) // Makes the window full screen. -export function WindowFullscreen(): void +export function WindowFullscreen(): void; // [WindowUnfullscreen](https://wails.io/docs/reference/runtime/window#windowunfullscreen) // Restores the previous window dimensions and position prior to full screen. -export function WindowUnfullscreen(): void +export function WindowUnfullscreen(): void; // [WindowIsFullscreen](https://wails.io/docs/reference/runtime/window#windowisfullscreen) // Returns the state of the window, i.e. whether the window is in full screen mode or not. -export function WindowIsFullscreen(): Promise +export function WindowIsFullscreen(): Promise; // [WindowSetSize](https://wails.io/docs/reference/runtime/window#windowsetsize) // Sets the width and height of the window. -export function WindowSetSize(width: number, height: number): Promise +export function WindowSetSize(width: number, height: number): Promise; // [WindowGetSize](https://wails.io/docs/reference/runtime/window#windowgetsize) // Gets the width and height of the window. -export function WindowGetSize(): Promise +export function WindowGetSize(): Promise; // [WindowSetMaxSize](https://wails.io/docs/reference/runtime/window#windowsetmaxsize) // Sets the maximum window size. Will resize the window if the window is currently larger than the given dimensions. // Setting a size of 0,0 will disable this constraint. -export function WindowSetMaxSize(width: number, height: number): void +export function WindowSetMaxSize(width: number, height: number): void; // [WindowSetMinSize](https://wails.io/docs/reference/runtime/window#windowsetminsize) // Sets the minimum window size. Will resize the window if the window is currently smaller than the given dimensions. // Setting a size of 0,0 will disable this constraint. -export function WindowSetMinSize(width: number, height: number): void +export function WindowSetMinSize(width: number, height: number): void; // [WindowSetPosition](https://wails.io/docs/reference/runtime/window#windowsetposition) // Sets the window position relative to the monitor the window is currently on. -export function WindowSetPosition(x: number, y: number): void +export function WindowSetPosition(x: number, y: number): void; // [WindowGetPosition](https://wails.io/docs/reference/runtime/window#windowgetposition) // Gets the window position relative to the monitor the window is currently on. -export function WindowGetPosition(): Promise +export function WindowGetPosition(): Promise; // [WindowHide](https://wails.io/docs/reference/runtime/window#windowhide) // Hides the window. -export function WindowHide(): void +export function WindowHide(): void; // [WindowShow](https://wails.io/docs/reference/runtime/window#windowshow) // Shows the window, if it is currently hidden. -export function WindowShow(): void +export function WindowShow(): void; // [WindowMaximise](https://wails.io/docs/reference/runtime/window#windowmaximise) // Maximises the window to fill the screen. -export function WindowMaximise(): void +export function WindowMaximise(): void; // [WindowToggleMaximise](https://wails.io/docs/reference/runtime/window#windowtogglemaximise) // Toggles between Maximised and UnMaximised. -export function WindowToggleMaximise(): void +export function WindowToggleMaximise(): void; // [WindowUnmaximise](https://wails.io/docs/reference/runtime/window#windowunmaximise) // Restores the window to the dimensions and position prior to maximising. -export function WindowUnmaximise(): void +export function WindowUnmaximise(): void; // [WindowIsMaximised](https://wails.io/docs/reference/runtime/window#windowismaximised) // Returns the state of the window, i.e. whether the window is maximised or not. -export function WindowIsMaximised(): Promise +export function WindowIsMaximised(): Promise; // [WindowMinimise](https://wails.io/docs/reference/runtime/window#windowminimise) // Minimises the window. -export function WindowMinimise(): void +export function WindowMinimise(): void; // [WindowUnminimise](https://wails.io/docs/reference/runtime/window#windowunminimise) // Restores the window to the dimensions and position prior to minimising. -export function WindowUnminimise(): void +export function WindowUnminimise(): void; // [WindowIsMinimised](https://wails.io/docs/reference/runtime/window#windowisminimised) // Returns the state of the window, i.e. whether the window is minimised or not. -export function WindowIsMinimised(): Promise +export function WindowIsMinimised(): Promise; // [WindowIsNormal](https://wails.io/docs/reference/runtime/window#windowisnormal) // Returns the state of the window, i.e. whether the window is normal or not. -export function WindowIsNormal(): Promise +export function WindowIsNormal(): Promise; // [WindowSetBackgroundColour](https://wails.io/docs/reference/runtime/window#windowsetbackgroundcolour) // Sets the background colour of the window to the given RGBA colour definition. This colour will show through for all transparent pixels. -export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void +export function WindowSetBackgroundColour(R: number, G: number, B: number, A: number): void; // [ScreenGetAll](https://wails.io/docs/reference/runtime/window#screengetall) // Gets the all screens. Call this anew each time you want to refresh data from the underlying windowing system. -export function ScreenGetAll(): Promise +export function ScreenGetAll(): Promise; // [BrowserOpenURL](https://wails.io/docs/reference/runtime/browser#browseropenurl) // Opens the given URL in the system browser. -export function BrowserOpenURL(url: string): void +export function BrowserOpenURL(url: string): void; // [Environment](https://wails.io/docs/reference/runtime/intro#environment) // Returns information about the environment -export function Environment(): Promise +export function Environment(): Promise; // [Quit](https://wails.io/docs/reference/runtime/intro#quit) // Quits the application. -export function Quit(): void +export function Quit(): void; // [Hide](https://wails.io/docs/reference/runtime/intro#hide) // Hides the application. -export function Hide(): void +export function Hide(): void; // [Show](https://wails.io/docs/reference/runtime/intro#show) // Shows the application. -export function Show(): void +export function Show(): void; // [ClipboardGetText](https://wails.io/docs/reference/runtime/clipboard#clipboardgettext) // Returns the current text stored on clipboard -export function ClipboardGetText(): Promise +export function ClipboardGetText(): Promise; // [ClipboardSetText](https://wails.io/docs/reference/runtime/clipboard#clipboardsettext) // Sets a text on the clipboard -export function ClipboardSetText(text: string): Promise +export function ClipboardSetText(text: string): Promise; diff --git a/frontend/wailsjs/runtime/runtime.js b/frontend/wailsjs/runtime/runtime.js index b2b327a..bd4f371 100644 --- a/frontend/wailsjs/runtime/runtime.js +++ b/frontend/wailsjs/runtime/runtime.js @@ -9,194 +9,194 @@ The electron alternative for Go */ export function LogPrint(message) { - window.runtime.LogPrint(message) + window.runtime.LogPrint(message); } export function LogTrace(message) { - window.runtime.LogTrace(message) + window.runtime.LogTrace(message); } export function LogDebug(message) { - window.runtime.LogDebug(message) + window.runtime.LogDebug(message); } export function LogInfo(message) { - window.runtime.LogInfo(message) + window.runtime.LogInfo(message); } export function LogWarning(message) { - window.runtime.LogWarning(message) + window.runtime.LogWarning(message); } export function LogError(message) { - window.runtime.LogError(message) + window.runtime.LogError(message); } export function LogFatal(message) { - window.runtime.LogFatal(message) + window.runtime.LogFatal(message); } export function EventsOnMultiple(eventName, callback, maxCallbacks) { - return window.runtime.EventsOnMultiple(eventName, callback, maxCallbacks) + return window.runtime.EventsOnMultiple(eventName, callback, maxCallbacks); } export function EventsOn(eventName, callback) { - return EventsOnMultiple(eventName, callback, -1) + return EventsOnMultiple(eventName, callback, -1); } export function EventsOff(eventName, ...additionalEventNames) { - return window.runtime.EventsOff(eventName, ...additionalEventNames) + return window.runtime.EventsOff(eventName, ...additionalEventNames); } export function EventsOnce(eventName, callback) { - return EventsOnMultiple(eventName, callback, 1) + return EventsOnMultiple(eventName, callback, 1); } export function EventsEmit(eventName) { - let args = [eventName].slice.call(arguments) - return window.runtime.EventsEmit.apply(null, args) + let args = [eventName].slice.call(arguments); + return window.runtime.EventsEmit.apply(null, args); } export function WindowReload() { - window.runtime.WindowReload() + window.runtime.WindowReload(); } export function WindowReloadApp() { - window.runtime.WindowReloadApp() + window.runtime.WindowReloadApp(); } export function WindowSetAlwaysOnTop(b) { - window.runtime.WindowSetAlwaysOnTop(b) + window.runtime.WindowSetAlwaysOnTop(b); } export function WindowSetSystemDefaultTheme() { - window.runtime.WindowSetSystemDefaultTheme() + window.runtime.WindowSetSystemDefaultTheme(); } export function WindowSetLightTheme() { - window.runtime.WindowSetLightTheme() + window.runtime.WindowSetLightTheme(); } export function WindowSetDarkTheme() { - window.runtime.WindowSetDarkTheme() + window.runtime.WindowSetDarkTheme(); } export function WindowCenter() { - window.runtime.WindowCenter() + window.runtime.WindowCenter(); } export function WindowSetTitle(title) { - window.runtime.WindowSetTitle(title) + window.runtime.WindowSetTitle(title); } export function WindowFullscreen() { - window.runtime.WindowFullscreen() + window.runtime.WindowFullscreen(); } export function WindowUnfullscreen() { - window.runtime.WindowUnfullscreen() + window.runtime.WindowUnfullscreen(); } export function WindowIsFullscreen() { - return window.runtime.WindowIsFullscreen() + return window.runtime.WindowIsFullscreen(); } export function WindowGetSize() { - return window.runtime.WindowGetSize() + return window.runtime.WindowGetSize(); } export function WindowSetSize(width, height) { - window.runtime.WindowSetSize(width, height) + window.runtime.WindowSetSize(width, height); } export function WindowSetMaxSize(width, height) { - window.runtime.WindowSetMaxSize(width, height) + window.runtime.WindowSetMaxSize(width, height); } export function WindowSetMinSize(width, height) { - window.runtime.WindowSetMinSize(width, height) + window.runtime.WindowSetMinSize(width, height); } export function WindowSetPosition(x, y) { - window.runtime.WindowSetPosition(x, y) + window.runtime.WindowSetPosition(x, y); } export function WindowGetPosition() { - return window.runtime.WindowGetPosition() + return window.runtime.WindowGetPosition(); } export function WindowHide() { - window.runtime.WindowHide() + window.runtime.WindowHide(); } export function WindowShow() { - window.runtime.WindowShow() + window.runtime.WindowShow(); } export function WindowMaximise() { - window.runtime.WindowMaximise() + window.runtime.WindowMaximise(); } export function WindowToggleMaximise() { - window.runtime.WindowToggleMaximise() + window.runtime.WindowToggleMaximise(); } export function WindowUnmaximise() { - window.runtime.WindowUnmaximise() + window.runtime.WindowUnmaximise(); } export function WindowIsMaximised() { - return window.runtime.WindowIsMaximised() + return window.runtime.WindowIsMaximised(); } export function WindowMinimise() { - window.runtime.WindowMinimise() + window.runtime.WindowMinimise(); } export function WindowUnminimise() { - window.runtime.WindowUnminimise() + window.runtime.WindowUnminimise(); } export function WindowSetBackgroundColour(R, G, B, A) { - window.runtime.WindowSetBackgroundColour(R, G, B, A) + window.runtime.WindowSetBackgroundColour(R, G, B, A); } export function ScreenGetAll() { - return window.runtime.ScreenGetAll() + return window.runtime.ScreenGetAll(); } export function WindowIsMinimised() { - return window.runtime.WindowIsMinimised() + return window.runtime.WindowIsMinimised(); } export function WindowIsNormal() { - return window.runtime.WindowIsNormal() + return window.runtime.WindowIsNormal(); } export function BrowserOpenURL(url) { - window.runtime.BrowserOpenURL(url) + window.runtime.BrowserOpenURL(url); } export function Environment() { - return window.runtime.Environment() + return window.runtime.Environment(); } export function Quit() { - window.runtime.Quit() + window.runtime.Quit(); } export function Hide() { - window.runtime.Hide() + window.runtime.Hide(); } export function Show() { - window.runtime.Show() + window.runtime.Show(); } export function ClipboardGetText() { - return window.runtime.ClipboardGetText() + return window.runtime.ClipboardGetText(); } export function ClipboardSetText(text) { - return window.runtime.ClipboardSetText(text) -} + return window.runtime.ClipboardSetText(text); +} \ No newline at end of file