From 076c3b7fa202b306f5e5787406771f90c312ebf4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 5 Apr 2022 19:28:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=BD=91=E9=A1=B5=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=8D=A2=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E6=97=A0=E6=B3=95=E7=AB=8B=E5=8D=B3=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/Editor/FrameLinks.vue         |  2 ++
 .../components/canvas/custom-component/DeFrame.vue  | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/canvas/components/Editor/FrameLinks.vue b/frontend/src/components/canvas/components/Editor/FrameLinks.vue
index 351728af6a..c0e3b21497 100644
--- a/frontend/src/components/canvas/components/Editor/FrameLinks.vue
+++ b/frontend/src/components/canvas/components/Editor/FrameLinks.vue
@@ -28,6 +28,7 @@
 import { mapState } from 'vuex'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import { checkAddHttp } from '@/utils/urlUtils'
+import bus from '@/utils/bus'
 
 export default {
   props: {
@@ -73,6 +74,7 @@ export default {
       this.linkInfoTemp.src = checkAddHttp(this.linkInfoTemp.src)
       this.curComponent.frameLinks = this.linkInfoTemp
       this.$store.state.styleChangeTimes++
+      bus.$emit('frameLinksChange-' + this.curComponent.id)
       this.popoverClose()
     },
     onClose() {
diff --git a/frontend/src/components/canvas/custom-component/DeFrame.vue b/frontend/src/components/canvas/custom-component/DeFrame.vue
index 44f412cf75..dc27903414 100644
--- a/frontend/src/components/canvas/custom-component/DeFrame.vue
+++ b/frontend/src/components/canvas/custom-component/DeFrame.vue
@@ -1,7 +1,7 @@
 <template>
   <el-row class="main-frame">
     <div v-if="element.frameLinks.src" class="main-frame">
-      <iframe id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
+      <iframe v-if="frameShow" id="iframe" :src="element.frameLinks.src" scrolling="auto" frameborder="0" class="main-frame" @load="loaded" @error="onError" />
       <div v-if="editMode==='edit'" class="frame-mask">
         <span style="opacity: 1;">
           <span style="font-weight: bold;color: lawngreen;">{{ $t('panel.edit_web_tips') }}</span>
@@ -17,7 +17,7 @@
 
 <script>
 import { mapState } from 'vuex'
-import NProgress from 'nprogress'
+import bus from '@/utils/bus'
 export default {
   name: 'DeFrame',
   props: {
@@ -45,7 +45,8 @@ export default {
   },
   data() {
     return {
-      pOption: {}
+      pOption: {},
+      frameShow: true
     }
   },
 
@@ -62,6 +63,12 @@ export default {
   created() {
   },
   mounted() {
+    bus.$on('frameLinksChange-' + this.element.id, () => {
+      this.frameShow = false
+      this.$nextTick(() => {
+        this.frameShow = true
+      })
+    })
   },
   methods: {
     loaded(e) {