From 7d6fdd87d9cbb948baeacdadf547b19bd26eb232 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 31 三月 2024 23:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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..de695df 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: {}
},
@@ -101,15 +101,6 @@
}
},
watch:{
- sourceData:{
- handler(newval) {
- //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
- console.log(this.areasName);
- console.log(newval);
- }
- }
- },
- watch:{
slotData:{
handler(newV){
this.getDictList(newV)
@@ -139,6 +130,13 @@
deep: true,
immediate: true,
},
+ sourceData:{
+ handler(newval) {
+ //婧愭暟鎹湁鍙樺寲鏃跺彉鏇村綋鍓嶅尯鍩熸暟鎹�
+ console.log(this.areasName);
+ console.log(newval);
+ }
+ }
},
methods: {
//杞寲鏁版嵁
@@ -250,7 +248,7 @@
this.formTemplateData = val;
},
setReferValue(data) {
- if (data.prop) {
+ if (data && data.prop) {
this.ruleForm[data.prop] = data.value || "";
this.ruleForm[data.showProp] = data.text || "";
if (data.propMap) {
--
Gitblit v1.9.3