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" > <!-- 分组 -->