From 54e289ce56e5ac97e95ecd882c145c6fc622fe14 Mon Sep 17 00:00:00 2001
From: DLmaster361 <DLmaster_361@163.com>
Date: Wed, 3 Sep 2025 22:06:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=94=A8?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=E9=80=89=E6=8B=A9=E6=97=A0=E6=B3=95=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/core/config.py                | 20 +++++---
 app/models/ConfigBase.py          |  4 +-
 frontend/src/views/History.vue    |  6 +--
 frontend/src/views/ScriptEdit.vue | 78 +++++++++++++++++++++----------
 4 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/app/core/config.py b/app/core/config.py
index a3cbd54..0edb465 100644
--- a/app/core/config.py
+++ b/app/core/config.py
@@ -229,7 +229,9 @@ class MaaUserConfig(ConfigBase):
             "Normal",
             OptionsValidator(["Normal", "Rotation", "Custom"]),
         )
-        self.Info_InfrastPath = ConfigItem("Info", "InfrastPath", ".", FileValidator())
+        self.Info_InfrastPath = ConfigItem(
+            "Info", "InfrastPath", str(Path.cwd()), FileValidator()
+        )
         self.Info_Password = ConfigItem("Info", "Password", "", EncryptValidator())
         self.Info_Notes = ConfigItem("Info", "Notes", "无")
         self.Info_MedicineNumb = ConfigItem(
@@ -337,7 +339,7 @@ class MaaConfig(ConfigBase):
         super().__init__()
 
         self.Info_Name = ConfigItem("Info", "Name", "新 MAA 脚本")
-        self.Info_Path = ConfigItem("Info", "Path", ".", FolderValidator())
+        self.Info_Path = ConfigItem("Info", "Path", str(Path.cwd()), FolderValidator())
 
         self.Run_TaskTransitionMethod = ConfigItem(
             "Run",
@@ -500,17 +502,19 @@ class GeneralConfig(ConfigBase):
         super().__init__()
 
         self.Info_Name = ConfigItem("Info", "Name", "新通用脚本")
-        self.Info_RootPath = ConfigItem("Info", "RootPath", ".", FileValidator())
+        self.Info_RootPath = ConfigItem(
+            "Info", "RootPath", str(Path.cwd()), FileValidator()
+        )
 
         self.Script_ScriptPath = ConfigItem(
-            "Script", "ScriptPath", ".", FileValidator()
+            "Script", "ScriptPath", str(Path.cwd()), FileValidator()
         )
         self.Script_Arguments = ConfigItem("Script", "Arguments", "")
         self.Script_IfTrackProcess = ConfigItem(
             "Script", "IfTrackProcess", False, BoolValidator()
         )
         self.Script_ConfigPath = ConfigItem(
-            "Script", "ConfigPath", ".", FileValidator()
+            "Script", "ConfigPath", str(Path.cwd()), FileValidator()
         )
         self.Script_ConfigPathMode = ConfigItem(
             "Script", "ConfigPathMode", "File", OptionsValidator(["File", "Folder"])
@@ -521,7 +525,9 @@ class GeneralConfig(ConfigBase):
             "Never",
             OptionsValidator(["Never", "Success", "Failure", "Always"]),
         )
-        self.Script_LogPath = ConfigItem("Script", "LogPath", ".", FileValidator())
+        self.Script_LogPath = ConfigItem(
+            "Script", "LogPath", str(Path.cwd()), FileValidator()
+        )
         self.Script_LogPathFormat = ConfigItem("Script", "LogPathFormat", "%Y-%m-%d")
         self.Script_LogTimeStart = ConfigItem(
             "Script", "LogTimeStart", 1, RangeValidator(1, 9999)
@@ -539,7 +545,7 @@ class GeneralConfig(ConfigBase):
         self.Game_Type = ConfigItem(
             "Game", "Type", "Emulator", OptionsValidator(["Emulator", "Client"])
         )
-        self.Game_Path = ConfigItem("Game", "Path", ".", FileValidator())
+        self.Game_Path = ConfigItem("Game", "Path", str(Path.cwd()), FileValidator())
         self.Game_Arguments = ConfigItem("Game", "Arguments", "")
         self.Game_WaitTime = ConfigItem("Game", "WaitTime", 0, RangeValidator(0, 9999))
         self.Game_IfForceClose = ConfigItem(
diff --git a/app/models/ConfigBase.py b/app/models/ConfigBase.py
index d49a43d..2367372 100644
--- a/app/models/ConfigBase.py
+++ b/app/models/ConfigBase.py
@@ -134,7 +134,7 @@ class FileValidator(ConfigValidator):
 
     def correct(self, value: Any) -> str:
         if not isinstance(value, str):
-            value = "."
+            value = str(Path.cwd())
         if not Path(value).is_absolute():
             value = Path(value).resolve().as_posix()
         if Path(value).suffix == ".lnk":
@@ -159,7 +159,7 @@ class FolderValidator(ConfigValidator):
 
     def correct(self, value: Any) -> str:
         if not isinstance(value, str):
-            value = "."
+            value = str(Path.cwd())
         return Path(value).resolve().as_posix()
 
 
diff --git a/frontend/src/views/History.vue b/frontend/src/views/History.vue
index c9b1960..576146c 100644
--- a/frontend/src/views/History.vue
+++ b/frontend/src/views/History.vue
@@ -92,11 +92,7 @@
   <div class="history-content">
     <a-spin :spinning="searchLoading">
       <div v-if="historyData.length === 0 && !searchLoading" class="empty-state">
-        <a-empty description="暂无历史记录数据">
-          <template #image>
-            <HistoryOutlined style="font-size: 64px; color: #d9d9d9" />
-          </template>
-        </a-empty>
+        <img src="@/assets/NoData.png" alt="无数据" class="empty-image" />
       </div>
 
       <div v-else class="history-layout">
diff --git a/frontend/src/views/ScriptEdit.vue b/frontend/src/views/ScriptEdit.vue
index 89632b5..71bf54d 100644
--- a/frontend/src/views/ScriptEdit.vue
+++ b/frontend/src/views/ScriptEdit.vue
@@ -394,7 +394,7 @@
               <a-col :span="12">
                 <a-form-item>
                   <template #label>
-                    <a-tooltip title="脚本配置文件的路径">
+                    <a-tooltip :title="generalConfig.Script.ConfigPathMode === 'Folder' ? '脚本配置文件所在的文件夹路径' : '脚本配置文件的路径'">
                       <span class="form-label">
                         配置文件路径
                         <QuestionCircleOutlined class="help-icon" />
@@ -404,16 +404,17 @@
                   <a-input-group compact class="path-input-group">
                     <a-input
                       v-model:value="generalConfig.Script.ConfigPath"
-                      placeholder="请选择配置文件"
+                      :placeholder="generalConfig.Script.ConfigPathMode === 'Folder' ? '请选择配置文件夹' : '请选择配置文件'"
                       size="large"
                       class="path-input"
                       readonly
                     />
                     <a-button size="large" @click="selectConfigPath" class="path-button">
                       <template #icon>
-                        <FileOutlined />
+                        <FolderOpenOutlined v-if="generalConfig.Script.ConfigPathMode === 'Folder'" />
+                        <FileOutlined v-else />
                       </template>
-                      选择文件
+                      {{ generalConfig.Script.ConfigPathMode === 'Folder' ? '选择文件夹' : '选择文件' }}
                     </a-button>
                   </a-input-group>
                 </a-form-item>
@@ -429,7 +430,7 @@
                     </a-tooltip>
                   </template>
                   <a-select v-model:value="generalConfig.Script.ConfigPathMode" size="large">
-                    <a-select-option value="File">所有文件 (*)</a-select-option>
+                    <a-select-option value="File">单文件</a-select-option>
                     <a-select-option value="Folder">文件夹</a-select-option>
                   </a-select>
                 </a-form-item>
@@ -825,7 +826,7 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { FormInstance } from 'ant-design-vue'
 import { message } from 'ant-design-vue'
@@ -896,7 +897,7 @@ const generalConfig = reactive<GeneralScriptConfig>({
   Script: {
     Arguments: '',
     ConfigPath: '.',
-    ConfigPathMode: '所有文件 (*)',
+    ConfigPathMode: 'File',
     ErrorLog: '',
     IfTrackProcess: false,
     LogPath: '.',
@@ -920,6 +921,27 @@ const rules = {
   type: [{ required: true, message: '请选择脚本类型', trigger: 'change' }],
 }
 
+// 监听配置文件类型变化，重置路径为根目录
+watch(
+  () => generalConfig.Script.ConfigPathMode,
+  (newMode, oldMode) => {
+    if (newMode !== oldMode && generalConfig.Script.ConfigPath && generalConfig.Script.ConfigPath !== '.') {
+      // 当配置文件类型改变时，重置为根目录路径
+      const rootPath = generalConfig.Info.RootPath
+      if (rootPath && rootPath !== '.') {
+        generalConfig.Script.ConfigPath = rootPath
+        const typeText = newMode === 'Folder' ? '文件夹' : '文件'
+        message.info(`配置文件类型已切换为${typeText}，路径已重置为根目录`)
+      } else {
+        // 如果没有设置根目录，则清空路径
+        generalConfig.Script.ConfigPath = '.'
+        const typeText = newMode === 'Folder' ? '文件夹' : '文件'
+        message.info(`配置文件类型已切换为${typeText}，请重新选择路径`)
+      }
+    }
+  }
+)
+
 onMounted(async () => {
   await loadScript()
 })
@@ -1072,11 +1094,7 @@ const selectScriptPath = async () => {
     }
 
     const path = await window.electronAPI.selectFile([
-      { name: '脚本文件', extensions: ['py', 'js', 'bat', 'sh', 'cmd'] },
-      { name: 'Python 脚本', extensions: ['py'] },
-      { name: 'JavaScript 脚本', extensions: ['js'] },
-      { name: '批处理文件', extensions: ['bat', 'cmd'] },
-      { name: 'Shell 脚本', extensions: ['sh'] },
+      { name: '可执行文件', extensions: ['exe', 'bat'] },
       { name: '所有文件', extensions: ['*'] },
     ])
     if (path) {
@@ -1096,21 +1114,33 @@ const selectConfigPath = async () => {
       return
     }
 
-    const path = await window.electronAPI.selectFile([
-      { name: '配置文件', extensions: ['json', 'yaml', 'yml', 'ini', 'conf', 'toml'] },
-      { name: 'JSON 文件', extensions: ['json'] },
-      { name: 'YAML 文件', extensions: ['yaml', 'yml'] },
-      { name: 'INI 文件', extensions: ['ini', 'conf'] },
-      { name: 'TOML 文件', extensions: ['toml'] },
-      { name: '所有文件', extensions: ['*'] },
-    ])
-    if (path) {
-      generalConfig.Script.ConfigPath = path
-      message.success('配置路径选择成功')
+    let selectedPath: string | undefined
+
+    // 根据配置文件类型选择不同的选择方式
+    if (generalConfig.Script.ConfigPathMode === 'Folder') {
+      // 选择文件夹
+      selectedPath = await window.electronAPI.selectFolder()
+    } else {
+      // 选择文件（默认行为）
+      selectedPath = await window.electronAPI.selectFile([
+        { name: '配置文件', extensions: ['json', 'yaml', 'yml', 'ini', 'conf', 'toml'] },
+        { name: 'JSON 文件', extensions: ['json'] },
+        { name: 'YAML 文件', extensions: ['yaml', 'yml'] },
+        { name: 'INI 文件', extensions: ['ini', 'conf'] },
+        { name: 'TOML 文件', extensions: ['toml'] },
+        { name: '所有文件', extensions: ['*'] },
+      ])
+    }
+
+    if (selectedPath) {
+      generalConfig.Script.ConfigPath = selectedPath
+      const typeText = generalConfig.Script.ConfigPathMode === 'Folder' ? '配置文件夹' : '配置文件'
+      message.success(`${typeText}路径选择成功`)
     }
   } catch (error) {
     console.error('选择配置路径失败:', error)
-    message.error('选择文件失败')
+    const typeText = generalConfig.Script.ConfigPathMode === 'Folder' ? '文件夹' : '文件'
+    message.error(`选择${typeText}失败`)
   }
 }