fix(ali): 修复 Text 组件的 decode 属性不生效的问题

remaxjs · Jul 17, 2020 · 8868383 · 8868383
1 parent 16e4eb3
commit 8868383
Show file tree

Hide file tree

Showing 35 changed files with 105 additions and 67 deletions.
diff --git a/packages/remax-ali/templates/default/component.ejs b/packages/remax-ali/templates/default/component.ejs
@@ -16,6 +16,11 @@
         </block>
       </swiper-item>
     </block>
+    <% } else if (id === 'text') { %>
+    <block a:for="{{item.children}}" key="{{item.id}}">
+      <block a:if="{{item.type === 'plain-text'}}">{{item.text}}</block>
+      <template a:else is="REMAX_TPL_1_CONTAINER" data="{{item: item.children[0]}}" />
+    </block>
     <% } else if (id === 'picker') { %>
     <view>
       <template is="REMAX_TPL_1_CONTAINER" data="{{item: item.children[0]}}" />

diff --git a/packages/remax-ali/templates/default/page.ejs b/packages/remax-ali/templates/default/page.ejs
@@ -22,4 +22,4 @@
 </template>
 
 <template is="REMAX_TPL" data="{{ root: root }}" />
-<template is="REMAX_TPL" data="{{ root: modalRoot }}" />
+<template is="REMAX_TPL" data="{{ root: modalRoot }}" />
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/packageA/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/classPage.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/ali/expected/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/assets/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/assets/expected/pages/index.axml
diff --git a/...emax-cli/src/__tests__/integration/fixtures/babel-plugin-import/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/babel-plugin-import/expected/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/babelrc/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/babelrc/expected/pages/index.axml
diff --git a/...remax-cli/src/__tests__/integration/fixtures/circularDependence/expected/pages/index.axml b/...remax-cli/src/__tests__/integration/fixtures/circularDependence/expected/pages/index.axml
diff --git a/...emax-cli/src/__tests__/integration/fixtures/config-add-css-rule/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/config-add-css-rule/expected/pages/index.axml
diff --git a/...-cli/src/__tests__/integration/fixtures/createHostComponent/expected/ali/pages/index.axml b/...-cli/src/__tests__/integration/fixtures/createHostComponent/expected/ali/pages/index.axml
diff --git a/...ges/remax-cli/src/__tests__/integration/fixtures/customCwdBabel/expected/pages/index.axml b/...ges/remax-cli/src/__tests__/integration/fixtures/customCwdBabel/expected/pages/index.axml
diff --git a/...ages/remax-cli/src/__tests__/integration/fixtures/customRootDir/expected/pages/index.axml b/...ages/remax-cli/src/__tests__/integration/fixtures/customRootDir/expected/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/env/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/env/expected/pages/index.axml
diff --git a/.../remax-cli/src/__tests__/integration/fixtures/hook-config-babel/expected/pages/index.axml b/.../remax-cli/src/__tests__/integration/fixtures/hook-config-babel/expected/pages/index.axml
diff --git a/...emax-cli/src/__tests__/integration/fixtures/hook-config-webpack/expected/pages/index.axml b/...emax-cli/src/__tests__/integration/fixtures/hook-config-webpack/expected/pages/index.axml
diff --git a/...s/remax-cli/src/__tests__/integration/fixtures/hook-onAppConfig/expected/pages/index.axml b/...s/remax-cli/src/__tests__/integration/fixtures/hook-onAppConfig/expected/pages/index.axml
diff --git a/.../remax-cli/src/__tests__/integration/fixtures/hook-onPageConfig/expected/pages/about.axml b/.../remax-cli/src/__tests__/integration/fixtures/hook-onPageConfig/expected/pages/about.axml
diff --git a/.../remax-cli/src/__tests__/integration/fixtures/hook-onPageConfig/expected/pages/index.axml b/.../remax-cli/src/__tests__/integration/fixtures/hook-onPageConfig/expected/pages/index.axml
diff --git a/...es/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.axml b/...es/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/packageA/pages/index.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/hybrid/expected/pages/index.axml
diff --git a/...ages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/pages/classPage.axml b/...ages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/pages/classPage.axml
diff --git a/packages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/pages/index.axml b/packages/remax-cli/src/__tests__/integration/fixtures/lifeCycle/expected/pages/index.axml
diff --git a/...remax-cli/src/__tests__/integration/fixtures/namespaceAttribute/expected/pages/index.axml b/...remax-cli/src/__tests__/integration/fixtures/namespaceAttribute/expected/pages/index.axml