mm_tpl 2.1.4 → 2.1.6

package/cache/test.cache.html

@@ -5,23 +5,13 @@
 		<title>超级美眉Art模板引擎</title>
 	</head>
 	<body>
-		<h5>系统名称</h5>
-		<ul>
-			<li>123</li>
-			<li>234</li>
-		</ul>
-		<ul>
-			<li>123</li>
-			<li>234</li>
-		</ul>
-		<ul>
-			<li>123</li>
-			<li>234</li>
-		</ul>
-		<script type="text/javascript">
-			var a_0 =123;
-			var a_1 =234;
-		</script>系统名称计算
-		123123'priceNIHAO'#计算
+		<div>游戏主题</div>
+		<div><div class="bar_user"><div>您好吗？</div><div>你好！</div></div>
+<div class="bar">导航栏</div>
+<style>
+	.bar {
+		font-weight: 800;
+	}
+</style></div>
 	</body>
 </html>

package/hook.js

@@ -0,0 +1,124 @@
+class Hook {
+	constructor() {
+		this.dict_action = {};
+		this.dict_filter = {};
+	}
+}
+
+/**
+ * 排序
+ * @param {Array} list 钩子列表
+ */
+Hook.prototype.sort = function(list) {
+	return list.sort((o1, o2) => {
+		return o2.sort - o1.sort
+	});
+}
+
+/**
+ * 添加动作钩子
+ * @param {String} name 钩子名称
+ * @param {Function} func 钩子函数
+ * @param {Number} sort 执行顺序
+ * @param {String} alias 函数别名，用于删除
+ */
+Hook.prototype.addAction = function(name, func, sort, alias) {
+	var obj = {
+		func,
+		sort,
+		alias
+	}
+	var arr = this.dict_action[name];
+	if (!arr) {
+		arr = [];
+	}
+	arr.push(obj);
+	this.dict_action[name] = this.sort(arr);
+}
+
+/**
+ * 添加过滤钩子
+ * @param {String} name 钩子名称
+ * @param {Function} func 钩子函数
+ * @param {Number} sort 执行顺序
+ * @param {String} alias 函数别名，用于删除
+ */
+Hook.prototype.addFilter = function(name, func, sort, alias) {
+	var obj = {
+		func,
+		sort,
+		alias
+	}
+	var arr = this.dict_filter[name];
+	if (!arr) {
+		arr = [];
+	}
+	arr.push(obj);
+	this.dict_filter[name] = this.sort(arr);
+}
+
+/**
+ * 删除动作钩子
+ * @param {String} name 钩子名称
+ * @param {String} alias 函数别名
+ */
+Hook.prototype.delAction = function(name, alias) {
+	var arr = this.dict_action[name];
+	if (arr) {
+		arr.del({
+			alias
+		});
+	}
+}
+
+/**
+ * 删除过滤钩子
+ * @param {String} name 钩子名称
+ * @param {String} alias 函数别名
+ */
+Hook.prototype.delFilter = function(name, alias = "") {
+	var arr = this.dict_filter[name];
+	if (arr) {
+		arr.del({
+			alias
+		});
+	}
+}
+
+/**
+ * 运行动作钩子
+ * @param {String} name 钩子名称
+ * @param {Object} ret 结果
+ * @param {Object} args 附加参数
+ */
+Hook.prototype.runAction = function(name, ret, ...args) {
+	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);
+		}
+	}
+	return ret;
+}
+
+/**
+ * 运行过滤钩子
+ * @param {String} name 钩子名称
+ * @param {Object} ret 结果
+ * @param {Object} args 附加参数
+ */
+Hook.prototype.runFilter = function(name, 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];
+			ret = o.func(ret, ...args);
+		}
+	}
+	return ret;
+}
+
+module.exports = Hook;

package/index.js

@@ -1,5 +1,6 @@
 require('mm_expand');
 const template = require('art-template');
+const Hook = require('./hook.js');
 const {
 	nativeRule,
 	artRule,
@@ -13,6 +14,10 @@ if (!$.globalBag) {
 	$.globalBag = {};
 }
 
+if (!$.hook) {
+	$.hook = new Hook();
+}
+
 /**
  * 模板类
  * @class
@@ -30,6 +35,8 @@ class Tpl {
 		 */
 		this.config = {
 			root: $.runPath + '',
+			defualt_dir: "./template/",
+			defualt_theme: 'defualt',
 			extname: ".html",
 			rules: [nativeRule, artRule, htmlRule, jsRule, pyRule, pyRule2],
 			cache_root: './cache'.fullname(),
@@ -48,16 +55,26 @@ class Tpl {
 
 		// 修改配置
 		this.set_config(config);
-		
+
 		/**
-		 * 模板更目录
+		 * 模板根目录
 		 */
 		this.dir = "./template/";
-		
+
+		/**
+		 * 当前主题
+		 */
+		this.current_theme = this.config.defualt_theme;
+
 		/**
 		 * 错误提示
 		 */
 		this.error = null;
+		
+		/**
+		 * 初始化
+		 */
+		this.init(config);
 	}
 }
 
@@ -78,6 +95,14 @@ Tpl.prototype.set_config = function(config) {
 	}
 };
 
