mm_tpl 2.5.3 → 2.5.5

package/index.js

@@ -33,7 +33,7 @@ class Tpl extends Base {
 		/**
 		 * 默认模板目录
 		 */
-		default_dir: "./template/",
+		default_dir: "./static/template/",
 		/**
 		 * 默认主题
 		 */
@@ -79,7 +79,7 @@ class Tpl extends Base {
 		/**
 		 * 模板根目录
 		 */
-		this.dir = './template/';
+		this.dir = './static/template/';
 
 		/**
 		 * 当前主题
@@ -357,13 +357,14 @@ Tpl.prototype.compile = function (body, options) {
 };
 
 /**
- * 渲染模板文件
+ * 获取模板文件
  * @param {string} file - 模板文件路径
- * @param {Object} model - 数据模型
- * @param {Object} options - 配置参数
- * @returns {string} 渲染结果
+ * @returns {string} 模板文件路径
  */
-Tpl.prototype.view = function (file, model, options) {
+Tpl.prototype.getFile = function (file) {
+	if (typeof (file) !== 'string') {
+		throw new Error('模板文件路径必须是字符串');
+	}
 	if (file.replace('./', '').indexOf('.') === -1 && !file.endsWith(this.config.extname)) {
 		file += this.config.extname;
 	}
@@ -383,13 +384,23 @@ Tpl.prototype.view = function (file, model, options) {
 			}
 		}
 	}
+	return f;
+};
 
+/**
+ * 渲染模板文件
+ * @param {string} file - 模板文件路径
+ * @param {Object} model - 数据模型
+ * @param {Object} options - 配置参数
+ * @returns {string} 渲染结果
+ */
+Tpl.prototype.view = function (file, model, options) {
+	var f = this.getFile(file);
 	if (!f.hasFile()) {
 		this.error = {
 			code: 10000,
 			message: f + "文件不存在！"
 		};
-		this.log('error', '渲染模板文件失败', this.error);
 	}
 	else {
 		var body = f.loadText();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_tpl",
-    "version": "2.5.3",
+    "version": "2.5.5",
     "description": "Super Meimei Template Engine - High-performance template engine based on art-template with MVC pattern, hook system, theme switching and caching mechanism",
     "main": "index.js",
     "scripts": {
@@ -34,7 +34,7 @@
     "homepage": "https://gitee.com/qiuwenwu91/mm_tpl#readme",
     "dependencies": {
         "art-template": "^4.13.4",
-        "mm_expand": "^2.2.9"
+        "mm_expand": "^2.3.1"
     },
     "engines": {
         "node": ">=12.0.0"