@dcloudio/vue-cli-plugin-hbuilderx 2.0.2-alpha-3080320230522001 → 2.0.2-alpha-3080520230615001

package/build/vue-loader.conf.js

@@ -18,6 +18,31 @@ const TAGS = [
   'slider'
 ]
 
+function isTextElement (node) {
+  return node.type === 1 /* NodeTypes.ELEMENT */ && node.tag === 'text'
+}
+
+/*
+  1. 转换 \\n 为 \n
+  2. u-text 下只能有一个文本节点（不支持 children），需要移除子组件并合并文本
+*/
+function parseText (el) {
+  const children = el.children
+  if (children.length > 1) {
+    const expression = []
+    children.forEach(child => {
+      if (child.type === 3) {
+        expression.push(`" ${child.text}"`)
+      } else if (child.type === 2) {
+        expression.push(child.expression.replace(/\\n/g, ''))
+      }
+    })
+    el.children = [{ type: 2, expression: expression.join('+'), tokens: [] }]
+  } else if (children.length === 1) {
+    children[0].text = children[0].text.replace(/\n/g, '').replace(/\\n/g, '\n')
+  }
+}
+
 const modules = [{
   // render-whole => append="tree"
   preTransformNode (el, options) {
@@ -54,6 +79,9 @@ const deprecated = {
 if (process.env.UNI_USING_NVUE_COMPILER) {
   const wrapperTextTag = function (el, options) {
     const tag = el.tag
+    if (isTextElement(el)) {
+      parseText(el)
+    }
     if (tag === 'text' || tag === 'u-text' || tag === 'button') {
       return
     }
@@ -146,4 +174,4 @@ module.exports = {
   compilerOptions: {
     modules
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/vue-cli-plugin-hbuilderx",
-  "version": "2.0.2-alpha-3080320230522001",
+  "version": "2.0.2-alpha-3080520230615001",
   "description": "HBuilderX plugin for vue-cli 3",
   "main": "index.js",
   "repository": {
@@ -18,5 +18,5 @@
     "css": "~2.2.1",
     "escodegen": "^1.8.1"
   },
-  "gitHead": "bf158b4016023a0346959abecf5ad79feb03f2fe"
+  "gitHead": "c9d18e44da2ea83e0ca9ed05048bfbad49f0de29"
 }

package/packages/weex-template-compiler/build.js

@@ -2488,10 +2488,9 @@ function genWeexHandler (handler, options) {
   var code = handler.value;
   var isMethodPath = simplePathRE.test(code);
   var isFunctionExpression = fnExpRE.test(code);
-  var isFunctionCall = functionCallRE.test(code);
-
   // TODO: binding this to recyclable event handlers
   if (options.recyclable) {
+    var isFunctionCall = functionCallRE.test(code);
     if (isMethodPath) {
       return ("function($event){this." + code + "()}")
     }