@tuya-miniapp/smart-ui 2.6.4-beta-6 → 2.6.4-beta-8

package/lib/picker-column/index.js

@@ -1,40 +1,4 @@
 "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)) {
@@ -52,7 +16,12 @@ var component_1 = require("../common/component");
 var utils_1 = require("../common/utils");
 var validator_1 = require("../common/validator");
 var ty_1 = __importDefault(require("../common/ty"));
-var DEFAULT_DURATION = 400;
+var compIdList = [];
+var getId = function () {
+    var id = 'smart-picker-column-' + compIdList.length;
+    compIdList.push(id);
+    return id;
+};
 (0, component_1.SmartComponent)({
     classes: ['active-class'],
     props: {
@@ -71,8 +40,8 @@ var DEFAULT_DURATION = 400;
             observer: function (value) {
                 if (!this.data.isInit)
                     return;
+                this.updateViewOptions();
                 this.updateUint(value);
-                this.updateVisibleOptions(this.data.currentIndex);
             },
         },
         defaultIndex: {
@@ -90,10 +59,10 @@ var DEFAULT_DURATION = 400;
         activeIndex: {
             type: Number,
             value: -1,
-            observer: function (index) {
+            observer: function () {
                 if (!this.data.isInit)
                     return;
-                this.setIndex(index, false, this.data.changeAnimation, this.data.animationTime);
+                this.updateViewOptions();
             },
         },
         unit: {
@@ -104,6 +73,10 @@ var DEFAULT_DURATION = 400;
             type: Number,
             value: 300,
         },
+        loop: {
+            type: Boolean,
+            value: false,
+        },
     },
     data: {
         startY: 0,
@@ -118,165 +91,71 @@ var DEFAULT_DURATION = 400;
         playing: false,
         isInit: false,
         maxText: '',
+        instanceId: '',
         timer: null,
         preOffsetList: [],
+        viewOptions: [],
     },
     created: function () {
-        var _a = this.data, defaultIndex = _a.defaultIndex, activeIndex = _a.activeIndex, options = _a.options;
+        this.setData({
+            instanceId: getId(),
+        });
+        this.checkIndex();
+        this.updateViewOptions();
+        var options = this.data.options;
         this.updateUint(options);
-        this.setIndex(activeIndex !== -1 ? activeIndex : defaultIndex, false, this.data.changeAnimation, this.data.animationTime);
         this.setData({
             isInit: true,
         });
     },
     methods: {
-        getCount: function () {
-            return this.data.options.length;
-        },
-        onTouchStart: function (event) {
-            if (this.data.disabled) {
+        checkIndex: function () {
+            var activeIndex = this.data.activeIndex;
+            var index = this.adjustIndex(activeIndex);
+            if (activeIndex === index)
                 return;
-            }
-            if (this.data.timer) {
-                clearTimeout(this.data.timer);
-                this.setData({
-                    timer: null,
-                });
-            }
-            if (!this.data.playing) {
-                this.$emit('animation-start');
-            }
             this.setData({
-                startY: event.touches[0].clientY,
-                startOffset: this.data.offset,
-                duration: 100,
-                playing: true,
-                timer: null,
-                preOffsetList: [this.data.offset],
+                activeIndex: index,
             });
         },
-        onTouchMove: function (event) {
-            if (this.data.disabled) {
-                return;
-            }
+        adjustIndex: function (index) {
             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);
+            var count = this.data.options.length;
+            index = (0, utils_1.range)(index, 0, count);
+            for (var i = index; i < count; i++) {
+                if (!this.isDisabled(data.options[i]))
+                    return i;
             }
-            // 索引变化时 粗发震动反馈
-            if (index !== preIndex) {
-                // @ts-ignore
-                this.vibrateShort();
+            for (var i = index - 1; i >= 0; i--) {
+                if (!this.isDisabled(data.options[i]))
+                    return i;
             }
-            var animationIndex = Math.abs(-offset / data.itemHeight);
-            this.setData({
-                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, time;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            data = this.data;
-                            if (data.disabled) {
-                                return [2 /*return*/];
-                            }
-                            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), data.animationTime);
-                            }
-                            // 最终定位索引
-                            this.setData({
-                                duration: isSameTouch ? 150 : data.animationTime,
-                                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) {
-                                time = isSameTouch ? 150 : data.animationTime;
-                                // if (!isSameTouch) {
-                                //   this.timer = setInterval(() => {
-                                //     if (Math.abs(this.data.animationIndex - index) < 0.5) return clearInterval(this.timer);
-                                //     this.setData({
-                                //       animationIndex: this.data.animationIndex + (index - data.currentIndex > 0 ? 1 : -1),
-                                //     });
-                                //   }, data.animationTime / Math.abs(index - data.currentIndex));
-                                // }
-                                return [2 /*return*/, this.setData({
-                                        timer: setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
-                                            return __generator(this, function (_a) {
-                                                this.setIndex(index, true, false, this.data.animationTime);
-                                                return [2 /*return*/];
-                                            });
-                                        }); }, time),
-                                    })];
-                            }
-                            this.setData({
-                                playing: false,
-                            });
-                            this.$emit('animation-end');
-                            return [2 /*return*/];
-                    }
-                });
-            });
+        isDisabled: function (option) {
+            return (0, validator_1.isObj)(option) && option.disabled;
         },
