Skip to content

Commit

Permalink
优化
Browse files Browse the repository at this point in the history
  • Loading branch information
lyswhut committed Jan 1, 2023
1 parent 8bbc4a3 commit 8a49e32
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const mergeSetting = (originSetting: LX.AppSetting, targetSetting?: Parti
updatedSettingKeys: Array<keyof LX.AppSetting>
updatedSetting: Partial<LX.AppSetting>
} => {
let originSettingCopy: LX.AppSetting = JSON.parse(JSON.stringify(originSetting))
let originSettingCopy: LX.AppSetting = { ...originSetting }
// const defaultVersion = targetSettingCopy.version
const updatedSettingKeys: Array<keyof LX.AppSetting> = []
const updatedSetting: Partial<LX.AppSetting> = {}
Expand Down Expand Up @@ -114,7 +114,7 @@ export const updateSetting = (setting?: Partial<LX.AppSetting>, isInit: boolean
let originSetting: LX.AppSetting
if (isInit) {
if (setting) setting = migrateSetting(setting)
originSetting = defaultSetting
originSetting = { ...defaultSetting }
} else originSetting = global.lx.appSetting

const result = mergeSetting(originSetting, setting)
Expand Down

0 comments on commit 8a49e32

Please sign in to comment.