+/**
+ * 初始化
+ * @param {Object} config 配置参数
+ */
+Tpl.prototype.init = function(config) {
+	this.set_config(config);
+}
+
 /**
  * 渲染模板(之前)
  * @param {String} body 模板
@@ -103,6 +128,33 @@ Tpl.prototype.render_before = function(body, model, options) {
 	return ret;
 };
 
+/**
+ * 加载函数
+ * @param {Object} m 模型
+ */
+Tpl.prototype.loadFunc = function(m) {
+	var _this = this;
+	m.view = function(file, model, options) {
+		return _this.view(file, model, options);
+	}
+	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_filter = function(name, content, ...args) {
+		if (!content) {
+			content = "";
+		}
+		return $.hook.runFilter(name, content, ...args);
+	}
+	return m;
+}
+
 /**
  * 渲染模板(主要)
  * @param {String} body 模板
@@ -113,10 +165,12 @@ Tpl.prototype.render_before = function(body, model, options) {
 Tpl.prototype.render_main = function(body, model, options) {
 	var ret = "";
 	if (body) {
-		ret = template.render(body, Object.assign({}, {
+		var m = Object.assign({}, {
 			viewBag: this.viewBag,
 			globalBag: $.globalBag
-		}, model), options);
+		}, model);
+		this.loadFunc(m);
+		ret = template.render(body, m, options);
 	}
 	return ret;
 };
@@ -184,8 +238,18 @@ Tpl.prototype.view = function(file, model, options) {
 	if (file.replace('./', '').indexOf('.') === -1 && !file.endWith(this.config.extname)) {
 		file += this.config.extname;
 	}
-	var f = file.fullname(this.dir);
-	if(!f.hasFile()){
+	var f = file.fullname(this.dir + this.current_theme);
+	if (!f.hasFile()) {
+		f = file.fullname(this.dir + this.config.defualt_theme);
+		if (!f.hasFile()) {
+			f = file.fullname(this.defualt_dir + this.config.current_theme);
+			if (!f.hasFile()) {
+				f = file.fullname(this.defualt_dir + this.config.defualt_theme);
+			}
+		}
+	}
+
+	if (!f.hasFile()) {
 		this.error = {
 			code: 10000,
 			message: f + "文件不存在！"
@@ -194,8 +258,7 @@ Tpl.prototype.view = function(file, model, options) {
 	var body = f.loadText();
 	if (body) {
 		return this.render(body, model, options);
-	}
-	else {
+	} else {
 		return "";
 	}
 };
@@ -256,4 +319,4 @@ if (global.$) {
 	$.tpl = new Tpl();
 }
 
-module.exports = Tpl;
+module.exports = Tpl;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.1.4",
+    "version": "2.1.6",
     "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.1"
+        "mm_expand": "^1.5.5"
     }
 }

package/template/game/bar.html

@@ -0,0 +1,7 @@
+<div class="bar_user">${@hook_filter('test', hook_action('test'))}</div>
+<div class="bar">导航栏</div>
+<style>
+	.bar {
+		font-weight: 800;
+	}
+</style>

package/template/game/test.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset="utf-8">
+		<title>${globalBag.name}</title>
+	</head>
+	<body>
+		<div>游戏主题</div>
+		<div>${@view('./bar.html')}</div>
+	</body>
+</html>

package/test.js

@@ -44,6 +44,24 @@ async function test() {
 	
 	// 设置实例化视图变量
 	tpl.viewBag.name = "系统名称";
+	tpl.current_theme = "game";
+	tpl.dir = "";
+	
+	$.hook.addAction('test', (ret) => {
+		return "<div>你好吗？</div>";
+	}, 2, "测试动作2");
+	
+	$.hook.addAction('test', (ret) => {
+		return "<div>你好！</div>";
+	}, 1, "测试动作1");
+	
+	$.hook.addFilter('test', (ret) => {
+		return ret.replace("你", "您");
+	}, 1, "测试过滤");
+	
+	// $.hook.delAction('test', "测试动作1");
+	// $.hook.delFilter('test', "测试过滤");
+	
 	// 渲染视图(并缓存)
 	var body = tpl.view("./test", { arr: [123, 234] }, {
 		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取