1、tp内核更新

2、时间格式bug更新
2017-01-26 23:45:27 +08:00
parent 109cf819be
commit bcad70a714
35 changed files with 1233 additions and 654 deletions
--- a/core/library/think/model/relation/BelongsTo.php
+++ b/core/library/think/model/relation/BelongsTo.php
@@ -11,6 +11,7 @@

 namespace think\model\relation;

+use think\Loader;
 use think\Model;

 class BelongsTo extends OneToOne
@@ -22,29 +23,32 @@ class BelongsTo extends OneToOne
     * @param string $model 模型名
     * @param string $foreignKey 关联外键
     * @param string $localKey 关联主键
-     * @param array  $alias 别名定义
     * @param string $joinType JOIN类型
     */
-    public function __construct(Model $parent, $model, $foreignKey, $localKey, $alias = [], $joinType = 'INNER')
+    public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER')
    {
        $this->parent     = $parent;
        $this->model      = $model;
        $this->foreignKey = $foreignKey;
        $this->localKey   = $localKey;
-        $this->alias      = $alias;
        $this->joinType   = $joinType;
        $this->query      = (new $model)->db();
    }

    /**
     * 延迟获取关联数据
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
     * @access public
+     * @return array|false|\PDOStatement|string|Model
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
        $foreignKey = $this->foreignKey;
-        $localKey   = $this->localKey;
-        return $this->query->where($localKey, $this->parent->$foreignKey)->find();
+        if ($closure) {
+            call_user_func_array($closure, [ & $this->query]);
+        }
+        return $this->query->where($this->localKey, $this->parent->$foreignKey)->relation($subRelation)->find();
    }

    /**
@@ -54,10 +58,9 @@ class BelongsTo extends OneToOne
     * @param string    $relation 当前关联名
     * @param string    $subRelation 子关联名
     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
     * @return void
     */
