mm_tpl 2.1.7 → 2.1.9

package/hook.js

@@ -88,16 +88,17 @@ Hook.prototype.delFilter = function(name, alias = "") {
 /**
  * 运行动作钩子
  * @param {String} name 钩子名称
- * @param {Object} ret 结果
+ * @param {Object} model 模型
  * @param {Object} args 附加参数
  */
-Hook.prototype.runAction = function(name, ret, ...args) {
+Hook.prototype.runAction = function(name, model, ...args) {
+	var ret = "";
 	var dict = this.dict_action;
 	var list = dict[name];
 	if (list) {
 		for (var i = 0; i < list.length; i++) {
 			var o = list[i];
-			ret += o.func(ret, ...args);
+			ret += o.func(model, ...args);
 		}
 	}
 	return ret;
@@ -107,15 +108,16 @@ Hook.prototype.runAction = function(name, ret, ...args) {
  * 运行过滤钩子
  * @param {String} name 钩子名称
  * @param {Object} ret 结果
+ * @param {Object} model 模型
  * @param {Object} args 附加参数
  */
-Hook.prototype.runFilter = function(name, ret, ...args) {
+Hook.prototype.runFilter = function(name, ret, model, ...args) {
 	var dict = this.dict_filter;
 	var list = dict[name];
 	if (list) {
 		for (var i = 0; i < list.length; i++) {
 			var o = list[i];
-			ret = o.func(ret, ...args);
+			ret = o.func(ret, model, ...args);
 		}
 	}
 	return ret;

package/index.js

@@ -140,17 +140,14 @@ Tpl.prototype.loadFunc = function(m) {
 	m.render = function(body, model, options) {
 		return _this.render(body, model, options);
 	}
-	m.hook_action = function(name, content, ...args) {
-		if (!content) {
-			content = "";
-		}
-		return $.hook.runAction(name, content, ...args);
+	m.hook_action = function(name, ...args) {
+		return $.hook.runAction(name, m, ...args);
 	}
 	m.hook_filter = function(name, content, ...args) {
 		if (!content) {
 			content = "";
 		}
-		return $.hook.runFilter(name, content, ...args);
+		return $.hook.runFilter(name, content, m, ...args);
 	}
 	return m;
 }
@@ -242,7 +239,7 @@ Tpl.prototype.view = function(file, model, options) {
 	if (!f.hasFile()) {
 		f = file.fullname(this.dir + this.config.defualt_theme);
 		if (!f.hasFile()) {
-			f = file.fullname(this.config.defualt_dir + this.config.current_theme);
+			f = file.fullname(this.config.defualt_dir + this.current_theme);
 			if (!f.hasFile()) {
 				f = file.fullname(this.config.defualt_dir + this.config.defualt_theme);
 			}

package/package.json

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

package/template/game/bar.html

@@ -1,4 +1,4 @@
-<div class="bar_user">${@hook_filter('test', hook_action('test'))}</div>
+<div class="bar_user">${@hook_filter('test', hook_action('test', '好的'), '真的')}</div>
 <div class="bar">导航栏</div>
 <style>
 	.bar {

package/test.js

@@ -47,15 +47,17 @@ async function test() {
 	tpl.current_theme = "game";
 	tpl.dir = "";
 	
-	$.hook.addAction('test', (ret) => {
+	$.hook.addAction('test', function(m, param) {
+		// console.log(param, m);
 		return "<div>你好吗？</div>";
 	}, 2, "测试动作2");
 	
-	$.hook.addAction('test', (ret) => {
+	$.hook.addAction('test', function(m, param) {
 		return "<div>你好！</div>";
 	}, 1, "测试动作1");
 	
-	$.hook.addFilter('test', (ret) => {
+	$.hook.addFilter('test', function(ret, m, param) {
+		// console.log(ret, param, m);
 		return ret.replace("你", "您");
 	}, 1, "测试过滤");