@xtdev/xt-miniprogram-ui 1.2.53 → 1.2.55
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.
|
@@ -58,7 +58,17 @@ Component({
|
|
|
58
58
|
type: String,
|
|
59
59
|
value: "dateRange",
|
|
60
60
|
observer: function (value) {
|
|
61
|
-
|
|
61
|
+
const getValue = () => {
|
|
62
|
+
switch(value) {
|
|
63
|
+
case "daterange":
|
|
64
|
+
return "dateRange";
|
|
65
|
+
case "yearmonth":
|
|
66
|
+
return "yearMonth";
|
|
67
|
+
default:
|
|
68
|
+
return value;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
this.setData({ filtType: getValue(value) });
|
|
62
72
|
},
|
|
63
73
|
},
|
|
64
74
|
// 最小可选日期
|
|
@@ -445,6 +455,10 @@ Component({
|
|
|
445
455
|
if (newDateArr[2] > newDaysArr.length) {
|
|
446
456
|
newDateArr = [newDateArr[0], newDateArr[1], newDaysArr.length - 1];
|
|
447
457
|
}
|
|
458
|
+
// 解决天数undefined问题
|
|
459
|
+
if (newDateArr[2] < 0) {
|
|
460
|
+
newDateArr[2] = 0;
|
|
461
|
+
}
|
|
448
462
|
// 天数选择下拉循环选择
|
|
449
463
|
this.setData({
|
|
450
464
|
newDaysArr,
|
|
@@ -597,9 +611,15 @@ Component({
|
|
|
597
611
|
let { data: { dateStr } } = this;
|
|
598
612
|
let curDateArr = this.transformToArr(defaultDate);
|
|
599
613
|
let minDateArr = this.transformToArr(minDate);
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
614
|
+
if (filtType === 'yearMonth') {
|
|
615
|
+
resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月`;
|
|
616
|
+
resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990), curDateArr[1] - 1, curDateArr[2] - 1];
|
|
617
|
+
resetDateValue = `${curDateArr[0]}-${curDateArr[1]}}`;
|
|
618
|
+
} else {
|
|
619
|
+
resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月${curDateArr[2]}日`;
|
|
620
|
+
resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990), curDateArr[1] - 1, curDateArr[2] - 1];
|
|
621
|
+
resetDateValue = `${curDateArr[0]}-${curDateArr[1]}-${curDateArr[2]}`;
|
|
622
|
+
}
|
|
603
623
|
this.setData({
|
|
604
624
|
dateArr: resetDateArr,
|
|
605
625
|
dateStr: resetDateStr,
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
{{item}}月
|
|
47
47
|
</view>
|
|
48
48
|
</picker-view-column>
|
|
49
|
-
<picker-view-column wx:if="{{
|
|
49
|
+
<picker-view-column wx:if="{{filtType !== 'yearMonth'}}">
|
|
50
50
|
<view wx:for="{{days}}" wx:key="index" class="picker-item {{dateArr[2] === index ? 'picker-select' : ''}}">
|
|
51
51
|
{{item}}日
|
|
52
52
|
</view>
|