Fix override default conf

ruddenchaux · Jul 25, 2018 · 6f7bd2d · 6f7bd2d
1 parent 915f212
commit 6f7bd2d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/dist/vuex-orm.common.js b/dist/vuex-orm.common.js
@@ -6185,7 +6185,8 @@ var Model = /** @class */ (function (_super) {
         }
         else {
             var _onModelconf = this._conf;
-            var _defaultConf = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
+            var _defaultConf = Object.assign({}, defaultConf);
+            _defaultConf.http = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
             this.replaceAllUrlSelf(_defaultConf);
             // instance default conf
             this._conf = new ModelConf(_defaultConf);

diff --git a/dist/vuex-orm.esm.js b/dist/vuex-orm.esm.js
@@ -6183,7 +6183,8 @@ var Model = /** @class */ (function (_super) {
         }
         else {
             var _onModelconf = this._conf;
-            var _defaultConf = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
+            var _defaultConf = Object.assign({}, defaultConf);
+            _defaultConf.http = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
             this.replaceAllUrlSelf(_defaultConf);
             // instance default conf
             this._conf = new ModelConf(_defaultConf);

diff --git a/dist/vuex-orm.js b/dist/vuex-orm.js
@@ -6189,7 +6189,8 @@
             }
             else {
                 var _onModelconf = this._conf;
-                var _defaultConf = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
+                var _defaultConf = Object.assign({}, defaultConf);
+                _defaultConf.http = __assign$10({}, defaultConf.http, ModuleOptions.getDefaultHttpConfig());
                 this.replaceAllUrlSelf(_defaultConf);
                 // instance default conf
                 this._conf = new ModelConf(_defaultConf);

diff --git a/dist/vuex-orm.min.js b/dist/vuex-orm.min.js
diff --git a/lib/model/Model.js b/lib/model/Model.js
diff --git a/lib/model/Model.js.map b/lib/model/Model.js.map
diff --git a/src/model/Model.ts b/src/model/Model.ts
@@ -39,7 +39,8 @@ export default class Model extends BaseModel {
     }
     else {
       const _onModelconf = this._conf as JsonModelConf
-      const _defaultConf = { ...defaultConf.http as any, ...ModuleOptions.getDefaultHttpConfig() }
+      let _defaultConf = Object.assign({}, defaultConf)
+      _defaultConf.http = { ...defaultConf.http as any, ...ModuleOptions.getDefaultHttpConfig() }
 
       this.replaceAllUrlSelf(_defaultConf as JsonModelConf)
       // instance default conf