@afeefa/vue-app 0.0.324 → 0.0.326

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.324
+0.0.326

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.324",
+  "version": "0.0.326",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/AAlert.vue

@@ -14,7 +14,7 @@
     </v-icon>
 
     <div>
-      <h3>{{ _headline }}</h3>
+      <h3>{{ headline }}</h3>
 
       <div v-html="message" />
 
@@ -55,13 +55,6 @@ export default class AAlert extends Vue {
     window.addEventListener('mouseup', this.onMouseDown)
   }
 
-  get _headline () {
-    if (this.headline) {
-      return this.headline
-    }
-    return this.error ? 'Ein Fehler ist aufgetreten.' : 'Alles super!'
-  }
-
   onError (alertEvent) {
     this.success = false
     this.error = true
@@ -75,6 +68,14 @@ export default class AAlert extends Vue {
   }
 
   show (alert) {
+    if (!alert.headline) {
+      const messages = this.error
+        ? ['Ein Fehler ist aufgetreten', 'Da stimmt was nicht', 'Leider nicht geklappt', 'Da hakt es', 'Hoppla', 'Etwas ist schiefgelaufen', 'Das hat nicht funktioniert', 'Da klemmt etwas', 'Unerwartetes Hindernis', 'Kritischer Fehler #983-45§.v2)= ;-)', 'Kann mal passieren', 'Die Technik wieder']
+        : ['Erledigt!', 'Einwandfrei', 'Passt!', 'Wunderbar', 'Alles klar', 'Daten sicher verstaut', 'Tipptopp', 'Reibungslos', 'Bestens', 'Hat geklappt', 'Super', 'Totalgenial']
+      const index = Math.floor(Math.random() * messages.length)
+      alert.headline = messages[index]
+    }
+
     this.headline = alert.headline
     this.message = alert.message
     this.detail = alert.detail

package/src/components/ACheckboxGroup.vue

@@ -10,7 +10,7 @@
     >
       <a-checkbox
         v-for="option in options_"
-        :key="option.itemValue"
+        :key="optionKey(option.itemValue)"
         :label="option.itemText"
         :value="isChecked(option.itemValue)"
         hide-details
@@ -58,20 +58,26 @@ export default class ACheckboxGroup extends Vue {
     this.init()
   }
 
+  optionKey (value) {
+    return value && value.id !== undefined ? value.id : value
+  }
+
   checked (key, value) {
     if (value) {
       if (!this.isChecked(key)) {
         this.value_.push(key)
       }
     } else {
-      this.value_ = this.value_.filter(v => v !== key)
+      const keyId = this.optionKey(key)
+      this.value_ = this.value_.filter(v => this.optionKey(v) !== keyId)
     }
     this.$emit('input', this.value_)
     this.validate()
   }
 
   isChecked (key) {
-    return this.value_.includes(key)
+    const keyId = this.optionKey(key)
+    return this.value_.some(v => this.optionKey(v) === keyId)
   }
 
   @Watch('options')

package/src/components/form/FormFieldMixin.js

@@ -66,13 +66,11 @@ export class FormFieldMixin extends Vue {
 
       const options = []
 
-      if (!this.validator || !this.validator.getParam('filled')) {
-        if (!this.$attrs.hasOwnProperty('multiple')) { // don't offer 'keine auswahl' on multiselects
-          options.push({
-            itemText: 'Keine Auswahl',
-            itemValue: null
-          })
-        }
+      if (this._addNullOption && (!this.validator || !this.validator.getParam('filled'))) {
+        options.push({
+          itemText: 'Keine Auswahl',
+          itemValue: null
+        })
       }
 
       return [
@@ -113,6 +111,10 @@ export class FormFieldMixin extends Vue {
     }
   }
 
+  get _addNullOption () {
+    return !('multiple' in this.$attrs)
+  }
+
   get validator () {
     const validator = this.customValidator || this.field.getValidator()
     if (this.additionalRules) {

package/src/components/form/fields/FormFieldCheckboxGroup.vue

@@ -1,7 +1,7 @@
 <template>
   <a-checkbox-group
     v-model="model[name]"
-    :label="label || name"
+    :label="label"
     :options="_options"
     :validator="validator"
     v-bind="$attrs"
@@ -23,6 +23,10 @@ export default class FormFieldCheckboxGroup extends Mixins(FormFieldMixin) {
     }
   }
 
+  get _addNullOption () {
+    return false
+  }
+
   get _options () {
     return this.$attrs.options || this.options || []
   }