From 911440855cef32746e894c77d3360ca7065ac968 Mon Sep 17 00:00:00 2001
From: chenglie33 <394699890@qq.com>
Date: Sun, 12 Jul 2020 11:37:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96vue=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8F=90=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 kiwi-cli/src/extract/findChineseText.ts | 7 ++++++-
 kiwi-demo/src/vuePage.vue               | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/kiwi-cli/src/extract/findChineseText.ts b/kiwi-cli/src/extract/findChineseText.ts
index 4012290..6c6e944 100644
--- a/kiwi-cli/src/extract/findChineseText.ts
+++ b/kiwi-cli/src/extract/findChineseText.ts
@@ -185,7 +185,6 @@ function findTextInHtml(code) {
  */
 function findTextInVue (code: string) {
   const vueObejct = compilerVue.compile(code.toString(),{outputSourceRange: true});
-  debugger
   let TextaArr = findVueText(vueObejct.ast)
   const sfc = compilerVue.parseComponent(code.toString());
   let vueTemp = findTextInVueTs(sfc.script.content, 'fileName', sfc.script.start)
@@ -251,6 +250,12 @@ function findVueText (ast) {
           if (varInStr) itemText.match(DOUBLE_BYTE_REGEX)&&arr.push({text:' ' + itemText,range:{start:ast.start+2,end:ast.end-2},isString: true})
           else itemText.match(DOUBLE_BYTE_REGEX)&&arr.push({text:itemText,range:{start:ast.start,end:ast.end},isString: false})
         }) 
+      } else {
+        ast.tokens && ast.tokens.forEach(element => {
+          if (typeof(element) === 'string' && element.match(DOUBLE_BYTE_REGEX)) {
+            arr.push({text:element,range:{start:ast.start + ast.text.indexOf(element),end:ast.start + ast.text.indexOf(element)+element.length},isString: false})
+          }
+        });
       }
     } else if (!ast.expression&&ast.text) { 
       ast.text.match(DOUBLE_BYTE_REGEX)&&arr.push({text:ast.text,range:{start:ast.start,end:ast.end},isString: false})
diff --git a/kiwi-demo/src/vuePage.vue b/kiwi-demo/src/vuePage.vue
index 018930d..288406c 100644
--- a/kiwi-demo/src/vuePage.vue
+++ b/kiwi-demo/src/vuePage.vue
@@ -3,9 +3,8 @@
         <span>vue中文文案测试</span>
         <span attrs='中间'>{{`中文${pageName}`}}</span>
         <span @click='meth("按钮")'>按钮中文</span>
-        <span @click='meth("按钮")'>{{`可以的`}}</span>
-        `可以的`
-        <span @click='meth("按钮")'>{{`可以的`}}</span>
+        <span @click='meth("按钮")'>{{`可以${pageName}的`}}</span>
+        <span @click='meth("按钮")'>测试{{this.pageName}}翻译</span>
     </div>
 </template>
 <script>