upd: update feature of holiday

xc39 · Oct 15, 2020 · e689811 · e689811
1 parent 06b8255
commit e689811
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/docs/v2/guide.md b/docs/v2/guide.md
@@ -49,15 +49,13 @@ Page({
    * currentSelect 当前点击的日期
    */
   takeoverTap(e) {
-    console.log('takeoverTap', e.detail) // => { year: 2019, month: 12, day: 3, ...}
+    console.log('takeoverTap', e.detail) // => { year: 2019, month: 12, date: 3, ...}
   },
   /**
    * 选择日期后执行的事件
-   * currentSelect 当前点击的日期
-   * allSelectedDays 选择的所有日期（当multi为true时，allSelectedDays有值）
    */
   afterTapDate(e) {
-    console.log('afterTapDate', e.detail) // => { currentSelect: {}, allSelectedDays: [] }
+    console.log('afterTapDate', e.detail) // => { year: 2019, month: 12, date: 3, ...}
   },
   /**
    * 当日历滑动时触发(适用于周/月视图)

diff --git a/src/component/v2/index.wxml b/src/component/v2/index.wxml
@@ -32,15 +32,9 @@
           <view class="date b ac pc {{item.class ? item.class  : ''}} {{item.isToday && config.highlightToday ? config.theme + '_today' : ''}} {{item.choosed ? config.theme + '_choosed' : ''}} {{item.disable ? config.theme + '_date-disable' : ''}} {{config.chooseAreaMode ? 'date-area-mode' : ''}}">
                 {{config.markToday && item.isToday ? config.markToday : item.date}}
                 <view
-                  wx:if="{{(config.showLunar && item.lunar && !item.showTodoLabel) || (item.showTodoLabel && calendar.todoLabelPos !== 'bottom')}}"
+                  wx:if="{{(config.showLunar && item.lunar && !item.showTodoLabel) || (item.showTodoLabel && calendar.todoLabelPos !== 'bottom') || config.showHolidays}}"
                   class="date-desc {{config.theme}}_date-desc date-desc-bottom {{(item.choosed || item.isToday) ? 'date-desc-bottom-always' : ''}} {{item.disable ? config.theme + '_date-desc-disable' : ''}}">
-                  {{item.lunar.Term || item.lunar.IDayCn}}
-                </view>
-                <view
-                  wx:if="{{config.showHolidays && item.label && !item.choosed}}"
-                  class="date-desc {{config.theme + '_date-desc-lunar'}} date-desc-bottom"
-                  style="background-color: {{item.label ? '' : item.color}}; color: {{item.color}}">
-                    {{item.label}}
+                  <text class="{{config.showHolidays && !item.showTodoLabel && item.label && !item.choosed ? config.theme + '_date-desc-lunar' : ''}}">{{item.label || item.lunar.Term || item.lunar.IDayCn}}</text>
                 </view>
                 <view
                   wx:if="{{item.showTodoLabel && !calendar.todoLabelCircle}}"