From 9d003325865fe5adb195a0225be1893eb3d03606 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 16:27:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 1ac86c5..6199887 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,7 +23,7 @@
@setDataStore="setDataStore">
</UIContentArea>
</el-aside>
- <el-container style="height: 100%">
+ <el-container style="height: 100%;display: block">
<el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
cradStyle=""
@@ -53,7 +53,6 @@
<script>
import UIContentArea from "@/views/base/UIContentArea"
-import {uiDefineVOData} from "@/views/base/uiDefineVOInDialog"
import {verifyNull} from "@/util/validate";
import {getUIContent} from '@/api/base/region'
@@ -123,7 +122,6 @@
methods: {
initUI() {
getUIContent({btmType: this.btmType, id: this.content}).then(res => {
- console.log(res.data.obj)
this.uiDefineVO = res.data.obj;
this.initContent();
})
--
Gitblit v1.9.3