@tuya-miniapp/smart-ui 1.3.0-beta-1 → 1.3.1-beta-1

package/dist/toast/toast.d.ts

@@ -15,12 +15,14 @@ interface ToastOptions {
     loadingType?: string;
     message?: ToastMessage;
     onClose?: () => void;
+    width?: number;
 }
 declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance | undefined;
 declare namespace Toast {
     var loading: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;
     var success: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;
     var fail: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;
+    var warn: (options: ToastMessage | ToastOptions) => WechatMiniprogram.Component.TrivialInstance | undefined;
     var clear: () => void;
     var setDefaultOptions: (options: ToastOptions) => void;
     var resetDefaultOptions: () => void;

package/dist/toast/toast.js

@@ -10,6 +10,7 @@ const defaultOptions = {
     forbidClick: false,
     loadingType: 'circular',
     selector: '#smart-toast',
+    width: '100%',
 };
 let queue = [];
 let currentOptions = Object.assign({}, defaultOptions);
@@ -53,6 +54,7 @@ const createMethod = (type) => (options) => Toast(Object.assign({ type }, parseO
 Toast.loading = createMethod('loading');
 Toast.success = createMethod('success');
 Toast.fail = createMethod('fail');
+Toast.warn = createMethod('warn');
 Toast.clear = () => {
     queue.forEach((toast) => {
         toast.clear();

package/dist/wxs/style.wxs

@@ -1,5 +1,11 @@
+/*
+ * @Author: mjh
+ * @Date: 2024-08-02 11:38:15
+ * @LastEditors: mjh
+ * @LastEditTime: 2024-10-31 15:52:59
+ * @Description: 
+ */
 /* eslint-disable */
-var utils = require('./utils.wxs');
 var object = require('./object.wxs');
 var array = require('./array.wxs');
 
@@ -32,15 +38,15 @@ function style(styles) {
         return styles[key] != null && styles[key] !== '';
       })
       .map(function (key) {
-        if (utils.isAppThemeVar(key)) {
-          return [key, styles[key]].join(':');
-        }
         return [kebabCase(key), [styles[key]]].join(':');
       })
       .join(';');
   }
+  if (typeof styles === 'string') {
+    return styles
+  }
 
-  return styles;
+  return styles || '';
 }
 
 module.exports = style;

package/dist/wxs/utils.wxs

@@ -2,11 +2,9 @@
 var bem = require('./bem.wxs');
 var memoize = require('./memoize.wxs');
 var addUnit = require('./add-unit.wxs');
-var isAppThemeVar = require('./is-app-theme-var.wxs');
 
 module.exports = {
   bem: memoize(bem),
   memoize: memoize,
-  addUnit: addUnit,
-  isAppThemeVar: isAppThemeVar,
+  addUnit: addUnit
 };

package/lib/bottom-sheet/index.css

@@ -0,0 +1 @@
+@import '../common/index.css';.smart-bottom-sheet{color:var(--bottom-sheet-font-color,var(--app-B4-N1,#000));max-height:var(--bottom-sheet-max-height,50%)!important;min-height:var(--bottom-sheet-min-height,auto);padding:var(--bottom-sheet-padding,0 16px);padding-bottom:env(safe-area-inset-bottom);width:var(--bottom-sheet-width,100%)!important}.smart-bottom-sheet__header{color:var(--bottom-sheet-header-color,var(--app-B4-N1,#000));font-size:var(--bottom-sheet-header-font-size,17px);font-weight:var(--bottom-sheet-header-font-weight,600);line-height:var(--bottom-sheet-header-height,56px);text-align:center}.smart-bottom-sheet__icon{margin:var(--bottom-sheet-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}

package/lib/bottom-sheet/index.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/bottom-sheet/index.js

@@ -0,0 +1,75 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var Xmark_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Xmark"));
+var component_1 = require("../common/component");
+(0, component_1.SmartComponent)({
+    props: {
+        show: Boolean,
+        title: String,
+        iconSize: {
+            type: null,
+            value: 24,
+        },
+        round: {
+            type: Boolean,
+            value: true,
+        },
+        zIndex: {
+            type: Number,
+            value: 100,
+        },
+        overlay: {
+            type: Boolean,
+            value: true,
+        },
+        closeOnClickOverlay: {
+            type: Boolean,
+            value: true,
+        },
+        rootPortal: {
+            type: Boolean,
+            value: false,
+        },
+    },
+    data: {
+        xmarkIcon: Xmark_1.default,
+        xmarkIconColor: '#3678E3',
+    },
+    mounted: function () {
+        var _a;
+        // @ts-ignore
+        var themeInfo = (_a = ty === null || ty === void 0 ? void 0 : ty.getThemeInfo()) !== null && _a !== void 0 ? _a : {};
+        var xmarkIconColor = this.data.activeColor || themeInfo['--app-B4-N3'] || 'rgba(0, 0, 0, 0.5)';
+        this.setData({ xmarkIconColor: xmarkIconColor });
+    },
+    methods: {
+        onClose: function () {
+            this.$emit('close');
+        },
+        onClickOverlay: function () {
+            this.$emit('click-overlay');
+            this.onClose();
+        },
+        onBeforeEnter: function () {
+            this.$emit('before-enter');
+        },
+        onEnter: function () {
+            this.$emit('enter');
+        },
+        onAfterEnter: function () {
+            this.$emit('after-enter');
+        },
+        onBeforeLeave: function () {
+            this.$emit('before-leave');
+        },
+        onLeave: function () {
+            this.$emit('leave');
+        },
+        onAfterLeave: function () {
+            this.$emit('after-leave');
+        },
+    },
+});

package/lib/bottom-sheet/index.json

@@ -0,0 +1,8 @@
+{
+  "component": true,
+  "usingComponents": {
+    "smart-icon": "../icon/index",
+    "smart-popup": "../popup/index",
+    "smart-loading": "../loading/index"
+  }
+}

package/lib/bottom-sheet/index.wxml

@@ -0,0 +1,26 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<smart-popup
+  show="{{ show }}"
+  position="bottom"
+  round="{{ round }}"
+  z-index="{{ zIndex }}"
+  overlay="{{ overlay }}"
+  custom-class="smart-bottom-sheet custom-class"
+  safe-area-inset-bottom="{{false}}"
+  close-on-click-overlay="{{ closeOnClickOverlay }}"
+  root-portal="{{ rootPortal }}"
+  bind:close="onClickOverlay"
+  bind:before-enter="onBeforeEnter"
+  bind:enter="onEnter"
+  bind:after-enter="onAfterEnter"
+  bind:before-leave="onBeforeLeave"
+  bind:leave="onLeave"
+  bind:after-leave="onAfterLeave"
+>
+  <view wx:if="{{ title }}" class="smart-bottom-sheet__header">
+    {{ title }}
+    <smart-icon bind:click="onClose" name="{{ xmarkIcon }}" class="smart-bottom-sheet__icon" size="{{ iconSize }}" color="{{ xmarkIconColor }}" />
+  </view>
+  <slot />
+</smart-popup>

package/lib/bottom-sheet/index.wxss

@@ -0,0 +1 @@
+@import '../common/index.wxss';.smart-bottom-sheet{color:var(--bottom-sheet-font-color,var(--app-B4-N1,#000));max-height:var(--bottom-sheet-max-height,50%)!important;min-height:var(--bottom-sheet-min-height,auto);padding:var(--bottom-sheet-padding,0 16px);padding-bottom:env(safe-area-inset-bottom);width:var(--bottom-sheet-width,100%)!important}.smart-bottom-sheet__header{color:var(--bottom-sheet-header-color,var(--app-B4-N1,#000));font-size:var(--bottom-sheet-header-font-size,17px);font-weight:var(--bottom-sheet-header-font-weight,600);line-height:var(--bottom-sheet-header-height,56px);text-align:center}.smart-bottom-sheet__icon{margin:var(--bottom-sheet-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}

package/lib/button/index.js

@@ -30,6 +30,7 @@ var mixins = [button_1.button];
         disabled: Boolean,
         loadingText: String,
         customStyle: String,
+        textStyle: String,
         loadingType: {
             type: String,
             value: 'circular',

package/lib/button/index.wxml

@@ -49,7 +49,7 @@
       class="smart-button__icon"
       custom-style="line-height: inherit;"
     />
-    <view class="smart-button__text">
+    <view class="smart-button__text" style="{{textStyle}}">
       <slot />
     </view>
     <smart-icon

package/lib/calendar/calendar.wxml

@@ -4,73 +4,74 @@
   <header
     title="{{ title }}"
     showTitle="{{ showTitle }}"
-    subtitle="{{ subtitle }}"
+    subtitle="{{ mode === 'year' ? '' : mode === 'month' ? computed.formatYearTitle(currentDate, visibleIndex, locale.yearFormatter) : computed.formatMonthTitle(months[visibleIndex], subFormatter) }}"
+    subFormatter="{{locale.subFormatter || 'YYYY-MM'}}"
     showSubtitle="{{ showSubtitle }}"
     firstDayOfWeek="{{ firstDayOfWeek }}"
     bind:click-subtitle="onClickSubtitle"
     defaultWeeks="{{locale.shortWeekDays || ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']}}"
+    bind:click-prev="onPrev"
+    bind:click-next="onNext"
+    bind:click-save="onConfirm"
+    hideWeek="{{ mode !== 'day' }}"
   >
     <slot name="title" slot="title"></slot>
   </header>
 
-  <scroll-view
-    class="smart-calendar__body"
-    scroll-y
-    scroll-into-view="{{ scrollIntoView }}"
-  >
-    <month
-      wx:for="{{ computed.getMonths(minDate, maxDate) }}"
-      wx:key="index"
-      id="month{{ index }}"
-      class="month"
-      visible="{{ computed.getVisible(visibleIndex, index) }}"
-      subFormatter="{{locale.subFormatter || 'YYYY-MM'}}"
-      rangeStart="{{locale.rangeStart || 'Start'}}"
-      rangeEnd="{{locale.rangeEnd || 'End'}}"
-      data-date="{{ item }}"
-      data-index="{{index}}"
-      date="{{ item }}"
-      type="{{ type }}"
-      color="{{ color }}"
+  <block wx:if="{{mode === 'day'}}">
+    <view class="smart-calendar-month_wrap" wx:for="{{ months }}" wx:key="index">
+      <month
+        id="month{{ index }}"
+        class="smart-calendar-month month"
+        wx:if="{{ computed.getVisible(visibleIndex, index) }}"
+        subFormatter="{{locale.subFormatter || 'YYYY-MM'}}"
+        rangeStart="{{locale.rangeStart || 'Start'}}"
+        rangeEnd="{{locale.rangeEnd || 'End'}}"
+        data-date="{{ item }}"
+        data-index="{{index}}"
+        date="{{ item }}"
+        type="{{ type }}"
+        color="{{ color }}"
+        minDate="{{ minDate }}"
+        maxDate="{{ maxDate }}"
+        showMark="{{ showMark }}"
+        formatter="{{ formatter }}"
+        rowHeight="{{ rowHeight }}"
+        currentDate="{{ currentDate }}"
+        showSubtitle="{{ showSubtitle }}"
+        allowSameDay="{{ allowSameDay }}"
+        showMonthTitle="{{ index !== 0 || !showSubtitle }}"
+        firstDayOfWeek="{{ firstDayOfWeek }}"
+        bind:click="onClickDay"
+      />
+    </view>
+  </block>
+  
+  <block wx:if="{{mode === 'month'}}">
+    <month-list
       minDate="{{ minDate }}"
       maxDate="{{ maxDate }}"
-      showMark="{{ showMark }}"
-      formatter="{{ formatter }}"
-      rowHeight="{{ rowHeight }}"
-      currentDate="{{ currentDate }}"
-      showSubtitle="{{ showSubtitle }}"
-      allowSameDay="{{ allowSameDay }}"
-      showMonthTitle="{{ index !== 0 || !showSubtitle }}"
-      firstDayOfWeek="{{ firstDayOfWeek }}"
-      bind:click="onClickDay"
+      monthsFormatter="{{ locale.monthsFormatter }}"
+      bind:click="onClickDate"
+      date="{{defaultDate}}"
+      visibleIndex="{{visibleIndex}}"
     />
-  </scroll-view>
+  </block>
 
-  <view
-    class="{{ utils.bem('calendar__footer', { safeAreaInsetBottom }) }}"
-  >
-    <slot name="footer"></slot>
-  </view>
+  <block wx:if="{{mode === 'year'}}">
+    <year-list 
+      minDate="{{ minDate }}"
+      maxDate="{{ maxDate }}"
+      yearFormatter="{{ locale.yearFormatter }}"
+      bind:click="onClickDate"
+      date="{{defaultDate}}"
+      visibleIndex="{{visibleIndex}}"
+     />
+  </block>
 
   <view
     class="{{ utils.bem('calendar__footer', { safeAreaInsetBottom }) }}"
   >
-    <smart-button
-      wx:if="{{ showConfirm }}"
-      round
-      block
-      type="danger"
-      color="{{ color }}"
-      custom-class="smart-calendar__confirm"
-      disabled="{{ computed.getButtonDisabled(type, currentDate, minRange) }}"
-      nativeType="text"
-      bind:click="onConfirm"
-    >
-      {{
-        computed.getButtonDisabled(type, currentDate, minRange)
-          ? confirmDisabledText
-          : confirmText
-      }}
-    </smart-button>
+    <slot name="footer"></slot>
   </view>
 </view>

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

@@ -1 +1 @@
-@import '../../../common/index.css';.smart-calendar__header{box-shadow:var(--calendar-header-box-shadow,0 2px 10px hsla(220,1%,50%,.16));flex-shrink:0}.smart-calendar__header-subtitle,.smart-calendar__header-title{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__header-title+.smart-calendar__header-title,.smart-calendar__header-title:empty{display:none}.smart-calendar__header-title:empty+.smart-calendar__header-title{display:block!important}.smart-calendar__weekdays{display:flex}.smart-calendar__weekday{flex:1;font-size:var(--calendar-weekdays-font-size,12px);line-height:var(--calendar-weekdays-height,30px);text-align:center}
+@import '../../../common/index.css';.smart-calendar__header{flex-shrink:0}.smart-calendar__header-title{position:relative}.smart-calendar__header-title-save{color:var(--calendar-header-title-save-color,#1989fa);font-size:16px;font-weight:400;letter-spacing:0;line-height:24px;position:absolute;right:48rpx;text-align:right;top:50%;transform:translateY(-50%)}.smart-calendar__header-subtitle,.smart-calendar__header-title{font-size:16px;font-weight:var(--font-weight-bold,500);font-weight:500;height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__header-subtitle_wrap{align-items:center;display:flex;justify-content:center;position:relative}.smart-calendar__header-subtitle_left{left:52rpx}.smart-calendar__header-subtitle_left,.smart-calendar__header-subtitle_right{align-items:center;background:rgba(0,0,0,.05);border-radius:50%;display:flex;height:48rpx;justify-content:center;position:absolute;top:50%;transform:translateY(-50%);width:48rpx}.smart-calendar__header-subtitle_right{right:52rpx}.smart-calendar__header-title+.smart-calendar__header-title,.smart-calendar__header-title:empty{display:none}.smart-calendar__header-title:empty+.smart-calendar__header-title{display:block!important}.smart-calendar__weekdays{display:flex;margin-bottom:16rpx;margin-top:16rpx}.smart-calendar__weekday{color:var(--calendar-weekdays-font-color,var(--app-B4-N1,#000));flex:1;font-size:var(--calendar-weekdays-font-size,12px);font-weight:500;line-height:var(--calendar-weekdays-height,30px);opacity:.5;text-align:center}

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

@@ -8,18 +8,28 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../../../common/component");
+var Left_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Left"));
+var Right_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right"));
 (0, component_1.SmartComponent)({
     props: {
         title: {
             type: String,
             value: '日期选择',
         },
+        rightText: {
+            type: String,
+            value: '保存',
+        },
         subtitle: String,
         showTitle: Boolean,
         showSubtitle: Boolean,
         defaultWeeks: Array,
+        hideWeek: Boolean,
         firstDayOfWeek: {
             type: Number,
             observer: 'initWeekDay',
@@ -27,6 +37,8 @@ var component_1 = require("../../../common/component");
     },
     data: {
         weekdays: [],
+        LeftIcon: Left_1.default,
+        RightIcon: Right_1.default,
     },
     created: function () {
         this.initWeekDay();
@@ -42,5 +54,14 @@ var component_1 = require("../../../common/component");
         onClickSubtitle: function (event) {
             this.$emit('click-subtitle', event);
         },
+        onPrev: function () {
+            this.$emit('click-prev');
+        },
+        onNext: function () {
+            this.$emit('click-next');
+        },
+        onSave: function () {
+            this.$emit('click-save');
+        },
     },
 });

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

@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "smart-icon": "../../../icon/index"
+  }
 }

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

@@ -1,14 +1,25 @@
 <view class="smart-calendar__header">
   <block wx:if="{{ showTitle }}">
     <view class="smart-calendar__header-title"><slot name="title"></slot></view>
-    <view class="smart-calendar__header-title">{{ title }}</view>
+    <view class="smart-calendar__header-title">
+      {{ title }}
+      <view class="smart-calendar__header-title-save" bind:tap=="onSave">{{ rightText }}</view>
+    </view>
   </block>
 
-  <view wx:if="{{ showSubtitle }}" class="smart-calendar__header-subtitle" bind:tap="onClickSubtitle">
-    {{ subtitle }}
+  <view class="smart-calendar__header-subtitle_wrap">
+    <view class="smart-calendar__header-subtitle_left" bind:tap="onPrev">
+      <smart-icon name="{{LeftIcon}}" />
+    </view>
+    <view wx:if="{{ showSubtitle }}" class="smart-calendar__header-subtitle" bind:tap="onClickSubtitle">
+      {{ subtitle }}
+    </view>
+    <view class="smart-calendar__header-subtitle_right" bind:tap="onNext">
+      <smart-icon name="{{RightIcon}}" />
+    </view>
   </view>
 
-  <view class="smart-calendar__weekdays">
+  <view class="smart-calendar__weekdays" wx:if="{{!hideWeek}}">
     <view wx:for="{{ weekdays }}" wx:key="index" class="smart-calendar__weekday">
       {{ item }}
     </view>

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

@@ -1 +1 @@
-@import '../../../common/index.wxss';.smart-calendar__header{box-shadow:var(--calendar-header-box-shadow,0 2px 10px hsla(220,1%,50%,.16));flex-shrink:0}.smart-calendar__header-subtitle,.smart-calendar__header-title{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__header-title+.smart-calendar__header-title,.smart-calendar__header-title:empty{display:none}.smart-calendar__header-title:empty+.smart-calendar__header-title{display:block!important}.smart-calendar__weekdays{display:flex}.smart-calendar__weekday{flex:1;font-size:var(--calendar-weekdays-font-size,12px);line-height:var(--calendar-weekdays-height,30px);text-align:center}
+@import '../../../common/index.wxss';.smart-calendar__header{flex-shrink:0}.smart-calendar__header-title{position:relative}.smart-calendar__header-title-save{color:var(--calendar-header-title-save-color,#1989fa);font-size:16px;font-weight:400;letter-spacing:0;line-height:24px;position:absolute;right:48rpx;text-align:right;top:50%;transform:translateY(-50%)}.smart-calendar__header-subtitle,.smart-calendar__header-title{font-size:16px;font-weight:var(--font-weight-bold,500);font-weight:500;height:var(--calendar-header-title-height,44px);line-height:var(--calendar-header-title-height,44px);text-align:center}.smart-calendar__header-subtitle_wrap{align-items:center;display:flex;justify-content:center;position:relative}.smart-calendar__header-subtitle_left{left:52rpx}.smart-calendar__header-subtitle_left,.smart-calendar__header-subtitle_right{align-items:center;background:rgba(0,0,0,.05);border-radius:50%;display:flex;height:48rpx;justify-content:center;position:absolute;top:50%;transform:translateY(-50%);width:48rpx}.smart-calendar__header-subtitle_right{right:52rpx}.smart-calendar__header-title+.smart-calendar__header-title,.smart-calendar__header-title:empty{display:none}.smart-calendar__header-title:empty+.smart-calendar__header-title{display:block!important}.smart-calendar__weekdays{display:flex;margin-bottom:16rpx;margin-top:16rpx}.smart-calendar__weekday{color:var(--calendar-weekdays-font-color,var(--app-B4-N1,#000));flex:1;font-size:var(--calendar-weekdays-font-size,12px);font-weight:500;line-height:var(--calendar-weekdays-height,30px);opacity:.5;text-align:center}

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,16px);height:var(--calendar-day-height,64px);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,#ee0a24);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-radius:4px 0 0 4px}.smart-calendar__day--end{border-radius:0 4px 4px 0}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{color:var(--calendar-range-middle-color,#ee0a24)}.smart-calendar__day--middle:after{background-color:currentColor;bottom:0;content:"";left:0;opacity:var(--calendar-range-middle-background-opacity,.1);position:absolute;right:0;top:0}.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,#ee0a24);border-radius:4px;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,54px);width:var(--calendar-selected-day-size,54px)}
+@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)}

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

@@ -37,7 +37,7 @@ var utils_1 = require("../../utils");
         },
         visible: {
             type: Boolean,
-            value: true
+            value: true,
         },
         subFormatter: String,
         rangeStart: String,
@@ -145,6 +145,9 @@ var utils_1 = require("../../utils");
             if (type === 'range') {
                 return this.getRangeDayType(day);
             }
+            if (type === 'week') {
+                return this.getRangeDayType(day);
+            }
             return '';
         },
         getBottomInfo: function (type) {
@@ -156,7 +159,9 @@ var utils_1 = require("../../utils");
                     return this.properties.rangeEnd || 'End';
                 }
                 if (type === 'start-end') {
-                    return (this.properties.rangeStart || 'Start') + '/' + (this.properties.rangeEnd || 'End');
+                    return ((this.properties.rangeStart || 'Start') +
+                        '/' +
+                        (this.properties.rangeEnd || 'End'));
                 }
             }
         },

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

@@ -2,14 +2,7 @@
 <wxs src="../../../wxs/utils.wxs" module="utils" />
 
 <view class="smart-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
-  <view wx:if="{{ showMonthTitle }}" class="smart-calendar__month-title">
-    {{ computed.formatMonthTitle(date, subFormatter) }}
-  </view>
-
   <view wx:if="{{ visible }}" class="smart-calendar__days">
-    <view wx:if="{{ showMark }}" class="smart-calendar__month-mark">
-      {{ computed.getMark(date) }}
-    </view>
 
     <view
       wx:for="{{ days }}"
@@ -22,16 +15,10 @@
       <view wx:if="{{ item.type === 'selected' }}" class="smart-calendar__selected-day" style="width: {{ rowHeight }}px; height: {{ rowHeight }}px; background: {{ color }}">
         <view wx:if="{{ item.topInfo }}" class="smart-calendar__top-info">{{ item.topInfo }}</view>
         {{ item.text }}
-        <view wx:if="{{ item.bottomInfo }}" class="smart-calendar__bottom-info">
-          {{ item.bottomInfo }}
-        </view>
       </view>
       <block wx:else>
         <view wx:if="{{ item.topInfo }}" class="smart-calendar__top-info">{{ item.topInfo }}</view>
         {{ item.text }}
-        <view wx:if="{{ item.bottomInfo }}" class="smart-calendar__bottom-info">
-          {{ item.bottomInfo }}
-        </view>
       </block>
     </view>
   </view>

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

@@ -10,9 +10,12 @@ var ROW_HEIGHT = 64;
 function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
   var style = [];
   var current = getDate(date).getDay() || 7;
-  var offset = current < firstDayOfWeek ? (7 - firstDayOfWeek + current) :
-    current === 7 && firstDayOfWeek === 0 ? 0 :
-      (current - firstDayOfWeek);
+  var offset =
+    current < firstDayOfWeek
+      ? 7 - firstDayOfWeek + current
+      : current === 7 && firstDayOfWeek === 0
+      ? 0
+      : current - firstDayOfWeek;
 
   if (index === 0) {
     style.push(['margin-left', (100 * offset) / 7 + '%']);
@@ -32,7 +35,7 @@ function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
     ) {
       style.push(['background', color]);
     } else if (type === 'middle') {
-      style.push(['color', color]);
+      style.push(['background', color]);
     }
   }
 
@@ -43,10 +46,13 @@ function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
     .join(';');
 }
 
-function formatMonthTitle(date, formatter = "YYYY-MM") {
+function formatMonthTitle(date, formatter = 'YYYY-MM') {
   date = getDate(date);
   const year = date.getFullYear();
-  const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() + 1 + "";
+  const month =
+    date.getMonth() + 1 < 10
+      ? `0${date.getMonth() + 1}`
+      : date.getMonth() + 1 + '';
   return formatter.replace('YYYY', year + '').replace('MM', month);
 }
 
@@ -69,5 +75,5 @@ module.exports = {
   getMark: getMark,
   getDayStyle: getDayStyle,
   formatMonthTitle: formatMonthTitle,
-  getMonthStyle: getMonthStyle
+  getMonthStyle: getMonthStyle,
 };

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,16px);height:var(--calendar-day-height,64px);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,#ee0a24);color:var(--calendar-range-edge-color,#fff)}.smart-calendar__day--start{border-radius:4px 0 0 4px}.smart-calendar__day--end{border-radius:0 4px 4px 0}.smart-calendar__day--multiple-selected,.smart-calendar__day--start-end{border-radius:4px}.smart-calendar__day--middle{color:var(--calendar-range-middle-color,#ee0a24)}.smart-calendar__day--middle:after{background-color:currentColor;bottom:0;content:"";left:0;opacity:var(--calendar-range-middle-background-opacity,.1);position:absolute;right:0;top:0}.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,#ee0a24);border-radius:4px;color:var(--calendar-selected-day-color,#fff);height:var(--calendar-selected-day-size,54px);width:var(--calendar-selected-day-size,54px)}
+@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)}

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

@@ -0,0 +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}

package/lib/calendar/components/month-list/index.d.ts

@@ -0,0 +1 @@
+export {};