From 4fa2c0d57d01d9d3cc6ee37e9f580e79df520e55 Mon Sep 17 00:00:00 2001
From: adonis <mseddighi99.ms@gmail.com>
Date: Tue, 30 Jun 2026 22:21:56 +0330
Subject: [PATCH] fix bugs

---
 src/components/BasicPacks/BasicInput.vue      | 51 +++++++++++--------
 .../BasicPriceInput/src/BasicPriceInput.vue   |  7 ++-
 src/utils/inputRules.ts                       | 18 ++++++-
 src/utils/persianDigits.ts                    | 29 +++++++++++
 src/views/login/components/Login.vue          |  2 +-
 src/views/login/components/Register.vue       |  2 +-
 6 files changed, 80 insertions(+), 29 deletions(-)
 create mode 100644 src/utils/persianDigits.ts

diff --git a/src/components/BasicPacks/BasicInput.vue b/src/components/BasicPacks/BasicInput.vue
index 95db065..cf17223 100644
--- a/src/components/BasicPacks/BasicInput.vue
+++ b/src/components/BasicPacks/BasicInput.vue
@@ -36,6 +36,7 @@
 import {usePrefix} from "@/utils/usePrefix";
 import {computed} from "vue";
 import {usePrice} from "@/components/BasicPacks/BasicPriceInput/src/utils/usePrice";
