xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-09-27 21:56:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

debug:mergeAppState list key

Browse Source
This commit is contained in:
cbm 2024-07-13 16:56:28 +08:00
parent bf5546b112
commit e5edfd97a5
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/store/sync.ts
View File

@ -96,7 +96,7 @@ export const useSyncStore = createPersistStore(
const config = get()[provider];
const client = this.getClient();
await client.set(config.username, JSON.stringify(localState));
try {
const remoteState = await client.get(config.username);
@ -116,6 +116,8 @@ export const useSyncStore = createPersistStore(
throw e;
}
await client.set(config.username, JSON.stringify(localState));
this.markSyncTime();

9
app/utils/sync.ts
View File

@ -137,9 +137,12 @@ export function setLocalAppState(appState: AppState) {
export function mergeAppState(localState: AppState, remoteState: AppState) {
Object.keys(localState).forEach(<T extends keyof AppState>(k: string) => {
const key = k as T;
const localStoreState = localState[key];
const remoteStoreState = remoteState[key];
MergeStates[key](localStoreState, remoteStoreState);
//if(k !== ''){
console.log('mergeAppState',k)
const localStoreState = localState[key];
const remoteStoreState = remoteState[key];
MergeStates[key](localStoreState, remoteStoreState);
//}
});
return localState;