fix(transformer): 单独使用的自定义组件也当做循环自定义组件处理

NervJS · Jul 3, 2018 · 47bdc55 · 47bdc55
1 parent c88033e
commit 47bdc55
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/packages/taro-transformer-wx/src/class.ts b/packages/taro-transformer-wx/src/class.ts
@@ -276,6 +276,7 @@ class Transformer {
         const callee = rootCallExpression.node.callee
         const calleeCode = generate(callee).code
         let nodes: t.ObjectExpression[] = []
+        const uuid = createUUID()
         loopComponents.forEach((loopComponent) => {
           const { name, element: component, parent } = loopComponent
           let subscript = ''
@@ -291,7 +292,7 @@ class Transformer {
             const calleeCode = generate(callee).code
             subscript = calleeCode.split('.').slice(1, calleeCode.split('.').length).join('')
           }
-          const node = this.generateTopLoopNodes(name, component, anonymousPropsFunctionId, subscript.slice(0, subscript.length - 3), parent, iterator.name, index)
+          const node = this.generateTopLoopNodes(name, component, uuid, subscript.slice(0, subscript.length - 3), parent, iterator.name, index)
           nodes.push(node)
         })
         let stateName = ''
@@ -304,7 +305,6 @@ class Transformer {
           stateName = ary[1] === 'state' || ary[1] === 'props' || ary[1] === '__state' || ary[1] === '__props'
             ? ary[2] : ary[1]
         }
-        const uuid = createUUID()
         const stateNameDecl = buildConstVariableDeclaration('stateName', t.stringLiteral(stateName))
         const returnStatement = t.returnStatement(
           t.objectExpression([
@@ -394,7 +394,7 @@ class Transformer {
       ])
       blockStatement.push(nodeDeclare)
       blockStatement.push(returnStatement)
-      const node = this.generateTopLoopNodes(name, component, anonymousPropsFunctionId, '', null, undefined, undefined, false)
+      const node = this.generateTopLoopNodes(name, component, uuid, '', null, undefined, undefined, false)
       nodes.push(node)
       properties.push(
         t.objectProperty(t.identifier(uuid), t.arrowFunctionExpression([], t.blockStatement(blockStatement)))
@@ -413,7 +413,7 @@ class Transformer {
   generateTopLoopNodes (
     name: string,
     component: NodePath<t.JSXElement>,
-    uid: () => number,
+    uuid: string,
     subscript: string,
     parent: NodePath<t.CallExpression> | null,
     iterator?: string,
@@ -460,7 +460,7 @@ class Transformer {
               }
               expresionPath.replaceWith(replacement)
             } else if (isNeedClassMethodWrapper(name.name, expresion)) {
-              const id = `$$anonymousPropsFunction_${uid()}`
+              const id = `$$anonymousPropsFunction_${anonymousPropsFunctionId()}`
               path.get('value').get('expression').replaceWith(
                 t.memberExpression(
                   t.thisExpression(),
@@ -525,7 +525,7 @@ class Transformer {
     const argsFunction = t.objectMethod('method', t.identifier('args'), isLoop ? [t.identifier(MAP_CALL_ITERATOR), t.identifier('index')] : [],
       t.blockStatement(
         [
-          t.returnStatement(t.objectExpression(properties))
+          t.returnStatement(t.objectExpression(properties.concat([t.objectProperty(t.identifier('$path'), t.stringLiteral(uuid))])))
         ]
       )
     )
@@ -614,6 +614,20 @@ class Transformer {
         'wx:for-item',
         t.stringLiteral('item')
       )
+      setJSXAttr(
+        jsx,
+        'data',
+        t.jSXExpressionContainer(
+          t.identifier('...item')
+        )
+      )
+      setJSXAttr(
+        jsx,
+        'wx:for',
+        t.jSXExpressionContainer(
+          t.identifier('$$' + name)
+        )
+      )
       path.replaceWith(jsx)
       this.customComponentNames.add('$$' + name)
     })

diff --git a/packages/taro-transformer-wx/src/render.ts b/packages/taro-transformer-wx/src/render.ts
@@ -1003,6 +1003,8 @@ export class RenderParser {
       .filter(i => !this.templates.has(i))
       .filter(i => !i.includes('.'))
       .filter(i => i !== MAP_CALL_ITERATOR && !this.reserveStateWords.has(i))
+      .filter(i => !i.startsWith('.'))
+      .filter(i => !i.startsWith('$$'))
       .map(i => t.objectProperty(t.identifier(i), t.identifier(i)))
     if (this.customComponentData.length > 0) {
       properties = properties.concat(this.customComponentData)