Browse Source

fix:优化DatePicker中minuteStep支持到datetime类型

richard1015 6 years ago
parent
commit
13d0e52ddc
1 changed files with 7 additions and 2 deletions
  1. 7 2
      src/packages/datepicker/datepicker.vue

+ 7 - 2
src/packages/datepicker/datepicker.vue

@@ -259,6 +259,9 @@ export default {
                 }else{
                 }else{
                     resHour = hour;
                     resHour = hour;
                 }
                 }
+                if(resHour == 0){
+                    resHour = '0';
+                }
                 return resHour ? `${resHour}${this.chinese[3]}` : undefined;
                 return resHour ? `${resHour}${this.chinese[3]}` : undefined;
             })
             })
             return hours.filter(item => item);
             return hours.filter(item => item);
@@ -292,8 +295,10 @@ export default {
                 }else{
                 }else{
                     resMinute = minute;
                     resMinute = minute;
                 }
                 }
-                return resMinute ? `${resMinute}${this.chinese[4]}` : undefined;
-                
+                if(resMinute == 0){ 
+                    resMinute = '0'; 
+                }
+                return resMinute % this.minuteStep == 0 ? `${resMinute}${this.chinese[4]}` : undefined;
             })
             })
             return minutes.filter(item => item);
             return minutes.filter(item => item);
         },
         },