mm_machine 1.5.2 → 1.5.3

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.
Files changed (2) hide show
  1. package/index.js +4 -4
  2. package/package.json +1 -1
package/index.js CHANGED
@@ -126,7 +126,8 @@ Item.prototype.loadObj = function(config) {
126
126
  config = this.config;
127
127
  }
128
128
  else {
129
- config = Object.assign({}, config, this.config);
129
+ this.set_config(config);
130
+ config = this.config;
130
131
  }
131
132
  var f = config.func_file;
132
133
  if (f) {
@@ -245,8 +246,7 @@ Item.prototype.load = function(cg) {
245
246
  } else {
246
247
  config = cg;
247
248
  }
248
- this.set_config(config);
249
- this.loadObj(this.config);
249
+ this.loadObj(config);
250
250
  };
251
251
 
252
252
  /**
@@ -363,8 +363,8 @@ Index.prototype.Drive = Item;
363
363
  */
364
364
  Index.prototype.load_item = function(dir, cg, file) {
365
365
  var drive = new this.Drive(dir);
366
- drive.loadObj(cg);
367
366
  drive.filename = file;
367
+ drive.loadObj(cg);
368
368
  this.list.push(drive);
369
369
  };
370
370
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "mm_machine",
3
- "version": "1.5.2",
3
+ "version": "1.5.3",
4
4
  "description": "这是超级美眉框架机制构建辅助模块,用于快速构建一个机制",
5
5
  "main": "index.js",
6
6
  "scripts": {