mm_machine 1.8.2 → 1.8.4

package/demo/test1/demo.json

@@ -30,16 +30,5 @@
 	/**
 	 * 显示, 0表示不显示, 1表示显示
 	 */
-	"show": 0,
-	/**
-	 * 增加配置
-	 */
-	"options": [{
-		"name": "demo1",
-		"title": "示例1",
-		"description": "示例1",
-		"sort": 10,
-		"state": 0,
-		"show": 0,
-	}]
+	"show": 0
 }

package/index.js

@@ -201,14 +201,16 @@ Item.prototype.loadFile = function(file) {
 	var obj;
 	var f = file.fullname(this.dir);
 	var text = f.loadText();
-	if (text) {
-		obj = text.toJson();
-	} else {
+	if (!text) {
 		this.new_config(f);
-		var text = f.loadText();
-		if (text) {
-			obj = text.toJson();
-		}
+		text = f.loadText();
+	}
+	if (text) {
+		obj = $.loadJson(f, (mod) => {
+			if (mod) {
+				this.set_config(mod);
+			}
+		});
 	}
 	this.filename = f;
 	return obj;
@@ -460,9 +462,11 @@ Index.prototype.load_list = function(list) {
 		var obj;
 		if (_this.mode) {
 			obj = $.loadJson(file, function(config) {
-				var plug = _this.get(config.name);
-				if (plug) {
-					plug.set_config(config);
+				if (config.name) {
+					var plug = _this.get(config.name);
+					if (plug) {
+						plug.set_config(config);
+					}
 				}
 			});
 		} else {
@@ -494,8 +498,9 @@ Index.prototype.load_list = function(list) {
 /**
  * 加载配置
  * @param {String} path 检索路径
+ * @param {Boolean} accurate 精准路径，默认为false
  */
-Index.prototype.load = function(path) {
+Index.prototype.load = function(path, accurate) {
 	if (path) {
 		if (!ph.isAbsolute(path)) {
 			path = ph.join('app', path);
@@ -503,15 +508,20 @@ Index.prototype.load = function(path) {
 	} else {
 		path = './app/';
 	}
-
-	// 获取所有应用路径
-	var search_dir;
-	if (this.scope && this.scope !== $.val.scope) {
-		search_dir = this.type + '_' + this.scope;
-	} else {
-		search_dir = this.type;
+	var list_scope = [];
+	if (!accurate) {
+		// 获取所有应用路径
+		var search_dir;
+		if (this.scope && this.scope !== $.val.scope) {
+			search_dir = this.type + '_' + this.scope;
+		} else {
+			search_dir = this.type;
+		}
+		list_scope = $.dir.getAll(path, search_dir);
+	}
+	else {
+		list_scope = $.dir.getAll(path);
 	}
-	var list_scope = $.dir.getAll(path, search_dir);
 
 	// 遍历目录路径
 	list_scope.map((f) => {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mm_machine",
-	"version": "1.8.2",
+	"version": "1.8.4",
 	"description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
 	"main": "index.js",
 	"scripts": {
@@ -30,7 +30,7 @@
 	},
 	"homepage": "https://github.com/qiuwenwu/mm_machine#readme",
 	"dependencies": {
-		"mm_config": "^1.1.3",
-		"mm_hot_reload": "^1.0.4"
+		"mm_config": "^1.1.4",
+		"mm_hot_reload": "^1.0.5"
 	}
 }

package/test.js

@@ -30,6 +30,11 @@ async function demo() {
 	await engine.exec('demo1', 'init');
 	await engine.run(null, 'main');
 	await engine.exec(null, 'main');
+
+	var plug = engine.get('demo1');
+	if (plug) {
+		plug.loadFile(plug.filename);
+	}
 	// console.log("模块数", engine.list.length);
 
 	// var i = 0;
@@ -76,7 +81,7 @@ async function demo() {
 	// 	text = text.replace("1234567", "7654321");
 	// 	file.saveText(text);
 	// }, 26000)
-	
+
 	setInterval(() => {
 		var plug = engine.get("demo1");
 		console.log("查看变化", plug);