aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPitu <[email protected]>2021-06-20 21:53:09 +0900
committerPitu <[email protected]>2021-06-20 21:53:09 +0900
commitc416e2a0bf722b5576b1356984b82cb6b7f4070a (patch)
treec227a17e3c2ae37f9bf0af6b140e88618ff51e66
parentfix: be able to delete tags (diff)
downloadhost.fuwn.me-c416e2a0bf722b5576b1356984b82cb6b7f4070a.tar.xz
host.fuwn.me-c416e2a0bf722b5576b1356984b82cb6b7f4070a.zip
feat: show field notes if any
-rw-r--r--src/site/components/settings/JoiObject.vue14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/site/components/settings/JoiObject.vue b/src/site/components/settings/JoiObject.vue
index 8d3a803..99e832f 100644
--- a/src/site/components/settings/JoiObject.vue
+++ b/src/site/components/settings/JoiObject.vue
@@ -3,7 +3,7 @@
<div v-for="[key, field] in Object.entries(settings)" :key="key">
<b-field
:label="field.flags.label"
- :message="getErrorMessage(key) || field.flags.description"
+ :message="getErrorMessage(key) || field | getMessage"
:type="getValidationType(key)"
class="field"
horizontal>
@@ -53,6 +53,15 @@
<script>
export default {
name: 'JoiObject',
+ filters: {
+ getMessage: function(field) {
+ let msg = field.flags.description;
+ if (field.notes?.length) {
+ msg += field.notes.map(note => `\n${note}`);
+ }
+ return msg;
+ }
+ },
props: {
settings: {
type: Object,
@@ -128,7 +137,8 @@ export default {
.field {
margin-bottom: 1em;
- ::v-deep .help.is-danger {
+ ::v-deep .help {
+ font-size: 12px;
white-space: pre-line;
}
}