From bf2ea2a2c6949459e8055709cad6719c1ab72576 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 12 Aug 2024 17:25:10 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E5=8D=A1=E3=80=81=E5=AF=8C=E6=96=87=E6=9C=AC=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E8=AE=BE=E7=BD=AE=20#10960?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-visualization/canvas/ComponentWrapper.vue |  8 ++++----
 .../src/custom-component/common/CommonAttr.vue     |  2 +-
 .../src/custom-component/common/CommonEvent.vue    | 14 +++++++++++---
 .../src/custom-component/component-list.ts         |  4 +++-
 core/core-frontend/src/utils/canvasUtils.ts        |  4 +++-
 .../components/editor/editor-style/ChartStyle.vue  |  6 +++++-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
index 821e72d8e6..f903fcfc67 100644
--- a/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
+++ b/core/core-frontend/src/components/data-visualization/canvas/ComponentWrapper.vue
@@ -209,12 +209,12 @@ const onPointClick = param => {
 
 const eventEnable = computed(
   () =>
-    (['Picture', 'CanvasIcon', 'CircleShape', 'SvgTriangle', 'RectShape', 'ScrollText'].includes(
+    ['Picture', 'CanvasIcon', 'CircleShape', 'SvgTriangle', 'RectShape', 'ScrollText'].includes(
       config.value.component
     ) ||
-      config.value.innerType === 'rich-text') &&
-    config.value.events &&
-    config.value.events.checked
+    (['indicator', 'rich-text'].includes(config.value.innerType) &&
+      config.value.events &&
+      config.value.events.checked)
 )
 
 const onWrapperClick = e => {
diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index 0c8874f0ea..56aee1c0e7 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -2,7 +2,7 @@
 import { computed, nextTick, onMounted, ref, toRefs } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
-import { styleData, selectKey, optionMap, horizontalPosition } from '@/utils/attr'
+import { styleData } from '@/utils/attr'
 import ComponentPosition from '@/components/visualization/common/ComponentPosition.vue'
 import BackgroundOverallCommon from '@/components/visualization/component-background/BackgroundOverallCommon.vue'
 import { useI18n } from '@/hooks/web/useI18n'
diff --git a/core/core-frontend/src/custom-component/common/CommonEvent.vue b/core/core-frontend/src/custom-component/common/CommonEvent.vue
index d2485739cc..1efdedfc5a 100644
--- a/core/core-frontend/src/custom-component/common/CommonEvent.vue
+++ b/core/core-frontend/src/custom-component/common/CommonEvent.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
-import { toRefs } from 'vue'
+import { computed, toRefs } from 'vue'
 import { ElFormItem, ElIcon } from 'element-plus-secondary'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import Icon from '../../components/icon-custom/src/Icon.vue'
+import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
+const dvMainStore = dvMainStoreWithOut()
 
 const snapshotStore = snapshotStoreWithOut()
 
@@ -16,9 +18,15 @@ const props = withDefaults(
   }
 )
 const { themes, eventsInfo } = toRefs(props)
+const isDashboard = dvMainStore.dvInfo.type === 'dashboard'
 
-const curSupportEvents = ['jump', 'showHidden', 'refreshDataV']
-
+const curSupportEvents = computed(() => {
+  if (isDashboard) {
+    return ['jump', 'refreshDataV']
+  } else {
+    return ['jump', 'showHidden', 'refreshDataV']
+  }
+})
 const onEventChange = () => {
   snapshotStore.recordSnapshotCache('renderChart')
 }
diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts
index 193c19bbe2..474d2eb9e3 100644
--- a/core/core-frontend/src/custom-component/component-list.ts
+++ b/core/core-frontend/src/custom-component/component-list.ts
@@ -224,7 +224,9 @@ export const commonAttr = {
     'picture',
     'frameLinks',
     'videoLinks',
-    'streamLinks'
+    'streamLinks',
+    'carouselInfo',
+    'events'
   ], // 编辑组件时记录当前使用的是哪个折叠面板，再次回来时恢复上次打开的折叠面板，优化用户体验
   linkage: {
     duration: 0, // 过渡持续时间
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 0b3add4141..fc0e74841d 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -173,7 +173,9 @@ export function historyAdaptor(
     }
     // 组件事件适配
     componentItem.events =
-      componentItem.events && componentItem.events.checked !== undefined
+      componentItem.events &&
+      componentItem.events.checked !== undefined &&
+      componentItem.events.type !== 'displayChange'
         ? componentItem.events
         : deepCopy(BASE_EVENTS)
     componentItem['category'] = componentItem['category'] || 'base'
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 b5a0fba572..ae8f4b7b00 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
@@ -124,7 +124,11 @@ const positionComponentShow = computed(() => {
 })
 
 const eventsShow = computed(() => {
-  return !batchOptStatus.value && chart.value.type.includes('rich-text') && props.eventInfo
+  return (
+    !batchOptStatus.value &&
+    ['indicator', 'rich-text'].includes(chart.value.type) &&
+    props.eventInfo
+  )
 })
 
 const showProperties = (property: EditorProperty) => properties.value?.includes(property)