mm_tpl 2.2.6 → 2.2.8

package/cache/test.cache.html

@@ -6,6 +6,7 @@
 	</head>
 	<body>
 		<h5>系统名称</h5>
+		<p>您真的是人才！</p>
 		<ul>
 			<li>123</li>
 			<li>234</li>

package/hook.js

@@ -175,18 +175,18 @@ Hook.prototype.runAction = function(name, model, ...args) {
 /**
  * 运行过滤钩子
  * @param {String} name 钩子名称
- * @param {Object} ret 结果
  * @param {Object} model 模型
+ * @param {Object} ret 结果
  * @param {Object} args 附加参数
  */
-Hook.prototype.runFilter = function(name, ret, model, ...args) {
+Hook.prototype.runFilter = function(name, model, ret, ...args) {
 	var dict = this.dict_filter;
 	var list = dict[name];
 	if (list) {
 		for (var i = 0; i < list.length; i++) {
 			var o = list[i];
 			try {
-				ret = o.func(ret, model, ...args);
+				ret = o.func(model, ret, ...args);
 			} catch (err) {
 				console.error(ret);
 			}

package/index.js

@@ -158,7 +158,7 @@ Tpl.prototype.loadFunc = function(m) {
 		if (!content) {
 			content = "";
 		}
-		return $.hook.runFilter(name, content, m, ...args);
+		return $.hook.runFilter(name, m, content, ...args);
 	}
 	return m;
 }

package/package.json

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

package/template/diy/ad.html

@@ -6,6 +6,7 @@
 	</head>
 	<body>
 		<h5>${viewBag.name}</h5>
+		<p>${@hook_filter('test', '你真的是人才！')}</p>
 		<ul>
 			${loop arr value idx}
 			<li>${ value }</li>

package/test.js

@@ -55,7 +55,7 @@ async function test() {
 		if (query.project_id) {
 			m.project_id = query.project_id;
 		}
-		console.log(m);
+		console.log("列表", m);
 	});
 
 	$.hook.addAction('test', function aa(m, param) {
@@ -67,13 +67,14 @@ async function test() {
 		return "<div>你好！</div>";
 	}, 1, "测试动作1");
 
-	$.hook.addFilter('test', function(ret, m, param) {
-		// console.log(ret, param, m);
+	$.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.delAction('test', "aa");
+	$.hook.delAction('test', "测试动作1");
 	// $.hook.delFilter('test', "测试过滤");
 
 	await tpl.runFunc('list', {