From 9abe823b794fb120ece0b614155b72411c6d0d77 Mon Sep 17 00:00:00 2001
From: CaptainB <bin@fit2cloud.com>
Date: Tue, 24 Sep 2024 11:27:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=AC=E5=BC=80=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=8E=A5=E5=8F=A3=E8=BE=93=E5=85=A5=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=9A=84=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1047029 --user=刘瑞斌 【应用编排】- 公开访问连接中未自动生成 接口传参的变量 https://www.tapd.cn/57709429/s/1584536
---
 .../component/EmbedDialog.vue                 | 43 ++++---------------
 ui/src/views/application-overview/index.vue   | 32 ++++++++++++--
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/ui/src/views/application-overview/component/EmbedDialog.vue b/ui/src/views/application-overview/component/EmbedDialog.vue
index a8cf10ac3..a4dc869a4 100644
--- a/ui/src/views/application-overview/component/EmbedDialog.vue
+++ b/ui/src/views/application-overview/component/EmbedDialog.vue
@@ -52,14 +52,15 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { copyClick } from '@/utils/clipboard'
 import useStore from '@/stores'
 
 const { application } = useStore()
 
 const props = defineProps({
-  data: Object
+  data: Object,
+  apiInputParams: String
 })
 
 const emit = defineEmits(['addData'])
@@ -70,7 +71,9 @@ const source1 = ref('')
 
 const source2 = ref('')
 
-const apiInputParams = ref([])
+const urlParams1 = computed(() => props.apiInputParams ? '?' + props.apiInputParams : '')
+const urlParams2 = computed(() => props.apiInputParams ? '&' + props.apiInputParams : '')
+
 
 watch(dialogVisible, (bool) => {
   if (!bool) {
@@ -81,7 +84,7 @@ watch(dialogVisible, (bool) => {
 
 const open = (val: string) => {
   source1.value = `<iframe
-src="${application.location + val}?${mapToUrlParams(apiInputParams.value)}"
+src="${application.location + val + urlParams1.value}"
 style="width: 100%; height: 100%;"
 frameborder="0"
 allow="microphone">
@@ -94,42 +97,12 @@ defer
 src="${window.location.origin}/api/application/embed?protocol=${window.location.protocol.replace(
     ':',
     ''
-  )}&host=${window.location.host}&token=${val}&${mapToUrlParams(apiInputParams.value)}">
+  )}&host=${window.location.host}&token=${val}${urlParams2.value}">
 <\/script>
 `
   dialogVisible.value = true
 }
 
-function mapToUrlParams(map: any[]) {
-    const params = new URLSearchParams();
-
-    map.forEach((item: any) => {
-        params.append(encodeURIComponent(item.name), encodeURIComponent(item.value));
-    });
-
-    return params.toString(); // 返回 URL 查询字符串
-}
-
-watch(() => props.data,
-  (val) => {
-    if (val) {
-      val.work_flow?.nodes
-        ?.filter((v: any) => v.id === 'base-node')
-        .map((v: any) => {
-          apiInputParams.value = v.properties.input_field_list
-            ? v.properties.input_field_list
-              .filter((v: any) => v.assignment_method === 'api_input')
-              .map((v: any) => {
-                return {
-                  name: v.variable,
-                  value: v.default_value
-                }
-              })
-            : []
-        })
-    }
-  }
-)
 
 defineExpose({ open })
 </script>
diff --git a/ui/src/views/application-overview/index.vue b/ui/src/views/application-overview/index.vue
index 6801027f2..5ac8c2dff 100644
--- a/ui/src/views/application-overview/index.vue
+++ b/ui/src/views/application-overview/index.vue
@@ -153,7 +153,7 @@
         </div>
       </div>
     </el-scrollbar>
-    <EmbedDialog ref="EmbedDialogRef" :data="detail" />
+    <EmbedDialog ref="EmbedDialogRef" :data="detail" :api-input-params="mapToUrlParams(apiInputParams)"/>
     <APIKeyDialog ref="APIKeyDialogRef" />
     <LimitDialog ref="LimitDialogRef" @refresh="refresh" />
     <EditAvatarDialog ref="EditAvatarDialogRef" @refresh="refreshIcon" />
@@ -161,7 +161,7 @@
   </LayoutContainer>
 </template>
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import EmbedDialog from './component/EmbedDialog.vue'
 import APIKeyDialog from './component/APIKeyDialog.vue'
@@ -199,7 +199,8 @@ const detail = ref<any>(null)
 
 const loading = ref(false)
 
-const shareUrl = computed(() => application.location + accessToken.value.access_token)
+const urlParams = computed(() => mapToUrlParams(apiInputParams.value) ? '?' + mapToUrlParams(apiInputParams.value) : '')
+const shareUrl = computed(() => application.location + accessToken.value.access_token + urlParams.value)
 
 const dayOptions = [
   {
@@ -240,6 +241,7 @@ const statisticsLoading = ref(false)
 const statisticsData = ref([])
 
 const showEditIcon = ref(false)
+const apiInputParams = ref([])
 
 function toUrl(url: string) {
   window.open(url, '_blank')
@@ -326,6 +328,19 @@ function getAccessToken() {
 function getDetail() {
   application.asyncGetApplicationDetail(id, loading).then((res: any) => {
     detail.value = res.data
+    detail.value.work_flow?.nodes?.filter((v: any) => v.id === 'base-node')
+      .map((v: any) => {
+        apiInputParams.value = v.properties.input_field_list
+          ? v.properties.input_field_list
+            .filter((v: any) => v.assignment_method === 'api_input')
+            .map((v: any) => {
+              return {
+                name: v.variable,
+                value: v.default_value
+              }
+            })
+          : []
+      })
   })
 }
 
@@ -337,6 +352,17 @@ function refreshIcon() {
   getDetail()
 }
 
+
+function mapToUrlParams(map: any[]) {
+    const params = new URLSearchParams();
+
+    map.forEach((item: any) => {
+        params.append(encodeURIComponent(item.name), encodeURIComponent(item.value));
+    });
+
+    return params.toString(); // 返回 URL 查询字符串
+}
+
 onMounted(() => {
   getDetail()
   getAccessToken()