Merge pull request #1 from RSJWY/main
fix:打开#settings页面时后端在没有订阅链接的情况下返回 null,导致页面异常
This commit is contained in:
@@ -78,7 +78,8 @@ export default function SettingsPanel() {
|
|||||||
fetchSettings(),
|
fetchSettings(),
|
||||||
refreshSubStatus(),
|
refreshSubStatus(),
|
||||||
])
|
])
|
||||||
const merged = { ...defaultSettings, ...settingsData }
|
const subscriptions = settingsData.subscriptions || []
|
||||||
|
const merged = { ...defaultSettings, ...settingsData, subscriptions }
|
||||||
setSettings(merged)
|
setSettings(merged)
|
||||||
setSavedSettings(merged)
|
setSavedSettings(merged)
|
||||||
setIsDirty(false)
|
setIsDirty(false)
|
||||||
|
|||||||
Reference in New Issue
Block a user