Selaa lähdekoodia

feat(account): validate for user

gemercheung 3 vuotta sitten
vanhempi
commit
2bd989d20e

+ 2 - 1
src/api/system/system.ts

@@ -12,6 +12,7 @@ import {
   RoleListGetResultModel,
   SaveRoleParams,
 } from './model/systemModel';
+import { Result } from '/#/axios';
 import { defHttp } from '/@/utils/http/axios';
 // import { ContentTypeEnum } from '/@/enums/httpEnum';
 // sys/user/list
@@ -83,4 +84,4 @@ export const deptListApi = (params?: RolePageParams) =>
   defHttp.post<RolePageListGetResultModel>({ url: Api.DeptList, params });
 
 export const checkUserApi = (params?: CheckUserParams) =>
-  defHttp.post<RolePageListGetResultModel>({ url: Api.checkUser, params });
+  defHttp.post<Result>({ url: Api.checkUser, params });

+ 4 - 4
src/components/Form/src/BasicForm.vue

@@ -241,12 +241,12 @@
       function setFormModel(key: string, value: any) {
         formModel[key] = value;
         const { validateTrigger } = unref(getBindValue);
-        console.log(' unref(getBindValue)', unref(getBindValue));
+        // console.log(' unref(getBindValue)', unref(getBindValue));
 
         console.log('validateTrigger', validateTrigger, formModel);
-        if (!validateTrigger || validateTrigger === 'change') {
-          validateFields([key]).catch((_) => {});
-        }
+        // if (!validateTrigger || validateTrigger === 'change') {
+        //   validateFields([key]).catch((_) => {});
+        // }
       }
 
       function handleEnterPress(e: KeyboardEvent) {

+ 0 - 1
src/components/Modal/src/hooks/useModal.ts

@@ -55,7 +55,6 @@ export function useModal(): UseModalReturnType {
   }
 
   const getInstance = () => {
-    console.log('modal', modal);
     const instance = unref(modal);
     if (!instance) {
       error('useModal instance is undefined!');

+ 15 - 8
src/views/dashboard/system/account/account.data.ts

@@ -5,6 +5,7 @@ import { FormSchema } from '/@/components/Table';
 import { h } from 'vue';
 // import { Switch } from 'ant-design-vue';
 import { Time } from '/@/components/Time';
+import { isBoolean } from '/@/utils/is';
 
 export const columns: BasicColumn[] = [
   {
@@ -128,7 +129,6 @@ export const accountFormSchema: FormSchema[] = [
     component: 'Input',
     required: true,
     helpMessage: ['验证提示', '手机号需在指房宝APP注册后才可新增'],
-
     itemProps: {
       validateTrigger: 'blur',
     },
@@ -139,14 +139,21 @@ export const accountFormSchema: FormSchema[] = [
       },
       {
         validator(_, value) {
-          return new Promise((resolve, reject) => {
-            checkUserApi({
-              phone: value,
-            })
-              .then(() => resolve())
-              .catch((err) => {
-                reject(err.message || '验证失败');
+          return new Promise(async (resolve, reject) => {
+            try {
+              const res = await checkUserApi({
+                phone: value,
               });
+
+              isBoolean(res) && res ? resolve() : reject('用户不存在');
+            } catch (error) {
+              reject(error.message || '用户不存在');
+            }
+
+            //   .then(() => resolve())
+            //   .catch((err) => {
+            //     reject(err.message || '验证失败');
+            //   });
           });
         },
       },