archive-gh-me/thinkjs
1
0
Fork 0
mirror of https://github.com/thinkjs/thinkjs.git synced 2026-01-25 14:42:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix can not change key & fKey when relation type is belong to

Browse Source
This commit is contained in:
lichengyin 2016-03-23 17:22:05 +08:00
parent fc878943b2
commit d1601cc910
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/model/relation.js
View File

@ -155,6 +155,10 @@ export default class extends think.model.base {
switch(item.type){
case think.model.BELONG_TO:
opts = think.extend(opts, {
key: opts.model.getModelName() + '_id',
fKey: 'id'
}, item);
return this._getBelongsToRelation(data, opts, options);
case think.model.HAS_MANY:
return this._getHasManyRelation(data, opts, options);
@ -188,8 +192,6 @@ export default class extends think.model.base {
* @return {Promise} []
*/
async _getBelongsToRelation(data, mapOpts/*, options*/){
mapOpts.key = mapOpts.model.getModelName() + '_id';
mapOpts.fKey = await mapOpts.model.getPk();
let where = this.parseRelationWhere(data, mapOpts);
let mapData = await mapOpts.model.where(where).select();
return this.parseRelationData(data, mapData, mapOpts);