@tuya-miniapp/smart-ui 1.3.1-beta-2 → 1.3.1-beta-3

package/dist/toast/toast.js

@@ -13,6 +13,7 @@ const defaultOptions = {
     width: '100%',
 };
 let queue = [];
+// @ts-expect-error
 let currentOptions = Object.assign({}, defaultOptions);
 function parseOptions(message) {
     return isObj(message) ? message : { message };
@@ -65,6 +66,7 @@ Toast.setDefaultOptions = (options) => {
     Object.assign(currentOptions, options);
 };
 Toast.resetDefaultOptions = () => {
+    // @ts-expect-error
     currentOptions = Object.assign({}, defaultOptions);
 };
 export default Toast;

package/dist/wxs/style.wxs

@@ -1,10 +1,3 @@
-/*
- * @Author: mjh
- * @Date: 2024-08-02 11:38:15
- * @LastEditors: mjh
- * @LastEditTime: 2024-10-31 15:52:59
- * @Description: 
- */
 /* eslint-disable */
 var object = require('./object.wxs');
 var array = require('./array.wxs');

package/lib/calendar/calendar.wxml

@@ -4,7 +4,7 @@
   <header
     title="{{ title }}"
     showTitle="{{ showTitle }}"
-    subtitle="{{ mode === 'year' ? '' : mode === 'month' ? computed.formatYearTitle(currentDate, visibleIndex, locale.yearFormatter) : computed.formatMonthTitle(months[visibleIndex], subFormatter) }}"
+    subtitle="{{ type === 'year' ? '' : type === 'month' ? computed.formatYearTitle(currentDate, visibleIndex, locale.yearFormatter) : computed.formatMonthTitle(months[visibleIndex], subFormatter) }}"
     subFormatter="{{locale.subFormatter || 'YYYY-MM'}}"
     showSubtitle="{{ showSubtitle }}"
     firstDayOfWeek="{{ firstDayOfWeek }}"
@@ -13,12 +13,14 @@
     bind:click-prev="onPrev"
     bind:click-next="onNext"
     bind:click-save="onConfirm"
-    hideWeek="{{ mode !== 'day' }}"
+    hideWeek="{{ type === 'year' || type === 'month' }}"
+    right-text="{{confirmText}}"
+    showConfirm="{{showConfirm}}"
   >
     <slot name="title" slot="title"></slot>
   </header>
 
-  <block wx:if="{{mode === 'day'}}">
+  <block wx:if="{{ type !== 'year' && type !== 'month' }}">
     <view class="smart-calendar-month_wrap" wx:for="{{ months }}" wx:key="index">
       <month
         id="month{{ index }}"
@@ -47,25 +49,28 @@
     </view>
   </block>
   
-  <block wx:if="{{mode === 'month'}}">
+  <block wx:if="{{type === 'month'}}">
     <month-list
       minDate="{{ minDate }}"
       maxDate="{{ maxDate }}"
       monthsFormatter="{{ locale.monthsFormatter }}"
       bind:click="onClickDate"
-      date="{{defaultDate}}"
-      visibleIndex="{{visibleIndex}}"
+      date="{{currentDate}}"
+      color="{{color}}"
+      readonly="{{readonly}}"
     />
   </block>
 
-  <block wx:if="{{mode === 'year'}}">
+  <block wx:if="{{type === 'year'}}">
     <year-list 
       minDate="{{ minDate }}"
       maxDate="{{ maxDate }}"
       yearFormatter="{{ locale.yearFormatter }}"
       bind:click="onClickDate"
-      date="{{defaultDate}}"
+      date="{{currentDate}}"
       visibleIndex="{{visibleIndex}}"
+      color="{{color}}"
+      readonly="{{readonly}}"
      />
   </block>
 

package/lib/calendar/components/header/index.js

@@ -19,17 +19,21 @@ var Right_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right"));
     props: {
         title: {
             type: String,
-            value: '日期选择',
+            value: 'Select Date',
         },
         rightText: {
             type: String,
-            value: '保存',
+            value: 'Save',
         },
         subtitle: String,
         showTitle: Boolean,
         showSubtitle: Boolean,
         defaultWeeks: Array,
         hideWeek: Boolean,
+        showConfirm: {
+            type: Boolean,
+            value: true,
+        },
         firstDayOfWeek: {
             type: Number,
             observer: 'initWeekDay',

package/lib/calendar/components/header/index.wxml

@@ -3,7 +3,7 @@
     <view class="smart-calendar__header-title"><slot name="title"></slot></view>
     <view class="smart-calendar__header-title">
       {{ title }}
-      <view class="smart-calendar__header-title-save" bind:tap=="onSave">{{ rightText }}</view>
+      <view class="smart-calendar__header-title-save" bind:tap=="onSave" wx:if="{{showConfirm}}">{{ rightText }}</view>
     </view>
   </block>
 

package/lib/calendar/components/month/index.css

@@ -1 +1 @@
-@import '../../../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));display:flex;flex-direction:column;height:100%}.smart-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.smart-calendar__month-mark{color:var(--calendar-month-mark-color,hsla(210,6%,87%,.6));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.smart-calendar__day,.smart-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.smart-calendar__day{font-size:var(--calendar-day-font-size,15px);font-weight:500;height:var(--calendar-day-height,100rpx);position:relative;width:14.285%}.smart-calendar__day--end,.smart-calendar__day--multiple-middle,.smart-calendar__day--multiple-selected,.smart-calendar__day--start,.smart-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-bottom-left-radius:34rpx;border-top-left-radius:34rpx}.smart-calendar__day--end{border-bottom-right-radius:34rpx;border-top-right-radius:34rpx}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-middle-color,var(--app-B3,#fff))}.smart-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:9px}}.smart-calendar__top-info{top:6px}.smart-calendar__bottom-info{bottom:6px}.smart-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#3678e3);border-radius:50%;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,34px);width:var(--calendar-selected-day-size,34px)}
+@import '../../../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));display:flex;flex-direction:column;height:100%}.smart-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.smart-calendar__month-mark{color:var(--calendar-month-mark-color,hsla(210,6%,87%,.6));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.smart-calendar__day,.smart-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.smart-calendar__day{font-size:var(--calendar-day-font-size,15px);font-weight:var(--calendar-day-font-weight,500);height:var(--calendar-day-height,100rpx);position:relative;width:14.285%}.smart-calendar__day--end,.smart-calendar__day--multiple-middle,.smart-calendar__day--multiple-selected,.smart-calendar__day--start,.smart-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-bottom-left-radius:var(--calendar-day-select-border-radius,34rpx);border-top-left-radius:var(--calendar-day-select-border-radius,34rpx)}.smart-calendar__day--end{border-bottom-right-radius:var(--calendar-day-select-border-radius,34rpx);border-top-right-radius:var(--calendar-day-select-border-radius,34rpx)}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-middle-color,var(--app-B3,#fff))}.smart-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:9px}}.smart-calendar__top-info{top:6px}.smart-calendar__bottom-info{bottom:6px}.smart-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#3678e3);border-radius:50%;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,34px);width:var(--calendar-selected-day-size,34px)}

package/lib/calendar/components/month/index.wxss

@@ -1 +1 @@
-@import '../../../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));display:flex;flex-direction:column;height:100%}.smart-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.smart-calendar__month-mark{color:var(--calendar-month-mark-color,hsla(210,6%,87%,.6));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.smart-calendar__day,.smart-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.smart-calendar__day{font-size:var(--calendar-day-font-size,15px);font-weight:500;height:var(--calendar-day-height,100rpx);position:relative;width:14.285%}.smart-calendar__day--end,.smart-calendar__day--multiple-middle,.smart-calendar__day--multiple-selected,.smart-calendar__day--start,.smart-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-bottom-left-radius:34rpx;border-top-left-radius:34rpx}.smart-calendar__day--end{border-bottom-right-radius:34rpx;border-top-right-radius:34rpx}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-middle-color,var(--app-B3,#fff))}.smart-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:9px}}.smart-calendar__top-info{top:6px}.smart-calendar__bottom-info{bottom:6px}.smart-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#3678e3);border-radius:50%;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,34px);width:var(--calendar-selected-day-size,34px)}
+@import '../../../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));display:flex;flex-direction:column;height:100%}.smart-calendar__month-title{font-size:var(--calendar-month-title-font-size,14px);font-weight:var(--font-weight-bold,500);height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__days{display:flex;flex-wrap:wrap;position:relative;-webkit-user-select:none;user-select:none}.smart-calendar__month-mark{color:var(--calendar-month-mark-color,hsla(210,6%,87%,.6));font-size:var(--calendar-month-mark-font-size,160px);left:50%;pointer-events:none;position:absolute;top:50%;transform:translate(-50%,-50%);z-index:0}.smart-calendar__day,.smart-calendar__selected-day{align-items:center;display:flex;justify-content:center;text-align:center}.smart-calendar__day{font-size:var(--calendar-day-font-size,15px);font-weight:var(--calendar-day-font-weight,500);height:var(--calendar-day-height,100rpx);position:relative;width:14.285%}.smart-calendar__day--end,.smart-calendar__day--multiple-middle,.smart-calendar__day--multiple-selected,.smart-calendar__day--start,.smart-calendar__day--start-end{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-bottom-left-radius:var(--calendar-day-select-border-radius,34rpx);border-top-left-radius:var(--calendar-day-select-border-radius,34rpx)}.smart-calendar__day--end{border-bottom-right-radius:var(--calendar-day-select-border-radius,34rpx);border-top-right-radius:var(--calendar-day-select-border-radius,34rpx)}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{background-color:var(--calendar-range-edge-background-color,#3678e3);color:var(--calendar-range-middle-color,var(--app-B3,#fff))}.smart-calendar__day--disabled{color:var(--calendar-day-disabled-color,#c8c9cc);cursor:default}.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:var(--calendar-info-font-size,10px);left:0;line-height:var(--calendar-info-line-height,14px);position:absolute;right:0}@media (max-width:350px){.smart-calendar__bottom-info,.smart-calendar__top-info{font-size:9px}}.smart-calendar__top-info{top:6px}.smart-calendar__bottom-info{bottom:6px}.smart-calendar__selected-day{background-color:var(--calendar-selected-day-background-color,#3678e3);border-radius:50%;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,34px);width:var(--calendar-selected-day-size,34px)}

package/lib/calendar/components/month-list/index.css

@@ -1 +1 @@
-@import '../../../common/index.css';.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}
+@import '../../../common/index.css';.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;height:104rpx;line-height:104rpx;text-align:center;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/lib/calendar/components/month-list/index.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // components/month-list.js
 var utils_1 = require("../../utils");
 var component_1 = require("../../../common/component");
+var currentYear = new Date().getFullYear();
+var minMonthDate = new Date(currentYear - 10, 1, 1).getTime();
+var maxMonthDate = new Date(currentYear + 10, 12, 31).getTime();
 (0, component_1.SmartComponent)({
     /**
      * 组件的属性列表
@@ -12,30 +15,25 @@ var component_1 = require("../../../common/component");
             type: null,
             observer: function (newVal, oldVal) {
                 if (newVal !== oldVal) {
-                    this.calcMonth();
+                    this.getMonthList();
                 }
             },
         },
+        color: {
+            type: String,
+            value: '#3678e3'
+        },
         minDate: {
             type: null,
-            value: new Date(new Date().getFullYear(), 0, 1).getTime(),
+            value: minMonthDate,
         },
         maxDate: {
             type: null,
-            value: new Date(new Date().getFullYear(), 11, 31).getTime(),
+            value: maxMonthDate,
         },
-        currentYear: {
-            type: null,
-            value: new Date().getFullYear(),
-        },
-        visibleIndex: {
-            type: Number,
-            value: 0,
-            observer: function (newVal, oldVal) {
-                if (newVal !== oldVal) {
-                    this.getMonthList();
-                }
-            },
+        readonly: {
+            type: Boolean,
+            value: false
         },
         monthsFormatter: {
             type: null,
@@ -64,22 +62,16 @@ var component_1 = require("../../../common/component");
     },
     created: function () {
         this.getMonthList();
-        this.calcMonth();
     },
     /**
      * 组件的方法列表
      */
     methods: {
-        calcMonth: function () {
-            var date = new Date(this.data.date);
-            var cur = date.getMonth();
-            this.setData({
-                currentMonth: cur,
-            });
-        },
         getMonthList: function () {
-            var _a = this.data, minDate = _a.minDate, maxDate = _a.maxDate, visibleIndex = _a.visibleIndex, _b = _a.monthsFormatter, monthsFormatter = _b === void 0 ? [] : _b;
-            var cur = new Date().getFullYear() + visibleIndex;
+            var _a = this.data, minDate = _a.minDate, maxDate = _a.maxDate, _b = _a.monthsFormatter, monthsFormatter = _b === void 0 ? [] : _b;
+            var curDate = new Date(this.data.date);
+            var cur = curDate.getFullYear();
+            var curMonthDate = new Date(curDate.getFullYear(), curDate.getMonth(), 1);
             var start = new Date(cur, 0, 1).getTime();
             var end = new Date(cur, 11, 31).getTime();
             var minDateTime = new Date(minDate).getTime();
@@ -88,7 +80,10 @@ var component_1 = require("../../../common/component");
             var monthlist = months.map(function (date) {
                 var monthVal = new Date(date).getMonth();
                 var time = new Date(date).getTime();
-                var isDisabled = time < minDateTime || time > maxDateTime;
+                var isDisabled = false;
+                if (minDate && maxDate) {
+                    isDisabled = time < minDateTime || time > maxDateTime;
+                }
                 return {
                     value: date,
                     month: monthVal,
@@ -98,9 +93,12 @@ var component_1 = require("../../../common/component");
             });
             this.setData({
                 months: monthlist,
+                currentMonth: curMonthDate.getTime(),
             });
         },
         onClick: function (event) {
+            if (this.data.readonly)
+                return;
             var index = event.currentTarget.dataset.index;
             var item = this.data.months[index];
             if (item.type !== 'disabled') {

package/lib/calendar/components/month-list/index.wxml

@@ -1,9 +1,13 @@
-<view class="contain">
-  <smart-row>
-    <smart-col wx:for="{{months}}" span="6">
-      <view class="item {{ currentMonth === item.month ? 'item_active' : '' }} {{ item.type === 'disabled' ? 'item_disabled' : '' }}" data-index="{{index}}" bindtap="onClick">
-        {{item.text}}
-      </view>
-    </smart-col>
-  </smart-row>
-</view>
+<smart-row>
+  <smart-col wx:for="{{months}}" span="6">
+    <view wx:if="{{item.type === 'disabled'}}" class="item item_disabled" data-index="{{index}}">
+      {{item.text}}
+    </view>
+    <view wx:elif="{{currentMonth === item.value}}" class="item item_active" data-index="{{index}}" bindtap="onClick" style="background: {{ color }};">
+      {{item.text}}
+    </view>
+    <view wx:else class="item" data-index="{{index}}" bindtap="onClick">
+      {{item.text}}
+    </view>
+  </smart-col>
+</smart-row>

package/lib/calendar/components/month-list/index.wxss

@@ -1 +1 @@
-@import '../../../common/index.wxss';.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}
+@import '../../../common/index.wxss';.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;height:104rpx;line-height:104rpx;text-align:center;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/lib/calendar/components/year-list/index.css

@@ -1 +1 @@
-@import '../../../common/index.css';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}
+@import '../../../common/index.css';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;height:104rpx;line-height:104rpx;text-align:center;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/lib/calendar/components/year-list/index.js

@@ -16,6 +16,10 @@ var component_1 = require("../../../common/component");
                 }
             },
         },
+        readonly: {
+            type: Boolean,
+            value: false
+        },
         minDate: {
             type: null,
             value: new Date(new Date().getFullYear() - 30, 0, 1).getTime(),
@@ -24,6 +28,10 @@ var component_1 = require("../../../common/component");
             type: null,
             value: new Date(new Date().getFullYear() + 30, 11, 31).getTime(),
         },
+        color: {
+            type: String,
+            value: '#3678e3',
+        },
         currentYear: {
             type: null,
             value: new Date().getFullYear(),
@@ -76,12 +84,15 @@ var component_1 = require("../../../common/component");
             var yearlist = years.map(function (date) {
                 var yearVal = new Date(date).getFullYear();
                 var curTime = new Date(date).getTime();
-                var disabled = curTime <= minStart || curTime >= maxStart;
+                var isDisabled = false;
+                if (minDate && maxDate) {
+                    isDisabled = curTime <= minStart || curTime >= maxStart;
+                }
                 return {
                     value: date,
                     year: yearVal,
                     text: yearFormatter.replace('YYYY', yearVal),
-                    type: disabled ? 'disabled' : '',
+                    type: isDisabled ? 'disabled' : '',
                 };
             });
             this.setData({
@@ -89,6 +100,8 @@ var component_1 = require("../../../common/component");
             });
         },
         onClick: function (event) {
+            if (this.data.readonly)
+                return;
             var index = event.currentTarget.dataset.index;
             var item = this.data.years[index];
             if (item.type !== 'disabled') {

package/lib/calendar/components/year-list/index.wxml

@@ -1,7 +1,13 @@
 <view class="contain">
   <smart-row>
     <smart-col wx:for="{{years}}" span="6">
-      <view class="item {{ currentYear === item.year ? 'item_active' : '' }} {{ item.type === 'disabled' ? 'item_disabled' : '' }}" data-index="{{index}}" bindtap="onClick">
+      <view wx:if="{{item.type === 'disabled'}}" class="item item_disabled" data-index="{{index}}">
+        {{item.text}}
+      </view>
+      <view wx:elif="{{currentYear === item.year}}" class="item item_active" data-index="{{index}}" bindtap="onClick" style="background: {{ color }};">
+        {{item.text}}
+      </view>
+      <view wx:else class="item" data-index="{{index}}" bindtap="onClick">
         {{item.text}}
       </view>
     </smart-col>

package/lib/calendar/components/year-list/index.wxss

@@ -1 +1 @@
-@import '../../../common/index.wxss';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;line-height:104rpx;text-align:center}.item,.item_active{height:104rpx;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}
+@import '../../../common/index.wxss';.contain{margin:24rpx 0}.item{border-radius:50%;color:rgba(0,0,0,.9);font-size:15px;font-weight:500;height:104rpx;line-height:104rpx;text-align:center;width:104rpx}.item_active{background:#3678e3;color:#fff}.item_disabled{opacity:.5}

package/lib/calendar/index.js

@@ -15,11 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var utils_1 = require("./utils");
 var toast_1 = __importDefault(require("../toast/toast"));
-var initialMinDate = (0, utils_1.getToday)().getTime();
-var initialMaxDate = (function () {
-    var now = (0, utils_1.getToday)();
-    return new Date(now.getFullYear(), now.getMonth() + 6, now.getDate()).getTime();
-})();
+var dateEdge = (0, utils_1.getInitEdgeDate)('year');
 var getTime = function (date) {
     return date instanceof Date ? date.getTime() : date;
 };
@@ -27,7 +23,7 @@ var getTime = function (date) {
     props: {
         title: {
             type: String,
-            value: '日期选择',
+            value: 'Select Date',
         },
         color: String,
         show: {
@@ -63,18 +59,13 @@ var getTime = function (date) {
                 rangeEnd: 'End',
             },
         },
-        formatter: null,
         confirmText: {
             type: String,
-            value: '确定',
+            value: 'Confirm',
         },
         confirmDisabledText: {
             type: String,
-            value: '确定',
-        },
-        mode: {
-            type: String,
-            value: 'day',
+            value: 'Confirm',
         },
         rangePrompt: String,
         showRangePrompt: {
@@ -97,11 +88,11 @@ var getTime = function (date) {
         },
         minDate: {
             type: Number,
-            value: initialMinDate,
+            value: dateEdge.min
         },
         maxDate: {
             type: Number,
-            value: initialMaxDate,
+            value: dateEdge.max
         },
         position: {
             type: String,
@@ -117,7 +108,7 @@ var getTime = function (date) {
         },
         poppable: {
             type: Boolean,
-            value: true,
+            value: false,
         },
         showMark: {
             type: Boolean,
@@ -189,15 +180,19 @@ var getTime = function (date) {
     methods: {
         onPrev: function () {
             var visibleIndex = this.data.visibleIndex - 1;
-            if (this.data.mode === 'year') {
+            if (this.data.type === 'year') {
                 this.setData({
                     visibleIndex: visibleIndex,
                 });
                 return;
             }
-            if (this.data.mode === 'month') {
+            if (this.data.type === 'month') {
+                var nextDate = new Date(this.data.currentDate);
+                nextDate.setFullYear(nextDate.getFullYear() - 1);
+                this.select(nextDate, true);
                 this.setData({
                     visibleIndex: visibleIndex,
+                    currentDate: nextDate,
                 });
                 return;
             }
@@ -209,15 +204,19 @@ var getTime = function (date) {
         },
         onNext: function () {
             var visibleIndex = this.data.visibleIndex + 1;
-            if (this.data.mode === 'year') {
+            if (this.data.type === 'year') {
                 this.setData({
                     visibleIndex: visibleIndex,
                 });
                 return;
             }
-            if (this.data.mode === 'month') {
+            if (this.data.type === 'month') {
+                var nextDate = new Date(this.data.currentDate);
+                nextDate.setFullYear(nextDate.getFullYear() + 1);
+                this.select(nextDate, true);
                 this.setData({
                     visibleIndex: visibleIndex,
+                    currentDate: nextDate,
                 });
                 return;
             }
@@ -231,16 +230,14 @@ var getTime = function (date) {
             this.setData({ currentDate: this.getInitialDate(this.data.defaultDate) });
             this.scrollIntoView();
         },
-        initYearIdx: function (currentDate) {
-        },
         initData: function () {
             var currentDate = this.getInitialDate(this.data.defaultDate);
             var months = (0, utils_1.getMonths)(this.data.minDate, this.data.maxDate);
             var visibleIndex = this.data.defaultDate
                 ? (0, utils_1.getCurrentIndex)(currentDate, months)
                 : months.length - 1;
-            var isYear = this.data.mode === 'year';
-            var isMonth = this.data.mode === 'month';
+            var isYear = this.data.type === 'year';
+            var isMonth = this.data.type === 'month';
             var data = {
                 currentDate: currentDate,
                 months: months,
@@ -260,8 +257,9 @@ var getTime = function (date) {
         limitDateRange: function (date, minDate, maxDate) {
             if (minDate === void 0) { minDate = null; }
             if (maxDate === void 0) { maxDate = null; }
-            minDate = minDate || this.data.minDate;
-            maxDate = maxDate || this.data.maxDate;
+            var _a = (0, utils_1.getInitEdgeDate)(this.data.type), min = _a.min, max = _a.max;
+            minDate = minDate || this.data.minDate || min;
+            maxDate = maxDate || this.data.maxDate || max;
             if ((0, utils_1.compareDay)(date, minDate) === -1) {
                 return minDate;
             }

package/lib/calendar/index.wxs

@@ -47,7 +47,7 @@ function formatMonthTitle(date, formatter = 'YYYY-MM') {
 
 function formatYearTitle(date, offset, formatter = 'YYYY') {
   date = getDate(date);
-  const year = date.getFullYear() + offset;
+  const year = date.getFullYear();
   return formatter.replace('YYYY', year + '');
 }
 

package/lib/calendar/utils.d.ts

@@ -16,3 +16,7 @@ export declare function getWeekStartAndEnd(date: Date): {
     weekStart: Date;
     weekEnd: Date;
 };
+export declare const getInitEdgeDate: (type: string) => {
+    min: number;
+    max: number;
+};

package/lib/calendar/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWeekStartAndEnd = exports.getCurrentIndex = exports.getYears = exports.getMonths = exports.getMonthEndDay = exports.copyDates = exports.calcDateNum = exports.getToday = exports.getNextDay = exports.getPrevDay = exports.getDayByOffset = exports.compareDay = exports.compareMonth = exports.formatMonthTitle = exports.ROW_HEIGHT = void 0;
+exports.getInitEdgeDate = exports.getWeekStartAndEnd = exports.getCurrentIndex = exports.getYears = exports.getMonths = exports.getMonthEndDay = exports.copyDates = exports.calcDateNum = exports.getToday = exports.getNextDay = exports.getPrevDay = exports.getDayByOffset = exports.compareDay = exports.compareMonth = exports.formatMonthTitle = exports.ROW_HEIGHT = void 0;
 exports.ROW_HEIGHT = 34;
 function formatMonthTitle(date, formatter) {
     if (formatter === void 0) { formatter = 'YYYY-MM'; }
@@ -147,3 +147,32 @@ function getWeekStartAndEnd(date) {
     };
 }
 exports.getWeekStartAndEnd = getWeekStartAndEnd;
+var getInitEdgeDate = function (type) {
+    var currentYear = new Date().getFullYear();
+    if (type === 'month') {
+        var minMonthDate = new Date(currentYear - 1, 1, 1).getTime();
+        var maxMonthDate = new Date(currentYear + 1, 12, 31).getTime();
+        return {
+            min: minMonthDate,
+            max: maxMonthDate,
+        };
+    }
+    if (type === 'year') {
+        var minMonthDate = new Date(currentYear - 10, 1, 1).getTime();
+        var maxMonthDate = new Date(currentYear + 10, 12, 31).getTime();
+        return {
+            min: minMonthDate,
+            max: maxMonthDate,
+        };
+    }
+    var initialMinDate = getToday().getTime();
+    var initialMaxDate = (function () {
+        var now = getToday();
+        return new Date(now.getFullYear(), now.getMonth() + 6, now.getDate()).getTime();
+    })();
+    return {
+        min: initialMinDate,
+        max: initialMaxDate,
+    };
+};
+exports.getInitEdgeDate = getInitEdgeDate;

package/lib/notice-bar/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-notice-bar{--notice-bar-info-color:#1989fa;--notice-bar-warning-color:#ffa000;--notice-bar-error-color:#f04c4c;--notice-bar-right-icon-color:rgba(0,0,0,.2);align-items:center;background-color:var(--notice-bar-background-color,rgba(25,137,250,.1));color:var(--notice-bar-text-color,var(--app-B6-N3,rgba(0,0,0,.5)));display:flex;font-size:var(--notice-bar-font-size,12px);height:var(--notice-bar-height,40px);line-height:var(--notice-bar-line-height,14px);padding:var(--notice-bar-padding,0 16px)}.smart-notice-bar--warning{background-color:var(--notice-bar-background-warning-color,rgba(255,160,0,.1))}.smart-notice-bar--error{background-color:var(--notice-bar-background-error-color,rgba(240,76,76,.1))}.smart-notice-bar--hover{opacity:.6}.smart-notice-bar--wrapable{height:auto;padding:var(--notice-bar-wrapable-padding,8px 16px)}.smart-notice-bar--wrapable .smart-notice-bar__wrap{height:auto}.smart-notice-bar--wrapable .smart-notice-bar__content{position:relative;white-space:normal}.smart-notice-bar__left-icon{align-items:center;display:flex;font-size:var(--notice-bar-icon-size,16px);margin-right:var(--notice-bar-left-icon-margin-right,8px);vertical-align:middle}.smart-notice-bar__right-icon{font-size:var(--notice-bar-icon-size,16px);margin-left:var(--notice-bar-right-icon-margin-left,8px)}.smart-notice-bar__wrap{flex:1;height:var(--notice-bar-line-height,14px);overflow:hidden;position:relative}.smart-notice-bar__content{position:absolute;white-space:nowrap}.smart-notice-bar__content.smart-ellipsis{max-width:100%}.smart-notice-bar__content__btn{color:#1989fa;display:inline-block}
+@import '../common/index.css';.smart-notice-bar{--notice-bar-info-color:#1989fa;--notice-bar-warning-color:#ffa000;--notice-bar-error-color:#f04c4c;--notice-bar-right-icon-color:rgba(0,0,0,.2);align-items:center;background-color:var(--notice-bar-background-color,rgba(25,137,250,.1));color:var(--notice-bar-text-color,var(--app-B6-N3,rgba(0,0,0,.5)));display:flex;font-size:var(--notice-bar-font-size,12px);height:var(--notice-bar-height,40px);line-height:var(--notice-bar-line-height,14px);padding:var(--notice-bar-padding,0 16px)}.smart-notice-bar--warning{background-color:var(--notice-bar-background-warning-color,rgba(255,160,0,.1))}.smart-notice-bar--error{background-color:var(--notice-bar-background-error-color,rgba(240,76,76,.1))}.smart-notice-bar--hover{opacity:.6}.smart-notice-bar--wrapable{height:auto;padding:var(--notice-bar-wrapable-padding,8px 16px)}.smart-notice-bar--wrapable .smart-notice-bar__wrap{height:auto}.smart-notice-bar--wrapable .smart-notice-bar__content{position:relative;white-space:normal}.smart-notice-bar__left-icon{align-items:center;display:flex;font-size:var(--notice-bar-icon-size,16px);margin-right:var(--notice-bar-left-icon-margin-right,8px);vertical-align:middle}.smart-notice-bar__right-icon{font-size:var(--notice-bar-icon-size,16px);margin-left:var(--notice-bar-right-icon-margin-left,8px)}.smart-notice-bar__wrap{flex:1;height:var(--notice-bar-line-height,14px);overflow:hidden;position:relative}.smart-notice-bar__content{position:absolute;white-space:nowrap}.smart-notice-bar__content.smart-ellipsis{max-width:100%}.smart-notice-bar__content__btn{color:var(--notice-bar-btn-color,var(--app-M4,#1989fa));display:inline-block}

package/lib/notice-bar/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-notice-bar{--notice-bar-info-color:#1989fa;--notice-bar-warning-color:#ffa000;--notice-bar-error-color:#f04c4c;--notice-bar-right-icon-color:rgba(0,0,0,.2);align-items:center;background-color:var(--notice-bar-background-color,rgba(25,137,250,.1));color:var(--notice-bar-text-color,var(--app-B6-N3,rgba(0,0,0,.5)));display:flex;font-size:var(--notice-bar-font-size,12px);height:var(--notice-bar-height,40px);line-height:var(--notice-bar-line-height,14px);padding:var(--notice-bar-padding,0 16px)}.smart-notice-bar--warning{background-color:var(--notice-bar-background-warning-color,rgba(255,160,0,.1))}.smart-notice-bar--error{background-color:var(--notice-bar-background-error-color,rgba(240,76,76,.1))}.smart-notice-bar--hover{opacity:.6}.smart-notice-bar--wrapable{height:auto;padding:var(--notice-bar-wrapable-padding,8px 16px)}.smart-notice-bar--wrapable .smart-notice-bar__wrap{height:auto}.smart-notice-bar--wrapable .smart-notice-bar__content{position:relative;white-space:normal}.smart-notice-bar__left-icon{align-items:center;display:flex;font-size:var(--notice-bar-icon-size,16px);margin-right:var(--notice-bar-left-icon-margin-right,8px);vertical-align:middle}.smart-notice-bar__right-icon{font-size:var(--notice-bar-icon-size,16px);margin-left:var(--notice-bar-right-icon-margin-left,8px)}.smart-notice-bar__wrap{flex:1;height:var(--notice-bar-line-height,14px);overflow:hidden;position:relative}.smart-notice-bar__content{position:absolute;white-space:nowrap}.smart-notice-bar__content.smart-ellipsis{max-width:100%}.smart-notice-bar__content__btn{color:#1989fa;display:inline-block}
+@import '../common/index.wxss';.smart-notice-bar{--notice-bar-info-color:#1989fa;--notice-bar-warning-color:#ffa000;--notice-bar-error-color:#f04c4c;--notice-bar-right-icon-color:rgba(0,0,0,.2);align-items:center;background-color:var(--notice-bar-background-color,rgba(25,137,250,.1));color:var(--notice-bar-text-color,var(--app-B6-N3,rgba(0,0,0,.5)));display:flex;font-size:var(--notice-bar-font-size,12px);height:var(--notice-bar-height,40px);line-height:var(--notice-bar-line-height,14px);padding:var(--notice-bar-padding,0 16px)}.smart-notice-bar--warning{background-color:var(--notice-bar-background-warning-color,rgba(255,160,0,.1))}.smart-notice-bar--error{background-color:var(--notice-bar-background-error-color,rgba(240,76,76,.1))}.smart-notice-bar--hover{opacity:.6}.smart-notice-bar--wrapable{height:auto;padding:var(--notice-bar-wrapable-padding,8px 16px)}.smart-notice-bar--wrapable .smart-notice-bar__wrap{height:auto}.smart-notice-bar--wrapable .smart-notice-bar__content{position:relative;white-space:normal}.smart-notice-bar__left-icon{align-items:center;display:flex;font-size:var(--notice-bar-icon-size,16px);margin-right:var(--notice-bar-left-icon-margin-right,8px);vertical-align:middle}.smart-notice-bar__right-icon{font-size:var(--notice-bar-icon-size,16px);margin-left:var(--notice-bar-right-icon-margin-left,8px)}.smart-notice-bar__wrap{flex:1;height:var(--notice-bar-line-height,14px);overflow:hidden;position:relative}.smart-notice-bar__content{position:absolute;white-space:nowrap}.smart-notice-bar__content.smart-ellipsis{max-width:100%}.smart-notice-bar__content__btn{color:var(--notice-bar-btn-color,var(--app-M4,#1989fa));display:inline-block}

package/lib/search/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-search{align-items:center;background-color:var(--search-background-color,var(--app-B3,#fff));box-sizing:border-box;display:flex;padding:var(--search-padding,12px 16px)}.smart-search__content{align-items:center;background-color:var(--search-body-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:flex;flex:1;flex-direction:row;padding:12px 16px}.smart-search__content--round{border-radius:999px}.smart-search__label{color:var(--search-label-color,var(--app-B4-N1,#000));font-size:var(--search-label-font-size,14px);line-height:var(--search-input-height,24px);padding:var(--search-label-padding,0 5px)}.smart-search__field{flex:1}.smart-search__field__left-icon{--icon-color:var(--search-left-icon-color,var(--app-B4-N4,rgba(0,0,0,.4)));margin-left:2px}.smart-search__input{font-size:var(--search-value-font-size,14px)}.smart-search--withaction{padding-right:0}.smart-search__action{color:var(--search-action-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--search-action-font-size,14px);line-height:var(--search-input-height,24px)}.smart-search__action--hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:.4}.smart-search__action-button{padding:var(--search-action-padding,0 16px 0 12px)}.smart-search__hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:.4}.smart-search__submit{align-items:center;color:var(--search-submit-color,var(--app-M1,#3678e3));display:flex;flex-direction:row;font-size:var(--search-submit-font-size,14px)}.smart-search__submit:before{background-color:var(--search-submit-color,var(--app-M1,#3678e3));content:"";display:block;height:12px;margin-right:12px;width:1px}
+@import '../common/index.css';.smart-search{align-items:center;background-color:var(--search-background-color,var(--app-B3,#fff));box-sizing:border-box;display:flex;padding:var(--search-padding,12px 16px)}.smart-search__content{align-items:center;background-color:var(--search-body-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:flex;flex:1;flex-direction:row;padding:12px 16px}.smart-search__content--round{border-radius:999px}.smart-search__label{color:var(--search-label-color,var(--app-B4-N1,#000));font-size:var(--search-label-font-size,14px);line-height:var(--search-input-height,24px);padding:var(--search-label-padding,0 5px)}.smart-search__field{flex:1}.smart-search__field__left-icon{--icon-color:var(--search-left-icon-color,var(--app-B4-N4,rgba(0,0,0,.4)));margin-left:2px}.smart-search__input{font-size:var(--search-value-font-size,14px)}.smart-search--withaction{padding-right:0}.smart-search__action{color:var(--search-action-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--search-action-font-size,14px);line-height:var(--search-input-height,24px)}.smart-search__action--hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:var(--search-btn-hover-opacity,.4)}.smart-search__action-button{padding:var(--search-action-padding,0 16px 0 12px)}.smart-search__hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:var(--search-btn-hover-opacity,.4)}.smart-search__submit{align-items:center;color:var(--search-submit-color,var(--app-M1,#3678e3));display:flex;flex-direction:row;font-size:var(--search-submit-font-size,14px)}.smart-search__submit:before{background-color:var(--search-submit-color,var(--app-M1,#3678e3));content:"";display:block;height:var(--search-submit-line-height,12px);margin-right:12px;width:var(--search-submit-line-width,1px)}

package/lib/search/index.js

@@ -32,11 +32,7 @@ var Close_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Close"));
         rightIcon: String,
         placeholder: String,
         placeholderStyle: String,
-        searchText: {
-            type: String,
-            value: 'Search',
-        },
-        showSearchButton: Boolean,
+        searchText: String,
         background: String,
         actionText: {
             type: String,

package/lib/search/index.wxml

@@ -40,7 +40,7 @@
       <smart-icon wx:if="{{ !useLeftIconSlot && leftIcon }}" size="18" name="{{ leftIcon }}" custom-class="smart-search__field__left-icon" slot="left-icon" />
       <slot wx:if="{{ useLeftIconSlot }}" name="left-icon" slot="left-icon" />
       <slot wx:if="{{ useRightIconSlot }}" name="right-icon" slot="right-icon" />
-      <view wx:if="{{ showSearchButton && searchText }}" hover-class="smart-search__hover" bind:tap="goSearch" class="smart-search__submit" slot="button" >{{ searchText }}</view>
+      <view wx:if="{{ searchText }}" hover-class="smart-search__hover" bind:tap="goSearch" class="smart-search__submit" slot="button" >{{ searchText }}</view>
       <slot name="search-button" slot="button" />
     </smart-field>
   </view>

package/lib/search/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-search{align-items:center;background-color:var(--search-background-color,var(--app-B3,#fff));box-sizing:border-box;display:flex;padding:var(--search-padding,12px 16px)}.smart-search__content{align-items:center;background-color:var(--search-body-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:flex;flex:1;flex-direction:row;padding:12px 16px}.smart-search__content--round{border-radius:999px}.smart-search__label{color:var(--search-label-color,var(--app-B4-N1,#000));font-size:var(--search-label-font-size,14px);line-height:var(--search-input-height,24px);padding:var(--search-label-padding,0 5px)}.smart-search__field{flex:1}.smart-search__field__left-icon{--icon-color:var(--search-left-icon-color,var(--app-B4-N4,rgba(0,0,0,.4)));margin-left:2px}.smart-search__input{font-size:var(--search-value-font-size,14px)}.smart-search--withaction{padding-right:0}.smart-search__action{color:var(--search-action-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--search-action-font-size,14px);line-height:var(--search-input-height,24px)}.smart-search__action--hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:.4}.smart-search__action-button{padding:var(--search-action-padding,0 16px 0 12px)}.smart-search__hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:.4}.smart-search__submit{align-items:center;color:var(--search-submit-color,var(--app-M1,#3678e3));display:flex;flex-direction:row;font-size:var(--search-submit-font-size,14px)}.smart-search__submit:before{background-color:var(--search-submit-color,var(--app-M1,#3678e3));content:"";display:block;height:12px;margin-right:12px;width:1px}
+@import '../common/index.wxss';.smart-search{align-items:center;background-color:var(--search-background-color,var(--app-B3,#fff));box-sizing:border-box;display:flex;padding:var(--search-padding,12px 16px)}.smart-search__content{align-items:center;background-color:var(--search-body-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:flex;flex:1;flex-direction:row;padding:12px 16px}.smart-search__content--round{border-radius:999px}.smart-search__label{color:var(--search-label-color,var(--app-B4-N1,#000));font-size:var(--search-label-font-size,14px);line-height:var(--search-input-height,24px);padding:var(--search-label-padding,0 5px)}.smart-search__field{flex:1}.smart-search__field__left-icon{--icon-color:var(--search-left-icon-color,var(--app-B4-N4,rgba(0,0,0,.4)));margin-left:2px}.smart-search__input{font-size:var(--search-value-font-size,14px)}.smart-search--withaction{padding-right:0}.smart-search__action{color:var(--search-action-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--search-action-font-size,14px);line-height:var(--search-input-height,24px)}.smart-search__action--hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:var(--search-btn-hover-opacity,.4)}.smart-search__action-button{padding:var(--search-action-padding,0 16px 0 12px)}.smart-search__hover{background-color:var(--app-B4-N9,rgba(0,0,0,.05));opacity:var(--search-btn-hover-opacity,.4)}.smart-search__submit{align-items:center;color:var(--search-submit-color,var(--app-M1,#3678e3));display:flex;flex-direction:row;font-size:var(--search-submit-font-size,14px)}.smart-search__submit:before{background-color:var(--search-submit-color,var(--app-M1,#3678e3));content:"";display:block;height:var(--search-submit-line-height,12px);margin-right:12px;width:var(--search-submit-line-width,1px)}