mm_machine 1.4.3 → 1.4.6

package/index.js

@@ -3,8 +3,7 @@
  * @author <a href="http://qww.elins.cn">邱文武</a>
  * @version 1.2
  */
-
-require('mm_expand');
+var conf = require('mm_config');
 
 const fs = require('fs');
 
@@ -62,9 +61,9 @@ class Item {
 			 */
 			"sort": 10,
 			/**
-			 * 开关, true表示开启，false表示关闭
+			 * 状态, 1表示开启，0表示未开启
 			 */
-			"switch": true
+			"state": 1
 		};
 
 		/**
@@ -74,6 +73,14 @@ class Item {
 	}
 }
 
+/**
+ * 设置配置
+ * @param {Object} config 配置
+ */
+Item.prototype.set_config = function(config){
+	this.config = conf(Object.assign(this.config, config || {}));
+}
+
 /**
  * @description 加载完成时
  */
@@ -106,16 +113,15 @@ Item.prototype.remove_module = function(module) {
  * @description 加载配置对象
  * @param {Object} obj 配置对象
  */
-Item.prototype.loadObj = function(obj) {
-	$.push(this.config, obj, true);
-	var f = this.config.func_file;
+Item.prototype.loadObj = function(config) {
+	var f = config.func_file;
 	if (f) {
 		var file = f.fullname(this.dir);
 		if (file.hasFile()) {
 			this.remove_module(file);
 			var cs = require(file);
 			if (cs) {
-				var name = this.config.func_name;
+				var name = config.func_name;
 				if (name) {
 					this.main = cs[name];
 				} else {
@@ -151,6 +157,10 @@ Item.prototype.loadFile = function(file) {
 		obj = text.toJson();
 	} else {
 		this.new_config(f);
+		var text = f.loadText();
+		if (text) {
+			obj = text.toJson();
+		}
 	}
 	this.filename = f;
 	return obj;
@@ -212,16 +222,14 @@ Item.prototype.removeFile = function() {
  * @param {Object|String} cg 配置对象或配置路径
  */
 Item.prototype.load = function(cg) {
-	var obj;
-	if (!cg) {
-		cg = this.extensions;
-	}
+	var config;
 	if (typeof(cg) === "string") {
-		obj = this.loadFile(cg);
+		config = this.loadFile(cg);
 	} else {
-		obj = cg;
+		config = cg;
 	}
-	this.loadObj(obj);
+	this.set_config(config);
+	this.loadObj(config);
 };
 
 /**
@@ -569,4 +577,4 @@ Index.prototype.load_file = function(file) {
 /**
  * @module 导出Index类
  */
-exports.Index = Index;
+exports.Index = Index;

package/package.json

@@ -1,34 +1,34 @@
-{
-    "name": "mm_machine",
-    "version": "1.4.3",
-    "description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
-    "main": "index.js",
-    "scripts": {
-        "test": "node test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/qiuwenwu/mm_machine.git"
-    },
-    "keywords": [
-        "common",
-        "com",
-        "run",
-        "cmd",
-        "load",
-        "save",
-        "get",
-        "set",
-        "add",
-        "del"
-    ],
-    "author": "邱文武",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://github.com/qiuwenwu/mm_machine/issues"
-    },
-    "homepage": "https://github.com/qiuwenwu/mm_machine#readme",
-    "dependencies": {
-        "mm_expand": "^1.4.7"
-    }
-}
+{
+    "name": "mm_machine",
+    "version": "1.4.6",
+    "description": "这是超级美眉框架机制构建辅助模块，用于快速构建一个机制",
+    "main": "index.js",
+    "scripts": {
+        "test": "node test.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/qiuwenwu/mm_machine.git"
+    },
+    "keywords": [
+        "common",
+        "com",
+        "run",
+        "cmd",
+        "load",
+        "save",
+        "get",
+        "set",
+        "add",
+        "del"
+    ],
+    "author": "邱文武",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://github.com/qiuwenwu/mm_machine/issues"
+    },
+    "homepage": "https://github.com/qiuwenwu/mm_machine#readme",
+    "dependencies": {
+        "mm_config": "^1.0.2"
+    }
+}