fix(miniapp): template generation error

raxjs · Aug 26, 2021 · 03046af · 03046af
1 parent 983b89b
commit 03046af
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/baidu.js b/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/baidu.js
@@ -893,13 +893,13 @@ function generateFlattenView(level, component) {
   if (level === 0) {
     return '<template is="RAX_TMPL_CHILDREN_0" data="{{{r: item.children}}}" />';
   }
-  const child = generateFlattenView(level - 1);
-  let attributes = 'animation="{{r[\'animation\']}}" bindtap="onTap" bindtouchstart="onTouchStart" bindtouchmove="onTouchMove" bindtouchcancel="onTouchCancel" bindtouchend="onTouchEnd" bindlongtap="onLongTap" style="{{r.style}}" class="{{r.class}}" id="{{r.id}}" data-private-node-id="{{r.nodeId}}"';
+  const child = generateFlattenView(level - 1, component);
+  let attributes = 'animation="{{item[\'animation\']}}" bindtap="onTap" bindtouchstart="onTouchStart" bindtouchmove="onTouchMove" bindtouchcancel="onTouchCancel" bindtouchend="onTouchEnd" bindlongtap="onLongTap" style="{{item.style}}" class="{{item.class}}" id="{{item.id}}" data-private-node-id="{{item.nodeId}}"';
   if (component === 'view') {
-    attributes += ' hover-class="{{r[\'hover-class\']||\'none\'}}" hover-start-time="{{tool.a(r[\'hover-start-time\'],50)}}" hover-stay-time="{{tool.a(r[\'hover-stay-time\'],400)}}" hover-stop-propagation="{{tool.a(r[\'hover-stop-propagation\'],false)}}"';
+    attributes += ' hover-class="{{item[\'hover-class\']||\'none\'}}" hover-start-time="{{tool.a(item[\'hover-start-time\'],50)}}" hover-stay-time="{{tool.a(item[\'hover-stay-time\'],400)}}" hover-stop-propagation="{{tool.a(item[\'hover-stop-propagation\'],false)}}"';
   }
   const template =
-`<block s-for="{{r.children}}" s-key="nodeId">
+`<block s-for="{{${level === flattenViewLevel ? 'r' : 'item'}.children}}" s-key="nodeId">
   <view s-if="item.nodeType==='${component}'&&(item.class||item.style)" ${attributes}>
     ${child}
   </view>

diff --git a/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/kuaishou.js b/packages/rax-miniapp-runtime-webpack-plugin/src/platforms/kuaishou.js
@@ -893,13 +893,13 @@ function generateFlattenView(level, component) {
   if (level === 0) {
     return '<template is="RAX_TMPL_CHILDREN_0" data="{{r: item.children}}" />';
   }
-  const child = generateFlattenView(level - 1);
-  let attributes = 'animation="{{r[\'animation\']}}" bindtap="onTap" bindtouchstart="onTouchStart" bindtouchmove="onTouchMove" bindtouchcancel="onTouchCancel" bindtouchend="onTouchEnd" bindlongtap="onLongTap" style="{{r.style}}" class="{{r.class}}" id="{{r.id}}" data-private-node-id="{{r.nodeId}}"';
+  const child = generateFlattenView(level - 1, component);
+  let attributes = 'animation="{{item[\'animation\']}}" bindtap="onTap" bindtouchstart="onTouchStart" bindtouchmove="onTouchMove" bindtouchcancel="onTouchCancel" bindtouchend="onTouchEnd" bindlongtap="onLongTap" style="{{item.style}}" class="{{item.class}}" id="{{item.id}}" data-private-node-id="{{item.nodeId}}"';
   if (component === 'view') {
-    attributes += ' hover-class="{{r[\'hover-class\']||\'none\'}}" hover-start-time="{{tool.a(r[\'hover-start-time\'],50)}}" hover-stay-time="{{tool.a(r[\'hover-stay-time\'],400)}}" hover-stop-propagation="{{tool.a(r[\'hover-stop-propagation\'],false)}}"';
+    attributes += ' hover-class="{{item[\'hover-class\']||\'none\'}}" hover-start-time="{{tool.a(item[\'hover-start-time\'],50)}}" hover-stay-time="{{tool.a(item[\'hover-stay-time\'],400)}}" hover-stop-propagation="{{tool.a(item[\'hover-stop-propagation\'],false)}}"';
   }
   const template =
-`<block ks:for="{{r.children}}" ks:key="nodeId">
+`<block ks:for="{{${level === flattenViewLevel ? 'r' : 'item'}.children}}" ks:key="nodeId">
   <view ks:if="item.nodeType==='${component}'&&(item.class||item.style)" ${attributes}>
     ${child}
   </view>