From 52e123212f37e214ee4599649adbd743e0d86c2b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 15 四月 2024 10:32:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-custom.vue |    6 +++---
 1 files changed, 3 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..522c005 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"
@@ -68,7 +68,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 +114,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