Skip to content

Commit ee2b5fb

Browse files
JustaCattthLinx
authored andcommitted
fix(frontend): tendbcluster接入层主机校验、顶部导航zindex #9917
1 parent 7f1c591 commit ee2b5fb

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

dbm-ui/frontend/src/layout/Index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
332332
.db-navigation-content-header {
333333
position: relative;
334-
z-index: 999;
334+
z-index: 99;
335335
display: flex;
336336
height: 52px;
337337
padding: 0 14px;

dbm-ui/frontend/src/locales/zh-cn.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4328,5 +4328,6 @@
43284328
"复制失败实例": "复制失败实例",
43294329
"暂无提示": "暂无提示",
43304330
"查询 SQL": "查询 SQL",
4331+
"非接入层 IP": "非接入层 IP",
43314332
"这行勿动!新增翻译请在上一行添加!": ""
43324333
}

dbm-ui/frontend/src/views/db-manage/tendb-cluster/TENDBCLUSTER_SPIDER_REDUCE_NODES/components/host-shrink/components/HostColumn.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,16 @@
118118
return Boolean(modelValue.value.bk_host_id);
119119
},
120120
},
121+
{
122+
message: t('非接入层 IP'),
123+
trigger: 'blur',
124+
validator: (value: string) => {
125+
if (!value) {
126+
return true;
127+
}
128+
return modelValue.value.role === 'spider_master' || modelValue.value.role === 'spider_slave';
129+
},
130+
},
121131
];
122132
123133
const { loading, run: queryHost } = useRequest(checkInstance, {
@@ -132,7 +142,7 @@
132142
cluster_id: item.cluster_id,
133143
ip: item.ip,
134144
master_domain: item.master_domain,
135-
role: item.role === 'slave' ? 'spider_slave' : 'spider_master',
145+
role: item.role,
136146
};
137147
}
138148
},

0 commit comments

Comments
 (0)