From c7a10c035c4cb98fa7dece4a66e52de99ec65f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=89=A7=E6=AF=85?= <changyun.pcy@alibaba-inc.com>
Date: Fri, 21 Aug 2020 13:30:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E7=BB=8F=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=8F=91=E7=8E=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=87=8C?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=98=E6=98=AF=E5=BE=97=E5=8C=85=E4=B8=8A=20eval?=
 =?UTF-8?q?=20=E5=90=A6=E5=88=99=20Rax=20=E6=A1=86=E6=9E=B6=E4=BC=9A?=
 =?UTF-8?q?=E8=AF=AF=E6=8A=8A=20context=20=E5=8F=91=E9=80=81=E5=88=B0?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=E8=BF=9B=E7=A8=8B=E8=80=8C=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/code-generator/src/plugins/component/rax/jsx.ts  | 8 --------
 .../demo2/expected/demo-project/src/pages/Home/index.jsx  | 6 +++---
 .../demo5/expected/demo-project/src/pages/Home/index.jsx  | 2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/packages/code-generator/src/plugins/component/rax/jsx.ts b/packages/code-generator/src/plugins/component/rax/jsx.ts
index c92f29f4f..2bf71b84a 100644
--- a/packages/code-generator/src/plugins/component/rax/jsx.ts
+++ b/packages/code-generator/src/plugins/component/rax/jsx.ts
@@ -194,14 +194,6 @@ function transformJsExpr(expr: string, handlers: CustomHandlerSet) {
     case 'FunctionExpression':
       return transformThis2Context(exprAst, handlers);
 
-    // 对于直接访问 this.xxx, this.utils.xxx, this.state.xxx 的也不用再包下
-    case 'MemberExpression':
-      if (isSimpleDirectlyAccessingThis(exprAst) || isSimpleDirectlyAccessingSafeProperties(exprAst)) {
-        return transformThis2Context(exprAst, handlers);
-      }
-
-      break;
-
     default:
       break;
   }
diff --git a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
index 43c6ca91a..3befd88d4 100644
--- a/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo2/expected/demo-project/src/pages/Home/index.jsx
@@ -83,13 +83,13 @@ class Home$$Page extends Component {
         <View>
           <Text>=== User Info: ===</Text>
         </View>
-        {__$$context.state.user && (
+        {__$$eval(() => __$$context.state.user) && (
           <View style={{ flexDirection: 'row' }}>
             <Image
               source={{ uri: __$$eval(() => __$$context.state.user.avatar) }}
               style={{ width: '32px', height: '32px' }}
             />
-            <View onClick={__$$context.hello}>
+            <View onClick={__$$eval(() => __$$context.hello)}>
               <Text>{__$$eval(() => __$$context.state.user.name)}</Text>
               <Text>{__$$eval(() => __$$context.state.user.age)}岁</Text>
             </View>
@@ -132,7 +132,7 @@ class Home$$Page extends Component {
             });
           }}
         >
-          <Text>点击次数：{__$$context.state.clickCount}(点击加 1)</Text>
+          <Text>点击次数：{__$$eval(() => __$$context.state.clickCount)}(点击加 1)</Text>
         </View>
         <View>
           <Text>操作提示：</Text>
diff --git a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
index fbfac0844..40444b2f2 100644
--- a/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
+++ b/packages/code-generator/test-cases/rax-app/demo5/expected/demo-project/src/pages/Home/index.jsx
@@ -47,7 +47,7 @@ class Home$$Page extends Component {
             __$$context.setLocale(__$$context.getLocale() === 'en-US' ? 'zh-CN' : 'en-US');
           }}
         >
-          {__$$context.i18n['hello-world']}
+          {__$$eval(() => __$$context.i18n['hello-world'])}
         </Text>
       </Page>
     );