From 7064338a3dbb8d943b35081bcacebfb45102a861 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 25 Jun 2019 17:31:05 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-18382=20fix:=20=E6=97=B6=E5=88=86?= =?UTF-8?q?=E7=A7=92=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=BC=E5=BC=8F=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/time/time.trigger.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/widget/time/time.trigger.js b/src/widget/time/time.trigger.js index 0de374465..ce3decb98 100644 --- a/src/widget/time/time.trigger.js +++ b/src/widget/time/time.trigger.js @@ -3,7 +3,7 @@ _const: { COMPARE_FORMAT: "%H:%M:%S", - COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S", + COMPLETE_COMPARE_FORMAT: "%Y-%M-%d %H:%M:%S %P", FORMAT_ARRAY: [ "%H:%M:%S", // HH:mm:ss "%I:%M:%S", // hh:mm:ss @@ -11,6 +11,7 @@ "%k:%M:%S", // H:mm:ss "%l:%M:%S %p", // h:mm:ss a "%l:%M:%S %P", // h:mm:ss a + "%H:%M:%S %p", // HH:mm:ss a "%l:%M", // h:mm "%k:%M", // H:mm "%I:%M", // hh:mm