xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2025-11-17 14:33:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixed:keep local accessCode

Browse Source
This commit is contained in:
cbmland
2024-07-13 20:15:42 +08:00
parent 119f0a94d2
commit c621662aae
4 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/utils/sync.ts
View File

@@ -119,14 +119,12 @@ const MergeStates: StateMerger = {
};
export function getLocalAppState() {
const accessStore = useAccessStore();
const appState = Object.fromEntries(
Object.entries(LocalStateGetters).map(([key, getter]) => {
return [key, getter()];
}),
) as AppState;
appState["access-control"].accessCode = accessStore.accessCode
return appState;
}
@@ -140,10 +138,10 @@ export function mergeAppState(localState: AppState, remoteState: AppState) {
Object.keys(localState).forEach(<T extends keyof AppState>(k: string) => {
const key = k as T;
//if(k !== ''){
console.log('mergeAppState',k)
const localStoreState = localState[key];
const remoteStoreState = remoteState[key];
MergeStates[key](localStoreState, remoteStoreState);
console.log("mergeAppState", k);
const localStoreState = localState[key];
const remoteStoreState = remoteState[key];
MergeStates[key](localStoreState, remoteStoreState);
//}
});