From e6a35cef322110bdae782266dfac11eb4f7cdce1 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 05 六月 2024 11:23:07 +0800
Subject: [PATCH] 对象引用改动。
---
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 75 ++++++++++++++++++++++++++-----------
1 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index c987860..8279a53 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -2,10 +2,14 @@
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
<div style="height:calc(100% - 4px);min-width:1200px" >
<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.northArea.data"
:inDialog="inDialog"
:sourceData="sourceData"
+ :sourceBtmType="btmType"
areas-name="northArea"
@setDataStore="setDataStore">
</UIContentArea>
@@ -15,10 +19,14 @@
<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.westArea.data"
:inDialog="inDialog"
:sourceData="sourceData"
+ :sourceBtmType="btmType"
areas-name="westArea"
cradStyle=""
@setDataStore="setDataStore">
@@ -26,10 +34,14 @@
</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"
+ <UIContentArea :key="'centerArea-'+uiDefineVO.oid"
+ :uiBtmType="btmType"
+ :uiContext="context"
+ :areasData="uiDefineVO.centerAreas"
+ :dataStore="checkedData.centerArea.data"
:inDialog="inDialog"
- :sourceData="checkedData.westArea[checkedData.westArea.length-1]"
+ :sourceData="checkedData.westArea.data[checkedData.westArea.data.length-1]"
+ :sourceBtmType="checkedData.westArea.DefineVOBtmType"
areas-name="centerArea"
cradStyle=""
@setDataStore="setDataStore">
@@ -37,10 +49,14 @@
</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"
+ <UIContentArea :key="'southArea-'+uiDefineVO.oid"
+ :uiBtmType="btmType"
+ :uiContext="context"
+ :areasData="uiDefineVO.southAreas"
+ :dataStore="checkedData.southArea.data"
:inDialog="inDialog"
- :sourceData="checkedData.centerArea[checkedData.centerArea.length-1]"
+ :sourceData="checkedData.centerArea.data[checkedData.centerArea.data.length-1]"
+ :sourceBtmType="checkedData.centerArea.DefineVOBtmType"
areas-name="southArea"
cradStyle=""
@setDataStore="setDataStore">
@@ -54,7 +70,7 @@
<script>
import {verifyNull} from "@/util/validate";
import UIContentArea from "@/views/base/UIContentArea"
-import {getUIContent} from '@/api/base/region'
+import {getUIContext} from '@/api/base/ui'
export default {
name: "UIContentViewer",
@@ -62,13 +78,25 @@
data() {
return {
btmType: '',//涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
- content: '',//UI涓婁笅鏂囩殑鍚嶇О
+ context: '',//UI涓婁笅鏂囩殑鍚嶇О
checkedData: {
//鍚勫尯鍩熼�変腑鏁版嵁
- northArea: [{}],
- westArea: [{}],
- centerArea: [{}],
- southArea: [{}]
+ northArea: {
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ westArea: {
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ centerArea: {
+ DefineVOBtmType:'',
+ data:[{}]
+ },
+ southArea: {
+ DefineVOBtmType:'',
+ data:[{}]
+ }
},
uiDefineVO: {},
centerHeight: '100%',
@@ -84,8 +112,8 @@
}
},
computed: {
- typeAContent(){
- return this.btmType+this.content;
+ typeAndContext(){
+ return this.btmType+this.context;
}
},
created() {
@@ -99,16 +127,16 @@
methods: {
getTheParameters(){
this.btmType = this.$route.query.type;
- this.content = this.$route.query.context || this.$route.query.content;
+ this.context = this.$route.query.context || this.$route.query.content;
this.sourceData = this.$route.query;
},
initUI() {
- getUIContent({btmType: this.btmType, id: this.content}).then(res => {
+ getUIContext({btmType: this.btmType, id: this.context}).then(res => {
this.uiDefineVO = res.data.obj;
- this.initContent();
+ this.initContext();
})
},
- initContent() {
+ initContext() {
if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
this.centerHeight = '65%';
} else {
@@ -116,7 +144,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