From cac387862cc57af3c802bf550ba31e6b61ece0fc Mon Sep 17 00:00:00 2001
From: "lin.xiao" <lin.xiao@upai.com>
Date: Tue, 7 Jun 2022 16:58:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(van-datetime-picker):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=9A=E8=87=AA=E5=B7=B1=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Ainput=E3=80=81change=20callback=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=80=E6=96=B0=E5=80=BC=E5=AD=98=E5=9C=A8=E5=BB=B6?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                     |  3 +++
 packages/datetime-picker/index.ts | 29 ++++++++++++++---------------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 1f6aca1ca..b6b5eca27 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -16,5 +16,8 @@ indent_size = 2
 [*.js]
 indent_size = 2
 
+[*.ts]
+indent_size = 2
+
 [*.json]
 indent_size = 2
diff --git a/packages/datetime-picker/index.ts b/packages/datetime-picker/index.ts
index 094a08eca..74a6e75d2 100644
--- a/packages/datetime-picker/index.ts
+++ b/packages/datetime-picker/index.ts
@@ -110,11 +110,12 @@ VantComponent({
       const { data } = this;
       const val = this.correctValue(data.value);
       const isEqual = val === data.innerValue;
-      this.updateColumnValue(val).then(() => {
-        if (!isEqual) {
-          this.$emit('input', val);
-        }
-      });
+
+      if (!isEqual) {
+        this.updateColumnValue(val);
+      } else {
+        this.updateColumns();
+      }
     },
 
     getPicker() {
@@ -322,10 +323,7 @@ VantComponent({
       }
       value = this.correctValue(value);
 
-      this.updateColumnValue(value).then(() => {
-        this.$emit('input', value);
-        this.$emit('change', picker);
-      });
+      this.updateColumnValue(value);
     },
 
     updateColumnValue(value) {
@@ -355,16 +353,17 @@ VantComponent({
         }
       }
 
-      return this.set({ innerValue: value })
-        .then(() => this.updateColumns())
-        .then(() => picker.setValues(values));
+      return this.setData({ innerValue: value }, () => {
+        picker.setValues(values);
+        this.updateColumns();
+        this.$emit('input', value);
+        this.$emit('change', picker);
+      });
     },
   },
 
   created() {
     const innerValue = this.correctValue(this.data.value);
-    this.updateColumnValue(innerValue).then(() => {
-      this.$emit('input', innerValue);
-    });
+    this.updateColumnValue(innerValue);
   },
 });