mm_machine 1.7.3 → 1.7.5

package/index.js

@@ -752,13 +752,15 @@ Index.prototype.reload = function(name) {
  * @return {Object} 执行结果
  */
 Index.prototype.run = async function(name, method, ...params) {
-	var ret;
+	var result;
 	if (name) {
 		var o = await this.get(name);
 		if (o) {
-			ret = o.run(method, params);
+			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
-				ret = await ret;
+				result = await ret;
+			} else {
+				result = ret;
 			}
 			if (this.mode) {
 				o.reload();
@@ -768,15 +770,57 @@ Index.prototype.run = async function(name, method, ...params) {
 		var lt = this.list;
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
-			ret = o.run(method, params);
+			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
-				ret = await ret;
+				result = await ret;
+			} else {
+				result = ret;
 			}
 		}
 	}
-	return ret;
+	return result;
 };
 
+/**
+ * 执行方法
+ * @param {String} name 插件名称
+ * @param {String} method 方法名称
+ * @param {Object} option 配置参数
+ * @return {String} 执行结果
+ */
+Index.prototype.exec = function(name, method, ...params) {
+	var result;
+	if (name) {
+		var o = await this.get(name);
+		if (o && o.config.state === 1) {
+			var ret = o.run(method, ...params);
+			if (util.types.isPromise(ret)) {
+				result = await ret;
+			} else {
+				result = ret;
+			}
+			if (this.mode) {
+				o.reload();
+			}
+		}
+	} else if (name === null) {
+		var lt = this.list;
+		for (var i = 0; i < lt.length; i++) {
+			var o = lt[i];
+			if (o.config.state === 1) {
+				var ret = o.run(method, ...params);
+				if (util.types.isPromise(ret)) {
+					result = await ret;
+				} else {
+					result = ret;
+				}
+			}
+		}
+	}
+	return result;
+};
+
+
 /**
  * @module 导出Index类
  */

package/package.json

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

package/test.js

@@ -28,8 +28,6 @@ async function demo() {
 	await engine.update("./".fullname(__dirname));
 
 	engine.run(null, 'init');
-	engine.run(undefined, 'init');
-	return
 	console.log("模块数", engine.list.length);
 
 	var i = 0;