From 52e123212f37e214ee4599649adbd743e0d86c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 10:32:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue | 70 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index cfb67d8..6528465 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -1,48 +1,48 @@
<template>
<!--UI涓婁笅鏂囩殑灞曠ず鍣�-->
- <div style="height:calc(100% - 4px);min-width:1200px">
+ <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="northAreaInDialog"
- :areasData="uiDefineVO.northAreas"
+ <UIContentArea :key="'northArea-'+uiDefineVO.oid" :areasData="uiDefineVO.northAreas"
+ :dataStore="checkedData.northArea"
:inDialog="inDialog"
:sourceData="sourceData"
- :dataStore="checkedData.northAreaInDialog"
- :paramVOS="paramVOS"
+ areas-name="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' || uiDefineVO.westAreas[0].componentVOs[0].uiComponentType=='TreeTable'?'420px':'320px'" height="100%">
- <UIContentArea :key="'westArea-'+uiDefineVO.oid" areas-name="westAreaInDialog"
- cradStyle=""
- :areasData="uiDefineVO.westAreas"
+ <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' || uiDefineVO.westAreas[0].componentVOs[0].uiComponentType=='TreeTable'?'420px':'320px'"
+ height="100%">
+ <UIContentArea :key="'westArea-'+uiDefineVO.oid" :areasData="uiDefineVO.westAreas"
+ :dataStore="checkedData.westArea"
:inDialog="inDialog"
:sourceData="sourceData"
- :dataStore="checkedData.westAreaInDialog"
- :paramVOS="paramVOS"
+ 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: 260px;height: '+centerHeight">
- <UIContentArea :key="'centerArea-'+uiDefineVO.oid" areas-name="centerAreaInDialog"
- cradStyle=""
- :areasData="uiDefineVO.centerAreas"
+ <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"
:inDialog="inDialog"
- :sourceData="checkedData.westAreaInDialog[checkedData.westAreaInDialog.length-1]"
- :dataStore="checkedData.centerAreaInDialog"
- :paramVOS="paramVOS"
+ :sourceData="checkedData.westArea[checkedData.westArea.length-1]"
+ 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" areas-name="southAreaInDialog"
- cradStyle=""
- :areasData="uiDefineVO.southAreas"
+ <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"
:inDialog="inDialog"
- :sourceData="checkedData.centerAreaInDialog[checkedData.centerAreaInDialog.length-1]"
- :dataStore="checkedData.southAreaInDialog"
- :paramVOS="paramVOS"
+ :sourceData="checkedData.centerArea[checkedData.centerArea.length-1]"
+ areas-name="southArea"
+ cradStyle=""
@setDataStore="setDataStore">
</UIContentArea>
</el-footer>
@@ -54,7 +54,7 @@
<script>
import UIContentArea from "@/views/base/UIContentArea"
import {verifyNull} from "@/util/validate";
-import {getUIContent} from '@/api/base/region'
+import {getUIContext} from '@/api/base/region'
export default {
name: "UIContentViewerInDialog",
@@ -63,7 +63,7 @@
btmType:{
type: String,
},
- content:{
+ context:{
type: String,
},
inDialog: {
@@ -99,7 +99,7 @@
}
},
watch: {
- typeAContent:{
+ typeAndContext:{
handler(newV,oldV){
if(oldV!=newV && !verifyNull(newV)){
this.initUI();
@@ -109,24 +109,24 @@
}
},
computed: {
- typeAContent(){
- return this.btmType+this.content;
+ typeAndContext(){
+ return this.btmType+this.context;
}
},
created() {
- if (verifyNull(this.btmType) || verifyNull(this.content) ) {
+ if (verifyNull(this.btmType) || verifyNull(this.context) ) {
this.$message.error("鑷畾涔夌粍浠堕厤缃殑淇℃伅閿欒锛岃鍙傝�冣��?type=xxx&context=yyy¶m=zzz鈥滆繖绉嶅舰寮忋�傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
return false;
}
},
methods: {
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 {
--
Gitblit v1.9.3