-    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure, $class)
+    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
    {
        $localKey   = $this->localKey;
        $foreignKey = $this->foreignKey;
@@ -71,26 +74,29 @@ class BelongsTo extends OneToOne
        }

        if (!empty($range)) {
-            $this->where[$localKey] = ['in', $range];
-            $data                   = $this->eagerlyWhere($this, [
+            $data = $this->eagerlyWhere($this, [
                $localKey => [
                    'in',
                    $range,
                ],
            ], $localKey, $relation, $subRelation, $closure);
-
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            // 关联数据封装
            foreach ($resultSet as $result) {
-                if (!isset($data[$result->$foreignKey])) {
-                    $data[$result->$foreignKey] = [];
+                // 关联模型
+                if (!isset($data[$result->$localKey])) {
+                    $relationModel = null;
+                } else {
+                    $relationModel = $data[$result->$localKey];
                }
-                $relationModel = $this->resultSetBuild($data[$result->$foreignKey], $class);
-                if (!empty($this->bindAttr)) {
+
+                if ($relationModel && !empty($this->bindAttr)) {
                    // 绑定关联属性
                    $this->bindAttr($relationModel, $result, $this->bindAttr);
                }
                // 设置关联属性
-                $result->setAttr($relation, $relationModel);
+                $result->setAttr($attr, $relationModel);
            }
        }
    }
@@ -102,25 +108,25 @@ class BelongsTo extends OneToOne
     * @param string    $relation 当前关联名
     * @param string    $subRelation 子关联名
     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
     * @return void
     */
-    protected function eagerlyOne(&$result, $relation, $subRelation, $closure, $class)
+    protected function eagerlyOne(&$result, $relation, $subRelation, $closure)
    {
        $localKey   = $this->localKey;
        $foreignKey = $this->foreignKey;
        $data       = $this->eagerlyWhere($this, [$localKey => $result->$foreignKey], $localKey, $relation, $subRelation, $closure);
-        // 关联数据封装
-        if (!isset($data[$result->$foreignKey])) {
-            $data[$result->$foreignKey] = [];
+        // 关联模型
+        if (!isset($data[$result->$localKey])) {
+            $relationModel = null;
+        } else {
+            $relationModel = $data[$result->$localKey];
        }
-        $relationModel = $this->resultSetBuild($data[$result->$foreignKey], $class);
-        if (!empty($this->bindAttr)) {
+        if ($relationModel && !empty($this->bindAttr)) {
            // 绑定关联属性
            $this->bindAttr($relationModel, $result, $this->bindAttr);
        }
        // 设置关联属性
-        $result->setAttr($relation, $relationModel);
+        $result->setAttr(Loader::parseName($relation), $relationModel);
    }

 }
--- a/core/library/think/model/relation/BelongsToMany.php
+++ b/core/library/think/model/relation/BelongsToMany.php
@@ -11,9 +11,9 @@

 namespace think\model\relation;

-use think\Db;
 use think\db\Query;
 use think\Exception;
+use think\Loader;
 use think\Model;
 use think\model\Pivot;
 use think\model\Relation;
@@ -26,37 +26,40 @@ class BelongsToMany extends Relation
    /**
     * 架构函数
     * @access public
-     * @param Model  $parent 上级模型对象
-     * @param string $model 模型名
-     * @param string $table 中间表名
+     * @param Model  $parent     上级模型对象
+     * @param string $model      模型名
+     * @param string $table      中间表名
     * @param string $foreignKey 关联模型外键
-     * @param string $localKey 当前模型关联键
-     * @param array  $alias 别名定义
+     * @param string $localKey   当前模型关联键
     */
-    public function __construct(Model $parent, $model, $table, $foreignKey, $localKey, $alias = [])
+    public function __construct(Model $parent, $model, $table, $foreignKey, $localKey)
    {
        $this->parent     = $parent;
        $this->model      = $model;
        $this->foreignKey = $foreignKey;
        $this->localKey   = $localKey;
        $this->middle     = $table;
-        $this->alias      = $alias;
        $this->query      = (new $model)->db();
    }

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return false|\PDOStatement|string|\think\Collection
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
        $foreignKey = $this->foreignKey;
        $localKey   = $this->localKey;
        $middle     = $this->middle;
+        if ($closure) {
+            call_user_func_array($closure, [& $this->query]);
+        }
        // 关联查询
        $pk                              = $this->parent->getPk();
        $condition['pivot.' . $localKey] = $this->parent->$pk;
-        $result                          = $this->belongsToManyQuery($middle, $foreignKey, $localKey, $condition)->select();
+        $result                          = $this->belongsToManyQuery($middle, $foreignKey, $localKey, $condition)->relation($subRelation)->select();
        foreach ($result as $set) {
            $pivot = [];
            foreach ($set->getData() as $key => $val) {
@@ -76,14 +79,13 @@ class BelongsToMany extends Relation
    /**
     * 预载入关联查询（数据集）
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
    {
        $localKey   = $this->localKey;
        $foreignKey = $this->foreignKey;
@@ -105,14 +107,15 @@ class BelongsToMany extends Relation
                    $range,
                ],
            ], $relation, $subRelation);
-
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            // 关联数据封装
            foreach ($resultSet as $result) {
                if (!isset($data[$result->$pk])) {
                    $data[$result->$pk] = [];
                }

-                $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class));
+                $result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
            }
        }
    }
@@ -120,14 +123,13 @@ class BelongsToMany extends Relation
    /**
     * 预载入关联查询（单个数据）
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
    {
        $pk = $result->getPk();
        if (isset($result->$pk)) {
@@ -139,15 +141,15 @@ class BelongsToMany extends Relation
            if (!isset($data[$pk])) {
                $data[$pk] = [];
            }
-            $result->setAttr($relation, $this->resultSetBuild($data[$pk], $class));
+            $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$pk]));
        }
    }

    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
@@ -164,20 +166,25 @@ class BelongsToMany extends Relation
    /**
     * 获取关联统计子查询
     * @access public
-     * @param \Closure  $closure 闭包
+     * @param \Closure $closure 闭包
     * @return string
     */
    public function getRelationCountQuery($closure)
    {
-        return $this->belongsToManyQuery($this->middle, $this->foreignKey, $this->localKey, ['pivot.' . $this->localKey => ['exp', '=' . $this->parent->getTable() . '.' . $this->parent->getPk()]])->fetchSql()->count();
+        return $this->belongsToManyQuery($this->middle, $this->foreignKey, $this->localKey, [
+            'pivot.' . $this->localKey => [
+                'exp',
+                '=' . $this->parent->getTable() . '.' . $this->parent->getPk()
+            ]
+        ])->fetchSql()->count();
    }

    /**
     * 多对多 关联模型预查询
     * @access public
-     * @param array     $where 关联预查询条件
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
+     * @param array  $where       关联预查询条件
+     * @param string $relation    关联名
+     * @param string $subRelation 子关联
     * @return array
     */
    protected function eagerlyManyToMany($where, $relation, $subRelation = '')
@@ -207,10 +214,10 @@ class BelongsToMany extends Relation
    /**
     * BELONGS TO MANY 关联查询
     * @access public
-     * @param string    $table 中间表名
-     * @param string    $foreignKey 关联模型关联键
-     * @param string    $localKey 当前模型关联键
-     * @param array     $condition 关联查询条件
+     * @param string $table      中间表名
+     * @param string $foreignKey 关联模型关联键
+     * @param string $localKey   当前模型关联键
+     * @param array  $condition  关联查询条件
     * @return Query
     */
    protected function belongsToManyQuery($table, $foreignKey, $localKey, $condition = [])
@@ -227,8 +234,8 @@ class BelongsToMany extends Relation
    /**
     * 保存（新增）当前关联数据对象
     * @access public
-     * @param mixed     $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
-     * @param array     $pivot 中间表额外数据
+     * @param mixed $data  数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param array $pivot 中间表额外数据
     * @return integer
     */
    public function save($data, array $pivot = [])
@@ -240,9 +247,9 @@ class BelongsToMany extends Relation
    /**
     * 批量保存当前关联数据对象
     * @access public
-     * @param array     $dataSet 数据集
-     * @param array     $pivot 中间表额外数据
-     * @param bool      $samePivot 额外数据是否相同
+     * @param array $dataSet   数据集
+     * @param array $pivot     中间表额外数据
+     * @param bool  $samePivot 额外数据是否相同
     * @return integer
     */
    public function saveAll(array $dataSet, array $pivot = [], $samePivot = false)
@@ -262,9 +269,10 @@ class BelongsToMany extends Relation
    /**
     * 附加关联的一个中间表数据
     * @access public
-     * @param mixed     $data 数据 可以使用数组、关联模型对象 或者 关联对象的主键
-     * @param array     $pivot 中间表额外数据
-     * @return integer
+     * @param mixed $data  数据 可以使用数组、关联模型对象 或者 关联对象的主键
+     * @param array $pivot 中间表额外数据
+     * @return int
+     * @throws Exception
     */
    public function attach($data, $pivot = [])
    {
@@ -304,8 +312,8 @@ class BelongsToMany extends Relation
    /**
     * 解除关联的一个中间表数据
     * @access public
-     * @param integer|array     $data 数据 可以使用关联对象的主键
-     * @param bool              $relationDel 是否同时删除关联表数据
+     * @param integer|array $data        数据 可以使用关联对象的主键
+     * @param bool          $relationDel 是否同时删除关联表数据
     * @return integer
     */
    public function detach($data = null, $relationDel = false)
--- a/core/library/think/model/relation/HasMany.php
+++ b/core/library/think/model/relation/HasMany.php
@@ -13,6 +13,7 @@ namespace think\model\relation;

 use think\Db;
 use think\db\Query;
+use think\Loader;
 use think\Model;
 use think\model\Relation;

@@ -21,42 +22,44 @@ class HasMany extends Relation
    /**
     * 架构函数
     * @access public
-     * @param Model  $parent 上级模型对象
-     * @param string $model 模型名
+     * @param Model  $parent     上级模型对象
+     * @param string $model      模型名
     * @param string $foreignKey 关联外键
-     * @param string $localKey 关联主键
-     * @param array  $alias 别名定义
+     * @param string $localKey   关联主键
     */
-    public function __construct(Model $parent, $model, $foreignKey, $localKey, $alias = [])
+    public function __construct(Model $parent, $model, $foreignKey, $localKey)
    {
        $this->parent     = $parent;
        $this->model      = $model;
        $this->foreignKey = $foreignKey;
        $this->localKey   = $localKey;
-        $this->alias      = $alias;
        $this->query      = (new $model)->db();
    }

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return false|\PDOStatement|string|\think\Collection
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
-        return $this->select();
+        if ($closure) {
+            call_user_func_array($closure, [& $this->query]);
+        }
+        return $this->relation($subRelation)->select();
    }

    /**
     * 预载入关联查询
-     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @access   public
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
    {
        $localKey = $this->localKey;
        $range    = [];
@@ -68,35 +71,34 @@ class HasMany extends Relation
        }

        if (!empty($range)) {
-            $this->where[$this->foreignKey] = ['in', $range];
-            $data                           = $this->eagerlyOneToMany($this, [
+            $data = $this->eagerlyOneToMany($this, [
                $this->foreignKey => [
                    'in',
                    $range,
                ],
            ], $relation, $subRelation, $closure);
-
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            // 关联数据封装
            foreach ($resultSet as $result) {
                if (!isset($data[$result->$localKey])) {
                    $data[$result->$localKey] = [];
                }
-                $result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class));
+                $result->setAttr($attr, $this->resultSetBuild($data[$result->$localKey]));
            }
        }
    }

    /**
     * 预载入关联查询
-     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @access   public
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
    {
        $localKey = $this->localKey;

@@ -106,15 +108,15 @@ class HasMany extends Relation
            if (!isset($data[$result->$localKey])) {
                $data[$result->$localKey] = [];
            }
-            $result->setAttr($relation, $this->resultSetBuild($data[$result->$localKey], $class));
+            $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$localKey]));
        }
    }

    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
@@ -123,7 +125,7 @@ class HasMany extends Relation
        $count    = 0;
        if (isset($result->$localKey)) {
            if ($closure) {
-                call_user_func_array($closure, [ & $this->query]);
+                call_user_func_array($closure, [& $this->query]);
            }
            $count = $this->query->where([$this->foreignKey => $result->$localKey])->count();
        }
@@ -133,26 +135,31 @@ class HasMany extends Relation
    /**
     * 创建关联统计子查询
     * @access public
-     * @param \Closure  $closure 闭包
+     * @param \Closure $closure 闭包
     * @return string
     */
    public function getRelationCountQuery($closure)
    {
        if ($closure) {
-            call_user_func_array($closure, [ & $this->query]);
+            call_user_func_array($closure, [& $this->query]);
        }

-        return $this->query->where([$this->foreignKey => ['exp', '=' . $this->parent->getTable() . '.' . $this->parent->getPk()]])->fetchSql()->count();
+        return $this->query->where([
+            $this->foreignKey => [
+                'exp',
+                '=' . $this->parent->getTable() . '.' . $this->parent->getPk()
+            ]
+        ])->fetchSql()->count();
    }

    /**
     * 一对多 关联模型预查询
     * @access public
-     * @param object    $model 关联模型对象
-     * @param array     $where 关联预查询条件
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
-     * @param bool      $closure
+     * @param object $model       关联模型对象
+     * @param array  $where       关联预查询条件
+     * @param string $relation    关联名
+     * @param string $subRelation 子关联
+     * @param bool   $closure
     * @return array
     */
    protected function eagerlyOneToMany($model, $where, $relation, $subRelation = '', $closure = false)
@@ -160,7 +167,7 @@ class HasMany extends Relation
        $foreignKey = $this->foreignKey;
        // 预载入关联查询 支持嵌套预载入
        if ($closure) {
-            call_user_func_array($closure, [ & $model]);
+            call_user_func_array($closure, [& $model]);
        }
        $list = $model->where($where)->with($subRelation)->select();

@@ -175,7 +182,7 @@ class HasMany extends Relation
    /**
     * 保存（新增）当前关联数据对象
     * @access public
-     * @param mixed     $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
     * @return integer
     */
    public function save($data)
@@ -192,7 +199,7 @@ class HasMany extends Relation
    /**
     * 批量保存当前关联数据对象
     * @access public
-     * @param array     $dataSet 数据集
+     * @param array $dataSet 数据集
     * @return integer
     */
    public function saveAll(array $dataSet)
@@ -207,16 +214,15 @@ class HasMany extends Relation
    /**
     * 根据关联条件查询当前模型
     * @access public
-     * @param Model     $model 模型对象
-     * @param string    $operator 比较操作符
-     * @param integer   $count 个数
-     * @param string    $id 关联表的统计字段
+     * @param string  $operator 比较操作符
+     * @param integer $count    个数
+     * @param string  $id       关联表的统计字段
     * @return Query
     */
-    public function has($model, $operator = '>=', $count = 1, $id = '*')
+    public function has($operator = '>=', $count = 1, $id = '*')
    {
        $table = $this->query->getTable();
-        return $model->db()->alias('a')
+        return $this->parent->db()->alias('a')
            ->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType)
            ->group('b.' . $this->foreignKey)
            ->having('count(' . $id . ')' . $operator . $count);
@@ -225,24 +231,25 @@ class HasMany extends Relation
    /**
     * 根据关联条件查询当前模型
     * @access public
-     * @param Model    $model 模型对象
-     * @param mixed     $where 查询条件（数组或者闭包）
+     * @param mixed $where 查询条件（数组或者闭包）
     * @return Query
     */
-    public function hasWhere($model, $where = [])
+    public function hasWhere($where = [])
    {
-        $table = $this->query->getTable();
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
        if (is_array($where)) {
            foreach ($where as $key => $val) {
                if (false === strpos($key, '.')) {
-                    $where['b.' . $key] = $val;
+                    $where[$relation . '.' . $key] = $val;
                    unset($where[$key]);
                }
            }
        }
-        return $model->db()->alias('a')
-            ->field('a.*')
-            ->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType)
+        return $this->parent->db()->alias($model)
+            ->field($model . '.*')
+            ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey)
            ->where($where);
    }

@@ -254,9 +261,7 @@ class HasMany extends Relation
    protected function baseQuery()
    {
        if (empty($this->baseQuery)) {
-            if (isset($this->where)) {
-                $this->query->where($this->where);
-            } elseif (isset($this->parent->{$this->localKey})) {
+            if (isset($this->parent->{$this->localKey})) {
                // 关联查询带入关联条件
                $this->query->where($this->foreignKey, $this->parent->{$this->localKey});
            }
--- a/core/library/think/model/relation/HasManyThrough.php
+++ b/core/library/think/model/relation/HasManyThrough.php
@@ -26,16 +26,15 @@ class HasManyThrough extends Relation

    /**
     * 架构函数
-     * @access public
-     * @param Model  $parent 上级模型对象
-     * @param string $model 模型名
-     * @param string $through 中间模型名
-     * @param string $firstkey 关联外键
-     * @param string $secondKey 关联外键
-     * @param string $localKey 关联主键
-     * @param array  $alias 别名定义
+     * @access   public
+     * @param Model  $parent     上级模型对象
+     * @param string $model      模型名
+     * @param string $through    中间模型名
+     * @param string $foreignKey 关联外键
+     * @param string $throughKey 关联外键
+     * @param string $localKey   关联主键
     */
-    public function __construct(Model $parent, $model, $through, $foreignKey, $throughKey, $localKey, $alias = [])
+    public function __construct(Model $parent, $model, $through, $foreignKey, $throughKey, $localKey)
    {
        $this->parent     = $parent;
        $this->model      = $model;
@@ -43,54 +42,61 @@ class HasManyThrough extends Relation
        $this->foreignKey = $foreignKey;
        $this->throughKey = $throughKey;
        $this->localKey   = $localKey;
-        $this->alias      = $alias;
        $this->query      = (new $model)->db();
    }

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return false|\PDOStatement|string|\think\Collection
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
-        return $this->select();
+        if ($closure) {
+            call_user_func_array($closure, [& $this->query]);
+        }
+        return $this->relation($subRelation)->select();
    }

    /**
     * 预载入关联查询
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
+     * @param string   $class       数据集对象名 为空表示数组
     * @return void
     */
    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
-    {}
+    {
+    }

    /**
     * 预载入关联查询 返回模型对象
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
+     * @param string   $class       数据集对象名 为空表示数组
     * @return void
     */
    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
-    {}
+    {
+    }

    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
-    {}
+    {
+    }

    /**
     * 执行基础查询（进执行一次）
--- a/core/library/think/model/relation/HasOne.php
+++ b/core/library/think/model/relation/HasOne.php
@@ -11,6 +11,8 @@

 namespace think\model\relation;

+use think\db\Query;
+use think\Loader;
 use think\Model;

 class HasOne extends OneToOne
@@ -18,72 +20,74 @@ class HasOne extends OneToOne
    /**
     * 架构函数
     * @access public
-     * @param Model $parent 上级模型对象
-     * @param string $model 模型名
+     * @param Model  $parent     上级模型对象
+     * @param string $model      模型名
     * @param string $foreignKey 关联外键
-     * @param string $localKey 关联主键
-     * @param array  $alias 别名定义
-     * @param string $joinType JOIN类型
+     * @param string $localKey   关联主键
+     * @param string $joinType   JOIN类型
     */
-    public function __construct(Model $parent, $model, $foreignKey, $localKey, $alias = [], $joinType = 'INNER')
+    public function __construct(Model $parent, $model, $foreignKey, $localKey, $joinType = 'INNER')
    {
        $this->parent     = $parent;
        $this->model      = $model;
        $this->foreignKey = $foreignKey;
        $this->localKey   = $localKey;
-        $this->alias      = $alias;
        $this->joinType   = $joinType;
        $this->query      = (new $model)->db();
    }

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return array|false|\PDOStatement|string|Model
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
        // 执行关联定义方法
        $localKey = $this->localKey;
-
+        if ($closure) {
+            call_user_func_array($closure, [& $this->query]);
+        }
        // 判断关联类型执行查询
-        return $this->query->where($this->foreignKey, $this->parent->$localKey)->find();
+        return $this->query->where($this->foreignKey, $this->parent->$localKey)->relation($subRelation)->find();
    }

    /**
     * 根据关联条件查询当前模型
     * @access public
-     * @param Model    $model 模型对象
-     * @param mixed    $where 查询条件（数组或者闭包）
+     * @param mixed $where 查询条件（数组或者闭包）
     * @return Query
     */
-    public function hasWhere($model, $where = [])
+    public function hasWhere($where = [])
    {
-        $table = $this->query->getTable();
+        $table    = $this->query->getTable();
+        $model    = basename(str_replace('\\', '/', get_class($this->parent)));
+        $relation = basename(str_replace('\\', '/', $this->model));
        if (is_array($where)) {
            foreach ($where as $key => $val) {
                if (false === strpos($key, '.')) {
-                    $where['b.' . $key] = $val;
+                    $where[$relation . '.' . $key] = $val;
                    unset($where[$key]);
                }
            }
        }
-        return $model->db()->alias('a')
-            ->field('a.*')
-            ->join($table . ' b', 'a.' . $this->localKey . '=b.' . $this->foreignKey, $this->joinType)
+        return $this->parent->db()->alias($model)
+            ->field($model . '.*')
+            ->join($table . ' ' . $relation, $model . '.' . $this->localKey . '=' . $relation . '.' . $this->foreignKey, $this->joinType)
            ->where($where);
    }

    /**
     * 预载入关联查询（数据集）
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure, $class)
+    protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure)
    {
        $localKey   = $this->localKey;
        $foreignKey = $this->foreignKey;
@@ -97,26 +101,28 @@ class HasOne extends OneToOne
        }

        if (!empty($range)) {
-            $this->where[$foreignKey] = ['in', $range];
-            $data                     = $this->eagerlyWhere($this, [
+            $data = $this->eagerlyWhere($this, [
                $foreignKey => [
                    'in',
                    $range,
                ],
            ], $foreignKey, $relation, $subRelation, $closure);
-
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            // 关联数据封装
            foreach ($resultSet as $result) {
+                // 关联模型
                if (!isset($data[$result->$localKey])) {
-                    $data[$result->$localKey] = [];
+                    $relationModel = null;
+                } else {
+                    $relationModel = $data[$result->$localKey];
                }
-                $relationModel = $this->resultSetBuild($data[$result->$localKey], $class);
-                if (!empty($this->bindAttr)) {
+                if ($relationModel && !empty($this->bindAttr)) {
                    // 绑定关联属性
                    $this->bindAttr($relationModel, $result, $this->bindAttr);
                }
                // 设置关联属性
-                $result->setAttr($relation, $relationModel);
+                $result->setAttr($attr, $relationModel);
            }
        }
    }
@@ -124,28 +130,30 @@ class HasOne extends OneToOne
    /**
     * 预载入关联查询（数据）
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    protected function eagerlyOne(&$result, $relation, $subRelation, $closure, $class)
+    protected function eagerlyOne(&$result, $relation, $subRelation, $closure)
    {
        $localKey   = $this->localKey;
        $foreignKey = $this->foreignKey;
        $data       = $this->eagerlyWhere($this, [$foreignKey => $result->$localKey], $foreignKey, $relation, $subRelation, $closure);
-        // 关联数据封装
+
+        // 关联模型
        if (!isset($data[$result->$localKey])) {
-            $data[$result->$localKey] = [];
+            $relationModel = null;
+        } else {
+            $relationModel = $data[$result->$localKey];
        }
-        $relationModel = $this->resultSetBuild($data[$result->$localKey], $class);
-        if (!empty($this->bindAttr)) {
+
+        if ($relationModel && !empty($this->bindAttr)) {
            // 绑定关联属性
            $this->bindAttr($relationModel, $result, $this->bindAttr);
        }
-        $result->setAttr($relation, $relationModel);
+        $result->setAttr(Loader::parseName($relation), $relationModel);
    }

 }
--- a/core/library/think/model/relation/MorphMany.php
+++ b/core/library/think/model/relation/MorphMany.php
@@ -13,6 +13,7 @@ namespace think\model\relation;

 use think\Db;
 use think\db\Query;
+use think\Loader;
 use think\Model;
 use think\model\Relation;

@@ -27,11 +28,11 @@ class MorphMany extends Relation
    /**
     * 架构函数
     * @access public
-     * @param Model  $parent 上级模型对象
-     * @param string $model 模型名
-     * @param string $morphKey 关联外键
+     * @param Model  $parent    上级模型对象
+     * @param string $model     模型名
+     * @param string $morphKey  关联外键
     * @param string $morphType 多态字段名
-     * @param string $type 多态类型
+     * @param string $type      多态类型
     */
    public function __construct(Model $parent, $model, $morphKey, $morphType, $type)
    {
@@ -45,24 +46,28 @@ class MorphMany extends Relation

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return false|\PDOStatement|string|\think\Collection
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
-        return $this->select();
+        if ($closure) {
+            call_user_func_array($closure, [& $this->query]);
+        }
+        return $this->relation($subRelation)->select();
    }

    /**
     * 预载入关联查询
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
    {
        $morphType = $this->morphType;
        $morphKey  = $this->morphKey;
@@ -77,19 +82,18 @@ class MorphMany extends Relation
        }

        if (!empty($range)) {
-            $this->where[$morphKey]  = ['in', $range];
-            $this->where[$morphType] = $type;
-            $data                    = $this->eagerlyMorphToMany([
+            $data = $this->eagerlyMorphToMany([
                $morphKey  => ['in', $range],
                $morphType => $type,
            ], $relation, $subRelation, $closure);
-
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            // 关联数据封装
            foreach ($resultSet as $result) {
                if (!isset($data[$result->$pk])) {
                    $data[$result->$pk] = [];
                }
-                $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class));
+                $result->setAttr($attr, $this->resultSetBuild($data[$result->$pk]));
            }
        }
    }
@@ -97,27 +101,29 @@ class MorphMany extends Relation
    /**
     * 预载入关联查询
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
    {
        $pk = $result->getPk();
        if (isset($result->$pk)) {
-            $data = $this->eagerlyMorphToMany([$this->morphKey => $result->$pk, $this->morphType => $this->type], $relation, $subRelation, $closure);
-            $result->setAttr($relation, $this->resultSetBuild($data[$result->$pk], $class));
+            $data = $this->eagerlyMorphToMany([
+                $this->morphKey  => $result->$pk,
+                $this->morphType => $this->type
+            ], $relation, $subRelation, $closure);
+            $result->setAttr(Loader::parseName($relation), $this->resultSetBuild($data[$result->$pk]));
        }
    }

    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
@@ -126,7 +132,7 @@ class MorphMany extends Relation
        $count = 0;
        if (isset($result->$pk)) {
            if ($closure) {
-                call_user_func_array($closure, [ & $this->query]);
+                call_user_func_array($closure, [& $this->query]);
            }
            $count = $this->query->where([$this->morphKey => $result->$pk, $this->morphType => $this->type])->count();
        }
@@ -136,32 +142,38 @@ class MorphMany extends Relation
    /**
     * 获取关联统计子查询
     * @access public
-     * @param \Closure  $closure 闭包
+     * @param \Closure $closure 闭包
     * @return string
     */
    public function getRelationCountQuery($closure)
    {
        if ($closure) {
-            call_user_func_array($closure, [ & $this->query]);
+            call_user_func_array($closure, [& $this->query]);
        }

-        return $this->query->where([$this->morphKey => ['exp', '=' . $this->parent->getTable() . '.' . $this->parent->getPk()], $this->morphType => $this->type])->fetchSql()->count();
+        return $this->query->where([
+            $this->morphKey  => [
+                'exp',
+                '=' . $this->parent->getTable() . '.' . $this->parent->getPk()
+            ],
+            $this->morphType => $this->type
+        ])->fetchSql()->count();
    }

    /**
     * 多态一对多 关联模型预查询
-     * @access public
-     * @param object    $model 关联模型对象
-     * @param array     $where 关联预查询条件
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
+     * @access   public
+     * @param array         $where       关联预查询条件
+     * @param string        $relation    关联名
+     * @param string        $subRelation 子关联
+     * @param bool|\Closure $closure     闭包
     * @return array
     */
    protected function eagerlyMorphToMany($where, $relation, $subRelation = '', $closure = false)
    {
        // 预载入关联查询 支持嵌套预载入
        if ($closure) {
-            call_user_func_array($closure, [ & $this]);
+            call_user_func_array($closure, [& $this]);
        }
        $list     = $this->query->where($where)->with($subRelation)->select();
        $morphKey = $this->morphKey;
@@ -176,7 +188,7 @@ class MorphMany extends Relation
    /**
     * 保存（新增）当前关联数据对象
     * @access public
-     * @param mixed     $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
     * @return integer
     */
    public function save($data)
@@ -196,7 +208,7 @@ class MorphMany extends Relation
    /**
     * 批量保存当前关联数据对象
     * @access public
-     * @param array     $dataSet 数据集
+     * @param array $dataSet 数据集
     * @return integer
     */
    public function saveAll(array $dataSet)
--- a/core/library/think/model/relation/MorphTo.php
+++ b/core/library/think/model/relation/MorphTo.php
@@ -11,6 +11,7 @@

 namespace think\model\relation;

+use think\Exception;
 use think\Loader;
 use think\Model;
 use think\model\Relation;
@@ -20,14 +21,16 @@ class MorphTo extends Relation
    // 多态字段
    protected $morphKey;
    protected $morphType;
+    // 多态别名
+    protected $alias;

    /**
     * 架构函数
     * @access public
-     * @param Model  $parent 上级模型对象
+     * @param Model  $parent    上级模型对象
     * @param string $morphType 多态字段名
-     * @param string $morphKey 外键名
-     * @param array  $alias 多态别名定义
+     * @param string $morphKey  外键名
+     * @param array  $alias     多态别名定义
     */
    public function __construct(Model $parent, $morphType, $morphKey, $alias = [])
    {
@@ -39,9 +42,11 @@ class MorphTo extends Relation

    /**
     * 延迟获取关联数据
-     * @access public
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包查询条件
+     * @return mixed
     */
-    public function getRelation()
+    public function getRelation($subRelation = '', $closure = null)
    {
        $morphKey  = $this->morphKey;
        $morphType = $this->morphType;
@@ -49,7 +54,7 @@ class MorphTo extends Relation
        $model = $this->parseModel($this->parent->$morphType);
        // 主键数据
        $pk = $this->parent->$morphKey;
-        return (new $model)->find($pk);
+        return (new $model)->relation($subRelation)->find($pk);
    }

    /**
@@ -72,17 +77,29 @@ class MorphTo extends Relation
        return $model;
    }

+    /**
+     * 设置多态别名
+     * @access public
+     * @param array $alias 别名定义
+     * @return $this
+     */
+    public function setAlias($alias)
+    {
+        $this->alias = $alias;
+        return $this;
+    }
+
    /**
     * 预载入关联查询
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
+     * @throws Exception
     */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
    {
        $morphKey  = $this->morphKey;
        $morphType = $this->morphType;
@@ -95,6 +112,8 @@ class MorphTo extends Relation
        }

        if (!empty($range)) {
+            // 关联属性名
+            $attr = Loader::parseName($relation);
            foreach ($range as $key => $val) {
                // 多态类型映射
                $model = $this->parseModel($key);
@@ -107,10 +126,12 @@ class MorphTo extends Relation
                }
                foreach ($resultSet as $result) {
                    if ($key == $result->$morphType) {
+                        // 关联模型
                        if (!isset($data[$result->$morphKey])) {
-                            $data[$result->$morphKey] = [];
+                            throw new Exception('relation data not exists :' . $this->model);
+                        } else {
+                            $result->setAttr($attr, $data[$result->$morphKey]);
                        }
-                        $result->setAttr($relation, $this->resultSetBuild($data[$result->$morphKey], $class));
                    }
                }
            }
@@ -120,14 +141,13 @@ class MorphTo extends Relation
    /**
     * 预载入关联查询
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
    {
        $morphKey  = $this->morphKey;
        $morphType = $this->morphType;
@@ -139,20 +159,21 @@ class MorphTo extends Relation
    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
-    {}
+    {
+    }

    /**
     * 多态MorphTo 关联模型预查询
-     * @access public
-     * @param object    $model 关联模型对象
-     * @param array     $where 关联预查询条件
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
+     * @access   public
+     * @param object $model       关联模型对象
+     * @param string $relation    关联名
+     * @param        $result
+     * @param string $subRelation 子关联
     * @return void
     */
    protected function eagerlyMorphToOne($model, $relation, &$result, $subRelation = '')
@@ -163,7 +184,7 @@ class MorphTo extends Relation
        if ($data) {
            $data->isUpdate(true);
        }
-        $result->setAttr($relation, $data ?: null);
+        $result->setAttr(Loader::parseName($relation), $data ?: null);
    }

    /**
--- a/core/library/think/model/relation/OneToOne.php
+++ b/core/library/think/model/relation/OneToOne.php
@@ -17,27 +17,46 @@ use think\Loader;
 use think\Model;
 use think\model\Relation;

+/**
+ * Class OneToOne
+ * @package think\model\relation
+ *
+ */
 abstract class OneToOne extends Relation
 {
-    // 预载入方式
-    protected $eagerlyType = 0;
+    // 预载入方式 0 -JOIN 1 -IN
+    protected $eagerlyType = 1;
+    // 当前关联的JOIN类型
+    protected $joinType;
    // 要绑定的属性
    protected $bindAttr = [];

+    /**
+     * 设置join类型
+     * @access public
+     * @param string $type JOIN类型
+     * @return $this
+     */
+    public function joinType($type)
+    {
+        $this->joinType = $type;
+        return $this;
+    }
+
    /**
     * 预载入关联查询（JOIN方式）
     * @access public
-     * @param Query     $query 查询对象
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
-     * @param \Closure  $closure 闭包条件
-     * @param bool      $first
+     * @param Query    $query       查询对象
+     * @param string   $relation    关联名
+     * @param string   $subRelation 子关联
+     * @param \Closure $closure     闭包条件
+     * @param bool     $first
     * @return void
     */
    public function eagerly(Query $query, $relation, $subRelation, $closure, $first)
    {
        $name  = Loader::parseName(basename(str_replace('\\', '/', $query->getModel())));
-        $alias = isset($this->alias[$name]) ? $this->alias[$name] : $name;
+        $alias = $name;
        if ($first) {
            $table = $query->getTable();
            $query->table([$table => $alias]);
@@ -52,8 +71,7 @@ abstract class OneToOne extends Relation

        // 预载入封装
        $joinTable = $this->query->getTable();
-        $joinName  = Loader::parseName(basename(str_replace('\\', '/', $this->model)));
-        $joinAlias = isset($this->alias[$joinName]) ? $this->alias[$joinName] : $relation;
+        $joinAlias = $relation;
        $query->via($joinAlias);

        if ($this instanceof BelongsTo) {
@@ -64,9 +82,8 @@ abstract class OneToOne extends Relation

        if ($closure) {
            // 执行闭包查询
-            call_user_func_array($closure, [ & $query]);
-            //指定获取关联的字段
-            //需要在 回调中 调方法 withField 方法，如
+            call_user_func_array($closure, [& $query]);
+            // 使用withField指定获取关联的字段，如
            // $query->where(['id'=>1])->withField('id,name');
            if ($query->getOptions('with_field')) {
                $field = $query->getOptions('with_field');
@@ -80,21 +97,40 @@ abstract class OneToOne extends Relation
        $query->field($field, false, $joinTable, $joinAlias, $relation . '__');
    }

+    /**
+     *  预载入关联查询（数据集）
+     * @param array    $resultSet
+     * @param string   $relation
+     * @param string   $subRelation
+     * @param \Closure $closure
+     * @return mixed
+     */
+    abstract protected function eagerlySet(&$resultSet, $relation, $subRelation, $closure);
+
+    /**
+     * 预载入关联查询（数据）
+     * @param Model    $result
+     * @param string   $relation
+     * @param string   $subRelation
+     * @param \Closure $closure
+     * @return mixed
+     */
+    abstract protected function eagerlyOne(&$result, $relation, $subRelation, $closure);
+
    /**
     * 预载入关联查询（数据集）
     * @access public
-     * @param array     $resultSet 数据集
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param array    $resultSet   数据集
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure, $class)
+    public function eagerlyResultSet(&$resultSet, $relation, $subRelation, $closure)
    {
        if (1 == $this->eagerlyType) {
            // IN查询
-            $this->eagerlySet($resultSet, $relation, $subRelation, $closure, $class);
+            $this->eagerlySet($resultSet, $relation, $subRelation, $closure);
        } else {
            // 模型关联组装
            foreach ($resultSet as $result) {
@@ -106,18 +142,17 @@ abstract class OneToOne extends Relation
    /**
     * 预载入关联查询（数据）
     * @access public
-     * @param Model     $result 数据对象
-     * @param string    $relation 当前关联名
-     * @param string    $subRelation 子关联名
-     * @param \Closure  $closure 闭包
-     * @param string    $class 数据集对象名 为空表示数组
+     * @param Model    $result      数据对象
+     * @param string   $relation    当前关联名
+     * @param string   $subRelation 子关联名
+     * @param \Closure $closure     闭包
     * @return void
     */
-    public function eagerlyResult(&$result, $relation, $subRelation, $closure, $class)
+    public function eagerlyResult(&$result, $relation, $subRelation, $closure)
    {
        if (1 == $this->eagerlyType) {
            // IN查询
-            $this->eagerlyOne($result, $relation, $subRelation, $closure, $class);
+            $this->eagerlyOne($result, $relation, $subRelation, $closure);
        } else {
            // 模型关联组装
            $this->match($this->model, $relation, $result);
@@ -127,7 +162,7 @@ abstract class OneToOne extends Relation
    /**
     * 保存（新增）当前关联数据对象
     * @access public
-     * @param mixed     $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
+     * @param mixed $data 数据 可以使用数组 关联模型对象 和 关联对象的主键
     * @return integer
     */
    public function save($data)
@@ -144,8 +179,8 @@ abstract class OneToOne extends Relation
    /**
     * 设置预载入方式
     * @access public
-     * @param integer     $type 预载入方式 0 JOIN查询 1 IN查询
-     * @return this
+     * @param integer $type 预载入方式 0 JOIN查询 1 IN查询
+     * @return $this
     */
    public function setEagerlyType($type)
    {
@@ -167,8 +202,8 @@ abstract class OneToOne extends Relation
    /**
     * 绑定关联表的属性到父模型属性
     * @access public
-     * @param mixed    $attr 要绑定的属性列表
-     * @return this
+     * @param mixed $attr 要绑定的属性列表
+     * @return $this
     */
    public function bind($attr)
    {
@@ -182,19 +217,20 @@ abstract class OneToOne extends Relation
    /**
     * 关联统计
     * @access public
-     * @param Model     $result 数据对象
-     * @param \Closure  $closure 闭包
+     * @param Model    $result  数据对象
+     * @param \Closure $closure 闭包
     * @return integer
     */
    public function relationCount($result, $closure)
-    {}
+    {
+    }

    /**
     * 一对一 关联模型预查询拼装
     * @access public
-     * @param string    $model 模型名称
-     * @param string    $relation 关联名
-     * @param Model     $result 模型对象实例
+     * @param string $model    模型名称
+     * @param string $relation 关联名
+     * @param Model  $result   模型对象实例
     * @return void
     */
    protected function match($model, $relation, &$result)
@@ -215,16 +251,17 @@ abstract class OneToOne extends Relation
                $this->bindAttr($relationModel, $result, $this->bindAttr);
            }
        }
-        $result->setAttr($relation, !isset($relationModel) ? null : $relationModel->isUpdate(true));
+        $result->setAttr(Loader::parseName($relation), !isset($relationModel) ? null : $relationModel->isUpdate(true));
    }

    /**
     * 绑定关联属性到父模型
     * @access protected
-     * @param Model    $model 关联模型对象
-     * @param Model    $result 父模型对象
-     * @param array    $bindAttr 绑定属性
+     * @param Model $model    关联模型对象
+     * @param Model $result   父模型对象
+     * @param array $bindAttr 绑定属性
     * @return void
+     * @throws Exception
     */
    protected function bindAttr($model, &$result, $bindAttr)
    {
@@ -241,26 +278,29 @@ abstract class OneToOne extends Relation
    /**
     * 一对一 关联模型预查询（IN方式）
     * @access public
-     * @param object    $model 关联模型对象
-     * @param array     $where 关联预查询条件
-     * @param string    $key 关联键名
-     * @param string    $relation 关联名
-     * @param string    $subRelation 子关联
-     * @param bool      $closure
+     * @param object        $model       关联模型对象
+     * @param array         $where       关联预查询条件
+     * @param string        $key         关联键名
+     * @param string        $relation    关联名
+     * @param string        $subRelation 子关联
+     * @param bool|\Closure $closure
     * @return array
     */
    protected function eagerlyWhere($model, $where, $key, $relation, $subRelation = '', $closure = false)
    {
        // 预载入关联查询 支持嵌套预载入
        if ($closure) {
-            call_user_func_array($closure, [ & $model]);
+            call_user_func_array($closure, [& $model]);
+            if ($field = $model->getOptions('with_field')) {
+                $model->field($field)->removeOption('with_field');
+            }
        }
        $list = $model->where($where)->with($subRelation)->select();

        // 组装模型数据
        $data = [];
        foreach ($list as $set) {
-            $data[$set->$key][] = $set;
+            $data[$set->$key] = $set;
        }
        return $data;
    }