mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-09-02 13:31:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

分页功能

Browse Source
This commit is contained in:
yunwuxin
2016-05-06 18:09:43 +08:00
parent 2a42932f12
commit a00df4246e
13 changed files with 870 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Model.php
View File

@@ -16,7 +16,13 @@ use think\Db;
use think\db\Query;
use think\Loader;
use think\model\Relation;
use think\paginator\Collection as PaginatorCollection;
/**
* Class Model
* @package think
* @method PaginatorCollection paginate(integer $listRows = 15, boolean $simple = false, array $config = []) static 分页查询
*/
abstract class Model implements \JsonSerializable, \ArrayAccess
{
@@ -172,7 +178,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
continue;
}
if ($val instanceof Model) {
if ($val instanceof Model || $val instanceof Collection) {
// 关联模型对象
$item[$key] = $val->toArray();
} elseif (is_array($val) && isset($val[0]) && $val[0] instanceof Model) {