16/11/1404

src/utils/inputRules.ts

@@ -245,15 +245,17 @@ export const passwordRules = () => {
 
 export const englishNumberRule = () => {
     return {
-        validator: (_: any, value: string) => {
+        validator: (_: any, value: string | number) => {
-            if (!value) return Promise.resolve()
+            const str = value != null ? String(value) : ''
-            const hasPersianDigits = /[۰-۹]/.test(value)
+            if (!str) return Promise.resolve()
-            if (hasPersianDigits) {
+            const isEnglishDigitsOnly = /^[0-9]+$/.test(str)
+            if (!isEnglishDigitsOnly) {
                 return Promise.reject('لطفاً فقط از اعداد انگلیسی استفاده کنید')
             }
             return Promise.resolve()
         },
-        trigger: 'change',
+        trigger: ['change', 'blur'],
     }
 }
 
+

src/views/login/components/Register.vue

@@ -10,15 +10,15 @@
       <a-form-item :rules="[required()]" class="home_appear_fade_in_down" label="نام خانوادگی" name="lname">
         <BasicInput v-model:value="userFormState.lname" place-holder="نام خانوادگی" />
       </a-form-item>
-      <a-form-item :rules="[required(),mobileValidation(), englishNumberRule()]" class="home_appear_fade_in_down" label="شماره تلفن"
+      <a-form-item :rules="[required(),mobileValidation()]" class="home_appear_fade_in_down" label="شماره تلفن"
                    name="mobile">
-        <BasicInput :rules="[englishNumberRule()]" v-model:value="userFormState.mobile" place-holder="شماره تلفن" inputmode="decimal"/>
+        <BasicInput v-model:value="userFormState.mobile" place-holder="شماره تلفن" inputmode="decimal"/>
       </a-form-item>
-      <a-form-item :rules="[required(), englishNumberRule()]" class="home_appear_fade_in_down" label="کلمه عبور" name="password">
+      <a-form-item :rules="[required()]" class="home_appear_fade_in_down" label="کلمه عبور" name="password">
         <!--        <BasicInput v-model:value="userFormState.password" size="large" place-holder="کلمه عبور"/>-->
         <AInputPassword v-model:value="userFormState.password" place-holder="کلمه عبور" />
       </a-form-item>
-      <a-form-item  :rules="[required(), englishNumberRule()]" class="home_appear_fade_in_down" label="کد معرف" name="referral_id">
+      <a-form-item  :rules="[required()]" class="home_appear_fade_in_down" label="کد معرف" name="referral_id">
         <BasicInput :disabled="disableForm" v-model:value="userFormState.referral_id" place-holder="کد معرف"/>
       </a-form-item>
       <!--      <a-form-item v-if="URLUserType() === 'customer'" :rules="[required()]" class="home_appear_fade_in_down"
@@ -117,7 +117,7 @@
 
 <script lang="ts" setup>
 
-import {englishNumberRule, mobileValidation, required} from '@/utils/inputRules'
+import {mobileValidation, required} from '@/utils/inputRules'
 import type { User } from '@/models/login'
 import BasicInput from '@/components/BasicPacks/BasicInput.vue'
 import BasicButton from '@/components/BasicPacks/BasicButton.vue'