@xtdev/xt-miniprogram-ui 1.2.54 → 1.2.55

package/libs/xt-date-picker-loop/index.js

@@ -58,7 +58,17 @@ Component({
       type: String,
       value: "dateRange",
       observer: function (value) {
-        this.setData({ filtType: value });
+        const getValue = () => {
+          switch(value) {
+            case "daterange":
+              return "dateRange";
+            case "yearmonth":
+              return "yearMonth";
+            default:
+              return value;
+          }
+        }
+        this.setData({ filtType: getValue(value) });
       },
     },
     // 最小可选日期
@@ -445,6 +455,10 @@ Component({
       if (newDateArr[2] > newDaysArr.length) {
         newDateArr = [newDateArr[0], newDateArr[1], newDaysArr.length - 1];
       }
+      // 解决天数undefined问题
+      if (newDateArr[2] < 0) {
+        newDateArr[2] = 0;
+      }
       // 天数选择下拉循环选择
       this.setData({
         newDaysArr,
@@ -597,9 +611,15 @@ Component({
       let { data: { dateStr } } = this;
       let curDateArr = this.transformToArr(defaultDate);
       let minDateArr = this.transformToArr(minDate);
-      resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月${curDateArr[2]}日`;
-      resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990),  curDateArr[1] - 1, curDateArr[2]];
-      resetDateValue = `${curDateArr[0]}-${curDateArr[1]}-${curDateArr[2]}`;
+      if (filtType === 'yearMonth') {
+        resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月`;
+        resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990),  curDateArr[1] - 1, curDateArr[2] - 1];
+        resetDateValue = `${curDateArr[0]}-${curDateArr[1]}}`;
+      } else {
+        resetDateStr = `${curDateArr[0]}年${curDateArr[1]}月${curDateArr[2]}日`;
+        resetDateArr = [curDateArr[0] - (minDateArr && minDateArr[0] ? minDateArr[0] : 1990),  curDateArr[1] - 1, curDateArr[2] - 1];
+        resetDateValue = `${curDateArr[0]}-${curDateArr[1]}-${curDateArr[2]}`;
+      }
       this.setData({
         dateArr: resetDateArr,
         dateStr: resetDateStr,

package/libs/xt-date-picker-loop/index.wxml

@@ -46,7 +46,7 @@
           {{item}}月
         </view>
       </picker-view-column>
-      <picker-view-column wx:if="{{type !== 'yearMonth'}}">
+      <picker-view-column wx:if="{{filtType !== 'yearMonth'}}">
         <view wx:for="{{days}}" wx:key="index" class="picker-item {{dateArr[2] === index ? 'picker-select' : ''}}">
           {{item}}日
         </view>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xtdev/xt-miniprogram-ui",
-  "version": "1.2.54",
+  "version": "1.2.55",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {