From 9b2f18e0f8841e7de6b212442049d30a3aea21c3 Mon Sep 17 00:00:00 2001
From: Gzx1999 <guozhengxin@kylinos.cn>
Date: Tue, 5 Dec 2023 17:28:01 +0800
Subject: [PATCH] add check rules for AddUser form

---
 frontend/src/views/Login/Login.vue            |  4 +-
 frontend/src/views/Login/logic.ts             |  9 ++--
 .../src/views/User/components/AddUser.vue     | 54 +++++++++++++++++--
 frontend/src/views/User/components/logic.ts   | 23 ++++++++
 4 files changed, 81 insertions(+), 9 deletions(-)
 create mode 100644 frontend/src/views/User/components/logic.ts

diff --git a/frontend/src/views/Login/Login.vue b/frontend/src/views/Login/Login.vue
index f47270a..678d941 100644
--- a/frontend/src/views/Login/Login.vue
+++ b/frontend/src/views/Login/Login.vue
@@ -36,7 +36,7 @@ import { directTo } from '@/router/index';
 import { loginByEmail } from "@/request/user";
 import { RespCodeOK } from "@/request/request";
 import { setToken } from "@/module/cookie";
-import { checkEmail } from "./logic";
+import { checkAccount } from "./logic";
 import { userStore } from "@/stores/user";
 
 const loginFormRef = ref()
@@ -53,7 +53,7 @@ const rules = {
             trigger: "blur"
         },
         {
-            validator: checkEmail,
+            validator: checkAccount,
             message: "请输入正确的邮箱格式",
             trigger: "blur"
         }
diff --git a/frontend/src/views/Login/logic.ts b/frontend/src/views/Login/logic.ts
index decb848..ab66a32 100644
--- a/frontend/src/views/Login/logic.ts
+++ b/frontend/src/views/Login/logic.ts
@@ -1,14 +1,15 @@
 
-export let checkEmail = (rule:any, value:any, callback:any) => {
+// 校验登录账号
+export let checkAccount = (rule: any, value: any, callback: Function) => {
     if (!value) {
-      return callback();
+        return callback();
     }
     if (value === "admin") {
-      return callback();
+        return callback();
     }
     let patt = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
     if (!patt.test(value)) {
         return callback(new Error("邮箱格式错误"))
     }
     return callback()
-  };
+};
diff --git a/frontend/src/views/User/components/AddUser.vue b/frontend/src/views/User/components/AddUser.vue
index 4000ddf..72b0f9e 100644
--- a/frontend/src/views/User/components/AddUser.vue
+++ b/frontend/src/views/User/components/AddUser.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-form :model="form" ref="form" label-width="100px">
+        <el-form :model="form" :rules="rules" ref="form" label-width="100px">
             <el-form-item label="用户名:" prop="username">
                 <el-input class="ipInput" type="text" v-model="form.username" autocomplete="off"></el-input>
             </el-form-item>
@@ -10,7 +10,7 @@
             </el-form-item>
             <el-form-item label="部门:" prop="departName">
                 <el-input class="ipInput" controls-position="right" v-model="form.departName" autocomplete="off"></el-input>
-                <PGTree style="width: 98%;">
+                <PGTree style="width: 98%;" :showHeader="false">
                 </PGTree>
             </el-form-item>
             <el-form-item label="用户角色:" prop="role">
@@ -39,6 +39,50 @@ import { ref, onMounted } from "vue";
 
 import PGTree from "@/components/PGTree.vue";
 
+import { checkEmail, checkPhone } from "./logic";
+
+const rules = {
+    username: [
+        {
+            required: true,
+            message: "请输入用户名",
+            trigger: "blur"
+        }],
+    password: [
+        {
+            required: true,
+            message: "请输入密码",
+            trigger: "blur"
+        }],
+    departName: [{
+        required: true,
+        message: "请选择部门",
+        trigger: "blur"
+    }],
+    role: [{
+        required: true,
+        message: "请选择角色",
+        trigger: "blur"
+    }],
+    phone: [
+        {
+            validator: checkPhone,
+            message: "请输入正确的手机号格式",
+            trigger: "change",
+        }],
+    email: [
+        {
+            required: true,
+            message: "请输入邮箱",
+            trigger: "blur",
+        },
+        {
+            validator: checkEmail,
+            message: "请输入正确的邮箱格式",
+            trigger: "change",
+        }],
+}
+
 const roles = ref([
     {
         value: '1',
@@ -55,4 +99,8 @@ const form = ref<any>({});
 
 </script>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.dialog-footer {
+    text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/frontend/src/views/User/components/logic.ts b/frontend/src/views/User/components/logic.ts
new file mode 100644
index 0000000..9f2aa3c
--- /dev/null
+++ b/frontend/src/views/User/components/logic.ts
@@ -0,0 +1,23 @@
+
+// 校验邮箱
+export let checkEmail = (rule: any, value: any, callback: Function) => {
+    if (!value) {
+        return callback();
+    }
+
+    let patt = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/;
+    if (!patt.test(value)) {
+        return callback(new Error("邮箱格式错误"))
+    }
+    return callback()
+};
+
+
+// 校验手机号
+export let checkPhone = (rule: any, value: any, callback: Function) => {
+    let reg = /^[1]([3-9])[0-9]{9}$/;
+    if (!reg.test(value)) {
+        return callback(new Error("手机号格式错误"))
+    }
+    return callback()
+};
\ No newline at end of file
-- 
Gitee