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/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后端存储的情况 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, }; } },