From 7d6fdd87d9cbb948baeacdadf547b19bd26eb232 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期日, 31 三月 2024 23:35:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
index ad074fb..e561d73 100644
--- a/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
+++ b/Source/ProjectWeb/src/views/base/UIContentViewerInDialog.vue
@@ -54,17 +54,24 @@
 <script>
 import UIContentArea from "@/views/base/UIContentArea"
 import {uiDefineVOData} from "@/views/base/uiDefineVOInDialog"
+import {verifyNull} from "@/util/validate";
 
 export default {
   name: "UIContentViewerInDialog",
   components:{UIContentArea},
   props:{
+    btmType:{
+      type: String,
+    },
+    content:{
+      type: String,
+    },
     inDialog: {
       type: Boolean,
       default: false
     },
     sourceData:{
-      //鑿滃崟婧愭暟鎹垨鑰呭脊绐楁椂鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+      //鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
       type:Object,
       default: {}
     },
@@ -76,16 +83,10 @@
     paramVOS:{
       type:Object,
       default: {}
-    },
-    customOptions:{
-      type:Object,
-      default: {}
     }
   },
   data() {
     return {
-      btmType:this.customOptions.btmType,//涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
-      content:this.customOptions.content,//UI涓婁笅鏂囩殑鍚嶇О
       checkedData:{
         //鍚勫尯鍩熼�変腑鏁版嵁
         northAreaInDialog:[{}],
@@ -93,7 +94,7 @@
         centerAreaInDialog:[{}],
         southAreaInDialog:[{}]
       },
-      uiDefineVO: uiDefineVOData,
+      uiDefineVO: {},
       centerHeight:'100%'
     }
   },
@@ -104,18 +105,23 @@
 
   },
   created() {
-    if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
-      this.centerHeight = 'calc(100% - 310px)';
-    } else {
-      this.centerHeight = '100%';
+    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(){
-
+    initUI() {
+      this.uiDefineVO = uiDefineVOData;
     },
-    initContent(){
-
+    initContent() {
+      if (this.uiDefineVO.southAreas && this.uiDefineVO.southAreas.length > 0) {
+        this.centerHeight = 'calc(100% - 310px)';
+      } else {
+        this.centerHeight = '100%';
+      }
     },
     setDataStore(value) {
       this.checkedData[value.area] = value.dataStore;

--
Gitblit v1.9.3