From 1ff1b2135552eeb5bd235b41b4a297cccbed7975 Mon Sep 17 00:00:00 2001 From: Gabe Yuan Date: Fri, 8 Sep 2023 17:10:54 +0800 Subject: [PATCH] fix get setting with default --- src/libs/storage.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libs/storage.js b/src/libs/storage.js index b6aacae..abdc6e5 100644 --- a/src/libs/storage.js +++ b/src/libs/storage.js @@ -82,10 +82,8 @@ export const storage = { * 设置信息 */ export const getSetting = () => getObj(STOKEY_SETTING); -export const getSettingWithDefault = async () => ({ - ...DEFAULT_SETTING, - ...((await getSetting()) || {}), -}); +export const getSettingWithDefault = async () => + (await getSetting()) || DEFAULT_SETTING; export const setSetting = (val) => setObj(STOKEY_SETTING, val); export const updateSetting = (obj) => putObj(STOKEY_SETTING, obj);