mm_machine 1.4.5 → 1.4.6

package/index.js

@@ -78,7 +78,7 @@ class Item {
  * @param {Object} config 配置
  */
 Item.prototype.set_config = function(config){
-	this.config = conf(Object.assign(this.config, config));
+	this.config = conf(Object.assign(this.config, config || {}));
 }
 
 /**
@@ -113,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 {
@@ -158,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;
@@ -219,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);
 };
 
 /**

package/package.json

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