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

改进关联属性的输出

Browse Source
This commit is contained in:
thinkphp
2017-05-14 11:27:41 +08:00
parent e3665caeeb
commit 96f45258cd
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/think/Model.php
View File

@@ -658,14 +658,22 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
if (is_string($append)) { if (is_string($append)) {
$append = explode(',', $append); $append = explode(',', $append);
} }
$model = $this->getAttr($relation);
$relation = Loader::parseName($relation, 1, false);
if (isset($this->relation[$relation])) {
$model = $this->relation[$relation];
} else {
$model = $this->getAttr($relation);
}
if ($model instanceof Model) { if ($model instanceof Model) {
foreach ($append as $key => $attr) { foreach ($append as $key => $attr) {
$key = is_numeric($key) ? $attr : $key; $key = is_numeric($key) ? $attr : $key;
if ($this->__isset($key)) { if (isset($this->data[$key])) {
throw new Exception('bind attr has exists:' . $key); throw new Exception('bind attr has exists:' . $key);
} else { } else {
$this->setAttr($key, $model->$attr); $this->data[$key] = $model->$attr;
} }
} }
} }
@@ -778,7 +786,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 关联模型数据集 // 关联模型数据集
$arr = []; $arr = [];
foreach ($val as $k => $value) { foreach ($val as $k => $value) {
$arr[$k] = $this->subToArray($value, $visible, $hidden, $k); $arr[$k] = $this->subToArray($value, $visible, $hidden, $key);
} }
$item[$key] = $arr; $item[$key] = $arr;
} else { } else {