From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue b/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
index 8279a53..822042e 100644
--- a/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
+++ b/Source/plt-web/plt-web-ui/src/views/base/UIContentViewer.vue
@@ -40,8 +40,8 @@
                          :areasData="uiDefineVO.centerAreas"
                          :dataStore="checkedData.centerArea.data"
                          :inDialog="inDialog"
-                         :sourceData="checkedData.westArea.data[checkedData.westArea.data.length-1]"
-                         :sourceBtmType="checkedData.westArea.DefineVOBtmType"
+                         :sourceData="uiDefineVO.westAreas && uiDefineVO.westAreas.length>0?checkedData.westArea.data[checkedData.westArea.data.length-1]:sourceData"
+                         :sourceBtmType="uiDefineVO.westAreas && uiDefineVO.westAreas.length>0?checkedData.westArea.DefineVOBtmType:btmType"
                          areas-name="centerArea"
                          cradStyle=""
                          @setDataStore="setDataStore">
@@ -117,6 +117,7 @@
     }
   },
   created() {
+    console.log('route',this.$route);
     if (verifyNull(this.$route.query.type) || (verifyNull(this.$route.query.context) && verifyNull(this.$route.query.content))) {
       this.$message.error("閰嶇疆鐨勪俊鎭敊璇紝璇峰弬鑰冣��?type=xxx&context=yyy&param=zzz鈥濊繖绉嶅舰寮忋�傚叾涓璽ype鏄笟鍔＄被鍨嬶紙鎴栭摼鎺ョ被鍨嬶級锛宑ontext鏄疷I涓婁笅鏂囩殑鍚嶇О");
       return false;

--
Gitblit v1.9.3