7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-21 10:25:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.0.X

Browse Source 
# Conflicts:
#	package-lock.json
This commit is contained in:
Louis Lam
2023-08-30 01:39:16 +08:00
parent eec221247f c4e222d1e6
commit a13fc7079e
31 changed files with 403 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/pages/EditMonitor.vue
View File

@@ -82,7 +82,7 @@
<option value="redis">
Redis
</option>
<option value="tailscale-ping">
<option v-if="$root.info.isContainer" value="tailscale-ping">
Tailscale Ping
</option>
</optgroup>
@@ -99,18 +99,6 @@
<input id="name" v-model="monitor.name" type="text" class="form-control" required>
</div>
<!-- Parent Monitor -->
<div class="my-3">
<label for="parent" class="form-label">{{ $t("Monitor Group") }}</label>
<ActionSelect
v-model="monitor.parent"
:options="parentMonitorOptionsList"
:disabled="sortedGroupMonitorList.length === 0 && draftGroupName == null"
:icon="'plus'"
:action="() => $refs.createGroupDialog.show()"
/>
</div>
<!-- URL -->
<div v-if="monitor.type === 'http' || monitor.type === 'keyword' || monitor.type === 'json-query' || monitor.type === 'real-browser' " class="my-3">
<label for="url" class="form-label">{{ $t("URL") }}</label>
@@ -504,6 +492,18 @@
</div>
</template>
<!-- Parent Monitor -->
<div class="my-3">
<label for="parent" class="form-label">{{ $t("Monitor Group") }}</label>
<ActionSelect
v-model="monitor.parent"
:options="parentMonitorOptionsList"
:disabled="sortedGroupMonitorList.length === 0 && draftGroupName == null"
:icon="'plus'"
:action="() => $refs.createGroupDialog.show()"
/>
</div>
<!-- Description -->
<div class="my-3">
<label for="description" class="form-label">{{ $t("Description") }}</label>