From 6384bebdc31167d19c8784f0dd8a7be249c172ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Fri, 5 Aug 2022 19:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=20mb-form=20getDetail=20?=
 =?UTF-8?q?=E5=92=8C=20formData=E5=85=B1=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/magic/template/mb-form.vue | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/magic-boot-ui/src/components/magic/template/mb-form.vue b/magic-boot-ui/src/components/magic/template/mb-form.vue
index 834c35b..fb61b87 100644
--- a/magic-boot-ui/src/components/magic/template/mb-form.vue
+++ b/magic-boot-ui/src/components/magic/template/mb-form.vue
@@ -13,6 +13,7 @@
             v-model="formData[col.name]"
             :item-label="col.label"
             v-bind="col.props"
+            @change="col.change"
           />
         </el-form-item>
       </el-col>
@@ -21,10 +22,10 @@
 </template>
 
 <script setup>
-  import {ref, reactive, getCurrentInstance } from 'vue'
+  import { ref, reactive, getCurrentInstance, watch } from 'vue'
   const { proxy } = getCurrentInstance()
   const rules = reactive(getRules())
-  const formData = ref(initFormData())
+  const formData = ref({})
   const dataForm = ref()
   const props = defineProps({
     form: {
@@ -41,6 +42,9 @@
     }
   })
   const emit = defineEmits(['reload'])
+  watch(() => props.detail.formData, (value) => {
+    Object.assign(formData.value, value)
+  },{ deep: true })
 
   props.form.props = props.form.props || {}
   proxy.$common.setDefaultValue(props.form.props, 'labelPosition', 'right')
@@ -106,14 +110,21 @@
   }
 
   function getDetail(id) {
-    formData.value[props.primaryField] = id
+    formData.value = props.detail.formData || {}
+    var detailData = initFormData()
+    detailData[props.primaryField] = id
     proxy.$get(props.detail.request.url, { [props.primaryField]: id }).then(res => {
       const { data } = res
-      for (var t in formData.value) {
-        if (data[t] && (!props.detail.excludeAssign || props.detail.excludeAssign.indexOf(t) === -1)) {
-          formData.value[t] = data[t]
+      for (var t in detailData) {
+        if ((data[t] || data[t] === 0) && (!props.detail.excludeAssign || props.detail.excludeAssign.indexOf(t) === -1)) {
+          detailData[t] = data[t]
         }
       }
+      if(formData.value){
+        formData.value = Object.assign(detailData, formData.value)
+      } else {
+        formData.value = detailData
+      }
     })
   }