mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-08-30 12:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

model类完善scope方法 并支持动态调用 重写driver类的scope方法

Browse Source
This commit is contained in:
thinkphp
2016-04-09 12:37:41 +08:00
parent 4183edc3b0
commit 6675a8f4da
2 changed files with 23 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
library/think/Model.php
View File

@@ -554,7 +554,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public static function create($data = [])
{
$model = new static();
return $model->insert($data);
return $model->isUpdate(false)->save($data);
}
/**
@@ -620,18 +620,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @param string|Closure $name 命名范围名称 逗号分隔
* @return Db
*/
public static function scope($name)
public static function scope($name, $params = [])
{
$model = new static();
$class = self::db();
if ($name instanceof \Closure) {
call_user_func_array($name, [ & $class]);
call_user_func_array($name, [ & $class, $params]);
} else {
$names = explode(',', $name);
foreach ($names as $scope) {
$method = 'scope' . $scope;
if (method_exists($model, $method)) {
$model->$method($class);
$model->$method($class, $params);
}
}
}
@@ -726,6 +726,20 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
return self::$links[$model];
}
public function __call($method, $args)
{
if (method_exists($this, 'scope' . $method)) {
// 动态调用命名范围
$method = 'scope' . $method;
$class = self::db();
array_unshift($args, $class);
call_user_func_array([$this, $method], $args);
return $class;
} else {
throw new Exception(__CLASS__ . ':' . $method . ' method not exist');
}
}
public static function __callStatic($method, $params)
{
return call_user_func_array([self::db(), $method], $params);