From 8dcde1740df729d3f5c16ba7ab53c72896aa17d5 Mon Sep 17 00:00:00 2001
From: "liu.shiyi" <liu.shiyi@ustcinfo.com>
Date: Wed, 26 Jun 2024 17:56:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=B4=E8=B7=9D=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicComponents/Candlestick/index.vue     |  9 +++----
 .../BasicComponents/Candlestick/setting.vue   | 25 +++++++++++++++++++
 .../Candlestick/settingConfig.js              |  2 ++
 3 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/data-room-ui/packages/BasicComponents/Candlestick/index.vue b/data-room-ui/packages/BasicComponents/Candlestick/index.vue
index 9cafe386..d03f0cc9 100644
--- a/data-room-ui/packages/BasicComponents/Candlestick/index.vue
+++ b/data-room-ui/packages/BasicComponents/Candlestick/index.vue
@@ -141,11 +141,11 @@ export default {
      */
     handleOption (config) {
       this.option = {
-        xAxis: [
+        xAxis:
           {
             show: true,
             name: config.customize.xAxis.name,
-            nameGap: 30,
+            nameGap: config.customize.xAxis.nameGap,
             data: this.xData,
             nameTextStyle: {
               color: config.customize.xAxis.nameColor,
@@ -178,11 +178,10 @@ export default {
               },
               margin: 30
             }
-          }
-        ],
+          },
         yAxis: {
           name: config.customize.yAxis.name,
-          nameGap: 10,
+          nameGap: config.customize.yAxis.nameGap,
           nameTextStyle: {
             color: config.customize.yAxis.nameColor,
             fontSize: config.customize.yAxis.nameSize
diff --git a/data-room-ui/packages/BasicComponents/Candlestick/setting.vue b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue
index b96ff034..0e820ec4 100644
--- a/data-room-ui/packages/BasicComponents/Candlestick/setting.vue
+++ b/data-room-ui/packages/BasicComponents/Candlestick/setting.vue
@@ -128,6 +128,19 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item
+          label="标题间距"
+          label-width="100px"
+        >
+          <el-input-number
+            v-model="config.customize.xAxis.nameGap"
+            class="bs-el-input-number"
+            placeholder="请输入标题间距"
+            :min="0"
+            clearable
+          />
+        </el-form-item>
+
         <el-form-item
           label="标题字体大小"
           label-width="100px"
@@ -247,6 +260,18 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item
+          label="标题间距"
+          label-width="100px"
+        >
+          <el-input-number
+            v-model="config.customize.yAxis.nameGap"
+            class="bs-el-input-number"
+            placeholder="请输入标题间距"
+            :min="0"
+            clearable
+          />
+        </el-form-item>
 
         <el-form-item
           label="标题字体大小"
diff --git a/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js
index 7f477e6f..32a5e745 100644
--- a/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js
+++ b/data-room-ui/packages/BasicComponents/Candlestick/settingConfig.js
@@ -48,6 +48,7 @@ const customConfig = {
     bottom: 60,
     xAxis: {
       name: '',
+      nameGap: 30,
       nameColor: '#fff',
       nameSize: 16,
       position: 'end',
@@ -60,6 +61,7 @@ const customConfig = {
     },
     yAxis: {
       name: '',
+      nameGap: 10,
       nameColor: '#fff',
       nameSize: 16,
       position: 'end',