@xtdev/xt-miniprogram-ui 1.2.48 → 1.2.50

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

@@ -93,7 +93,6 @@ Component({
     endDateStr: '', // 结束日期字符
     defaultDate: '', // 默认日期（组件接收的|当前时间）
     checkedType: 'start', // 当前选择的日期类型
-    clickedEnd: false, // 点击结束时间
     filtType: 'dateRange', // 选择器模式
     typeEnums: {
       date: '按日筛选',
@@ -346,10 +345,8 @@ Component({
     // 切换日期类型
     switchDateType(e) {
       const checkedType = e.currentTarget.dataset.type;
-      const { data: { clickedEnd } } = this;
       this.setData({
         checkedType,
-        clickedEnd: checkedType === 'end' ? true : clickedEnd
       });
       this.showCheckedPicker();
     },
@@ -405,7 +402,6 @@ Component({
           endDateArr: [],
           endDateStr: '',
           endDateValue: '',
-          clickedEnd: false
         })
       }
     },

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

@@ -17,10 +17,12 @@
     <view class="date-sel">
       <view wx:if="{{filtType === 'date'}}" class="sel-sigle actived">{{dateStr}}</view>
       <view wx:else class="sel-range">
-        <view catchtap="switchDateType" data-type="start" class="sel-start actived">{{startDateStr}}</view>
+        <view catchtap="switchDateType" data-type="start" class="sel-start {{checkedType == 'start' ? 'actived' : ''}}">
+          {{startDateStr}}
+        </view>
         <view>至</view>
-        <view catchtap="switchDateType" data-type="end" class="sel-end {{clickedEnd ? 'actived' : ''}}">
-          {{ clickedEnd ? endDateStr : '结束时间'}}
+        <view catchtap="switchDateType" data-type="end" class="sel-end {{checkedType  == 'end' ? 'actived' : ''}}">
+          {{ endDateStr || '结束时间'}}
         </view>
       </view>
     </view>

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

@@ -107,7 +107,6 @@ Component({
     endDateStr: "", // 结束日期字符
     defaultDate: "", // 默认日期（组件接收的|当前时间）
     checkedType: "start", // 当前选择的日期类型
-    clickedEnd: false, // 点击结束时间
     filtType: "dateRange", // 选择器模式
     btnDisabled: false, // 按钮禁用
     newDaysArr: [], // 新的天数数组列表，储存拖动之后的天数数组值，用于拖动结束后更新
@@ -264,6 +263,7 @@ Component({
           dateArr,
           defaultDate,
           minDate,
+          filtType
         },
       } = this;
       currentDate = currentDate || getDefaultDate();
@@ -281,7 +281,7 @@ Component({
           : 1;
       if (curDateArr && curDateArr.length) {
         // 如果有设置当前日期，则数组下标选中当前日期
-        dateStr = `${curYear}年${curMonth}月${curDay}日`;
+        dateStr = filtType === "yearMonth" ? `${curYear}年${curMonth}月` : `${curYear}年${curMonth}月${curDay}日`;
         dateArr = [
           curYear - defaultYear,
           curMonth - defaultMonth,
@@ -290,7 +290,9 @@ Component({
         dateValue = `${curYear}-${curMonth}-${curDay}`;
       } else {
         // 如果有设置当前日期，则数组下标默认选中当前
-        dateStr = `${now.getFullYear()}年${
+        dateStr = filtType === "yearMonth" ? `${now.getFullYear()}年${
+          now.getMonth() + 1
+        }月` : `${now.getFullYear()}年${
           now.getMonth() + 1
         }月${now.getDate()}日`;
         dateArr = [now.getFullYear() - 1990, now.getMonth(), now.getDate() - 1];
@@ -548,12 +550,8 @@ Component({
     // 切换日期类型
     switchDateType(e) {
       const checkedType = e.currentTarget.dataset.type;
-      const {
-        data: { clickedEnd },
-      } = this;
       this.setData({
         checkedType,
-        clickedEnd: checkedType === "end" ? true : clickedEnd,
       });
       this.showCheckedPicker();
     },
@@ -614,8 +612,7 @@ Component({
           startDateStr: resetDateStr,
           endDateArr: [],
           endDateStr: '',
-          endDateValue: '',
-          clickedEnd: false
+          endDateValue: ''
         })
       }
     },

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

@@ -17,10 +17,12 @@
     <view class="date-sel">
       <view wx:if="{{filtType === 'date' || filtType === 'yearMonth'}}" class="sel-sigle actived">{{dateStr}}</view>
       <view wx:else class="sel-range">
-        <view catchtap="switchDateType" data-type="start" class="sel-start actived">{{startDateStr}}</view>
+        <view catchtap="switchDateType" data-type="start" class="sel-start  {{checkedType == 'start' ? 'actived' : ''}}">
+          {{startDateStr}}
+        </view>
         <view>至</view>
-        <view catchtap="switchDateType" data-type="end" class="sel-end {{clickedEnd ? 'actived' : ''}}">
-          {{ clickedEnd ? endDateStr : '结束时间'}}
+        <view catchtap="switchDateType" data-type="end" class="sel-end  {{checkedType  == 'end' ? 'actived' : ''}}">
+          {{ endDateStr || '结束时间'}}
         </view>
       </view>
     </view>

package/package.json

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