TyleoDvDelaware3217/Kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-05-22 14:52:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bug fix

Browse source
This commit is contained in:
Marshu 2025-04-13 18:43:41 +08:00
parent fee7666c0f
commit 436ac1b2ca
1 changed files with 65 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
src/components/PublicGroupList.vue
View file

@ -426,7 +426,8 @@ export default {
const settings = JSON.parse(savedSettings); const settings = JSON.parse(savedSettings);
return { return {
key: settings.key, key: settings.key,
direction: settings.direction direction: settings.direction,
useOwnSort: settings.useOwnSort
}; };
} }
} catch (error) { } catch (error) {
@ -466,6 +467,9 @@ export default {
// Apply saved settings if found // Apply saved settings if found
group.sortKey = savedSettings.key; group.sortKey = savedSettings.key;
group.sortDirection = savedSettings.direction; group.sortDirection = savedSettings.direction;
// Restore independent sort flag from localStorage
group.useOwnSort = savedSettings.useOwnSort === undefined ? false : savedSettings.useOwnSort;
} else { } else {
// Use default settings otherwise // Use default settings otherwise
if (group.sortKey === undefined) { if (group.sortKey === undefined) {
@ -474,6 +478,7 @@ export default {
if (group.sortDirection === undefined) { if (group.sortDirection === undefined) {
group.sortDirection = 'desc'; group.sortDirection = 'desc';
} }
group.useOwnSort = false;
} }
// Apply initial sort when the component is created // Apply initial sort when the component is created
@ -504,10 +509,13 @@ export default {
// Apply saved settings if found // Apply saved settings if found
group.sortKey = savedSettings.key; group.sortKey = savedSettings.key;
group.sortDirection = savedSettings.direction; group.sortDirection = savedSettings.direction;
// Restore independent sort flag from localStorage
group.useOwnSort = savedSettings.useOwnSort === undefined ? false : savedSettings.useOwnSort;
} else { } else {
// Use default settings otherwise // Use default settings otherwise
group.sortKey = 'status'; group.sortKey = 'status';
group.sortDirection = 'desc'; group.sortDirection = 'desc';
group.useOwnSort = false;
} }
// Apply sort to newly added group // Apply sort to newly added group
@ -655,31 +663,26 @@ export default {
group.sortDirection = (key === 'status') ? 'desc' : 'asc'; group.sortDirection = (key === 'status') ? 'desc' : 'asc';
} }
// Set independent sort flag for current group when clicking on its sort buttons
group.useOwnSort = true;
// Save sort settings to localStorage // Save sort settings to localStorage
try { try {
// Get a unique identifier for the group, use name if id is not available // Get a unique identifier for the group, use name if id is not available
const groupId = group.id || group.name || 'Default Group'; const groupId = group.id || group.name || 'Default Group';
const storageKey = `uptime-kuma-sort-${this.slug}-${groupId}`; const storageKey = `uptime-kuma-sort-${this.slug}-${groupId}`;
// Save sort settings // Save sort settings with the useOwnSort flag
const sortSettings = { const sortSettings = {
key: group.sortKey, key: group.sortKey,
direction: group.sortDirection direction: group.sortDirection,
useOwnSort: group.useOwnSort
}; };
localStorage.setItem(storageKey, JSON.stringify(sortSettings)); localStorage.setItem(storageKey, JSON.stringify(sortSettings));
} catch (error) { } catch (error) {
console.error('Cannot save sort settings', error); console.error('Cannot save sort settings', error);
} }
// If global sort is active, we need to temporarily disable it to apply group's sort
const wasGlobalSortActive = this.isGlobalSortActive;
// Temporarily disable global sort
if (wasGlobalSortActive) {
// Set independent sort flag for current group
group.useOwnSort = true;
}
// Apply sort to this group // Apply sort to this group
this.applySortToGroup(group); this.applySortToGroup(group);
}, },
@ -851,16 +854,31 @@ export default {
toggleGlobalSort() { toggleGlobalSort() {
this.isGlobalSortActive = !this.isGlobalSortActive; this.isGlobalSortActive = !this.isGlobalSortActive;
// Reset all groups' independent sort flags when toggling global sort state // Reset all groups' independent sort flags and save their status to localStorage
if (this.$root && this.$root.publicGroupList) { if (this.$root && this.$root.publicGroupList) {
this.$root.publicGroupList.forEach(group => { this.$root.publicGroupList.forEach(group => {
if (group) { if (group) {
// When toggling global sort, reset all group's independent sort flags
group.useOwnSort = false; group.useOwnSort = false;
// Save the updated status to localStorage for each group
try {
const groupId = group.id || group.name || 'Default Group';
const groupStorageKey = `uptime-kuma-sort-${this.slug}-${groupId}`;
const groupSortSettings = {
key: group.sortKey,
direction: group.sortDirection,
useOwnSort: false
};
localStorage.setItem(groupStorageKey, JSON.stringify(groupSortSettings));
} catch (error) {
console.error('Cannot save group sort settings', error);
}
} }
}); });
} }
// Save settings // Save global sort toggle state
try { try {
const storageKey = `uptime-kuma-global-sort-${this.slug}`; const storageKey = `uptime-kuma-global-sort-${this.slug}`;
const globalSortSettings = { const globalSortSettings = {
@ -904,11 +922,26 @@ export default {
// Activate global sort // Activate global sort
this.isGlobalSortActive = true; this.isGlobalSortActive = true;
// Clear all groups' independent sort flags // Clear all groups' independent sort flags and save each group's settings
if (this.$root && this.$root.publicGroupList) { if (this.$root && this.$root.publicGroupList) {
this.$root.publicGroupList.forEach(group => { this.$root.publicGroupList.forEach(group => {
if (group) { if (group) {
// Set useOwnSort to false for all groups
group.useOwnSort = false; group.useOwnSort = false;
// Save the group's sort settings with useOwnSort=false to localStorage
try {
const groupId = group.id || group.name || 'Default Group';
const groupStorageKey = `uptime-kuma-sort-${this.slug}-${groupId}`;
const groupSortSettings = {
key: group.sortKey,
direction: group.sortDirection,
useOwnSort: false
};
localStorage.setItem(groupStorageKey, JSON.stringify(groupSortSettings));
} catch (error) {
console.error('Cannot save group sort settings', error);
}
} }
}); });
} }
@ -938,16 +971,31 @@ export default {
disableGlobalSort() { disableGlobalSort() {
this.isGlobalSortActive = false; this.isGlobalSortActive = false;
// Clear all groups' independent sort flags // Save the updated useOwnSort=false status for all groups
if (this.$root && this.$root.publicGroupList) { if (this.$root && this.$root.publicGroupList) {
this.$root.publicGroupList.forEach(group => { this.$root.publicGroupList.forEach(group => {
if (group) { if (group) {
// Mark all groups as not using independent sort when global sort is disabled
group.useOwnSort = false; group.useOwnSort = false;
// Save the updated status to localStorage
try {
const groupId = group.id || group.name || 'Default Group';
const groupStorageKey = `uptime-kuma-sort-${this.slug}-${groupId}`;
const groupSortSettings = {
key: group.sortKey,
direction: group.sortDirection,
useOwnSort: false
};
localStorage.setItem(groupStorageKey, JSON.stringify(groupSortSettings));
} catch (error) {
console.error('Cannot save group sort settings', error);
}
} }
}); });
} }
// Save settings // Save global sort settings with active=false
try { try {
const storageKey = `uptime-kuma-global-sort-${this.slug}`; const storageKey = `uptime-kuma-global-sort-${this.slug}`;
const globalSortSettings = { const globalSortSettings = {