mm_tpl 2.3.0 → 2.3.2

package/cache/test.cache.html

@@ -9,16 +9,16 @@
 		<p>您真的是人才！</p>
 		<p>您真的是人才！</p>
 		<ul>
-			<li>123</li>
-			<li>234</li>
+			<li>\123</li>
+			<li>\234</li>
 		</ul>
 		<ul>
 			<li>123</li>
 			<li>234</li>
 		</ul>
 		<ul>
-			<li>123</li>
-			<li>234</li>
+			<li>\123</li>
+			<li>\234</li>
 		</ul>
 		<script type="text/javascript">
 			var a_0 =123;
@@ -27,3 +27,4 @@
 		123123'priceNIHAO'#计算
 	</body>
 </html>
+$

package/index.js

@@ -40,7 +40,8 @@ class Tpl {
 			extname: ".html",
 			rules: [nativeRule, artRule, htmlRule, jsRule, pyRule, pyRule2],
 			cache_root: './cache'.fullname(),
-			cache_extname: '.cache.html'
+			cache_extname: '.cache.html',
+			change_str: ["\\$", "\\\\", "\\<", "\\>"],
 		};
 
 		/**
@@ -71,6 +72,12 @@ class Tpl {
 		 */
 		this.error = null;
 
+		this.regex_in = [];
+		this.str_in = [];
+
+		this.regex_out = [];
+		this.str_out = [];
+
 		/**
 		 * 初始化
 		 */
