From 926d1a1a4f06271cb39de001d74c68832fc004c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 三月 2024 17:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentArea.vue | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentArea.vue b/Source/ProjectWeb/src/views/base/UIContentArea.vue
index 24ed6bd..b850356 100644
--- a/Source/ProjectWeb/src/views/base/UIContentArea.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentArea.vue
@@ -1,35 +1,59 @@
<template>
- <basic-container :cradStyle="cradStyle">
- <el-tabs v-if="areasData.length>1" v-model="activeName" type="card" @tab-click="tabHandleClick">
- <el-tab-pane v-for="(areaItem,index) in areasData" :key="areaItem.oid" :label="areaItem.name" :name="areasName+'-Tab-'+index">
- <el-collapse v-model="collapseActiveNames" v-if="areaItem.componentVOs.length>1">
+ <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" :key="areaItem.oid+'-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}}
</template>
- <div class="componentVO" style="height: 60%">
- <compoent-index :key="componentVO.oid" :componentVO="componentVO" :sourceData="sourceData" :areasName="areasName" :paramVOS="paramVOS"></compoent-index>
+ <div class="componentVO">
+ <compoent-index :key="areasName+'componentVO-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
</el-collapse>
<div v-else class="componentVO">
- <compoent-index :key="areaItem.componentVOs[0].oid" :componentVO="areaItem.componentVOs[0]" :sourceData="sourceData" :areasName="areasName" :paramVOS="paramVOS"></compoent-index>
+ <compoent-index :key="areasName+'componentVO-'+areaItem.componentVOs[0].oid"
+ :inDialog="inDialog"
+ :componentVO="areaItem.componentVOs[0]"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="activeName==(areasName+'-Tab-'+index)?true:false"></compoent-index>
</div>
</el-tab-pane>
</el-tabs>
- <div v-else>
- <el-collapse v-model="collapseActiveNames" v-if="areasData[0].componentVOs.length>1">
+ <div v-else style="height:100%;overflow: auto">
+ <el-collapse class="UI-collapse" :key="areasData[0].oid+'-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}}
</template>
- <div class="componentVO" style="height: 60%">
- <compoent-index :key="componentVO.oid" :componentVO="componentVO" :sourceData="sourceData" :areasName="areasName" :paramVOS="paramVOS"></compoent-index>
+ <div class="componentVO">
+ <compoent-index :key="areasName+'componentVO-'+componentVO.oid"
+ :inDialog="inDialog"
+ :componentVO="componentVO"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="collapseActiveNames.indexOf(areasName+'-collapse-'+componentIndex)!=-1?true:false"></compoent-index>
</div>
</el-collapse-item>
</el-collapse>
<div v-else class="componentVO">
- <compoent-index :key="areasData[0].componentVOs[0].oid" :componentVO="areasData[0].componentVOs[0]" :sourceData="sourceData" :areasName="areasName" :paramVOS="paramVOS"></compoent-index>
+ <compoent-index :key="areasName+'componentVO-'+areasData[0].componentVOs[0].oid"
+ :inDialog="inDialog"
+ :componentVO="areasData[0].componentVOs[0]"
+ :sourceData="sourceData"
+ :areasName="areasName"
+ :paramVOS="paramVOS"
+ :isShow="true"></compoent-index>
</div>
</div>
</basic-container>
@@ -76,12 +100,15 @@
}
},
mounted() {
- console.log(this.areasData);
+ // console.log(this.areasData);
},
methods:{
tabHandleClick(tab, event) {
- console.log(tab, event);
+ // console.log(tab, event);
},
+ handleChange(val) {
+ //console.log(val);
+ }
}
}
</script>
--
Gitblit v1.9.3