支持 slot[:name] 动态slotname

Author: songlr

src/platforms/mp/compiler/codegen/convert/component.js

@@ -2,9 +2,27 @@ function getSlotsName (obj) {
   if (!obj) {
     return ''
   }
-  return Object.keys(obj).map(k => {
-    return `$slot${k}:'${obj[k]}'`
-  }).join(',')
+  // wxml模板中 data="{{ a:{a1:'string2'}, b:'string'}}" 键a不能放在最后，会出错
+  return tmplateSlotsObj(obj)
+    .concat(
+      Object.keys(obj).map(function(k) {
+        return '$slot' + k + ":'" + obj[k] + "'"
+      })
+    )
+    .join(',')
+}
+
+function tmplateSlotsObj(obj) {
+  if (!obj) {
+    return []
+  }
+  // wxml模板中 data="{{ a:{a1:'string2'}, b:'string'}}" 键a1不能写成 'a1' 带引号的形式，会出错
+  const $for = Object.keys(obj)
+    .map(function(k) {
+      return `${k}:'${obj[k]}'`
+    })
+    .join(',')
+  return $for ? [`$for:{${$for}}`] : []
 }
 
 export default {
@@ -14,8 +32,14 @@ export default {
   convertComponent (ast, components, slotName) {
     const { attrsMap, tag, mpcomid, slots } = ast
     if (slotName) {
-      attrsMap['data'] = `{{...$root[$k], $root}}`
-      attrsMap['is'] = `{{${slotName}}}`
+      attrsMap['data'] = "{{...$root[$k], $root}}"
+      // bindedName is available when rendering slot in v-for
+      const bindedName = attrsMap['v-bind:name']
+      if(bindedName) {
+        attrsMap['is'] = "{{$for[" + bindedName + "]}}"
+      } else {
+        attrsMap['is'] = "{{" + slotName + "}}"
+      }
     } else {
       const slotsName = getSlotsName(slots)
       const restSlotsName = slotsName ? `, ${slotsName}` : ''