From ca5699400f4b86ff6f9dccb6529d57da6e5a5e35 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 30 Jul 2024 14:17:40 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=85=B3=E8=81=94=E5=9B=BE=E8=A1=A8=E7=9A=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=BF=87=E9=95=BF=E6=97=B6=E6=97=A0=E6=B3=95=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=AE=8C=E6=95=B4=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue  | 17 +++++++++++++++--
 .../v-query/QueryConditionConfiguration.vue     |  2 +-
 .../src/views/template-market/index.vue         | 12 ++----------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 498e9fbb07..b86d8dab16 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -512,6 +512,19 @@ const labelStyle = computed(() => {
   }
   return style
 })
+
+const paddingTop = computed<CSSProperties>(() => {
+  return {
+    paddingTop: customStyle.layout !== 'horizontal' ? customStyle.nameboxSpacing + 22 + 'px' : '0'
+  }
+})
+
+const marginRight = computed<CSSProperties>(() => {
+  return {
+    marginRight: customStyle.layout === 'horizontal' ? customStyle.nameboxSpacing + 'px' : '8px'
+  }
+})
+
 const autoStyle = computed(() => {
   return {
     position: 'absolute',
@@ -558,8 +571,8 @@ const autoStyle = computed(() => {
           :key="ele.id"
           v-for="(ele, index) in listVisible"
         >
-          <div class="query-field">
-            <div class="label" :style="{ marginRight: `${customStyle.nameboxSpacing}px` }">
+          <div class="query-field" :style="paddingTop">
+            <div class="label" :style="marginRight">
               <div class="label-wrapper" v-show="customStyle.labelShow">
                 <div class="label-wrapper-text" :style="labelStyle">
                   <el-tooltip effect="dark" :content="ele.name" placement="top">
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index 8b4bb188eb..4f0aea129d 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -1383,7 +1383,7 @@ defineExpose({
                   canvasViewInfo[field.componentId].title
                 }}</span></el-checkbox
               >
-              <span class="dataset ellipsis">{{ field.name }}</span>
+              <span :title="field.name" class="dataset ellipsis">{{ field.name }}</span>
               <el-select
                 @change="setParameters"
                 @focus="handleDialogClick"
diff --git a/core/core-frontend/src/views/template-market/index.vue b/core/core-frontend/src/views/template-market/index.vue
index 10767ca7f9..07e40270fe 100644
--- a/core/core-frontend/src/views/template-market/index.vue
+++ b/core/core-frontend/src/views/template-market/index.vue
@@ -177,9 +177,7 @@ import { nextTick, reactive, watch, onMounted, ref, computed } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { ElMessage } from 'element-plus-secondary'
 import { useCache } from '@/hooks/web/useCache'
-import router from '@/router'
 import MarketPreviewV2 from '@/views/template-market/component/MarketPreviewV2.vue'
-import { parseUrl } from '@/utils/ParseUrl'
 import { imgUrlTrans } from '@/utils/imgUtils'
 import CategoryTemplateV2 from '@/views/template-market/component/CategoryTemplateV2.vue'
 import { interactiveStoreWithOut } from '@/store/modules/interactive'
@@ -201,8 +199,7 @@ const close = () => {
 }
 
 const title = computed(() => (state.curPosition === 'branch' ? '模板中心' : '使用模板新建'))
-const isDataEaseBi = computed(() => appStore.getIsDataEaseBi)
-const isIframe = computed(() => appStore.getIsIframe)
+const isEmbedded = computed(() => appStore.getIsDataEaseBi || appStore.getIsIframe)
 const state = reactive({
   initReady: true,
   curPosition: 'branch',
@@ -472,7 +469,7 @@ const apply = template => {
     '&templateParams=' +
     encodeURIComponent(Base64.encode(JSON.stringify(templateTemplate)))
   let newWindow = null
-  if (isDataEaseBi.value) {
+  if (isEmbedded.value) {
     embeddedStore.clearState()
     embeddedStore.setCreateType('template')
     embeddedStore.setTemplateParams(
@@ -491,11 +488,6 @@ const apply = template => {
     )
     return
   }
-
-  if (isIframe.value) {
-    router.push(parseUrl(state.pid ? baseUrl + `&pid=${state.pid}` : baseUrl))
-    return
-  }
   if (state.pid) {
     newWindow = window.open(baseUrl + `&pid=${state.pid}`, '_blank')
   } else {