fix(miniprogram): 修复循环内使用 ref 的问题，fix #5050

计算循环 ref 跑 createData 前，需要先把 Current.index 置空
NervJS · Dec 19, 2019 · 4e718a2 · 4e718a2
1 parent 36fd185
commit 4e718a2
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 0 deletions.
diff --git a/packages/taro-alipay/src/lifecycle.js b/packages/taro-alipay/src/lifecycle.js
@@ -205,6 +205,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-jd/src/create-component.js b/packages/taro-jd/src/create-component.js
@@ -253,6 +253,7 @@ export function componentTrigger (component, key, args) {
     }
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-jd/src/lifecycle.js b/packages/taro-jd/src/lifecycle.js
@@ -208,6 +208,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-qq/src/create-component.js b/packages/taro-qq/src/create-component.js
@@ -231,6 +231,7 @@ export function componentTrigger (component, key, args) {
     }
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-qq/src/lifecycle.js b/packages/taro-qq/src/lifecycle.js
@@ -208,6 +208,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-quickapp/src/create-component.js b/packages/taro-quickapp/src/create-component.js
@@ -260,6 +260,7 @@ export function componentTrigger (component, key, args) {
   if (key === 'componentDidMount') {
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-quickapp/src/lifecycle.js b/packages/taro-quickapp/src/lifecycle.js
@@ -201,6 +201,7 @@ function doUpdate (component, prevProps, prevState) {
     invokeEffects(component)
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-swan/src/create-component.js b/packages/taro-swan/src/create-component.js
@@ -285,6 +285,7 @@ function createComponent (ComponentClass, isPage) {
       }
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-swan/src/lifecycle.js b/packages/taro-swan/src/lifecycle.js
@@ -207,6 +207,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-tt/src/create-component.js b/packages/taro-tt/src/create-component.js
@@ -185,6 +185,7 @@ export function componentTrigger (component, key, args) {
   if (key === 'componentDidMount') {
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-tt/src/lifecycle.js b/packages/taro-tt/src/lifecycle.js
@@ -208,6 +208,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false

diff --git a/packages/taro-weapp/src/create-component.js b/packages/taro-weapp/src/create-component.js
@@ -252,6 +252,7 @@ export function componentTrigger (component, key, args) {
     }
     if (component['$$hasLoopRef']) {
       Current.current = component
+      Current.index = 0
       component._disableEffect = true
       component._createData(component.state, component.props, true)
       component._disableEffect = false

diff --git a/packages/taro-weapp/src/lifecycle.js b/packages/taro-weapp/src/lifecycle.js
@@ -208,6 +208,7 @@ function doUpdate (component, prevProps, prevState) {
 
       if (component['$$hasLoopRef']) {
         Current.current = component
+        Current.index = 0
         component._disableEffect = true
         component._createData(component.state, component.props, true)
         component._disableEffect = false