From 7b9edd238b007402a6027bb32cf612640cb54186 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 14 五月 2024 11:45:34 +0800
Subject: [PATCH] 删除log
---
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 76 +++++++++++++++++++++++++++++++++-----
1 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index 6942d23..cfc0423 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,9 +9,12 @@
:dataStore="checkedData.northAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
+ :actionType="actionType"
:sourceData="sourceData"
:sourceBtmType="btmType"
- areas-name="northArea"
+ areas-name="northAreaInDialog"
+ @setData="setData"
@setDataStore="setDataStore">
</UIContentArea>
</el-header>
@@ -27,15 +30,18 @@
:dataStore="checkedData.westAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
+ :actionType="actionType"
:sourceData="sourceData"
:sourceBtmType="btmType"
- areas-name="westArea"
+ areas-name="westAreaInDialog"
cradStyle=""
+ @setData="setData"
@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">
+ <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,15 +49,18 @@
:dataStore="checkedData.centerAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
- :sourceData="checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]"
- :sourceBtmType="checkedData.westAreaInDialog.DefineVOBtmType"
- areas-name="centerArea"
+ :canEdit="canEdit"
+ :actionType="actionType"
+ :sourceData="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.data[checkedData.westAreaInDialog.data.length-1]:sourceData"
+ :sourceBtmType="(uiDefineVO.westAreas && uiDefineVO.westAreas.length>0)?checkedData.westAreaInDialog.DefineVOBtmType:btmType"
+ areas-name="centerAreaInDialog"
cradStyle=""
+ @setData="setData"
@setDataStore="setDataStore">
</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,10 +68,13 @@
:dataStore="checkedData.southAreaInDialog.data"
:paramVOS="paramVOS"
:inDialog="inDialog"
+ :canEdit="canEdit"
+ :actionType="actionType"
:sourceData="checkedData.centerAreaInDialog.data[checkedData.centerAreaInDialog.data.length-1]"
:sourceBtmType="checkedData.centerAreaInDialog.DefineVOBtmType"
- areas-name="southArea"
+ areas-name="southAreaInDialog"
cradStyle=""
+ @setData="setData"
@setDataStore="setDataStore">
</UIContentArea>
</el-footer>
@@ -90,6 +102,15 @@
type: Boolean,
default: false
},
+ canEdit:{
+ //鍐呭鏄惁鍙紪杈�
+ type:Boolean,
+ default:false
+ },
+ actionType:{
+ //鎸夐挳鎿嶄綔绫诲瀷
+ default:"add"
+ },
sourceData:{
//鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
type:Object,
@@ -107,8 +128,8 @@
},
data() {
return {
+ //鍚勫尯鍩熺殑閫変腑鏁版嵁
checkedData:{
- //鍚勫尯鍩熼�変腑鏁版嵁
northAreaInDialog:{
DefineVOBtmType:'',
data:[{}]
@@ -124,6 +145,29 @@
southAreaInDialog:{
DefineVOBtmType:'',
data:[{}]
+ }
+ },
+ //鍚勫尯鍩熸暟鎹�
+ data:{
+ northAreaInDialog:{
+ type:'',
+ DefineVO:null,
+ data:null
+ },
+ westAreaInDialog:{
+ type:'',
+ DefineVO:null,
+ data:null
+ },
+ centerAreaInDialog:{
+ type:'',
+ DefineVO:null,
+ data:null
+ },
+ southAreaInDialog:{
+ type:'',
+ DefineVO:null,
+ data:null
}
},
uiDefineVO: {},
@@ -164,6 +208,18 @@
} else {
this.centerHeight = '100%';
}
+ if(this.uiDefineVO.westAreas && this.uiDefineVO.westAreas.length>0){
+ this.checkedData.westAreaInDialog.data=this.dataStore;
+ }else if(this.uiDefineVO.centerAreas && this.uiDefineVO.centerAreas.length>0){
+ this.checkedData.centerAreaInDialog.data=this.dataStore;
+ }else {
+ this.checkedData.southAreaInDialog.data=this.dataStore;
+ }
+ },
+ setData(value) {
+ this.data[value.area].DefineVO = value.currentDefineVO;
+ this.data[value.area].data = value.data;
+ this.data[value.area].type = value.type;
},
setDataStore(value) {
this.checkedData[value.area].DefineVOBtmType = value.btmType;
--
Gitblit v1.9.3