feat(projects): page manage_user

soybeanjs · Jan 28, 2024 · 8a170ee · 8a170ee · vercel · Jan 28, 2024
1 parent a19f895
commit 8a170ee
Show file tree

Hide file tree

Showing 11 changed files with 703 additions and 52 deletions.
diff --git a/src/constants/business.ts b/src/constants/business.ts
@@ -6,3 +6,17 @@ export const roleStatusRecord: Record<Api.SystemManage.RoleStatus, App.I18n.I18n
 };
 
 export const roleStatusOptions = transformRecordToOption(roleStatusRecord);
+
+export const userGenderRecord: Record<Api.SystemManage.UserGender, App.I18n.I18nKey> = {
+  '1': 'page.manage.user.gender.male',
+  '2': 'page.manage.user.gender.female'
+};
+
+export const userGenderOptions = transformRecordToOption(userGenderRecord);
+
+export const userStatusRecord: Record<Api.SystemManage.UserStatus, App.I18n.I18nKey> = {
+  '1': 'page.manage.user.status.enable',
+  '2': 'page.manage.user.status.disable'
+};
+
+export const userStatusOptions = transformRecordToOption(userStatusRecord);
diff --git a/src/hooks/common/form.ts b/src/hooks/common/form.ts
@@ -4,47 +4,40 @@ import { REG_CODE_SIX, REG_EMAIL, REG_PHONE, REG_PWD, REG_USER_NAME } from '@/co
 import { $t } from '@/locales';
 
 export function useFormRules() {
-  const constantRules = {
-    userName: [
-      createRequiredRule($t('form.userName.required')),
-      {
-        pattern: REG_USER_NAME,
-        message: $t('form.userName.invalid'),
-        trigger: 'change'
-      }
-    ],
-    phone: [
-      createRequiredRule($t('form.phone.required')),
-      {
-        pattern: REG_PHONE,
-        message: $t('form.phone.invalid'),
-        trigger: 'change'
-      }
-    ],
-    pwd: [
-      createRequiredRule($t('form.pwd.required')),
-      {
-        pattern: REG_PWD,
-        message: $t('form.pwd.invalid'),
-        trigger: 'change'
-      }
-    ],
-    code: [
-      createRequiredRule($t('form.code.required')),
-      {
-        pattern: REG_CODE_SIX,
-        message: $t('form.code.invalid'),
-        trigger: 'change'
-      }
-    ],
-    email: [
-      createRequiredRule($t('form.email.required')),
-      {
-        pattern: REG_EMAIL,
-        message: $t('form.email.invalid'),
-        trigger: 'change'
-      }
-    ]
+  const patternRules = {
+    userName: {
+      pattern: REG_USER_NAME,
+      message: $t('form.userName.invalid'),
+      trigger: 'change'
+    },
+    phone: {
+      pattern: REG_PHONE,
+      message: $t('form.phone.invalid'),
+      trigger: 'change'
+    },
+    pwd: {
+      pattern: REG_PWD,
+      message: $t('form.pwd.invalid'),
+      trigger: 'change'
+    },
+    code: {
+      pattern: REG_CODE_SIX,
+      message: $t('form.code.invalid'),
+      trigger: 'change'
+    },
+    email: {
+      pattern: REG_EMAIL,
+      message: $t('form.email.invalid'),
+      trigger: 'change'
+    }
+  } satisfies Record<string, App.Global.FormRule>;
+
+  const formRules = {
+    userName: [createRequiredRule($t('form.userName.required')), patternRules.userName],
+    phone: [createRequiredRule($t('form.phone.required')), patternRules.phone],
+    pwd: [createRequiredRule($t('form.pwd.required')), patternRules.pwd],
+    code: [createRequiredRule($t('form.code.required')), patternRules.code],
+    email: [createRequiredRule($t('form.email.required')), patternRules.email]
   } satisfies Record<string, App.Global.FormRule[]>;
 
   /** the default required rule */
@@ -58,7 +51,8 @@ export function useFormRules() {
   }
 
   return {
-    constantRules,
+    patternRules,
+    formRules,
     defaultRequiredRule,
     createRequiredRule
   };

diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
@@ -271,6 +271,35 @@ const local: App.I18n.Schema = {
           enable: 'Enable',
           disable: 'Disable'
         }
+      },
+      user: {
+        title: 'User List',
+        form: {
+          userName: 'Please enter user name',
+          userGender: 'Please select gender',
+          nickName: 'Please enter nick name',
+          userPhone: 'Please enter phone number',
+          userEmail: 'Please enter email',
+          userStatus: 'Please select user status',
+          userRole: 'Please select user role'
+        },
+        userName: 'User Name',
+        userGender: 'Gender',
+        nickName: 'Nick Name',
+        userPhone: 'Phone Number',
+        userEmail: 'Email',
+        userStatus: 'User Status',
+        userRole: 'User Role',
+        addUser: 'Add User',
+        editUser: 'Edit User',
+        gender: {
+          male: 'Male',
+          female: 'Female'
+        },
+        status: {
+          enable: 'Enable',
+          disable: 'Disable'
+        }
       }
     }
   },

diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
@@ -271,6 +271,35 @@ const local: App.I18n.Schema = {
           enable: '启用',
           disable: '禁用'
         }
