@tuya-miniapp/smart-ui 2.5.1-beta-2 → 2.5.1-beta-4

package/lib/circle/index.rjs

@@ -190,7 +190,7 @@ export default Render({
       ctx.stroke();
 
       // 绘制进度条
-      const progressAngle = progress * (Math.PI * 2); // 根据进度计算角度
+      const progressAngle = progress * (Math.PI * 2.12); // 根据进度计算角度
       ctx.beginPath();
       ctx.arc(this.width / 2, this.height / 2, radius, startAngle, startAngle + progressAngle);
       ctx.lineWidth = lineWidth;
@@ -217,6 +217,7 @@ export default Render({
     drawProgressBar(progress, this.fillColor); // 25%的蓝色进度条
   },
   render(val) {
+    val = Math.min(Math.max(0, val), 100)
     if (this.mode === 'basic') {
       this.renderAll(val / 100, this.round ? { lineCap: 'round' } : { lineCap: '' });
     }

package/lib/common/appLog.js

@@ -15,7 +15,7 @@ var init = function (tag) {
         return Log;
     }
     // @ts-ignore
-    if (typeof ty !== 'undefined' && !ty.getLogManager) {
+    if (typeof ty === 'undefined' || (typeof ty !== 'undefined' && !ty.getLogManager)) {
         // console.warn('不支持ty.getLogManager');
         return null;
     }

package/lib/common/ty.d.ts

@@ -0,0 +1,7 @@
+declare const tyApi: {
+    vibrateShort: (v: any) => void;
+    nativeDisabled: (v: boolean) => void;
+    getThemeInfo: () => any;
+    isWX: () => boolean;
+};
+export default tyApi;

package/lib/common/ty.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tyApi = {
+    vibrateShort: function (v) {
+        // @ts-ignore
+        if (typeof ty !== 'undefined') {
+            // @ts-ignore
+            ty.vibrateShort(v);
+        }
+        else if (typeof wx !== 'undefined') {
+            wx.vibrateShort(v);
+        }
+    },
+    nativeDisabled: function (v) {
+        var _a;
+        // @ts-ignore
+        if (typeof ty !== 'undefined') {
+            // @ts-ignore
+            (_a = ty.nativeDisabled) === null || _a === void 0 ? void 0 : _a.call(ty, v);
+        }
+    },
+    getThemeInfo: function () {
+        var _a;
+        // @ts-ignore
+        if (typeof ty !== 'undefined') {
+            // @ts-ignore
+            return (_a = ty.getThemeInfo) === null || _a === void 0 ? void 0 : _a.call(ty);
+        }
+    },
+    isWX: function () {
+        // @ts-ignore
+        return typeof ty === 'undefined' && !!wx;
+    },
+};
+exports.default = tyApi;

package/lib/config-provider/index.wxml

@@ -1,5 +1,5 @@
 <wxs src="./index.wxs" module="computed" />
 
-<view class="smart-config-provider" style="{{ computed.mapThemeVarsToCSSVars(themeVars) }}">
+<view class="smart-config-provider custom-class" style="{{ computed.mapThemeVarsToCSSVars(themeVars) }}">
   <slot />
 </view>

package/lib/custom-keyboard/index.wxml

@@ -1,8 +1,6 @@
 <view class="{{prefix}} {{prefix}}-container" style="{{inputContainerStyle}}">
   <view class="{{prefix}}-textView" bind:tap="handlePassword">
-    <text class="{{prefix}}-pwdText {{currValue !== '' ? prefix + '-password' : null}}" style="{{valueTextStyle}}">
-      {{currValue || placeholder}}
-    </text>
+    <text class="{{prefix}}-pwdText {{currValue !== '' ? prefix + '-password' : null}}" style="{{valueTextStyle}}">{{currValue || placeholder}}</text>
   </view>
   <slot name="custom-button" />
 </view>
@@ -14,7 +12,7 @@
 >
   <view class="{{prefix}}-popup-container">
     <view class="{{prefix}}-number-wrap" style="height: {{row * 56}}px">
-      <view wx:for="{{numberArray}}" wx:key="index" bind:tap="changeValue" hover-class="{{prefix}}-hover-class" data-item="{{ item }}" class="{{prefix}}-number-item" style="{{(item === 0 || item === 10) && numberArray.length === 11 ? 'width: 175px' : ''}}">
+      <view wx:for="{{numberArray}}" wx:key="index" bind:tap="changeValue" hover-class="{{prefix}}-hover-class" data-item="{{ item }}" class="{{prefix}}-number-item" style="{{(item === 0 || item === 10) && numberArray.length === 11 ? 'width: 345rpx' : ''}}">
         <view
           wx:if="{{item === -2}}"
           class="{{prefix}}-hidden-image"
@@ -39,9 +37,7 @@
         bind:tap="confirm"
         hover-class="{{prefix}}-hover-class"
       >
-        <text class="{{prefix}}-confirm-text" style="{{confirmTextStyle}}">
-          {{confirmText}}
-        </text>
+        <text class="{{prefix}}-confirm-text" space="false" style="{{confirmTextStyle}}">{{confirmText}}</text>
       </button >
     </view>
   </view>

package/lib/dialog/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-dialog{background-color:var(--dialog-background-color,var(--app-B4,#fff));border-radius:var(--dialog-border-radius,16px);font-size:var(--dialog-font-size,16px);overflow:hidden;top:45%!important;width:var(--dialog-width,311px)}@media (max-width:321px){.smart-dialog{width:var(--dialog-small-screen-width,90%)}}.smart-dialog__header{color:var(--dialog-header-font-color,var(--app-B4-N1,#000));font-weight:var(--dialog-header-font-weight,400);line-height:var(--dialog-header-line-height,24px);padding:var(--dialog-header-padding,0);padding-top:var(--dialog-header-padding-top,24px);text-align:center}.smart-dialog__header-icon{border-radius:100%;display:block;font-size:var(--dialog-header-icon-size,39px);height:var(--dialog-header-icon-size,39px);margin:auto auto 12px;width:var(--dialog-header-icon-size,39px)}.smart-dialog__header--isolated{padding:var(--dialog-header-isolated-padding,24px 0)}.smart-dialog__message{-webkit-overflow-scrolling:touch;color:var(--dialog-message-text-color,var(--app-B4-N1,#000));font-size:var(--dialog-message-font-size,16px);line-height:var(--dialog-message-line-height,20px);max-height:var(--dialog-message-max-height,60vh);overflow-y:auto;padding:var(--dialog-message-padding,24px);text-align:center}.smart-dialog__message-text{word-wrap:break-word}.smart-dialog__message--hasTitle{color:var(--dialog-has-title-message-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--dialog-has-title-message-font-size,14px);padding-top:var(--dialog-has-title-message-padding-top,8px)}.smart-dialog__message--round-button{padding-bottom:16px}.smart-dialog__message--left{text-align:left}.smart-dialog__message--right{text-align:right}.smart-dialog__message--justify{text-align:justify}.smart-dialog__input{background-color:var(--dialog-input-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));border-radius:var(--dialog-input-border-radius,10px);font-size:var(--dialog-input-font-size,14px);height:var(--dialog-input-height,40px);margin:var(--dialog-input-margin,0 16px 24px);padding:var(--dialog-input-padding,0 10px)}.smart-dialog__footer{display:flex}.smart-dialog__footer--round-button{height:40px!important;padding:8px 20px 16px!important;position:relative!important}.smart-dialog__button{flex:1}.smart-dialog-bounce-enter{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-dialog-bounce-leave-active{opacity:0;transform:translate3d(-50%,-50%,0) scale(.9)}.smart-dialog--round-button .smart-dialog__cancel,.smart-dialog--round-button .smart-dialog__confirm{border-radius:var(--dialog--round-button-border-radius,20px)!important}
+@import '../common/index.css';.smart-dialog{background-color:var(--dialog-background-color,var(--app-B4,#fff));border-radius:var(--dialog-border-radius,16px);font-size:var(--dialog-font-size,16px);overflow:hidden;top:45%!important;width:var(--dialog-width,311px)}@media (max-width:321px){.smart-dialog{width:var(--dialog-small-screen-width,90%)}}.smart-dialog__header{color:var(--dialog-header-font-color,var(--app-B4-N1,#000));font-weight:var(--dialog-header-font-weight,400);line-height:var(--dialog-header-line-height,24px);padding:var(--dialog-header-padding,0);padding-top:var(--dialog-header-padding-top,24px);text-align:center}.smart-dialog__header-icon{border-radius:100%;display:block;font-size:var(--dialog-header-icon-size,39px);height:var(--dialog-header-icon-size,39px);margin:auto auto 12px;width:var(--dialog-header-icon-size,39px)}.smart-dialog__header--isolated{padding:var(--dialog-header-isolated-padding,24px 0)}.smart-dialog__message{-webkit-overflow-scrolling:touch;color:var(--dialog-message-text-color,var(--app-B4-N1,#000));font-size:var(--dialog-message-font-size,16px);line-height:var(--dialog-message-line-height,20px);max-height:var(--dialog-message-max-height,60vh);overflow-y:auto;padding:var(--dialog-message-padding,24px);text-align:center}.smart-dialog__message-text{word-wrap:break-word}.smart-dialog__message--hasTitle{color:var(--dialog-has-title-message-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--dialog-has-title-message-font-size,14px);padding-top:var(--dialog-has-title-message-padding-top,8px)}.smart-dialog__message--round-button{--hairline-right-width:0;padding-bottom:16px}.smart-dialog__message--left{text-align:left}.smart-dialog__message--right{text-align:right}.smart-dialog__message--justify{text-align:justify}.smart-dialog__input{background-color:var(--dialog-input-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));border-radius:var(--dialog-input-border-radius,10px);font-size:var(--dialog-input-font-size,14px);height:var(--dialog-input-height,40px);margin:var(--dialog-input-margin,0 16px 24px);padding:var(--dialog-input-padding,0 10px)}.smart-dialog__footer{display:flex}.smart-dialog__footer--round-button{--hairline-right-width:0;height:40px!important;padding:8px 20px 16px!important;position:relative!important}.smart-dialog__button{flex:1}.smart-dialog__cancel,.smart-dialog__confirm{border:0!important;border-radius:0!important}.smart-dialog-bounce-enter{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-dialog-bounce-leave-active{opacity:0;transform:translate3d(-50%,-50%,0) scale(.9)}.smart-dialog--round-button .smart-dialog__cancel,.smart-dialog--round-button .smart-dialog__confirm{border-radius:var(--dialog--round-button-border-radius,20px)!important}

package/lib/dialog/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var Warning_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Warning"));
+var icons_1 = require("@tuya-miniapp/icons");
 var component_1 = require("../common/component");
 var button_1 = require("../mixins/button");
 var appLog_1 = __importDefault(require("../common/appLog"));
@@ -90,7 +90,7 @@ var dialog_1 = require("./dialog");
         },
     },
     data: {
-        warningIcon: Warning_1.default,
+        warningIcon: icons_1.Warning,
         inputValue: '',
         loading: {
             confirm: false,

package/lib/dialog/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-dialog{background-color:var(--dialog-background-color,var(--app-B4,#fff));border-radius:var(--dialog-border-radius,16px);font-size:var(--dialog-font-size,16px);overflow:hidden;top:45%!important;width:var(--dialog-width,311px)}@media (max-width:321px){.smart-dialog{width:var(--dialog-small-screen-width,90%)}}.smart-dialog__header{color:var(--dialog-header-font-color,var(--app-B4-N1,#000));font-weight:var(--dialog-header-font-weight,400);line-height:var(--dialog-header-line-height,24px);padding:var(--dialog-header-padding,0);padding-top:var(--dialog-header-padding-top,24px);text-align:center}.smart-dialog__header-icon{border-radius:100%;display:block;font-size:var(--dialog-header-icon-size,39px);height:var(--dialog-header-icon-size,39px);margin:auto auto 12px;width:var(--dialog-header-icon-size,39px)}.smart-dialog__header--isolated{padding:var(--dialog-header-isolated-padding,24px 0)}.smart-dialog__message{-webkit-overflow-scrolling:touch;color:var(--dialog-message-text-color,var(--app-B4-N1,#000));font-size:var(--dialog-message-font-size,16px);line-height:var(--dialog-message-line-height,20px);max-height:var(--dialog-message-max-height,60vh);overflow-y:auto;padding:var(--dialog-message-padding,24px);text-align:center}.smart-dialog__message-text{word-wrap:break-word}.smart-dialog__message--hasTitle{color:var(--dialog-has-title-message-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--dialog-has-title-message-font-size,14px);padding-top:var(--dialog-has-title-message-padding-top,8px)}.smart-dialog__message--round-button{padding-bottom:16px}.smart-dialog__message--left{text-align:left}.smart-dialog__message--right{text-align:right}.smart-dialog__message--justify{text-align:justify}.smart-dialog__input{background-color:var(--dialog-input-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));border-radius:var(--dialog-input-border-radius,10px);font-size:var(--dialog-input-font-size,14px);height:var(--dialog-input-height,40px);margin:var(--dialog-input-margin,0 16px 24px);padding:var(--dialog-input-padding,0 10px)}.smart-dialog__footer{display:flex}.smart-dialog__footer--round-button{height:40px!important;padding:8px 20px 16px!important;position:relative!important}.smart-dialog__button{flex:1}.smart-dialog-bounce-enter{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-dialog-bounce-leave-active{opacity:0;transform:translate3d(-50%,-50%,0) scale(.9)}.smart-dialog--round-button .smart-dialog__cancel,.smart-dialog--round-button .smart-dialog__confirm{border-radius:var(--dialog--round-button-border-radius,20px)!important}
+@import '../common/index.wxss';.smart-dialog{background-color:var(--dialog-background-color,var(--app-B4,#fff));border-radius:var(--dialog-border-radius,16px);font-size:var(--dialog-font-size,16px);overflow:hidden;top:45%!important;width:var(--dialog-width,311px)}@media (max-width:321px){.smart-dialog{width:var(--dialog-small-screen-width,90%)}}.smart-dialog__header{color:var(--dialog-header-font-color,var(--app-B4-N1,#000));font-weight:var(--dialog-header-font-weight,400);line-height:var(--dialog-header-line-height,24px);padding:var(--dialog-header-padding,0);padding-top:var(--dialog-header-padding-top,24px);text-align:center}.smart-dialog__header-icon{border-radius:100%;display:block;font-size:var(--dialog-header-icon-size,39px);height:var(--dialog-header-icon-size,39px);margin:auto auto 12px;width:var(--dialog-header-icon-size,39px)}.smart-dialog__header--isolated{padding:var(--dialog-header-isolated-padding,24px 0)}.smart-dialog__message{-webkit-overflow-scrolling:touch;color:var(--dialog-message-text-color,var(--app-B4-N1,#000));font-size:var(--dialog-message-font-size,16px);line-height:var(--dialog-message-line-height,20px);max-height:var(--dialog-message-max-height,60vh);overflow-y:auto;padding:var(--dialog-message-padding,24px);text-align:center}.smart-dialog__message-text{word-wrap:break-word}.smart-dialog__message--hasTitle{color:var(--dialog-has-title-message-text-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--dialog-has-title-message-font-size,14px);padding-top:var(--dialog-has-title-message-padding-top,8px)}.smart-dialog__message--round-button{--hairline-right-width:0;padding-bottom:16px}.smart-dialog__message--left{text-align:left}.smart-dialog__message--right{text-align:right}.smart-dialog__message--justify{text-align:justify}.smart-dialog__input{background-color:var(--dialog-input-background-color,var(--app-B4-N9,rgba(0,0,0,.05)));border-radius:var(--dialog-input-border-radius,10px);font-size:var(--dialog-input-font-size,14px);height:var(--dialog-input-height,40px);margin:var(--dialog-input-margin,0 16px 24px);padding:var(--dialog-input-padding,0 10px)}.smart-dialog__footer{display:flex}.smart-dialog__footer--round-button{--hairline-right-width:0;height:40px!important;padding:8px 20px 16px!important;position:relative!important}.smart-dialog__button{flex:1}.smart-dialog__cancel,.smart-dialog__confirm{border:0!important;border-radius:0!important}.smart-dialog-bounce-enter{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-dialog-bounce-leave-active{opacity:0;transform:translate3d(-50%,-50%,0) scale(.9)}.smart-dialog--round-button .smart-dialog__cancel,.smart-dialog--round-button .smart-dialog__confirm{border-radius:var(--dialog--round-button-border-radius,20px)!important}

package/lib/dropdown-item/index.js

@@ -5,7 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 var relation_1 = require("../common/relation");
 var component_1 = require("../common/component");
-var Check_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Check"));
+var icons_1 = require("@tuya-miniapp/icons");
+var ty_1 = __importDefault(require("../common/ty"));
 (0, component_1.SmartComponent)({
     classes: ['item-title-class'],
     field: true,
@@ -43,7 +44,7 @@ var Check_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Check"));
         },
     },
     data: {
-        checkMarkIcon: Check_1.default,
+        checkMarkIcon: icons_1.Check,
         checkMarkIconColor: '',
         transition: true,
         showPopup: false,
@@ -53,8 +54,7 @@ var Check_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Check"));
     },
     mounted: function () {
         var _a;
-        // @ts-ignore
-        var themeInfo = (_a = ty === null || ty === void 0 ? void 0 : ty.getThemeInfo()) !== null && _a !== void 0 ? _a : {};
+        var themeInfo = (_a = ty_1.default.getThemeInfo()) !== null && _a !== void 0 ? _a : {};
         var checkMarkIconColor = this.data.activeColor || themeInfo['--app-M1'] || '#3678E3';
         this.setData({ checkMarkIconColor: checkMarkIconColor });
     },

package/lib/dropdown-menu/index.js

@@ -6,7 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var relation_1 = require("../common/relation");
 var utils_1 = require("../common/utils");
-var TriangleDown_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/TriangleDown"));
+var icons_1 = require("@tuya-miniapp/icons");
+var ty_1 = __importDefault(require("../common/ty"));
 var ARRAY = [];
 (0, component_1.SmartComponent)({
     field: true,
@@ -58,14 +59,13 @@ var ARRAY = [];
         },
     },
     data: {
-        triangleDown: TriangleDown_1.default,
+        triangleDown: icons_1.TriangleDown,
         activeColorStatic: '',
         itemListData: [],
     },
     mounted: function () {
         var _a;
-        // @ts-ignore
-        var themeInfo = (_a = ty === null || ty === void 0 ? void 0 : ty.getThemeInfo()) !== null && _a !== void 0 ? _a : {};
+        var themeInfo = (_a = ty_1.default.getThemeInfo()) !== null && _a !== void 0 ? _a : {};
         var activeColorStatic = this.data.activeColor || themeInfo['--app-M1'] || '#3678E3';
         this.setData({ activeColorStatic: activeColorStatic });
     },

package/lib/field/index.js

@@ -10,14 +10,11 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var utils_1 = require("../common/utils");
 var component_1 = require("../common/component");
 var props_1 = require("./props");
-var Xmark_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Xmark"));
+var icons_1 = require("@tuya-miniapp/icons");
 (0, component_1.SmartComponent)({
     field: true,
     classes: ['input-class', 'right-icon-class', 'label-class'],
@@ -40,7 +37,7 @@ var Xmark_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Xmark"));
             value: '6.2em',
         }, clearIcon: {
             type: String,
-            value: Xmark_1.default,
+            value: icons_1.Xmark,
         }, extraEventParams: {
             type: Boolean,
             value: false,

package/lib/image/index.js

@@ -1,11 +1,8 @@
 "use strict";
-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 button_1 = require("../mixins/button");
-var Loading_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Loading"));
+var icons_1 = require("@tuya-miniapp/icons");
 (0, component_1.SmartComponent)({
     mixins: [button_1.button],
     classes: ['custom-class', 'loading-class', 'error-class', 'image-class'],
@@ -51,7 +48,7 @@ var Loading_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Loading"))
     data: {
         error: false,
         loading: true,
-        loadingSvg: Loading_1.default,
+        loadingSvg: icons_1.Loading,
         viewStyle: '',
     },
     methods: {

package/lib/image/index.wxs

@@ -30,7 +30,7 @@ function mode(fit) {
 
 
 function maskStyle(url, color) {
-  const str = 'mask-image: url(' + url + ');-webkit-mask-image: url(' + url + ');background: ' + color + ';'
+  var str = 'mask-image: url(' + url + ');-webkit-mask-image: url(' + url + ');background: ' + color + ';'
   return str
 }
 

package/lib/loading/index.wxs

@@ -3,7 +3,7 @@ var style = require('../wxs/style.wxs');
 var addUnit = require('../wxs/add-unit.wxs');
 
 function textStyle(data) {
-  const ret = style({
+  var ret = style({
     'font-size': addUnit(data.textSize),
     color: data.color,
   });
@@ -12,7 +12,7 @@ function textStyle(data) {
 }
 
 function loadingStyle(data) {
-  let iconSrc = ''
+  var iconSrc = ''
 
   if (data.type === 'spinner') {
     iconSrc = data.spinner

package/lib/mixins/transition.js

@@ -35,11 +35,15 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transition = void 0;
 // @ts-nocheck
 var utils_1 = require("../common/utils");
 var validator_1 = require("../common/validator");
+var ty_1 = __importDefault(require("../common/ty"));
 var getClassNames = function (name) { return ({
     enter: "smart-".concat(name, "-enter smart-").concat(name, "-enter-active enter-class enter-active-class"),
     'enter-to': "smart-".concat(name, "-enter-to smart-").concat(name, "-enter-active enter-to-class enter-active-class"),
@@ -98,20 +102,19 @@ function transition(showDefaultValue) {
                 this.enterFinishedPromise = new Promise(function (resolve) { return __awaiter(_this, void 0, void 0, function () {
                     var _a, duration, name, classNames, currentDuration;
                     var _this = this;
-                    var _b;
-                    return __generator(this, function (_c) {
-                        switch (_c.label) {
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 _a = this.data, duration = _a.duration, name = _a.name;
                                 classNames = getClassNames(name);
                                 currentDuration = (0, validator_1.isObj)(duration) ? duration.enter : duration;
-                                this.$emit('before-enter');
                                 if (this.data.nativeDisabled) {
-                                    (_b = ty === null || ty === void 0 ? void 0 : ty.nativeDisabled) === null || _b === void 0 ? void 0 : _b.call(ty, true);
+                                    ty_1.default.nativeDisabled(true);
                                 }
+                                this.$emit('before-enter');
                                 return [4 /*yield*/, (0, utils_1.requestAnimationFrame)()];
                             case 1:
-                                _c.sent();
+                                _b.sent();
                                 this.$emit('enter');
                                 this.setData({
                                     inited: true,
@@ -121,7 +124,7 @@ function transition(showDefaultValue) {
                                 });
                                 return [4 /*yield*/, (0, utils_1.requestAnimationFrame)()];
                             case 2:
-                                _c.sent();
+                                _b.sent();
                                 this.transitionEnded = false;
                                 this.setData({ classes: classNames['enter-to'] });
                                 clearTimeout(this.timer);
@@ -179,12 +182,11 @@ function transition(showDefaultValue) {
                                         this.transitionEnded = false;
                                         clearTimeout(this.timer);
                                         setTimeout(function () {
-                                            var _a;
                                             _this.enterFinishedPromise = null;
-                                            _this.$emit('after-leave');
                                             if (_this.data.nativeDisabled) {
-                                                (_a = ty === null || ty === void 0 ? void 0 : ty.nativeDisabled) === null || _a === void 0 ? void 0 : _a.call(ty, false);
+                                                ty_1.default.nativeDisabled(false);
                                             }
+                                            _this.$emit('after-leave');
                                             _this.setData({
                                                 display: false,
                                                 animating: false,
@@ -197,13 +199,12 @@ function transition(showDefaultValue) {
                             });
                         }); })
                             .catch(function (err) {
-                            var _a;
                             _this.enterFinishedPromise = null;
                             _this.setData({ animating: false });
                             console.log(err, '---error-leave');
                             _this.$emit('leave-error', err);
                             if (_this.data.nativeDisabled) {
-                                (_a = ty === null || ty === void 0 ? void 0 : ty.nativeDisabled) === null || _a === void 0 ? void 0 : _a.call(ty, false);
+                                ty_1.default.nativeDisabled(false);
                             }
                         });
                         return [2 /*return*/];

package/lib/nav-bar/index.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var Left_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Left"));
+var icons_1 = require("@tuya-miniapp/icons");
 var component_1 = require("../common/component");
 var utils_1 = require("../common/utils");
 (0, component_1.SmartComponent)({
@@ -50,7 +47,7 @@ var utils_1 = require("../common/utils");
     },
     data: {
         height: 46,
-        leftArrowIcon: Left_1.default,
+        leftArrowIcon: icons_1.Left,
     },
     created: function () {
         var statusBarHeight = (0, utils_1.getSystemInfoSync)().statusBarHeight;

package/lib/notice-bar/index.js

@@ -1,12 +1,9 @@
 "use strict";
-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("../common/utils");
-var Xmark_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Xmark"));
-var Right_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right"));
+var icons_1 = require("@tuya-miniapp/icons");
+var icons_2 = require("@tuya-miniapp/icons");
 (0, component_1.SmartComponent)({
     props: {
         text: {
@@ -83,8 +80,8 @@ var Right_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right"));
         wrapable: Boolean,
     },
     data: {
-        Xmark: Xmark_1.default,
-        Right: Right_1.default,
+        Xmark: icons_1.Xmark,
+        Right: icons_2.Right,
         show: true,
     },
     created: function () {

package/lib/picker-column/index.js

@@ -44,10 +44,14 @@ 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("../common/utils");
 var validator_1 = require("../common/validator");
+var ty_1 = __importDefault(require("../common/ty"));
 var DEFAULT_DURATION = 400;
 (0, component_1.SmartComponent)({
     classes: ['active-class'],
@@ -173,10 +177,10 @@ var DEFAULT_DURATION = 400;
                 // @ts-ignore
                 this.vibrateShort();
             }
-            // const animationIndex = Math.abs(-offset / data.itemHeight);
+            var animationIndex = Math.abs(-offset / data.itemHeight);
             this.setData({
                 offset: offset,
-                // animationIndex: animationIndex,
+                animationIndex: animationIndex,
                 preOffsetList: __spreadArray(__spreadArray([], data.preOffsetList, true), [offset], false),
                 animate: false,
             });
@@ -219,7 +223,7 @@ var DEFAULT_DURATION = 400;
                             // 最终定位索引
                             this.setData({
                                 duration: isSameTouch ? 150 : data.animationTime,
-                                // animationIndex: index,
+                                animationIndex: index,
                                 offset: offsetData,
                                 animate: true,
                             });
@@ -265,8 +269,7 @@ var DEFAULT_DURATION = 400;
             var _this = this;
             if (time === void 0) { time = 1000; }
             if (!count) {
-                // @ts-ignore
-                ty.vibrateShort({ type: 'light' });
+                ty_1.default.vibrateShort({ type: 'light' });
                 return;
             }
             var has = 0;
@@ -365,7 +368,7 @@ var DEFAULT_DURATION = 400;
                 if (animate) {
                     return this.set({
                         currentIndex: index,
-                        // animationIndex: index,
+                        animationIndex: index,
                         offset: offset,
                         animate: true,
                         duration: time,
@@ -385,11 +388,9 @@ var DEFAULT_DURATION = 400;
                     });
                 }
                 return this.set({
-                    optionsV: data.options,
                     offset: offset,
                     currentIndex: index,
-                    // animationIndex: index,
-                    renderStart: 0,
+                    animationIndex: index,
                     animate: !!animate,
                 }).then(function () {
                     if (!userAction) {

package/lib/picker-column/index.wxml

@@ -16,7 +16,7 @@
         wx:for-item="option"
         wx:key="index"
         data-index="{{ renderStart + index }}"
-        style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: renderStart + index === currentIndex ? activeStyle : ''})}}"
+        style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: renderStart + index === currentIndex ? activeStyle : '', animationIndex, index: renderStart + index })}}"
         class="smart-ellipsis {{ utils.bem('picker-column__item', { disabled: option && option.disabled, selected: renderStart + index === currentIndex }) }} {{ renderStart + index === currentIndex ? 'active-class' : '' }}"
       >
         {{ computed.optionText(option, valueKey) }}

package/lib/picker-column/index.wxs

@@ -48,20 +48,17 @@ function wrapperItemStyle(data) {
   var heightStyleStr = "height: " + data.itemHeight + 'px;'
   var fontStyleStr = style(data.fontStyle);
   var activeStyleStr = style(data.activeStyle);
+
+  // var offsetIndex = data.animationIndex - data.index;
+  // var scale = Math.min(Math.abs(offsetIndex * 0.05), 0.05 * 2)
+  // var rotateX = offsetIndex * 25 > 0 ? Math.min(offsetIndex * 25, 25 * 2) : Math.max(offsetIndex * 25, -25 * 2)
+  // const transStyle = style({
+  //   transform: `rotateX(${rotateX}deg) scale(${1 - scale})`
+  // });
+  // return trans + ';' + heightStyleStr + (fontStyleStr ? fontStyleStr + ';' : fontStyleStr) + activeStyleStr
   return heightStyleStr + (fontStyleStr ? fontStyleStr + ';' : fontStyleStr) + activeStyleStr
 }
 
-// function wrapperItemStyle(data) {
-//   const { index, animationIndex: currentIndex } = data;
-//   const offsetIndex = currentIndex - index;
-//   const rotateX = offsetIndex * 25 > 0 ? Math.min(offsetIndex * 25, 25 * 2) : Math.max(offsetIndex * 25, -25 * 2)
-//   const scale = Math.min(Math.abs(offsetIndex * 0.05), 0.05 * 2)
-//   return style({
-//     transition: 'transform ' + data.duration + 'ms ease-out',
-//     transform: `rotateX(${rotateX}deg) scale(${1 - scale})`
-//   });
-// }
-
 module.exports = {
   optionText: optionText,
   rootStyle: rootStyle,

package/lib/popover/index.js

@@ -56,6 +56,11 @@ function createSvgIcon(svg) {
             type: String,
             value: '',
         },
+        trigger: {
+            type: String,
+            // tap | longpress
+            value: 'tap',
+        },
         zIndex: {
             type: Number,
             value: 101,

package/lib/popover/index.wxml

@@ -1,4 +1,4 @@
-<view class="smart-popover">
+<view class="smart-popover custom-class">
 
   <smart-overlay
     show="{{ currentShow }}"
@@ -12,7 +12,15 @@
    
   </smart-overlay>
 
-  <view class="smart-popover-button" catch:tap="onClick">
+  <view wx:if="{{trigger === 'longpress'}}" class="smart-popover-button" catch:longpress="onClick">
+    <slot />
+    <view catch:tap="noop" wx:if="{{currentShow}}" class="smart-popover-overlay" style="left: {{left}};top: {{top}}; bottom:{{bottom}};right:{{right}}; transform:{{transform}}; {{customStyle}}; {{showStyle}}">
+      <slot name="overlay" />
+      <smart-icon class="smart-popover-overlay-arrow" name="{{iconSrc}}" style=" transform: {{iconTransform}}; {{iconPos}}: {{iconPosVal}}px;background-size: {{iconWidth}} {{iconHeight}};{{iconStyle}}"></smart-icon>
+    </view>
+  </view>
+
+  <view wx:else class="smart-popover-button" catch:tap="onClick">
     <slot />
     <view catch:tap="noop" wx:if="{{currentShow}}" class="smart-popover-overlay" style="left: {{left}};top: {{top}}; bottom:{{bottom}};right:{{right}}; transform:{{transform}}; {{customStyle}}; {{showStyle}}">
       <slot name="overlay" />

package/lib/popup/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-popup{-webkit-overflow-scrolling:touch;animation:ease both;background-color:var(--popup-background-color,var(--app-B4,#fff));box-sizing:border-box;max-height:100%;position:fixed;transition-timing-function:ease}.smart-popup--center{left:50%;top:50%;transform:translate3d(-50%,-50%,0)}.smart-popup--center.smart-popup--round{border-radius:var(--popup-round-border-radius,16px)}.smart-popup--top{left:0;top:0;width:100%}.smart-popup--top.smart-popup--round{border-radius:0 0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px))}.smart-popup--right{right:0;top:50%;transform:translate3d(0,-50%,0)}.smart-popup--right.smart-popup--round{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0 0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px))}.smart-popup--bottom{bottom:0;left:0;width:100%}.smart-popup--bottom.smart-popup--round{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0 0}.smart-popup--left{left:0;top:50%;transform:translate3d(0,-50%,0)}.smart-popup--left.smart-popup--round{border-radius:0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0}.smart-popup--bottom.smart-popup--safeTabBar,.smart-popup--top.smart-popup--safeTabBar{bottom:var(--tabbar-height,55px)}.smart-popup--safeTop{padding-top:env(safe-area-inset-top)}.smart-popup__close-icon{color:var(--popup-close-icon-color,#969799);font-size:var(--popup-close-icon-size,24px);position:absolute;z-index:var(--popup-close-icon-z-index,1)}.smart-popup__close-icon--top-left{left:var(--popup-close-icon-margin,12px);top:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--top-right{right:var(--popup-close-icon-margin,12px);top:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--bottom-left{bottom:var(--popup-close-icon-margin,12px);left:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--bottom-right{bottom:var(--popup-close-icon-margin,12px);right:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon:active{opacity:.6}.smart-scale-enter-active,.smart-scale-leave-active{transition-property:opacity,transform}.smart-scale-enter,.smart-scale-leave-to{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-fade-enter-active,.smart-fade-leave-active{transition-property:opacity}.smart-fade-enter,.smart-fade-leave-to{opacity:0}.smart-center-enter-active,.smart-center-leave-active{transition-property:opacity}.smart-center-enter,.smart-center-leave-to{opacity:0}.smart-bottom-enter-active,.smart-bottom-leave-active,.smart-left-enter-active,.smart-left-leave-active,.smart-right-enter-active,.smart-right-leave-active,.smart-top-enter-active,.smart-top-leave-active{transition-property:transform}.smart-bottom-enter,.smart-bottom-leave-to{transform:translate3d(0,100%,0)}.smart-top-enter,.smart-top-leave-to{transform:translate3d(0,-100%,0)}.smart-left-enter,.smart-left-leave-to{transform:translate3d(-100%,-50%,0)}.smart-right-enter,.smart-right-leave-to{transform:translate3d(100%,-50%,0)}
+@import '../common/index.css';.smart-popup{-webkit-overflow-scrolling:touch;animation:ease both;background-color:var(--popup-background-color,var(--app-B4,#fff));box-sizing:border-box;max-height:100%;position:fixed;transition-timing-function:ease}.smart-popup--center{left:50%;top:50%;transform:translate3d(-50%,-50%,0)}.smart-popup--center.smart-popup--round{border-radius:var(--popup-round-border-radius,16px);overflow:hidden}.smart-popup--top{left:0;top:0;width:100%}.smart-popup--top.smart-popup--round{border-radius:0 0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px));overflow:hidden}.smart-popup--right{right:0;top:50%;transform:translate3d(0,-50%,0)}.smart-popup--right.smart-popup--round{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0 0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px));overflow:hidden}.smart-popup--bottom{bottom:0;left:0;width:100%}.smart-popup--bottom.smart-popup--round{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0 0;overflow:hidden}.smart-popup--left{left:0;top:50%;transform:translate3d(0,-50%,0)}.smart-popup--left.smart-popup--round{border-radius:0 var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) var(--popup-round-border-radius,var(--popup-round-border-radius,16px)) 0;overflow:hidden}.smart-popup--bottom.smart-popup--safeTabBar,.smart-popup--top.smart-popup--safeTabBar{bottom:var(--tabbar-height,55px)}.smart-popup--safeTop{padding-top:env(safe-area-inset-top)}.smart-popup__close-icon{color:var(--popup-close-icon-color,#969799);font-size:var(--popup-close-icon-size,24px);position:absolute;z-index:var(--popup-close-icon-z-index,1)}.smart-popup__close-icon--top-left{left:var(--popup-close-icon-margin,12px);top:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--top-right{right:var(--popup-close-icon-margin,12px);top:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--bottom-left{bottom:var(--popup-close-icon-margin,12px);left:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon--bottom-right{bottom:var(--popup-close-icon-margin,12px);right:var(--popup-close-icon-margin,12px)}.smart-popup__close-icon:active{opacity:.6}.smart-scale-enter-active,.smart-scale-leave-active{transition-property:opacity,transform}.smart-scale-enter,.smart-scale-leave-to{opacity:0;transform:translate3d(-50%,-50%,0) scale(.7)}.smart-fade-enter-active,.smart-fade-leave-active{transition-property:opacity}.smart-fade-enter,.smart-fade-leave-to{opacity:0}.smart-center-enter-active,.smart-center-leave-active{transition-property:opacity}.smart-center-enter,.smart-center-leave-to{opacity:0}.smart-bottom-enter-active,.smart-bottom-leave-active,.smart-left-enter-active,.smart-left-leave-active,.smart-right-enter-active,.smart-right-leave-active,.smart-top-enter-active,.smart-top-leave-active{transition-property:transform}.smart-bottom-enter,.smart-bottom-leave-to{transform:translate3d(0,100%,0)}.smart-top-enter,.smart-top-leave-to{transform:translate3d(0,-100%,0)}.smart-left-enter,.smart-left-leave-to{transform:translate3d(-100%,-50%,0)}.smart-right-enter,.smart-right-leave-to{transform:translate3d(100%,-50%,0)}

package/lib/popup/index.js

@@ -1,9 +1,6 @@
 "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 icons_1 = require("@tuya-miniapp/icons");
 var component_1 = require("../common/component");
 var transition_1 = require("../mixins/transition");
 var utils_1 = require("../common/utils");
@@ -37,7 +34,7 @@ var utils_1 = require("../common/utils");
         },
         closeIcon: {
             type: String,
-            value: Xmark_1.default,
+            value: icons_1.Xmark,
         },
         closeIconPosition: {
             type: String,
@@ -78,7 +75,7 @@ var utils_1 = require("../common/utils");
         },
     },
     data: {
-        closeIcon: Xmark_1.default,
+        closeIcon: icons_1.Xmark,
         bottomSafeHeight: 0,
     },
     mounted: function () {

package/lib/popup/index.wxs

@@ -2,7 +2,7 @@
 var style = require('../wxs/style.wxs');
 
 function popupStyle(data) {
-  const transformStyle = data.position === 'bottom' ? "transform: translate3d(0, calc(100% + " + data.bottomSafeHeight + "px), 0)" : null;
+  var transformStyle = data.position === 'bottom' ? "transform: translate3d(0, calc(100% + " + data.bottomSafeHeight + "px), 0)" : null;
 
   return style([
     {