From eb9a9257dee3ca109e68fdd1c6ff1cb0aa9f3513 Mon Sep 17 00:00:00 2001
From: preschooler <preschool@139.com>
Date: Wed, 21 Aug 2024 13:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=88=20perf:=E4=BC=98=E5=8C=96iframe?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IFrame/src/IFrame.vue          | 33 ++++++++++++++-----
 src/views/infra/druid/index.vue               |  4 +--
 src/views/infra/server/index.vue              |  2 +-
 src/views/infra/skywalking/index.vue          |  2 +-
 src/views/infra/swagger/index.vue             |  4 +--
 .../delivery/pickUpStore/PickUpStoreForm.vue  | 15 ++-------
 src/views/report/goview/index.vue             |  1 +
 src/views/report/jmreport/index.vue           |  4 +--
 8 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/components/IFrame/src/IFrame.vue b/src/components/IFrame/src/IFrame.vue
index 19de51a3..64ffc0e5 100644
--- a/src/components/IFrame/src/IFrame.vue
+++ b/src/components/IFrame/src/IFrame.vue
@@ -7,26 +7,41 @@ const props = defineProps({
   src: propTypes.string.def('')
 })
 const loading = ref(true)
-const height = ref('')
 const frameRef = ref<HTMLElement | null>(null)
 const init = () => {
-  height.value = document.documentElement.clientHeight - 94.5 + 'px'
-  loading.value = false
+  nextTick(() => {
+    loading.value = true
+    if (!frameRef.value) return
+    frameRef.value.onload = () => {
+      loading.value = false
+    }
+  })
 }
 onMounted(() => {
-  setTimeout(() => {
-    init()
-  }, 300)
+  init()
 })
+watch(
+  () => props.src,
+  () => {
+    init()
+  }
+)
 </script>
 <template>
-  <div v-loading="loading" :style="'height:' + height">
+  <div
+    v-loading="loading"
+    class="w-full h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-content-padding)-var(--app-content-padding)-2px)]"
+  >
     <iframe
       ref="frameRef"
       :src="props.src"
-      frameborder="no"
+      frameborder="0"
       scrolling="auto"
-      style="width: 100%; height: 100%"
+      height="100%"
+      width="100%"
+      allowfullscreen="true"
+      webkitallowfullscreen="true"
+      mozallowfullscreen="true"
     ></iframe>
   </div>
 </template>
diff --git a/src/views/infra/druid/index.vue b/src/views/infra/druid/index.vue
index bc047d76..2ac99d23 100644
--- a/src/views/infra/druid/index.vue
+++ b/src/views/infra/druid/index.vue
@@ -2,8 +2,8 @@
   <doc-alert title="数据库 MyBatis" url="https://doc.iocoder.cn/mybatis/" />
   <doc-alert title="多数据源（读写分离）" url="https://doc.iocoder.cn/dynamic-datasource/" />
 
-  <ContentWrap>
-    <IFrame v-if="!loading" :src="url" />
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+    <IFrame v-if="!loading" v-loading="loading" :src="url" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/infra/server/index.vue b/src/views/infra/server/index.vue
index b9a157a5..6dcdec6c 100644
--- a/src/views/infra/server/index.vue
+++ b/src/views/infra/server/index.vue
@@ -1,7 +1,7 @@
 <template>
   <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
 
-  <ContentWrap>
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
diff --git a/src/views/infra/skywalking/index.vue b/src/views/infra/skywalking/index.vue
index d576ddb0..f5055d73 100644
--- a/src/views/infra/skywalking/index.vue
+++ b/src/views/infra/skywalking/index.vue
@@ -1,7 +1,7 @@
 <template>
   <doc-alert title="服务监控" url="https://doc.iocoder.cn/server-monitor/" />
 
-  <ContentWrap>
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
diff --git a/src/views/infra/swagger/index.vue b/src/views/infra/swagger/index.vue
index f844ba65..7ed35f83 100644
--- a/src/views/infra/swagger/index.vue
+++ b/src/views/infra/swagger/index.vue
@@ -1,8 +1,8 @@
 <template>
   <doc-alert title="接口文档" url="https://doc.iocoder.cn/api-doc/" />
 
-  <ContentWrap>
-    <IFrame :src="src" />
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
+    <IFrame v-if="!loading" v-loading="loading" :src="src" />
   </ContentWrap>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue b/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
index fb5821fc..077ba672 100644
--- a/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
+++ b/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
@@ -106,14 +106,8 @@
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
     </template>
-    <el-dialog
-      v-model="mapDialogVisible"
-      title="获取经纬度"
-      append-to-body
-      width="500px"
-      class="mapBox"
-    >
-      <iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="tencentLbsUrl"></iframe>
+    <el-dialog v-model="mapDialogVisible" title="获取经纬度" append-to-body>
+      <IFrame class="h-609px" :src="tencentLbsUrl" />
     </el-dialog>
   </Dialog>
 </template>
@@ -266,8 +260,3 @@ onMounted(async () => {
   await initTencentLbsMap()
 })
 </script>
-<style lang="scss">
-.mapBox .el-dialog__body {
-  height: 640px !important;
-}
-</style>
diff --git a/src/views/report/goview/index.vue b/src/views/report/goview/index.vue
index dd10cca0..355fdd54 100644
--- a/src/views/report/goview/index.vue
+++ b/src/views/report/goview/index.vue
@@ -2,6 +2,7 @@
   <ContentWrap>
     <doc-alert title="大屏设计器" url="https://doc.iocoder.cn/report/screen/" />
 
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame :src="src" />
   </ContentWrap>
 </template>
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
index 382d7893..49c6f902 100644
--- a/src/views/report/jmreport/index.vue
+++ b/src/views/report/jmreport/index.vue
@@ -2,6 +2,7 @@
   <ContentWrap>
     <doc-alert title="报表设计器" url="https://doc.iocoder.cn/report/" />
 
+  <ContentWrap :bodyStyle="{ padding: '0px' }" class="!mb-0">
     <IFrame :src="src" />
   </ContentWrap>
 </template>
@@ -10,6 +11,5 @@ import { getAccessToken } from '@/utils/auth'
 
 defineOptions({ name: 'JimuReport' })
 
-const BASE_URL = import.meta.env.VITE_BASE_URL
-const src = ref(BASE_URL + '/jmreport/list?token=' + getAccessToken())
+const src = ref(import.meta.env.VITE_BASE_URL + '/jmreport/list?token=' + getAccessToken())
 </script>