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

Query类增加hidden和visible方法 用于模型输出的字段隐藏和显示

Browse Source 
with和relation方法支持多次调用
This commit is contained in:
thinkphp
2017-01-22 17:13:41 +08:00
parent 1b17858887
commit b1fa683e3d
1 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
library/think/db/Query.php
View File

@@ -1503,6 +1503,30 @@ class Query
return $this;
}
/**
* 设置模型输出显示字段
* @access public
* @param mixed $visible
* @return $this
*/
public function visible($visible)
{
$this->options['visible'] = $visible;
return $this;
}
/**
* 设置模型输出隐藏字段
* @access public
* @param mixed $hidden
* @return $this
*/
public function hidden($hidden)
{
$this->options['hidden'] = $hidden;
return $this;
}
/**
* 指定数据表别名
* @access public
@@ -1911,7 +1935,11 @@ class Query
}
}
$this->via();
$this->options['with'] = $with;
if (isset($this->options['with'])) {
$this->options['with'] = array_merge($this->options['with'], $with);
} else {
$this->options['with'] = $with;
}
return $this;
}
@@ -1976,12 +2004,22 @@ class Query
/**
* 设置关联查询
* @access public
* @param string $relation 关联名称
* @param string|array $relation 关联名称
* @return $this
*/
public function relation($relation)
{
$this->options['relation'] = $relation;
if (empty($relation)) {
return $this;
}
if (is_string($relation)) {
$relation = explode(',', $relation);
}
if (isset($this->options['relation'])) {
$this->options['relation'] = array_mrege($this->options['relation'], $relation);
} else {
$this->options['relation'] = $relation;
}
return $this;
}
@@ -2295,6 +2333,7 @@ class Query
/** @var Model $result */
$model = new $modelName($result);
$model->isUpdate(true);
// 关联查询
if (!empty($options['relation'])) {
$model->relationQuery($options['relation']);
@@ -2303,6 +2342,14 @@ class Query
if (!empty($options['with_count'])) {
$model->relationCount($model, $options['with_count']);
}
// 显式或隐藏属性
if (!empty($options['visible'])) {
$model->visible($options['visible']);
} elseif (!empty($options['hidden'])) {
$model->hidden($options['hidden']);
}
$resultSet[$key] = $model;
}
if (!empty($options['with'])) {
@@ -2414,6 +2461,12 @@ class Query
if (!empty($options['with_count'])) {
$data->relationCount($data, $options['with_count']);
}
// 显式或隐藏属性
if (!empty($options['visible'])) {
$data->visible($options['visible']);
} elseif (!empty($options['hidden'])) {
$data->hidden($options['hidden']);
}
}
} elseif (!empty($options['fail'])) {
$this->throwNotFound($options);