From eb9691c760f6545f23c1c283a1e05c98eb034aa6 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期三, 10 四月 2024 15:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index e561d73..86c330a 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -23,8 +23,8 @@
                        @setDataStore="setDataStore">
         </UIContentArea>
       </el-aside>
-      <el-container style="height: 100%">
-        <el-main v-if="uiDefineVO.centerAreas && uiDefineVO.centerAreas.length>0" :style="'height: '+centerHeight">
+      <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"
@@ -35,7 +35,7 @@
                          @setDataStore="setDataStore">
           </UIContentArea>
         </el-main>
-        <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%" style="max-height: 300px">
+        <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"
@@ -53,8 +53,8 @@
 
 <script>
 import UIContentArea from "@/views/base/UIContentArea"
-import {uiDefineVOData} from "@/views/base/uiDefineVOInDialog"
 import {verifyNull} from "@/util/validate";
+import {getUIContent} from '@/api/base/region'
 
 export default {
   name: "UIContentViewerInDialog",
@@ -99,26 +99,36 @@
     }
   },
   watch: {
-
+    typeAContent:{
+      handler(newV,oldV){
+        if(oldV!=newV && !verifyNull(newV)){
+          this.initUI();
+        }
+      },
+      immediate: true,
+    }
   },
   computed: {
-
+    typeAContent(){
+      return this.btmType+this.content;
+    }
   },
   created() {
     if (verifyNull(this.btmType) || verifyNull(this.content) ) {
       this.$message.error("鑷畾涔夌粍浠堕厤缃殑淇℃伅閿欒锛岃鍙傝�僢s=name?type=xxx&context=yyy&param=zzz杩欑褰㈠紡銆傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О,name涓虹粍浠跺悕绉帮紝绌哄�兼椂榛樿灞曠ずUI寮曟搸");
       return false;
     }
-    this.initUI();
-    this.initContent();
   },
   methods: {
     initUI() {
-      this.uiDefineVO = uiDefineVOData;
+      getUIContent({btmType: this.btmType, id: this.content}).then(res => {
+        this.uiDefineVO = res.data.obj;
+        this.initContent();
+      })
     },
     initContent() {
       if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
-        this.centerHeight = 'calc(100% - 310px)';
+        this.centerHeight = '65%';
       } else {
         this.centerHeight = '100%';
       }

--
Gitblit v1.9.3