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

package/dist/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/dist/common/utils.js

@@ -84,3 +84,9 @@ export function getCurrentPage() {
 export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform);
 // 是否企业微信
 export const isWxWork = getSystemInfoSync().environment === 'wxwork';
+export function replacePlaceholders(template, values) {
+    // 使用正则表达式匹配占位符
+    return template.replace(/{{(.*?)}}/g, (match, key) => {
+        return values[key] || match; // 如果在values中找到key对应的值，则替换；否则保留原样
+    });
+}

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

@@ -11,6 +11,24 @@ SmartComponent({
         currentDate3: new Date(2018, 0, 1),
         currentDate4: '12: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(type, value) {
             if (type === 'year') {
                 return `${value}${I18n.t('year')}`;

package/dist/datetime-picker/index.js

@@ -1,13 +1,11 @@
 import { SmartComponent } from '../common/component';
 import { isDef } from '../common/validator';
 import { pickerProps } from '../picker/shared';
+import { range, replacePlaceholders } from '../common/utils';
 const currentYear = new Date().getFullYear();
 function isValidDate(date) {
     return isDef(date) && !isNaN(new Date(date).getTime());
 }
-function range(num, min, max) {
-    return Math.min(Math.max(num, min), max);
-}
 function padZero(val) {
     return `00${val}`.slice(-2);
 }
@@ -73,6 +71,9 @@ SmartComponent({
             type: Number,
             value: 59,
             observer: 'updateValue',
+        }, formatterMap: {
+            type: Object,
+            value: undefined,
         } }),
     data: {
         innerValue: Date.now(),
@@ -98,10 +99,22 @@ SmartComponent({
             }
             return this.picker;
         },
+        formatterFunc(type, value) {
+            var _a;
+            const { formatterMap, formatter = defaultFormatter } = this.data;
+            const mapDetail = formatterMap === null || formatterMap === void 0 ? void 0 : formatterMap[type];
+            if (typeof mapDetail === 'string') {
+                return replacePlaceholders(mapDetail, { [type]: value });
+            }
+            if (typeof mapDetail === 'object') {
+                return (_a = mapDetail[value]) !== null && _a !== void 0 ? _a : formatter(type, value);
+            }
+            return formatter(type, value);
+        },
         updateColumns() {
-            const { formatter = defaultFormatter, locale } = this.data;
+            const { locale } = this.data;
             const results = this.getOriginColumns().map(column => ({
-                values: column.values.map(value => formatter(column.type, value)),
+                values: column.values.map(value => this.formatterFunc(column.type, value)),
                 unit: locale === null || locale === void 0 ? void 0 : locale[column.type],
             }));
             return this.set({ columns: results });
@@ -264,7 +277,7 @@ SmartComponent({
         updateColumnValue(value) {
             let values = [];
             const { type } = this.data;
-            const formatter = this.data.formatter || defaultFormatter;
+            const formatter = this.formatterFunc;
             const picker = this.getPicker();
             if (type === 'time') {
                 const pair = value.split(':');

package/dist/datetime-picker/index.wxml

@@ -10,6 +10,7 @@
   visible-item-count="{{ visibleItemCount }}"
   confirm-button-text="{{ confirmButtonText }}"
   cancel-button-text="{{ cancelButtonText }}"
+  change-animation="{{ changeAnimation }}"
   bind:change="onChange"
   bind:confirm="onConfirm"
   bind:cancel="onCancel"

package/dist/icon/index.wxs

@@ -14,7 +14,7 @@ function rootClass(data) {
   var classes = ['custom-class'];
 
   if (data.classPrefix !== 'smart-icon') {
-    classes.push('smart-icon--custom')
+    classes.push('smart-icon--custom');
   }
 
   if (data.classPrefix != null) {
@@ -54,6 +54,8 @@ function svgStyle(data) {
     {
       '-webkit-mask-image': imageBase64Src,
       '-webkit-mask-size': 'contain',
+      '-webkit-mask-repeat': 'no-repeat',
+      '-webkit-mask-position': 'center',
       'mask-image': imageBase64Src,
       'mask-size': 'contain',
       width: data.size,

package/dist/picker/demo/index.js

@@ -45,6 +45,7 @@ SmartComponent({
     methods: {
         onChange1(event) {
             const { value, index } = event.detail;
+            console.log(`Value: ${value}, Index：${index}`);
             Toast({
                 context: this,
                 message: `Value: ${value}, Index：${index}`,

package/dist/picker/index.wxml

@@ -23,6 +23,7 @@
       active-style="{{ activeStyle }}"
       options="{{ item.values }}"
       unit="{{ item.unit || unit }}"
+      changeAnimation="{{ changeAnimation }}"
       default-index="{{ item.defaultIndex || defaultIndex }}"
       active-index="{{ item.activeIndex || activeIndex }}"
       item-height="{{ itemHeight }}"

package/dist/picker/shared.d.ts

@@ -18,4 +18,8 @@ export declare const pickerProps: {
         type: NumberConstructor;
         value: number;
     };
+    changeAnimation: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
 };

package/dist/picker/shared.js

@@ -18,4 +18,8 @@ export const pickerProps = {
         type: Number,
         value: 44,
     },
+    changeAnimation: {
+        type: Boolean,
+        value: true,
+    },
 };

package/dist/picker-column/index.css

@@ -1 +1 @@
-@import '../common/index.css';.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.css';.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/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/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

@@ -16,6 +16,24 @@ var toast_1 = __importDefault(require("../../toast/toast"));
         currentDate3: new Date(2018, 0, 1),
         currentDate4: '12: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'));

package/lib/datetime-picker/index.js

@@ -23,13 +23,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var validator_1 = require("../common/validator");
 var shared_1 = require("../picker/shared");
+var utils_1 = require("../common/utils");
 var currentYear = new Date().getFullYear();
 function isValidDate(date) {
     return (0, validator_1.isDef)(date) && !isNaN(new Date(date).getTime());
 }
-function range(num, min, max) {
-    return Math.min(Math.max(num, min), max);
-}
 function padZero(val) {
     return "00".concat(val).slice(-2);
 }
@@ -97,6 +95,9 @@ var defaultFormatter = function (type, value) {
             type: Number,
             value: 59,
             observer: 'updateValue',
+        }, formatterMap: {
+            type: Object,
+            value: undefined,
         } }),
     data: {
         innerValue: Date.now(),
@@ -129,10 +130,24 @@ var defaultFormatter = function (type, value) {
             }
             return this.picker;
         },
+        formatterFunc: function (type, value) {
+            var _a;
+            var _b;
+            var _c = this.data, formatterMap = _c.formatterMap, _d = _c.formatter, formatter = _d === void 0 ? defaultFormatter : _d;
+            var mapDetail = formatterMap === null || formatterMap === void 0 ? void 0 : formatterMap[type];
+            if (typeof mapDetail === 'string') {
+                return (0, utils_1.replacePlaceholders)(mapDetail, (_a = {}, _a[type] = value, _a));
+            }
+            if (typeof mapDetail === 'object') {
+                return (_b = mapDetail[value]) !== null && _b !== void 0 ? _b : formatter(type, value);
+            }
+            return formatter(type, value);
+        },
         updateColumns: function () {
-            var _a = this.data, _b = _a.formatter, formatter = _b === void 0 ? defaultFormatter : _b, locale = _a.locale;
+            var _this = this;
+            var locale = this.data.locale;
             var results = this.getOriginColumns().map(function (column) { return ({
-                values: column.values.map(function (value) { return formatter(column.type, value); }),
+                values: column.values.map(function (value) { return _this.formatterFunc(column.type, value); }),
                 unit: locale === null || locale === void 0 ? void 0 : locale[column.type],
             }); });
             return this.set({ columns: results });
@@ -210,8 +225,8 @@ var defaultFormatter = function (type, value) {
             // time type
             if (!isDateType) {
                 var _a = value.split(':'), hour = _a[0], minute = _a[1];
-                hour = padZero(range(hour, data.minHour, data.maxHour));
-                minute = padZero(range(minute, data.minMinute, data.maxMinute));
+                hour = padZero((0, utils_1.range)(hour, data.minHour, data.maxHour));
+                minute = padZero((0, utils_1.range)(minute, data.minMinute, data.maxMinute));
                 return "".concat(hour, ":").concat(minute);
             }
             // date type
@@ -299,7 +314,7 @@ var defaultFormatter = function (type, value) {
             var _this = this;
             var values = [];
             var type = this.data.type;
-            var formatter = this.data.formatter || defaultFormatter;
+            var formatter = this.formatterFunc;
             var picker = this.getPicker();
             if (type === 'time') {
                 var pair = value.split(':');

package/lib/datetime-picker/index.wxml

@@ -10,6 +10,7 @@
   visible-item-count="{{ visibleItemCount }}"
   confirm-button-text="{{ confirmButtonText }}"
   cancel-button-text="{{ cancelButtonText }}"
+  change-animation="{{ changeAnimation }}"
   bind:change="onChange"
   bind:confirm="onConfirm"
   bind:cancel="onCancel"

package/lib/icon/index.wxs

@@ -14,7 +14,7 @@ function rootClass(data) {
   var classes = ['custom-class'];
 
   if (data.classPrefix !== 'smart-icon') {
-    classes.push('smart-icon--custom')
+    classes.push('smart-icon--custom');
   }
 
   if (data.classPrefix != null) {
@@ -54,6 +54,8 @@ function svgStyle(data) {
     {
       '-webkit-mask-image': imageBase64Src,
       '-webkit-mask-size': 'contain',
+      '-webkit-mask-repeat': 'no-repeat',
+      '-webkit-mask-position': 'center',
       'mask-image': imageBase64Src,
       'mask-size': 'contain',
       width: data.size,

package/lib/picker/demo/index.js

@@ -51,6 +51,7 @@ var toast_1 = __importDefault(require("../../toast/toast"));
     methods: {
         onChange1: function (event) {
             var _a = event.detail, value = _a.value, index = _a.index;
+            console.log("Value: ".concat(value, ", Index\uFF1A").concat(index));
             (0, toast_1.default)({
                 context: this,
                 message: "Value: ".concat(value, ", Index\uFF1A").concat(index),

package/lib/picker/index.wxml

@@ -23,6 +23,7 @@
       active-style="{{ activeStyle }}"
       options="{{ item.values }}"
       unit="{{ item.unit || unit }}"
+      changeAnimation="{{ changeAnimation }}"
       default-index="{{ item.defaultIndex || defaultIndex }}"
       active-index="{{ item.activeIndex || activeIndex }}"
       item-height="{{ itemHeight }}"

package/lib/picker/shared.d.ts

@@ -18,4 +18,8 @@ export declare const pickerProps: {
         type: NumberConstructor;
         value: number;
     };
+    changeAnimation: {
+        type: BooleanConstructor;
+        value: boolean;
+    };
 };

package/lib/picker/shared.js

@@ -21,4 +21,8 @@ exports.pickerProps = {
         type: Number,
         value: 44,
     },
+    changeAnimation: {
+        type: Boolean,
+        value: true,
+    },
 };

package/lib/picker-column/index.css

@@ -1 +1 @@
-@import '../common/index.css';.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.css';.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/lib/picker-column/index.js

@@ -1,9 +1,54 @@
 "use strict";
+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());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 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 DEFAULT_DURATION = 200;
+var DEFAULT_DURATION = 400;
 (0, component_1.SmartComponent)({
     classes: ['active-class'],
     props: {
@@ -27,11 +72,15 @@ var DEFAULT_DURATION = 200;
             type: Number,
             value: 0,
         },
+        changeAnimation: {
+            type: Boolean,
+            value: true,
+        },
         activeIndex: {
             type: Number,
             value: -1,
             observer: function (index) {
-                this.setIndex(index, false, true);
+                this.setIndex(index, false, this.data.changeAnimation);
             },
         },
         unit: {
@@ -50,57 +99,158 @@ var DEFAULT_DURATION = 200;
         renderStart: 0,
         animate: false,
         maxText: '',
+        timer: null,
+        // animationIndex: -1,
+        preOffsetList: [],
     },
     created: function () {
         var _a = this.data, defaultIndex = _a.defaultIndex, activeIndex = _a.activeIndex, options = _a.options;
         this.updateUint(options);
-        this.setIndex(activeIndex !== -1 ? activeIndex : defaultIndex, false, true);
+        this.setIndex(activeIndex !== -1 ? activeIndex : defaultIndex, false, this.data.changeAnimation);
     },
     methods: {
         getCount: function () {
             return this.data.options.length;
         },
         onTouchStart: function (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: function (event) {
             var data = this.data;
+            var preOffsetList = data.preOffsetList;
             var deltaY = event.touches[0].clientY - data.startY;
+            var offset = (0, utils_1.range)(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight);
+            var direction = this.checkIsDown(offset);
+            // 上一次滚动的索引
+            var preIndex = (0, utils_1.range)(Math.round(-preOffsetList[preOffsetList.length - 1] / data.itemHeight), 0, this.getCount() - 1);
+            // 最终定位索引
+            var index = (0, utils_1.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: (0, utils_1.range)(data.startOffset + deltaY, -(this.getCount() * data.itemHeight), data.itemHeight),
+                offset: offset,
+                // animationIndex: animationIndex,
+                preOffsetList: __spreadArray(__spreadArray([], data.preOffsetList, true), [offset], false),
+                animate: false,
             });
         },
         onTouchEnd: function () {
+            return __awaiter(this, void 0, void 0, function () {
+                var data, preOffsetList, preOffset, isSameTouch, direction, offset, countHeight, animationOffset, finOffset, index, offsetData, countVibrate;
+                var _this = this;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            data = this.data;
+                            preOffsetList = data.preOffsetList;
+                            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);
+                            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;
+                            direction = this.checkIsDown();
+                            offset = Math.abs(preOffset) < 3 || isSameTouch || !direction
+                                ? data.offset
+                                : data.offset + (direction === 'down' ? -preOffset : preOffset) * 10;
+                            countHeight = (this.getCount() - 1) * data.itemHeight;
+                            animationOffset = (0, utils_1.range)(offset, -(this.getCount() * data.itemHeight), data.itemHeight);
+                            finOffset = animationOffset < -countHeight ? -countHeight : animationOffset > 0 ? 0 : animationOffset;
+                            index = (0, utils_1.range)(Math.round(-finOffset / data.itemHeight), 0, this.getCount() - 1);
+                            offsetData = -index * data.itemHeight;
+                            // 增加惯性音效
+                            if (Math.abs(offsetData - data.offset) > data.itemHeight && !isSameTouch) {
+                                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))) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.updateVisibleOptions(index)];
+                        case 1:
+                            _a.sent();
+                            _a.label = 2;
+                        case 2:
+                            // 更新索引
+                            if (index !== data.currentIndex) {
+                                this.setData({
+                                    timer: setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
+                                        return __generator(this, function (_a) {
+                                            this.setIndex(index, true, false);
+                                            return [2 /*return*/];
+                                        });
+                                    }); }, isSameTouch ? 150 : 800),
+                                });
+                            }
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        },
+        checkIsDown: function (curr) {
             var data = this.data;
-            if (data.offset !== data.startOffset) {
-                var index = (0, utils_1.range)(Math.round(-data.offset / data.itemHeight), 0, this.getCount() - 1);
-                this.setIndex(index, true, true);
-            }
+            var preOffsetList = data.preOffsetList;
+            var currOffset = curr === undefined ? preOffsetList[preOffsetList.length - 1] : curr;
+            var 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: function () {
-            var _a = this.data, options = _a.options, visibleItemCount = _a.visibleItemCount, currentIndex = _a.currentIndex;
-            var renderNum = 0;
-            var renderStart = 0;
-            if (visibleItemCount < 20 && options.length > visibleItemCount) {
-                // 选项多于20个时，进行列表优化
-                renderNum = Math.max(visibleItemCount * 2, 20);
-                renderStart = Math.max(0, currentIndex - renderNum / 2);
-                var optionsV = options.slice(renderStart, renderStart + renderNum);
-                this.setData({ optionsV: optionsV, renderStart: renderStart, renderNum: renderNum, animate: false });
-            }
-            else {
-                this.setData({ animate: false });
-            }
-            if (this.fireChange) {
-                this.$emit('change', currentIndex);
+        vibrateShort: function (count, time) {
+            var _this = this;
+            if (time === void 0) { time = 1000; }
+            if (!count) {
+                // @ts-ignore
+                ty.vibrateShort({ type: 'light' });
+                return;
             }
+            var has = 0;
+            var timer = setInterval(function () {
+                if (has >= count) {
+                    clearInterval(timer);
+                    return;
+                }
+                has++;
+                _this.vibrateShort();
+            }, time / count - 20);
         },
         onClickItem: function (event) {
             var index = event.currentTarget.dataset.index;
+            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: function (options) {
@@ -122,7 +272,7 @@ var DEFAULT_DURATION = 200;
             if (visibleItemCount < 20 && options.length > visibleItemCount) {
                 var renderNum = 0;
                 var renderStart = 0;
-                // 选项多于20个时，进行列表优化
+                // 选项多于 20 个时，进行列表优化
                 renderNum = Math.max(visibleItemCount * 2, 20);
                 renderStart = Math.max(0, targetIndex - renderNum / 2);
                 var renderEnd = Math.min(options.length, renderStart + renderNum);
@@ -161,36 +311,34 @@ var DEFAULT_DURATION = 200;
             var data = this.data;
             return (0, validator_1.isObj)(option) && data.valueKey in option ? option[data.valueKey] : option;
         },
-        setIndex: function (index, userAction, animate) {
+        setIndex: function (index, userAction, animate, time) {
             var _this = this;
+            if (time === void 0) { time = DEFAULT_DURATION; }
             var data = this.data;
             index = this.adjustIndex(index) || 0;
             var offset = -index * data.itemHeight;
-            this.fireChange = false;
             if (index !== data.currentIndex) {
                 // 需要动画的情况下，保持最大的截取
+                this.updateVisibleOptions(index);
                 if (animate) {
-                    return this.updateVisibleOptions(index).then(function () {
-                        _this.set({
-                            currentIndex: index,
-                            offset: offset,
-                            animate: true,
-                            duration: DEFAULT_DURATION,
-                        }).then(function () {
-                            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: offset,
+                        animate: true,
+                        duration: time,
+                    }).then(function () {
+                        if (!userAction)
+                            return;
+                        console.log('change', index);
+                        _this.$emit('change', index);
                     });
                 }
                 return this.set({
                     optionsV: data.options,
                     offset: offset,
                     currentIndex: index,
+                    // animationIndex: index,
                     renderStart: 0,
                     animate: !!animate,
                 }).then(function () {
@@ -203,7 +351,7 @@ var DEFAULT_DURATION = 200;
             var options = this.data.options;
             for (var 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/lib/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/lib/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/lib/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/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.1.10",
+  "version": "2.1.11-beta-1",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",
   "description": "轻量、可靠的智能小程序 UI 组件库",
   "scripts": {
-    "prepublishOnly": "node ./build/transCSSVar.js",
+    "prepublishOnly": "node ./build/prepublishOnly.js",
     "dev": "NODE_OPTIONS=--no-experimental-fetch node build/dev.mjs",
     "lint": "eslint ./packages --ext .js,.ts --fix",
     "lint:style": "stylelint \"packages/**/*.less\" --fix",
@@ -78,7 +78,7 @@
     "iOS >= 9"
   ],
   "dependencies": {
-    "@ray-js/components-ty-slider": "^0.2.52",
+    "@ray-js/components-ty-slider": "^0.3.1",
     "@tuya-miniapp/icons": "^2.1.7"
   },
   "maintainers": [