@afeefa/vue-app 0.0.77 → 0.0.80

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

@@ -1 +1 @@
-0.0.77
+0.0.80

package/package.json

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

package/src/components/ADialog.vue

@@ -23,10 +23,24 @@
         {{ title }}
       </v-card-title>
 
-      <v-card-text v-if="message">
+      <v-card-text
+        v-if="message"
+      >
         <span v-html="message" />
       </v-card-text>
 
+      <v-card-text
+        v-if="info"
+        class="dialogInfo"
+      >
+        <v-alert
+          dense
+          type="info"
+        >
+          {{ info }}
+        </v-alert>
+      </v-card-text>
+
       <v-card-text v-if="$slots.default">
         <slot :props="props" />
       </v-card-text>
@@ -70,6 +84,7 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, CancelOnEs
 
   title = null
   message = null
+  info = null
   yesButton = null
   yesColor = null
   cancelButton = null
@@ -103,6 +118,7 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, CancelOnEs
 
       this.title = this.payload.title
       this.message = this.payload.message
+      this.info = this.payload.info
       this.yesButton = this.payload.yesButton
       this.yesColor = this.payload.yesColor
       this.cancelButton = this.payload.cancelButton
@@ -178,6 +194,7 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, CancelOnEs
 
     this.title = dialogEvent.payload.title
     this.message = dialogEvent.payload.message
+    this.info = dialogEvent.payload.info
     this.yesButton = dialogEvent.payload.yesButton
     this.yesColor = dialogEvent.payload.yesColor
     this.cancelButton = dialogEvent.payload.cancelButton
@@ -234,4 +251,9 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, CancelOnEs
     }
   }
 }
+
+.dialogInfo {
+  padding-top: 0 !important;
+  padding-bottom: 0 !important;
+}
 </style>

package/src/components/form/EditForm.vue

@@ -9,6 +9,7 @@
       :valid="valid"
       :modelToEdit="modelToEdit"
       :model="model"
+      :getField="getField"
     />
   </v-form>
 </template>
@@ -35,6 +36,15 @@ export default class EditForm extends Vue {
     this.reset()
   }
 
+  getField = name => {
+    const modelType = this.$apiResources.getType(this.model.type)
+    const update = !!this.model.id
+    const fields = update
+      ? modelType.getUpdateFields()
+      : modelType.getCreateFields()
+    return fields[name]
+  }
+
   forceUnchanged () {
     this.forcedUnchange = true
     this.$emit('update:changed', false)

package/src/components/form/FormFieldMixin.js

@@ -69,7 +69,18 @@ export class FormFieldMixin extends Vue {
     }
 
     if (field.hasOptions()) {
-      const options = field.getOptions()
+      let options = field.getOptions()
+
+      if (!Array.isArray(options)) {
+        options = Object.entries(options).map(([key, title]) => {
+          return {
+            itemText: title,
+            itemValue: key
+          }
+        })
+        return options
+      }
+
       return options.map((value, index) => {
         if (typeof value === 'object') { // object option
           return {

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

@@ -41,7 +41,7 @@ import { DialogEvent } from '@a-vue/events'
 import { randomCssClass } from '@a-vue/utils/random'
 
 @Component({
-  props: ['title', 'itemTitle', 'protect']
+  props: ['title', 'message', 'info', 'itemTitle', 'protect']
 })
 export default class EditPage extends Vue {
   dialogId = randomCssClass(10)
@@ -56,7 +56,8 @@ export default class EditPage extends Vue {
     const result = await this.$events.dispatch(new DialogEvent(DialogEvent.SHOW, {
       id: this.dialogId,
       title: this.itemTitle + ' löschen?',
-      message: 'Soll ' + this.itemTitle + ' gelöscht werden?',
+      message: ['Soll ' + this.itemTitle + ' gelöscht werden?', this.message].filter(m => m).join('<br><br>'),
+      info: this.info,
       yesButton: 'Löschen',
       yesColor: 'red white--text'
     }))

package/src-admin/components/pages/EditPage.vue

@@ -8,11 +8,12 @@
       :createModelToEdit="createModelToEdit"
       v-on="$listeners"
     >
-      <template #form="{modelToEdit, model, changed, valid}">
+      <template #form="{modelToEdit, model, getField, changed, valid}">
         <slot
           name="form"
           :modelToEdit="modelToEdit"
           :model="model"
+          :getField="getField"
           :changed="changed"
           :valid="valid"
         />