mm_tpl 2.1.8 → 2.2.0

package/hook.js

@@ -1,5 +1,10 @@
+const {
+	types
+} = require("node:util");
+
 class Hook {
 	constructor() {
+		this.dict_func = {};
 		this.dict_action = {};
 		this.dict_filter = {};
 	}
@@ -15,6 +20,27 @@ Hook.prototype.sort = function(list) {
 	});
 }
 
+/**
+ * 添加函数钩子
+ * @param {String} name 钩子名称
+ * @param {Function} func 钩子函数
+ * @param {Number} sort 执行顺序
+ * @param {String} alias 函数别名，用于删除
+ */
+Hook.prototype.addFunc = function(name, func, sort, alias) {
+	var obj = {
+		func,
+		sort,
+		alias
+	}
+	var arr = this.dict_func[name];
+	if (!arr) {
+		arr = [];
+	}
+	arr.push(obj);
+	this.dict_func[name] = this.sort(arr);
+}
+
 /**
  * 添加动作钩子
  * @param {String} name 钩子名称
@@ -57,6 +83,21 @@ Hook.prototype.addFilter = function(name, func, sort, alias) {
 	this.dict_filter[name] = this.sort(arr);
 }
 
+
+/**
+ * 删除函数钩子
+ * @param {String} name 钩子名称
+ * @param {String} alias 函数别名
+ */
+Hook.prototype.delFunc = function(name, alias) {
+	var arr = this.dict_func[name];
+	if (arr) {
+		arr.del({
+			alias
+		});
+	}
+}
+
 /**
  * 删除动作钩子
  * @param {String} name 钩子名称
@@ -88,16 +129,21 @@ 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);
+			try {
+				ret += o.func(model, ...args);
+			} catch (err) {
+				console.error(ret);
+			}
 		}
 	}
 	return ret;
@@ -107,15 +153,47 @@ 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);
+			try {
+				ret = o.func(ret, model, ...args);
+			} catch (err) {
+				console.error(ret);
+			}
+		}
+	}
+	return ret;
+}
+
+/**
+ * 运行函数钩子
+ * @param {String} name 钩子名称
+ * @param {Object} model 模型
+ * @param {Object} req 请求参数
+ * @param {Object} args 附加参数
+ */
+Hook.prototype.runFunc = async function(name, model, req, ...args) {
+	var ret;
+	var dict = this.dict_func;
+	var list = dict[name];
+	if (list) {
+		for (var i = 0; i < list.length; i++) {
+			var o = list[i];
+			try {
+				ret = o.func(model, req, ...args);
+				if (ret) {
+					ret = await ret;
+				}
+			} catch (err) {
+				console.error(ret);
+			}
 		}
 	}
 	return ret;

package/index.js

@@ -141,7 +141,7 @@ Tpl.prototype.loadFunc = function(m) {
 		return _this.render(body, model, options);
 	}
 	m.hook_action = function(name, ...args) {
-		return $.hook.runAction(name, "", m, ...args);
+		return $.hook.runAction(name, m, ...args);
 	}
 	m.hook_filter = function(name, content, ...args) {
 		if (!content) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.1.8",
+    "version": "2.2.0",
     "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

@@ -11,13 +11,13 @@ const Tpl = require('./index.js');
 // async function test() {
 // 	var tpl = new Tpl();
 // 	// var body = tpl.render("<a>${loop arr value idx} ${idx} ${ value } ${/loop} + 123123</a>", { arr: [123,234] });
-	
+
 // 	var body = tpl.render("<a>${ loop obj value key } ${ key } ${ value } ${/loop} + 123123</a>", { obj: { a: 123, b: 467 } });
-	
+
 // 	// var body = tpl.render("<a><!--[ for(var i = 0; i < arr.length; i++){ ]--> ${ arr[i] } <!--[ } ]--> + 123123</a>", {
 // 	// 	arr: [123, 234]
 // 	// });
-	
+
 // 	// var body = tpl.render("<a>${ each arr } ${ arr[$index] } ${/each} + 123123</a>", { arr: [123,234] });
 // 	// var view = tpl.render("<a>${ each arr } ${ $value } ${/each} + 123123</a>", { arr: [123,234] });
 // 	console.log(body);
@@ -27,10 +27,10 @@ const Tpl = require('./index.js');
 // 	var tpl = new Tpl();
 // 	// 设置全局变量
 // 	$.globalBag.name = "超级美眉Art模板引擎";
-	
+
 // 	// 设置实例化视图变量
 // 	tpl.viewBag.name = "系统名称";
-	
+
 // 	// 渲染视图
 // 	var body = tpl.view("./test.html", { arr: [123,234] });
 // 	console.log(body);
@@ -38,42 +38,55 @@ const Tpl = require('./index.js');
 
 async function test() {
 	var tpl = new Tpl();
-	
+
 	// 设置全局变量
 	$.globalBag.name = "超级美眉Art模板引擎";
-	
+
 	// 设置实例化视图变量
 	tpl.viewBag.name = "系统名称";
 	tpl.current_theme = "game";
 	tpl.dir = "";
+
+	$.hook.addFunc('list', async function(viewBag, req, type) {
+		console.log(viewBag, req, type);
+	});
 	
-	$.hook.addAction('test', function(ret, m) {
-		console.log(m);
+	await $.hook.runFunc('list', tpl.viewBag, {
+		query: {
+			a: 1,
+			b: 2
+		}
+	}, 'article');
+
+	$.hook.addAction('test', function(m, param) {
+		// console.log(param, m);
 		return "<div>你好吗？</div>";
 	}, 2, "测试动作2");
-	
-	$.hook.addAction('test', function(ret) {
+
+	$.hook.addAction('test', function(m, param) {
 		return "<div>你好！</div>";
 	}, 1, "测试动作1");
-	
-	$.hook.addFilter('test', function(ret, m) {
-		console.log(m);
+
+	$.hook.addFilter('test', function(ret, m, param) {
+		// console.log(ret, param, m);
 		return ret.replace("你", "您");
 	}, 1, "测试过滤");
-	
+
 	// $.hook.delAction('test', "测试动作1");
 	// $.hook.delFilter('test', "测试过滤");
-	
+
 	// 渲染视图(并缓存)
-	var body = tpl.view("./test", { arr: [123, 234] }, {
+	var body = tpl.view("./test", {
+		arr: [123, 234]
+	}, {
 		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取
 		cache: false,
 		// 缓存文件名
 		cache_filename: "./test"
 	});
-	
+
 	// 删除指定目录的缓存文件
 	// tpl.clear_cache('./mall');
 	console.log(body);
 }
-test();
+test();