@afeefa/vue-app 0.0.73 → 0.0.76

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

@@ -1 +1 @@
-0.0.73
+0.0.76

package/package.json

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

package/src/components/ADialog.vue

@@ -5,8 +5,9 @@
     :contentClass="_dialogId"
     transition="v-fade-transition"
     v-bind="$attrs"
+    persistent
+    no-click-animation
     @click:outside="cancel"
-    @keydown.esc="cancel"
   >
     <template #activator="{ on }">
       <div v-on="on">
@@ -59,11 +60,12 @@ import { DialogEvent } from './dialog/DialogEvent'
 import { PositionConfig } from '../services/PositionService'
 import { UsesPositionServiceMixin } from '../services/position/UsesPositionServiceMixin'
 import { randomCssClass } from '../utils/random'
+import { CancelOnEscMixin } from '@a-vue/services/escape/CancelOnEscMixin'
 
 @Component({
   props: ['id', 'anchor', 'active', 'payload']
 })
-export default class ADialog extends Mixins(UsesPositionServiceMixin) {
+export default class ADialog extends Mixins(UsesPositionServiceMixin, CancelOnEscMixin) {
   dialogId = randomCssClass(10)
 
   title = null
@@ -88,6 +90,11 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin) {
     this.$events.off(DialogEvent.SHOW, this.show)
   }
 
+  coe_cancelOnEsc () {
+    this.cancel()
+    return false // stop esc propagation
+  }
+
   @Watch('dialog')
   dialogChanged () {
     // called without event from activator
@@ -105,6 +112,13 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin) {
 
       this.calledViaEvent = false
     }
+
+    // register for esc
+    if (this.dialog) {
+      this.coe_watchCancel()
+    } else {
+      this.coe_unwatchCancel()
+    }
   }
 
   get _dialogId () {

package/src/components/AModal.vue

@@ -7,10 +7,9 @@
     v-bind="$attrs"
     :contentClass="modalId"
     transition="v-fade-transition"
-    :persistent="true"
-    :no-click-animation="true"
+    persistent
+    no-click-animation
     @click:outside="cancel"
-    @keydown.esc="cancel"
   >
     <template #activator="{ on }">
       <div
@@ -41,11 +40,12 @@ import { UsesPositionServiceMixin } from '@a-vue/services/position/UsesPositionS
 import { randomCssClass } from '../utils/random'
 import { getZIndex } from 'vuetify/lib/util/helpers'
 import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
+import { CancelOnEscMixin } from '@a-vue/services/escape/CancelOnEscMixin'
 
 @Component({
   props: ['show', 'title', 'beforeClose', 'triggerClass', 'anchorPosition']
 })
-export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentWidthMixin) {
+export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentWidthMixin, CancelOnEscMixin) {
   modalId = randomCssClass(10)
 
   modal = false
@@ -79,6 +79,11 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentW
     }
   }
 
