@afeefa/vue-app 0.0.117 → 0.0.118

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

@@ -1 +1 @@
-0.0.117
+0.0.118

package/package.json

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

package/src/components/ARow.vue

@@ -1,7 +1,7 @@
 <template>
   <div
+    :style="cwm_widthStyle + ' ' + displayStyle"
     :class="['a-row', directionClass, gapClass, classes]"
-    :style="cwm_widthStyle"
   >
     <slot />
   </div>
@@ -14,7 +14,7 @@ import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
 
 @Component({
   props: [
-    { vertical: false },
+    { vertical: false, inline: false },
     'gap'
   ]
 })
@@ -27,6 +27,10 @@ export default class ARow extends Mixins(ComponentWidthMixin) {
     return classes
   }
 
+  get displayStyle () {
+    return 'display: ' + (this.inline ? 'inline-flex' : 'flex') + ';'
+  }
+
   get gapClass () {
     if (this.gap) {
       return 'gap-' + this.gap
@@ -44,7 +48,6 @@ export default class ARow extends Mixins(ComponentWidthMixin) {
 
 <style scoped lang="scss">
 .a-row {
-  display: flex;
   align-items: center;
 
   &.vertical {

package/src/components/form/FormFieldMixin.js

@@ -62,10 +62,22 @@ export class FormFieldMixin extends Vue {
         .fromRequest(request)
         .load()
 
-      return models.map(model => ({
-        itemText: model.getTitle(),
-        itemValue: model
-      }))
+      const options = []
+
+      if (!this.validator || !this.validator.getParams().filled) {
+        options.push({
+          itemText: 'Keine Auswahl',
+          itemValue: null
+        })
+      }
+
+      return [
+        ...options,
+        ...models.map(model => ({
+          itemText: model.getTitle(),
+          itemValue: model
+        }))
+      ]
     }
 
     if (field.hasOptions()) {

package/src-admin/components/App.vue

@@ -63,7 +63,7 @@
               </div>
             </div>
 
-            <a-context-menu>
+            <a-context-menu v-if="$has.settings">
               <a-context-menu-item
                 :to="{name: 'settings', params: {accountId: account.id}}"
               >
@@ -144,6 +144,8 @@ import '../styles.scss'
   }
 })
 export default class App extends Vue {
+  $hasOptions = ['settings']
+
   drawer = true
   isLoading = false