+      },
+      user: {
+        title: '用户列表',
+        form: {
+          userName: '请输入用户名',
+          userGender: '请选择性别',
+          nickName: '请输入昵称',
+          userPhone: '请输入手机号',
+          userEmail: '请输入邮箱',
+          userStatus: '请选择用户状态',
+          userRole: '请选择用户角色'
+        },
+        userName: '用户名',
+        userGender: '性别',
+        nickName: '昵称',
+        userPhone: '手机号',
+        userEmail: '邮箱',
+        userStatus: '用户状态',
+        userRole: '用户角色',
+        addUser: '新增用户',
+        editUser: '编辑用户',
+        gender: {
+          male: '男',
+          female: '女'
+        },
+        status: {
+          enable: '启用',
+          disable: '禁用'
+        }
       }
     }
   },

diff --git a/src/service/api/system-manage.ts b/src/service/api/system-manage.ts
@@ -8,3 +8,24 @@ export function fetchGetRoleList(params?: Api.SystemManage.RoleSearchParams) {
     params
   });
 }
+
+/**
+ * get all roles
+ *
+ * these roles are all enabled
+ */
+export function fetchGetAllRoles() {
+  return request<Api.SystemManage.AllRole[]>({
+    url: '/systemManage/getAllRoles',
+    method: 'get'
+  });
+}
+
+/** get user list */
+export function fetchGetUserList(params?: Api.SystemManage.UserSearchParams) {
+  return request<Api.SystemManage.UserList>({
+    url: '/systemManage/getUserList',
+    method: 'get',
+    params
+  });
+}
diff --git a/src/typings/api.d.ts b/src/typings/api.d.ts
@@ -77,6 +77,8 @@ declare namespace Api {
    * backend api module: "systemManage"
    */
   namespace SystemManage {
+    type CommonSearchParams = Pick<Common.PaginatingCommonParams, 'current' | 'size'>;
+
     /**
      * role status
      *
@@ -99,11 +101,56 @@ declare namespace Api {
 
     /** role search params */
     type RoleSearchParams = CommonType.RecordNullable<
-      Pick<Api.SystemManage.Role, 'roleName' | 'roleCode' | 'roleStatus'> &
-        Pick<Common.PaginatingCommonParams, 'current' | 'size'>
+      Pick<Api.SystemManage.Role, 'roleName' | 'roleCode' | 'roleStatus'> & CommonSearchParams
     >;
 
     /** role list */
     type RoleList = Common.PaginatingQueryRecord<Role>;
+
+    /** all role */
+    type AllRole = Pick<Role, 'id' | 'roleName' | 'roleCode'>;
+
+    /**
+     * user gender
+     *
+     * - "1": "male"
+     * - "2": "female"
+     */
+    type UserGender = '1' | '2';
+
+    /**
+     * user status
+     *
+     * - "1": enabled
+     * - "2": disabled
+     */
+    type UserStatus = '1' | '2';
+
+    /** user */
+    type User = Common.CommonRecord<{
+      /** user name */
+      userName: string;
+      /** user gender */
+      userGender: UserGender | null;
+      /** user nick name */
+      nickName: string;
+      /** user phone */
+      userPhone: string;
+      /** user email */
+      userEmail: string;
+      /** user role code collection */
+      userRoles: string[];
+      /** user status */
+      userStatus: UserStatus | null;
+    }>;
+
+    /** user search params */
+    type UserSearchParams = CommonType.RecordNullable<
+      Pick<Api.SystemManage.User, 'userName' | 'userGender' | 'nickName' | 'userPhone' | 'userEmail' | 'userStatus'> &
+        CommonSearchParams
+    >;
+
+    /** user list */
+    type UserList = Common.PaginatingQueryRecord<User>;
   }
 }
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
@@ -459,6 +459,35 @@ declare namespace App {
               disable: string;
             };
           };
+          user: {
+            title: string;
+            form: {
+              userName: string;
+              userGender: string;
+              nickName: string;
+              userPhone: string;
+              userEmail: string;
+              userStatus: string;
+              userRole: string;
+            };
+            userName: string;
+            userGender: string;
+            nickName: string;
+            userPhone: string;
+            userEmail: string;
+            userStatus: string;
+            userRole: string;
+            addUser: string;
+            editUser: string;
+            gender: {
+              male: string;
+              female: string;
+            };
+            status: {
+              enable: string;
+              disable: string;
+            };
+          };
         };
       };
       form: {

diff --git a/src/views/_builtin/login/modules/pwd-login.vue b/src/views/_builtin/login/modules/pwd-login.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { reactive } from 'vue';
+import { computed, reactive } from 'vue';
 import { $t } from '@/locales';
 import { loginModuleRecord } from '@/constants/app';
 import { useRouterPush } from '@/hooks/common/router';
@@ -13,7 +13,6 @@ defineOptions({
 const authStore = useAuthStore();
 const { toggleLoginModule } = useRouterPush();
 const { formRef, validate } = useNaiveForm();
-const { constantRules } = useFormRules();
 
 interface FormModel {
   userName: string;
@@ -25,10 +24,14 @@ const model: FormModel = reactive({
   password: '123456'
 });
 
-const rules: Record<keyof FormModel, App.Global.FormRule[]> = {
-  userName: constantRules.userName,
-  password: constantRules.pwd
-};
+const rules = computed<Record<keyof FormModel, App.Global.FormRule[]>>(() => {
+  const { formRules } = useFormRules(); // inside computed to make locale reactive
+
+  return {
+    userName: formRules.userName,
+    password: formRules.pwd
+  };
+});
 
 async function handleSubmit() {
   await validate();