@tuya-miniapp/smart-ui 2.3.9-beta-2 → 2.4.0-beta-1

package/dist/calendar/calendar.wxml

@@ -76,5 +76,8 @@
       readonly="{{readonly}}"
      />
   </block>
-  <smart-toast wx:if="{{toastId}}" id="{{toastId}}" />
+  <smart-toast wx:if="{{showRangePrompt}}" show="{{showToast}}">
+    <text wx:if="{{rangePrompt}}" style="text-align:center;">{{ rangePrompt }}</text>
+    <text style="text-align:center;" wx:else>Days selected over {{maxRange}} days</text>
+  </smart-toast>
 </view>

package/dist/calendar/index.js

@@ -1,6 +1,5 @@
 import { SmartComponent } from '../common/component';
 import { ROW_HEIGHT, getPrevDay, getNextDay, getToday, compareDay, copyDates, calcDateNum, getMonths, getDayByOffset, getCurrentIndex, getWeekStartAndEnd, getInitEdgeDate, } from '../calendar-utils/utils';
-import Toast from '../toast/toast';
 const dateEdge = getInitEdgeDate('year');
 const getTime = (date) => (date instanceof Date ? date.getTime() : date);
 SmartComponent({
@@ -143,10 +142,6 @@ SmartComponent({
         dayClassMap: {
             type: null,
         },
-        toastId: {
-            type: String,
-            value: 'smart-toast-calendar',
-        },
     },
     data: {
         subtitle: '',
@@ -155,6 +150,7 @@ SmartComponent({
         scrollIntoView: '',
         visibleIndex: 0,
         months: [],
+        showToast: false,
     },
     watch: {
         minDate() {
@@ -416,14 +412,17 @@ SmartComponent({
             this.$emit('select', copyDates(date));
         },
         checkRange(date) {
-            const { maxRange, rangePrompt, showRangePrompt } = this.data;
+            const { maxRange, showRangePrompt } = this.data;
             if (maxRange && calcDateNum(date) > maxRange) {
                 if (showRangePrompt) {
-                    Toast({
-                        selector: '#' + this.data.toastId,
-                        context: this,
-                        message: rangePrompt || `选择天数不能超过 ${maxRange} 天`,
+                    this.setData({
+                        showToast: true,
                     });
+                    setTimeout(() => {
+                        this.setData({
+                            showToast: false,
+                        });
+                    }, 2000);
                 }
                 this.$emit('over-range');
                 return false;

package/dist/circle/index.wxml

@@ -1,8 +1,8 @@
-<view class="smart-progress-circle" style="width:{{width}}px;height:{{height}}px">
+<view class="smart-progress-circle" style="width:{{width}}px;height:{{height}}px;{{customStyle}}">
   <canvas 
   type="2d" 
   wx:if="{{canvasId}}" 
   canvas-id="{{canvasId}}" 
-  style="{{customStyle}}"
+  style="width:100%;height:100%;"
   ></canvas>
 </view>

package/dist/toast/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}
+@import '../common/index.css';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;right:-1000px;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}

package/dist/toast/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}
+@import '../common/index.wxss';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;right:-1000px;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}

package/lib/calendar/calendar.wxml

@@ -76,5 +76,8 @@
       readonly="{{readonly}}"
      />
   </block>
-  <smart-toast wx:if="{{toastId}}" id="{{toastId}}" />
+  <smart-toast wx:if="{{showRangePrompt}}" show="{{showToast}}">
+    <text wx:if="{{rangePrompt}}" style="text-align:center;">{{ rangePrompt }}</text>
+    <text style="text-align:center;" wx:else>Days selected over {{maxRange}} days</text>
+  </smart-toast>
 </view>

package/lib/calendar/index.js

@@ -8,13 +8,9 @@ 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 utils_1 = require("../calendar-utils/utils");
-var toast_1 = __importDefault(require("../toast/toast"));
 var dateEdge = (0, utils_1.getInitEdgeDate)('year');
 var getTime = function (date) { return (date instanceof Date ? date.getTime() : date); };
 (0, component_1.SmartComponent)({
@@ -157,10 +153,6 @@ var getTime = function (date) { return (date instanceof Date ? date.getTime() :
         dayClassMap: {
             type: null,
         },
-        toastId: {
-            type: String,
-            value: 'smart-toast-calendar',
-        },
     },
     data: {
         subtitle: '',
@@ -169,6 +161,7 @@ var getTime = function (date) { return (date instanceof Date ? date.getTime() :
         scrollIntoView: '',
         visibleIndex: 0,
         months: [],
+        showToast: false,
     },
     watch: {
         minDate: function () {
@@ -434,14 +427,18 @@ var getTime = function (date) { return (date instanceof Date ? date.getTime() :
             this.$emit('select', (0, utils_1.copyDates)(date));
         },
         checkRange: function (date) {
-            var _a = this.data, maxRange = _a.maxRange, rangePrompt = _a.rangePrompt, showRangePrompt = _a.showRangePrompt;
+            var _this = this;
+            var _a = this.data, maxRange = _a.maxRange, showRangePrompt = _a.showRangePrompt;
             if (maxRange && (0, utils_1.calcDateNum)(date) > maxRange) {
                 if (showRangePrompt) {
-                    (0, toast_1.default)({
-                        selector: '#' + this.data.toastId,
-                        context: this,
-                        message: rangePrompt || "\u9009\u62E9\u5929\u6570\u4E0D\u80FD\u8D85\u8FC7 ".concat(maxRange, " \u5929"),
+                    this.setData({
+                        showToast: true,
                     });
+                    setTimeout(function () {
+                        _this.setData({
+                            showToast: false,
+                        });
+                    }, 2000);
                 }
                 this.$emit('over-range');
                 return false;

package/lib/circle/index.wxml

@@ -1,8 +1,8 @@
-<view class="smart-progress-circle" style="width:{{width}}px;height:{{height}}px">
+<view class="smart-progress-circle" style="width:{{width}}px;height:{{height}}px;{{customStyle}}">
   <canvas 
   type="2d" 
   wx:if="{{canvasId}}" 
   canvas-id="{{canvasId}}" 
-  style="{{customStyle}}"
+  style="width:100%;height:100%;"
   ></canvas>
 </view>

package/lib/toast/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}
+@import '../common/index.css';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;right:-1000px;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}

package/lib/toast/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}
+@import '../common/index.wxss';.smart-toast{word-wrap:break-word;align-items:center;background-color:var(--toast-background-color,rgba(0,0,0,.7));border-radius:var(--toast-border-radius,10px);box-sizing:initial;color:var(--toast-text-color,#fff);display:flex;flex-direction:column;font-size:var(--toast-font-size,14px);justify-content:center;line-height:var(--toast-line-height,20px);white-space:pre-wrap}.smart-toast__container{left:50%;max-width:var(--toast-max-width,70%);position:fixed;right:-1000px;top:50%;transform:translate(-50%,-50%);width:-webkit-fit-content;width:fit-content}.smart-toast--text{min-width:var(--toast-text-min-width,96px);padding:var(--toast-text-padding,8px 12px)}.smart-toast--icon{min-height:var(--toast-default-min-height,88px);padding:var(--toast-default-padding,16px);width:var(--toast-default-width,88px)}.smart-toast--icon .smart-toast__icon{font-size:var(--toast-icon-size,36px)}.smart-toast--icon .smart-toast__text{padding-top:8px}.smart-toast__loading{margin:10px 0}.smart-toast--top{transform:translateY(-30vh) translate(-50%,-50%)}.smart-toast--bottom{transform:translateY(30vh) translate(-50%,-50%)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.3.9-beta-2",
+  "version": "2.4.0-beta-1",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",