From 3e5e1a9b41ce9b47b04676d57be34c2c766c0318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Sat, 8 Oct 2022 20:49:08 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/GoSystemSet/index.vue                       | 2 +-
 src/components/Pages/ChartItemSetting/StylesSetting.vue    | 2 +-
 src/views/chart/ContentEdit/components/EditGroup/index.vue | 2 +-
 src/views/chart/ContentEdit/index.vue                      | 5 ++++-
 src/views/preview/components/PreviewRenderGroup/index.vue  | 6 +++---
 src/views/preview/components/PreviewRenderList/index.vue   | 4 ++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/components/GoSystemSet/index.vue b/src/components/GoSystemSet/index.vue
index 83df5a15..180836a1 100644
--- a/src/components/GoSystemSet/index.vue
+++ b/src/components/GoSystemSet/index.vue
@@ -190,7 +190,7 @@ const handleChange = (e: MouseEvent, item: ListType) => {
     width: 100px;
   }
   .select-min-width {
-    width: 110px;
+    width: 115px;
   }
   @include deep() {
     .n-list-item {
diff --git a/src/components/Pages/ChartItemSetting/StylesSetting.vue b/src/components/Pages/ChartItemSetting/StylesSetting.vue
index 672755c4..b943ca71 100644
--- a/src/components/Pages/ChartItemSetting/StylesSetting.vue
+++ b/src/components/Pages/ChartItemSetting/StylesSetting.vue
@@ -72,7 +72,7 @@
     <!-- 混合模式 -->
     <setting-item-box v-if="!isCanvas" name="混合模式" :alone="true">
       <setting-item name="视频组件需要底色透明一般选中滤色">
-        <n-select size="small" v-model:value="chartStyles.blendMode" :options="BlendModeEnumList"></n-select>
+        <n-select v-model:value="chartStyles.blendMode" size="small" filterable :options="BlendModeEnumList"></n-select>
       </setting-item>
     </setting-item-box>
 
diff --git a/src/views/chart/ContentEdit/components/EditGroup/index.vue b/src/views/chart/ContentEdit/components/EditGroup/index.vue
index 9276ec08..5d7f1462 100644
--- a/src/views/chart/ContentEdit/components/EditGroup/index.vue
+++ b/src/views/chart/ContentEdit/components/EditGroup/index.vue
@@ -12,7 +12,7 @@
         ...useSizeStyle(groupData.attr),
         ...getFilterStyle(groupData.styles),
         ...getTransformStyle(groupData.styles),
-        ...getBlendModeStyle(groupData.styles)
+        ...getBlendModeStyle(groupData.styles) as any
       }"
       @click="mouseClickHandle($event, groupData)"
       @mousedown="mousedownHandle($event, groupData)"
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index 51c449b5..520a558c 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -37,7 +37,10 @@
               v-else
               :data-id="item.id"
               :index="index"
-              :style="{ ...useComponentStyle(item.attr, index), ...getBlendModeStyle(item.styles) }"
+              :style="{
+                ...useComponentStyle(item.attr, index),
+                ...getBlendModeStyle(item.styles) as any
+              }"
               :item="item"
               @click="mouseClickHandle($event, item)"
               @mousedown="mousedownHandle($event, item)"
diff --git a/src/views/preview/components/PreviewRenderGroup/index.vue b/src/views/preview/components/PreviewRenderGroup/index.vue
index a866fb7a..81790f63 100644
--- a/src/views/preview/components/PreviewRenderGroup/index.vue
+++ b/src/views/preview/components/PreviewRenderGroup/index.vue
@@ -8,9 +8,9 @@
       ...getComponentAttrStyle(item.attr, groupIndex),
       ...getFilterStyle(item.styles),
       ...getTransformStyle(item.styles),
-      ...getBlendModeStyle(item.styles),
-      ...getStatusStyle(item.status)
-    } as any"
+      ...getStatusStyle(item.status),
+      ...getBlendModeStyle(item.styles) as any
+    }"
   >
     <component
       :is="item.chartConfig.chartKey"
diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue
index af0850a5..4335ab96 100644
--- a/src/views/preview/components/PreviewRenderList/index.vue
+++ b/src/views/preview/components/PreviewRenderList/index.vue
@@ -8,8 +8,8 @@
       ...getComponentAttrStyle(item.attr, index),
       ...getFilterStyle(item.styles),
       ...getTransformStyle(item.styles),
-      ...getBlendModeStyle(item.styles),
-      ...getStatusStyle(item.status)
+      ...getStatusStyle(item.status),
+      ...getBlendModeStyle(item.styles) as any
     } as any"
   >
     <!-- 分组 -->