Merge pull request #406 from yhanwen/patch-1

fix: can't set custom model
thinkjs · Jul 29, 2016 · 97da142 · 97da142
2 parents d4191d3 + fd89894
commit 97da142
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/model/relation.js b/src/model/relation.js
@@ -155,6 +155,9 @@ export default class extends think.model.base {
 
       switch(item.type){
         case think.model.BELONG_TO:
+          if(item.model) {
+            delete item.model;
+          }
           opts = think.extend(opts, {
             key: opts.model.getModelName() + '_id',
             fKey: 'id' 
@@ -535,4 +538,4 @@ export default class extends think.model.base {
     await Promise.all(promises);
     return ids;
   }
-}
+}