From c7a1b7cf2670e7c13093602c5b093c5b10fa4e38 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 24 Jun 2022 11:40:40 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=98=BE=E7=A4=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue   |  6 +--
 .../views/chart/view/ChartStyleBatchSet.vue   |  4 +-
 .../src/views/panel/SubjectSetting/index.vue  | 46 ++++++++++---------
 frontend/src/views/panel/edit/index.vue       | 11 ++---
 frontend/src/views/panel/filter/index.vue     |  3 --
 5 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 14ab18cc16..36f45f706b 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -2664,12 +2664,12 @@ export default {
   background-color: #f7f8fa;
   overflow-y: auto;
   overflow-x: hidden;
-  height: calc(100vh - 75px);
+  height: calc(100vh - 96px);
 }
 
 .view-panel-Mask {
   display: flex;
-  height: calc(100vh - 60px);
+  height: calc(100vh - 80px);
   background-color: rgba(92,94,97, 0.7);
   position:absolute;
   top:0px;
@@ -2828,7 +2828,7 @@ span {
 }
 
 .attr-style {
-  height: calc(100vh - 56px - 60px - 40px - 40px);
+  height: calc(100vh - 76px - 60px - 40px - 40px);
 }
 
 .blackTheme .attr-style {
diff --git a/frontend/src/views/chart/view/ChartStyleBatchSet.vue b/frontend/src/views/chart/view/ChartStyleBatchSet.vue
index e4f081d59f..bcf40f9d33 100644
--- a/frontend/src/views/chart/view/ChartStyleBatchSet.vue
+++ b/frontend/src/views/chart/view/ChartStyleBatchSet.vue
@@ -121,11 +121,11 @@ export default {
     display: flex;
     align-items: center;
     justify-content: center;
-    height: calc(100vh - 35px);
+    height: calc(100vh - 56px);
   }
 
   .batch-opt-main{
-    height:  calc(100vh - 35px);
+    height:  calc(100vh - 56px);
     overflow-y: hidden;
     width: 100%;
     border-left: 1px solid #E6E6E6
diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue
index d9c4ab3dd2..42e5cf71bb 100644
--- a/frontend/src/views/panel/SubjectSetting/index.vue
+++ b/frontend/src/views/panel/SubjectSetting/index.vue
@@ -9,28 +9,30 @@
     </div>
     <!--折叠面板-->
     <div v-if="collapseShow" style="margin: 10px;overflow-y: auto">
-      <el-collapse v-model="activeNames" @change="handleChange">
-        <el-collapse-item :title="'整体配置'" name="panel">
-          <el-row class="selector-div">
-            <overall-setting />
-          </el-row>
-        </el-collapse-item>
-        <el-collapse-item :title="'仪表板背景'" name="panelBackground">
-          <background-selector />
-        </el-collapse-item>
-        <el-collapse-item :title="'组件样式'" name="componentStyle">
-          <component-style />
-        </el-collapse-item>
-        <el-collapse-item :title="'组件配色'" name="graphical">
-          <panel-color-selector @onColorChange="onColorChange" />
-        </el-collapse-item>
-        <el-collapse-item :title="'图表标题'" name="table">
-          <view-title @onTextChange="onTextChange" />
-        </el-collapse-item>
-        <el-collapse-item :title="'过滤组件'" name="filterComponent">
-          <FilterStyleSelector />
-        </el-collapse-item>
-      </el-collapse>
+      <div>
+        <el-collapse v-model="activeNames" @change="handleChange">
+          <el-collapse-item :title="'整体配置'" name="panel">
+            <el-row class="selector-div">
+              <overall-setting />
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item :title="'仪表板背景'" name="panelBackground">
+            <background-selector />
+          </el-collapse-item>
+          <el-collapse-item :title="'组件样式'" name="componentStyle">
+            <component-style />
+          </el-collapse-item>
+          <el-collapse-item :title="'组件配色'" name="graphical">
+            <panel-color-selector @onColorChange="onColorChange" />
+          </el-collapse-item>
+          <el-collapse-item :title="'图表标题'" name="table">
+            <view-title @onTextChange="onTextChange" />
+          </el-collapse-item>
+          <el-collapse-item :title="'过滤组件'" name="filterComponent">
+            <FilterStyleSelector />
+          </el-collapse-item>
+        </el-collapse>
+      </div>
     </div>
   </el-row>
 </template>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 18c53782b1..c178715265 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -126,7 +126,6 @@
           </div>
         </div>
       </de-aside-container>
-
       <!--画布区域-->
       <de-main-container id="canvasInfo-main">
         <!--左侧抽屉-->
@@ -141,12 +140,12 @@
           :close-on-press-escape="false"
           :modal-append-to-body="true"
         >
-          <!--          <view-select v-show=" show && showIndex===0" @newChart="newChart" />-->
-          <filter-group v-show=" show &&showIndex===1" />
-          <subject-setting v-show=" show &&showIndex===2" />
-          <assist-component v-show=" show &&showIndex===3" />
+          <div style="width: 295px">
+            <filter-group v-show=" show &&showIndex===1" />
+            <subject-setting v-show=" show &&showIndex===2" />
+            <assist-component v-show=" show &&showIndex===3" />
+          </div>
         </el-drawer>
-
         <!--PC端画布区域-->
         <div
           v-if="!previewVisible&&!mobileLayoutStatus"
diff --git a/frontend/src/views/panel/filter/index.vue b/frontend/src/views/panel/filter/index.vue
index 30a92b0949..54cc505566 100644
--- a/frontend/src/views/panel/filter/index.vue
+++ b/frontend/src/views/panel/filter/index.vue
@@ -1,12 +1,9 @@
 <template>
-
   <div class="filter-container" @dragstart="handleDragStart" @dragend="handleDragEnd()">
-
     <div v-for="(item, key) in widgetSubjects" :key="key" class="widget-subject">
       <div class="filter-header">
         <div class="filter-header-text"> {{ key }} </div>
       </div>
-
       <div class="filter-widget-content">
         <div
           v-for="(widget, index) in item"