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

Model类数据验证方法改为public 增加insert和update快捷方法

Browse Source
This commit is contained in:
thinkphp
2016-04-08 14:12:23 +08:00
parent a4cc8c2ca1
commit e0d1f4d8b9
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
library/think/Model.php
View File

@@ -299,20 +299,18 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
public function save($data = [], $where = []) public function save($data = [], $where = [])
{ {
if (!empty($data)) { if (!empty($data)) {
// 数据对象赋值
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$this->__set($key, $value); $this->__set($key, $value);
} }
} }
// 数据自动验证 // 数据自动验证
if (!$this->dataValidate($this->data)) { if (!$this->validateData($this->data)) {
return false; return false;
} }
if (false === $this->trigger('before_write', $this)) { if (false === $this->trigger('before_write', $this)) {
return false; return false;
} }
// 数据自动完成 // 数据自动完成
$this->autoDataComplete($this->auto); $this->autoDataComplete($this->auto);
@@ -321,7 +319,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (false === $this->trigger('before_update', $this)) { if (false === $this->trigger('before_update', $this)) {
return false; return false;
} }
// 自动更新 // 自动更新
$this->autoDataComplete($this->update); $this->autoDataComplete($this->update);
@@ -358,17 +355,40 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$this->data[$this->pk] = $insertId; $this->data[$this->pk] = $insertId;
} }
} }
// 新增回调 // 新增回调
$this->trigger('after_insert', $this); $this->trigger('after_insert', $this);
} }
// 写入回调 // 写入回调
$this->trigger('after_write', $this); $this->trigger('after_write', $this);
// 清空
$this->isUpdate = null;
return $result; return $result;
} }
/**
* 保存数据对象
* @access public
* @param array $data 数据
* @param array $where 更新条件
* @return integer
*/
public function insert($data = [])
{
return $this->isUpdate(false)->save($data);
}
/**
* 更新数据对象
* @access public
* @param array $data 数据
* @param array $where 更新条件
* @return integer
*/
public function update($data = [], $where = [])
{
return $this->isUpdate(true)->save($data, $where);
}
/** /**
* 是否为更新数据 * 是否为更新数据
* @access public * @access public
@@ -456,11 +476,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
/** /**
* 数据自动验证 * 数据自动验证
* @access protected * @access public
* @param array $data 数据 * @param array $data 数据
* @return void * @return void
*/ */
protected function dataValidate(&$data) public function validateData()
{ {
if (!empty($this->validate)) { if (!empty($this->validate)) {
$info = $this->validate; $info = $this->validate;
@@ -478,7 +498,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$validate->scene($scene); $validate->scene($scene);
} }
} }
if (!$validate->check($data)) { if (!$validate->check($this->data)) {
$this->error = $validate->getError(); $this->error = $validate->getError();
return false; return false;
} }