@afeefa/vue-app 0.0.323 → 0.0.325

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

@@ -1 +1 @@
-0.0.323
+0.0.325

package/package.json

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

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/AContextMenu.vue

@@ -31,11 +31,12 @@ import { Component, Mixins, Watch } from '@a-vue'
 import { UsesPositionServiceMixin } from '../services/position/UsesPositionServiceMixin'
 import { Positions, PositionConfig } from '../services/PositionService'
 import { randomCssClass } from '../utils/random'
+import { CancelOnEscMixin } from '@a-vue/services/escape/CancelOnEscMixin'
 
 @Component({
   props: ['contentHeight', 'repositionWatchKey', 'triggerIcon', 'customAnchor']
 })
-export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
+export default class AContextMenu extends Mixins(UsesPositionServiceMixin, CancelOnEscMixin) {
   CONTEXT_MENU = true
   menuId = randomCssClass(10)
   nosePosition = 'left'
@@ -91,7 +92,7 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     window.addEventListener('mousedown', this.onClickOutside)
     window.addEventListener('wheel', this.close)
     window.addEventListener('touchmove', this.close)
-    window.addEventListener('keydown', this.close)
+    window.addEventListener('keydown', this.onKeyDown)
 
     const container = this.getContainer()
     container.appendChild(this.popUp)
@@ -100,6 +101,8 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
 
     this.isOpen = true
 
+    this.coe_watchCancel()
+
     this.$emit('open')
   }
 
@@ -109,12 +112,14 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     window.removeEventListener('mousedown', this.onClickOutside)
     window.removeEventListener('wheel', this.close)
     window.removeEventListener('touchmove', this.close)
-    window.removeEventListener('keydown', this.close)
+    window.removeEventListener('keydown', this.onKeyDown)
 
     this.$el.appendChild(this.popUp)
 
     this.isOpen = false
 
+    this.coe_unwatchCancel()
+
     this.$emit('close')
   }
 
@@ -139,6 +144,17 @@ export default class AContextMenu extends Mixins(UsesPositionServiceMixin) {
     return container.querySelector('.' + this.popUpCssClass)
   }
 
+  coe_cancelOnEsc () {
+    this.close()
+    return false // stop esc propagation
+  }
+
+  onKeyDown (e) {
+    if (e.key !== 'Escape') {
+      this.close()
+    }
+  }
+
   onClickOutside (e) {
     const popUp = this.popUp
 

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 || []
   }