From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
index 9a1a0cf..2358b28 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue
@@ -11,7 +11,7 @@
     </el-alert>
     <component v-else :is="currentComponent"
                :btmType="btmType"
-               :content="content"
+               :context="context"
                :inDialog="true"
                :key="areasName+'customCom-'+componentVO.oid"
                :componentVO="componentVO"
@@ -33,6 +33,14 @@
     'test2': () => import('@/views/custom-ui/test2'),
   },
   props: {
+    //ui涓婁笅鏂囩殑涓氬姟绫诲瀷锛堟垨閾炬帴绫诲瀷锛�
+    uiBtmType: {
+      type: String
+    },
+    //ui涓婁笅鏂�
+    uiContext:{
+      type: String
+    },
     componentVO: {
       type: Object,
       default: {}
@@ -68,7 +76,7 @@
   data() {
     return {
       btmType: '',
-      content: '',
+      context: '',
       urlParams: {},
       height: '300px',
       customClass: '', //?type=xxx&context=yyy&param=zzz  鎴栬�� 缁勪欢name?type=xxx&context=yyy&param=zzz
@@ -114,7 +122,7 @@
     }
 
     this.btmType = urlParams.type;
-    this.content = urlParams.context;
+    this.context = urlParams.context;
     this.urlParams = Object.assign(this.paramVOS, urlParams)
 
     //this.getHeight(this.$parent);

--
Gitblit v1.9.3