@afeefa/vue-app 0.0.258 → 0.0.261

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

@@ -1 +1 @@
-0.0.258
+0.0.261

package/package.json

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

package/src/components/form/EditModal.vue

@@ -53,6 +53,7 @@
             :changed="changed || forceChanged"
             :forceActive="forceActive"
             :valid="validFromOutside && valid"
+            :saveTitle="saveTitle"
             angular
             :has="{reset: reset && !!modelToEdit.id}"
             @save="$emit('save', modelToEdit, ignoreChangesOnClose, close)"
@@ -72,7 +73,7 @@ import { Component, Vue, Watch } from '@a-vue'
 import { DialogEvent } from '@a-vue/events'
 
 @Component({
-  props: ['model', 'createModelToEdit', 'show', {deleteButton: false, reset: true, valid: true, forceChanged: false, forceActive: false}]
+  props: ['model', 'createModelToEdit', 'show', {deleteButton: false, reset: true, valid: true, forceChanged: false, forceActive: false, saveTitle: 'Speichern'}]
 })
 export default class EditModal extends Vue {
   show_ = false

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

@@ -85,7 +85,7 @@ import { ListAction, GetAction } from '@a-vue/api-resources/ApiActions'
 import { Category } from '@/models'
 
 @Component({
-  props: ['itemTitle', 'itemValue', {
+  props: ['itemTitle', 'itemValue', 'optionRequestFilters', {
     selectedKey: 'id',
     getTitle: {type: Function, default: m => m.getTitle()},
     getSubtitle: {type: Function, default: m => m.getSubtitle()},
@@ -145,6 +145,7 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
   createListAction () {
     const request = this.filter
       .createOptionsRequest()
+      .addFilters(this.optionRequestFilters || {})
     return ListAction.fromRequest(request)
   }
 

package/src-admin/components/app/AppBarTitle.vue

@@ -60,13 +60,13 @@ export default class appBarTitle extends Vue {
   }
 
   getLastNamedRoute () {
-    const currentRouteName = this.$route.name
+    const currentRoutePath = this.$route.path
     const historyStack = routeConfigPlugin.getRouteHistory()
 
     // Durchlaufe die Historie rückwärts, um die letzte benannte Route zu finden, die sich vom aktuellen Namen unterscheidet
     for (let i = historyStack.length - 2; i >= 0; i--) {
       const route = historyStack[i]
-      if (route.name && route.name !== currentRouteName) {
+      if (route.path && route.path !== currentRoutePath) {
         return {
           route,
           index: i

package/src-admin/components/controls/SearchSelectNavigator.vue

@@ -15,7 +15,6 @@
         ref="input"
         readonly
         :label="label"
-        :rules="validationRules"
         placeholder="Mausklick oder Space/↓-Taste zum Auswählen"
         :clearable="false"
         appendIcon="$dropdown"
@@ -82,8 +81,6 @@ import { ListAction } from '@a-vue/api-resources/ApiActions'
     'modelType',
     'label',
     'fields',
-    'customValidator',
-    'additionalRules',
     {
       getTitle: {type: Function, default: m => m.getTitle()},
       getSubtitle: {type: Function, default: m => m.getSubtitle()}
@@ -92,12 +89,6 @@ import { ListAction } from '@a-vue/api-resources/ApiActions'
 export default class SearchSelectNavigator extends Vue {
   $hasOptions = ['icon']
 
-  mounted () {
-    if (this.validator) {
-      this.$refs.input.validate()
-    }
-  }
-
   calculateSelectorSize () {
     const input = this.$refs.input.$el
     const inputWidth = input.offsetWidth
@@ -121,19 +112,6 @@ export default class SearchSelectNavigator extends Vue {
   focusInput () {
     this.$refs.input.setFocus(true)
   }
-
-  get validator () {
-    const validator = this.customValidator
-    if (this.additionalRules) {
-      validator.setAdditionalRules(this.additionalRules)
-    }
-    return validator
-  }
-
-  get validationRules () {
-    const label = this.label
-    return (this.validator && this.validator.getRules(label)) || []
-  }
 }
 </script>
 

package/src-admin/components/form/EditFormButtons.vue

@@ -11,7 +11,7 @@
             small
             :disabled="disabled"
             color="green white--text"
-            title="Speichern"
+            :title="saveTitle"
             @click="$emit('save')"
           >
             <v-icon
@@ -22,7 +22,7 @@
             </v-icon>
 
             <template v-if="angular">
-              Speichern
+              {{ saveTitle }}
             </template>
           </v-btn>
         </div>
@@ -30,10 +30,10 @@
 
       <span v-if="disabled">
         <template v-if="!valid">
-          Daten berichtigen,<br>um zu speichern
+          Daten berichtigen,<br>um zu {{ saveTitle.toLowerCase() }}
         </template>
         <template v-else>
-          Daten ändern,<br>um zu speichern
+          Daten ändern,<br>um zu {{ saveTitle.toLowerCase() }}
         </template>
       </span>
     </v-tooltip>
@@ -64,7 +64,12 @@ import { mdiRotateLeft} from '@mdi/js'
   props: [
     'changed',
     'valid',
-    {angular: false, small: false, forceActive: false}
+    {
+      angular: false,
+      small: false,
+      forceActive: false,
+      saveTitle: 'Speichern'
+    }
   ]
 })
 export default class EditFormButtons extends Vue {