From f0f3a4bb99c8fd5877b2fa2eb952ad548edb1f55 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 7 May 2024 17:16:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):=20?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue       |  5 -----
 .../editor/editor-style/VQueryChartStyle.vue         | 12 +++---------
 2 files changed, 3 insertions(+), 14 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 ab22cfabe3..7271cb437d 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -86,7 +86,6 @@ const { datasetFieldList } = comInfo(element.value.id)
 
 const setCustomStyle = val => {
   const {
-    show,
     borderShow,
     borderColor,
     bgColorShow,
@@ -102,10 +101,6 @@ const setCustomStyle = val => {
     textColorShow,
     title
   } = val
-  if (!show) {
-    Object.assign(customStyle, { ...defaultStyle })
-    return
-  }
   customStyle.background = bgColorShow ? bgColor || '' : ''
   customStyle.border = borderShow ? borderColor || '' : ''
   customStyle.btnList = [...btnList]
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index c29b4f427a..c5d286d835 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -2,7 +2,6 @@
 import { useI18n } from '@/hooks/web/useI18n'
 import { toRefs } from 'vue'
 import { COLOR_PANEL } from '@/views/chart/components/editor/util/chart'
-import CollapseSwitchItem from '@/components/collapse-switch-item/src/CollapseSwitchItem.vue'
 const { t } = useI18n()
 
 const state = {
@@ -24,13 +23,8 @@ const { chart } = toRefs(props)
   <div class="attr-style">
     <el-row class="de-collapse-style">
       <el-collapse v-model="state.styleActiveNames" class="style-collapse">
-        <collapse-switch-item
-          themes="light"
-          v-model="chart.customStyle.component.show"
-          name="component"
-          :title="t('visualization.module')"
-        >
-          <el-form label-position="top" :disabled="!chart.customStyle.component.show">
+        <el-collapse-item themes="light" name="component" :title="t('visualization.module')">
+          <el-form label-position="top">
             <el-form-item class="form-item margin-bottom-8">
               <el-checkbox size="small" v-model="chart.customStyle.component.titleShow">
                 {{ t('chart.show') + t('chart.title') }}
@@ -158,7 +152,7 @@ const { chart } = toRefs(props)
               </el-radio-group>
             </el-form-item>
           </el-form>
-        </collapse-switch-item>
+        </el-collapse-item>
       </el-collapse>
     </el-row>
   </div>