mm_machine 1.7.7 → 1.7.8

package/demo/test1/demo.json

@@ -26,7 +26,7 @@
 	/**
 	 * 状态, 0表示未启用, 1表示启用
 	 */
-	"state": 1,
+	"state": 0,
 	/**
 	 * 显示, 0表示不显示, 1表示显示
 	 */

package/demo2/test1/demo.json

@@ -26,7 +26,7 @@
 	/**
 	 * 状态, 0表示未启用, 1表示启用
 	 */
-	"state": 1,
+	"state": 0,
 	/**
 	 * 显示, 0表示不显示, 1表示显示
 	 */

package/index.js

@@ -156,9 +156,6 @@ Item.prototype.loadObj = function(config) {
 	if (f) {
 		var file = f.fullname(this.dir);
 		if (file.hasFile()) {
-			if (!config.state) {
-				return;
-			}
 			var name = config.func_name;
 			var cs = $.require(file, (cs, way) => {
 				if (way == "change" && cs) {
@@ -755,7 +752,7 @@ Index.prototype.run = async function(name, method, ...params) {
 	var result;
 	if (name) {
 		var o = await this.get(name);
-		if (o) {
+		if (o && o.config.state === 1) {
 			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
@@ -770,11 +767,13 @@ Index.prototype.run = async function(name, method, ...params) {
 		var lt = this.list;
 		for (var i = 0; i < lt.length; i++) {
 			var o = lt[i];
-			var ret = o.run(method, ...params);
-			if (util.types.isPromise(ret)) {
-				result = await ret;
-			} else {
-				result = ret;
+			if (o.config.state === 1) {
+				var ret = o.run(method, ...params);
+				if (util.types.isPromise(ret)) {
+					result = await ret;
+				} else {
+					result = ret;
+				}
 			}
 		}
 	}
@@ -792,7 +791,7 @@ Index.prototype.exec = async function(name, method, ...params) {
 	var result;
 	if (name) {
 		var o = await this.get(name);
-		if (o && o.config.state === 1) {
+		if (o) {
 			var ret = o.run(method, ...params);
 			if (util.types.isPromise(ret)) {
 				result = await ret;
@@ -807,13 +806,11 @@ Index.prototype.exec = async function(name, method, ...params) {
 		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;
-				}
+			var ret = o.run(method, ...params);
+			if (util.types.isPromise(ret)) {
+				result = await ret;
+			} else {
+				result = ret;
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_machine",
-    "version": "1.7.7",
+    "version": "1.7.8",
     "description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
     "main": "index.js",
     "scripts": {

package/test.js

@@ -26,7 +26,8 @@ async function demo() {
 	var engine = new Engine();
 	console.info("→ 加载mod");
 	await engine.update("./".fullname(__dirname));
-	// engine.run('demo1', 'init');
+	engine.run('demo1', 'init');
+	engine.exec('demo1', 'init');
 	// engine.run(null, 'init');
 	// console.log("模块数", engine.list.length);