Merge 6eadba8 into d296d8e

baidu · Feb 25, 2021 · 754e9cd · 754e9cd
2 parents d296d8e + 6eadba8
commit 754e9cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/view/component.js b/src/view/component.js
@@ -118,7 +118,7 @@ function Component(options) { // eslint-disable-line
     if (!proto.hasOwnProperty('aNode')) {
         var aPack = clazz.aPack || proto.hasOwnProperty('aPack') && proto.aPack;
         if (aPack) {
-            proto.aNode = unpackANode(aPack);
+            proto.aNode = parseComponentTemplate(clazz, unpackANode(aPack));
             clazz.aPack = proto.aPack = null;
         }
         else {

diff --git a/src/view/parse-component-template.js b/src/view/parse-component-template.js
@@ -20,16 +20,19 @@ var createAccessor = require('../parser/create-accessor');
  * @param {Function} ComponentClass 组件类
  * @return {ANode}
  */
-function parseComponentTemplate(ComponentClass) {
+function parseComponentTemplate(ComponentClass, tplANode) {
     var proto = ComponentClass.prototype;
-
-
-    var tplANode = parseTemplate(ComponentClass.template || proto.template, {
-        trimWhitespace: proto.trimWhitespace || ComponentClass.trimWhitespace,
-        delimiters: proto.delimiters || ComponentClass.delimiters
-    });
-
-    var aNode = tplANode.children[0];
+    var aNode;
+
+    if (!tplANode) {
+        tplANode = parseTemplate(ComponentClass.template || proto.template, {
+            trimWhitespace: proto.trimWhitespace || ComponentClass.trimWhitespace,
+            delimiters: proto.delimiters || ComponentClass.delimiters
+        });
+        aNode = tplANode.children[0];
+    } else {
+        aNode = tplANode;
+    }
     if (aNode && aNode.textExpr) {
         aNode = null;
     }