mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 23:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加Pivot对象parent属性

Browse Source
This commit is contained in:
yunwuxin
2017-03-02 16:06:37 +08:00
parent 6d2541585d
commit 0952e9231f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/model/Pivot.php
View File

@@ -16,13 +16,17 @@ use think\Model;
class Pivot extends Model class Pivot extends Model
{ {
/** @var Model */
public $parent;
/** /**
* 构造函数 * 构造函数
* @access public * @access public
* @param Model $parent
* @param array|object $data 数据 * @param array|object $data 数据
* @param string $table 中间数据表名 * @param string $table 中间数据表名
*/ */
public function __construct($data = [], $table = '') public function __construct(Model $parent, $data = [], $table = '')
{ {
if (is_object($data)) { if (is_object($data)) {
$this->data = get_object_vars($data); $this->data = get_object_vars($data);
@@ -30,6 +34,8 @@ class Pivot extends Model
$this->data = $data; $this->data = $data;
} }
$this->parent = $parent;
$this->table = $table; $this->table = $table;
} }

2
library/think/model/relation/BelongsToMany.php
View File

@@ -64,7 +64,7 @@ class BelongsToMany extends Relation
protected function newPivot($data) protected function newPivot($data)
{ {
$pivot = $this->pivot ?: '\\think\\model\\Pivot'; $pivot = $this->pivot ?: '\\think\\model\\Pivot';
return new $pivot($data, $this->middle); return new $pivot($this->parent, $data, $this->middle);
} }
/** /**