From 3ef8a933da00ec974b09aaf87d9a3240600252b1 Mon Sep 17 00:00:00 2001 From: ZiuChen <457353192@qq.com> Date: Sun, 30 Oct 2022 10:48:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=B7=AF=E5=BE=84=E6=97=B6=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=89=A7=E8=A1=8C=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/setting.json | 2 +- src/global/readSetting.js | 11 +++++++++-- src/global/restoreSetting.js | 2 ++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/data/setting.json b/src/data/setting.json index a6cc93f..e53dc64 100644 --- a/src/data/setting.json +++ b/src/data/setting.json @@ -1,5 +1,5 @@ { - "database.path": "", + "database.path": {}, "database.maxsize": 800, "database.maxage": 14, "operation.shown": ["copy", "view", "collect", "un-collect", "remove"], diff --git a/src/global/readSetting.js b/src/global/readSetting.js index a893604..7352940 100644 --- a/src/global/readSetting.js +++ b/src/global/readSetting.js @@ -1,4 +1,5 @@ import restoreSetting from './restoreSetting' +import { defaultPath } from './restoreSetting' import { getNativeId } from '../utils' const setting = utools.dbStorage.getItem('setting') || restoreSetting() @@ -9,8 +10,14 @@ if (typeof setting.database.path === 'string') { setting.database.path = { [nativeId]: setting.database.path } - // 将设置更新到数据库 - utools.dbStorage.setItem('setting', setting) +} else { + // 新版本的setting中path是对象,但是没有当前平台的路径 + if (!setting.database.path[nativeId]) { + setting.database.path[nativeId] = defaultPath + } } +// 将设置更新到数据库 +utools.dbStorage.setItem('setting', setting) + export default setting diff --git a/src/global/restoreSetting.js b/src/global/restoreSetting.js index f7df4e9..b15d800 100644 --- a/src/global/restoreSetting.js +++ b/src/global/restoreSetting.js @@ -15,3 +15,5 @@ export default function restoreSetting() { utools.dbStorage.setItem('setting', setting) return setting } + +export { defaultPath }