@@ -112,6 +119,37 @@ Tpl.prototype.runFunc = function(name, req, ...args) {
  */
 Tpl.prototype.init = function(config) {
 	this.set_config(config);
+	var lt = this.config.change_str;
+	for (var i = 0; i < lt.length; i++) {
+		var str = lt[i];
+		var rx = str.replace(/\\/g, "\\\\").replace("$", "\\$").replace("[", "\\[").replace("]", "\\]");
+		this.regex_in.push(new RegExp(rx, "gi"));
+		str = str.replace("\\", "");
+		this.str_in.push(str + "··");
+		this.regex_out.push(new RegExp(rx.replace(/\\/g, "") + "··", "gi"));
+		this.str_out.push(str.replace("\\", ""));
+	}
+}
+
+/**
+ * 转译字符
+ * @param {String} body 字符串
+ * @param {Boolean} restore 是否还原 
+ */
+Tpl.prototype.change = function(body, restore) {
+	if (!body) {
+		return body
+	}
+	if (restore) {
+		for (var i = 0; i < this.regex_out.length; i++) {
+			body = body.replace(this.regex_out[i], this.str_out[i]);
+		}
+	} else {
+		for (var i = 0; i < this.regex_in.length; i++) {
+			body = body.replace(this.regex_in[i], this.str_in[i]);
+		}
+	}
+	return body;
 }
 
 /**
@@ -215,6 +253,7 @@ Tpl.prototype.render_after = function(body, model, options) {
  * @return {String} view 渲染后的视图
  */
 Tpl.prototype.render = function(body, model, options) {
+	body = this.change(body);
 	var ret = this.render_before(body, model, options);
 	if (!ret) {
 		ret = this.render_main(body, model, options);
@@ -222,6 +261,7 @@ Tpl.prototype.render = function(body, model, options) {
 			ret = this.render_after(ret, model, options);
 		}
 	}
+	ret = this.change(ret, true);
 	return ret;
 };
 

package/package.json

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

package/template/{defualt → default}/test.html

@@ -8,13 +8,13 @@
 		<h5>${viewBag.name}</h5>
 		<ul>
 			${loop arr value idx}
-			<li>${ value }</li>
+			<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/template/diy/ad.html

@@ -10,7 +10,7 @@
 		<p><!--{@hook_filter('test', '你真的是人才！', {key: '123'})}--></p>
 		<ul>
 			${loop arr value idx}
-			<li>${ value }</li>
+			<li>\${ value }</li>
 			${/loop}
 		</ul>
 		<ul>
@@ -20,7 +20,7 @@
 		</ul>
 		<ul>
 			<!--{loop arr value idx}-->
-			<li>${ value }</li>
+			<li>\${ value }</li>
 			<!--{/loop}-->
 		</ul>
 		<script type="text/javascript">

package/test.js

@@ -23,79 +23,81 @@ const Tpl = require('./index.js');
 // 	console.log(body);
 // }
 
+async function test() {
+	console.log("测试开始")
+	var tpl = new Tpl();
+	// 设置全局变量
+	$.globalBag.name = "超级美眉Art模板引擎";
+
+	// 设置实例化视图变量
+	tpl.viewBag.name = "系统名称";
+
+	// 渲染视图
+	var body = tpl.view("./test.html", { arr: [123,234] });
+	console.log(tpl.error);
+	console.log(body);
+}
+
 // async function test() {
 // 	var tpl = new Tpl();
+
 // 	// 设置全局变量
 // 	$.globalBag.name = "超级美眉Art模板引擎";
 
 // 	// 设置实例化视图变量
 // 	tpl.viewBag.name = "系统名称";
+// 	tpl.current_theme = "game";
+// 	tpl.dir = "";
+
+// 	$.hook.addFunc('list', async function(m, req, type) {
+// 		var query = req.query;
+// 		if (query.user_id) {
+// 			m.user_id = query.user_id;
+// 		}
+// 		if (query.project_id) {
+// 			m.project_id = query.project_id;
+// 		}
+// 		console.log("列表", m);
+// 	});
 
-// 	// 渲染视图
-// 	var body = tpl.view("./test.html", { arr: [123,234] });
+// 	$.hook.addAction('test', function aa(m, param) {
+// 		// console.log(param, m);
+// 		return "<div>你好吗？</div>";
+// 	}, 2);
+
+// 	$.hook.addAction('test', function(m, param) {
+// 		return "<div>你好！</div>";
+// 	}, 1, "测试动作1");
+
+// 	$.hook.addFilter('test', function(m, ret, param) {
+// 		console.log("测试", ret);
+// 		// console.log(param, ret, m);
+// 		return ret.replace("你", "您");
+// 	}, 1, "测试过滤");
+
+// 	$.hook.delAction('test', "aa");
+// 	$.hook.delAction('test', "测试动作1");
+// 	// $.hook.delFilter('test', "测试过滤");
+
+// 	await tpl.runFunc('list', {
+// 		query: {
+// 			user_id: 1,
+// 			project_id: 2
+// 		}
+// 	}, 'article');
+
+// 	// 渲染视图(并缓存)
+// 	var body = tpl.view("./ad", {
+// 		arr: [123, 234],
+// 		message: "hello world！"
+// 	}, {
+// 		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取
+// 		cache: false,
+// 		// 缓存文件名
+// 		cache_filename: "./test"
+// 	});
+// 	// 删除指定目录的缓存文件
+// 	// tpl.clear_cache('./mall');
 // 	console.log(body);
 // }
-
-async function test() {
-	var tpl = new Tpl();
-
-	// 设置全局变量
-	$.globalBag.name = "超级美眉Art模板引擎";
-
-	// 设置实例化视图变量
-	tpl.viewBag.name = "系统名称";
-	tpl.current_theme = "game";
-	tpl.dir = "";
-
-	$.hook.addFunc('list', async function(m, req, type) {
-		var query = req.query;
-		if (query.user_id) {
-			m.user_id = query.user_id;
-		}
-		if (query.project_id) {
-			m.project_id = query.project_id;
-		}
-		console.log("列表", m);
-	});
-
-	$.hook.addAction('test', function aa(m, param) {
-		// console.log(param, m);
-		return "<div>你好吗？</div>";
-	}, 2);
-
-	$.hook.addAction('test', function(m, param) {
-		return "<div>你好！</div>";
-	}, 1, "测试动作1");
-
-	$.hook.addFilter('test', function(m, ret, param) {
-		console.log("测试", ret);
-		// console.log(param, ret, m);
-		return ret.replace("你", "您");
-	}, 1, "测试过滤");
-
-	$.hook.delAction('test', "aa");
-	$.hook.delAction('test', "测试动作1");
-	// $.hook.delFilter('test', "测试过滤");
-
-	await tpl.runFunc('list', {
-		query: {
-			user_id: 1,
-			project_id: 2
-		}
-	}, 'article');
-
-	// 渲染视图(并缓存)
-	var body = tpl.view("./ad", {
-		arr: [123, 234],
-		message: "hello world！"
-	}, {
-		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取
-		cache: false,
-		// 缓存文件名
-		cache_filename: "./test"
-	});
-	// 删除指定目录的缓存文件
-	// tpl.clear_cache('./mall');
-	console.log(body);
-}
 test();