mm_machine 1.4.9 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.js +7 -1
- package/package.json +1 -1
package/index.js
CHANGED
|
@@ -78,7 +78,7 @@ class Item {
|
|
|
78
78
|
* @param {Object} config 配置
|
|
79
79
|
*/
|
|
80
80
|
Item.prototype.set_config = function(config){
|
|
81
|
-
this.config = conf(Object.assign(this.config, config || {}));
|
|
81
|
+
this.config = conf(Object.assign({}, this.config, config || {}));
|
|
82
82
|
}
|
|
83
83
|
|
|
84
84
|
/**
|
|
@@ -114,6 +114,12 @@ Item.prototype.remove_module = function(module) {
|
|
|
114
114
|
* @param {Object} obj 配置对象
|
|
115
115
|
*/
|
|
116
116
|
Item.prototype.loadObj = function(config) {
|
|
117
|
+
if(!config){
|
|
118
|
+
config = this.config;
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
config = Object.assign({}, config, this.config);
|
|
122
|
+
}
|
|
117
123
|
var f = config.func_file;
|
|
118
124
|
if (f) {
|
|
119
125
|
var file = f.fullname(this.dir);
|