From e8f0edad184d4f32ac65a75b7aa2cacdd8b03c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E7=BB=B4=E6=9D=B0?= <917647288@qq.com>
Date: Mon, 14 Dec 2015 13:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=8A=A8=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/model.php       |  3 +++
 library/traits/model/auto.php | 11 +++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/library/think/model.php b/library/think/model.php
index 65966a83..ddb15f9e 100644
--- a/library/think/model.php
+++ b/library/think/model.php
@@ -17,6 +17,9 @@ class Model
     const MODEL_INSERT = 1; //  新增
     const MODEL_UPDATE = 2; //  更新
     const MODEL_BOTH   = 3; //  全部
+    const EXISTS_VALIDATE   =   0;  // 存在就验证
+    const MUST_VALIDATE     =   1;  // 必须验证
+    const VALUE_VALIDATE    =   2;  // 有值就验证
     // 当前数据库操作对象
     protected $db = null;
     // 数据库对象池
diff --git a/library/traits/model/auto.php b/library/traits/model/auto.php
index f29079bb..dabc85c7 100644
--- a/library/traits/model/auto.php
+++ b/library/traits/model/auto.php
@@ -15,11 +15,6 @@ use think\Lang;
 
 trait Auto
 {
-
-    const EXISTS_VALIDATE   =   0;  // 存在就验证
-    const MUST_VALIDATE     =   1;  // 必须验证
-    const VALUE_VALIDATE    =   2;  // 有值就验证
-
     protected $validate = []; // 自动验证定义
     protected $auto     = []; // 自动完成定义
 
@@ -213,17 +208,17 @@ trait Auto
                         // 支持提示信息的多语言 使用 {%语言定义} 方式
                         $val[2] = Lang::get(substr($val[2], 2, -1));
                     }
-                    $val[3] = isset($val[3]) ? $val[3] : EXISTS_VALIDATE;
+                    $val[3] = isset($val[3]) ? $val[3] : self::EXISTS_VALIDATE;
                     $val[4] = isset($val[4]) ? $val[4] : 'regex';
                     // 判断验证条件
                     switch ($val[3]) {
-                        case MUST_VALIDATE: // 必须验证 不管表单是否有设置该字段
+                        case self::MUST_VALIDATE: // 必须验证 不管表单是否有设置该字段
                             if (false === $this->_validationField($data, $val)) {
                                 return false;
                             }
 
                             break;
-                        case VALUE_VALIDATE: // 值不为空的时候才验证
+                        case self::VALUE_VALIDATE: // 值不为空的时候才验证
                             if ('' != trim($data[$val[0]])) {
                                 if (false === $this->_validationField($data, $val)) {
                                     return false;