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/UIContentViewerInDialog.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 56172a5..86c330a 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,8 +23,8 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
- <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+ <el-container style="height: 100%;display: block">
+ <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 260px;height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
cradStyle=""
:areasData="uiDefineVO.centerAreas"
@@ -35,7 +35,7 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-main>
- <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="max-height: 300px">
+ <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="min-height: 150px;">
<UIContentArea :key="'southArea-'+uiDefineVO.oid" areas-name="southAreaInDialog"
cradStyle=""
:areasData="uiDefineVO.southAreas"
@@ -122,14 +122,13 @@
methods: {
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
},
initContent() {
if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
- this.centerHeight = 'calc(100% - 310px)';
+ this.centerHeight = '65%';
} else {
this.centerHeight = '100%';
}
--
Gitblit v1.9.3