From f615e9fda8eac21db56a09973e4622268520835d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 19 May 2021 16:37:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=BB=E9=A2=98=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue | 4 ++--
 .../panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
index f74e0d10da..6a8288a361 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/Slider.vue
@@ -1,6 +1,6 @@
 <template>
   <el-row>
-    <el-row>
+    <el-row v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
       <el-col :span="2">
         <span>&nbsp</span>
         <ul class="direction">
@@ -14,7 +14,7 @@
           <div class="window">
             <ul class="container" :style="containerStyle">
               <li>
-                <div style="width:240px; height: 208px;">
+                <div style="width:240px; height: 208px;overflow: hidden">
                   <subject-template-item
                     v-for="item in sliders[sliders.length - 1]"
                     :key="item.id"
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
index 0ee2d577f0..3d07f9605a 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@@ -80,7 +80,7 @@ export default {
         background: 'background: 0% 0% / cover rgb(255, 255, 255)'
       }
       if (this.subjectItemDetails) {
-        if (this.subjectItemDetails.panel.backgroundType === 'image'&&this.subjectItemDetails.panel.imageUrl) {
+        if (this.subjectItemDetails.panel.backgroundType === 'image' && this.subjectItemDetails.panel.imageUrl) {
           style = {
             width: '100%',
             height: '100%',
@@ -224,7 +224,7 @@ export default {
   }
 
   .vertical-layout {
-    overflow: hidden auto;
+    overflow: hidden;
     position: absolute;
     inset: 0px 0px 30px;
     width: 108px; height: 58px;