@afeefa/vue-app 0.0.72 → 0.0.75

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +1 @@
1
- 0.0.72
1
+ 0.0.75
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@afeefa/vue-app",
3
- "version": "0.0.72",
3
+ "version": "0.0.75",
4
4
  "description": "",
5
5
  "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
6
6
  "license": "MIT",
@@ -41,6 +41,7 @@ export default class APagination extends Vue {
41
41
  margin: 0;
42
42
  width: 28px;
43
43
  height: 28px;
44
+ white-space: nowrap;
44
45
  }
45
46
  }
46
47
  </style>
@@ -2,7 +2,6 @@
2
2
  <v-text-field
3
3
  ref="input"
4
4
  :type="type"
5
- :appendIcon="appendIcon"
6
5
  :autocomplete="autocomplete"
7
6
  :rules="validationRules"
8
7
  :counter="counter"
@@ -47,6 +47,8 @@ export default class EditForm extends Vue {
47
47
  this.modelToEdit = this.model.cloneForEdit()
48
48
  }
49
49
  this.lastJson = this.json
50
+
51
+ this.$emit('update:modelToEdit', this.modelToEdit)
50
52
  }
51
53
 
52
54
  /**
@@ -27,6 +27,7 @@
27
27
  <script>
28
28
  import { Component, Vue } from '@a-vue'
29
29
  import { FlyingContextEvent } from '@a-vue/events'
30
+ import { getZIndex } from 'vuetify/lib/util/helpers'
30
31
 
31
32
  @Component({
32
33
  props: []
@@ -66,6 +67,12 @@ export default class FlyingContextContainer extends Vue {
66
67
  parent = parent.parentElement
67
68
  }
68
69
 
70
+ // popup clicked
71
+ const targetIndex = getZIndex(e.target)
72
+ if (targetIndex > 200) {
73
+ return
74
+ }
75
+
69
76
  // check if flying context ist clicked
70
77
  if (!this.$el.contains(e.target)) {
71
78
  this.hide()
@@ -83,7 +83,7 @@ h3 {
83
83
 
84
84
  h2 {
85
85
  font-size: 1.5rem;
86
- line-height: 1.5rem;
86
+ line-height: 1.7rem;
87
87
 
88
88
  white-space: nowrap;
89
89
  overflow: hidden;
@@ -8,5 +8,6 @@
8
8
  <style lang="scss" scoped>
9
9
  .detailMeta {
10
10
  color: gray;
11
+ font-size: .9rem;
11
12
  }
12
13
  </style>
@@ -33,7 +33,7 @@
33
33
  v-for="model in models_"
34
34
  :key="model.id"
35
35
  v-flying-context-trigger="hasFlyingContext"
36
- :class="{selectable: hasFlyingContext}"
36
+ :class="getRowClasses(model)"
37
37
  v-bind="getRowAttributes(model)"
38
38
  v-on="getRowListeners(model)"
39
39
  @click="emitFlyingContext(model)"
@@ -82,7 +82,7 @@ import { ListViewMixin } from '@a-vue/components/list/ListViewMixin'
82
82
  import { LoadingEvent } from '@a-vue/events'
83
83
 
84
84
  @Component({
85
- props: ['rowAttributes', 'rowListeners']
85
+ props: ['rowAttributes', 'rowClasses', 'rowListeners']
86
86
  })
87
87
  export default class ListView extends Mixins(ListViewMixin) {
88
88
  $hasOptions = ['icon']
@@ -103,7 +103,37 @@ export default class ListView extends Mixins(ListViewMixin) {
103
103
  if (typeof this.rowAttributes === 'function') {
104
104
  return this.rowAttributes(model)
105
105
  }
106
- return this.rowAttributes
106
+ return this.rowAttributes || {}
107
+ }
108
+
109
+ getRowClasses (model) {
110
+ let classes
111
+
112
+ if (typeof this.rowClasses === 'function') {
113
+ classes = this.rowClasses(model)
114
+ } else {
115
+ classes = this.rowClasses || {}
116
+ }
117
+
118
+ if (Array.isArray(classes)) { // ['a', {b: true/false}, 'c']
119
+ classes = classes.reduce((ac, a) => {
120
+ if (typeof a === 'object') { // {className: true/false}
121
+ return {...ac, ...a}
122
+ }
123
+ return {...ac, [a]: true} // 'className'
124
+ }, {})
125
+ } else if (typeof classes === 'string') { // 'a b c'
126
+ classes = {
127
+ [classes]: true
128
+ }
129
+ } // else { a: true, b: true, c: true }
130
+
131
+ classes = {
132
+ selectable: this.hasFlyingContext,
133
+ ...classes
134
+ }
135
+
136
+ return classes
107
137
  }
108
138
 
109
139
  getRowListeners (model) {
@@ -116,7 +146,7 @@ export default class ListView extends Mixins(ListViewMixin) {
116
146
 
117
147
  emitFlyingContext (model) {
118
148
  if (window.getSelection().toString()) { // do not open if text selected
119
- console.log(window.getSelection().toString())
149
+ // console.log(window.getSelection().toString())
120
150
  return
121
151
  }
122
152
  this.$emit('flyingContext', model)
@@ -6,6 +6,7 @@
6
6
  ref="form"
7
7
  :model="model"
8
8
  :createModelToEdit="createModelToEdit"
9
+ v-on="$listeners"
9
10
  >
10
11
  <template #form="{modelToEdit, model, changed, valid}">
11
12
  <slot
@@ -18,7 +18,8 @@ import {
18
18
  mdiPencil,
19
19
  mdiPlus,
20
20
  mdiPrinter,
21
- mdiThumbUpOutline
21
+ mdiThumbUpOutline,
22
+ mdiCurrencyEur
22
23
  } from '@mdi/js'
23
24
  import Vue from 'vue'
24
25
  import Vuetify from 'vuetify/lib'
@@ -48,7 +49,8 @@ export default new Vuetify({
48
49
  arrowLeftIcon: mdiArrowLeft,
49
50
  caretDownIcon: mdiMenuDown,
50
51
  caretUpIcon: mdiMenuUp,
51
- printerIcon: mdiPrinter
52
+ printerIcon: mdiPrinter,
53
+ euroSymbol: mdiCurrencyEur
52
54
  }
53
55
  },
54
56
  breakpoint: {