不同步系统配置

htmambo · Feb 27, 2024 · c99de8d · c99de8d
1 parent 13a436d
commit c99de8d
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/app/utils/sync.ts b/app/utils/sync.ts
@@ -108,16 +108,10 @@ const MergeStates: StateMerger = {
     return localState;
   },
   [StoreKey.Mask]: (localState, remoteState) => {
-    const uniqueMasks = new Set();
-    const mergedMasks = [];
-    for (const mask of [...localState.masks, ...remoteState.masks]) {
-      let maskContent = mask.context[0].content;
-      if (!uniqueMasks.has(maskContent)) {
-        uniqueMasks.add(maskContent);
-        mergedMasks.push(mask);
-      }
-    }
-    localState.masks = mergedMasks;
+    localState.masks = {
+      ...remoteState.masks,
+      ...localState.masks,
+    };
     return localState;
   },
   [StoreKey.Config]: mergeWithUpdate<AppState[StoreKey.Config]>,