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 }