From 2afed88c0907dd1e059dd040792228cad038cbd1 Mon Sep 17 00:00:00 2001 From: mengxiong10 <15623530290@163.com> Date: Thu, 14 Mar 2019 09:49:22 +0800 Subject: [PATCH] fix: pick minute will affect the hour (#168) --- src/panel/time.js | 97 +++++++++++++++++++++++++++-------------------- 1 file changed, 55 insertions(+), 42 deletions(-) diff --git a/src/panel/time.js b/src/panel/time.js index 9d29a84..bdad519 100644 --- a/src/panel/time.js +++ b/src/panel/time.js @@ -72,7 +72,8 @@ export default { let hours = Math.floor(timeMinutes / 60) let minutes = timeMinutes % 60 let value = { - hours, minutes + hours, + minutes } result.push({ value, @@ -82,11 +83,13 @@ export default { } return result } - }, render (h) { - const date = new Date(this.value) - const disabledTime = typeof this.disabledTime === 'function' && this.disabledTime + const date = this.value + ? new Date(this.value) + : new Date().setHours(0, 0, 0, 0) + const disabledTime = + typeof this.disabledTime === 'function' && this.disabledTime let pickers = this.getTimeSelectOptions() if (Array.isArray(pickers) && pickers.length) { @@ -98,32 +101,39 @@ export default {