fix: 解决分组在预览下的滤镜变换问题

This commit is contained in:
奔跑的面条 2023-09-18 11:43:04 +08:00
parent 8d78cc82ec
commit 9d5f9ced41
2 changed files with 30 additions and 22 deletions

View File

@ -1,31 +1,37 @@
<template> <template>
<div <div
class="chart-item" :class="animationsClass(groupData.styles.animations)"
v-for="item in groupData.groupList"
:class="animationsClass(item.styles.animations)"
:key="item.id"
:style="{ :style="{
...getComponentAttrStyle(item.attr, groupIndex), ...getSizeStyle(groupData.attr),
...getFilterStyle(groupData.styles), ...getFilterStyle(groupData.styles),
...getTransformStyle(groupData.styles), }"
>
<div
class="chart-item"
v-for="item in groupData.groupList"
:class="animationsClass(item.styles.animations)"
:key="item.id"
:style="{
...getComponentAttrStyle(item.attr, groupIndex),
...getStatusStyle(item.status), ...getStatusStyle(item.status),
...getPreviewConfigStyle(item.preview), ...getPreviewConfigStyle(item.preview),
...getBlendModeStyle(item.styles) as any ...getBlendModeStyle(item.styles) as any
}" }"
> >
<component <component
:is="item.chartConfig.chartKey" :is="item.chartConfig.chartKey"
:id="item.id" :id="item.id"
:chartConfig="item" :chartConfig="item"
:themeSetting="themeSetting" :themeSetting="themeSetting"
:themeColor="themeColor" :themeColor="themeColor"
:style="{ :style="{
...getSizeStyle(item.attr), ...getSizeStyle(item.attr),
...getFilterStyle(item.styles), ...getFilterStyle(item.styles),
...getTransformStyle(item.styles) ...getTransformStyle(item.styles)
}" }"
v-on="useLifeHandler(item)" v-on="useLifeHandler(item)"
></component> ></component>
</div>
</div> </div>
</template> </template>

View File

@ -6,7 +6,6 @@
:key="item.id" :key="item.id"
:style="{ :style="{
...getComponentAttrStyle(item.attr, index), ...getComponentAttrStyle(item.attr, index),
...getFilterStyle(item.styles),
...getTransformStyle(item.styles), ...getTransformStyle(item.styles),
...getStatusStyle(item.status), ...getStatusStyle(item.status),
...getPreviewConfigStyle(item.preview), ...getPreviewConfigStyle(item.preview),
@ -31,7 +30,10 @@
:chartConfig="item" :chartConfig="item"
:themeSetting="themeSetting" :themeSetting="themeSetting"
:themeColor="themeColor" :themeColor="themeColor"
:style="{ ...getSizeStyle(item.attr) }" :style="{
...getSizeStyle(item.attr),
...getFilterStyle(item.styles)
}"
v-on="useLifeHandler(item)" v-on="useLifeHandler(item)"
></component> ></component>
</div> </div>