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

Merge pull request #77 from shuipf/master

Browse Source 
优化set修改器，$data不完整
This commit is contained in:
Chino Chang
2016-05-13 14:58:00 +08:00
parent 792f146261 13ffe40a44
commit 529fb50c6e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/Model.php
View File

@@ -256,7 +256,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (!empty($data)) { if (!empty($data)) {
// 数据对象赋值 // 数据对象赋值
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$this->__set($key, $value); $this->__set($key, $value, $data);
} }
if (!empty($where)) { if (!empty($where)) {
$this->isUpdate = true; $this->isUpdate = true;
@@ -914,9 +914,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
* @access public * @access public
* @param string $name 名称 * @param string $name 名称
* @param mixed $value 值 * @param mixed $value 值
* @param array $data 数据信息
* @return void * @return void
*/ */
public function __set($name, $value) public function __set($name, $value, $data = [])
{ {
if (is_null($value) && in_array($name, $this->autoTimeField)) { if (is_null($value) && in_array($name, $this->autoTimeField)) {
// 自动写入的时间戳字段 // 自动写入的时间戳字段
@@ -943,7 +944,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 检测修改器 // 检测修改器
$method = 'set' . Loader::parseName($name, 1) . 'Attr'; $method = 'set' . Loader::parseName($name, 1) . 'Attr';
if (method_exists($this, $method)) { if (method_exists($this, $method)) {
$value = $this->$method($value, $this->data); $value = $this->$method($value, array_merge($data, $this->data));
} elseif (isset($this->type[$name])) { } elseif (isset($this->type[$name])) {
// 类型转换 // 类型转换
$type = $this->type[$name]; $type = $this->type[$name];