From 98c37f5e2b2732fa3e50d9e4a5e4743fd7b16f20 Mon Sep 17 00:00:00 2001
From: F4NNIU <sparkamax@gmail.com>
Date: Mon, 11 May 2020 01:04:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=99=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=9C=A8=E7=BC=96=E8=BE=91=E6=97=B6=E5=8A=A0=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/user/User.php |  1 +
 application/admin/validate/User.php        | 12 ++++++++++--
 application/admin/view/user/user/edit.html |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/user/User.php b/application/admin/controller/user/User.php
index 814ecd03..4bf19a82 100644
--- a/application/admin/controller/user/User.php
+++ b/application/admin/controller/user/User.php
@@ -66,6 +66,7 @@ class User extends Backend
     public function edit($ids = NULL)
     {
         $row = $this->model->get($ids);
+        $this->modelValidate = true;
         if (!$row)
             $this->error(__('No Results were found'));
         $this->view->assign('groupList', build_select('row[group_id]', \app\admin\model\UserGroup::column('id,name'), $row['group_id'], ['class' => 'form-control selectpicker']));
diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php
index e1747f43..f545389e 100644
--- a/application/admin/validate/User.php
+++ b/application/admin/validate/User.php
@@ -10,6 +10,14 @@ class User extends Validate
      * 验证规则
      */
     protected $rule = [
+        'username' => 'require|regex:\w{3,12}|unique:user',
+        'nickname' => 'require|unique:user',
+        'password' => 'regex:\S{6,32}',
+        'email'    => 'require|email|unique:user',
+        'mobile'   => 'require|unique:user'
+    ];
+    
+    /**
     ];
     /**
      * 提示消息
@@ -21,7 +29,7 @@ class User extends Validate
      */
     protected $scene = [
         'add'  => [],
-        'edit' => [],
+        'edit' => ['username', 'email', 'nickname', 'password', 'email', 'mobile'],
     ];
-    
+
 }
diff --git a/application/admin/view/user/user/edit.html b/application/admin/view/user/user/edit.html
index 426289bd..6584ac73 100644
--- a/application/admin/view/user/user/edit.html
+++ b/application/admin/view/user/user/edit.html
@@ -1,5 +1,5 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
+    <input type="hidden" name="row[id]" value="{$row.id}">
     <div class="form-group">
         <label for="c-group_id" class="control-label col-xs-12 col-sm-2">{:__('Group')}:</label>
         <div class="col-xs-12 col-sm-4">

From 379326628001e19aca6334f3019ffd804044bf41 Mon Sep 17 00:00:00 2001
From: F4NNIU <sparkamax@gmail.com>
Date: Mon, 11 May 2020 09:28:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/validate/User.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/application/admin/validate/User.php b/application/admin/validate/User.php
index f545389e..c2ab92e2 100644
--- a/application/admin/validate/User.php
+++ b/application/admin/validate/User.php
@@ -18,6 +18,9 @@ class User extends Validate
     ];
     
     /**
+     * 字段描述
+     */
+    protected $field = [
     ];
     /**
      * 提示消息
@@ -32,4 +35,16 @@ class User extends Validate
         'edit' => ['username', 'email', 'nickname', 'password', 'email', 'mobile'],
     ];
 
+    public function __construct(array $rules = [], $message = [], $field = [])
+    {
+        $this->field = [
+            'username' => __('Username'),
+            'nickname' => __('Nickname'),
+            'password' => __('Password'),
+            'email'    => __('Email'),
+            'mobile'   => __('Mobile')
+        ];
+        parent::__construct($rules, $message, $field);
+    }
+    
 }