Merge remote-tracking branch 'origin/main' into main

2021-06-04 15:49:53 +08:00 · 2021-06-04 15:49:53 +08:00 · 63414ea9af
commit 63414ea9af
parent 819def5c23 e3ab785540
1 changed files with 1 additions and 1 deletions
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@ -160,7 +160,7 @@ export default {
            background: `url(${this.canvasStyleData.panel.imageUrl}) no-repeat`,
            ...style
          }
-        } else {
+        } else if (this.canvasStyleData.panel.backgroundType === 'color') {
          style = {
            background: this.canvasStyleData.panel.color,
            ...style