af-mobile-client-vue3 1.2.18 → 1.2.20

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

@@ -53,9 +53,9 @@ const props = withDefaults(defineProps<{
   submitButton: true,
   isHandleFormKey: true,
 })
-const emits = defineEmits(['onSubmit'])
+const emits = defineEmits(['onSubmit', 'xFormItemEmitFunc'])
 const userStore = useUserStore()
-const formRef = ref<FormInstance>()
+const xFormRef = ref<FormInstance>()
 const myFormItems = ref<FormItem[]>([])
 const rules = reactive({})
 const form = ref({})
@@ -203,21 +203,6 @@ function init(params) {
 }
 
 function setFormProps(form, item) {
-  // 只有在字段未定义时，按类型赋有意义的默认值
-  if (form.value[item.model] === undefined) {
-    switch (item.rule?.type) {
-      case 'number':
-      case 'integer':
-      case 'float':
-        form.value[item.model] = 0
-        break
-      case 'string':
-        form.value[item.model] = ''
-        break
-      default:
-        form.value[item.model] = ''
-    }
-  }
   if (item.rule) {
     rules[item.model] = []
     let defaultValue
@@ -273,9 +258,9 @@ function getRealKey(key, mustHandleKey = false) {
 async function asyncSubmit() {
   return new Promise((resolve, reject) => {
     validate().then(async () => {
-      const requestForm = prepareForm()
-      await appendSilenceAddFields(requestForm)
-      const realForm = handleFormKeys(requestForm)
+      const cleanedForm = prepareForm()
+      await appendSilenceAddFields(cleanedForm)
+      const realForm = handleFormKeys(cleanedForm)
       resolve({
         realForm,
         mode: props.mode,
@@ -364,21 +349,74 @@ async function appendSilenceAddFields(form) {
 
 function prepareForm() {
   const formObj = { ...form.value }
+  const cleanedForm = {}
+
   for (const key of Object.keys(formObj)) {
     const value = formObj[key]
-    if (value === null || (typeof value === 'object' && Object.keys(value).length === 0)) {
-      formObj[key] = undefined
+
+    // 跳过无效值
+    if (value === null || value === undefined || value === '') {
+      continue
+    }
+
+    // 处理数组
+    if (Array.isArray(value)) {
+      // 过滤掉空字符串、null、undefined
+      const filteredArray = value.filter(item =>
+        item !== null && item !== undefined && item !== '',
+      )
+      // 只有当数组不为空时才添加
+      if (filteredArray.length > 0) {
+        cleanedForm[key] = filteredArray
+      }
+      continue
+    }
+
+    // 处理对象
+    if (typeof value === 'object' && value !== null) {
+      // 检查对象是否为空
+      const objectKeys = Object.keys(value)
+      if (objectKeys.length === 0) {
+        continue
+      }
+
+      // 递归清理对象内部
+      const cleanedObject = {}
+      let hasValidValue = false
+
+      for (const objKey of objectKeys) {
+        const objValue = value[objKey]
+        if (objValue !== null && objValue !== undefined && objValue !== '') {
+          cleanedObject[objKey] = objValue
+          hasValidValue = true
+        }
+      }
+
+      // 只有当对象有有效值时才添加
+      if (hasValidValue) {
+        cleanedForm[key] = cleanedObject
+      }
+      continue
+    }
+
+    // 处理基本类型
+    if (value !== null && value !== undefined && value !== '') {
+      cleanedForm[key] = value
     }
   }
-  return formObj
+
+  return cleanedForm
 }
 
 async function onSubmit() {
+  await validate()
+  // 清理表单数据
+  const cleanedForm = prepareForm()
   if (!props.configName && props.groupFormItems) {
     // 只有单表才可以成功，多表关联或者自定义sql不行
-    const requestForm = prepareForm()
-    await appendSilenceAddFields(requestForm)
-    const realForm = handleFormKeys(requestForm)
+    await appendSilenceAddFields(cleanedForm)
+    const realForm = handleFormKeys(cleanedForm)
+
     try {
       addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
         showSuccessToast('提交成功!！')
@@ -394,20 +432,26 @@ async function onSubmit() {
     }
   }
   else {
-    emits('onSubmit', form.value)
+    // 使用清理后的数据
+    emits('onSubmit', cleanedForm)
   }
 }
 async function validate() {
-  await formRef.value?.validate()
+  await xFormRef.value?.validate()
+}
+function emitFunc(func, data, value) {
+  emits(func, data, value)
+  emits('xFormItemEmitFunc', func, data, value)
 }
+
 watch(() => props.formData, (_val) => {
   form.value = _val
 })
-defineExpose({ init, form, formGroupName, validate, asyncSubmit })
+defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm })
 </script>
 
 <template>
-  <VanForm ref="formRef" class="x-form-container" @submit="onSubmit">
+  <VanForm ref="xFormRef" class="x-form-container" @submit="onSubmit">
     <div class="form-fields-scrollable">
       <VanCellGroup inset>
         <XFormItem
@@ -421,6 +465,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit })
           :service-name="myServiceName"
           :get-data-params="myGetDataParams"
           @set-form="setForm"
+          @x-form-item-emit-func="emitFunc"
         />
         <slot name="extraFormItem" />
       </VanCellGroup>