From 68abde09190acd43974a75ae9e4665b6fd3f6843 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 01 四月 2024 11:09:28 +0800
Subject: [PATCH] 整合代码
---
Source/ProjectWeb/src/views/base/UIContentViewer.vue | 104 ++++++++++++++++++++++++----------------------------
1 files changed, 48 insertions(+), 56 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index f110aa5..7eb33d1 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,24 +1,24 @@
<template>
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
- <div style="height:calc(100% - 4px) ">
+ <div style="height:calc(100% - 4px);min-width:1200px">
<el-header v-if="uiDefineVO.northAreas && uiDefineVO.northAreas.length>0">
<UIContentArea :key="'northArea-'+uiDefineVO.oid" areas-name="northArea"
:areasData="uiDefineVO.northAreas"
:inDialog="inDialog"
:sourceData="sourceData"
- :dataStore="dataStore"
- :paramVOS="paramVOS">
+ :dataStore="checkedData.northArea"
+ @setDataStore="setDataStore">
</UIContentArea>
</el-header>
<el-container :style="'height: '+(uiDefineVO.northAreas && uiDefineVO.northAreas.length>0?'calc(100% - 70px)':'100%')">
- <el-aside v-if="uiDefineVO.westAreas && uiDefineVO.westAreas.length>0" :width="uiDefineVO.westAreas[0].componentVOs[0].uiComponentType=='table'?'400px':'320px'" height="100%">
+ <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" areas-name="westArea"
cradStyle=""
:areasData="uiDefineVO.westAreas"
:inDialog="inDialog"
:sourceData="sourceData"
- :dataStore="dataStore"
- :paramVOS="paramVOS">
+ :dataStore="checkedData.westArea"
+ @setDataStore="setDataStore">
</UIContentArea>
</el-aside>
<el-container style="height: 100%">
@@ -27,19 +27,19 @@
cradStyle=""
:areasData="uiDefineVO.centerAreas"
:inDialog="inDialog"
- :sourceData="checkedData.westAreas[0]"
- :dataStore="checkedData.centerAreas[0]"
- :paramVOS="paramVOS">
+ :sourceData="checkedData.westArea[checkedData.westArea.length-1]"
+ :dataStore="checkedData.centerArea"
+ @setDataStore="setDataStore">
</UIContentArea>
</el-main>
- <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="300px" style="max-height: 300px">
+ <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="max-height: 300px">
<UIContentArea :key="'southArea-'+uiDefineVO.oid" areas-name="southArea"
cradStyle=""
:areasData="uiDefineVO.southAreas"
:inDialog="inDialog"
- :sourceData="checkedData.centerAreas[0]"
- :dataStore="checkedData.southAreas[0]"
- :paramVOS="paramVOS">
+ :sourceData="checkedData.centerArea[checkedData.centerArea.length-1]"
+ :dataStore="checkedData.southArea"
+ @setDataStore="setDataStore">
</UIContentArea>
</el-footer>
</el-container>
@@ -48,66 +48,58 @@
</template>
<script>
+import { verifyNull } from "@/util/validate";
import UIContentArea from "@/views/base/UIContentArea"
import {uiDefineVOData} from "@/views/base/uiDefineVO"
export default {
name: "UIContentViewer",
- components:{UIContentArea},
- props:{
- inDialog: {
- type: Boolean,
- default: false
- },
- sourceData:{
- //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
- type:Object,
- default: {}
- },
- dataStore:{
- //寮圭獥鏃舵寜閽墍灞炲尯鍩熼�変腑鏁版嵁
- type:Array,
- default: []
- },
- paramVOS:{
- type:Object,
- default: {}
- }
- },
+ components: {UIContentArea},
data() {
return {
- btmType:'',//涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
- content:'',//UI涓婁笅鏂囩殑鍚嶇О
- checkedData:{
+ btmType: '',//涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
+ content: '',//UI涓婁笅鏂囩殑鍚嶇О
+ checkedData: {
//鍚勫尯鍩熼�変腑鏁版嵁
- westAreas:[],
- centerAreas:[],
- southAreas:[]
+ northArea: [{}],
+ westArea: [{}],
+ centerArea: [{}],
+ southArea: [{}]
},
- uiDefineVO: uiDefineVOData,
- centerHeight:'100%'
+ uiDefineVO: {},
+ centerHeight: '100%',
+ inDialog: false,
+ //鑿滃崟婧愭暟鎹�
+ sourceData: {},
}
},
- watch: {
-
- },
- computed: {
-
- },
+ watch: {},
+ computed: {},
created() {
- if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
- this.centerHeight = 'calc(100% - 310px)';
- } else {
- this.centerHeight = '100%';
+ if (verifyNull(this.$route.query.type) || (verifyNull(this.$route.query.context) && verifyNull(this.$route.query.content))) {
+ this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=?type=xxx&context=yyy¶m=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
+ return false;
}
+ this.btmType=this.$route.query.type;
+ this.content=this.$route.query.context ||this.$route.query.content;
+ this.sourceData=this.$route.query;
+ this.initUI();
+ this.initContent();
},
methods: {
- initUI(){
-
+ initUI() {
+ this.uiDefineVO = uiDefineVOData;
},
- initContent(){
-
+ initContent() {
+ if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
+ this.centerHeight = 'calc(100% - 310px)';
+ } else {
+ this.centerHeight = '100%';
+ }
},
+ setDataStore(value) {
+ this.checkedData[value.area] = value.dataStore;
+ }
}
}
</script>
--
Gitblit v1.9.3