Merge remote-tracking branch 'origin/dev-3.1.1_theme' into dev-3.2

This commit is contained in:
chenjinsong
2021-11-29 15:43:27 +08:00
53 changed files with 826 additions and 403 deletions

View File

@@ -814,7 +814,7 @@ export default {
// data = JSON.parse(localStorage.getItem('topoData'))
if (!res.data.topo || !data.pens) {
data = {
bkColor: '#FFFFFF',
bkColor: '#FFFFFF00',
gridSize: 10,
gridColor: '#ededed',
lineWidth: 1,
@@ -893,6 +893,9 @@ export default {
if (!data.bkImage) {
data.bkImage = undefined
}
if (data.bkColor === '#FFFFFF') {
data.bkColor = '#FFFFFF00'
}
resolve(data)
}, 100)
}