mm_tpl 2.2.2 → 2.2.4

package/cache/test.cache.html

@@ -9,6 +9,7 @@
 		<div><div class="bar_user"><div>您好吗？</div><div>你好！</div>
 	<div>用户ID：1</div>
 	<div>当前项目ID：2</div>
+	<div>hello world！</div>
 </div>
 
 <div class="bar">导航栏</div>

package/index.js

@@ -1,4 +1,4 @@
-require('mm_expand');
+require('mm_expand');
 const template = require('art-template');
 const Hook = require('./hook.js');
 const {
@@ -35,8 +35,8 @@ class Tpl {
 		 */
 		this.config = {
 			root: $.runPath + '',
-			defualt_dir: "./template/",
-			defualt_theme: 'defualt',
+			default_dir: "./template/",
+			default_theme: 'default',
 			extname: ".html",
 			rules: [nativeRule, artRule, htmlRule, jsRule, pyRule, pyRule2],
 			cache_root: './cache'.fullname(),
@@ -64,7 +64,7 @@ class Tpl {
 		/**
 		 * 当前主题
 		 */
-		this.current_theme = this.config.defualt_theme;
+		this.current_theme = this.config.default_theme;
 
 		/**
 		 * 错误提示
@@ -146,10 +146,10 @@ Tpl.prototype.render_before = function(body, model, options) {
 Tpl.prototype.loadFunc = function(m) {
 	var _this = this;
 	m.view = function(file, model, options) {
-		return _this.view(file, model, options);
+		return _this.view(file, Object.assign({}, m, model), options);
 	}
 	m.render = function(body, model, options) {
-		return _this.render(body, model, options);
+		return _this.render(body, Object.assign({}, m, model), options);
 	}
 	m.hook_action = function(name, ...args) {
 		return $.hook.runAction(name, m, ...args);
@@ -248,11 +248,11 @@ Tpl.prototype.view = function(file, model, options) {
 	}
 	var f = file.fullname(this.dir + this.current_theme);
 	if (!f.hasFile()) {
-		f = file.fullname(this.dir + this.config.defualt_theme);
+		f = file.fullname(this.dir + this.config.default_theme);
 		if (!f.hasFile()) {
-			f = file.fullname(this.config.defualt_dir + this.current_theme);
+			f = file.fullname(this.config.default_dir + this.current_theme);
 			if (!f.hasFile()) {
-				f = file.fullname(this.config.defualt_dir + this.config.defualt_theme);
+				f = file.fullname(this.config.default_dir + this.config.default_theme);
 			}
 		}
 	}

package/package.json

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

package/template/game/bar.html

@@ -2,6 +2,7 @@
 	${@hook_filter('test', hook_action('test', '好的'), '真的')}
 	<div>用户ID：${viewBag.user_id}</div>
 	<div>当前项目ID：${viewBag.project_id}</div>
+	<div>${message}</div>
 </div>
 
 <div class="bar">导航栏</div>

package/test.js

@@ -84,7 +84,8 @@ async function test() {
 
 	// 渲染视图(并缓存)
 	var body = tpl.view("./test", {
-		arr: [123, 234]
+		arr: [123, 234],
+		message: "hello world！"
 	}, {
 		// 是否读取缓存文件, 如果为false, 但有cache_filename, 表示只保存缓存，但不读取
 		cache: false,