@xtdev/xt-miniprogram-ui 1.2.49 → 1.2.51

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

@@ -79,6 +79,7 @@ Component({
     }
   },
   data: {
+    show: false,
     years: [], // 年份数组
     months: [], // 月份数组
     days: [], // 天份数组
@@ -93,7 +94,6 @@ Component({
     endDateStr: '', // 结束日期字符
     defaultDate: '', // 默认日期（组件接收的|当前时间）
     checkedType: 'start', // 当前选择的日期类型
-    clickedEnd: false, // 点击结束时间
     filtType: 'dateRange', // 选择器模式
     typeEnums: {
       date: '按日筛选',
@@ -346,10 +346,8 @@ Component({
     // 切换日期类型
     switchDateType(e) {
       const checkedType = e.currentTarget.dataset.type;
-      const { data: { clickedEnd } } = this;
       this.setData({
         checkedType,
-        clickedEnd: checkedType === 'end' ? true : clickedEnd
       });
       this.showCheckedPicker();
     },
@@ -381,6 +379,12 @@ Component({
         dateArr
       })
     },
+    // 关闭选择器
+    onClose() {
+      this.onReset();
+      this.setData({ show: false });
+      this.triggerEvent("onClose", {});
+    },
     // 重置时间
     onReset() {
       this.initPickerArr();
@@ -405,9 +409,9 @@ Component({
           endDateArr: [],
           endDateStr: '',
           endDateValue: '',
-          clickedEnd: false
         })
       }
+      this.triggerEvent("onReset", {});
     },
     // 确认选择时间
     onConfirm() {

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

@@ -4,7 +4,7 @@
     <!-- 顶部标题+关闭按钮 -->
     <view class="xt-popup-head">
       <view class="xt-popup-head-text">{{title}}</view>
-      <xt-icon icon="shibai-xiao" class="shibai-xiao" size="48"/>
+      <xt-icon catchtap="onClose" icon="shibai-xiao" class="shibai-xiao" size="48"/>
     </view>
     <!-- 分割线 -->
     <view class="head-border"></view>
@@ -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: [], // 新的天数数组列表，储存拖动之后的天数数组值，用于拖动结束后更新
@@ -551,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();
     },
@@ -617,15 +612,16 @@ Component({
           startDateStr: resetDateStr,
           endDateArr: [],
           endDateStr: '',
-          endDateValue: '',
-          clickedEnd: false
+          endDateValue: ''
         })
       }
+      this.triggerEvent("onReset", {});
     },
     // 关闭选择器
     onClose() {
       this.onReset();
       this.setData({ show: false });
+      this.triggerEvent("onClose", {});
     },
     // 确认选择时间
     onConfirm() {

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.49",
+  "version": "1.2.51",
   "description": "",
   "miniprogram": "libs",
   "publishConfig": {