mm_tpl 2.4.2 → 2.4.4

package/README.md

@@ -61,6 +61,28 @@ const objectResult = tpl.render(`
 `, { 
     obj: { name: "张三", age: 25 } 
 });
+
+// 传统for循环
+const forResult = tpl.render(`
+    <ul>
+        <!--[ for(var i = 0; i < arr.length; i++){ ]-->
+            <li>${arr[i]}</li>
+        <!--[ } ]-->
+    </ul>
+`, {
+    arr: [123, 234]
+});
+
+// each循环
+const eachResult = tpl.render(`
+    <ul>
+        ${each arr}
+            <li>${$value}</li>
+        ${/each}
+    </ul>
+`, {
+    arr: [123, 234]
+});
 ```
 
 ### 4. 视图渲染
@@ -99,6 +121,10 @@ tpl.clear_cache('./views/mall');
 ```javascript
 $.hook.addFunc('list', async function(viewBag, req, type) {
     // 处理列表逻辑
+    var query = req.query;
+    if (query.user_id) {
+        viewBag.user_id = query.user_id;
+    }
     return someData;
 });
 ```
@@ -117,7 +143,7 @@ $.hook.addFilter('content', function(viewBag, content, param) {
 }, 1, "contentFilter");
 ```
 
-#### 使用钩子
+#### 在模板中使用钩子
 ```javascript
 // 运行函数钩子
 await tpl.runFunc('list', {
@@ -151,16 +177,35 @@ tpl.current_theme = "dark";
 ```javascript
 const html = tpl.view("./template.html", data);
 if (tpl.error) {
-    console.error("渲染错误:", tpl.error);
+    $.log.error("渲染错误:", tpl.error);
 }
 ```
 
+### 4. 视图背包操作
+```javascript
+// 设置视图变量
+tpl.set({
+    title: "页面标题",
+    keywords: "关键词"
+});
+
+// 获取视图变量
+const title = tpl.get("title");
+
+// 删除视图变量
+tpl.del("title");
+// 或批量删除
+tpl.del(["title", "keywords"]);
+```
+
 ## 注意事项
 
 1. 确保模板目录具有正确的读写权限
 2. 使用缓存时注意及时清理过期缓存
 3. 钩子的优先级数值越小，执行顺序越靠前
 4. 建议在生产环境开启模板缓存以提高性能
+5. 模板文件查找顺序：diy > current_theme > default_theme
+6. 使用钩子系统时注意处理异步操作
 
 ## 许可证
 

package/cache/test.cache.html

@@ -5,7 +5,7 @@
 		<title>超级美眉Art模板引擎</title>
 	</head>
 	<body>
-		<h5>系统名称测试123</h5>
+		<h5>系统名称</h5>
 		<p>您真的是人才！</p>
 		<p>您真的是人才！</p>
 		<ul>

package/hook.js

@@ -165,7 +165,7 @@ Hook.prototype.runAction = function(name, model, ...args) {
 			try {
 				ret += o.func(model, ...args);
 			} catch (err) {
-				console.error(ret);
+				$.log.error(ret);
 			}
 		}
 	}
@@ -188,7 +188,7 @@ Hook.prototype.runFilter = function(name, model, ret, ...args) {
 			try {
 				ret = o.func(model, ret, ...args);
 			} catch (err) {
-				console.error(ret);
+				$.log.error(ret);
 			}
 		}
 	}
@@ -215,7 +215,7 @@ Hook.prototype.runFunc = async function(name, model, req, ...args) {
 					ret = await ret;
 				}
 			} catch (err) {
-				console.error(ret);
+				$.log.error(ret);
 			}
 		}
 	}

package/index.js

@@ -1,4 +1,4 @@
-require('mm_expand');
+require('mm_logs');
 const template = require('art-template');
 const Hook = require('./hook.js');
 const {
@@ -55,7 +55,7 @@ class Tpl {
 		this.viewBag = {};
 
 		// 修改配置
-		this.set_config(config);
+		this.setConfig(config);
 
 		/**
 		 * 模板根目录
@@ -89,7 +89,7 @@ class Tpl {
  * 修改配置
  * @param {Object} config 配置参数
  */
-Tpl.prototype.set_config = function(config) {
+Tpl.prototype.setConfig = function(config) {
 	if (config) {
 		this.config = Object.assign(this.config, config);
 	}
@@ -125,7 +125,7 @@ Tpl.prototype.init_before = function(config) {}
  * @param {Object} config 配置参数
  */
 Tpl.prototype.init_main = function(config) {
-	this.set_config(config);
+	this.setConfig(config);
 }
 
 /**
@@ -291,7 +291,7 @@ Tpl.prototype.render_after = function(body, model, options) {
  * @param {Object} options 配置参数
  * @return {String} view 渲染后的视图
  */
-Tpl.prototype.render_sub = function(body, model, options) {
+Tpl.prototype.renderSub = function(body, model, options) {
 	var ret = this.render_before(body, model, options);
 	if (!ret) {
 		ret = this.render_main(body, model, options);
@@ -311,7 +311,7 @@ Tpl.prototype.render_sub = function(body, model, options) {
  */
 Tpl.prototype.render = function(body, model, options) {
 	body = this.change(body);
-	body = this.render_sub(body, model, options);
+	body = this.renderSub(body, model, options);
 	return this.change(body, true);
 };
 
@@ -362,7 +362,7 @@ Tpl.prototype.view = function(file, model, options) {
 	var body = f.loadText();
 	if (body) {
 		body = this.change(body);
-		body = this.render_sub(body, model, options);
+		body = this.renderSub(body, model, options);
 		body = this.change(body, true);
 		return body;
 	} else {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.4.2",
+    "version": "2.4.4",
     "description": "这是超级美眉模板帮助类模块，用于MVC模式下的视图渲染",
     "main": "index.js",
     "scripts": {
@@ -9,7 +9,7 @@
     },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/qiuwenwu/mm_tpl.git"
+        "url": "git+https://gitee.com/qiuwenwu91/mm_tpl.git"
     },
     "keywords": [
         "mvc",
@@ -23,11 +23,11 @@
     "author": "邱文武",
     "license": "ISC",
     "bugs": {
-        "url": "https://github.com/qiuwenwu/mm_tpl/issues"
+        "url": "https://gitee.com/qiuwenwu91/mm_tpl/issues"
     },
-    "homepage": "https://github.com/qiuwenwu/mm_tpl#readme",
+    "homepage": "https://gitee.com/qiuwenwu91/mm_tpl#readme",
     "dependencies": {
-        "art-template": "^4.13.2",
-        "mm_expand": "^1.7.9"
+        "art-template": "^4.13.4",
+        "mm_logs": "^1.5.3"
     }
 }

package/template/defualt/test.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

@@ -10,7 +10,7 @@ async function test() {
 	var body = tpl.render("<a>${test} + 123123</a>", {
 		test: 123
 	});
-	console.log(body);
+	$.log.debug(body);
 }
 
 /**
@@ -34,7 +34,7 @@ async function test() {
 	// each循环示例
 	// 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);
+	$.log.debug(body);
 }
 
 /**
@@ -43,7 +43,7 @@ async function test() {
  * @async
  */
 async function test() {
-	console.log("测试开始")
+	$.log.debug("测试开始")
 	var tpl = new Tpl();
 	// 设置全局变量
 	$.globalBag.name = "超级美眉Art模板引擎";
@@ -53,8 +53,8 @@ async function test() {
 
 	// 渲染视图
 	var body = tpl.view("./test.html", { arr: [123,234] });
-	console.log(tpl.error);
-	console.log(body);
+	$.log.debug(tpl.error);
+	$.log.debug(body);
 }
 
 /**
@@ -82,7 +82,7 @@ async function test() {
 		if (query.project_id) {
 			m.project_id = query.project_id;
 		}
-		console.log("列表", m);
+		$.log.debug("列表", m);
 	});
 
 	// 添加动作钩子
@@ -96,7 +96,7 @@ async function test() {
 
 	// 添加过滤器钩子
 	$.hook.addFilter('test', function(m, ret, param) {
-		console.log("测试", ret);
+		$.log.debug("测试", ret);
 		return ret.replace("你", "您");
 	}, 1, "测试过滤");
 
@@ -125,7 +125,7 @@ async function test() {
 	});
 	// 删除指定目录下的缓存文件
 	// tpl.clear_cache('./mall');
-	console.log(body);
+	$.log.debug(body);
 }
 
 // 执行测试

package/tpl_rule.js

@@ -51,7 +51,7 @@ var artRule = {
 
 		// 旧版语法升级提示
 		var warn = function warn(oldSyntax, newSyntax) {
-			console.warn((options.filename || 'anonymous') + ':' + (match.line + 1) + ':' + (match.start + 1) + '\n' + (
+			$.log.warn((options.filename || 'anonymous') + ':' + (match.line + 1) + ':' + (match.start + 1) + '\n' + (
 				'Template upgrade: ${' + oldSyntax + '} -> ${' + newSyntax + '}'));
 		};