From 11f9f92fad2d93cddd35f64f3f6a0de1720a3f3e Mon Sep 17 00:00:00 2001
From: Gary Fu <xuebaiyouling@gmail.com>
Date: Sat, 13 Jan 2024 12:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A8=E5=8D=95=E8=B5=8B?=
 =?UTF-8?q?=E5=80=BC=E4=B8=8E=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common-form-control/index.vue | 16 ++++++++++++++-
 src/components/common-form/index.vue         | 21 +++-----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/components/common-form-control/index.vue b/src/components/common-form-control/index.vue
index 5fe99dd..79142ea 100644
--- a/src/components/common-form-control/index.vue
+++ b/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>
diff --git a/src/components/common-form/index.vue b/src/components/common-form/index.vue
index da0d0bd..c3dfe06 100644
--- a/src/components/common-form/index.vue
+++ b/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 = () => {
-  if (formModel.value) {
-    props.options.forEach(option => {
-      if (option.prop) {
-        set(formModel.value, option.prop, option.value || undefined)
-      }
-    })
-  }
-}
+//= ============form暴露============//
 
-initFormModel()
-
-watch(() => props.options, initFormModel, { deep: true })
+const form = ref()
 
 defineExpose({
   form