From 33855a1961d581727cfbf59230085e6b95cc549c Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 29 四月 2024 15:56:37 +0800
Subject: [PATCH] action
---
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 6942d23..c54bf61 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -1,6 +1,6 @@
<template>
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
- <div style="height:calc(100% - 4px);min-width:1200px" >
+ <div style="height:calc(100% - 4px);" >
<el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
<UIContentArea :key="'northArea-'+uiDefineVO.oid"
:uiBtmType="btmType"
@@ -9,6 +9,7 @@
:dataStore="checkedData.northAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
:sourceData="sourceData"
:sourceBtmType="btmType"
areas-name="northArea"
@@ -27,6 +28,7 @@
:dataStore="checkedData.westAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
:sourceData="sourceData"
:sourceBtmType="btmType"
areas-name="westArea"
@@ -35,7 +37,7 @@
</UIContentArea>
</el-aside>
<el-container style="height: 100%;display: block">
- <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 300px;height: '+centerHeight">
+ <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'min-height: 200px;height: '+centerHeight">
<UIContentArea :key="'centerArea-'+uiDefineVO.oid"
:uiBtmType="btmType"
:uiContext="context"
@@ -43,6 +45,7 @@
:dataStore="checkedData.centerAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
:sourceData="checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]"
:sourceBtmType="checkedData.westAreaInDialog.DefineVOBtmType"
areas-name="centerArea"
@@ -51,7 +54,7 @@
</UIContentArea>
</el-main>
<el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
- style="min-height: 150px;">
+ style="min-height: 100px;">
<UIContentArea :key="'southArea-'+uiDefineVO.oid"
:uiBtmType="btmType"
:uiContext="context"
@@ -59,6 +62,7 @@
:dataStore="checkedData.southAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
:sourceData="checkedData.centerAreaInDialog.data[checkedData.centerAreaInDialog.data.length-1]"
:sourceBtmType="checkedData.centerAreaInDialog.DefineVOBtmType"
areas-name="southArea"
@@ -90,6 +94,11 @@
type: Boolean,
default: false
},
+ canEdit:{
+ //鍐呭鏄惁鍙紪杈�
+ type:Boolean,
+ default:false
+ },
sourceData:{
//鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
type:Object,
--
Gitblit v1.9.3