From beadbecb4ec7aaf960b8e46f5c02836bf6c9e976 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 08 四月 2024 16:14:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index e561d73..5dc73fd 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -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,22 +99,32 @@
     }
   },
   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) {

--
Gitblit v1.9.3