+  coe_cancelOnEsc () {
+    this.cancel()
+    return false // stop esc propagation
+  }
+
   /**
    * visiblility changes from outside
    * this will trigger the modal watcher
@@ -107,6 +112,14 @@ export default class ADialog extends Mixins(UsesPositionServiceMixin, ComponentW
     } else {
       this.removeTransientAnchor()
     }
+
+    // register for esc
+    if (this.modal) {
+      this.coe_watchCancel()
+    } else {
+      this.coe_unwatchCancel()
+    }
+
     this.$emit('update:show', this.modal)
   }
 

package/src/components/ATextField.vue

@@ -2,7 +2,6 @@
   <v-text-field
     ref="input"
     :type="type"
-    :appendIcon="appendIcon"
     :autocomplete="autocomplete"
     :rules="validationRules"
     :counter="counter"

package/src/components/form/EditForm.vue

@@ -47,6 +47,8 @@ export default class EditForm extends Vue {
       this.modelToEdit = this.model.cloneForEdit()
     }
     this.lastJson = this.json
+
+    this.$emit('update:modelToEdit', this.modelToEdit)
   }
 
   /**

package/src-admin/components/App.vue

@@ -97,7 +97,7 @@
 
       <v-container
         fluid
-        class="pa-8 pt-2"
+        class="pa-8 pt-0"
       >
         <sticky-header />
 

package/src-admin/components/FlyingContext.vue

@@ -7,14 +7,15 @@
 </template>
 
 <script>
-import { Component, Watch, Vue } from '@a-vue'
+import { Component, Watch, Mixins } from '@a-vue'
 import { FlyingContextEvent } from '@a-vue/events'
 import { randomCssClass } from '@a-vue/utils/random'
+import { CancelOnEscMixin } from '@a-vue/services/escape/CancelOnEscMixin'
 
 @Component({
   props: [{show: false}]
 })
-export default class FlyingContext extends Vue {
+export default class FlyingContext extends Mixins(CancelOnEscMixin) {
   isVisible = false
   contextId = randomCssClass(10)
 
@@ -44,8 +45,10 @@ export default class FlyingContext extends Vue {
     if (this.isVisible) {
       const container = this.getSidebarContainer()
       container.appendChild(el)
+      this.coe_watchCancel() // show context -> watch esc
     } else {
       this.$el.appendChild(el)
+      this.coe_unwatchCancel() // hide context -> do not watch esc any more
     }
   }
 
@@ -62,11 +65,17 @@ export default class FlyingContext extends Vue {
   onHide () {
     if (this.isVisible) {
       this.$el.appendChild(this.getContent())
+      this.coe_unwatchCancel() // hide context -> do not watch esc any more
       this.isVisible = false
       this.$emit('hide')
     }
   }
 
+  coe_cancelOnEsc () {
+    this.onHide()
+    return false // stop esc propagation
+  }
+
   getContent () {
     return document.querySelector('.' + this.contextId)
   }

package/src-admin/components/FlyingContextContainer.vue

@@ -27,6 +27,7 @@
 <script>
 import { Component, Vue } from '@a-vue'
 import { FlyingContextEvent } from '@a-vue/events'
+import { getZIndex } from 'vuetify/lib/util/helpers'
 
 @Component({
   props: []
@@ -66,6 +67,12 @@ export default class FlyingContextContainer extends Vue {
       parent = parent.parentElement
     }
 
+    // popup clicked
+    const targetIndex = getZIndex(e.target)
+    if (targetIndex > 200) {
+      return
+    }
+
     // check if flying context ist clicked
     if (!this.$el.contains(e.target)) {
       this.hide()

package/src-admin/components/StickyHeader.vue

@@ -57,7 +57,7 @@ export default class StickyHeader extends Vue {
 #stickyHeader {
   position: sticky;
   top: -1px;
-  margin: -1rem -2rem 2rem;
+  margin: 0 -2rem 2rem;
   padding: 1rem 2rem;
 
   &:not(.visible) {

package/src-admin/components/detail/DetailMeta.vue

@@ -8,5 +8,6 @@
 <style lang="scss" scoped>
 .detailMeta {
   color: gray;
+  font-size: .9rem;
 }
 </style>

package/src-admin/components/list/ListView.vue

@@ -33,7 +33,7 @@
             v-for="model in models_"
             :key="model.id"
             v-flying-context-trigger="hasFlyingContext"
-            :class="{selectable: hasFlyingContext}"
+            :class="getRowClasses(model)"
             v-bind="getRowAttributes(model)"
             v-on="getRowListeners(model)"
             @click="emitFlyingContext(model)"
@@ -82,7 +82,7 @@ import { ListViewMixin } from '@a-vue/components/list/ListViewMixin'
 import { LoadingEvent } from '@a-vue/events'
 
 @Component({
-  props: ['rowAttributes', 'rowListeners']
+  props: ['rowAttributes', 'rowClasses', 'rowListeners']
 })
 export default class ListView extends Mixins(ListViewMixin) {
   $hasOptions = ['icon']
@@ -103,7 +103,37 @@ export default class ListView extends Mixins(ListViewMixin) {
     if (typeof this.rowAttributes === 'function') {
       return this.rowAttributes(model)
     }
-    return this.rowAttributes
+    return this.rowAttributes || {}
+  }
+
+  getRowClasses (model) {
+    let classes
+
+    if (typeof this.rowClasses === 'function') {
+      classes = this.rowClasses(model)
+    } else {
+      classes = this.rowClasses || {}
+    }
+
+    if (Array.isArray(classes)) { // ['a', {b: true/false}, 'c']
+      classes = classes.reduce((ac, a) => {
+        if (typeof a === 'object') { // {className: true/false}
+          return {...ac, ...a}
+        }
+        return {...ac, [a]: true} // 'className'
+      }, {})
+    } else if (typeof classes === 'string') { // 'a b c'
+      classes = {
+        [classes]: true
+      }
+    } // else { a: true, b: true, c: true }
+
+    classes = {
+      selectable: this.hasFlyingContext,
+      ...classes
+    }
+
+    return classes
   }
 
   getRowListeners (model) {
@@ -116,7 +146,7 @@ export default class ListView extends Mixins(ListViewMixin) {
 
   emitFlyingContext (model) {
     if (window.getSelection().toString()) { // do not open if text selected
-      console.log(window.getSelection().toString())
+      // console.log(window.getSelection().toString())
       return
     }
     this.$emit('flyingContext', model)

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

@@ -6,6 +6,7 @@
       ref="form"
       :model="model"
       :createModelToEdit="createModelToEdit"
+      v-on="$listeners"
     >
       <template #form="{modelToEdit, model, changed, valid}">
         <slot

package/src-admin/config/vuetify.js

@@ -18,7 +18,8 @@ import {
   mdiPencil,
   mdiPlus,
   mdiPrinter,
-  mdiThumbUpOutline
+  mdiThumbUpOutline,
+  mdiCurrencyEur
 } from '@mdi/js'
 import Vue from 'vue'
 import Vuetify from 'vuetify/lib'
@@ -48,7 +49,8 @@ export default new Vuetify({
       arrowLeftIcon: mdiArrowLeft,
       caretDownIcon: mdiMenuDown,
       caretUpIcon: mdiMenuUp,
-      printerIcon: mdiPrinter
+      printerIcon: mdiPrinter,
+      euroSymbol: mdiCurrencyEur
     }
   },
   breakpoint: {