优化vue模板类型提取

flonny · Jul 12, 2020 · 9114408 · 9114408
1 parent 0d07ba9
commit 9114408
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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>