Merge branch 'master' into 7936-hotfix-allowNegative

2025-01-16 11:06:49 +00:00 · 2025-01-16 11:06:49 +00:00 · 755fca504d
parent ee66704a92 cc7f16b635
commit 755fca504d
2 changed files with 2 additions and 0 deletions
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@ -107,6 +107,7 @@ const manageDate = (date) => {
            :rules="mixinRules"
            :clearable="false"
            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
            hide-bottom-space
        >
            <template #append>
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@ -81,6 +81,7 @@ function dateToTime(newDate) {
            style="min-width: 100px"
            :rules="mixinRules"
            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
            type="time"
            hide-bottom-space
        >