@afeefa/vue-app 0.0.224 → 0.0.226

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

@@ -1 +1 @@
-0.0.224
+0.0.226

package/package.json

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

package/src/components/ASelect.vue

@@ -5,6 +5,7 @@
     :items="items_"
     :valueComparator="compareValues"
     :style="cwm_widthStyle"
+    :multiple="multiple"
     v-bind="{...$attrs, dense, outlined}"
     v-on="$listeners"
   />
@@ -17,7 +18,7 @@ import { Model } from '@afeefa/api-resources-client'
 import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
 
 @Component({
-  props: ['validator', 'defaultValue', 'items', {dense: true, outlined: true}]
+  props: ['validator', 'defaultValue', 'items', {dense: true, outlined: true, multiple: false}]
 })
 export default class ASelect extends Mixins(ComponentWidthMixin) {
   items_ = []
@@ -34,7 +35,11 @@ export default class ASelect extends Mixins(ComponentWidthMixin) {
     const setValue = this.select.setValue
     this.select.setValue = value => {
       if (this.select.isClear) {
-        value = this.defaultValue || null
+        if (this.multiple) {
+          value = this.defaultValue || []
+        } else {
+          value = this.defaultValue || null
+        }
       }
       setValue(value)
     }
@@ -98,6 +103,14 @@ export default class ASelect extends Mixins(ComponentWidthMixin) {
 </script>
 
 
+<style lang="scss">
+.v-application .v-select-list .v-list-item__action {
+  margin: 0;
+  margin-right: .5rem;
+}
+
+</style>
+
 <style lang="scss" scoped>
 .v-text-field :deep(.v-input__icon--clear) { // always show clear icon, https://github.com/vuetifyjs/vuetify/pull/15876
   opacity: 1;

package/src/components/list/filters/ListFilterSearchSelect.vue

@@ -74,10 +74,10 @@
 <script>
 import { Component, Mixins } from '@a-vue'
 import { ListFilterMixin } from '../ListFilterMixin'
-import { ListAction } from '@a-vue/api-resources/ApiActions'
+import { ListAction, GetAction } from '@a-vue/api-resources/ApiActions'
 
 @Component({
-  props: ['itemTitle', 'itemValue']
+  props: ['itemTitle', 'itemValue', {selectedKey: 'id'}]
 })
 export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
   $hasOptions = ['icon']
@@ -87,19 +87,17 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
 
   async created () {
     if (this.filter.value) {
-      const {models} = await this.createListAction()
+      const model = await this.createGetAction()
         .params({
-          [this.filter.name]: this.filter.value
+          [this.selectedKey]: this.filter.value
         })
         .load()
 
-      if (models.length) {
+      if (model) {
         if (this.filter.value) {
-          const selectedModel = models.find(m => m.id === this.filter.value)
+          const selectedModel = model
           if (selectedModel) {
             this.inputModel = selectedModel.getTitle()
-          } else {
-            this.inputModel = models[0].getTitle()
           }
         }
       }
@@ -126,6 +124,20 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
     return ListAction.fromRequest(request)
   }
 
+  createGetAction () {
+    const request = this.filter
+      .createOptionsRequest('get')
+
+    const getAction = this.$apiResources.getAction({
+      resourceType: request.getAction().getResource().getType(),
+      actionName: 'get'
+    })
+
+    request.action(getAction)
+
+    return GetAction.fromRequest(request)
+  }
+
   itemSelected (model) {
     if (model) {
       this.filter.value = model.id

package/src/components/list/filters/ListFilterSelect.vue

@@ -5,7 +5,8 @@
     :items="_items"
     itemText="itemTitle"
     itemValue="itemValue"
-    :clearable="filter.hasDefaultValue() && !filter.hasDefaultValueSet()"
+    :multiple="filter.multiple"
+    :clearable="clearable"
     :defaultValue="filter.defaultValue"
     hide-details
     v-bind="$attrs"
@@ -25,6 +26,10 @@ export default class ListFilterSelect extends Mixins(ListFilterMixin) {
   items = null
 
   created () {
+    if (this.filter.multiple && !this.filter.value) {
+      this.filter.value = []
+    }
+
     if (this.filter.hasOptionsRequest()) {
       this.items = this.loadRequestOptions()
     } else if (this.filter.hasOptions()) {
@@ -32,6 +37,18 @@ export default class ListFilterSelect extends Mixins(ListFilterMixin) {
     }
   }
 
+  get clearable () {
+    if (this.multiple) {
+      return !!this.filter.value?.length
+    }
+
+    if (this.filter.hasDefaultValue()) {
+      return !this.filter.hasDefaultValueSet()
+    }
+
+    return !!this.filter.value
+  }
+
   get _items () {
     return this.$attrs.items || this.items || []
   }