优化表单赋值与验证

src/components/common-form-control/index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { $i18nBundle } from '@/messages'
 import ControlChild from '@/components/common-form-control/control-child.vue'
 import { useInputType } from '@/components/utils'
@@ -100,6 +100,20 @@ const rules = computed(() => {
   return _rules
 })
 
+const initFormModel = () => {
+  if (formModel.value) {
+    const option = props.option
+    if (option.prop) {
+      const defaultVal = get(formModel.value, option.prop)
+      set(formModel.value, option.prop, defaultVal || option.value || undefined)
+    }
+  }
+}
+
+initFormModel()
+
+watch(() => props.option, initFormModel, { deep: true })
+
 </script>
 
 <template>

src/components/common-form/index.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { ref, watch } from 'vue'
+import { ref } from 'vue'
 import { useVModel } from '@vueuse/core'
-import { set } from 'lodash'
 
 /**
  * @type {CommonFormProps}
@@ -60,27 +59,13 @@ const props = defineProps({
   }
 })
 
-//= ============form暴露============//
-
-const form = ref()
-
 const emit = defineEmits(['submitForm', 'update:model'])
 
 const formModel = useVModel(props, 'model', emit)
 
-const initFormModel = () => {
+//= ============form暴露============//
-  if (formModel.value) {
-    props.options.forEach(option => {
-      if (option.prop) {
-        set(formModel.value, option.prop, option.value || undefined)
-      }
-    })
-  }
-}
 
-initFormModel()
+const form = ref()
-
-watch(() => props.options, initFormModel, { deep: true })
 
 defineExpose({
   form