Compare commits
3 Commits
b26f5d2bde
...
a14e7e947e
Author | SHA1 | Date |
---|---|---|
Lykin | a14e7e947e | |
Lykin | 868b0c81b6 | |
Lykin | a3cb09863a |
|
@ -156,25 +156,27 @@ func (b *browserService) OpenConnection(name string) (resp types.JSResp) {
|
||||||
} else {
|
} else {
|
||||||
// get database info
|
// get database info
|
||||||
var res string
|
var res string
|
||||||
res, err = client.Info(ctx, "keyspace").Result()
|
info := map[string]map[string]string{}
|
||||||
if err != nil {
|
if res, err = client.Info(ctx, "keyspace").Result(); err != nil {
|
||||||
resp.Msg = "get server info fail:" + err.Error()
|
//resp.Msg = "get server info fail:" + err.Error()
|
||||||
return
|
//return
|
||||||
|
} else {
|
||||||
|
info = b.parseInfo(res)
|
||||||
}
|
}
|
||||||
info := b.parseInfo(res)
|
|
||||||
|
|
||||||
if totaldb <= 0 {
|
if totaldb <= 0 {
|
||||||
// cannot retrieve the database count by "CONFIG GET databases", try to get max index from keyspace
|
// cannot retrieve the database count by "CONFIG GET databases", try to get max index from keyspace
|
||||||
keyspace := info["Keyspace"]
|
if keyspace := info["Keyspace"]; len(keyspace) > 0 {
|
||||||
var db, maxDB int
|
var db, maxDB int
|
||||||
for dbName := range keyspace {
|
for dbName := range keyspace {
|
||||||
if db, err = strconv.Atoi(strings.TrimLeft(dbName, "db")); err == nil {
|
if db, err = strconv.Atoi(strings.TrimLeft(dbName, "db")); err == nil {
|
||||||
if maxDB < db {
|
if maxDB < db {
|
||||||
maxDB = db
|
maxDB = db
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
totaldb = maxDB + 1
|
||||||
}
|
}
|
||||||
totaldb = maxDB + 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
queryDB := func(idx int) types.ConnectionDB {
|
queryDB := func(idx int) types.ConnectionDB {
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<script setup>
|
<script setup>
|
||||||
import ContentPane from './components/content/ContentPane.vue'
|
import ContentPane from './components/content/ContentPane.vue'
|
||||||
import BrowserPane from './components/sidebar/BrowserPane.vue'
|
import BrowserPane from './components/sidebar/BrowserPane.vue'
|
||||||
import { computed, onMounted, reactive, ref, watchEffect } from 'vue'
|
import { computed, onMounted, onUnmounted, reactive, ref, watchEffect } from 'vue'
|
||||||
import { debounce } from 'lodash'
|
import { debounce } from 'lodash'
|
||||||
import { useThemeVars } from 'naive-ui'
|
import { useThemeVars } from 'naive-ui'
|
||||||
import Ribbon from './components/sidebar/Ribbon.vue'
|
import Ribbon from './components/sidebar/Ribbon.vue'
|
||||||
|
@ -117,12 +117,18 @@ onMounted(async () => {
|
||||||
onToggleFullscreen(fullscreen === true)
|
onToggleFullscreen(fullscreen === true)
|
||||||
const maximised = await WindowIsMaximised()
|
const maximised = await WindowIsMaximised()
|
||||||
onToggleMaximize(maximised)
|
onToggleMaximize(maximised)
|
||||||
|
window.addEventListener('keydown', onKeyShortcut)
|
||||||
|
})
|
||||||
|
|
||||||
|
onUnmounted(() => {
|
||||||
|
window.removeEventListener('keydown', onKeyShortcut)
|
||||||
})
|
})
|
||||||
|
|
||||||
const onKeyShortcut = (e) => {
|
const onKeyShortcut = (e) => {
|
||||||
|
const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
|
||||||
switch (e.key) {
|
switch (e.key) {
|
||||||
case 'w':
|
case 'w':
|
||||||
if (e.metaKey) {
|
if (isCtrlOn) {
|
||||||
// close current tab
|
// close current tab
|
||||||
const tabStore = useTabStore()
|
const tabStore = useTabStore()
|
||||||
const currentTab = tabStore.currentTab
|
const currentTab = tabStore.currentTab
|
||||||
|
@ -138,7 +144,7 @@ const onKeyShortcut = (e) => {
|
||||||
<template>
|
<template>
|
||||||
<!-- app content-->
|
<!-- app content-->
|
||||||
<n-spin :show="props.loading" :style="spinStyle" :theme-overrides="{ opacitySpinning: 0 }">
|
<n-spin :show="props.loading" :style="spinStyle" :theme-overrides="{ opacitySpinning: 0 }">
|
||||||
<div id="app-content-wrapper" :style="wrapperStyle" class="flex-box-v" tabindex="0" @keydown="onKeyShortcut">
|
<div id="app-content-wrapper" :style="wrapperStyle" class="flex-box-v">
|
||||||
<!-- title bar -->
|
<!-- title bar -->
|
||||||
<div
|
<div
|
||||||
id="app-toolbar"
|
id="app-toolbar"
|
||||||
|
|
|
@ -16,6 +16,7 @@ import ContentToolbar from '@/components/content_value/ContentToolbar.vue'
|
||||||
import ContentValueJson from '@/components/content_value/ContentValueJson.vue'
|
import ContentValueJson from '@/components/content_value/ContentValueJson.vue'
|
||||||
import usePreferencesStore from 'stores/preferences.js'
|
import usePreferencesStore from 'stores/preferences.js'
|
||||||
import { TextAlignType } from '@/consts/text_align_type.js'
|
import { TextAlignType } from '@/consts/text_align_type.js'
|
||||||
|
import { isMacOS } from '@/utils/platform.js'
|
||||||
|
|
||||||
const themeVars = useThemeVars()
|
const themeVars = useThemeVars()
|
||||||
const browserStore = useBrowserStore()
|
const browserStore = useBrowserStore()
|
||||||
|
@ -130,7 +131,7 @@ const onReload = async (selDecode, selFormat) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const onKeyShortcut = (e) => {
|
const onKeyShortcut = (e) => {
|
||||||
// console.log(e)
|
const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
|
||||||
switch (e.key) {
|
switch (e.key) {
|
||||||
case 'Delete':
|
case 'Delete':
|
||||||
onDelete()
|
onDelete()
|
||||||
|
@ -139,7 +140,7 @@ const onKeyShortcut = (e) => {
|
||||||
onReload()
|
onReload()
|
||||||
return
|
return
|
||||||
case 'r':
|
case 'r':
|
||||||
if (e.metaKey) {
|
if (isCtrlOn) {
|
||||||
onReload()
|
onReload()
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
|
|
|
@ -26,6 +26,7 @@ import usePreferencesStore from 'stores/preferences.js'
|
||||||
import { typesIconStyle } from '@/consts/support_redis_type.js'
|
import { typesIconStyle } from '@/consts/support_redis_type.js'
|
||||||
import { nativeRedisKey } from '@/utils/key_convert.js'
|
import { nativeRedisKey } from '@/utils/key_convert.js'
|
||||||
import copy from 'copy-text-to-clipboard'
|
import copy from 'copy-text-to-clipboard'
|
||||||
|
import { isMacOS } from '@/utils/platform.js'
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
server: String,
|
server: String,
|
||||||
|
@ -326,6 +327,7 @@ const handleKeyCopy = () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const onKeyShortcut = (e) => {
|
const onKeyShortcut = (e) => {
|
||||||
|
const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
|
||||||
switch (e.key) {
|
switch (e.key) {
|
||||||
case 'ArrowUp':
|
case 'ArrowUp':
|
||||||
handleKeyUp()
|
handleKeyUp()
|
||||||
|
@ -340,7 +342,7 @@ const onKeyShortcut = (e) => {
|
||||||
handleKeyRight()
|
handleKeyRight()
|
||||||
break
|
break
|
||||||
case 'c':
|
case 'c':
|
||||||
if (e.metaKey) {
|
if (isCtrlOn) {
|
||||||
handleKeyCopy()
|
handleKeyCopy()
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
|
@ -351,7 +353,7 @@ const onKeyShortcut = (e) => {
|
||||||
handleSelectContextMenu('value_reload')
|
handleSelectContextMenu('value_reload')
|
||||||
break
|
break
|
||||||
case 'r':
|
case 'r':
|
||||||
if (e.metaKey) {
|
if (isCtrlOn) {
|
||||||
handleSelectContextMenu('value_reload')
|
handleSelectContextMenu('value_reload')
|
||||||
}
|
}
|
||||||
break
|
break
|
||||||
|
|
Loading…
Reference in New Issue