fix conflict

This commit is contained in:
Mohit Panjwani
2022-03-06 12:28:51 +05:30
40 changed files with 223 additions and 127 deletions

View File

@ -51,7 +51,7 @@
label="name"
value-prop="id"
:placeholder="$t('settings.disk.select_disk')"
track-by="id"
track-by="name"
object
/>
</BaseInputGroup>

View File

@ -38,6 +38,7 @@
label="key"
:searchable="true"
:invalid="v$.currentExchangeRate.driver.$error"
track-by="key"
@update:modelValue="resetCurrency"
@input="v$.currentExchangeRate.driver.$touch()"
/>
@ -60,6 +61,7 @@
:options="serverOptions"
:invalid="v$.currencyConverter.type.$error"
label="value"
track-by="value"
@update:modelValue="resetCurrency"
/>
</BaseInputGroup>
@ -104,8 +106,8 @@
:invalid="v$.currentExchangeRate.currencies.$error"
label="code"
track-by="code"
open-direction="top"
@input="v$.currentExchangeRate.currencies.$touch()"
openDirection="top"
/>
</BaseInputGroup>
<!-- For Currency Converter -->

View File

@ -50,7 +50,7 @@
:can-clear="false"
:placeholder="$t('items.select_a_unit')"
searchable
track-by="id"
track-by="name"
/>
</BaseInputGroup>

View File

@ -35,6 +35,7 @@
searchable
label="name"
:can-deselect="false"
track-by="name"
@update:modelValue="onChangeDriver(data)"
/>
</BaseInputGroup>