+import {persianToEnglishDigits, shouldNormalizeInputDigits} from '@/utils/persianDigits';
 
 //Props
 interface Prop {
@@ -56,29 +57,42 @@ interface Prop {
 
 const addonBgColor = computed(() => props.addonBgColor)
 const addonTextColor = computed(() => props.addonTextColor)
-//emits
-const localValue = computed({
-  set(value) {
-    // console.log(value?.toString().replaceAll(',', ''))
-    props.type === 'price' ? emits('update:value', value?.toString().replaceAll(',', '')) : emits('update:value', value)
-  },
-  get() {
-    let a = props.type === 'price' ? props.value ? usePrice(props.value as number, true, '').trim() : '' : props.value
-    // console.log(props.value)
-    return a
-  },
-})
 
 const props = withDefaults(defineProps<Prop>(), {
   isPassword: false
 })
 const emits = defineEmits(['update:value', 'onchange'])
 
+const localValue = computed({
+  set(value) {
+    emits('update:value', normalizeValue(value))
+  },
+  get() {
+    return props.type === 'price'
+      ? props.value ? usePrice(props.value as number, true, '').trim() : ''
+      : props.value
+  },
+})
+
+function normalizeValue(value: unknown) {
+  if (value == null || value === '') {
+    return value
+  }
+
+  let normalized = String(value)
+  if (shouldNormalizeInputDigits(props)) {
+    normalized = persianToEnglishDigits(normalized)
+  }
+  if (props.type === 'price') {
+    normalized = normalized.replaceAll(',', '')
+  }
+  return normalized
+}
+
 const handlerChange = (e: any) => {
-  // emits('onchange', e.target.value)
-  props.type === 'price' ? emits('update:value', e.target.value?.toString().replaceAll(',', '')) : emits('update:value', e.target.value)
-  props.type === 'price' ? emits('onchange', e.target.value?.toString().replaceAll(',', '')) : emits('onchange', e.target.value)
-  // console.log('sas')
+  const normalized = normalizeValue(e.target.value)
+  emits('update:value', normalized)
+  emits('onchange', normalized)
 }
 
 //css style
@@ -89,11 +103,6 @@ const {prefixCls} = usePrefix('input')
 @prefix: ~'@{prefixCls}-input';
 
 .@{prefix} {
-  /*  .ant-input-group-addon:first-child {
-    !*    border: #d9d9d9 1px solid;
-    border-radius: 0 6px 6px 0;*!
-  }*/
-
   .ant-input-group {
     direction: ltr;
   }
diff --git a/src/components/BasicPacks/BasicPriceInput/src/BasicPriceInput.vue b/src/components/BasicPacks/BasicPriceInput/src/BasicPriceInput.vue
index e722116..2c7bb55 100644
--- a/src/components/BasicPacks/BasicPriceInput/src/BasicPriceInput.vue
+++ b/src/components/BasicPacks/BasicPriceInput/src/BasicPriceInput.vue
@@ -1,5 +1,5 @@
 <template>
-  <BasicInput v-model:value="_val">
+  <BasicInput v-model:value="_val" type="price">
     <template v-for="(_, slotKey) in $slots" #[slotKey]="data">
       <slot :name="slotKey" v-bind="data || {}"></slot>
     </template>
@@ -10,6 +10,7 @@
 import {usePrice} from './utils/usePrice'
 import {computed} from "vue";
 import BasicInput from "../../BasicInput.vue";
+import {persianToEnglishDigits} from '@/utils/persianDigits'
 
 interface Props {
   value?: string | number
@@ -23,9 +24,7 @@ const props = withDefaults(defineProps<Props>(), {})
 
 const _val = computed({
   set(val: string) {
-    // const temp = val.toString().replaceAll(',', '')
-    const temp = val.toString().replaceAll(',', '')
-    emit('update:value', temp)
+    emit('update:value', persianToEnglishDigits(val).replaceAll(',', ''))
   },
   get() {
     return props.value ? usePrice(props.value as number, true, '').trim() : ''
diff --git a/src/utils/inputRules.ts b/src/utils/inputRules.ts
index 42f7d89..ee32f33 100644
--- a/src/utils/inputRules.ts
+++ b/src/utils/inputRules.ts
@@ -32,9 +32,23 @@ import { computed, ref } from 'vue'
 import type { Rule } from 'ant-design-vue/es/form'
 import { useWalletStore } from '@/store/walletStore'
 import {isToken} from "@/utils/index";
+import { persianToEnglishDigits } from '@/utils/persianDigits'
 
-export const mobileValidation = (title?: string) => {
-  return { len: 11, message: `شماره همراه باید 11 رقم باشد` }
+export const mobileValidation = (title?: string): Rule => {
+  const label = title ?? 'شماره تلفن'
+  return {
+    validator: (_rule, value) => {
+      const normalized = persianToEnglishDigits(String(value ?? '').trim())
+      if (!normalized) {
+        return Promise.resolve()
+      }
+      if (!/^09\d{9}$/.test(normalized)) {
+        return Promise.reject(`${label} باید با 09 شروع شود و 11 رقم باشد`)
+      }
+      return Promise.resolve()
+    },
+    trigger: ['change', 'blur'],
+  }
 }
 
 export const required = (title?: string) => {
diff --git a/src/utils/persianDigits.ts b/src/utils/persianDigits.ts
new file mode 100644
index 0000000..fc8976f
--- /dev/null
+++ b/src/utils/persianDigits.ts
@@ -0,0 +1,29 @@
+const PERSIAN_DIGITS = '۰۱۲۳۴۵۶۷۸۹'
+const ARABIC_DIGITS = '٠١٢٣٤٥٦٧٨٩'
+
+/** تبدیل ارقام فارسی/عربی و جداکننده اعشار به فرمت انگلیسی */
+export function persianToEnglishDigits(value: string | number | null | undefined): string {
+  if (value == null) {
+    return ''
+  }
+
+  return String(value)
+    .replace(/[۰-۹]/g, (d) => String(PERSIAN_DIGITS.indexOf(d)))
+    .replace(/[٠-٩]/g, (d) => String(ARABIC_DIGITS.indexOf(d)))
+    .replace(/٫/g, '.')
+}
+
+export function shouldNormalizeInputDigits(options: {
+  isPassword?: boolean
+  type?: string
+  inputmode?: string
+}): boolean {
+  if (options.isPassword) {
+    return false
+  }
+  if (options.type === 'price' || options.type === 'number') {
+    return true
+  }
+  const mode = String(options.inputmode ?? '').trim().toLowerCase()
+  return mode === 'numeric' || mode === 'decimal' || mode === 'number'
+}
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 7b75876..8c8d554 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -25,7 +25,7 @@
       <a-form-item v-if="!stepTwoVerify" :rules="[required('شماره تلفن'),mobileValidation()]"
                    class="home_appear_fade_in_down" label="شماره تلفن"
                    name="mobile">
-        <BasicInput v-model:value="userFormState.mobile" place-holder="شماره تلفن" size="large" inputmode="decimal"/>
+        <BasicInput v-model:value="userFormState.mobile" place-holder="شماره تلفن" size="large" inputmode="numeric"/>
       </a-form-item>
       <!--      </transition>-->
       <!--      <transition name="fade" mode="out-in">-->
diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue
index 4a35dd4..6738253 100644
--- a/src/views/login/components/Register.vue
+++ b/src/views/login/components/Register.vue
@@ -12,7 +12,7 @@
       </a-form-item>
       <a-form-item :rules="[required(),mobileValidation()]" class="home_appear_fade_in_down" label="شماره تلفن"
                    name="mobile">
-        <BasicInput v-model:value="userFormState.mobile" place-holder="شماره تلفن" inputmode="decimal"/>
+        <BasicInput v-model:value="userFormState.mobile" place-holder="شماره تلفن" inputmode="numeric"/>
       </a-form-item>
       <a-form-item :rules="[required()]" class="home_appear_fade_in_down" label="کلمه عبور" name="password">
         <!--        <BasicInput v-model:value="userFormState.password" size="large" place-holder="کلمه عبور"/>-->