@afeefa/vue-app 0.0.221 → 0.0.223

Sign up to get free protection for your applications and to get access to all the features.
@@ -1 +1 @@
1
- 0.0.221
1
+ 0.0.223
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@afeefa/vue-app",
3
- "version": "0.0.221",
3
+ "version": "0.0.223",
4
4
  "description": "",
5
5
  "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
6
6
  "license": "MIT",
@@ -19,7 +19,7 @@
19
19
  :label="label"
20
20
  :rules="validationRules"
21
21
  placeholder="Mausklick oder Space/↓-Taste zum Auswählen"
22
- :clearable="!!selectedItems.length"
22
+ :clearable="clearable && !!selectedItems.length"
23
23
  appendIcon="$dropdown"
24
24
  @keydown.space.prevent="open"
25
25
  @keydown.down.prevent="open"
@@ -91,6 +91,13 @@ export default class FormFieldSearchSelect extends Mixins(FormFieldMixin) {
91
91
  return (this.model[this.name] && this.model[this.name].getTitle()) || null
92
92
  }
93
93
 
94
+ get clearable () {
95
+ if (this.validator && this.validator.getParam('filled')) {
96
+ return false
97
+ }
98
+ return true
99
+ }
100
+
94
101
  calculateSelectorSize () {
95
102
  const input = this.$refs.input.$el
96
103
  const inputWidth = input.offsetWidth
@@ -7,6 +7,8 @@
7
7
  item-text="itemText"
8
8
  item-value="itemValue"
9
9
 
10
+ :clearable="clearable && !!model[name]"
11
+
10
12
  :validator="validator"
11
13
  v-bind="$attrs"
12
14
  v-on="$listeners"
@@ -33,6 +35,13 @@ export default class FormFieldSelect extends Mixins(FormFieldMixin) {
33
35
  }
34
36
  }
35
37
 
38
+ get clearable () {
39
+ if (this.validator && this.validator.getParam('filled')) {
40
+ return false
41
+ }
42
+ return true
43
+ }
44
+
36
45
  get _items () {
37
46
  return this.$attrs.items || this.items || []
38
47
  }
@@ -129,8 +129,10 @@ export default class ListView extends Mixins(ListViewMixin) {
129
129
 
130
130
  xStart = null
131
131
  scrollLeftStart = null
132
+ scrollContainerX = null
132
133
  yStart = null
133
134
  scrollTopStart = null
135
+ scrollContainerY = null
134
136
 
135
137
  @Watch('isLoading')
136
138
  isLoadingChanged () {
@@ -203,6 +205,9 @@ export default class ListView extends Mixins(ListViewMixin) {
203
205
  }
204
206
 
205
207
  startShifting (event) {
208
+ this.scrollContainerX = this.getScrollParent(this.$el.querySelector('.a-table-wrapper'), 'h')
209
+ this.scrollContainerY = this.getScrollParent(this.$el.querySelector('.a-table-wrapper'), 'v')
210
+
206
211
  if (this.scrollContainerX || this.scrollContainerY) {
207
212
  window.addEventListener('mouseup', this.stopShifting)
208
213
  window.addEventListener('mousemove', this.shift)
@@ -253,14 +258,6 @@ export default class ListView extends Mixins(ListViewMixin) {
253
258
  }
254
259
  }
255
260
 
256
- get scrollContainerX () {
257
- return this.getScrollParent(this.$el.querySelector('.a-table-wrapper'), 'h')
258
- }
259
-
260
- get scrollContainerY () {
261
- return this.getScrollParent(this.$el.querySelector('.a-table-wrapper'), 'v')
262
- }
263
-
264
261
  getScrollParent (node, direction) {
265
262
  if (node == null) {
266
263
  return null