@@ -175,6 +175,9 @@ $asideBottom: 70px;
transition: height ease 0.4s;
.btn-item {
margin-bottom: 10px;
+ &:first-of-type {
+ margin-bottom: 0;
+ }
@include deep() {
.n-button__icon {
margin-right: 4px;
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index 25e4d173..9043444d 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -19,7 +19,7 @@
@@ -54,7 +54,7 @@
:themeColor="themeColor"
:style="{
...useSizeStyle(item.attr),
- ...getFilterStyle(item.styles),
+ ...getFilterStyle(filterShow ? item.styles : undefined),
...getTransformStyle(item.styles)
}"
>
@@ -146,6 +146,11 @@ const themeColor = computed(() => {
return chartColors[chartThemeColor]
})
+// 是否展示渲染
+const filterShow = computed(() => {
+ return chartEditStore.getEditCanvasConfig.filterShow
+})
+
// 背景
const rangeStyle = computed(() => {
// 设置背景色和图片背景
diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue
index fbe74eca..75431eb7 100644
--- a/src/views/preview/index.vue
+++ b/src/views/preview/index.vue
@@ -42,7 +42,7 @@ const localStorageInfo: ChartEditStorageType = getSessionStorageInfo() as ChartE
const previewRefStyle = computed(() => {
return {
...getEditCanvasConfigStyle(localStorageInfo.editCanvasConfig),
- ...getFilterStyle(localStorageInfo.editCanvasConfig)
+ ...getFilterStyle(localStorageInfo.editCanvasConfig.filterShow ? localStorageInfo.editCanvasConfig : undefined)
}
})