mirror of
https://github.com/hi2shark/nazhua.git
synced 2026-01-17 09:40:42 +08:00
fix: 哪吒v1版本的服务器分组是1对多关系,导致排后面的分组过滤服务器异常
This commit is contained in:
parent
31a8c8a50c
commit
5e14207302
@ -163,6 +163,14 @@ const store = createStore({
|
|||||||
if (firstSetServers) {
|
if (firstSetServers) {
|
||||||
firstSetServers = false;
|
firstSetServers = false;
|
||||||
commit('SET_SERVERS', servers);
|
commit('SET_SERVERS', servers);
|
||||||
|
|
||||||
|
// 在v0没抓页面配置的情况下,从服务器列表中分离出标签列表
|
||||||
|
if (config.nazhua.nezhaVersion !== 'v1') {
|
||||||
|
const group = loadNezhaV0ServerGroup(servers);
|
||||||
|
if (group) {
|
||||||
|
commit('SET_SERVER_GROUP', group);
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
commit('UPDATE_SERVERS', servers);
|
commit('UPDATE_SERVERS', servers);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -53,11 +53,11 @@ export const loadServerGroup = (services) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
const tagList = [];
|
const tagList = [];
|
||||||
Object.entries(tagMap).forEach(([tag, serviceIds]) => {
|
Object.entries(tagMap).forEach(([tag, serviceList]) => {
|
||||||
tagList.push({
|
tagList.push({
|
||||||
name: tag,
|
name: tag,
|
||||||
count: serviceIds.length,
|
count: serviceList.length,
|
||||||
servers: serviceIds,
|
servers: serviceList.map((i) => i.ID),
|
||||||
group: {
|
group: {
|
||||||
name: tag,
|
name: tag,
|
||||||
},
|
},
|
||||||
|
|||||||
@ -120,7 +120,8 @@ const onlineOptions = computed(() => {
|
|||||||
const filterServerList = computed(() => serverList.value.filter((i) => {
|
const filterServerList = computed(() => serverList.value.filter((i) => {
|
||||||
const isFilterArr = [];
|
const isFilterArr = [];
|
||||||
if (filterFormData.value.tag) {
|
if (filterFormData.value.tag) {
|
||||||
isFilterArr.push(i.Tag === filterFormData.value.tag);
|
const group = store.state.serverGroup.find((o) => o.name === filterFormData.value.tag);
|
||||||
|
isFilterArr.push((group?.servers || []).includes(i.ID));
|
||||||
}
|
}
|
||||||
if (filterFormData.value.online) {
|
if (filterFormData.value.online) {
|
||||||
isFilterArr.push(i.online === (filterFormData.value.online * 1));
|
isFilterArr.push(i.online === (filterFormData.value.online * 1));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user