0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
JaguarJack 2021-02-10 08:33:17 +08:00
parent adb7ff5a03
commit e9179ee084
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
extend/catcher/traits/db/BaseOptionsTrait.php
View File

@ -3,9 +3,7 @@ declare(strict_types=1);
namespace catcher\traits\db;
use catcher\CatchModelCollection;
use catcher\Utils;
use think\Collection;
trait BaseOptionsTrait
{
@ -189,25 +187,4 @@ trait BaseOptionsTrait
return $model->save();
}
/**
* rewrite collection
*
* @time 2020年10月20日
* @param array|iterable $collection
* @param string|null $resultSetType
* @return CatchModelCollection|mixed
*/
public function toCollection(iterable $collection = [], string $resultSetType = null): Collection
{
$resultSetType = $resultSetType ?: $this->resultSetType;
if ($resultSetType && false !== strpos($resultSetType, '\\')) {
$collection = new $resultSetType($collection);
} else {
$collection = new CatchModelCollection($collection);
}
return $collection;
}
}

24
extend/catcher/traits/db/RewriteTrait.php
View File

@ -1,6 +1,9 @@
<?php
namespace catcher\traits\db;
use catcher\CatchModelCollection;
use think\Collection;
/**
* 重写 think\Model 的方法
*
@ -53,4 +56,25 @@ trait RewriteTrait
return $this;
}
/**
* rewrite collection
*
* @time 2020年10月20日
* @param array|iterable $collection
* @param string|null $resultSetType
* @return CatchModelCollection|mixed
*/
public function toCollection(iterable $collection = [], string $resultSetType = null): Collection
{
$resultSetType = $resultSetType ?: $this->resultSetType;
if ($resultSetType && false !== strpos($resultSetType, '\\')) {
$collection = new $resultSetType($collection);
} else {
$collection = new CatchModelCollection($collection);
}
return $collection;
}
}