7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-22 14:42:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into import-export

Browse Source
This commit is contained in:
Ponkhy
2021-09-07 14:12:53 +02:00
committed by GitHub
parent 8f9a973ede f842fb409e
commit 242e494cb5
36 changed files with 1219 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mixins/socket.js
View File

@@ -107,8 +107,8 @@ export default {
}
});
socket.on("heartbeatList", (monitorID, data) => {
if (! (monitorID in this.heartbeatList)) {
socket.on("heartbeatList", (monitorID, data, overwrite = false) => {
if (! (monitorID in this.heartbeatList) || overwrite) {
this.heartbeatList[monitorID] = data;
} else {
this.heartbeatList[monitorID] = data.concat(this.heartbeatList[monitorID])
@@ -127,8 +127,8 @@ export default {
this.certInfoList[monitorID] = JSON.parse(data)
});
socket.on("importantHeartbeatList", (monitorID, data) => {
if (! (monitorID in this.importantHeartbeatList)) {
socket.on("importantHeartbeatList", (monitorID, data, overwrite) => {
if (! (monitorID in this.importantHeartbeatList) || overwrite) {
this.importantHeartbeatList[monitorID] = data;
} else {
this.importantHeartbeatList[monitorID] = data.concat(this.importantHeartbeatList[monitorID])
@@ -257,6 +257,18 @@ export default {
uploadBackup(uploadedJSON, callback) {
socket.emit("uploadBackup", uploadedJSON, callback)
},
clearEvents(monitorID, callback) {
socket.emit("clearEvents", monitorID, callback)
},
clearHeartbeats(monitorID, callback) {
socket.emit("clearHeartbeats", monitorID, callback)
},
clearStatistics(callback) {
socket.emit("clearStatistics", callback)
},
},
computed: {

2
src/mixins/theme.js
View File

@@ -11,7 +11,7 @@ export default {
mounted() {
// Default Light
if (! this.userTheme) {
this.userTheme = "light";
this.userTheme = "auto";
}
// Default Heartbeat Bar