@xtdev/xt-miniprogram-ui 1.2.56 → 1.2.57
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -74,7 +74,7 @@ Component({
|
|
|
74
74
|
// 最小可选日期
|
|
75
75
|
minDate: {
|
|
76
76
|
type: String,
|
|
77
|
-
value: "
|
|
77
|
+
value: "",
|
|
78
78
|
},
|
|
79
79
|
// 最大可选日期
|
|
80
80
|
maxDate: {
|
|
@@ -613,13 +613,15 @@ Component({
|
|
|
613
613
|
let minDateArr = this.transformToArr(minDate);
|
|
614
614
|
if (filtType === 'yearMonth') {
|
|
615
615
|
resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月`;
|
|
616
|
-
resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990), curDateArr[1] - 1, curDateArr[2] - 1];
|
|
617
616
|
resetDateValue = `${curDateArr[0]}-${curDateArr[1]}`;
|
|
618
617
|
} else {
|
|
619
618
|
resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月${curDateArr[2]}日`;
|
|
620
|
-
resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990), curDateArr[1] - 1, curDateArr[2] - 1];
|
|
621
619
|
resetDateValue = `${curDateArr[0]}-${curDateArr[1]}-${curDateArr[2]}`;
|
|
622
620
|
}
|
|
621
|
+
const resetArrYear = curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990);
|
|
622
|
+
const resetArrMonth = minDateArr && minDateArr[1] ? curDateArr[1] - minDateArr[1] : curDateArr[1] - 1;
|
|
623
|
+
const resetArrDay = curDateArr[2] - 1;
|
|
624
|
+
resetDateArr = [resetArrYear, resetArrMonth, resetArrDay];
|
|
623
625
|
this.setData({
|
|
624
626
|
dateArr: resetDateArr,
|
|
625
627
|
dateStr: resetDateStr,
|