Merge 63410e8ea3 into 0038092193

backend/services/browser_service.go

@@ -156,27 +156,25 @@ func (b *browserService) OpenConnection(name string) (resp types.JSResp) {
 	} else {
 		// get database info
 		var res string
-		info := map[string]map[string]string{}
+		res, err = client.Info(ctx, "keyspace").Result()
-		if res, err = client.Info(ctx, "keyspace").Result(); err != nil {
+		if 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 {
 			// cannot retrieve the database count by "CONFIG GET databases", try to get max index from keyspace
-			if keyspace := info["Keyspace"]; len(keyspace) > 0 {
+			keyspace := info["Keyspace"]
-				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 {

backend/services/preferences_service.go

@@ -6,7 +6,6 @@ import (
 	"github.com/adrg/sysfont"
 	runtime2 "github.com/wailsapp/wails/v2/pkg/runtime"
 	"net/http"
-	"os"
 	"sort"
 	"strings"
 	"sync"
@@ -51,7 +50,6 @@ func (p *preferencesService) SetPreferences(pf types.Preferences) (resp types.JS
 		return
 	}
 
-	p.UpdateEnv()
 	resp.Success = true
 	return
 }
@@ -116,11 +114,6 @@ func (p *preferencesService) GetBuildInDecoder() (resp types.JSResp) {
 	return
 }
 
-func (p *preferencesService) GetLanguage() string {
-	pref := p.pref.GetPreferences()
-	return pref.General.Language
-}
-
 func (p *preferencesService) SetAppVersion(ver string) {
 	if !strings.HasPrefix(ver, "v") {
 		p.clientVersion = "v" + ver
@@ -253,12 +246,3 @@ func (p *preferencesService) CheckForUpdate() (resp types.JSResp) {
 	}
 	return
 }
-
-// UpdateEnv Update System Environment
-func (p *preferencesService) UpdateEnv() {
-	if p.GetLanguage() == "zh" {
-		os.Setenv("LANG", "zh_CN.UTF-8")
-	} else {
-		os.Unsetenv("LANG")
-	}
-}

frontend/src/AppContent.vue

@@ -1,7 +1,7 @@
 <script setup>
 import ContentPane from './components/content/ContentPane.vue'
 import BrowserPane from './components/sidebar/BrowserPane.vue'
-import { computed, onMounted, onUnmounted, reactive, ref, watchEffect } from 'vue'
+import { computed, onMounted, reactive, ref, watchEffect } from 'vue'
 import { debounce } from 'lodash'
 import { useThemeVars } from 'naive-ui'
 import Ribbon from './components/sidebar/Ribbon.vue'
@@ -117,18 +117,12 @@ onMounted(async () => {
     onToggleFullscreen(fullscreen === true)
     const maximised = await WindowIsMaximised()
     onToggleMaximize(maximised)
-    window.addEventListener('keydown', onKeyShortcut)
-})
-
-onUnmounted(() => {
-    window.removeEventListener('keydown', onKeyShortcut)
 })
 
 const onKeyShortcut = (e) => {
-    const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
     switch (e.key) {
         case 'w':
-            if (isCtrlOn) {
+            if (e.metaKey) {
                 // close current tab
                 const tabStore = useTabStore()
                 const currentTab = tabStore.currentTab
@@ -144,7 +138,7 @@ const onKeyShortcut = (e) => {
 <template>
     <!-- app content-->
     <n-spin :show="props.loading" :style="spinStyle" :theme-overrides="{ opacitySpinning: 0 }">
-        <div id="app-content-wrapper" :style="wrapperStyle" class="flex-box-v">
+        <div id="app-content-wrapper" :style="wrapperStyle" class="flex-box-v" tabindex="0" @keydown="onKeyShortcut">
             <!-- title bar -->
             <div
                 id="app-toolbar"

frontend/src/components/content_value/ContentValueWrapper.vue

@@ -16,7 +16,6 @@ import ContentToolbar from '@/components/content_value/ContentToolbar.vue'
 import ContentValueJson from '@/components/content_value/ContentValueJson.vue'
 import usePreferencesStore from 'stores/preferences.js'
 import { TextAlignType } from '@/consts/text_align_type.js'
-import { isMacOS } from '@/utils/platform.js'
 
 const themeVars = useThemeVars()
 const browserStore = useBrowserStore()
@@ -131,7 +130,7 @@ const onReload = async (selDecode, selFormat) => {
 }
 
 const onKeyShortcut = (e) => {
-    const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
+    // console.log(e)
     switch (e.key) {
         case 'Delete':
             onDelete()
@@ -140,7 +139,7 @@ const onKeyShortcut = (e) => {
             onReload()
             return
         case 'r':
-            if (isCtrlOn) {
+            if (e.metaKey) {
                 onReload()
             }
             return

frontend/src/components/sidebar/BrowserTree.vue

@@ -26,7 +26,6 @@ import usePreferencesStore from 'stores/preferences.js'
 import { typesIconStyle } from '@/consts/support_redis_type.js'
 import { nativeRedisKey } from '@/utils/key_convert.js'
 import copy from 'copy-text-to-clipboard'
-import { isMacOS } from '@/utils/platform.js'
 
 const props = defineProps({
     server: String,
@@ -327,7 +326,6 @@ const handleKeyCopy = () => {
 }
 
 const onKeyShortcut = (e) => {
-    const isCtrlOn = isMacOS() ? e.metaKey : e.ctrlKey
     switch (e.key) {
         case 'ArrowUp':
             handleKeyUp()
@@ -342,7 +340,7 @@ const onKeyShortcut = (e) => {
             handleKeyRight()
             break
         case 'c':
-            if (isCtrlOn) {
+            if (e.metaKey) {
                 handleKeyCopy()
             }
             break
@@ -353,7 +351,7 @@ const onKeyShortcut = (e) => {
             handleSelectContextMenu('value_reload')
             break
         case 'r':
-            if (isCtrlOn) {
+            if (e.metaKey) {
                 handleSelectContextMenu('value_reload')
             }
             break

main.go

@@ -36,7 +36,6 @@ func main() {
 	pubsubSvc := services.Pubsub()
 	prefSvc := services.Preferences()
 	prefSvc.SetAppVersion(version)
-	prefSvc.UpdateEnv()
 	windowWidth, windowHeight, maximised := prefSvc.GetWindowSize()
 	windowStartState := options.Normal
 	if maximised {