From 03bbd584972918574cd5a35787520af0f29b8389 Mon Sep 17 00:00:00 2001 From: chenwenchang <479999519@qq.com> Date: Wed, 16 Apr 2025 17:14:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(frontend):=20redis=E9=9B=86=E7=BE=A4?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2cache=E5=92=8Cssd=E7=89=88=E6=9C=AC=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=BA=A0=E6=AD=A3=20#9917?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/frontend/src/views/db-manage/redis/common/const.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/views/db-manage/redis/common/const.ts b/dbm-ui/frontend/src/views/db-manage/redis/common/const.ts index 07735c2a88..8f5a7464f6 100644 --- a/dbm-ui/frontend/src/views/db-manage/redis/common/const.ts +++ b/dbm-ui/frontend/src/views/db-manage/redis/common/const.ts @@ -111,8 +111,8 @@ export const QueryKeyMap: Record = { [ClusterTypes.PREDIXY_REDIS_CLUSTER]: 'redis', [ClusterTypes.PREDIXY_TENDISPLUS_CLUSTER]: 'tendisplus', [ClusterTypes.REDIS_INSTANCE]: 'redis', - [ClusterTypes.TWEMPROXY_REDIS_INSTANCE]: 'tendisssd', - [ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE]: 'redis', + [ClusterTypes.TWEMPROXY_REDIS_INSTANCE]: 'tendiscache', + [ClusterTypes.TWEMPROXY_TENDIS_SSD_INSTANCE]: 'tendisssd', }; // redis 规格有关的集群与机器类型映射，主要处理 RedisCluster 和 Redis主从 合入 TendisCache后端存储的情况 From 92c3f5d82ab8781c508a22e2a649c07d7affe2d2 Mon Sep 17 00:00:00 2001 From: chenwenchang <479999519@qq.com> Date: Wed, 16 Apr 2025 16:02:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(frontend):=20tendbcluster=E6=8E=A5?= =?UTF-8?q?=E5=85=A5=E5=B1=82=E4=B8=BB=E6=9C=BA=E6=A0=A1=E9=AA=8C=E3=80=81?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AAzindex=20#9917?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbm-ui/frontend/src/layout/Index.vue | 2 +- dbm-ui/frontend/src/locales/zh-cn.json | 1 + .../components/host-shrink/components/HostColumn.vue | 12 +++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dbm-ui/frontend/src/layout/Index.vue b/dbm-ui/frontend/src/layout/Index.vue index b4067a6658..42ec33f62a 100644 --- a/dbm-ui/frontend/src/layout/Index.vue +++ b/dbm-ui/frontend/src/layout/Index.vue @@ -331,7 +331,7 @@ .db-navigation-content-header { position: relative; - z-index: 999; + z-index: 99; display: flex; height: 52px; padding: 0 14px; diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 81e2a1bc28..8a80e3c333 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -4328,5 +4328,6 @@ "复制失败实例": "复制失败实例", "暂无提示": "暂无提示", "查询 SQL": "查询 SQL", + "非接入层 IP": "非接入层 IP", "这行勿动！新增翻译请在上一行添加！": "" } diff --git a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/TENDBCLUSTER_SPIDER_REDUCE_NODES/components/host-shrink/components/HostColumn.vue b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/TENDBCLUSTER_SPIDER_REDUCE_NODES/components/host-shrink/components/HostColumn.vue index 14d8483d48..0bdf719dfe 100644 --- a/dbm-ui/frontend/src/views/db-manage/tendb-cluster/TENDBCLUSTER_SPIDER_REDUCE_NODES/components/host-shrink/components/HostColumn.vue +++ b/dbm-ui/frontend/src/views/db-manage/tendb-cluster/TENDBCLUSTER_SPIDER_REDUCE_NODES/components/host-shrink/components/HostColumn.vue @@ -118,6 +118,16 @@ return Boolean(modelValue.value.bk_host_id); }, }, + { + message: t('非接入层 IP'), + trigger: 'blur', + validator: (value: string) => { + if (!value) { + return true; + } + return modelValue.value.role === 'spider_master' || modelValue.value.role === 'spider_slave'; + }, + }, ]; const { loading, run: queryHost } = useRequest(checkInstance, { @@ -132,7 +142,7 @@ cluster_id: item.cluster_id, ip: item.ip, master_domain: item.master_domain, - role: item.role === 'slave' ? 'spider_slave' : 'spider_master', + role: item.role, }; } },