From d154f3e1ac272711cb7c953b7b643a6f80df89d3 Mon Sep 17 00:00:00 2001
From: wuyanwen <wuyanwen@baijiayun.com>
Date: Thu, 12 Dec 2019 09:13:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 catchAdmin/user/controller/User.php | 34 +++++++++++++++++++++--------
 catchAdmin/user/view/create.html    |  2 ++
 catchAdmin/user/view/edit.html      |  4 +++-
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/catchAdmin/user/controller/User.php b/catchAdmin/user/controller/User.php
index 6fe2b42..19c4817 100644
--- a/catchAdmin/user/controller/User.php
+++ b/catchAdmin/user/controller/User.php
@@ -47,10 +47,10 @@ class User extends CatchController
         $form = new CatchForm();
 
         $form->formId('userForm');
-        $form->text('username', '用户名')->verify('required')->placeholder('请输入用户名');
-        $form->text('email', '邮箱')->verify('email')->placeholder('请输入邮箱');
-        $form->password('password', '密码')->id('pwd')->verify('required|psw')->placeholder('请输入密码');
-        $form->password('passwordConfirm', '确认密码')->verify('required|equalTo', ['pwd', '两次密码输入不一致'])->placeholder('请再次输入密码');
+        $form->text('username', '用户名', true)->verify('required')->placeholder('请输入用户名');
+        $form->text('email', '邮箱', true)->verify('email')->placeholder('请输入邮箱');
+        $form->password('password', '密码', true)->id('pwd')->verify('required|psw')->placeholder('请输入密码');
+        $form->password('passwordConfirm', '确认密码', true)->verify('required|equalTo', ['pwd', '两次密码输入不一致'])->placeholder('请再次输入密码');
         $form->dom('<div id="roles"></div>', '角色');
         $form->formBtn('submitUser');
 
@@ -67,11 +67,12 @@ class User extends CatchController
      */
     public function save(CreateRequest $request)
     {
-        $uid = $this->user->storeBy($request->post());
+        $this->user->storeBy($request->post());
 
         if (!empty($request->param('roleids'))) {
             $this->user->attach($request->param('roleids'));
         }
+
         return CatchResponse::success();
     }
 
@@ -92,8 +93,8 @@ class User extends CatchController
         $form = new CatchForm();
 
         $form->formId('userForm');
-        $form->text('username', '用户名')->verify('required')->default($user->username)->placeholder('请输入用户名');
-        $form->text('email', '邮箱')->verify('email')->default($user->email)->placeholder('请输入邮箱');
+        $form->text('username', '用户名', true)->verify('required')->default($user->username)->placeholder('请输入用户名');
+        $form->text('email', '邮箱', true)->verify('email')->default($user->email)->placeholder('请输入邮箱');
         $form->password('password', '密码')->id('pwd')->placeholder('请输入密码');
         $form->password('passwordConfirm', '确认密码')->verify('equalTo', ['pwd', '两次密码输入不一致'])->placeholder('请再次输入密码');
         $form->dom('<div id="roles"></div>', '角色');
@@ -114,7 +115,17 @@ class User extends CatchController
      */
     public function update($id, UpdateRequest $request)
     {
-        return CatchResponse::success($this->user->updateBy($id, $request->post()));
+        $this->user->updateBy($id, $request->post());
+
+        $user = $this->user->findBy($id);
+
+        $user->detach();
+
+        if (!empty($request->param('roleids'))) {
+            $user->attach($request->param('roleids'));
+        }
+
+        return CatchResponse::success();
     }
 
     /**
@@ -125,7 +136,12 @@ class User extends CatchController
      */
     public function delete($id)
     {
-        return CatchResponse::success($this->user->deleteBy($id));
+        // 删除角色
+        $this->user->findBy($id)->detach();
+
+        $this->user->deleteBy($id);
+
+        return CatchResponse::success();
     }
 
     /**
diff --git a/catchAdmin/user/view/create.html b/catchAdmin/user/view/create.html
index a0a6480..042d774 100644
--- a/catchAdmin/user/view/create.html
+++ b/catchAdmin/user/view/create.html
@@ -36,6 +36,8 @@ form.on('submit(submitUser)', function (data) {
             childKey: 'children',
             collapseLeafNode: true,
             theme: 'auth-skin-default',
+            autochecked: false,
+            autoclose: false,
         });
     });
 });
diff --git a/catchAdmin/user/view/edit.html b/catchAdmin/user/view/edit.html
index 1aafbe0..ea60d6e 100644
--- a/catchAdmin/user/view/edit.html
+++ b/catchAdmin/user/view/edit.html
@@ -22,7 +22,9 @@
                 childKey: 'children',
                 collapseLeafNode: true,
                 theme: 'auth-skin-default',
-                checkedKey: response.data.hasRoles
+                checkedKey: response.data.hasRoles,
+                autochecked: false,
+                autoclose: false,
             });
         });
         // 表单提交事件