Merge branch 'dev' into pr@dev_dataset_source

frontend/src/components/canvas/components/Toolbar.vue

@@ -193,6 +193,7 @@ export default {
     ])
   },
   created() {
+    eventBus.$on('editPanelInitReady', this.editPanelInit)
     eventBus.$on('preview', this.preview)
     eventBus.$on('save', this.save)
     eventBus.$on('clearCanvas', this.clearCanvas)
@@ -205,10 +206,14 @@ export default {
     eventBus.$off('preview', this.preview)
     eventBus.$off('save', this.save)
     eventBus.$off('clearCanvas', this.clearCanvas)
+    eventBus.$off('editPanelInitReady', this.editPanelInit)
     clearInterval(this.timer)
     this.timer = null
   },
   methods: {
+    editPanelInit(){
+      this.showGridSwitch = this.canvasStyleData.aidedDesign.showGrid
+    },
     close() {
       // 关闭页面清理缓存
       this.$store.commit('initCanvasBase')

frontend/src/components/canvas/utils/style.js

@@ -1,6 +1,7 @@
 import { sin, cos } from '@/components/canvas/utils/translate'
 import store from '@/store'
 import Vue from 'vue'
+
 export const LIGHT_THEME_COLOR_MAIN = '#000000'
 export const LIGHT_THEME_COLOR_SLAVE1 = '#CCCCCC'
 export const LIGHT_THEME_PANEL_BACKGROUND = '#F1F3F5'
@@ -35,6 +36,9 @@ export function getStyle(style, filter = []) {
           if (key === 'backgroundColor') {
             result[key] = colorRgb(style[key], style.opacity)
           }
+          if (key === 'fontSize' && result[key] < 12) {
+            result[key] = 12
+          }
           if (needUnit.includes(key)) {
             result[key] += 'px'
           }