From c83e5706898ca1d479d4d078157e16a73c4eaba2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 11:41:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentArea.vue | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentArea.vue b/Source/ProjectWeb/src/views/base/UIContentArea.vue
index 20e49eb..705baaf 100644
--- a/Source/ProjectWeb/src/views/base/UIContentArea.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -2,7 +2,7 @@
<basic-container :cradStyle="cradStyle" cardBodyStyle="height:100%;box-sizing: border-box;padding-bottom:5px;">
<el-tabs style="height: 100%;" class="UITabs" v-if="areasData.length>1" v-model="activeName" type="card" @tab-click="tabHandleClick">
<el-tab-pane style="height:100%;overflow: auto" v-for="(areaItem,index) in areasData" :key="areaItem.oid" :label="areaItem.name" :name="areasName+'-Tab-'+index">
- <el-collapse class="UI-collapse" v-model="collapseActiveNames" v-if="areaItem.componentVOs.length>1">
+ <el-collapse class="UI-collapse" v-model="collapseActiveNames" v-if="areaItem.componentVOs.length>1" @change="handleChange">
<el-collapse-item v-for="(componentVO,componentIndex) in areaItem.componentVOs" :name="areasName+'-collapse-'+componentIndex">
<template slot="title">
{{componentVO.name}}
@@ -13,7 +13,8 @@
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS"></compoent-index>
+ :paramVOS="paramVOS"
+ :isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
</el-collapse>
@@ -23,12 +24,13 @@
:componentVO="areaItem.componentVOs[0]"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS"></compoent-index>
+ :paramVOS="paramVOS"
+ :isShow="activeName==(areasName+'-Tab-'+index)?true:false"></compoent-index>
</div>
</el-tab-pane>
</el-tabs>
<div v-else style="height:100%;overflow: auto">
- <el-collapse class="UI-collapse" v-model="collapseActiveNames" v-if="areasData[0].componentVOs.length>1">
+ <el-collapse class="UI-collapse" v-model="collapseActiveNames" v-if="areasData[0].componentVOs.length>1" @change="handleChange">
<el-collapse-item v-for="(componentVO,componentIndex) in areasData[0].componentVOs" :name="areasName+'-collapse-'+componentIndex">
<template slot="title">
{{componentVO.name}}
@@ -39,7 +41,8 @@
:componentVO="componentVO"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS"></compoent-index>
+ :paramVOS="paramVOS"
+ :isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
</el-collapse>
@@ -49,7 +52,8 @@
:componentVO="areasData[0].componentVOs[0]"
:sourceData="sourceData"
:areasName="areasName"
- :paramVOS="paramVOS"></compoent-index>
+ :paramVOS="paramVOS"
+ :isShow="true"></compoent-index>
</div>
</div>
</basic-container>
@@ -102,6 +106,9 @@
tabHandleClick(tab, event) {
// console.log(tab, event);
},
+ handleChange(val) {
+ //console.log(val);
+ }
}
}
</script>
--
Gitblit v1.9.3