@tuya-miniapp/smart-ui 1.1.0 → 1.2.2

package/dist/calendar/calendar.wxml

@@ -8,6 +8,7 @@
     showSubtitle="{{ showSubtitle }}"
     firstDayOfWeek="{{ firstDayOfWeek }}"
     bind:click-subtitle="onClickSubtitle"
+    defaultWeeks="{{locale.shortWeekDays || ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']}}"
   >
     <slot name="title" slot="title"></slot>
   </header>
@@ -22,7 +23,12 @@
       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 }}"

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

@@ -8,6 +8,7 @@ SmartComponent({
         subtitle: String,
         showTitle: Boolean,
         showSubtitle: Boolean,
+        defaultWeeks: Array,
         firstDayOfWeek: {
             type: Number,
             observer: 'initWeekDay',
@@ -21,7 +22,7 @@ SmartComponent({
     },
     methods: {
         initWeekDay() {
-            const defaultWeeks = ['日', '一', '二', '三', '四', '五', '六'];
+            const defaultWeeks = this.properties.defaultWeeks;
             const firstDayOfWeek = this.data.firstDayOfWeek || 0;
             this.setData({
                 weekdays: [

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

@@ -33,12 +33,18 @@ SmartComponent({
             type: Number,
             observer: 'setDays',
         },
+        visible: {
+            type: Boolean,
+            value: true
+        },
+        subFormatter: String,
+        rangeStart: String,
+        rangeEnd: String,
         allowSameDay: Boolean,
         showSubtitle: Boolean,
         showMonthTitle: Boolean,
     },
     data: {
-        visible: true,
         days: [],
     },
     methods: {
@@ -140,13 +146,13 @@ SmartComponent({
         getBottomInfo(type) {
             if (this.data.type === 'range') {
                 if (type === 'start') {
-                    return '开始';
+                    return this.properties.rangeStart || 'Start';
                 }
                 if (type === 'end') {
-                    return '结束';
+                    return this.properties.rangeEnd || 'End';
                 }
                 if (type === 'start-end') {
-                    return '开始/结束';
+                    return (this.properties.rangeStart || 'Start') + '/' + (this.properties.rangeEnd || 'End');
                 }
             }
         },

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

@@ -3,7 +3,7 @@
 
 <view class="smart-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
   <view wx:if="{{ showMonthTitle }}" class="smart-calendar__month-title">
-    {{ computed.formatMonthTitle(date) }}
+    {{ computed.formatMonthTitle(date, subFormatter) }}
   </view>
 
   <view wx:if="{{ visible }}" class="smart-calendar__days">
@@ -26,14 +26,13 @@
           {{ item.bottomInfo }}
         </view>
       </view>
-
-      <view wx:else>
+      <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>
-      </view>
+      </block>
     </view>
   </view>
 </view>

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

@@ -11,8 +11,8 @@ 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);
+    current === 7 && firstDayOfWeek === 0 ? 0 :
+      (current - firstDayOfWeek);
 
   if (index === 0) {
     style.push(['margin-left', (100 * offset) / 7 + '%']);
@@ -37,15 +37,17 @@ function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
   }
 
   return style
-    .map(function(item) {
+    .map(function (item) {
       return item.join(':');
     })
     .join(';');
 }
 
-function formatMonthTitle(date) {
+function formatMonthTitle(date, formatter = "YYYY-MM") {
   date = getDate(date);
-  return date.getFullYear() + '年' + (date.getMonth() + 1) + '月';
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() + 1 + "";
+  return formatter.replace('YYYY', year + '').replace('MM', month);
 }
 
 function getMonthStyle(visible, date, rowHeight) {

package/dist/calendar/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:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}

package/dist/calendar/index.js

@@ -24,6 +24,15 @@ SmartComponent({
                 }
             },
         },
+        locale: {
+            type: Object,
+            value: {
+                shortWeekDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+                subFormatter: 'YYYY-MM',
+                rangeStart: 'Start',
+                rangeEnd: 'End',
+            },
+        },
         formatter: null,
         confirmText: {
             type: String,
@@ -122,6 +131,7 @@ SmartComponent({
         subtitle: '',
         currentDate: null,
         scrollIntoView: '',
+        visibleIndex: 0
     },
     watch: {
         minDate() {
@@ -163,7 +173,7 @@ SmartComponent({
             contentObserver.observe('.month', (res) => {
                 if (res.boundingClientRect.top <= res.relativeRect.top) {
                     // @ts-ignore
-                    this.setData({ subtitle: formatMonthTitle(res.dataset.date) });
+                    this.setData({ subtitle: formatMonthTitle(res.dataset.date, this.properties.locale.subFormatter), visibleIndex: res.dataset.index });
                 }
             });
         },
@@ -221,7 +231,7 @@ SmartComponent({
                 const months = getMonths(minDate, maxDate);
                 months.some((month, index) => {
                     if (compareMonth(month, targetDate) === 0) {
-                        this.setData({ scrollIntoView: `month${index}` });
+                        this.setData({ scrollIntoView: `month${index}`, visibleIndex: index });
                         return true;
                     }
                     return false;

package/dist/calendar/index.wxs

@@ -31,7 +31,12 @@ function getButtonDisabled(type, currentDate, minRange) {
   return !currentDate;
 }
 
+function getVisible(visibleIndex, curIndex) {
+  return Math.abs(visibleIndex - curIndex) < 2;
+}
+
 module.exports = {
   getMonths: getMonths,
+  getVisible,
   getButtonDisabled: getButtonDisabled
 };

package/dist/calendar/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:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}

package/dist/calendar/utils.d.ts

@@ -1,5 +1,5 @@
 export declare const ROW_HEIGHT = 64;
-export declare function formatMonthTitle(date: Date): string;
+export declare function formatMonthTitle(date: Date, formatter?: string): string;
 export declare function compareMonth(date1: Date | number, date2: Date | number): 0 | 1 | -1;
 export declare function compareDay(day1: Date | number, day2: Date | number): 0 | 1 | -1;
 export declare function getDayByOffset(date: Date, offset: number): Date;

package/dist/calendar/utils.js

@@ -1,9 +1,11 @@
 export const ROW_HEIGHT = 64;
-export function formatMonthTitle(date) {
+export function formatMonthTitle(date, formatter = 'YYYY-MM') {
     if (!(date instanceof Date)) {
         date = new Date(date);
     }
-    return `${date.getFullYear()}年${date.getMonth() + 1}月`;
+    const year = date.getFullYear();
+    const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() + 1 + "";
+    return formatter.replace('YYYY', year + '').replace('MM', month);
 }
 export function compareMonth(date1, date2) {
     if (!(date1 instanceof Date)) {

package/dist/dialog/dialog.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="miniprogram-api-typings" />
 export type Action = 'confirm' | 'cancel' | 'overlay';
 type DialogContext = WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
+type AnyObject = {};
 interface DialogOptions {
     lang?: string;
     show?: boolean;
@@ -49,7 +50,12 @@ declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     alert(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     confirm(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
-    input(options: DialogInputOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
+    input: (options: DialogInputOptions) => Promise<WechatMiniprogram.Component.Instance<{
+        /**
+         * 输入框的当前值
+         */
+        inputValue: string;
+    }, AnyObject, AnyObject>>;
     close(): void;
     stopLoading(): void;
     currentOptions: DialogOptions;

package/dist/dialog/dialog.js

@@ -61,7 +61,7 @@ const Dialog = (options) => {
 };
 Dialog.alert = (options) => Dialog(options);
 Dialog.confirm = (options) => Dialog(Object.assign({ showCancelButton: true }, options));
-Dialog.input = (options) => Dialog(Object.assign({ showCancelButton: true }, options));
+Dialog.input = ((options) => Dialog(Object.assign({ showCancelButton: true }, options)));
 Dialog.close = () => {
     queue.forEach((dialog) => {
         dialog.close();

package/dist/dialog/index.js

@@ -123,6 +123,10 @@ SmartComponent({
             });
         },
         handleAction(action) {
+            // 避免快速点击时，dialog 已经被关闭了，但是还往下走导致 loading 一直存在
+            // see /tuyarn-kit/base/ray-smart-ui/-/issues/11
+            if (!this.data.show)
+                return;
             this.$emit(action, { dialog: this, value: this.data.inputValue });
             const { asyncClose, beforeClose } = this.data;
             if (!asyncClose && !beforeClose) {

package/lib/calendar/calendar.wxml

@@ -8,6 +8,7 @@
     showSubtitle="{{ showSubtitle }}"
     firstDayOfWeek="{{ firstDayOfWeek }}"
     bind:click-subtitle="onClickSubtitle"
+    defaultWeeks="{{locale.shortWeekDays || ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']}}"
   >
     <slot name="title" slot="title"></slot>
   </header>
@@ -22,7 +23,12 @@
       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 }}"

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

@@ -19,6 +19,7 @@ var component_1 = require("../../../common/component");
         subtitle: String,
         showTitle: Boolean,
         showSubtitle: Boolean,
+        defaultWeeks: Array,
         firstDayOfWeek: {
             type: Number,
             observer: 'initWeekDay',
@@ -32,7 +33,7 @@ var component_1 = require("../../../common/component");
     },
     methods: {
         initWeekDay: function () {
-            var defaultWeeks = ['日', '一', '二', '三', '四', '五', '六'];
+            var defaultWeeks = this.properties.defaultWeeks;
             var firstDayOfWeek = this.data.firstDayOfWeek || 0;
             this.setData({
                 weekdays: __spreadArray(__spreadArray([], defaultWeeks.slice(firstDayOfWeek, 7), true), defaultWeeks.slice(0, firstDayOfWeek), true),

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

@@ -35,12 +35,18 @@ var utils_1 = require("../../utils");
             type: Number,
             observer: 'setDays',
         },
+        visible: {
+            type: Boolean,
+            value: true
+        },
+        subFormatter: String,
+        rangeStart: String,
+        rangeEnd: String,
         allowSameDay: Boolean,
         showSubtitle: Boolean,
         showMonthTitle: Boolean,
     },
     data: {
-        visible: true,
         days: [],
     },
     methods: {
@@ -144,13 +150,13 @@ var utils_1 = require("../../utils");
         getBottomInfo: function (type) {
             if (this.data.type === 'range') {
                 if (type === 'start') {
-                    return '开始';
+                    return this.properties.rangeStart || 'Start';
                 }
                 if (type === 'end') {
-                    return '结束';
+                    return this.properties.rangeEnd || 'End';
                 }
                 if (type === 'start-end') {
-                    return '开始/结束';
+                    return (this.properties.rangeStart || 'Start') + '/' + (this.properties.rangeEnd || 'End');
                 }
             }
         },

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

@@ -3,7 +3,7 @@
 
 <view class="smart-calendar__month" style="{{ computed.getMonthStyle(visible, date, rowHeight) }}">
   <view wx:if="{{ showMonthTitle }}" class="smart-calendar__month-title">
-    {{ computed.formatMonthTitle(date) }}
+    {{ computed.formatMonthTitle(date, subFormatter) }}
   </view>
 
   <view wx:if="{{ visible }}" class="smart-calendar__days">
@@ -26,14 +26,13 @@
           {{ item.bottomInfo }}
         </view>
       </view>
-
-      <view wx:else>
+      <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>
-      </view>
+      </block>
     </view>
   </view>
 </view>

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

@@ -11,8 +11,8 @@ 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);
+    current === 7 && firstDayOfWeek === 0 ? 0 :
+      (current - firstDayOfWeek);
 
   if (index === 0) {
     style.push(['margin-left', (100 * offset) / 7 + '%']);
@@ -37,15 +37,17 @@ function getDayStyle(type, index, date, rowHeight, color, firstDayOfWeek) {
   }
 
   return style
-    .map(function(item) {
+    .map(function (item) {
       return item.join(':');
     })
     .join(';');
 }
 
-function formatMonthTitle(date) {
+function formatMonthTitle(date, formatter = "YYYY-MM") {
   date = getDate(date);
-  return date.getFullYear() + '年' + (date.getMonth() + 1) + '月';
+  const year = date.getFullYear();
+  const month = date.getMonth() + 1 < 10 ? `0${date.getMonth() + 1}` : date.getMonth() + 1 + "";
+  return formatter.replace('YYYY', year + '').replace('MM', month);
 }
 
 function getMonthStyle(visible, date, rowHeight) {

package/lib/calendar/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:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.css';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}

package/lib/calendar/index.js

@@ -40,6 +40,15 @@ var getTime = function (date) {
                 }
             },
         },
+        locale: {
+            type: Object,
+            value: {
+                shortWeekDays: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+                subFormatter: 'YYYY-MM',
+                rangeStart: 'Start',
+                rangeEnd: 'End',
+            },
+        },
         formatter: null,
         confirmText: {
             type: String,
@@ -138,6 +147,7 @@ var getTime = function (date) {
         subtitle: '',
         currentDate: null,
         scrollIntoView: '',
+        visibleIndex: 0
     },
     watch: {
         minDate: function () {
@@ -180,7 +190,7 @@ var getTime = function (date) {
             contentObserver.observe('.month', function (res) {
                 if (res.boundingClientRect.top <= res.relativeRect.top) {
                     // @ts-ignore
-                    _this.setData({ subtitle: (0, utils_1.formatMonthTitle)(res.dataset.date) });
+                    _this.setData({ subtitle: (0, utils_1.formatMonthTitle)(res.dataset.date, _this.properties.locale.subFormatter), visibleIndex: res.dataset.index });
                 }
             });
         },
@@ -243,7 +253,7 @@ var getTime = function (date) {
                 var months = (0, utils_1.getMonths)(minDate, maxDate);
                 months.some(function (month, index) {
                     if ((0, utils_1.compareMonth)(month, targetDate) === 0) {
-                        _this.setData({ scrollIntoView: "month".concat(index) });
+                        _this.setData({ scrollIntoView: "month".concat(index), visibleIndex: index });
                         return true;
                     }
                     return false;

package/lib/calendar/index.wxs

@@ -31,7 +31,12 @@ function getButtonDisabled(type, currentDate, minRange) {
   return !currentDate;
 }
 
+function getVisible(visibleIndex, curIndex) {
+  return Math.abs(visibleIndex - curIndex) < 2;
+}
+
 module.exports = {
   getMonths: getMonths,
+  getVisible,
   getButtonDisabled: getButtonDisabled
 };

package/lib/calendar/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:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}
+@import '../common/index.wxss';.smart-calendar{background-color:var(--calendar-background-color,var(--app-B6,#fff));color:var(--calendar-text-color,#000);display:flex;flex-direction:column;height:var(--calendar-height,100%)}.smart-calendar__close-icon{top:11px}.smart-calendar__popup--bottom,.smart-calendar__popup--top{height:var(--calendar-popup-height,90%)}.smart-calendar__popup--left,.smart-calendar__popup--right{height:100%}.smart-calendar__body{-webkit-overflow-scrolling:touch;flex:1;overflow:auto}.smart-calendar__footer{flex-shrink:0;padding:0 var(--padding-md,16px)}.smart-calendar__footer--safe-area-inset-bottom{padding-bottom:env(safe-area-inset-bottom)}.smart-calendar__footer+.smart-calendar__footer,.smart-calendar__footer:empty{display:none}.smart-calendar__footer:empty+.smart-calendar__footer{display:block!important}.smart-calendar__confirm{height:var(--calendar-confirm-button-height,36px)!important;line-height:var(--calendar-confirm-button-line-height,34px)!important;margin:var(--calendar-confirm-button-margin,7px 0)!important}

package/lib/calendar/utils.d.ts

@@ -1,5 +1,5 @@
 export declare const ROW_HEIGHT = 64;
-export declare function formatMonthTitle(date: Date): string;
+export declare function formatMonthTitle(date: Date, formatter?: string): string;
 export declare function compareMonth(date1: Date | number, date2: Date | number): 0 | 1 | -1;
 export declare function compareDay(day1: Date | number, day2: Date | number): 0 | 1 | -1;
 export declare function getDayByOffset(date: Date, offset: number): Date;

package/lib/calendar/utils.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 = 64;
-function formatMonthTitle(date) {
+function formatMonthTitle(date, formatter) {
+    if (formatter === void 0) { formatter = 'YYYY-MM'; }
     if (!(date instanceof Date)) {
         date = new Date(date);
     }
-    return "".concat(date.getFullYear(), "\u5E74").concat(date.getMonth() + 1, "\u6708");
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1 < 10 ? "0".concat(date.getMonth() + 1) : date.getMonth() + 1 + "";
+    return formatter.replace('YYYY', year + '').replace('MM', month);
 }
 exports.formatMonthTitle = formatMonthTitle;
 function compareMonth(date1, date2) {

package/lib/dialog/dialog.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="miniprogram-api-typings" />
 export type Action = 'confirm' | 'cancel' | 'overlay';
 type DialogContext = WechatMiniprogram.Page.TrivialInstance | WechatMiniprogram.Component.TrivialInstance;
+type AnyObject = {};
 interface DialogOptions {
     lang?: string;
     show?: boolean;
@@ -49,7 +50,12 @@ declare const Dialog: {
     (options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     alert(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
     confirm(options: DialogOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
-    input(options: DialogInputOptions): Promise<WechatMiniprogram.Component.TrivialInstance>;
+    input: (options: DialogInputOptions) => Promise<WechatMiniprogram.Component.Instance<{
+        /**
+         * 输入框的当前值
+         */
+        inputValue: string;
+    }, AnyObject, AnyObject>>;
     close(): void;
     stopLoading(): void;
     currentOptions: DialogOptions;

package/lib/dialog/dialog.js

@@ -76,9 +76,9 @@ Dialog.alert = function (options) { return Dialog(options); };
 Dialog.confirm = function (options) {
     return Dialog(__assign({ showCancelButton: true }, options));
 };
-Dialog.input = function (options) {
+Dialog.input = (function (options) {
     return Dialog(__assign({ showCancelButton: true }, options));
-};
+});
 Dialog.close = function () {
     queue.forEach(function (dialog) {
         dialog.close();

package/lib/dialog/index.js

@@ -131,6 +131,10 @@ var utils_1 = require("../common/utils");
         handleAction: function (action) {
             var _a;
             var _this = this;
+            // 避免快速点击时，dialog 已经被关闭了，但是还往下走导致 loading 一直存在
+            // see /tuyarn-kit/base/ray-smart-ui/-/issues/11
+            if (!this.data.show)
+                return;
             this.$emit(action, { dialog: this, value: this.data.inputValue });
             var _b = this.data, asyncClose = _b.asyncClose, beforeClose = _b.beforeClose;
             if (!asyncClose && !beforeClose) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "1.1.0",
+  "version": "1.2.2",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",