From fecc7305a48f8ce6e283434718da33e143885c75 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 09 四月 2024 10:03:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/views/base/UIContentViewer.vue |   31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/Source/ProjectWeb/src/views/base/UIContentViewer.vue b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
index 44104ce..a963086 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewer.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewer.vue
@@ -1,6 +1,6 @@
 <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" :areasData="uiDefineVO.northAreas"
                      :dataStore="checkedData.northArea"
@@ -24,8 +24,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: 300px;height: '+centerHeight">
           <UIContentArea :key="'centerArea-'+uiDefineVO.oid" :areasData="uiDefineVO.centerAreas"
                          :dataStore="checkedData.centerArea"
                          :inDialog="inDialog"
@@ -36,7 +36,7 @@
           </UIContentArea>
         </el-main>
         <el-footer v-if="uiDefineVO.southAreas && uiDefineVO.southAreas.length>0" height="35%"
-                   style="max-height: 300px">
+                   style="min-height: 150px;">
           <UIContentArea :key="'southArea-'+uiDefineVO.oid" :areasData="uiDefineVO.southAreas"
                          :dataStore="checkedData.southArea"
                          :inDialog="inDialog"
@@ -78,13 +78,9 @@
     }
   },
   watch: {
-    typeAContent:{
-      handler(newV,oldV){
-        if(oldV!=newV && !verifyNull(newV)){
-          this.initUI();
-        }
-      },
-      immediate: true,
+    $route(to, from) {
+      this.getTheParameters()
+      this.initUI();
     }
   },
   computed: {
@@ -97,21 +93,24 @@
       this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰僢s=缁勪欢name?type=xxx&context=yyy&param=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.getTheParameters()
+    this.initUI();
   },
   methods: {
+    getTheParameters(){
+      this.btmType = this.$route.query.type;
+      this.content = this.$route.query.context || this.$route.query.content;
+      this.sourceData = this.$route.query;
+    },
     initUI() {
       getUIContent({btmType: this.btmType, id: this.content}).then(res => {
-        console.log(res.data.obj)
         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