@tuya-miniapp/smart-ui 2.10.0 → 2.10.1-beta-0

package/dist/index-anchor/index.js

@@ -14,10 +14,17 @@ SmartComponent({
     },
     methods: {
         scrollIntoView(scrollTop) {
-            getRect(this, '.smart-index-anchor-wrapper').then(rect => {
-                wx.pageScrollTo({
-                    duration: 0,
-                    scrollTop: scrollTop + rect.top - this.parent.data.stickyOffsetTop,
+            return new Promise((resolve, reject) => {
+                getRect(this, '.smart-index-anchor-wrapper').then(rect => {
+                    wx.pageScrollTo({
+                        duration: 0,
+                        scrollTop: scrollTop + rect.top - this.parent.data.stickyOffsetTop,
+                        complete: () => {
+                            setTimeout(() => {
+                                resolve('success');
+                            }, 50);
+                        },
+                    });
                 });
             });
         },

package/dist/index-bar/index.js

@@ -52,6 +52,8 @@ SmartComponent({
         activeAnchorIndex: null,
         showSidebar: false,
     },
+    // @ts-ignore
+    pendingAnchor: null,
     watch: {
         activeAnchorIndex(newVal) {
             if (newVal !== null && newVal !== -1) {
@@ -227,6 +229,10 @@ SmartComponent({
             const touch = event.touches[0];
             const itemHeight = this.sidebar.height / sidebarLength;
             let index = Math.floor((touch.clientY - this.sidebar.top) / itemHeight);
+            // 有时候会莫名间断出现 -90多的情况
+            if (index < -20) {
+                return;
+            }
             if (index < 0) {
                 index = 0;
             }
@@ -246,10 +252,39 @@ SmartComponent({
             }
             this.scrollToAnchorIndex = index;
             const anchor = this.children.find(item => item.data.index === this.data.indexList[index]);
-            if (anchor) {
-                anchor.scrollIntoView(this.scrollTop);
-                this.$emit('select', anchor.data.index);
+            if (!anchor)
+                return;
+            // 如果当前有正在进行的滚动，将新的滚动任务加入队列
+            if (!this.pendingAnchor) {
+                this.pendingAnchor = [];
+            }
+            if (this.pendingAnchor.length > 0) {
+                this.pendingAnchor = [anchor];
+                return;
             }
+            this.pendingAnchor = [anchor];
+            anchor
+                .scrollIntoView(this.scrollTop)
+                .then(() => {
+                if (this.pendingAnchor.length > 0 && this.pendingAnchor[0] !== anchor) {
+                    const index = this.data.indexList.indexOf(this.pendingAnchor[0].data.index);
+                    this.scrollToAnchor(index);
+                    this.pendingAnchor = [];
+                    return;
+                }
+                this.pendingAnchor = [];
+            })
+                .catch(err => {
+                console.error(err);
+                if (this.pendingAnchor.length > 0 && this.pendingAnchor[0] !== anchor) {
+                    const index = this.data.indexList.indexOf(this.pendingAnchor[0].data.index);
+                    this.scrollToAnchor(index);
+                    this.pendingAnchor = [];
+                    return;
+                }
+                this.pendingAnchor = [];
+            });
+            this.$emit('select', anchor.data.index);
         },
     },
 });

package/lib/index-anchor/index.js

@@ -17,10 +17,17 @@ var relation_1 = require("../common/relation");
     methods: {
         scrollIntoView: function (scrollTop) {
             var _this = this;
-            (0, utils_1.getRect)(this, '.smart-index-anchor-wrapper').then(function (rect) {
-                wx.pageScrollTo({
-                    duration: 0,
-                    scrollTop: scrollTop + rect.top - _this.parent.data.stickyOffsetTop,
+            return new Promise(function (resolve, reject) {
+                (0, utils_1.getRect)(_this, '.smart-index-anchor-wrapper').then(function (rect) {
+                    wx.pageScrollTo({
+                        duration: 0,
+                        scrollTop: scrollTop + rect.top - _this.parent.data.stickyOffsetTop,
+                        complete: function () {
+                            setTimeout(function () {
+                                resolve('success');
+                            }, 50);
+                        },
+                    });
                 });
             });
         },

package/lib/index-bar/index.js

@@ -57,6 +57,8 @@ var indexList = function () {
         activeAnchorIndex: null,
         showSidebar: false,
     },
+    // @ts-ignore
+    pendingAnchor: null,
     watch: {
         activeAnchorIndex: function (newVal) {
             if (newVal !== null && newVal !== -1) {
@@ -226,6 +228,10 @@ var indexList = function () {
             var touch = event.touches[0];
             var itemHeight = this.sidebar.height / sidebarLength;
             var index = Math.floor((touch.clientY - this.sidebar.top) / itemHeight);
+            // 有时候会莫名间断出现 -90多的情况
+            if (index < -20) {
+                return;
+            }
             if (index < 0) {
                 index = 0;
             }
@@ -246,10 +252,39 @@ var indexList = function () {
             }
             this.scrollToAnchorIndex = index;
             var anchor = this.children.find(function (item) { return item.data.index === _this.data.indexList[index]; });
-            if (anchor) {
-                anchor.scrollIntoView(this.scrollTop);
-                this.$emit('select', anchor.data.index);
+            if (!anchor)
+                return;
+            // 如果当前有正在进行的滚动，将新的滚动任务加入队列
+            if (!this.pendingAnchor) {
+                this.pendingAnchor = [];
+            }
+            if (this.pendingAnchor.length > 0) {
+                this.pendingAnchor = [anchor];
+                return;
             }
+            this.pendingAnchor = [anchor];
+            anchor
+                .scrollIntoView(this.scrollTop)
+                .then(function () {
+                if (_this.pendingAnchor.length > 0 && _this.pendingAnchor[0] !== anchor) {
+                    var index_1 = _this.data.indexList.indexOf(_this.pendingAnchor[0].data.index);
+                    _this.scrollToAnchor(index_1);
+                    _this.pendingAnchor = [];
+                    return;
+                }
+                _this.pendingAnchor = [];
+            })
+                .catch(function (err) {
+                console.error(err);
+                if (_this.pendingAnchor.length > 0 && _this.pendingAnchor[0] !== anchor) {
+                    var index_2 = _this.data.indexList.indexOf(_this.pendingAnchor[0].data.index);
+                    _this.scrollToAnchor(index_2);
+                    _this.pendingAnchor = [];
+                    return;
+                }
+                _this.pendingAnchor = [];
+            });
+            this.$emit('select', anchor.data.index);
         },
     },
 });

package/package.json

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