chore(release): Merge branch 'dev' into master

Author: hjzheng

src/components/calendar/CalendarCtrl.js

@@ -48,12 +48,21 @@ const lunnarFestivals = {
 	'腊月廿三': '小年'
 };
 
+const dateRange = {
+	preMinDate: new Date(1900, 1, 1),
+	preMaxDate: new Date((new Date()).getFullYear() + 30, 11, 1),
+	minDate: new Date(1900, 0, 1), // 闭
+	maxDate: new Date((new Date()).getFullYear() + 31, 0, 1) // 开
+};
+
+const MIN_YEAR = 1900;
+const MAX_YEAR = new Date().getFullYear() + 30;
+
 
 const yearList = (function() {
-	const end = new Date().getFullYear() + 30,
-		result = [];
+	const result = [];
 
-	for (let i = 1900; i <= end; i += 1) {
+	for (let i = MIN_YEAR; i <= MAX_YEAR; i += 1) {
 		result.push(i + '');
 	}
 
@@ -99,10 +108,25 @@ export default class DatePickerCtrl {
 		return this.DISPLAY_FORMAT[this.displayFormat] === 2;
 	}
 
+	setLGButtonStatus() {
+		if (this.parts.month === '0' && this.parts.year === MIN_YEAR + '') {
+			this.disabledL = true;
+		} else {
+			this.disabledL = false;
+		}
+
+		if (this.parts.month === '11' && this.parts.year === MAX_YEAR + '') {
+			this.disabledG = true;
+		} else {
+			this.disabledG = false;
+		}
+	}
+
 	/**
 	 * 改变月份
 	 */
 	changeMonth() {
+		this.setLGButtonStatus();
 		this.value = new Date(new Date(this.value).setMonth(this.parts.month));
 	}
 
@@ -111,6 +135,7 @@ export default class DatePickerCtrl {
 	 * 改变年份
 	 */
 	changeYear() {
+		this.setLGButtonStatus();
 		this.value = new Date(new Date(this.value).setFullYear(this.parts.year));
 	}
 
@@ -273,7 +298,23 @@ export default class DatePickerCtrl {
 	 */
 	switchMonth(delta) {
 		if (this.disableYear || this.disableMonth) return;
-		this.value = new Date(new Date(this.value).setMonth(this.value.getMonth() + delta));
+		const newDate = new Date(new Date(this.value).setMonth(this.value.getMonth() + delta));
+
+		if (newDate < dateRange.preMinDate) {
+			this.disabledL = true;
+		} else {
+			this.disabledL = false;
+		}
+
+		if (newDate >= dateRange.preMaxDate) {
+			this.disabledG = true;
+		} else {
+			this.disabledG = false;
+		}
+
+		if (newDate >= dateRange.minDate && newDate < dateRange.maxDate) {
+			this.value = newDate;
+		}
 	};
 
 

src/components/calendar/calendar.tpl.html

@@ -1,10 +1,10 @@
 <div class="calendar" ng-click="ctrl.preventDefault($event)">
 	<div class="calendar-header" ng-hide="ctrl.hideMonth()">
-		<span class="calendar-prev iconfont icon-rightarrow" ng-style="{'visibility': ctrl.hideYear() ? 'hidden' : 'inherit'}" ng-click="ctrl.switchMonth(-1)"></span><select ng-model="ctrl.parts.month"
+		<span class="calendar-prev iconfont icon-rightarrow" ng-style="{'visibility': ctrl.hideYear() ? 'hidden' : 'inherit', 'cursor': ctrl.disabledL ? 'not-allowed' : 'pointer'}" ng-click="ctrl.switchMonth(-1)"></span><select ng-model="ctrl.parts.month"
 						ng-options="index as month for (index, month) in ctrl.months" ng-disabled="ctrl.disableMonth" ng-hide="ctrl.hideMonth()"
 						ng-change="ctrl.changeMonth()"></select><select ng-model="ctrl.parts.year"
 						ng-options="year for year in ctrl.years" ng-disabled="ctrl.disableYear" ng-hide="ctrl.hideYear()"
-						ng-change="ctrl.changeYear()"></select><span class="calendar-next iconfont icon-rightarrow" ng-style="{'visibility': ctrl.hideYear() ? 'hidden' : 'inherit'}" ng-click="ctrl.switchMonth(1)"></span>
+						ng-change="ctrl.changeYear()"></select><span class="calendar-next iconfont icon-rightarrow" ng-style="{'visibility': ctrl.hideYear() ? 'hidden' : 'inherit', 'cursor': ctrl.disabledG ? 'not-allowed' : 'pointer'}" ng-click="ctrl.switchMonth(1)"></span>
 	</div>
 
 	<ul class="calendar-week-title">

src/components/date-picker/_date-picker.scss

@@ -49,6 +49,7 @@ $normal-color:	#c9c9c9;
     &.disabledInput .date-picker-input {
 	 	background: #fff;
 		color: #3d3d3d;
+	    pointer-events: none;
   	}
 
 	.date-picker-input-year {