fix(transformer): 单层 if 表达式被当成嵌套 if 表达式解析

NervJS · Mar 6, 2019 · d8a9cee · d8a9cee
1 parent f40d395
commit d8a9cee
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -47,6 +47,7 @@ import { transformOptions, buildBabelTransformOptions } from './options'
 import generate from 'babel-generator'
 import { LoopRef } from './interface'
 const template = require('babel-template')
+const gen = generate
 
 type ClassMethodsMap = Map<string, NodePath<t.ClassMethod | t.ClassProperty>>
 
@@ -737,9 +738,8 @@ export class RenderParser {
               const newBlock = buildBlockElement()
               newBlock.children = [block, jsxElementPath.node]
               block = newBlock
-            } else if (parentIfStatement) {
-              let hasNestIfStatement = false
-              this.handleNestedIfStatement(block, jsxElementPath.node, parentIfStatement.node.test, hasNestIfStatement)
+            } else if (parentIfStatement && parentIfStatement.get('alternate') !== ifStatement) {
+              this.handleNestedIfStatement(block, jsxElementPath.node, parentIfStatement.node.test)
             } else {
               block.children.push(jsxElementPath.node)
             }
@@ -761,7 +761,7 @@ export class RenderParser {
     }
   }
 
-  handleNestedIfStatement = (block: t.JSXElement, jsx: t.JSXElement, test: t.Expression, hasNestIfStatement: boolean) => {
+  handleNestedIfStatement = (block: t.JSXElement, jsx: t.JSXElement, test: t.Expression) => {
     if (this.isEmptyBlock(block)) {
       return
     }
@@ -778,10 +778,9 @@ export class RenderParser {
         (ifElseAttr && t.isJSXExpressionContainer(ifElseAttr.value, { expression: test }))
       ) {
         child.children.push(jsx)
-        hasNestIfStatement = true
         break
       } else {
-        this.handleNestedIfStatement(child, jsx, test, hasNestIfStatement)
+        this.handleNestedIfStatement(child, jsx, test)
       }
     }
   }