@tuya-miniapp/smart-ui 2.1.10 → 2.1.11-beta-2

package/dist/picker-column/index.js

@@ -1,7 +1,16 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import { SmartComponent } from '../common/component';
 import { range } from '../common/utils';
 import { isObj } from '../common/validator';
-const DEFAULT_DURATION = 200;
+const DEFAULT_DURATION = 400;
 SmartComponent({
     classes: ['active-class'],
     props: {
@@ -25,11 +34,15 @@ SmartComponent({
             type: Number,
             value: 0,
         },
+        changeAnimation: {
+            type: Boolean,
+            value: true,
+        },
         activeIndex: {
             type: Number,
             value: -1,
             observer(index) {
-                this.setIndex(index, false, true);
+                this.setIndex(index, false, this.data.changeAnimation);
             },
         },
         unit: {
@@ -48,57 +61,157 @@ SmartComponent({
         renderStart: 0,
         animate: false,
         maxText: '',
+        timer: null,
+        // animationIndex: -1,
+        preOffsetList: [],
     },
     created() {
         const { defaultIndex, activeIndex, options } = this.data;
         this.updateUint(options);
-        this.setIndex(activeIndex !== -1 ? activeIndex : defaultIndex, false, true);
+        this.setIndex(activeIndex !== -1 ? activeIndex : defaultIndex, false, this.data.changeAnimation);
     },
     methods: {
         getCount() {
             return this.data.options.length;
         },
         onTouchStart(event) {
+            if (this.data.timer) {
+                clearTimeout(this.data.timer);
+                this.setData({
+                    timer: null,
+                });
+            }
             this.setData({
                 startY: event.touches[0].clientY,
                 startOffset: this.data.offset,
-                duration: 0,
+                duration: 100,
+                timer: null,
+                preOffsetList: [this.data.offset],
             });
         },
         onTouchMove(event) {
             const { data } = this;
+            const { preOffsetList } = data;
             const deltaY = event.touches[0].clientY - data.startY;
+            const offset = range(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight);
+            const direction = this.checkIsDown(offset);
+            // 上一次滚动的索引
+            const preIndex = range(Math.round(-preOffsetList[preOffsetList.length - 1] / data.itemHeight), 0, this.getCount() - 1);
+            // 最终定位索引
+            const index = range(Math.round(-offset / data.itemHeight), 0, this.getCount() - 1);
+            if ((direction === 'up' && index < data.renderStart + 8) ||
+                (direction === 'down' && index > data.renderStart + data.renderNum - 8)) {
+                this.updateVisibleOptions(index);
+            }
+            // 索引变化时 粗发震动反馈
+            if (index !== preIndex) {
+                // @ts-ignore
+                this.vibrateShort();
+            }
+            // const animationIndex = Math.abs(-offset / data.itemHeight);
             this.setData({
-                offset: range(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight),
+                offset,
+                // animationIndex: animationIndex,
+                preOffsetList: [...data.preOffsetList, offset],
+                animate: false,
             });
         },
         onTouchEnd() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const { data } = this;
+                const { preOffsetList } = data;
+                let preOffset = Math.max(Math.abs(preOffsetList[preOffsetList.length - 3] - preOffsetList[preOffsetList.length - 4]), Math.abs(preOffsetList[preOffsetList.length - 2] - preOffsetList[preOffsetList.length - 3]), Math.abs(preOffsetList[preOffsetList.length - 1] - preOffsetList[preOffsetList.length - 2]));
+                if (isNaN(preOffset))
+                    preOffset = 0;
+                preOffset = Math.min(preOffset, 40);
+                // 三次同样的距离 说明用户一直在顶部或者底部滑动  或在move途中已经是上下边缘了
+                const isSameTouch = (preOffsetList[preOffsetList.length - 1] === preOffsetList[preOffsetList.length - 2] &&
+                    preOffsetList[preOffsetList.length - 2] === preOffsetList[preOffsetList.length - 3]) ||
+                    preOffsetList[preOffsetList.length - 1] === -(this.getCount() * data.itemHeight) ||
+                    preOffsetList[preOffsetList.length - 1] === data.itemHeight;
+                // 是否是向下滚动
+                const direction = this.checkIsDown();
+                // 当滚动速度比较慢时(<3) 不增加惯性滚动距离
+                const offset = Math.abs(preOffset) < 3 || isSameTouch || !direction
+                    ? data.offset
+                    : data.offset + (direction === 'down' ? -preOffset : preOffset) * 10;
+                // 有数字的最大滚动距离
+                const countHeight = (this.getCount() - 1) * data.itemHeight;
+                // 动画最大滚动距离 上下各加一个 data.itemHeight 的滚动空间
+                const animationOffset = range(offset, -(this.getCount() * data.itemHeight), data.itemHeight);
+                // 最终定位滚动位置
+                const finOffset = animationOffset < -countHeight ? -countHeight : animationOffset > 0 ? 0 : animationOffset;
+                // 获取索引
+                const index = range(Math.round(-finOffset / data.itemHeight), 0, this.getCount() - 1);
+                // 获取索引的标准距离
+                const offsetData = -index * data.itemHeight;
+                // 增加惯性音效
+                if (Math.abs(offsetData - data.offset) > data.itemHeight && !isSameTouch) {
+                    const countVibrate = Math.abs(offsetData - data.offset) / data.itemHeight;
+                    // @ts-ignore
+                    this.vibrateShort(Math.floor(countVibrate), 800);
+                }
+                // 最终定位索引
+                this.setData({
+                    duration: isSameTouch ? 150 : 800,
+                    // animationIndex: index,
+                    offset: offsetData,
+                    animate: true,
+                });
+                // 更新列表
+                if ((direction === 'up' && index < data.renderStart + 8) ||
+                    (direction === 'down' && index > data.renderStart + data.renderNum - 8)) {
+                    yield this.updateVisibleOptions(index);
+                }
+                // 更新索引
+                if (index !== data.currentIndex) {
+                    this.setData({
+                        timer: setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                            this.setIndex(index, true, false);
+                            // await this.setData({
+                            //   timer: null,
+                            //   currentIndex: index,
+                            //   // animationIndex: index,
+                            // });
+                            // this.$emit('change', index);
+                        }), isSameTouch ? 150 : 800),
+                    });
+                }
+            });
+        },
+        checkIsDown(curr) {
             const { data } = this;
-            if (data.offset !== data.startOffset) {
-                const index = range(Math.round(-data.offset / data.itemHeight), 0, this.getCount() - 1);
-                this.setIndex(index, true, true);
-            }
+            const { preOffsetList } = data;
+            const currOffset = curr === undefined ? preOffsetList[preOffsetList.length - 1] : curr;
+            const preOffset = curr === undefined
+                ? preOffsetList[preOffsetList.length - 2]
+                : preOffsetList[preOffsetList.length - 1];
+            if (currOffset === undefined || preOffset === undefined || currOffset === preOffset)
+                return;
+            return currOffset < preOffset ? 'down' : 'up';
         },
-        onTransitionEnd() {
-            const { options, visibleItemCount, currentIndex } = this.data;
-            let renderNum = 0;
-            let renderStart = 0;
-            if (visibleItemCount < 20 && options.length > visibleItemCount) {
-                // 选项多于20个时，进行列表优化
-                renderNum = Math.max(visibleItemCount * 2, 20);
-                renderStart = Math.max(0, currentIndex - renderNum / 2);
-                const optionsV = options.slice(renderStart, renderStart + renderNum);
-                this.setData({ optionsV, renderStart, renderNum, animate: false });
-            }
-            else {
-                this.setData({ animate: false });
-            }
-            if (this.fireChange) {
-                this.$emit('change', currentIndex);
+        vibrateShort(count, time = 1000) {
+            if (!count) {
+                // @ts-ignore
+                ty.vibrateShort({ type: 'light' });
+                return;
             }
+            let has = 0;
+            const timer = setInterval(() => {
+                if (has >= count) {
+                    clearInterval(timer);
+                    return;
+                }
+                has++;
+                this.vibrateShort();
+            }, time / count - 20);
         },
         onClickItem(event) {
             const { index } = event.currentTarget.dataset;
+            if (index === this.data.currentIndex || index < 0 || index > this.data.options.length - 1) {
+                return;
+            }
+            this.vibrateShort(Math.abs(index - this.data.currentIndex), DEFAULT_DURATION);
             this.setIndex(index, true, true);
         },
         updateUint(options) {
@@ -120,7 +233,7 @@ SmartComponent({
             if (visibleItemCount < 20 && options.length > visibleItemCount) {
                 let renderNum = 0;
                 let renderStart = 0;
-                // 选项多于20个时，进行列表优化
+                // 选项多于 20 个时，进行列表优化
                 renderNum = Math.max(visibleItemCount * 2, 20);
                 renderStart = Math.max(0, targetIndex - renderNum / 2);
                 const renderEnd = Math.min(options.length, renderStart + renderNum);
@@ -159,35 +272,32 @@ SmartComponent({
             const { data } = this;
             return isObj(option) && data.valueKey in option ? option[data.valueKey] : option;
         },
-        setIndex(index, userAction, animate) {
+        setIndex(index, userAction, animate, time = DEFAULT_DURATION) {
             const { data } = this;
             index = this.adjustIndex(index) || 0;
             const offset = -index * data.itemHeight;
-            this.fireChange = false;
             if (index !== data.currentIndex) {
                 // 需要动画的情况下，保持最大的截取
+                this.updateVisibleOptions(index);
                 if (animate) {
-                    return this.updateVisibleOptions(index).then(() => {
-                        this.set({
-                            currentIndex: index,
-                            offset,
-                            animate: true,
-                            duration: DEFAULT_DURATION,
-                        }).then(() => {
-                            if (!userAction)
-                                return;
-                            if ([0, data.optionsV.length - 1].includes(index)) {
-                                this.$emit('change', index);
-                                return;
-                            }
-                            this.fireChange = true;
-                        });
+                    return this.set({
+                        currentIndex: index,
+                        // animationIndex: index,
+                        offset,
+                        animate: true,
+                        duration: time,
+                    }).then(() => {
+                        if (!userAction)
+                            return;
+                        console.log('change', index);
+                        this.$emit('change', index);
                     });
                 }
                 return this.set({
                     optionsV: data.options,
                     offset,
                     currentIndex: index,
+                    // animationIndex: index,
                     renderStart: 0,
                     animate: !!animate,
                 }).then(() => {
@@ -200,7 +310,7 @@ SmartComponent({
             const { options } = this.data;
             for (let i = 0; i < options.length; i++) {
                 if (this.getOptionText(options[i]) === value) {
-                    return this.setIndex(i, false, true);
+                    return this.setIndex(i, false, this.data.changeAnimation);
                 }
             }
             return Promise.resolve();

package/dist/picker-column/index.wxml

@@ -9,18 +9,29 @@
   bind:touchend="onTouchEnd"
   bind:touchcancel="onTouchEnd"
 >
-  <view style="{{ computed.wrapperStyle({ offset, itemHeight, visibleItemCount, animate, duration, renderStart, unit }) }}"
-  bind:transitionend="onTransitionEnd"
-  id="options">
-    <view
-      wx:for="{{ optionsV }}"
-      wx:for-item="option"
+  <view class="smart-picker-column__offset" style="height: {{ itemHeight * options.length }}px;{{ computed.wrapperStyle({ offset, itemHeight, visibleItemCount, animate, duration, renderStart, unit }) }}" id="options">
+    <view class="smart-picker-column__visual" style="{{ computed.wrapperInterStyle({ offset, itemHeight, visibleItemCount, renderStart }) }}">
+      <view
+        wx:for="{{ optionsV }}"
+        wx:for-item="option"
+        wx:key="index"
+        data-index="{{ renderStart + index }}"
+        style="height: {{ itemHeight }}px;{{renderStart + index === currentIndex ? activeStyle : ''}}"
+        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) }}
+      </view>
+    </view>
+  </view>
+  <view class="smart-picker-column__mask">
+    <view 
+      wx:for="{{ visibleItemCount }}" 
       wx:key="index"
-      data-index="{{ renderStart + index }}"
-      style="height: {{ itemHeight }}px;{{renderStart + index === currentIndex ? activeStyle : ''}}"
-      class="smart-ellipsis {{ utils.bem('picker-column__item', { disabled: option && option.disabled, selected: renderStart + index === currentIndex }) }} {{ renderStart + index === currentIndex ? 'active-class' : '' }}"
-      bindtap="onClickItem"
-    >{{ computed.optionText(option, valueKey) }}</view>
+      class="smart-picker-column__mask__item" 
+      data-index="{{ currentIndex + index - 2 }}" 
+      bind:tap="onClickItem" 
+    >
+    </view>
   </view>
   <view wx:if="{{unit}}" class="smart-picker-column__unit" style="height: {{ itemHeight }}px">
     <view class="smart-picker-column__unit_text smart-picker-column__unit_hidden" >{{unit}}</view>

package/dist/picker-column/index.wxs

@@ -20,15 +20,11 @@ function rootStyle(data) {
 function wrapperStyle(data) {
   var offset =
     data.offset + (data.itemHeight * (data.visibleItemCount - 1)) / 2;
-  // 长列表优化
-  if (data.renderStart) {
-    offset += data.renderStart * data.itemHeight;
-  }
   offset = addUnit(offset);
   if (data.animate) {
     return style({
       'text-indent': data.unit ? '-8rpx' : '0',
-      transition: 'transform ' + data.duration + 'ms',
+      transition: 'transform ' + data.duration + 'ms ease-out',
       'line-height': addUnit(data.itemHeight),
       transform: 'translate3d(0, ' + offset + ', 0)',
     });
@@ -40,8 +36,29 @@ function wrapperStyle(data) {
   });
 }
 
+function wrapperInterStyle(data) {
+  var offset = data.renderStart * data.itemHeight;
+  offset = addUnit(offset);
+  return style({
+    'padding-top': offset,
+  });
+}
+
+// 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,
   wrapperStyle: wrapperStyle,
+  wrapperInterStyle: wrapperInterStyle,
+  // wrapperItemStyle: wrapperItemStyle
 };

package/dist/picker-column/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-picker-column{color:var(--picker-option-selected-text-color,var(--app-B6-N1,#000));font-size:var(--picker-option-font-size,16px);font-weight:var(--font-weight-bold,500);position:relative;text-align:center}.smart-picker-column__item{padding:0 5px}.smart-picker-column__item--selected{color:var(--picker-option-selected-text-color,var(--app-B6-N1,#000));font-weight:var(--font-weight-bold,500)}.smart-picker-column__item--disabled{opacity:var(--picker-option-disabled-opacity,.3)}.smart-picker-column__unit{align-items:center;display:flex;justify-content:center;position:absolute;top:50%;transform:translateY(-50%);width:100%}.smart-picker-column__unit_text{color:var(--picker-option-unit-text-color,var(--app-B6-N4,rgba(0,0,0,.4)));font-size:var(--picker-option-unit-font-size,12px)}.smart-picker-column__unit_hidden{opacity:0}.smart-picker-column__max-text{font-weight:var(--font-weight-bold,500);opacity:0}
+@import '../common/index.wxss';.smart-picker-column{color:var(--picker-option-selected-text-color,var(--app-B6-N1,#000));font-size:var(--picker-option-font-size,16px);font-weight:var(--font-weight-bold,500);text-align:center}.smart-picker-column,.smart-picker-column__offset{position:relative;width:100%}.smart-picker-column__visual{position:absolute;top:0;width:100%}.smart-picker-column__item{pointer-events:none}.smart-picker-column__item--selected{color:var(--picker-option-selected-text-color,var(--app-B6-N1,#000));font-weight:var(--font-weight-bold,500)}.smart-picker-column__item--disabled{opacity:var(--picker-option-disabled-opacity,.3)}.smart-picker-column__mask{background:transparent;display:flex;flex-direction:column;height:100%;position:absolute;top:0;width:100%;z-index:10}.smart-picker-column__mask__item{flex:1}.smart-picker-column__unit{align-items:center;display:flex;justify-content:center;position:absolute;top:50%;transform:translateY(-50%);width:100%}.smart-picker-column__unit_text{color:var(--picker-option-unit-text-color,var(--app-B6-N4,rgba(0,0,0,.4)));font-size:var(--picker-option-unit-font-size,12px)}.smart-picker-column__unit_hidden{opacity:0}.smart-picker-column__max-text{font-weight:var(--font-weight-bold,500);opacity:0}

package/dist/stepper/index.js

@@ -147,6 +147,8 @@ SmartComponent({
             const value = this.format(add(+this.data.currentValue, diff));
             this.emitChange(value);
             this.$emit(type);
+            // @ts-ignore
+            ty.vibrateShort({ type: 'light' });
         },
         longPressStep() {
             this.longPressTimer = setTimeout(() => {

package/dist/tag/index.js

@@ -1,4 +1,4 @@
-import Xmark from '@tuya-miniapp/icons/dist/svg/Xmark';
+import Xmark from '@tuya-miniapp/icons/dist/svg/Xmark.js';
 import { SmartComponent } from '../common/component';
 SmartComponent({
     props: {

package/lib/action-sheet/index.css

@@ -1 +1 @@
-@import '../common/index.css';.smart-action-sheet{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px))!important;color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000));left:var(--action-sheet-left,16px)!important;margin:var(--action-sheet-margin,0 0 16px);max-height:var(--action-sheet-max-height,90%)!important;width:var(--action-sheet-width,calc(100% - 32px))!important}.smart-action-sheet__list{max-height:325px;overflow-y:scroll}.smart-action-sheet__icon{font-size:var(--action-sheet-item-icon-size,28px);margin:var(--action-sheet-item-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}.smart-action-sheet__item{border-radius:var(--action-sheet-item-border-radius,0);color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000))}.smart-action-sheet__item:not(:last-child){border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)))}.smart-action-sheet__cancel,.smart-action-sheet__confirm,.smart-action-sheet__item{background-color:var(--action-sheet-item-background,var(--app-B4,#fff));font-size:var(--action-sheet-item-font-size,16px);font-weight:var(--action-sheet-item-font-weight,normal);line-height:var(--action-sheet-item-line-height,24px);padding:16px;text-align:center;width:100%}.smart-action-sheet__cancel--hover,.smart-action-sheet__confirm--hover,.smart-action-sheet__item--hover{background-color:var(--action-sheet-active-color,var(--app-B1,#f6f7fb))}.smart-action-sheet__cancel:after,.smart-action-sheet__confirm:after,.smart-action-sheet__item:after{border-width:0}.smart-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,var(--app-B4-N3,rgba(0,0,0,.5)))}.smart-action-sheet__confirm{color:var(--action-sheet-confirm-text-color,var(--app-B4-N1,#000));font-weight:var(--action-sheet-confirm-font-weight,500)}.smart-action-sheet__gap{background-color:var(--action-sheet-footer-padding-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:block;height:var(--action-sheet-footer-padding-top,8px)}.smart-action-sheet__item--disabled{opacity:var(--action-sheet-item-disabled-opacity,.3)}.smart-action-sheet__item--disabled.smart-action-sheet__item--hover{background-color:var(--action-sheet-item-background,var(--app-B4,#fff))}.smart-action-sheet__subname{color:var(--action-sheet-subname-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.smart-action-sheet__header{border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)));color:var(--action-sheet-header-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--action-sheet-header-font-weight,normal);line-height:var(--action-sheet-header-height,56px);text-align:center}.smart-action-sheet__description{color:var(--action-sheet-description-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.smart-action-sheet__loading{color:inherit!important;display:flex!important}.smart-action-sheet__footer{align-items:center;background-color:var(--action-sheet-item-background,var(--app-B4,#fff));display:flex;font-size:var(--action-sheet-item-font-size,16px);justify-content:space-around;line-height:var(--action-sheet-item-line-height,22px);text-align:center}
+@import '../common/index.css';.smart-action-sheet{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px))!important;color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000));left:var(--action-sheet-left,16px)!important;margin:var(--action-sheet-margin,0 0 16px);max-height:var(--action-sheet-max-height,90%)!important;width:var(--action-sheet-width,calc(100% - 32px))!important}.smart-action-sheet__list{max-height:325px;overflow-y:scroll}.smart-action-sheet__icon{--icon-color:var(--action-sheet-active-icon-color,var(--app-M1,#3678e3));font-size:var(--action-sheet-item-icon-size,28px);margin:var(--action-sheet-item-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}.smart-action-sheet__item{border-radius:var(--action-sheet-item-border-radius,0);color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000))}.smart-action-sheet__item:not(:last-child){border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)))}.smart-action-sheet__cancel,.smart-action-sheet__confirm,.smart-action-sheet__item{background-color:var(--action-sheet-item-background,var(--app-B4,#fff));font-size:var(--action-sheet-item-font-size,16px);font-weight:var(--action-sheet-item-font-weight,normal);line-height:var(--action-sheet-item-line-height,24px);padding:16px;text-align:center;width:100%}.smart-action-sheet__cancel--hover,.smart-action-sheet__confirm--hover,.smart-action-sheet__item--hover{background-color:var(--action-sheet-active-color,var(--app-B1,#f6f7fb))}.smart-action-sheet__cancel:after,.smart-action-sheet__confirm:after,.smart-action-sheet__item:after{border-width:0}.smart-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,var(--app-B4-N3,rgba(0,0,0,.5)))}.smart-action-sheet__confirm{color:var(--action-sheet-confirm-text-color,var(--app-B4-N1,#000));font-weight:var(--action-sheet-confirm-font-weight,500)}.smart-action-sheet__gap{background-color:var(--action-sheet-footer-padding-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:block;height:var(--action-sheet-footer-padding-top,8px)}.smart-action-sheet__item--disabled{opacity:var(--action-sheet-item-disabled-opacity,.3)}.smart-action-sheet__item--disabled.smart-action-sheet__item--hover{background-color:var(--action-sheet-item-background,var(--app-B4,#fff))}.smart-action-sheet__subname{color:var(--action-sheet-subname-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.smart-action-sheet__header{border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)));color:var(--action-sheet-header-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--action-sheet-header-font-weight,normal);line-height:var(--action-sheet-header-height,56px);text-align:center}.smart-action-sheet__description{color:var(--action-sheet-description-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.smart-action-sheet__loading{color:inherit!important;display:flex!important}.smart-action-sheet__footer{align-items:center;background-color:var(--action-sheet-item-background,var(--app-B4,#fff));display:flex;font-size:var(--action-sheet-item-font-size,16px);justify-content:space-around;line-height:var(--action-sheet-item-line-height,22px);text-align:center}

package/lib/action-sheet/index.js

@@ -55,14 +55,6 @@ var button_1 = require("../mixins/button");
     },
     data: {
         checkMarkIcon: Check_1.default,
-        checkMarkIconColor: '#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 checkMarkIconColor = this.data.activeColor || themeInfo['--app-M1'] || '#3678E3';
-        this.setData({ checkMarkIconColor: checkMarkIconColor });
     },
     methods: {
         onSelect: function (event) {

package/lib/action-sheet/index.wxml

@@ -53,7 +53,7 @@
       <block wx:if="{{ !item.loading }}">
         {{ item.name }}
         <view wx:if="{{ item.subname }}" class="smart-action-sheet__subname" >{{ item.subname }}</view>
-        <smart-icon wx:if="{{ item.checked }}" name="{{ checkMarkIcon }}" class="smart-action-sheet__icon" color="{{ checkMarkIconColor }}" />
+        <smart-icon wx:if="{{ item.checked }}" name="{{ checkMarkIcon }}" class="smart-action-sheet__icon" color="{{ activeColor }}" />
       </block>
       <smart-loading wx:else custom-class="smart-action-sheet__loading" size="22px" />
     </button>

package/lib/action-sheet/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.smart-action-sheet{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px))!important;color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000));left:var(--action-sheet-left,16px)!important;margin:var(--action-sheet-margin,0 0 16px);max-height:var(--action-sheet-max-height,90%)!important;width:var(--action-sheet-width,calc(100% - 32px))!important}.smart-action-sheet__list{max-height:325px;overflow-y:scroll}.smart-action-sheet__icon{font-size:var(--action-sheet-item-icon-size,28px);margin:var(--action-sheet-item-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}.smart-action-sheet__item{border-radius:var(--action-sheet-item-border-radius,0);color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000))}.smart-action-sheet__item:not(:last-child){border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)))}.smart-action-sheet__cancel,.smart-action-sheet__confirm,.smart-action-sheet__item{background-color:var(--action-sheet-item-background,var(--app-B4,#fff));font-size:var(--action-sheet-item-font-size,16px);font-weight:var(--action-sheet-item-font-weight,normal);line-height:var(--action-sheet-item-line-height,24px);padding:16px;text-align:center;width:100%}.smart-action-sheet__cancel--hover,.smart-action-sheet__confirm--hover,.smart-action-sheet__item--hover{background-color:var(--action-sheet-active-color,var(--app-B1,#f6f7fb))}.smart-action-sheet__cancel:after,.smart-action-sheet__confirm:after,.smart-action-sheet__item:after{border-width:0}.smart-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,var(--app-B4-N3,rgba(0,0,0,.5)))}.smart-action-sheet__confirm{color:var(--action-sheet-confirm-text-color,var(--app-B4-N1,#000));font-weight:var(--action-sheet-confirm-font-weight,500)}.smart-action-sheet__gap{background-color:var(--action-sheet-footer-padding-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:block;height:var(--action-sheet-footer-padding-top,8px)}.smart-action-sheet__item--disabled{opacity:var(--action-sheet-item-disabled-opacity,.3)}.smart-action-sheet__item--disabled.smart-action-sheet__item--hover{background-color:var(--action-sheet-item-background,var(--app-B4,#fff))}.smart-action-sheet__subname{color:var(--action-sheet-subname-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.smart-action-sheet__header{border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)));color:var(--action-sheet-header-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--action-sheet-header-font-weight,normal);line-height:var(--action-sheet-header-height,56px);text-align:center}.smart-action-sheet__description{color:var(--action-sheet-description-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.smart-action-sheet__loading{color:inherit!important;display:flex!important}.smart-action-sheet__footer{align-items:center;background-color:var(--action-sheet-item-background,var(--app-B4,#fff));display:flex;font-size:var(--action-sheet-item-font-size,16px);justify-content:space-around;line-height:var(--action-sheet-item-line-height,22px);text-align:center}
+@import '../common/index.wxss';.smart-action-sheet{border-radius:var(--popup-round-border-radius,var(--popup-round-border-radius,16px))!important;color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000));left:var(--action-sheet-left,16px)!important;margin:var(--action-sheet-margin,0 0 16px);max-height:var(--action-sheet-max-height,90%)!important;width:var(--action-sheet-width,calc(100% - 32px))!important}.smart-action-sheet__list{max-height:325px;overflow-y:scroll}.smart-action-sheet__icon{--icon-color:var(--action-sheet-active-icon-color,var(--app-M1,#3678e3));font-size:var(--action-sheet-item-icon-size,28px);margin:var(--action-sheet-item-icon-margin,16px 16px 0 0);position:absolute;right:0;top:0}.smart-action-sheet__item{border-radius:var(--action-sheet-item-border-radius,0);color:var(--action-sheet-item-text-color,var(--app-B4-N1,#000))}.smart-action-sheet__item:not(:last-child){border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)))}.smart-action-sheet__cancel,.smart-action-sheet__confirm,.smart-action-sheet__item{background-color:var(--action-sheet-item-background,var(--app-B4,#fff));font-size:var(--action-sheet-item-font-size,16px);font-weight:var(--action-sheet-item-font-weight,normal);line-height:var(--action-sheet-item-line-height,24px);padding:16px;text-align:center;width:100%}.smart-action-sheet__cancel--hover,.smart-action-sheet__confirm--hover,.smart-action-sheet__item--hover{background-color:var(--action-sheet-active-color,var(--app-B1,#f6f7fb))}.smart-action-sheet__cancel:after,.smart-action-sheet__confirm:after,.smart-action-sheet__item:after{border-width:0}.smart-action-sheet__cancel{color:var(--action-sheet-cancel-text-color,var(--app-B4-N3,rgba(0,0,0,.5)))}.smart-action-sheet__confirm{color:var(--action-sheet-confirm-text-color,var(--app-B4-N1,#000));font-weight:var(--action-sheet-confirm-font-weight,500)}.smart-action-sheet__gap{background-color:var(--action-sheet-footer-padding-color,var(--app-B4-N9,rgba(0,0,0,.05)));display:block;height:var(--action-sheet-footer-padding-top,8px)}.smart-action-sheet__item--disabled{opacity:var(--action-sheet-item-disabled-opacity,.3)}.smart-action-sheet__item--disabled.smart-action-sheet__item--hover{background-color:var(--action-sheet-item-background,var(--app-B4,#fff))}.smart-action-sheet__subname{color:var(--action-sheet-subname-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-subname-font-size,12px);line-height:var(--action-sheet-subname-line-height,20px);margin-top:var(--padding-xs,8px)}.smart-action-sheet__header{border-bottom:1px solid var(--action-sheet-header-border-color,var(--app-B4-N7,rgba(0,0,0,.1)));color:var(--action-sheet-header-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-header-font-size,16px);font-weight:var(--action-sheet-header-font-weight,normal);line-height:var(--action-sheet-header-height,56px);text-align:center}.smart-action-sheet__description{color:var(--action-sheet-description-color,var(--app-B4-N3,rgba(0,0,0,.5)));font-size:var(--action-sheet-description-font-size,14px);line-height:var(--action-sheet-description-line-height,20px);padding:20px var(--padding-md,16px);text-align:center}.smart-action-sheet__loading{color:inherit!important;display:flex!important}.smart-action-sheet__footer{align-items:center;background-color:var(--action-sheet-item-background,var(--app-B4,#fff));display:flex;font-size:var(--action-sheet-item-font-size,16px);justify-content:space-around;line-height:var(--action-sheet-item-line-height,22px);text-align:center}

package/lib/cell/index.js

@@ -3,10 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var Up_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Up"));
-var Down_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Down"));
-var Left_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Left"));
-var Right_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right"));
+var Up_js_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Up.js"));
+var Down_js_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Down.js"));
+var Left_js_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Left.js"));
+var Right_js_1 = __importDefault(require("@tuya-miniapp/icons/dist/svg/Right.js"));
+// import {
+//   Right as rightIcon,
+//   Left as leftIcon,
+//   Down as downIcon,
+//   Up as upIcon,
+// } from '@tuya-miniapp/icons';
 var link_1 = require("../mixins/link");
 var component_1 = require("../common/component");
 (0, component_1.SmartComponent)({
@@ -32,12 +38,12 @@ var component_1 = require("../common/component");
     },
     data: {
         arrowIcons: {
-            up: Up_1.default,
-            down: Down_1.default,
-            left: Left_1.default,
-            right: Right_1.default,
+            up: Up_js_1.default,
+            down: Down_js_1.default,
+            left: Left_js_1.default,
+            right: Right_js_1.default,
         },
-        arrowIcon: Right_1.default,
+        arrowIcon: Right_js_1.default,
     },
     methods: {
         onClick: function (event) {

package/lib/common/utils.d.ts

@@ -19,3 +19,4 @@ export declare const clamp: (num: any, min: any, max: any) => number;
 export declare function getCurrentPage<T>(): T & WechatMiniprogram.OptionalInterface<WechatMiniprogram.Page.ILifetime> & WechatMiniprogram.Page.InstanceProperties & WechatMiniprogram.Page.InstanceMethods<WechatMiniprogram.IAnyObject> & WechatMiniprogram.Page.Data<WechatMiniprogram.IAnyObject> & WechatMiniprogram.IAnyObject;
 export declare const isPC: boolean;
 export declare const isWxWork: boolean;
+export declare function replacePlaceholders(template: any, values: any): any;

package/lib/common/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWxWork = exports.isPC = exports.getCurrentPage = exports.clamp = exports.addNumber = exports.toPromise = exports.groupSetData = exports.getAllRect = exports.getRect = exports.pickExclude = exports.requestAnimationFrame = exports.addUnit = exports.nextTick = exports.range = exports.getSystemInfoSync = exports.isDef = void 0;
+exports.replacePlaceholders = exports.isWxWork = exports.isPC = exports.getCurrentPage = exports.clamp = exports.addNumber = exports.toPromise = exports.groupSetData = exports.getAllRect = exports.getRect = exports.pickExclude = exports.requestAnimationFrame = exports.addUnit = exports.nextTick = exports.range = exports.getSystemInfoSync = exports.isDef = void 0;
 var validator_1 = require("./validator");
 var version_1 = require("./version");
 var validator_2 = require("./validator");
@@ -107,3 +107,10 @@ exports.getCurrentPage = getCurrentPage;
 exports.isPC = ['mac', 'windows'].includes((0, version_1.getSystemInfoSync)().platform);
 // 是否企业微信
 exports.isWxWork = (0, version_1.getSystemInfoSync)().environment === 'wxwork';
+function replacePlaceholders(template, values) {
+    // 使用正则表达式匹配占位符
+    return template.replace(/{{(.*?)}}/g, function (match, key) {
+        return values[key] || match; // 如果在values中找到key对应的值，则替换；否则保留原样
+    });
+}
+exports.replacePlaceholders = replacePlaceholders;

package/lib/datetime-picker/demo/index.js

@@ -9,13 +9,33 @@ var toast_1 = __importDefault(require("../../toast/toast"));
     data: {
         minHour: 10,
         maxHour: 20,
+        columnsOrder: [2, 1, 1],
         minDate: new Date(2018, 0, 1).getTime(),
         maxDate: new Date(2019, 10, 1).getTime(),
         currentDate1: new Date(2018, 2, 31).getTime(),
         currentDate2: null,
         currentDate3: new Date(2018, 0, 1),
         currentDate4: '12:00',
+        currentDate5: '11:00',
         loading: false,
+        formatterMap: {
+            year: '{{year}}年',
+            month: {
+                '01': 'January',
+                '02': 'February',
+                '03': 'March',
+                '04': 'April',
+                '05': 'May',
+                '06': 'June',
+                '07': 'July',
+                '08': 'August',
+                '09': 'September',
+                '10': 'October',
+                '11': 'November',
+                '12': 'December',
+            },
+            day: '{{day}}日'
+        },
         formatter: function (type, value) {
             if (type === 'year') {
                 return "".concat(value).concat(I18n.t('year'));