From 64e53ff221798358200a5cbd8c2111f9f0b23564 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=A1=E9=A3=8E?= <18012261618@126.com>
Date: Wed, 8 Nov 2023 10:45:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E8=AE=BE=E7=BD=AE=E7=A7=92=E5=90=8E?=
=?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=8E=B7=E5=8F=96=E7=9A=84?=
=?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=BC=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/datetime-picker/TimePicker.js | 4 ++--
src/datetime-picker/demo/index.vue | 4 ++++
yarn.lock | 5 +++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/datetime-picker/TimePicker.js b/src/datetime-picker/TimePicker.js
index 7f021a6cd..4f6326e82 100644
--- a/src/datetime-picker/TimePicker.js
+++ b/src/datetime-picker/TimePicker.js
@@ -144,14 +144,14 @@ export default createComponent({
const hour = hourColumn.values[hourIndex] || hourColumn.values[0];
const minute = minuteColumn.values[minuteIndex] || minuteColumn.values[0];
- let innerValue = this.formatValue(`${hour}:${minute}`);
+ let innerValue = `${hour}:${minute}`;
if (this.unit === 'second') {
const second = secondColumn.values[secondIndex] || secondColumn.values[0];
innerValue += `:${second}`
}
- this.innerValue = innerValue;
+ this.innerValue = this.formatValue(innerValue);
this.updateColumnValue();
},
diff --git a/src/datetime-picker/demo/index.vue b/src/datetime-picker/demo/index.vue
index 23736f9c2..d9ea3e38b 100644
--- a/src/datetime-picker/demo/index.vue
+++ b/src/datetime-picker/demo/index.vue
@@ -99,16 +99,20 @@
+ value: {{value.datetime}}
+ value: {{value.datetime}}
+ value: {{value.time}}
+ value: {{value.secondTime}}
diff --git a/yarn.lock b/yarn.lock
index 4ce8b1905..8d9bec538 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6045,6 +6045,11 @@ decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
integrity "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="
+decimal.js@^10.4.3:
+ version "10.4.3"
+ resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+ integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+
decode-uri-component@^0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"