mm_tpl 2.2.4 → 2.2.6

package/cache/test.cache.html

@@ -5,18 +5,23 @@
 		<title>超级美眉Art模板引擎</title>
 	</head>
 	<body>
-		<div>游戏主题</div>
-		<div><div class="bar_user"><div>您好吗？</div><div>你好！</div>
-	<div>用户ID：1</div>
-	<div>当前项目ID：2</div>
-	<div>hello world！</div>
-</div>
-
-<div class="bar">导航栏</div>
-<style>
-	.bar {
-		font-weight: 800;
-	}
-</style></div>
+		<h5>系统名称</h5>
+		<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>

package/hook.js

@@ -20,6 +20,24 @@ Hook.prototype.sort = function(list) {
 	});
 }
 
+/**
+ * 获取别名
+ * @param {Function} func 钩子函数
+ * @param {String} alias 别名
+ */
+Hook.prototype.getName = function(func, alias) {
+	if (!alias) {
+		var str = func.toString();
+		var name = str.between('function ', "(").trim();
+		if (name) {
+			alias = name;
+		} else {
+			alias = (new Date()).toString().md5().substring(0, 8);
+		}
+	}
+	return alias;
+}
+
 /**
  * 添加函数钩子
  * @param {String} name 钩子名称
@@ -28,6 +46,7 @@ Hook.prototype.sort = function(list) {
  * @param {String} alias 函数别名，用于删除
  */
 Hook.prototype.addFunc = function(name, func, sort, alias) {
+	alias = this.getName(func, alias);
 	var obj = {
 		func,
 		sort,
@@ -39,6 +58,7 @@ Hook.prototype.addFunc = function(name, func, sort, alias) {
 	}
 	arr.push(obj);
 	this.dict_func[name] = this.sort(arr);
+	return alias;
 }
 
 /**
@@ -49,6 +69,7 @@ Hook.prototype.addFunc = function(name, func, sort, alias) {
  * @param {String} alias 函数别名，用于删除
  */
 Hook.prototype.addAction = function(name, func, sort, alias) {
+	alias = this.getName(func, alias);
 	var obj = {
 		func,
 		sort,
@@ -60,6 +81,7 @@ Hook.prototype.addAction = function(name, func, sort, alias) {
 	}
 	arr.push(obj);
 	this.dict_action[name] = this.sort(arr);
+	return alias;
 }
 
 /**
@@ -70,6 +92,7 @@ Hook.prototype.addAction = function(name, func, sort, alias) {
  * @param {String} alias 函数别名，用于删除
  */
 Hook.prototype.addFilter = function(name, func, sort, alias) {
+	alias = this.getName(func, alias);
 	var obj = {
 		func,
 		sort,
@@ -81,9 +104,9 @@ Hook.prototype.addFilter = function(name, func, sort, alias) {
 	}
 	arr.push(obj);
 	this.dict_filter[name] = this.sort(arr);
+	return alias;
 }
 
-
 /**
  * 删除函数钩子
  * @param {String} name 钩子名称

package/index.js

@@ -246,13 +246,19 @@ Tpl.prototype.view = function(file, model, options) {
 	if (file.replace('./', '').indexOf('.') === -1 && !file.endWith(this.config.extname)) {
 		file += this.config.extname;
 	}
-	var f = file.fullname(this.dir + this.current_theme);
+	var f = file.fullname(this.dir + 'diy');
 	if (!f.hasFile()) {
-		f = file.fullname(this.dir + this.config.default_theme);
+		f = file.fullname(this.config.default_dir + 'diy');
 		if (!f.hasFile()) {
-			f = file.fullname(this.config.default_dir + this.current_theme);
+			f = file.fullname(this.dir + this.current_theme);
 			if (!f.hasFile()) {
-				f = file.fullname(this.config.default_dir + this.config.default_theme);
+				f = file.fullname(this.dir + this.config.default_theme);
+				if (!f.hasFile()) {
+					f = file.fullname(this.config.default_dir + this.current_theme);
+					if (!f.hasFile()) {
+						f = file.fullname(this.config.default_dir + this.config.default_theme);
+					}
+				}
 			}
 		}
 	}

package/package.json

@@ -1,9 +1,10 @@
 {
     "name": "mm_tpl",
-    "version": "2.2.4",
+    "version": "2.2.6",
     "description": "这是超级美眉模板帮助类模块，用于MVC模式下的视图渲染",
     "main": "index.js",
     "scripts": {
+        "dev": "nodemon test.js",
         "test": "node test.js"
     },
     "repository": {
@@ -27,6 +28,6 @@
     "homepage": "https://github.com/qiuwenwu/mm_tpl#readme",
     "dependencies": {
         "art-template": "^4.13.2",
-        "mm_expand": "^1.5.5"
+        "mm_expand": "^1.5.6"
     }
 }

package/template/diy/ad.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>${globalBag.name}</title>
+	</head>
+	<body>
+		<h5>${viewBag.name}</h5>
+		<ul>
+			${loop arr value idx}
+			<li>${ value }</li>
+			${/loop}
+		</ul>
+		<ul>
+			<!--[ for(var i = 0; i < arr.length; i++) { ]-->
+			<li>${ arr[i] }</li>
+			<!--[ } ]-->
+		</ul>
+		<ul>
+			<!--{loop arr value idx}-->
+			<li>${ value }</li>
+			<!--{/loop}-->
+		</ul>
+		<script type="text/javascript">
+			/*[loop arr value idx]*/
+			var a_${idx} = ${value};
+			/*[/loop]*/
+		</script>
+		${viewBag.name}
+		## "计算" ##
+		123123'"""#
+		"price" + "NIHAO"
+		#"""'
+		## "#计算" ##
+	</body>
+</html>

package/test.js

@@ -58,10 +58,10 @@ async function test() {
 		console.log(m);
 	});
 
-	$.hook.addAction('test', function(m, param) {
+	$.hook.addAction('test', function aa(m, param) {
 		// console.log(param, m);
 		return "<div>你好吗？</div>";
-	}, 2, "测试动作2");
+	}, 2);
 
 	$.hook.addAction('test', function(m, param) {
 		return "<div>你好！</div>";
@@ -72,6 +72,7 @@ async function test() {
 		return ret.replace("你", "您");
 	}, 1, "测试过滤");
 
+	// $.hook.delAction('test', "aa");
 	// $.hook.delAction('test', "测试动作1");
 	// $.hook.delFilter('test', "测试过滤");
 
@@ -83,7 +84,7 @@ async function test() {
 	}, 'article');
 
 	// 渲染视图(并缓存)
-	var body = tpl.view("./test", {
+	var body = tpl.view("./ad", {
 		arr: [123, 234],
 		message: "hello world！"
 	}, {