-        checkIsDown: function (curr) {
-            var data = this.data;
-            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';
+        updateViewOptions: function () {
+            var currActiveIndex = this.data.activeIndex < 0 ? 0 : this.data.activeIndex;
+            var partNum = Math.floor(currActiveIndex / 10);
+            var lastNum = this.data.activeIndex - partNum * 10;
+            if (lastNum < 5 && partNum > 0) {
+                partNum -= 1;
+            }
+            var part2Times = Math.floor(partNum / 2);
+            var part2Percent = partNum % 2;
+            var onePartOffset = part2Percent + part2Times;
+            var twoPartOffset = part2Times;
+            var isReverse = onePartOffset > twoPartOffset;
+            var startPart = twoPartOffset + onePartOffset;
+            var viewIndexList = !isReverse
+                ? (0, utils_1.generateRangeArray)(startPart * 10, startPart * 10 + 20)
+                : __spreadArray(__spreadArray([], (0, utils_1.generateRangeArray)(startPart * 10 + 10, startPart * 10 + 20), true), (0, utils_1.generateRangeArray)(startPart * 10, startPart * 10 + 10), true);
+            this.setData({
+                viewOptions: viewIndexList,
+            });
         },
         vibrateShort: function (count, time) {
             var _this = this;
-            if (time === void 0) { time = DEFAULT_DURATION; }
             if (!count) {
                 ty_1.default.vibrateShort({ type: 'light' });
                 return;
@@ -289,17 +168,7 @@ var DEFAULT_DURATION = 400;
                 }
                 has++;
                 _this.vibrateShort();
-            }, time / count - 20);
-        },
-        onClickItem: function (event) {
-            if (this.data.disabled)
-                return;
-            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, this.data.animationTime);
+            }, (time || this.data.animationTime) / count - 20);
         },
         updateUint: function (options) {
             var _a = this.data, unit = _a.unit, valueKey = _a.valueKey;
@@ -315,129 +184,43 @@ var DEFAULT_DURATION = 400;
                 this.setData({ maxText: maxText_1 });
             }
         },
