@tarojs/shared 3.7.0-canary.0 → 3.8.0-canary.0

package/dist/template.js

@@ -489,7 +489,7 @@ const defaultMiniLifecycle = {
             'onReachBottom',
             'onPageScroll',
             'onResize',
-            'onTabItemTap',
+            'defer:onTabItemTap',
             'onTitleClick',
             'onOptionMenuClick',
             'onPopMenuClick',
@@ -746,6 +746,7 @@ const weixinAdapter = {
 };
 class BaseTemplate {
     constructor() {
+        this._baseLevel = 0;
         this.exportExpr = 'module.exports =';
         this.thirdPartyPatcher = {};
         this.supportXS = false;
@@ -765,19 +766,23 @@ class BaseTemplate {
         };
         this.buildBaseComponentTemplate = (ext) => {
             const data = !this.isSupportRecursive && this.supportXS
-                ? this.dataKeymap('i:i,l:l')
-                : this.dataKeymap('i:i');
+                ? this.dataKeymap('i:i,c:1,l:l')
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:i')
+                    : this.dataKeymap('i:i,c:1');
             return `<import src="./base${ext}" />
-<template is="tmpl_0_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
+<template is="{{'tmpl_0_' + i.nn}}" data="{{${data}}}" />`;
         };
         this.buildCustomComponentTemplate = (ext) => {
             const Adapter = this.Adapter;
             const data = !this.isSupportRecursive && this.supportXS
-                ? `${this.dataKeymap('i:item,l:\'\'')}`
-                : this.dataKeymap('i:item');
+                ? `${this.dataKeymap('i:item,c:1,l:\'\'')}`
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:item')
+                    : this.dataKeymap('i:item,c:1');
             return `<import src="./base${ext}" />
   <block ${Adapter.for}="{{i.${"cn" /* Shortcuts.Childnodes */}}}" ${Adapter.key}="sid">
-    <template is="tmpl_0_container" data="{{${data}}}" />
+    <template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />
   </block>`;
         };
         this.buildXScript = () => {
@@ -787,9 +792,6 @@ class BaseTemplate {
     return a === undefined ? b : a
   },
   c: ${this.buildXSTepFocus("nn" /* Shortcuts.NodeName */)},
-  d: function (i, v) {
-    return i === undefined ? v : i
-  },
   e: function (n) {
     return 'tmpl_' + n + '_${"container" /* Shortcuts.Container */}'
   },
@@ -797,6 +799,12 @@ class BaseTemplate {
 }`;
         };
     }
+    set baseLevel(lv) {
+        this._baseLevel = lv;
+    }
+    get baseLevel() {
+        return this._baseLevel;
+    }
     buildAttribute(attrs, nodeName) {
         return Object.keys(attrs)
             .map(k => `${k}="${k.startsWith('bind') || k.startsWith('on') || k.startsWith('catch') ? attrs[k] : `{${this.getAttrValue(attrs[k], k, nodeName)}}`}" `)
@@ -900,12 +908,19 @@ class BaseTemplate {
     buildBaseTemplate() {
         const Adapter = this.Adapter;
         const data = !this.isSupportRecursive && this.supportXS
-            ? `${this.dataKeymap('i:item,l:\'\'')}`
-            : this.dataKeymap('i:item');
+            ? `${this.dataKeymap('i:item,c:1,l:\'\'')}`
+            : this.isSupportRecursive
+                ? this.dataKeymap('i:item')
+                : this.dataKeymap('i:item,c:1');
+        const xs = this.supportXS
+            ? (this.isSupportRecursive
+                ? `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`
+                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */}, '')`)
+            : "'tmpl_0_' + item.nn";
         return `${this.buildXsTemplate()}
 <template name="taro_tmpl">
   <block ${Adapter.for}="{{root.cn}}" ${Adapter.key}="sid">
-    <template is="tmpl_0_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />
+    <template is="{{${xs}}}" data="{{${data}}}" />
   </block>
 </template>
 `;
@@ -953,15 +968,40 @@ class BaseTemplate {
             ? this.buildFocusComponentTemplate(comp, level)
             : this.buildStandardComponentTemplate(comp, level);
     }
+    getChildrenTemplate(level) {
+        const { isSupportRecursive, supportXS } = this;
+        const isLastRecursiveComp = !isSupportRecursive && level + 1 === this.baseLevel;
+        const isUseXs = !this.isSupportRecursive && this.supportXS;
+        if (isLastRecursiveComp) {
+            const data = isUseXs
+                ? `${this.dataKeymap('i:item,c:c,l:l')}`
+                : this.isSupportRecursive
+                    ? this.dataKeymap('i:item')
+                    : this.dataKeymap('i:item,c:c');
+            return supportXS
+                ? `<template is="{{xs.e(${level})}}" data="{{${data}}}" />`
+                : `<template is="tmpl_${level}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
+        }
+        else {
+            const data = isUseXs
+                ? `${this.dataKeymap(`i:item,c:c+1,l:xs.f(l,item.${"nn" /* Shortcuts.NodeName */})`)}`
+                : this.isSupportRecursive
+                    ? `${this.dataKeymap('i:item')}`
+                    : `${this.dataKeymap('i:item,c:c+1')}`;
+            const xs = !this.isSupportRecursive
+                ? `xs.a(c, item.${"nn" /* Shortcuts.NodeName */}, l)`
+                : `xs.a(0, item.${"nn" /* Shortcuts.NodeName */})`;
+            return supportXS
+                ? `<template is="{{${xs}}}" data="{{${data}}}" />`
+                : isSupportRecursive
+                    ? `<template is="{{'tmpl_0_' + item.nn}}" data="{{${data}}}" />`
+                    : `<template is="{{'tmpl_' + c + '_' + item.nn}}" data="{{${data}}}" />`;
+        }
+    }
     getChildren(comp, level) {
-        const { isSupportRecursive, Adapter, supportXS } = this;
+        const { isSupportRecursive, Adapter } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
-        const data = !this.isSupportRecursive && supportXS
-            ? `${this.dataKeymap('i:item,l:l')}`
-            : this.dataKeymap('i:item');
-        let child = supportXS
-            ? `<template is="{{xs.e(${isSupportRecursive ? 0 : 'cid+1'})}}" data="{{${data}}}" />`
-            : `<template is="tmpl_${nextLevel}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
+        let child = this.getChildrenTemplate(nextLevel);
         if (isFunction(this.modifyLoopBody)) {
             child = this.modifyLoopBody(child, comp.nodeName);
         }
@@ -988,7 +1028,7 @@ class BaseTemplate {
         delete attrs.focus;
         let res = `
 <template name="tmpl_${level}_${nodeAlias}">
-  <template is="{{${templateName}}}" data="{{${this.dataKeymap('i:i')}${children ? ',cid:cid' : ''}}}" />
+  <template is="{{${templateName}}}" data="{{${this.isSupportRecursive ? this.dataKeymap('i:i') : this.dataKeymap('i:i,c:c')}}}" />
 </template>
 
 <template name="tmpl_${level}_${nodeAlias}_focus">
@@ -1050,9 +1090,6 @@ class BaseTemplate {
         const { Adapter, isSupportRecursive, supportXS, nestElements } = this;
         const nextLevel = isSupportRecursive ? 0 : level + 1;
         let template = '';
-        const data = !isSupportRecursive && supportXS
-            ? `${this.dataKeymap('i:item,l:l')}`
-            : this.dataKeymap('i:item');
         componentConfig.thirdPartyComponents.forEach((attrs, compName) => {
             if (compName === 'custom-wrapper') {
                 template += `
@@ -1065,9 +1102,7 @@ class BaseTemplate {
             else {
                 if (!isSupportRecursive && supportXS && nestElements.has(compName) && level + 1 > nestElements.get(compName))
                     return;
-                let child = supportXS
-                    ? `<template is="{{xs.e(${isSupportRecursive ? 0 : 'cid+1'})}}" data="{{${data}}}" />`
-                    : `<template is="tmpl_${nextLevel}_${"container" /* Shortcuts.Container */}" data="{{${data}}}" />`;
+                let child = this.getChildrenTemplate(nextLevel);
                 if (isFunction(this.modifyThirdPartyLoopBody)) {
                     child = this.modifyThirdPartyLoopBody(child, compName);
                 }
@@ -1084,27 +1119,14 @@ class BaseTemplate {
         });
         return template;
     }
-    buildContainerTemplate(level, restart = false) {
-        let tmpl = '';
-        if (restart) {
-            tmpl = `<block ${this.Adapter.if}="{{i.nn === '#text'}}">
-    <template is="tmpl_0_#text" data="{{i:i}}" />
+    // 最后一层的 comp 需要引用 container 进行重新的模版循环，其他情况不需要 container
+    buildContainerTemplate(level) {
+        const tmpl = `<block ${this.Adapter.if}="{{i.nn === '${this.componentsAlias['#text']._num}'}}">
+    <template is="tmpl_0_${this.componentsAlias['#text']._num}" data="{{${this.dataKeymap('i:i')}}}" />
   </block>
   <block ${this.Adapter.else}>
     ${!this.isSupportRecursive && this.supportXS ? '<comp i="{{i}}" l="{{l}}" />' : '<comp i="{{i}}" />'}
   </block>`;
-        }
-        else {
-            const xs = !this.isSupportRecursive
-                ? `xs.a(${level}, i.${"nn" /* Shortcuts.NodeName */}, l)`
-                : `xs.a(${level}, i.${"nn" /* Shortcuts.NodeName */})`;
-            const data = !this.isSupportRecursive
-                ? `${this.dataKeymap(`i:i,cid:${level},l:xs.f(l,i.${"nn" /* Shortcuts.NodeName */})`)}`
-                : `${this.dataKeymap('i:i')}`;
-            tmpl = this.supportXS
-                ? `<template is="{{${xs}}}" data="{{${data}}}" />`
-                : `<template is="{{'tmpl_${level}_' + i.${"nn" /* Shortcuts.NodeName */}}}" data="{{${this.dataKeymap('i:i')}}}" />`;
-        }
         return `
 <template name="tmpl_${level}_${"container" /* Shortcuts.Container */}">
   ${tmpl}
@@ -1164,7 +1186,6 @@ class RecursiveTemplate extends BaseTemplate {
             }, template);
             template += this.buildPlainTextTemplate(ZERO_FLOOR);
             template += this.buildThirdPartyTemplate(ZERO_FLOOR, componentConfig);
-            template += this.buildContainerTemplate(ZERO_FLOOR);
             return template;
         };
     }
@@ -1191,15 +1212,9 @@ class UnRecursiveTemplate extends BaseTemplate {
             return template;
         };
     }
-    set baseLevel(lv) {
-        this._baseLevel = lv;
-    }
-    get baseLevel() {
-        return this._baseLevel;
-    }
     buildFloor(level, components, restart = false) {
         if (restart)
-            return this.buildContainerTemplate(level, restart);
+            return this.buildContainerTemplate(level);
         let template = components.reduce((current, nodeName) => {
             const attributes = this.miniComponents[nodeName];
             const nodeAlias = this.componentsAlias[nodeName]._num;
@@ -1207,12 +1222,11 @@ class UnRecursiveTemplate extends BaseTemplate {
         }, '');
         template += this.buildPlainTextTemplate(level);
         template += this.buildThirdPartyTemplate(level, this.componentConfig);
-        template += this.buildContainerTemplate(level, restart);
         return template;
     }
     buildOptimizeFloor(level, components, restart = false) {
         if (restart)
-            return this.buildContainerTemplate(level, restart);
+            return this.buildContainerTemplate(level);
         let template = components.reduce((current, nodeName) => {
             if (level !== 0) {
                 if (!this.nestElements.has(nodeName)) {
@@ -1234,7 +1248,6 @@ class UnRecursiveTemplate extends BaseTemplate {
         if (level === 0)
             template += this.buildPlainTextTemplate(level);
         template += this.buildThirdPartyTemplate(level, this.componentConfig);
-        template += this.buildContainerTemplate(level);
         return template;
     }
     buildXSTmplName() {
@@ -1255,6 +1268,7 @@ class UnRecursiveTemplate extends BaseTemplate {
         const componentsAlias = this.componentsAlias;
         const listA = Array.from(isLoopCompsSet).map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
         const listB = hasMaxComps.map(item => { var _a; return ((_a = componentsAlias[item]) === null || _a === void 0 ? void 0 : _a._num) || item; });
+        const containerLevel = this.baseLevel - 1;
         return `function (l, n, s) {
     var a = ${JSON.stringify(listA)}
     var b = ${JSON.stringify(listB)}
@@ -1269,6 +1283,9 @@ class UnRecursiveTemplate extends BaseTemplate {
       }
       l = depth
     }
+    if (l === ${containerLevel}) {
+      return 'tmpl_${containerLevel}_${"container" /* Shortcuts.Container */}'
+    }
     return 'tmpl_' + l + '_' + n
   }`;
     }