mm_tpl 2.3.3 → 2.3.4

package/index.js

@@ -244,7 +244,6 @@ Tpl.prototype.render_after = function(body, model, options) {
 	return body;
 };
 
-
 /**
  * 渲染模板
  * @param {String} body 模板
@@ -252,8 +251,7 @@ Tpl.prototype.render_after = function(body, model, options) {
  * @param {Object} options 配置参数
  * @return {String} view 渲染后的视图
  */
-Tpl.prototype.render = function(body, model, options) {
-	body = this.change(body);
+Tpl.prototype.render_sub = function(body, model, options) {
 	var ret = this.render_before(body, model, options);
 	if (!ret) {
 		ret = this.render_main(body, model, options);
@@ -261,10 +259,22 @@ Tpl.prototype.render = function(body, model, options) {
 			ret = this.render_after(ret, model, options);
 		}
 	}
-	ret = this.change(ret, true);
 	return ret;
 };
 
+/**
+ * 渲染模板
+ * @param {String} body 模板
+ * @param {Object} model 数据模型
+ * @param {Object} options 配置参数
+ * @return {String} view 渲染后的视图
+ */
+Tpl.prototype.render = function(body, model, options) {
+	body = this.change(body);
+	body = this.render_sub(body);
+	return  this.change(body, true);
+};
+
 /**
  * 编译模板并返回渲染函数
  * @param {String} body 模板
@@ -311,7 +321,10 @@ Tpl.prototype.view = function(file, model, options) {
 	}
 	var body = f.loadText();
 	if (body) {
-		return this.render(body, model, options);
+		body = this.change(body);
+		body = this.render_sub(body, model, options);
+		body = this.change(body, true);
+		return body;
 	} else {
 		return "";
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.3.3",
+    "version": "2.3.4",
     "description": "这是超级美眉模板帮助类模块，用于MVC模式下的视图渲染",
     "main": "index.js",
     "scripts": {

package/template/default/test.html

@@ -7,14 +7,14 @@
 	<body>
 		<h5>${viewBag.name}</h5>
 		<ul>
-			\${loop arr value idx}
-			<li>\${ value }</li>
-			\${/loop}
+			${loop arr value idx}
+			<li>${ value }</li>
+			${/loop}
 		</ul>
 		<ul>
-			\<!--[ for(var i = 0; i < arr.length; i++) { ]-->
+			<!--[ for(var i = 0; i < arr.length; i++) { ]-->
 			<li>${ arr[i] }</li>
-			\<!--[ } ]-->
+			<!--[ } ]-->
 		</ul>
 		<ul>
 			<!--{loop arr value idx}-->

package/cache/test.cache.html

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<title>超级美眉Art模板引擎</title>
-	</head>
-	<body>
-		<h5>系统名称</h5>
-		<p>您真的是人才！</p>
-		<p>您真的是人才！</p>
-		<ul>
-			<li>\123</li>
-			<li>\234</li>
-		</ul>
-		<ul>
-			<li>123</li>
-			<li>234</li>
-		</ul>
-		<ul>
-			<li>\123</li>
-			<li>\234</li>
-		</ul>
-		<script type="text/javascript">
-			var a_0 =123;
-			var a_1 =234;
-		</script>系统名称计算
-		123123'priceNIHAO'#计算
-	</body>
-</html>
-$