-        updateVisibleOptions: function (targetIndex) {
-            var _a = this.data, options = _a.options, visibleItemCount = _a.visibleItemCount, currentIndex = _a.currentIndex;
-            if (visibleItemCount < 20 && options.length > visibleItemCount) {
-                var renderNum = 0;
-                var renderStart = 0;
-                // 选项多于 20 个时，进行列表优化
-                renderNum = Math.max(visibleItemCount * 2, 20);
-                renderStart = Math.max(0, targetIndex - renderNum / 2);
-                var renderEnd = Math.min(options.length, renderStart + renderNum);
-                if (currentIndex >= 0) {
-                    if (currentIndex < targetIndex) {
-                        renderStart = Math.max(0, currentIndex - renderNum / 2);
-                    }
-                }
-                renderNum = renderEnd - renderStart;
-                var optionsV = options.slice(renderStart, renderEnd);
-                return this.set({ optionsV: optionsV, renderStart: renderStart, renderNum: renderNum });
-            }
-            return this.set({
-                optionsV: options,
-                renderStart: 0,
-                renderNum: options.length,
-            });
-        },
-        adjustIndex: function (index) {
-            var data = this.data;
-            var count = this.getCount();
-            index = (0, utils_1.range)(index, 0, count);
-            for (var i = index; i < count; i++) {
-                if (!this.isDisabled(data.options[i]))
-                    return i;
-            }
-            for (var i = index - 1; i >= 0; i--) {
-                if (!this.isDisabled(data.options[i]))
-                    return i;
-            }
-        },
-        isDisabled: function (option) {
-            return (0, validator_1.isObj)(option) && option.disabled;
-        },
         getOptionText: function (option) {
             var data = this.data;
             return (0, validator_1.isObj)(option) && data.valueKey in option ? option[data.valueKey] : option;
         },
-        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;
-            if (this.timer) {
-                clearTimeout(this.timer);
-                this.timer = null;
-            }
-            if (!data.playing) {
-                this.$emit('animation-start');
-                this.setData({
-                    playing: true,
-                });
-            }
-            if (index !== data.currentIndex) {
-                // 需要动画的情况下，保持最大的截取
-                this.updateVisibleOptions(index);
-                if (animate) {
-                    return this.set({
-                        currentIndex: index,
-                        animationIndex: index,
-                        offset: offset,
-                        animate: true,
-                        duration: time,
-                    }).then(function () {
-                        if (!userAction) {
-                            _this.setData({
-                                playing: false,
-                            });
-                            _this.$emit('animation-end');
-                            return;
-                        }
-                        _this.$emit('change', index);
-                        _this.setData({
-                            playing: false,
-                        });
-                        _this.$emit('animation-end');
-                    });
-                }
-                return this.set({
-                    offset: offset,
-                    currentIndex: index,
-                    animationIndex: index,
-                    animate: !!animate,
-                }).then(function () {
-                    if (!userAction) {
-                        _this.setData({
-                            playing: false,
-                        });
-                        _this.$emit('animation-end');
-                        return;
-                    }
-                    _this.$emit('change', index);
-                    _this.setData({
-                        playing: false,
-                    });
-                    _this.$emit('animation-end');
-                });
-            }
-            this.setData({
-                playing: false,
-            });
-            this.$emit('animation-end');
-            return this.set({ offset: offset });
-        },
         setValue: function (value) {
             var options = this.data.options;
             for (var i = 0; i < options.length; i++) {
                 if (this.getOptionText(options[i]) === value) {
-                    return this.setIndex(i, false, this.data.changeAnimation, this.data.animationTime);
+                    return this.setIndex(i);
                 }
             }
             return Promise.resolve();
         },
+        setIndex: function (index) {
+            this.setData({
+                activeIndex: index,
+            });
+        },
         getValue: function () {
             var data = this.data;
-            return data.options[data.currentIndex];
+            return data.options[data.activeIndex < 0 ? 0 : data.activeIndex];
+        },
+        viewOptionsChange: function (list) {
+            this.setData({
+                viewOptions: list,
+            });
+        },
+        activeIndexChange: function (index) {
+            this.setData({
+                activeIndex: index,
+            });
+            this.$emit('change', index);
+        },
+        animationIndexChange: function (index) {
+            this.setData({
+                animationIndex: index,
+            });
         },
     },
 });

package/lib/picker-column/index.wxml

@@ -4,33 +4,71 @@
 <view
   class="{{ utils.bem('picker-column', { disabled }) }} custom-class"
   style="{{ computed.rootStyle({ itemHeight, visibleItemCount }) }}"
