@afeefa/vue-app 0.0.262 → 0.0.264

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- 0.0.262
1
+ 0.0.264
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@afeefa/vue-app",
3
- "version": "0.0.262",
3
+ "version": "0.0.264",
4
4
  "description": "",
5
5
  "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
6
6
  "license": "MIT",
@@ -229,7 +229,8 @@ export default class ADatePicker extends Mixins(ComponentWidthMixin, UsesPositio
229
229
  // take given date string an create a local time date object
230
230
  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#date_time_string_format
231
231
  // > When the time zone offset is absent, date-only forms are interpreted as a UTC time and date-time forms are interpreted as local time.
232
- const dateStringThatGetsConvertedToLocalDate = date + 'T00:00'
232
+ const timeString = this.value_ ? this.value_.toTimeString().split(' ')[0] : '00:00:00'
233
+ const dateStringThatGetsConvertedToLocalDate = date + 'T' + timeString
233
234
  this.value_ = new Date(dateStringThatGetsConvertedToLocalDate)
234
235
  } else {
235
236
  this.value_ = null
@@ -79,7 +79,7 @@
79
79
 
80
80
 
81
81
  <script>
82
- import { Component, Mixins } from '@a-vue'
82
+ import { Component, Mixins, Watch } from '@a-vue'
83
83
  import { ListFilterMixin } from '../ListFilterMixin'
84
84
  import { ListAction, GetAction } from '@a-vue/api-resources/ApiActions'
85
85
  import { Category } from '@/models'
@@ -97,8 +97,18 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
97
97
 
98
98
  items = []
99
99
  inputModel = 'Alle'
100
+ filterChangedFromInside = false
100
101
 
101
102
  async created () {
103
+ this.onFilterValueChanged()
104
+ }
105
+
106
+ @Watch('filter.value')
107
+ async onFilterValueChanged () {
108
+ if (this.filterChangedFromInside) {
109
+ return
110
+ }
111
+
102
112
  if (this.filter.value) {
103
113
  const model = await this.createGetAction()
104
114
  .params({
@@ -164,12 +174,19 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
164
174
  }
165
175
 
166
176
  itemSelected (model) {
177
+ this.filterChangedFromInside = true
178
+
167
179
  if (model) {
168
180
  this.filter.value = model.id
169
181
  this.inputModel = model.getTitle()
170
182
  } else {
171
183
  this.filter.value = null
172
184
  }
185
+
186
+ this.$nextTick(() => {
187
+ this.filterChangedFromInside = false
188
+ })
189
+
173
190
  this.$emit('select', model)
174
191
  }
175
192
 
@@ -30,7 +30,10 @@ export class AfeefaAdmin {
30
30
  }
31
31
 
32
32
  customConfig (customConfig) {
33
- adminConfig.config = customConfig
33
+ adminConfig.config = {
34
+ ...adminConfig.config,
35
+ ...customConfig
36
+ }
34
37
  return this
35
38
  }
36
39
 
@@ -17,7 +17,9 @@ class AdminConfig {
17
17
  icons: {}
18
18
  }
19
19
 
20
- config = {}
20
+ config = {
21
+ has2FA: false
22
+ }
21
23
  }
22
24
 
23
25
  export const adminConfig = new AdminConfig()