From a60abbdf6b963cf52113eec518aaeef72a6c99f5 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 07 四月 2024 17:34:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentArea.vue | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentArea.vue b/Source/ProjectWeb/src/views/base/UIContentArea.vue
index b850356..3a368ff 100644
--- a/Source/ProjectWeb/src/views/base/UIContentArea.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -12,8 +12,10 @@
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
@@ -23,8 +25,10 @@
:inDialog="inDialog"
:componentVO="areaItem.componentVOs[0]"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="activeName==(areasName+'-Tab-'+index)?true:false"></compoent-index>
</div>
</el-tab-pane>
@@ -40,8 +44,10 @@
:inDialog="inDialog"
:componentVO="componentVO"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
@@ -51,8 +57,10 @@
:inDialog="inDialog"
:componentVO="areasData[0].componentVOs[0]"
:sourceData="sourceData"
+ :dataStore="dataStore"
:areasName="areasName"
:paramVOS="paramVOS"
+ @setDataStore="setDataStore"
:isShow="true"></compoent-index>
</div>
</div>
@@ -108,6 +116,10 @@
},
handleChange(val) {
//console.log(val);
+ },
+ setDataStore(value) {
+ this.$emit("setDataStore", value);
+ this.dataStore = value.dataStore;
}
}
}
--
Gitblit v1.9.3