fix: 细节修复

Author: Flex-7746

frontend/src/layout/DialogLike.vue

@@ -125,20 +125,38 @@
       <el-tab-pane label="目录" name="folder">
         <div class="item">
           <div class="label">
-            <el-popover content="选择后，启动时将默认打开该目录" placement="top" :width="150">
+            <el-popover content="选择后，启动时将自动打开该目录" placement="top" :width="150">
               <template #reference>
                 <el-icon><Warning /></el-icon>
               </template>
             </el-popover>
-            <div class="t">默认打开</div>
+            <div class="t">自动打开</div>
           </div>
           <div class="value">
-            <el-select v-model="cfg.folderDefOpen" size="small" clearable placeholder="启动时默认打开某个目录">
+            <el-select v-model="cfg.folderDefOpen" size="small" clearable placeholder="启动时自动打开某个目录">
               <el-option v-for="item in user.cfg.dir" :key="item" :label="item" :value="item" />
             </el-select>
           </div>
         </div>
 
+        <template v-if="cfg.folderDefOpen">
+          <div class="item">
+            <div class="label">
+              <el-popover content="开启后，从文件列表直接操作文件时将不会自动打开上方设置的目录" placement="top" :width="200">
+                <template #reference>
+                  <el-icon><Warning /></el-icon>
+                </template>
+              </el-popover>
+              <div class="t">打开文件时关闭</div>
+            </div>
+            <div class="value">
+              <el-switch v-model="cfg.folderNotOpenInQuery" />
+            </div>
+          </div>
+
+          <div class="line"></div>
+        </template>
+
         <div class="item">
           <div class="label">
             <div class="t">隐藏前缀文件</div>
@@ -225,6 +243,11 @@ watch(cfg, user.update, { deep: true })
           }
         }
       }
+
+      > .line {
+        height: 1px;
+        background-color: var(--el-border-color);
+      }
     }
   }
 }

frontend/src/layout/DialogOpen.vue

@@ -50,7 +50,7 @@
             <div class="t">我的目录</div>
 
             <el-select v-model="cfg.folderDefOpen" size="small" clearable style="width: 200px" placeholder="选择目录">
-              <el-option-group label="启动时默认打开">
+              <el-option-group label="启动时自动打开">
                 <el-option v-for="item in user.cfg.dir" :key="item" :label="item" :value="item" />
               </el-option-group>
             </el-select>

frontend/src/layout/ViewMenu.vue

@@ -29,15 +29,13 @@ import { onMounted } from 'vue'
 import { Folder, Timer, Notification, Setting } from '@element-plus/icons-vue'
 
 import { useMenuStore } from '@/store/menu'
-import { useUserStore } from '@/store/user'
 import { useLikeStore } from '@/store/like'
 
 const menu = useMenuStore()
-const user = useUserStore()
 const like = useLikeStore()
 
 onMounted(() => {
-  if (user.cfg.folderDefOpen) {
+  if (like.cfg.folderActive) {
     menu.toggle('folder')
   }
 })

frontend/src/store/user.ts

@@ -29,12 +29,15 @@ interface LikeModel {
 
   // 目录
   dir: string[] // 文件列表
-  folderDefOpen: string // 默认开启目录
+  folderDefOpen: string // 自动打开目录
+  folderNotOpenInQuery: boolean // 打开文件时不打开目录
   folderHidePrefix: string[] // 隐藏的文件前缀
 }
 
 const USER_CONFIG_PATH = `${APP_DIR_PATH}/config.json`
 
+const dir = IS_DEV ? ['/Users/flex/Downloads'] : ['/vol1/1000']
+
 const getDef = (): LikeModel => ({
   // 全局配置
   theme: 'vs-dark', // 主题
@@ -55,8 +58,9 @@ const getDef = (): LikeModel => ({
   },
 
   // 目录
-  dir: IS_DEV ? ['/Users/flex/Downloads'] : ['/vol1/1000'],
-  folderDefOpen: '', // 默认开启目录
+  dir: [...dir],
+  folderDefOpen: dir[0]!, // 自动打开目录
+  folderNotOpenInQuery: true, // 打开文件时不打开目录
   folderHidePrefix: ['.'], // 隐藏的文件前缀
 })
 
@@ -83,7 +87,11 @@ export const useUserStore = defineStore('user', () => {
       cfg.value = Object.assign(cfg.value, cloneDeep(result1) as LikeModel)
     }
 
-    like.cfg.folderActive = cfg.value.folderDefOpen || cfg.value.dir[0] || ''
+    const query = new URLSearchParams(window.location.search).get('path') || ''
+
+    if ((!query || !cfg.value.folderNotOpenInQuery) && cfg.value.folderDefOpen) {
+      like.cfg.folderActive = cfg.value.folderDefOpen
+    }
 
     initialized.value = true
   }
@@ -94,7 +102,7 @@ export const useUserStore = defineStore('user', () => {
       {
         encode: 'utf8',
         path: USER_CONFIG_PATH,
-        value: JSON.stringify(cfg.value),
+        value: JSON.stringify({ ...cfg.value, folderDefOpen: cfg.value.folderDefOpen || '' }),
         force: 1,
       },
       {