mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-25 13:44:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into uptime-badges

Browse source
This commit is contained in:
Louis Lam 2022-05-01 18:01:26 +08:00
parent d962ab7a1c 39aa0a7f07
commit e118d59ac8
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/components/PingChart.vue
View file

@ -24,7 +24,7 @@ import timezone from "dayjs/plugin/timezone";
import utc from "dayjs/plugin/utc";
import { LineChart } from "vue-chart-3";
import { useToast } from "vue-toastification";
import { DOWN } from "../util.ts";
import { DOWN, log } from "../util.ts";
dayjs.extend(utc);
dayjs.extend(timezone);
@ -217,7 +217,9 @@ export default {
watch: {
// Update chart data when the selected chart period changes
chartPeriodHrs: function (newPeriod) {
if (newPeriod === "0") {
// eslint-disable-next-line eqeqeq
if (newPeriod == "0") {
this.heartbeatList = null;
this.$root.storage().removeItem(`chart-period-${this.monitorId}`);
} else {
@ -240,7 +242,11 @@ export default {
// And mirror latest change to this.heartbeatList
this.$watch(() => this.$root.heartbeatList[this.monitorId],
(heartbeatList) => {
if (this.chartPeriodHrs !== "0") {
log.debug("ping_chart", `this.chartPeriodHrs type ${typeof this.chartPeriodHrs}, value: ${this.chartPeriodHrs}`);
// eslint-disable-next-line eqeqeq
if (this.chartPeriodHrs != "0") {
const newBeat = heartbeatList.at(-1);
if (newBeat && dayjs.utc(newBeat.time) > dayjs.utc(this.heartbeatList.at(-1)?.time)) {
this.heartbeatList.push(heartbeatList.at(-1));

2
src/layouts/Layout.vue
View file

@ -71,7 +71,7 @@
</header>
<main>
<router-view v-if="$root.loggedIn || forceShowContent" />
<router-view v-if="$root.loggedIn" />
<Login v-if="! $root.loggedIn && $root.allowLoginDialog" />
</main>

2
src/util.js
View file

@ -102,7 +102,7 @@ class Logger {
}
else if (level === "DEBUG") {
if (exports.isDev) {
console.debug(formattedMessage);
console.log(formattedMessage);
}
}
else {

2
src/util.ts
View file

@ -113,7 +113,7 @@ class Logger {
console.error(formattedMessage);
} else if (level === "DEBUG") {
if (isDev) {
console.debug(formattedMessage);
console.log(formattedMessage);
}
} else {
console.log(formattedMessage);