From 1b2642c615001b3435a9e99e478517a917f656af Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期五, 26 四月 2024 17:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 69 +++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 21f47a6..3c680d3 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -1,11 +1,16 @@
<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" :areasData="uiDefineVO.northAreas"
- :dataStore="checkedData.northArea"
+ <UIContentArea :key="'northArea-'+uiDefineVO.oid"
+ :uiBtmType="btmType"
+ :uiContext="context"
+ :areasData="uiDefineVO.northAreas"
+ :dataStore="checkedData.northAreaInDialog.data"
+ :paramVOS="paramVOS"
:inDialog="inDialog"
:sourceData="sourceData"
+ :sourceBtmType="btmType"
areas-name="northArea"
@setDataStore="setDataStore">
</UIContentArea>
@@ -15,32 +20,47 @@
<el-aside v-if="uiDefineVO.westAreas && uiDefineVO.westAreas.length>0"
:width="uiDefineVO.westAreas[0].componentVOs[0].uiComponentType=='table' || uiDefineVO.westAreas[0].componentVOs[0].uiComponentType=='TreeTable'?'420px':'320px'"
height="100%">
- <UIContentArea :key="'westArea-'+uiDefineVO.oid" :areasData="uiDefineVO.westAreas"
- :dataStore="checkedData.westArea"
+ <UIContentArea :key="'westArea-'+uiDefineVO.oid"
+ :uiBtmType="btmType"
+ :uiContext="context"
+ :areasData="uiDefineVO.westAreas"
+ :dataStore="checkedData.westAreaInDialog.data"
+ :paramVOS="paramVOS"
:inDialog="inDialog"
:sourceData="sourceData"
+ :sourceBtmType="btmType"
areas-name="westArea"
cradStyle=""
@setDataStore="setDataStore">
</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">
- <UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
- :dataStore="checkedData.centerArea"
+ <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"
+ :areasData="uiDefineVO.centerAreas"
+ :dataStore="checkedData.centerAreaInDialog.data"
+ :paramVOS="paramVOS"
:inDialog="inDialog"
- :sourceData="checkedData.westArea[checkedData.westArea.length-1]"
+ :sourceData="checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]"
+ :sourceBtmType="checkedData.westAreaInDialog.DefineVOBtmType"
areas-name="centerArea"
cradStyle=""
@setDataStore="setDataStore">
</UIContentArea>
</el-main>
<el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
- style="min-height: 150px;">
- <UIContentArea :key="'southArea-'+uiDefineVO.oid" :areasData="uiDefineVO.southAreas"
- :dataStore="checkedData.southArea"
+ style="min-height: 100px;">
+ <UIContentArea :key="'southArea-'+uiDefineVO.oid"
+ :uiBtmType="btmType"
+ :uiContext="context"
+ :areasData="uiDefineVO.southAreas"
+ :dataStore="checkedData.southAreaInDialog.data"
+ :paramVOS="paramVOS"
:inDialog="inDialog"
- :sourceData="checkedData.centerArea[checkedData.centerArea.length-1]"
+ :sourceData="checkedData.centerAreaInDialog.data[checkedData.centerAreaInDialog.data.length-1]"
+ :sourceBtmType="checkedData.centerAreaInDialog.DefineVOBtmType"
areas-name="southArea"
cradStyle=""
@setDataStore="setDataStore">
@@ -89,10 +109,22 @@
return {
checkedData:{
//鍚勫尯鍩熼�変腑鏁版嵁
- northAreaInDialog:[{}],
- westAreaInDialog:[{}],
- centerAreaInDialog:[{}],
- southAreaInDialog:[{}]
+ northAreaInDialog:{
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ westAreaInDialog:{
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ centerAreaInDialog:{
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ southAreaInDialog:{
+ DefineVOBtmType:'',
+ data:[{}]
+ }
},
uiDefineVO: {},
centerHeight:'100%'
@@ -134,7 +166,8 @@
}
},
setDataStore(value) {
- this.checkedData[value.area] = value.dataStore;
+ this.checkedData[value.area].DefineVOBtmType = value.btmType;
+ this.checkedData[value.area].data = value.dataStore;
}
}
}
--
Gitblit v1.9.3