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

去除 Model类的fieldType属性定义 统一由field定义

Browse Source
This commit is contained in:
thinkphp
2016-08-10 15:47:32 +08:00
parent 159d6c3145
commit a1edf89aec
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
library/think/Model.php
View File

@@ -56,12 +56,10 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
protected $error; protected $error;
// 字段验证规则 // 字段验证规则
protected $validate; protected $validate;
// 数据表主键 复合主键使用数组定义 // 数据表主键 复合主键使用数组定义 不设置则自动获取
protected $pk; protected $pk;
// 字段属性 // 数据表字段信息 留空则自动获取
protected $field = []; protected $field = [];
// 字段类型
protected $fieldType = [];
// 显示属性 // 显示属性
protected $visible = []; protected $visible = [];
// 隐藏属性 // 隐藏属性
@@ -155,13 +153,16 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
} }
if (!empty($this->field)) { if (!empty($this->field)) {
if (true === $this->field) {
$this->field = $this->db()->getTableInfo('', 'type');
}
if (is_array($this->field) && key($this->field) !== 0) {
$query->setFieldType($this->field);
$this->field = array_keys($this->field);
}
$query->allowField($this->field); $query->allowField($this->field);
} }
if (!empty($this->fieldType)) {
$query->setFieldType($this->fieldType);
}
if (!empty($this->pk)) { if (!empty($this->pk)) {
$query->pk($this->pk); $query->pk($this->pk);
} }
@@ -616,9 +617,6 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
// 检测字段 // 检测字段
if (!empty($this->field)) { if (!empty($this->field)) {
if (true === $this->field) {
$this->field = $this->db()->getTableInfo('', 'fields');
}
foreach ($this->data as $key => $val) { foreach ($this->data as $key => $val) {
if (!in_array($key, $this->field)) { if (!in_array($key, $this->field)) {
unset($this->data[$key]); unset($this->data[$key]);
@@ -741,6 +739,11 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
*/ */
public function allowField($field) public function allowField($field)
{ {
if (true === $field) {
$field = $this->db()->getTableInfo('', 'type');
$this->db()->setFieldType($field);
$field = array_keys($field);
}
$this->field = $field; $this->field = $field;
return $this; return $this;
} }