Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsgiehl <stefan@matomo.org>2022-07-21 14:28:53 +0300
committersgiehl <stefan@matomo.org>2022-07-21 14:28:53 +0300
commite459f3cc12758fdab09fe9182f28584276a1f9fe (patch)
treee6b371597e6b18ef99456aa488bb6ed85fa9cbea /plugins/CoreHome/vue/src
parent7f2d5ce9edbeb52ac9d6757ff91d698b9377dcc6 (diff)
parentca1b52a5e0113ce40f172ae337e93f86e1c8d831 (diff)
Merge branch 'next_release' into 4.x-dev
Diffstat (limited to 'plugins/CoreHome/vue/src')
-rw-r--r--plugins/CoreHome/vue/src/FieldArray/FieldArray.vue1
-rw-r--r--plugins/CoreHome/vue/src/MultiPairField/MultiPairField.vue12
2 files changed, 9 insertions, 4 deletions
diff --git a/plugins/CoreHome/vue/src/FieldArray/FieldArray.vue b/plugins/CoreHome/vue/src/FieldArray/FieldArray.vue
index 3721ddf976..55483c62f0 100644
--- a/plugins/CoreHome/vue/src/FieldArray/FieldArray.vue
+++ b/plugins/CoreHome/vue/src/FieldArray/FieldArray.vue
@@ -21,6 +21,7 @@
:model-value="item"
:options="field.availableValues"
@update:modelValue="onEntryChange($event, index)"
+ :model-modifiers="field.modelModifiers"
:placeholder="' '"
:uicontrol="field.uiControl"
:title="field.title"
diff --git a/plugins/CoreHome/vue/src/MultiPairField/MultiPairField.vue b/plugins/CoreHome/vue/src/MultiPairField/MultiPairField.vue
index 87a812d57e..53b28f8450 100644
--- a/plugins/CoreHome/vue/src/MultiPairField/MultiPairField.vue
+++ b/plugins/CoreHome/vue/src/MultiPairField/MultiPairField.vue
@@ -19,9 +19,10 @@
>
<Field
:full-width="true"
- v-model="item[field1.key]"
+ :model-value="item[field1.key]"
:options="field1.availableValues"
@update:modelValue="onEntryChange(index, field1.key, $event)"
+ :model-modifiers="field1.modelModifiers"
:placeholder="' '"
:uicontrol="field1.uiControl"
:name="`${name}-p1-${index}`"
@@ -39,7 +40,8 @@
:full-width="true"
:options="field2.availableValues"
@update:modelValue="onEntryChange(index, field2.key, $event)"
- v-model="item[field2.key]"
+ :model-value="item[field2.key]"
+ :model-modifiers="field2.modelModifiers"
:placeholder="' '"
:uicontrol="field2.uiControl"
:name="`${name}-p2-${index}`"
@@ -57,7 +59,8 @@
:full-width="true"
:options="field3.availableValues"
@update:modelValue="onEntryChange(index, field3.key, $event)"
- v-model="item[field3.key]"
+ :model-value="item[field3.key]"
+ :model-modifiers="field3.modelModifiers"
:placeholder="' '"
:uicontrol="field3.uiControl"
:title="field3.title"
@@ -74,7 +77,8 @@
:full-width="true"
:options="field4.availableValues"
@update:modelValue="onEntryChange(index, field4.key, $event)"
- v-model="item[field4.key]"
+ :model-value="item[field4.key]"
+ :model-modifiers="field4.modelModifiers"
:placeholder="' '"
:uicontrol="field4.uiControl"
:title="field4.title"