chore: 🔨 合并冲突解决

src/store/modules/app.ts

@@ -38,9 +38,7 @@ export const useAppStore = defineStore("app", () => {
   // 切换侧边栏
   function toggleSidebar() {
     sidebar.opened = !sidebar.opened;
-    sidebarStatus.value = sidebar.opened
-      ? SidebarStatusEnum.OPENED
-      : SidebarStatusEnum.CLOSED;
+    sidebarStatus.value = sidebar.opened ? SidebarStatusEnum.OPENED : SidebarStatusEnum.CLOSED;
   }
 
   // 关闭侧边栏

src/store/modules/settings.ts

@@ -10,15 +10,9 @@ export const useSettingsStore = defineStore("setting", () => {
   // 标签
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
-  const sidebarLogo = useStorage<boolean>(
-    "sidebarLogo",
-    defaultSettings.sidebarLogo
-  );
+  const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
   // 固定头部
-  const fixedHeader = useStorage<boolean>(
-    "fixedHeader",
-    defaultSettings.fixedHeader
-  );
+  const fixedHeader = useStorage<boolean>("fixedHeader", defaultSettings.fixedHeader);
   // 布局
   const layout = useStorage<string>("layout", defaultSettings.layout);
   // 水印
@@ -28,10 +22,7 @@ export const useSettingsStore = defineStore("setting", () => {
   );
 
   // 主题
-  const themeColor = useStorage<string>(
-    "themeColor",
-    defaultSettings.themeColor
-  );
+  const themeColor = useStorage<string>("themeColor", defaultSettings.themeColor);
   const theme = useStorage<string>("theme", defaultSettings.theme);
 
   // 监听主题变化
@@ -53,13 +44,7 @@ export const useSettingsStore = defineStore("setting", () => {
     watermarkEnabled,
   };
 
-  function changeSetting({
-    key,
-    value,
-  }: {
-    key: string;
-    value: SettingsValue;
-  }) {
+  function changeSetting({ key, value }: { key: string; value: SettingsValue }) {
     const setting = settingsMap[key];
     if (setting) setting.value = value;
   }

src/store/modules/tags-view.ts

@@ -124,9 +124,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
 
   function delLeftViews(view: TagView) {
     return new Promise((resolve) => {
-      const currIndex = visitedViews.value.findIndex(
-        (v) => v.path === view.path
-      );
+      const currIndex = visitedViews.value.findIndex((v) => v.path === view.path);
       if (currIndex === -1) {
         return;
       }
@@ -149,9 +147,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
 
   function delRightViews(view: TagView) {
     return new Promise((resolve) => {
-      const currIndex = visitedViews.value.findIndex(
-        (v) => v.path === view.path
-      );
+      const currIndex = visitedViews.value.findIndex((v) => v.path === view.path);
       if (currIndex === -1) {
         return;
       }