From 8cb45e70542c63e4319450dfaed8a089687e24bf Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 13 May 2020 10:12:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/api/system/user.js                          |  4 ++++
 vue/src/views/app/register.vue                      | 13 +++++++++++--
 vue/src/views/system/user/components/EditDialog.vue | 12 ++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/vue/src/api/system/user.js b/vue/src/api/system/user.js
index 2d2cd88..b7eaa83 100644
--- a/vue/src/api/system/user.js
+++ b/vue/src/api/system/user.js
@@ -45,3 +45,7 @@ export function updateAvatar(key) {
 export function validate(pwd) {
     return request.get(baseUrl + '/validate?pwd=' + pwd).then(({data}) => data)
 }
+
+export function checkName(name) {
+    return request.get(baseUrl + '/checkName?name=' + name).then(({data}) => data)
+}
diff --git a/vue/src/views/app/register.vue b/vue/src/views/app/register.vue
index 58d2a99..f905533 100644
--- a/vue/src/views/app/register.vue
+++ b/vue/src/views/app/register.vue
@@ -43,12 +43,18 @@
 <script>
     import md5 from "js-md5"
     import {register} from "@/api/account"
+    import {checkName} from "@/api/system/user"
     import {elSuccess} from "@/utils/message"
 
     export default {
         name: "register",
         data() {
-            let validateRepwd = (r, v, c) => {
+            const validateName = (r, v, c) => {
+                checkName(this.form.username)
+                    .then(({msg}) => msg ? c(msg) : c())
+                    .catch(e => c(e))
+            }
+            const validateRepwd = (r, v, c) => {
                 return v !== this.form.pwd ? c('两次密码输入不一致') : c()
             }
 
@@ -59,7 +65,10 @@
                     repwd: ''
                 },
                 rules: {
-                    username: [{required: true, message: '请输入用户名', trigger: 'change'}],
+                    username: [
+                        {required: true, message: '请输入用户名', trigger: 'change'},
+                        {validator: validateName, trigger: 'change'}
+                    ],
                     pwd: [
                         {required: true, message: '请输入密码', trigger: 'change'},
                         {min: 6, max: 32, message: '请输入6-32位的密码', trigger: 'change'}
diff --git a/vue/src/views/system/user/components/EditDialog.vue b/vue/src/views/system/user/components/EditDialog.vue
index 6843cfd..3b91c4e 100644
--- a/vue/src/views/system/user/components/EditDialog.vue
+++ b/vue/src/views/system/user/components/EditDialog.vue
@@ -31,7 +31,7 @@
 <script>
     import DialogForm from '@/bizComponents/DialogForm'
     import RoleSelector from './RoleSelector'
-    import {addUser, updateUser} from "@/api/system/user"
+    import {addUser, updateUser, checkName} from "@/api/system/user"
     import {isEmpty} from '@/utils'
     import {elConfirm} from "@/utils/message"
 
@@ -44,6 +44,11 @@
             data: {type: Object, default: () => ({})},
         },
         data() {
+            const validateName = (r, v, c) => {
+                checkName(this.form.name)
+                    .then(({msg}) => msg ? c(msg) : c())
+                    .catch(e => c(e))
+            }
             return {
                 loading: false,
                 form: {
@@ -54,7 +59,10 @@
                     status: 1,
                 },
                 rules: {
-                    name: [{required: true, message: '用户名称不能为空', trigger: 'change'}],
+                    name: [
+                        {required: true, message: '用户名称不能为空', trigger: 'change'},
+                        {validator: validateName, trigger: 'change'}
+                    ],
                     role: [{required: true, message: '用户角色不能为空', trigger: 'change'}],
                     status: [{required: true, message: '用户状态不能为空', trigger: 'change'}],
                 }