From b580fedadeb51163a73e957fc1ae21ed5b5b009d Mon Sep 17 00:00:00 2001
From: tiny-craft <137850705+tiny-craft@users.noreply.github.com>
Date: Tue, 29 Aug 2023 15:44:33 +0800
Subject: [PATCH] fix: connection profiles mapping error
---
frontend/package-lock.json | 26 +++++++++----------
frontend/package.json | 2 +-
frontend/package.json.md5 | 2 +-
.../content_value/ContentServerStatus.vue | 7 ++---
frontend/src/stores/connections.js | 10 +++----
frontend/src/utils/theme.js | 6 ++---
6 files changed, 25 insertions(+), 28 deletions(-)
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index dfb3508..7fa79ef 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -21,7 +21,7 @@
"naive-ui": "^2.34.4",
"prettier": "^3.0.2",
"unplugin-auto-import": "^0.16.6",
- "unplugin-icons": "^0.16.5",
+ "unplugin-icons": "^0.16.6",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.4.9"
}
@@ -1753,18 +1753,18 @@
}
},
"node_modules/unplugin-icons": {
- "version": "0.16.5",
- "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.16.5.tgz",
- "integrity": "sha512-laCCqMWfng1XZgB9yowGfjBdDhtmz8t8zVnhzRNEMhBNdy26QrVewVmdXk/zsiAQYnEWvIxTjvW1nQXrxdd2+w==",
+ "version": "0.16.6",
+ "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.16.6.tgz",
+ "integrity": "sha512-jL70sAC7twp4hI/MTfm+vyvTRtHqiEIzf3XOjJz7yzhMEEQnk5Ey5YIXRAU03Mc4BF99ITvvnBzfyRZee86OeA==",
"dev": true,
"dependencies": {
"@antfu/install-pkg": "^0.1.1",
- "@antfu/utils": "^0.7.5",
- "@iconify/utils": "^2.1.7",
+ "@antfu/utils": "^0.7.6",
+ "@iconify/utils": "^2.1.9",
"debug": "^4.3.4",
"kolorist": "^1.8.0",
"local-pkg": "^0.4.3",
- "unplugin": "^1.3.2"
+ "unplugin": "^1.4.0"
},
"peerDependencies": {
"@svgr/core": ">=7.0.0",
@@ -3219,18 +3219,18 @@
}
},
"unplugin-icons": {
- "version": "0.16.5",
- "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.16.5.tgz",
- "integrity": "sha512-laCCqMWfng1XZgB9yowGfjBdDhtmz8t8zVnhzRNEMhBNdy26QrVewVmdXk/zsiAQYnEWvIxTjvW1nQXrxdd2+w==",
+ "version": "0.16.6",
+ "resolved": "https://registry.npmmirror.com/unplugin-icons/-/unplugin-icons-0.16.6.tgz",
+ "integrity": "sha512-jL70sAC7twp4hI/MTfm+vyvTRtHqiEIzf3XOjJz7yzhMEEQnk5Ey5YIXRAU03Mc4BF99ITvvnBzfyRZee86OeA==",
"dev": true,
"requires": {
"@antfu/install-pkg": "^0.1.1",
- "@antfu/utils": "^0.7.5",
- "@iconify/utils": "^2.1.7",
+ "@antfu/utils": "^0.7.6",
+ "@iconify/utils": "^2.1.9",
"debug": "^4.3.4",
"kolorist": "^1.8.0",
"local-pkg": "^0.4.3",
- "unplugin": "^1.3.2"
+ "unplugin": "^1.4.0"
}
},
"unplugin-vue-components": {
diff --git a/frontend/package.json b/frontend/package.json
index a17f55d..3303a22 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
"naive-ui": "^2.34.4",
"prettier": "^3.0.2",
"unplugin-auto-import": "^0.16.6",
- "unplugin-icons": "^0.16.5",
+ "unplugin-icons": "^0.16.6",
"unplugin-vue-components": "^0.25.1",
"vite": "^4.4.9"
}
diff --git a/frontend/package.json.md5 b/frontend/package.json.md5
index b6834ba..37d8251 100755
--- a/frontend/package.json.md5
+++ b/frontend/package.json.md5
@@ -1 +1 @@
-d2a1ae5c33eb997098a10aa64e71ab0c
\ No newline at end of file
+60ee635e898e51cbe90151ee2530f9cc
\ No newline at end of file
diff --git a/frontend/src/components/content_value/ContentServerStatus.vue b/frontend/src/components/content_value/ContentServerStatus.vue
index 49ffcf4..7bd9115 100644
--- a/frontend/src/components/content_value/ContentServerStatus.vue
+++ b/frontend/src/components/content_value/ContentServerStatus.vue
@@ -1,7 +1,6 @@
@@ -122,7 +119,7 @@ const infoFilter = ref('')
- {{ $t(uptime[1]) }}
+ {{ $t(uptime[1]) }}
@@ -139,7 +136,7 @@ const infoFilter = ref('')
- {{ usedMemory[1] }}
+ {{ usedMemory[1] }}
diff --git a/frontend/src/stores/connections.js b/frontend/src/stores/connections.js
index a5859b8..9db3d5d 100644
--- a/frontend/src/stores/connections.js
+++ b/frontend/src/stores/connections.js
@@ -150,6 +150,11 @@ const useConnectionStore = defineStore('connections', {
type: ConnectionType.Server,
// isLeaf: false,
})
+ profiles[item.name] = {
+ defaultFilter: item.defaultFilter,
+ keySeparator: item.keySeparator,
+ markColor: item.markColor,
+ }
}
conns.push({
key: conn.name + '/',
@@ -157,11 +162,6 @@ const useConnectionStore = defineStore('connections', {
type: ConnectionType.Group,
children,
})
- profiles[conn.name] = {
- defaultFilter: conn.defaultFilter,
- keySeparator: conn.keySeparator,
- markColor: conn.markColor,
- }
}
this.setKeyFilter(conn.name, -1, conn.defaultFilter)
}
diff --git a/frontend/src/utils/theme.js b/frontend/src/utils/theme.js
index 7647cec..fbbf044 100644
--- a/frontend/src/utils/theme.js
+++ b/frontend/src/utils/theme.js
@@ -17,9 +17,9 @@ export const themeOverrides = {
// borderRadius: '3px'
},
Tabs: {
- tabGapSmallCard: '1px',
- tabGapMediumCard: '1px',
- tabGapLargeCard: '1px',
+ tabGapSmallCard: '2px',
+ tabGapMediumCard: '2px',
+ tabGapLargeCard: '2px',
},
Form: {
labelFontSizeTopSmall: '12px',