From b95de9f4f1f2057a65ade19e59cafb8447b32efc Mon Sep 17 00:00:00 2001 From: ZiuChen <457353192@qq.com> Date: Tue, 20 Sep 2022 21:42:45 +0800 Subject: [PATCH] =?UTF-8?q?revert:=20=E6=9A=82=E4=B8=8D=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=AE=BE=E7=BD=AE=E5=92=8C=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=9A=84diff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global/readSetting.js | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/src/global/readSetting.js b/src/global/readSetting.js index 8141d1c..b79fec3 100644 --- a/src/global/readSetting.js +++ b/src/global/readSetting.js @@ -1,27 +1,5 @@ import restoreSetting from './restoreSetting' -import defaultSetting from '../data/setting.json' -import { pointToObj } from '../utils' -defaultSetting = pointToObj(defaultSetting) - -// 比较默认设置与当前设置 -function compareSetting() { - const setting = utools.dbStorage.getItem('setting') || restoreSetting() - // 如果默认设置中新增了某个设置项,为本地设置添加该项 - for (const key in defaultSetting) { - if (setting[key] === undefined) { - setting[key] = defaultSetting[key] - } - } - // 如果默认设置中删除了某个设置项,删除本地设置中的该项 - for (const key in setting) { - if (defaultSetting[key] === undefined) { - delete setting[key] - } - } - return setting -} - -const setting = compareSetting() +const setting = utools.dbStorage.getItem('setting') || restoreSetting() export default setting