From 6b7eda5feb4bf5f0eec1dc50e2490f74942351e4 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 12 Aug 2024 16:23:49 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=BD=AE=E6=92=AD=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/common/CommonAttr.vue         | 10 ++++++++++
 .../src/custom-component/common/TabCarouselSetting.vue |  6 +++---
 .../src/custom-component/de-tabs/Attr.vue              |  6 ------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index fe24ecf702..0c8874f0ea 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -10,6 +10,7 @@ import elementResizeDetectorMaker from 'element-resize-detector'
 import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot'
 import CommonStyleSet from '@/custom-component/common/CommonStyleSet.vue'
 import CommonEvent from '@/custom-component/common/CommonEvent.vue'
+import TabCarouselSetting from '@/custom-component/common/TabCarouselSetting.vue'
 const snapshotStore = snapshotStoreWithOut()
 
 const { t } = useI18n()
@@ -102,6 +103,10 @@ const eventsShow = computed(() => {
   )
 })
 
+const carouselShow = computed(() => {
+  return element.value.component === 'DeTabs' && element.value.carousel
+})
+
 const backgroundCustomShow = computed(() => {
   return (
     dashboardActive.value ||
@@ -173,6 +178,11 @@ const stopEvent = e => {
       >
         <common-event :themes="themes" :events-info="element.events"></common-event>
       </el-collapse-item>
+      <TabCarouselSetting
+        v-if="carouselShow"
+        :element="element"
+        :themes="themes"
+      ></TabCarouselSetting>
     </el-collapse>
   </div>
 </template>
diff --git a/core/core-frontend/src/custom-component/common/TabCarouselSetting.vue b/core/core-frontend/src/custom-component/common/TabCarouselSetting.vue
index 37036c89ec..4510762ead 100644
--- a/core/core-frontend/src/custom-component/common/TabCarouselSetting.vue
+++ b/core/core-frontend/src/custom-component/common/TabCarouselSetting.vue
@@ -32,7 +32,7 @@ const onSettingChange = () => {
     :themes="themes"
     v-model="carouselInfo.enable"
     name="carouselInfo"
-    title="轮询"
+    title="轮播"
   >
     <el-row class="custom-row">
       <el-form label-position="top">
@@ -41,10 +41,10 @@ const onSettingChange = () => {
           :class="'form-item-' + themes"
           style="width: 50%; margin-bottom: 8px"
         >
-          <span style="font-size: 12px">轮询时间</span>
+          <span style="font-size: 12px">轮播时间</span>
           <el-tooltip class="item" :effect="themes" placement="top">
             <template #content>
-              <div>Tab轮询退出编辑模式才开生效</div>
+              <div>Tab轮播退出编辑模式才开生效</div>
             </template>
             <el-icon class="hint-icon" :class="{ 'hint-icon--dark': themes === 'dark' }">
               <Icon name="icon_info_outlined" />
diff --git a/core/core-frontend/src/custom-component/de-tabs/Attr.vue b/core/core-frontend/src/custom-component/de-tabs/Attr.vue
index 3a4563ab17..5eae5271b7 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Attr.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Attr.vue
@@ -3,7 +3,6 @@ import CommonAttr from '@/custom-component/common/CommonAttr.vue'
 import { toRefs } from 'vue'
 import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain'
 import { storeToRefs } from 'pinia'
-import TabCarouselSetting from '@/custom-component/common/TabCarouselSetting.vue'
 
 const props = withDefaults(
   defineProps<{
@@ -27,11 +26,6 @@ const { curComponent } = storeToRefs(dvMainStore)
       :background-color-picker-width="197"
       :background-border-select-width="197"
     >
-      <TabCarouselSetting
-        v-if="curComponent && curComponent.carousel"
-        :element="curComponent"
-        :themes="themes"
-      ></TabCarouselSetting>
     </CommonAttr>
   </div>
 </template>