fix(alita-core): 修复wxml引用wxs变量名t和template模板相关变量冲突导致无法正常渲染问题

areslabs · May 21, 2020 · 716c335 · 716c335
1 parent 375cb08
commit 716c335
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/alita-core/src/extractWxCompFiles/extractWxmlFile.ts b/packages/alita-core/src/extractWxCompFiles/extractWxmlFile.ts
@@ -78,13 +78,13 @@ export const handleChanged = (info, finalJSPath) => {
         // 如果只使用一个child 小程序会报递归， 然后就不渲染了
         const subT = `
 <template name="${name}">
-   <block wx:if="{{t.l(d)}}">{{d}}</block>
-   <${genericCompName} wx:elif="{{d.${genericCompDiuu}}}" diuu="{{d.${genericCompDiuu}}}" style="{{t.s(d.${genericCompDiuu}style)}}"/>
+   <block wx:if="{{_t.l(d)}}">{{d}}</block>
+   <${genericCompName} wx:elif="{{d.${genericCompDiuu}}}" diuu="{{d.${genericCompDiuu}}}" style="{{_t.s(d.${genericCompDiuu}style)}}"/>
    <template wx:elif="{{d.tempName}}" is="{{d.tempName}}" data="{{...d}}"/>
    <block wx:else>
        <block wx:for="{{d}}" wx:key="key">
-           <block wx:if="{{t.l(item)}}">{{item}}</block>
-           <${genericCompName} wx:elif="{{item.${genericCompDiuu}}}" diuu="{{item.${genericCompDiuu}}}" style="{{t.s(item.${genericCompDiuu}style)}}"/>
+           <block wx:if="{{_t.l(item)}}">{{item}}</block>
+           <${genericCompName} wx:elif="{{item.${genericCompDiuu}}}" diuu="{{item.${genericCompDiuu}}}" style="{{_t.s(item.${genericCompDiuu}style)}}"/>
            <template wx:else is="{{item.tempName}}" data="{{...item}}"/>
        </block>
    </block>
@@ -97,7 +97,7 @@ export const handleChanged = (info, finalJSPath) => {
 
     const utilWxsPath = `${RootPrefixPlaceHolader}/commonwxs.wxs`
 
-    templateWxml = `<wxs src="${utilWxsPath}" module="t" />
+    templateWxml = `<wxs src="${utilWxsPath}" module="_t" />
 
 ${templateWxml}
 

diff --git a/packages/alita-core/src/tran/geneAllTemplate.js b/packages/alita-core/src/tran/geneAllTemplate.js
@@ -105,7 +105,7 @@ export default function(ast, info) {
                 const styleAttr = getAttr(jsxOp, 'style')
                 if (!styleAttr) {
                     jsxOp.attributes.push(
-                        t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{t.s(${diuuKey}style)}}`))
+                        t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{_t.s(${diuuKey}style)}}`))
                     )
                 }
 
@@ -130,7 +130,7 @@ export default function(ast, info) {
 
 
                 jsxOp.attributes.push(
-                    t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{t.s(${diuuKey}style)}}`))
+                    t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{_t.s(${diuuKey}style)}}`))
                 )
                 jsxOp.attributes.push(
                     t.jsxAttribute(t.jsxIdentifier('wx:if'), t.stringLiteral(`{{${diuuKey}style !== false}}`)),
@@ -199,7 +199,7 @@ export default function(ast, info) {
                     jsxOp.attributes = jsxOp.attributes.filter(attr => !(attr.type === 'JSXAttribute' && attr.name.name === 'style'))
 
                     jsxOp.attributes.push(
-                        t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{t.s(${diuuKey}style)}}`))
+                        t.jsxAttribute(t.jsxIdentifier('style'), t.stringLiteral(`{{_t.s(${diuuKey}style)}}`))
                     )
 
 					if (info.isPageComp) {
@@ -251,7 +251,7 @@ export default function(ast, info) {
                             // 微信基本组件 <view style="height: 90px"/>
                             return
                         } else {
-                            attr.value = t.stringLiteral(`{{t.s(${diuuKey}style)}}`)
+                            attr.value = t.stringLiteral(`{{_t.s(${diuuKey}style)}}`)
                         }
                         return
                     }
@@ -281,7 +281,7 @@ export default function(ast, info) {
                             // 微信基本组件 <view style="height: 90px"/>
                             return
                         } else {
-                            attr.value = t.stringLiteral(`{{t.s(${diuuKey}style)}}`)
+                            attr.value = t.stringLiteral(`{{_t.s(${diuuKey}style)}}`)
                         }
                         return
                     }