From 9a1e23c661dc08df6ff28dadfb746c15700e1d15 Mon Sep 17 00:00:00 2001
From: MTrun <1262327911@qq.com>
Date: Fri, 28 Jan 2022 21:05:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/ContentBox/index.vue            | 17 +++++++++++++++--
 .../components/OptionContent/index.vue          |  2 +-
 src/views/chart/ContentCharts/index.vue         |  4 ++--
 src/views/chart/ContentEdit/index.vue           |  1 +
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/chart/ContentBox/index.vue b/src/views/chart/ContentBox/index.vue
index d50b13fa..aab92681 100644
--- a/src/views/chart/ContentBox/index.vue
+++ b/src/views/chart/ContentBox/index.vue
@@ -24,11 +24,19 @@
     </div>
 
     <aside class="content">
-      <n-scrollbar x-scrollable>
+      <template v-if="xScroll">
+        <n-scrollbar x-scrollable>
+          <n-scrollbar>
+            <slot></slot>
+          </n-scrollbar>
+        </n-scrollbar>
+      </template>
+
+      <template v-else>
         <n-scrollbar>
           <slot></slot>
         </n-scrollbar>
-      </n-scrollbar>
+      </template>
     </aside>
 
     <div v-if="showBottom" class="bottom go-mt-0">
@@ -69,6 +77,11 @@ defineProps({
   depth: {
     type: Number,
     default: 1
+  },
+  // x 轴滚动
+  xScroll: {
+    type: Boolean,
+    default: false
   }
 })
 
diff --git a/src/views/chart/ContentCharts/components/OptionContent/index.vue b/src/views/chart/ContentCharts/components/OptionContent/index.vue
index 693df276..e3ec94a8 100644
--- a/src/views/chart/ContentCharts/components/OptionContent/index.vue
+++ b/src/views/chart/ContentCharts/components/OptionContent/index.vue
@@ -109,7 +109,7 @@ const clickItemHandle = (key: string) => {
 
 <style lang="scss" scoped>
 /* 此高度与 ContentBox 组件关联*/
-$topHeight: 36px;
+$topHeight: 40px;
 $menuWidth: 65px;
 @include go('chart-common') {
   display: flex;
diff --git a/src/views/chart/ContentCharts/index.vue b/src/views/chart/ContentCharts/index.vue
index 117ee7d1..5d1ed64c 100644
--- a/src/views/chart/ContentCharts/index.vue
+++ b/src/views/chart/ContentCharts/index.vue
@@ -62,8 +62,8 @@ import {
 $width: 330px;
 /* 列表的宽度 */
 $widthScoped: 65px;
-/* 此高度与 ContentBox 组件关联*/
-$topHeight: 36px;
+/* 此高度与 ContentBox 组件关联 */
+$topHeight: 40px;
 
 @include go(content-charts) {
   width: $width;
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index 20d53f17..b045d26e 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -6,6 +6,7 @@
     :showTop="false"
     :showBottom="true"
     :depth="1"
+    :xScroll="true"
     @drop="handleDrop"
     @dragover="handleDragOver"
   >