From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue |   33 +++++++++++++++------------------
 1 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
index 8326916..9641b5f 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
@@ -60,7 +60,7 @@
       default: ''
     },
     sourceData:{
-      //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+      //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
       type:Object,
       default: {}
     },
@@ -81,8 +81,7 @@
   },
   data() {
     return {
-      form: {},
-      ruleForm:{}
+      form: {}
     }
   },
   mounted() {
@@ -101,22 +100,13 @@
     }
   },
   watch:{
-    sourceData:{
-      handler(newval) {
-        //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
-        console.log(this.areasName);
-        console.log(newval);
-      }
-    }
-  },
-  watch:{
     slotData:{
       handler(newV){
        this.getDictList(newV)
       },
       immediate: true,
     },
-    ruleForm: {
+    form: {
       handler(val) {
         if (val) {
           if (Array.isArray(val)) { // 妫�鏌� val 鏄惁涓烘暟缁�
@@ -139,6 +129,13 @@
       deep: true,
       immediate: true,
     },
+    sourceData:{
+      handler(newval) {
+        //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
+        console.log(this.areasName);
+        console.log(newval);
+      }
+    }
   },
   methods: {
     //杞寲鏁版嵁
@@ -230,7 +227,7 @@
         if (code.type == "refer") {
           if (code.referConfig && code.referConfig.useFormKey) {
             if (verifyNull(code.referConfig.formValuesKey)) {
-              code.referConfig.formValuesKey = "ruleForm";
+              code.referConfig.formValuesKey = "form";
             }
             code.referConfig.formValues = this[code.referConfig.formValuesKey];
           }
@@ -250,9 +247,9 @@
       this.formTemplateData = val;
     },
     setReferValue(data) {
-      if (data.prop) {
-        this.ruleForm[data.prop] = data.value || "";
-        this.ruleForm[data.showProp] = data.text || "";
+      if (data && data.prop) {
+        this.form[data.prop] = data.value || "";
+        this.form[data.showProp] = data.text || "";
         if (data.propMap) {
           //璇存槑闇�瑕佹槧灏�
           for (let key in data.propMap) {
@@ -280,7 +277,7 @@
                 value.push(temp);
               }
             });
-            this.ruleForm[key] = value.join(",");
+            this.form[key] = value.join(",");
           }
         }
       }

--
Gitblit v1.9.3