@tuya-miniapp/smart-ui 2.6.4-beta-10 → 2.6.4-beta-11

package/dist/picker/index.js

@@ -100,7 +100,7 @@ SmartComponent({
         },
         // get column option index by column index
         getColumnIndex(columnIndex) {
-            return (this.getColumn(columnIndex) || {}).data.activeIndex;
+            return (this.getColumn(columnIndex) || {}).data.currentIndex;
         },
         // set column option index by column index
         setColumnIndex(columnIndex, optionIndex) {
@@ -141,7 +141,7 @@ SmartComponent({
         },
         // get indexes of all columns
         getIndexes() {
-            return this.children.map(child => child.data.activeIndex === null ? child.data.defaultIndex : child.data.activeIndex);
+            return this.children.map(child => child.data.currentIndex);
         },
         // set indexes of all columns
         setIndexes(indexes) {

package/dist/picker-column/index.js

@@ -28,7 +28,8 @@ SmartComponent({
                 if (!this.data.isInit)
                     return;
                 this.updateUint(value);
-                this.checkIndexUpdateList();
+                this.updateCurrentIndex(this.data.currentIndex);
+                this.updateVisibleOptions();
             },
         },
         defaultIndex: {
@@ -45,10 +46,11 @@ SmartComponent({
         },
         activeIndex: {
             type: null,
-            observer() {
+            observer(activeIndex) {
                 if (!this.data.isInit)
                     return;
-                this.checkIndexUpdateList();
+                this.updateCurrentIndex(activeIndex);
+                this.updateVisibleOptions();
             },
         },
         unit: {
@@ -68,14 +70,8 @@ SmartComponent({
         isInit: false,
         maxText: '',
         optionsVIndexList: [],
-        offsetActiveIndex: 0,
-        endTimer: null,
-        offsetList: [],
-        moving: false,
-        movingDirection: 'down',
-        startY: 0,
-        offsetting: 0,
         animationIndex: 0,
+        currentIndex: 0,
         isDestroy: false,
     },
     created() {
@@ -83,7 +79,10 @@ SmartComponent({
             instanceId: getId(),
         });
         this.updateUint(this.data.options);
-        this.checkIndexUpdateList();
+        const { activeIndex, defaultIndex } = this.data;
+        const currIndex = activeIndex !== null ? activeIndex : defaultIndex;
+        this.updateCurrentIndex(currIndex);
+        this.updateVisibleOptions();
         this.setData({
             isInit: true,
         });
@@ -94,34 +93,33 @@ SmartComponent({
         });
     },
     methods: {
-        checkIndexUpdateList() {
-            const { activeIndex, defaultIndex } = this.data;
+        updateCurrentIndex(currIndex) {
             const count = this.data.options.length;
-            const currIndex = activeIndex !== null ? activeIndex : defaultIndex;
             let animationIndex = this.getAnimationIndex(currIndex);
             animationIndex = this.adjustIndex(animationIndex);
             let currActiveIndex = this.data.loop ? ((animationIndex + 1) % count) - 1 : animationIndex;
             if (currActiveIndex < 0) {
                 currActiveIndex += count;
             }
-            const optionsVIndexList = this.getVisibleOptions(animationIndex);
             this.setData({
-                activeIndex: currActiveIndex,
+                currentIndex: currActiveIndex,
                 animationIndex: animationIndex,
+            });
+        },
+        updateVisibleOptions() {
+            const optionsVIndexList = this.getVisibleOptions(this.data.animationIndex);
+            this.setData({
                 optionsVIndexList: optionsVIndexList,
             });
-            // if (currActiveIndex !== activeIndex) {
-            //   this.$emit('change', currActiveIndex);
-            // }
         },
-        getAnimationIndex(activeIndex) {
+        getAnimationIndex(currentIndex) {
             const { animationIndex } = this.data;
             const length = this.data.options.length || 1;
             if (this.data.loop) {
-                const newAnimationIndex = this.getNewAnimationIndex(animationIndex, activeIndex, length, this.data.loop);
+                const newAnimationIndex = this.getNewAnimationIndex(animationIndex, currentIndex, length, this.data.loop);
                 return newAnimationIndex;
             }
-            return activeIndex;
+            return currentIndex;
         },
         getCount() {
             return this.data.options.length;
@@ -224,12 +222,12 @@ SmartComponent({
             }
             return newArr;
         },
-        getNewAnimationIndex(animationIndex, activeIndex, length, loop) {
-            const curOptionsNewIndex = Math.floor((animationIndex + 1) / length) * length + activeIndex;
+        getNewAnimationIndex(animationIndex, currentIndex, length, loop) {
+            const curOptionsNewIndex = Math.floor((animationIndex + 1) / length) * length + currentIndex;
             const preOptionsNewIndex = curOptionsNewIndex - length;
             const afterOptionsNewIndex = curOptionsNewIndex + length;
             const newAnimationIndex = !loop
-                ? activeIndex
+                ? currentIndex
                 : Math.abs(preOptionsNewIndex - animationIndex) >
                     Math.abs(curOptionsNewIndex - animationIndex)
                     ? Math.abs(curOptionsNewIndex - animationIndex) >
@@ -259,12 +257,12 @@ SmartComponent({
                 }
                 return 0;
             }
-            const activeIndex = range(index, 0, count);
-            for (let i = activeIndex; i < count; i++) {
+            const currentIndex = range(index, 0, count);
+            for (let i = currentIndex; i < count; i++) {
                 if (!this.isDisabled(data.options[i]) && data.options[i] !== undefined)
                     return i;
             }
-            for (let i = activeIndex - 1; i >= 0; i--) {
+            for (let i = currentIndex - 1; i >= 0; i--) {
                 if (!this.isDisabled(data.options[i]) && data.options[i] !== undefined)
                     return i;
             }
@@ -287,29 +285,29 @@ SmartComponent({
             return Promise.resolve();
         },
         setIndex(index) {
-            let activeIndex = ((index + 1) % this.data.options.length) - 1;
-            if (activeIndex < 0) {
-                activeIndex += this.data.options.length;
+            let currentIndex = ((index + 1) % this.data.options.length) - 1;
+            if (currentIndex < 0) {
+                currentIndex += this.data.options.length;
             }
             this.setData({
-                activeIndex: activeIndex,
+                currentIndex,
                 animationIndex: index,
             });
         },
         getValue() {
             const { data } = this;
-            return isObj(data.options[data.activeIndex])
-                ? data.options[data.activeIndex][data.valueKey]
-                : data.options[data.activeIndex];
+            return isObj(data.options[data.currentIndex])
+                ? data.options[data.currentIndex][data.valueKey]
+                : data.options[data.currentIndex];
         },
         activeIndexChange(index) {
-            let activeIndex = ((index + 1) % this.data.options.length) - 1;
-            if (activeIndex < 0) {
-                activeIndex += this.data.options.length;
+            let currentIndex = ((index + 1) % this.data.options.length) - 1;
+            if (currentIndex < 0) {
+                currentIndex += this.data.options.length;
             }
-            const isSame = activeIndex === this.data.activeIndex;
+            const isSame = currentIndex === this.data.activeIndex;
             this.setData({
-                activeIndex: activeIndex,
+                currentIndex,
                 animationIndex: index,
             });
             !isSame && this.$emit('change', index);

package/dist/picker-column/index.wxml

@@ -12,12 +12,12 @@
   data-valuekey="{{valueKey}}"
   data-itemheight="{{itemHeight}}"
   data-visibleitemcount="{{visibleItemCount}}"
-  data-activeindex="{{activeIndex}}"
+  data-activeindex="{{currentIndex}}"
   data-loop="{{loop}}"
   data-animationtime="{{animationTime}}"
   isdestroy="{{isDestroy}}"
   options="{{options}}" 
-  activeindex="{{activeIndex}}"
+  activeindex="{{currentIndex}}"
   changeanimation="{{changeAnimation}}"
   loop="{{loop}}"
   valuekey="{{valueKey}}"

package/lib/picker/index.js

@@ -118,7 +118,7 @@ var shared_1 = require("./shared");
         },
         // get column option index by column index
         getColumnIndex: function (columnIndex) {
-            return (this.getColumn(columnIndex) || {}).data.activeIndex;
+            return (this.getColumn(columnIndex) || {}).data.currentIndex;
         },
         // set column option index by column index
         setColumnIndex: function (columnIndex, optionIndex) {
@@ -161,9 +161,7 @@ var shared_1 = require("./shared");
         },
         // get indexes of all columns
         getIndexes: function () {
-            return this.children.map(function (child) {
-                return child.data.activeIndex === null ? child.data.defaultIndex : child.data.activeIndex;
-            });
+            return this.children.map(function (child) { return child.data.currentIndex; });
         },
         // set indexes of all columns
         setIndexes: function (indexes) {

package/lib/picker-column/index.js

@@ -33,7 +33,8 @@ var getId = function () {
                 if (!this.data.isInit)
                     return;
                 this.updateUint(value);
-                this.checkIndexUpdateList();
+                this.updateCurrentIndex(this.data.currentIndex);
+                this.updateVisibleOptions();
             },
         },
         defaultIndex: {
@@ -50,10 +51,11 @@ var getId = function () {
         },
         activeIndex: {
             type: null,
-            observer: function () {
+            observer: function (activeIndex) {
                 if (!this.data.isInit)
                     return;
-                this.checkIndexUpdateList();
+                this.updateCurrentIndex(activeIndex);
+                this.updateVisibleOptions();
             },
         },
         unit: {
@@ -73,14 +75,8 @@ var getId = function () {
         isInit: false,
         maxText: '',
         optionsVIndexList: [],
-        offsetActiveIndex: 0,
-        endTimer: null,
-        offsetList: [],
-        moving: false,
-        movingDirection: 'down',
-        startY: 0,
-        offsetting: 0,
         animationIndex: 0,
+        currentIndex: 0,
         isDestroy: false,
     },
     created: function () {
@@ -88,7 +84,10 @@ var getId = function () {
             instanceId: getId(),
         });
         this.updateUint(this.data.options);
-        this.checkIndexUpdateList();
+        var _a = this.data, activeIndex = _a.activeIndex, defaultIndex = _a.defaultIndex;
+        var currIndex = activeIndex !== null ? activeIndex : defaultIndex;
+        this.updateCurrentIndex(currIndex);
+        this.updateVisibleOptions();
         this.setData({
             isInit: true,
         });
@@ -99,34 +98,33 @@ var getId = function () {
         });
     },
     methods: {
-        checkIndexUpdateList: function () {
-            var _a = this.data, activeIndex = _a.activeIndex, defaultIndex = _a.defaultIndex;
+        updateCurrentIndex: function (currIndex) {
             var count = this.data.options.length;
-            var currIndex = activeIndex !== null ? activeIndex : defaultIndex;
             var animationIndex = this.getAnimationIndex(currIndex);
             animationIndex = this.adjustIndex(animationIndex);
             var currActiveIndex = this.data.loop ? ((animationIndex + 1) % count) - 1 : animationIndex;
             if (currActiveIndex < 0) {
                 currActiveIndex += count;
             }
-            var optionsVIndexList = this.getVisibleOptions(animationIndex);
             this.setData({
-                activeIndex: currActiveIndex,
+                currentIndex: currActiveIndex,
                 animationIndex: animationIndex,
+            });
+        },
+        updateVisibleOptions: function () {
+            var optionsVIndexList = this.getVisibleOptions(this.data.animationIndex);
+            this.setData({
                 optionsVIndexList: optionsVIndexList,
             });
-            // if (currActiveIndex !== activeIndex) {
-            //   this.$emit('change', currActiveIndex);
-            // }
         },
-        getAnimationIndex: function (activeIndex) {
+        getAnimationIndex: function (currentIndex) {
             var animationIndex = this.data.animationIndex;
             var length = this.data.options.length || 1;
             if (this.data.loop) {
-                var newAnimationIndex = this.getNewAnimationIndex(animationIndex, activeIndex, length, this.data.loop);
+                var newAnimationIndex = this.getNewAnimationIndex(animationIndex, currentIndex, length, this.data.loop);
                 return newAnimationIndex;
             }
-            return activeIndex;
+            return currentIndex;
         },
         getCount: function () {
             return this.data.options.length;
@@ -230,12 +228,12 @@ var getId = function () {
             }
             return newArr;
         },
-        getNewAnimationIndex: function (animationIndex, activeIndex, length, loop) {
-            var curOptionsNewIndex = Math.floor((animationIndex + 1) / length) * length + activeIndex;
+        getNewAnimationIndex: function (animationIndex, currentIndex, length, loop) {
+            var curOptionsNewIndex = Math.floor((animationIndex + 1) / length) * length + currentIndex;
             var preOptionsNewIndex = curOptionsNewIndex - length;
             var afterOptionsNewIndex = curOptionsNewIndex + length;
             var newAnimationIndex = !loop
-                ? activeIndex
+                ? currentIndex
                 : Math.abs(preOptionsNewIndex - animationIndex) >
                     Math.abs(curOptionsNewIndex - animationIndex)
                     ? Math.abs(curOptionsNewIndex - animationIndex) >
@@ -265,12 +263,12 @@ var getId = function () {
                 }
                 return 0;
             }
-            var activeIndex = (0, utils_1.range)(index, 0, count);
-            for (var i = activeIndex; i < count; i++) {
+            var currentIndex = (0, utils_1.range)(index, 0, count);
+            for (var i = currentIndex; i < count; i++) {
                 if (!this.isDisabled(data.options[i]) && data.options[i] !== undefined)
                     return i;
             }
-            for (var i = activeIndex - 1; i >= 0; i--) {
+            for (var i = currentIndex - 1; i >= 0; i--) {
                 if (!this.isDisabled(data.options[i]) && data.options[i] !== undefined)
                     return i;
             }
@@ -293,29 +291,29 @@ var getId = function () {
             return Promise.resolve();
         },
         setIndex: function (index) {
-            var activeIndex = ((index + 1) % this.data.options.length) - 1;
-            if (activeIndex < 0) {
-                activeIndex += this.data.options.length;
+            var currentIndex = ((index + 1) % this.data.options.length) - 1;
+            if (currentIndex < 0) {
+                currentIndex += this.data.options.length;
             }
             this.setData({
-                activeIndex: activeIndex,
+                currentIndex: currentIndex,
                 animationIndex: index,
             });
         },
         getValue: function () {
             var data = this.data;
-            return (0, validator_1.isObj)(data.options[data.activeIndex])
-                ? data.options[data.activeIndex][data.valueKey]
-                : data.options[data.activeIndex];
+            return (0, validator_1.isObj)(data.options[data.currentIndex])
+                ? data.options[data.currentIndex][data.valueKey]
+                : data.options[data.currentIndex];
         },
         activeIndexChange: function (index) {
-            var activeIndex = ((index + 1) % this.data.options.length) - 1;
-            if (activeIndex < 0) {
-                activeIndex += this.data.options.length;
+            var currentIndex = ((index + 1) % this.data.options.length) - 1;
+            if (currentIndex < 0) {
+                currentIndex += this.data.options.length;
             }
-            var isSame = activeIndex === this.data.activeIndex;
+            var isSame = currentIndex === this.data.activeIndex;
             this.setData({
-                activeIndex: activeIndex,
+                currentIndex: currentIndex,
                 animationIndex: index,
             });
             !isSame && this.$emit('change', index);

package/lib/picker-column/index.wxml

@@ -12,12 +12,12 @@
   data-valuekey="{{valueKey}}"
   data-itemheight="{{itemHeight}}"
   data-visibleitemcount="{{visibleItemCount}}"
-  data-activeindex="{{activeIndex}}"
+  data-activeindex="{{currentIndex}}"
   data-loop="{{loop}}"
   data-animationtime="{{animationTime}}"
   isdestroy="{{isDestroy}}"
   options="{{options}}" 
-  activeindex="{{activeIndex}}"
+  activeindex="{{currentIndex}}"
   changeanimation="{{changeAnimation}}"
   loop="{{loop}}"
   valuekey="{{valueKey}}"

package/package.json

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