From 0381ff0e11aed722ba53c1dc4f356dcffa579489 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 24 Dec 2024 13:16:03 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=B7=B3=E8=BD=AC=E8=81=94=E5=8A=A8=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=20#14186?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/visualization/LinkJumpSet.vue  | 25 ++++++++++++++++---
 .../editor/editor-style/ChartStyle.vue        | 21 ----------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/LinkJumpSet.vue b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
index 5088357a80..aab47beba8 100644
--- a/core/core-frontend/src/components/visualization/LinkJumpSet.vue
+++ b/core/core-frontend/src/components/visualization/LinkJumpSet.vue
@@ -225,7 +225,13 @@
                             </el-col>
                             <el-col :span="8"></el-col>
                           </el-row>
-                          <div class="main-scrollbar-container">
+                          <div
+                            class="main-scrollbar-container"
+                            :class="{
+                              'main-scrollbar-container-min':
+                                state.linkJumpInfo?.jumpType === 'newPop'
+                            }"
+                          >
                             <el-scrollbar height="fit-content" max-height="178px">
                               <div
                                 style="display: flex; margin-bottom: 6px"
@@ -358,7 +364,7 @@
                               text
                               @click="addLinkJumpField('view')"
                             >
-                              {{ t('visualization.add_jump_field') }}
+                              {{ t('visualization.add_jump_field') }} 1
                             </el-button>
                           </div>
                         </template>
@@ -384,7 +390,13 @@
                                 {{ t('visualization.link_outer_params') }}
                               </el-col>
                             </el-row>
-                            <div class="main-scrollbar-container">
+                            <div
+                              class="main-scrollbar-container"
+                              :class="{
+                                'main-scrollbar-container-min':
+                                  state.linkJumpInfo?.jumpType === 'newPop'
+                              }"
+                            >
                               <el-scrollbar height="fit-content" max-height="178px">
                                 <div
                                   style="display: flex; margin-bottom: 6px"
@@ -1377,6 +1389,13 @@ span {
   }
 }
 
+.main-scrollbar-container-min {
+  :deep(.ed-scrollbar) {
+    height: fit-content;
+    max-height: 138px !important;
+  }
+}
+
 .top-area-value {
   font-weight: 400;
   font-size: 14px;
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index 70fa44b3dc..262423467a 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -51,10 +51,6 @@ const props = defineProps({
     type: Object,
     required: false
   },
-  eventInfo: {
-    type: Object,
-    required: false
-  },
   chart: {
     type: Object as PropType<ChartObj>,
     required: true
@@ -139,14 +135,6 @@ const positionComponentShow = computed(() => {
   return !batchOptStatus.value && dvInfo.value.type !== 'dashboard'
 })
 
-const eventsShow = computed(() => {
-  return (
-    !batchOptStatus.value &&
-    ['indicator', 'rich-text'].includes(chart.value.type) &&
-    props.eventInfo
-  )
-})
-
 const showProperties = (property: EditorProperty) => properties.value?.includes(property)
 
 const onMiscChange = (val, prop) => {
@@ -379,15 +367,6 @@ watch(
               @onMiscChange="onMiscChange"
             />
           </el-collapse-item>
-
-          <el-collapse-item
-            :effect="themes"
-            name="events"
-            :title="t('visualization.event')"
-            v-if="eventsShow"
-          >
-            <common-event :themes="themes" :events-info="eventInfo"></common-event>
-          </el-collapse-item>
           <el-collapse-item
             :effect="themes"
             v-if="showProperties('indicator-value-selector')"