From 9478c2e9600b802b0e491fc756f3d695c499fb1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Tue, 9 Aug 2022 16:26:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=20add.formData=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20Object.assign=20=E6=8A=8A=E4=B8=AA=E5=88=AB?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8E=BB=E6=8E=89=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 magic-boot-ui/src/components/magic/template/mb-form.vue | 7 ++++---
 magic-boot-ui/src/scripts/common.js                     | 4 ++++
 2 files changed, 8 insertions(+), 3 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 cfa9163..38b819a 100644
--- a/magic-boot-ui/src/components/magic/template/mb-form.vue
+++ b/magic-boot-ui/src/components/magic/template/mb-form.vue
@@ -25,6 +25,7 @@
 
 <script setup>
   import { ref, reactive, getCurrentInstance, watch } from 'vue'
+  import common from '@/scripts/common'
   const { proxy } = getCurrentInstance()
   const rules = reactive(getRules())
   const formData = ref(initFormData())
@@ -51,7 +52,7 @@
   watch(() => [props.detail && props.detail.formData, props.add && props.add.formData], (value) => {
     value.forEach(it => {
       if(it){
-        Object.assign(formData.value, it)
+        formData.value = common.objectAssign(formData.value, it)
       }
     })
   },{ deep: true })
@@ -61,7 +62,7 @@
   proxy.$common.setDefaultValue(props.form.props, 'labelWidth', '120px')
 
   if(props.add && props.add.formData){
-    Object.assign(formData.value, props.add.formData)
+    formData.value = common.objectAssign(formData.value, props.add.formData)
   }
 
   function getRules(){
@@ -122,7 +123,7 @@
           }
         }
         if(formData.value){
-          formData.value = Object.assign(_formData, formData.value)
+          formData.value = common.objectAssign(_formData, formData.value)
         } else {
           formData.value = _formData
         }
diff --git a/magic-boot-ui/src/scripts/common.js b/magic-boot-ui/src/scripts/common.js
index 723751c..f2b0834 100644
--- a/magic-boot-ui/src/scripts/common.js
+++ b/magic-boot-ui/src/scripts/common.js
@@ -229,4 +229,8 @@ common.exportExcel = (options) => {
   writeFile(wb, `${options.fileName}.${options.suffix || 'xlsx'}`);
 }
 
+common.objectAssign = (target, source) => {
+  return Object.assign({}, JSON.parse(JSON.stringify(target)), JSON.parse(JSON.stringify(source)))
+}
+
 export default common