bug fix 修复在非 cron 下起始日期不准确的问题

Tencent · Mar 22, 2019 · 36752fc · 36752fc
1 parent ea81b1e
commit 36752fc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/dist/example/example.js b/dist/example/example.js
@@ -219,7 +219,7 @@
 	// 时间选择器
 	document.querySelector('#datePickerBtn100').addEventListener('click', function () {
 	    _weui2.default.datePicker({
-	        start: '1816-12-29',
+	        start: '1816-03-29',
 	        end: '2030-12-29',
 	        /**
 	         * https://zh.wikipedia.org/wiki/Cron
@@ -4555,7 +4555,7 @@
 	    var hasLeapYear = function hasLeapYear(year) {
 	        return year % 400 === 0 || year % 4 === 0 && year % 100 !== 0;
 	    };
-	    var createDaysArr = function createDaysArr(hasLeap, month, startDay, endDay) {
+	    var createDaysArr = function createDaysArr(hasLeap, month, startMonth, endMonth, startDay, endDay) {
 	        var daysArr = [];
 	        var maxDays = hasLeap ? 29 : 28;
 	        switch (month) {
@@ -4580,6 +4580,12 @@
 	        }
 	        startDay = startDay || 1;
 	        endDay = endDay || maxDays;
+	        if (month > startMonth) {
+	            startDay = 1;
+	        }
+	        if (month < endMonth) {
+	            endDay = maxDays;
+	        }
 	        if (startDay > maxDays) {
 	            startDay = maxDays;
 	        }
@@ -4598,7 +4604,7 @@
 	            monthsArr.push({
 	                label: i + '月',
 	                value: i,
-	                children: createDaysArr(hasLeap, i, startDay, endDay)
+	                children: createDaysArr(hasLeap, i, startMonth, endMonth, startDay, endDay)
 	            });
 	        }
 	        return monthsArr;

diff --git a/dist/weui.js b/dist/weui.js
@@ -3190,7 +3190,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    var hasLeapYear = function hasLeapYear(year) {
 	        return year % 400 === 0 || year % 4 === 0 && year % 100 !== 0;
 	    };
-	    var createDaysArr = function createDaysArr(hasLeap, month, startDay, endDay) {
+	    var createDaysArr = function createDaysArr(hasLeap, month, startMonth, endMonth, startDay, endDay) {
 	        var daysArr = [];
 	        var maxDays = hasLeap ? 29 : 28;
 	        switch (month) {
@@ -3215,6 +3215,12 @@ return /******/ (function(modules) { // webpackBootstrap
 	        }
 	        startDay = startDay || 1;
 	        endDay = endDay || maxDays;
+	        if (month > startMonth) {
+	            startDay = 1;
+	        }
+	        if (month < endMonth) {
+	            endDay = maxDays;
+	        }
 	        if (startDay > maxDays) {
 	            startDay = maxDays;
 	        }
@@ -3233,7 +3239,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	            monthsArr.push({
 	                label: i + '月',
 	                value: i,
-	                children: createDaysArr(hasLeap, i, startDay, endDay)
+	                children: createDaysArr(hasLeap, i, startMonth, endMonth, startDay, endDay)
 	            });
 	        }
 	        return monthsArr;

diff --git a/dist/weui.min.js b/dist/weui.min.js
diff --git a/example/example.js b/example/example.js
@@ -174,7 +174,7 @@ document.querySelector('#datePickerBtn').addEventListener('click', function () {
 // 时间选择器
 document.querySelector('#datePickerBtn100').addEventListener('click', function () {
     weui.datePicker({
-        start: '1816-12-29',
+        start: '1816-03-29',
         end: '2030-12-29',
         /**
          * https://zh.wikipedia.org/wiki/Cron

diff --git a/src/picker/picker.js b/src/picker/picker.js
@@ -488,7 +488,7 @@ function datePicker(options) {
 
     const date2arr = date => [date.getFullYear(), date.getMonth() + 1, date.getDate()];
     const hasLeapYear = year => year % 400 === 0 || (year % 4 === 0 && year % 100 !== 0);
-    const createDaysArr = (hasLeap, month, startDay, endDay) => {
+    const createDaysArr = (hasLeap, month, startMonth, endMonth, startDay, endDay) => {
         const daysArr = [];
         let maxDays = hasLeap ? 29 : 28;
         switch (month) {
@@ -513,6 +513,12 @@ function datePicker(options) {
         }
         startDay = startDay || 1;
         endDay = endDay || maxDays;
+        if (month > startMonth) {
+            startDay = 1;
+        }
+        if (month < endMonth) {
+            endDay = maxDays;
+        }
         if (startDay > maxDays) {
             startDay = maxDays;
         }
@@ -531,7 +537,7 @@ function datePicker(options) {
             monthsArr.push({
                 label: i + '月',
                 value: i,
-                children: createDaysArr(hasLeap, i, startDay, endDay),
+                children: createDaysArr(hasLeap, i, startMonth, endMonth, startDay, endDay),
             });
         }
         return monthsArr;