From b13bf52a45d3eec7b5c0397e762e469d9f7be99d Mon Sep 17 00:00:00 2001
From: Hugo Zigha <hugo.zigha@al-enterprise.com>
Date: Tue, 7 Jan 2025 17:20:40 +0100
Subject: [PATCH] MT#61710 change inputs behavior
Bin icon misplaced bug fixed by changing the
css class. This commit also improve input
behaviors. With the Vue 3 migration it seems
that $atts doesn't overwrite binded attributes
anymore, so we had two clear buttons on inputs.
To prevent this the following steps have been
taken:
* custom clear button is switched on only when
the attribute "value" is used.
* native clear button is switched on in all
other cases
This should avoid adding regressions.
Change-Id: I39f41ce8d461efc5eff5c7e541d227dbfd6c667d
---
src/components/form/CscInput.vue | 9 +--------
.../pages/Conversations/CscConversationsFilter.vue | 4 ++--
src/pages/CscPageHome.vue | 2 +-
src/pages/CscPagePbxDeviceDetails.vue | 2 +-
4 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/components/form/CscInput.vue b/src/components/form/CscInput.vue
index a741a535..75eabcb3 100644
--- a/src/components/form/CscInput.vue
+++ b/src/components/form/CscInput.vue
@@ -27,7 +27,7 @@
name="append"
/>
<q-btn
- v-if="$attrs.clearable !== undefined && value !== ''"
+ v-if="$attrs.clearable !== undefined && value !== undefined && value !== ''"
icon="backspace"
color="white"
flat
@@ -55,13 +55,6 @@ export default {
}
},
emits: ['input', 'clear'],
- date () {
- return {
-
- }
- },
- mounted () {
- },
methods: {
clear () {
this.$emit('input', '')
diff --git a/src/components/pages/Conversations/CscConversationsFilter.vue b/src/components/pages/Conversations/CscConversationsFilter.vue
index ff7f6dd6..db200705 100644
--- a/src/components/pages/Conversations/CscConversationsFilter.vue
+++ b/src/components/pages/Conversations/CscConversationsFilter.vue
@@ -6,7 +6,7 @@
class="q-mr-sm"
data-cy="filter-from"
dense
- clearable
+ :clearable="false"
:label="$t('From')"
:disable="loading"
@input="inputFrom"
@@ -15,7 +15,7 @@
:value="value.to"
data-cy="filter-to"
dense
- clearable
+ :clearable="false"
:label="$t('To')"
:disable="loading"
@input="inputTo"
diff --git a/src/pages/CscPageHome.vue b/src/pages/CscPageHome.vue
index fd6f4e8a..a1fa4224 100644
--- a/src/pages/CscPageHome.vue
+++ b/src/pages/CscPageHome.vue
@@ -18,7 +18,7 @@
data-cy="csc-call-number-input"
:value="callNumberInput"
:readonly="dialpadOpened"
- clearable
+ :clearable="false"
:disable="!isCallEnabled"
@keypress.space.prevent
@keydown.space.prevent
diff --git a/src/pages/CscPagePbxDeviceDetails.vue b/src/pages/CscPagePbxDeviceDetails.vue
index 91b29ae2..8af82298 100644
--- a/src/pages/CscPagePbxDeviceDetails.vue
+++ b/src/pages/CscPagePbxDeviceDetails.vue
@@ -410,6 +410,6 @@ export default {
</script>
<style>
.no-wrap {
- flex-wrap: wrap;
+ flex-wrap: nowrap;
}
</style>