Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2021-03-31 b16fe5e2632d17f802d6f45263dfefa096cf9708

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-ui/src/views/tool/build/index.vue

 ruoyi-ui/src/views/tool/build/index.vue

@@ -193,7 +193,12 @@
      activeData: drawingDefalut[0]
    }
  },
  computed: {
  created() {
    // 防止 firefox 下 拖拽 会新打卡一个选项卡
    document.body.ondrop = event => {
      event.preventDefault()
      event.stopPropagation()
    }
  },
  watch: {
    // eslint-disable-next-line func-names