From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index ee9ea7d..a963086 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -25,7 +25,7 @@
</UIContentArea>
</el-aside>
<el-container style="height: 100%;display: block">
- <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 400px;height: '+centerHeight">
+ <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 300px;height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
:dataStore="checkedData.centerArea"
:inDialog="inDialog"
@@ -36,7 +36,7 @@
</UIContentArea>
</el-main>
<el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
- style="max-height: 300px;min-height: 150px;">
+ style="min-height: 150px;">
<UIContentArea :key="'southArea-'+uiDefineVO.oid" :areasData="uiDefineVO.southAreas"
:dataStore="checkedData.southArea"
:inDialog="inDialog"
@@ -110,7 +110,7 @@
},
initContent() {
if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
- this.centerHeight = 'calc(100% - 300px)';
+ this.centerHeight = '65%';
} else {
this.centerHeight = '100%';
}
--
Gitblit v1.9.3