af-mobile-client-vue3 1.6.9 → 1.6.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/components/data/XForm/index.vue

@@ -148,6 +148,12 @@ const resolvedSubmitButton = computed(() => {
   return props.submitButton
 })
 
+const fieldErrors = ref<Record<string, string>>({})
+
+function handleValidateError(model: string, error: string) {
+  fieldErrors.value[model] = error
+}
+
 // 地图预览相关
 const previewMapRef = ref(null)
 const previewLonLatKey = computed(() => {
@@ -704,6 +710,14 @@ async function onSubmit() {
 }
 async function validate() {
   await xFormRef.value?.validate()
+  const hasError = Object.values(fieldErrors.value).some(err => err && err.length > 0)
+  if (hasError) {
+    // 将错误转换为 Vant 格式
+    const errors = Object.entries(fieldErrors.value)
+      .filter(([_, msg]) => msg)
+      .map(([model, message]) => ({ name: model, message }))
+    return Promise.reject(errors)
+  }
 }
 function emitFunc(func: any, data: any, value: any, attr: any) {
   emits(func, data, value, attr)
@@ -743,6 +757,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
           :input-align="props.inputAlign"
           @set-form="setForm"
           @x-form-item-emit-func="emitFunc"
+          @validate-error="handleValidateError"
         />
         <slot name="extraFormItem" />
       </VanCellGroup>

package/src/components/data/XFormItem/index.vue

@@ -119,7 +119,7 @@ const props = defineProps({
   },
 })
 
-const emits = defineEmits(['setForm', 'xFormItemEmitFunc', 'scanCodeOrNfc'])
+const emits = defineEmits(['setForm', 'xFormItemEmitFunc', 'scanCodeOrNfc', 'validateError'])
 
 // 用 defineModel 替代 modelValue/emit
 const modelData = defineModel<string | number | boolean | any[] | Record<string, any>>()
@@ -457,87 +457,76 @@ function formTypeCheck(attr, value) {
     return
   // if (!attr.rule || !attr.rule.required || attr.rule.required === 'false')
   //   return
+  let error = ''
   switch (attr.rule.type) {
     case 'string':
       if (value.length === 0) {
-        errorMessage.value = `请输入${attr.name}`
-        return
+        error = `请输入${attr.name}`
       }
       break
     case 'number':
       if (!/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(value)) {
-        errorMessage.value = `${attr.name}必须为数字`
-        return
+        error = `${attr.name}必须为数字`
       }
       break
     case 'boolean':
     case 'array':
     case 'regexp':
       if (value) {
-        errorMessage.value = ''
-        return
+        error = ''
       }
       break
     case 'integer':
       if (!/^-?\d+$/.test(value)) {
-        errorMessage.value = `${attr.name}必须为整数`
-        return
+        error = `${attr.name}必须为整数`
       }
       break
     case 'float':
       if (!/^-?\d+\.\d+$/.test(value)) {
-        errorMessage.value = `${attr.name}必须为小数`
-        return
+        error = `${attr.name}必须为小数`
       }
       break
     case 'email':
       if (!/^[\w.%+-]+@[a-z0-9.-]+\.[a-z]{2,}$/i.test(value)) {
-        errorMessage.value = `请输入正确的邮箱地址`
-        return
+        error = `请输入正确的邮箱地址`
       }
       break
     case 'idNumber':
       if (!/^(?:\d{15}|\d{17}[0-9X])$/.test(value)) {
-        errorMessage.value = `请输入正确的身份证号码`
-        return
+        error = `请输入正确的身份证号码`
       }
       break
     case 'userPhone':
       if (!/^1[3-9]\d{9}$/.test(value)) {
-        errorMessage.value = `请输入正确的手机号码`
-        return
+        error = `请输入正确的手机号码`
       }
       break
     case 'landlineNumber':
       if (!/^0\d{2,3}[-\s]?\d{7,8}$/.test(value)) {
-        errorMessage.value = `请输入正确的座机号码`
-        return
+        error = `请输入正确的座机号码`
       }
       break
     case 'greaterThanZero':
       if (!/^(?:[1-9]\d*(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?$/i.test(value)) {
-        errorMessage.value = `请输入一个大于0的数字`
-        return
+        error = `请输入一个大于0的数字`
       }
       break
     case 'greaterThanOrEqualZero':
       if (!/^(?:\d+|\d*\.\d+)$/.test(value)) {
-        errorMessage.value = `请输入一个大于等于0的数字`
-        return
+        error = `请输入一个大于等于0的数字`
       }
       break
     case 'stringLength':
       if (!(value.length >= attr.rule.minLen && value.length < attr.rule.maxLen)) {
-        errorMessage.value = `长度必须在${attr.rule.minLen}~${attr.rule.maxLen}之间`
-        return
+        error = `长度必须在${attr.rule.minLen}~${attr.rule.maxLen}之间`
       }
       break
     case 'customJs':
       // eslint-disable-next-line no-case-declarations
       const funcStr = attr.rule.customValidatorFunc
       // 输入的数据是否符合条件
-      // eslint-disable-next-line no-case-declarations
-      const status = ref(true)
+
+      // const status = ref(true)
       // 提取函数体部分
       // eslint-disable-next-line no-case-declarations
       const funcBodyMatch = funcStr.match(/function\s*\(.*?\)\s*\{([\s\S]*)\}/)
@@ -550,10 +539,10 @@ function formTypeCheck(attr, value) {
       const customValidatorFunc = new Function('rule', 'value', 'callback', 'form', 'attr', 'util', funcBody)
       // 定义 callback 函数
       // eslint-disable-next-line no-case-declarations
-      const callback = (error) => {
-        if (error) {
-          errorMessage.value = `${error}`
-          status.value = false // 表示有错误发生
+      const callback = (errorMsg) => {
+        if (errorMsg) {
+          error = `${errorMsg}`
+          // status.value = false // 表示有错误发生
         }
       }
       // 调用自定义校验函数
@@ -565,14 +554,16 @@ function formTypeCheck(attr, value) {
         attr,
         {}, // util 对象（可以根据需要传递）
       )
-      if (!status.value)
-        return
+      // if (!status.value)
+      //   return
       break
     default:
-      errorMessage.value = ''
+      error = ''
       break
   }
-  errorMessage.value = ''
+
+  errorMessage.value = error
+  emits('validateError', attr.model, errorMessage.value)
 }
 
 onBeforeMount(() => {

package/src/views/SafeInspection/SecurityCertificate/index.vue

@@ -939,6 +939,19 @@ async function validateAllForms() {
   // 再次确保所有标签页已初始化
   await initAllTabs()
 
+  // 验证用户信息表单
+  if (userDetail.value && userInfoRef.value) {
+    try {
+      await userInfoRef.value.validate()
+    }
+    catch (error) {
+      // 更新错误计数
+      errorCounts.userInfo = error.length || 0
+      // 记录第一条错误信息
+      if (!firstErrorMessage && error && error[0])
+        firstErrorMessage = error[0]
+    }
+  }
   // 验证常规表单和slot组件
   for (let i = 0; i < config.data.length; i++) {
     const configItem = config.data[i]

package/src/views/SafeInspection/SecurityCertificate/userInfo/index.vue

@@ -52,6 +52,39 @@ defineExpose({
   getData() {
     return formData.value
   },
+  validate: async () => {
+    const errors = []
+
+    // 验证 XForm 表单
+    if (formRefs.value) {
+      try {
+        if (typeof formRefs.value.validate === 'function') {
+          await formRefs.value.validate()
+        }
+        else {
+          await formRefs.value.submit()
+        }
+      }
+      catch (error) {
+        if (Array.isArray(error)) {
+          errors.push(...error)
+        }
+        else if (error && error.message) {
+          errors.push(error.message)
+        }
+        else {
+          errors.push('表单验证失败')
+        }
+      }
+    }
+
+    // 如果有错误，抛出异常
+    if (errors.length > 0) {
+      return Promise.reject(errors)
+    }
+
+    return Promise.resolve()
+  },
 })
 </script>