fix(QTime): update innerValue when using setNow before it's updated f…

…rom external value quasarframework#10727 quasarframework#10727
pdanpdan · Dec 1, 2021 · c4c2393 · c4c2393
1 parent 6d778e5
commit c4c2393
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/ui/src/components/time/QTime.js b/ui/src/components/time/QTime.js
@@ -295,10 +295,22 @@ export default Vue.extend({
 
   methods: {
     setNow () {
-      this.__updateValue({
+      const nowStr = this.__updateValue({
         ...this.__getCurrentDate(),
         ...this.__getCurrentTime()
       })
+
+      const model = __splitDate(
+        nowStr,
+        this.computedMask,
+        this.computedLocale,
+        this.calendar,
+        this.defaultDateModel
+      )
+
+      this.innerModel = model
+      this.isAM = model.hour < 12
+
       this.__goToView('Hour')
     },
 
@@ -897,6 +909,8 @@ export default Vue.extend({
         this.$emit('input', val, date)
       }
       final === true && this.$emit('change', val, date)
+
+      return val
     }
   },