-  bind:touchstart="onTouchStart"
-  catch:touchmove="onTouchMove"
-  bind:touchend="onTouchEnd"
-  bind:touchcancel="onTouchEnd"
+  instanceId="{{instanceId}}"
+  id="{{instanceId}}"
+  data-options="{{options}}"
+  data-valuekey="{{valueKey}}"
+  data-itemheight="{{itemHeight}}"
+  data-visibleitemcount="{{visibleItemCount}}"
+  data-activeindex="{{activeIndex}}"
+  data-loop="{{loop}}"
+  data-animationtime="{{animationTime}}"
+  options="{{options}}" 
+  activeindex="{{activeIndex}}"
+  loop="{{loop}}"
+  valuekey="{{valueKey}}"
+  itemheight="{{itemHeight}}"
+  visibleitemcount="{{visibleItemCount}}"
+  animationtime="{{animationTime}}"
+  change:options="{{computed.updateValue(instanceId, 'options')}}" 
+  change:valuekey="{{computed.updateValue(instanceId,'valueKey')}}" 
+  change:itemheight="{{computed.updateValue(instanceId,'itemHeight')}}" 
+  change:visibleitemcount="{{computed.updateValue(instanceId, 'visibleItemCount')}}" 
+  change:activeindex="{{computed.updateValue(instanceId,'activeIndex')}}" 
+  change:loop="{{computed.updateValue(instanceId,'loop')}}" 
+  change:animationtime="{{computed.updateValue(instanceId,'animationTime')}}" 
+  change:instanceid="{{computed.updateValue(instanceId,'instanceId')}}" 
+  bind:touchstart="{{computed.touchStart(instanceId)}}"
+  catch:touchmove="{{computed.touchMove(instanceId)}}"
+  bind:touchend="{{computed.touchEnd(instanceId)}}"
+  bind:touchcancel="{{computed.touchEnd(instanceId)}}"
 >
-  <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="*this"
-        data-index="{{ renderStart + index }}"
-        style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: renderStart + index === currentIndex ? activeStyle : '', animationIndex, index: renderStart + index, visibleItemCount })}}"
-        class="{{ computed.wrapperItemClass({ index, renderStart, animationIndex, option })}}"
-      >
-        {{ computed.optionText(option, valueKey) }}
+  <view 
+    id="options"
+    class="smart-picker-column__offset" 
+    style="height: {{ itemHeight * options.length }}px;{{ computed.wrapperStyle({ offset, itemHeight, visibleItemCount, animate, duration, renderStart, unit, loop }) }}" 
+  >
+    <view class="smart-picker-column__visual">
+      <view class="smart-picker-column__visual__item_1">
+        <view
+          wx:for="{{ computed.sliceArray(viewOptions, 0, 10) }}"
+          wx:key="index"
+          data-index="{{item}}"
+          style="{{computed.wrapperItemStyle({ itemHeight, animationIndex, index: item, visibleItemCount })}}"
+          class="smart-picker-column__item_{{index}} {{ computed.wrapperItemClass({ index: item, animationIndex, options })}}"
+          bind:tap="{{computed.tapItem(instanceId)}}" 
+        >
+          <view
+            class="smart-picker-column__item__text"
+            style="{{computed.wrapperItemTextStyle({ fontStyle, activeStyle, index: item, animationIndex })}}"
+          ></view>
+        </view>
+      </view>
+      <view class="smart-picker-column__visual__item_2">
+        <view
+          wx:for="{{ computed.sliceArray(viewOptions, 10) }}"
+          wx:key="index"
+          data-index="{{item}}"
+          style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: item === currentIndex ? activeStyle : '', animationIndex, index: item, visibleItemCount })}}"
+          class="smart-picker-column__item_{{index + 10}} {{ computed.wrapperItemClass({ index: item, animationIndex, options })}}"
+          bind:tap="{{computed.tapItem(instanceId)}}" 
+        >
+          <view
+            class="smart-picker-column__item__text"
+            style="{{computed.wrapperItemTextStyle({ fontStyle, activeStyle, index: item, animationIndex })}}"
+          ></view>
+        </view>
       </view>
-    </view>
-  </view>
-  <view class="smart-picker-column__mask">
-    <view 
-      wx:for="{{ visibleItemCount }}" 
-      wx:key="index"
-      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">