From 953138f7e94244d499db94006618363641587948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=97=B6=E5=90=AF=E9=BE=99?= <shiqilong@beyondcent.com>
Date: Wed, 28 Aug 2024 17:22:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=B9=E9=80=A0=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webs/log-web/src/views/iframe.vue | 21 +++++++++++++++------
 webs/oms-web/src/views/iframe.vue | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/webs/log-web/src/views/iframe.vue b/webs/log-web/src/views/iframe.vue
index 477ab3b..1b4bbec 100644
--- a/webs/log-web/src/views/iframe.vue
+++ b/webs/log-web/src/views/iframe.vue
@@ -6,15 +6,24 @@
 
 <script>
 import { getToken } from '@cmp/cmp-element'
+function addParamsToUrl(url, params) {
+  const queryString = Object.keys(params)
+    .map(key => key + '=' + params[key])
+    .join('&')
+
+  // 检查原url中是否已存在查询字符串
+  const separator = url.includes('?') ? '&' : '?'
+  return url + separator + queryString
+}
+
 export default {
-  data() {
-    return {}
-  },
-  methods: {},
   computed: {
     iframeUrl() {
-      const url = new URL(this.$route.meta.url)
-      url.searchParams.append('token', getToken())
+      const params = {
+        token: getToken(),
+        ...this.$route.query
+      }
+      const url = addParamsToUrl(this.$route.meta.url, params)
       return url.toString()
     }
   }
diff --git a/webs/oms-web/src/views/iframe.vue b/webs/oms-web/src/views/iframe.vue
index 477ab3b..1b4bbec 100644
--- a/webs/oms-web/src/views/iframe.vue
+++ b/webs/oms-web/src/views/iframe.vue
@@ -6,15 +6,24 @@
 
 <script>
 import { getToken } from '@cmp/cmp-element'
+function addParamsToUrl(url, params) {
+  const queryString = Object.keys(params)
+    .map(key => key + '=' + params[key])
+    .join('&')
+
+  // 检查原url中是否已存在查询字符串
+  const separator = url.includes('?') ? '&' : '?'
+  return url + separator + queryString
+}
+
 export default {
-  data() {
-    return {}
-  },
-  methods: {},
   computed: {
     iframeUrl() {
-      const url = new URL(this.$route.meta.url)
-      url.searchParams.append('token', getToken())
+      const params = {
+        token: getToken(),
+        ...this.$route.query
+      }
+      const url = addParamsToUrl(this.$route.meta.url, params)
       return url.toString()
     }
   }