Pre Merge pull request !198 from ly-chn/master

This commit is contained in:
ly-chn 2023-08-16 09:15:32 +00:00 committed by Gitee
commit efc868728c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 3 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ dist
dist-ssr dist-ssr
*.local *.local
.vscode .vscode
.idea

View File

@ -196,9 +196,7 @@ export const useSync = () => {
chartHistoryStore.clearForwardStack() chartHistoryStore.clearForwardStack()
} }
} }
} else { } else if (key === ChartEditStoreEnum.EDIT_CANVAS_CONFIG || key === ChartEditStoreEnum.REQUEST_GLOBAL_CONFIG) {
// 非组件(顺便排除脏数据)
if (key !== 'editCanvasConfig' && key !== 'requestGlobalConfig') return
componentMerge(chartEditStore[key], projectData[key], true) componentMerge(chartEditStore[key], projectData[key], true)
} }
} }