mm_tpl 2.2.3 → 2.2.5

package/cache/test.cache.html

@@ -6,9 +6,10 @@
 	</head>
 	<body>
 		<div>游戏主题</div>
-		<div><div class="bar_user"><div>您好吗？</div><div>你好！</div>
+		<div><div class="bar_user"><div>您好！</div>
 	<div>用户ID：1</div>
 	<div>当前项目ID：2</div>
+	<div>hello world！</div>
 </div>
 
 <div class="bar">导航栏</div>

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

@@ -146,10 +146,10 @@ Tpl.prototype.render_before = function(body, model, options) {
 Tpl.prototype.loadFunc = function(m) {
 	var _this = this;
 	m.view = function(file, model, options) {
-		return _this.view(file, model, options);
+		return _this.view(file, Object.assign({}, m, model), options);
 	}
 	m.render = function(body, model, options) {
-		return _this.render(body, model, options);
+		return _this.render(body, Object.assign({}, m, model), options);
 	}
 	m.hook_action = function(name, ...args) {
 		return $.hook.runAction(name, m, ...args);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.2.3",
+    "version": "2.2.5",
     "description": "这是超级美眉模板帮助类模块，用于MVC模式下的视图渲染",
     "main": "index.js",
     "scripts": {
@@ -27,6 +27,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/game/bar.html

@@ -2,6 +2,7 @@
 	${@hook_filter('test', hook_action('test', '好的'), '真的')}
 	<div>用户ID：${viewBag.user_id}</div>
 	<div>当前项目ID：${viewBag.project_id}</div>
+	<div>${message}</div>
 </div>
 
 <div class="bar">导航栏</div>

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>";
@@ -71,7 +71,8 @@ async function test() {
 		// console.log(ret, param, m);
 		return ret.replace("你", "您");
 	}, 1, "测试过滤");
-
+	
+	// $.hook.delAction('test', "aa");
 	// $.hook.delAction('test', "测试动作1");
 	// $.hook.delFilter('test', "测试过滤");
 
@@ -84,7 +85,8 @@ async function test() {
 
 	// 渲染视图(并缓存)
 	var body = tpl.view("./test", {
-		arr: [123, 234]
+		arr: [123, 234],
+		message: "hello world！"
 	}, {
 		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取
 		cache: false,