From 727ab7d83b5ff4e83fe567f9516cc16e6859e373 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Mon, 11 Aug 2025 10:54:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat=20(core):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=20Logo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/icons/python.svg             |  17 ++
 src/components/Settings.vue         |   7 +-
 src/components/setting/Language.vue | 244 ++++++++++++++++------------
 src/ui/Tabs.vue                     |  12 +-
 4 files changed, 173 insertions(+), 107 deletions(-)
 create mode 100644 public/icons/python.svg

diff --git a/public/icons/python.svg b/public/icons/python.svg
new file mode 100644
index 0000000..37b7428
--- /dev/null
+++ b/public/icons/python.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
+    <linearGradient id="python-original-a" gradientUnits="userSpaceOnUse" x1="70.252" y1="1237.476" x2="170.659" y2="1151.089" gradientTransform="matrix(.563 0 0 -.568 -29.215 707.817)">
+        <stop offset="0" stop-color="#5A9FD4" />
+        <stop offset="1" stop-color="#306998" />
+    </linearGradient>
+    <linearGradient id="python-original-b" gradientUnits="userSpaceOnUse" x1="209.474" y1="1098.811" x2="173.62" y2="1149.537" gradientTransform="matrix(.563 0 0 -.568 -29.215 707.817)">
+        <stop offset="0" stop-color="#FFD43B" />
+        <stop offset="1" stop-color="#FFE873" />
+    </linearGradient>
+    <path fill="url(#python-original-a)" d="M63.391 1.988c-4.222.02-8.252.379-11.8 1.007-10.45 1.846-12.346 5.71-12.346 12.837v9.411h24.693v3.137H29.977c-7.176 0-13.46 4.313-15.426 12.521-2.268 9.405-2.368 15.275 0 25.096 1.755 7.311 5.947 12.519 13.124 12.519h8.491V67.234c0-8.151 7.051-15.34 15.426-15.34h24.665c6.866 0 12.346-5.654 12.346-12.548V15.833c0-6.693-5.646-11.72-12.346-12.837-4.244-.706-8.645-1.027-12.866-1.008zM50.037 9.557c2.55 0 4.634 2.117 4.634 4.721 0 2.593-2.083 4.69-4.634 4.69-2.56 0-4.633-2.097-4.633-4.69-.001-2.604 2.073-4.721 4.633-4.721z" transform="translate(0 10.26)" />
+    <path fill="url(#python-original-b)" d="M91.682 28.38v10.966c0 8.5-7.208 15.655-15.426 15.655H51.591c-6.756 0-12.346 5.783-12.346 12.549v23.515c0 6.691 5.818 10.628 12.346 12.547 7.816 2.297 15.312 2.713 24.665 0 6.216-1.801 12.346-5.423 12.346-12.547v-9.412H63.938v-3.138h37.012c7.176 0 9.852-5.005 12.348-12.519 2.578-7.735 2.467-15.174 0-25.096-1.774-7.145-5.161-12.521-12.348-12.521h-9.268zM77.809 87.927c2.561 0 4.634 2.097 4.634 4.692 0 2.602-2.074 4.719-4.634 4.719-2.55 0-4.633-2.117-4.633-4.719 0-2.595 2.083-4.692 4.633-4.692z" transform="translate(0 10.26)" />
+    <radialGradient id="python-original-c" cx="1825.678" cy="444.45" r="26.743" gradientTransform="matrix(0 -.24 -1.055 0 532.979 557.576)" gradientUnits="userSpaceOnUse">
+        <stop offset="0" stop-color="#B8B8B8" stop-opacity=".498" />
+        <stop offset="1" stop-color="#7F7F7F" stop-opacity="0" />
+    </radialGradient>
+    <path opacity=".444" fill="url(#python-original-c)" d="M97.309 119.597c0 3.543-14.816 6.416-33.091 6.416-18.276 0-33.092-2.873-33.092-6.416 0-3.544 14.815-6.417 33.092-6.417 18.275 0 33.091 2.872 33.091 6.417z" />
+</svg>
diff --git a/src/components/Settings.vue b/src/components/Settings.vue
index ec139a0..c6cf322 100644
--- a/src/components/Settings.vue
+++ b/src/components/Settings.vue
@@ -1,6 +1,11 @@
 <template>
   <Modal v-model:show="isVisible" title="设置" size="4xl" :close-on-backdrop="false" :close-on-esc="false" @close="closeSettings">
-    <Tabs v-model="activeTab" type="card" size="md" :tabs="tabsData">
+    <Tabs v-model="activeTab"
+          type="card"
+          size="md"
+          :nav-class="['w-full']"
+          :tab-button-class="['flex', 'flex-col']"
+          :tabs="tabsData">
       <!-- 通用配置 -->
       <template #general>
         <General/>
diff --git a/src/components/setting/Language.vue b/src/components/setting/Language.vue
index b0c633b..a90ddc1 100644
--- a/src/components/setting/Language.vue
+++ b/src/components/setting/Language.vue
@@ -1,108 +1,118 @@
 <template>
   <div class="-mt-2">
-    <Tabs v-model="activeTab" type="card" size="md" position="left" :tab-button-class="['w-36']" :tabs="tabsData" @change="handleTabChange">
-      <template #[activeTab]="{ tab }">
+    <Tabs v-model="activePlugin" type="card" size="md" position="left" :tab-button-class="['w-36']" :tabs="tabsPluginData" @change="handleTabChange">
+      <template #[activePlugin]="{ tab }">
         <h3 class="text-lg font-semibold text-gray-900 dark:text-white mb-4 flex items-center">
-          <Settings2 class="w-5 h-5 mr-2"/>
+          <LanguagesIcon class="w-5 h-5 mr-2"/>
           {{ `语言 [ ${ tab.label } ] 配置` }}
         </h3>
 
-        <div class="space-y-4">
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              语言环境目录
-            </label>
-            <div class="flex gap-2">
-              <input v-model="pluginConfig.execute_home"
-                     type="text"
-                     placeholder="选择语言环境目录路径"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
-
-              <Button type="primary"
-                      :icon-only="true"
-                      :icon="Folder"
-                      @click="selectExecuteHome">
-              </Button>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              文件后缀名
-            </label>
-            <div class="flex gap-2">
-              <input v-model="pluginConfig.extension"
-                     type="text"
-                     placeholder="输入文件后缀名"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              编译前执行的命令
-            </label>
-            <div class="flex gap-2">
-              <input v-model="pluginConfig.before_compile"
-                     type="text"
-                     placeholder="编译前执行的命令"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              执行的命令
-            </label>
-            <div class="flex flex-col space-y-1.5">
-              <input v-model="pluginConfig.run_command"
-                     type="text"
-                     placeholder="执行的命令"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
-
-              <div class="flex text-sm font-medium text-gray-700 dark:text-gray-300 ml-1 space-x-4">
-                <div class="font-bold">$filename</div>
-                <div>执行的源文件或临时生成的文件</div>
+        <Tabs v-model="activeTab" type="card" size="md" :tabs="tabsData">
+          <template #general>
+            <div class="space-y-4">
+              <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  编译前执行的命令
+                </label>
+                <div class="flex gap-2">
+                  <input v-model="pluginConfig.before_compile"
+                         type="text"
+                         placeholder="编译前执行的命令"
+                         class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+                </div>
+              </div>
+
+              <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  执行的命令
+                </label>
+                <div class="flex flex-col space-y-1.5">
+                  <input v-model="pluginConfig.run_command"
+                         type="text"
+                         placeholder="执行的命令"
+                         class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+
+                  <div class="flex text-sm font-medium text-gray-700 dark:text-gray-300 ml-1 space-x-4">
+                    <div class="font-bold">$filename</div>
+                    <div>执行的源文件或临时生成的文件</div>
+                  </div>
+                </div>
+              </div>
+
+              <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  编译完成后执行的命令
+                </label>
+                <div class="flex gap-2">
+                  <input v-model="pluginConfig.after_compile"
+                         type="text"
+                         placeholder="编译完成后执行的命令"
+                         class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+                </div>
+              </div>
+
+              <div>
+                <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                  文件后缀名
+                </label>
+                <div class="flex gap-2">
+                  <input v-model="pluginConfig.extension"
+                         type="text"
+                         placeholder="输入文件后缀名"
+                         class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+                </div>
               </div>
             </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              编译完成后执行的命令
-            </label>
-            <div class="flex gap-2">
-              <input v-model="pluginConfig.after_compile"
-                     type="text"
-                     placeholder="编译完成后执行的命令"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+          </template>
+
+          <template #environment>
+            <div>
+              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                语言环境目录
+              </label>
+              <div class="flex gap-2">
+                <input v-model="pluginConfig.execute_home"
+                       type="text"
+                       placeholder="选择语言环境目录路径"
+                       class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+
+                <Button type="primary"
+                        :icon-only="true"
+                        :icon="Folder"
+                        @click="selectExecuteHome">
+                </Button>
+              </div>
             </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              超时时间(秒)
-            </label>
-            <div class="flex gap-2">
-              <input v-model="pluginConfig.timeout"
-                     type="number"
-                     placeholder="超时时间(秒)，默认 30 秒"
-                     class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+          </template>
+
+          <template #template>
+            <div>
+              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                文件模板
+              </label>
+              <div class="flex">
+                <textarea v-model="pluginConfig.template"
+                          placeholder="文件模板"
+                          rows="20"
+                          class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+              </div>
             </div>
-          </div>
-
-          <div>
-            <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-              文件模板
-            </label>
-            <div class="flex">
-              <textarea v-model="pluginConfig.template"
-                        placeholder="文件模板"
-                        cols="6"
-                        class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+          </template>
+
+          <template #advanced>
+            <div>
+              <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
+                超时时间(秒)
+              </label>
+              <div class="flex gap-2">
+                <input v-model="pluginConfig.timeout"
+                       type="number"
+                       placeholder="超时时间(秒)，默认 30 秒"
+                       class="flex-1 px-3 py-2 border border-gray-300 dark:border-gray-600 rounded-md bg-white dark:bg-gray-700 text-gray-900 dark:text-white focus:outline-none focus:ring-1 focus:ring-blue-500 focus:border-transparent text-sm"/>
+              </div>
             </div>
-          </div>
-        </div>
+          </template>
+        </Tabs>
       </template>
     </Tabs>
   </div>
@@ -113,7 +123,7 @@ import { onMounted, ref, watch } from 'vue'
 import { invoke } from '@tauri-apps/api/core'
 import { debounce } from 'lodash-es'
 import { open as openDialog } from '@tauri-apps/plugin-dialog'
-import { Folder, Settings2 } from 'lucide-vue-next'
+import { ContainerIcon, FileIcon, Folder, LanguagesIcon, PickaxeIcon, Settings2 } from 'lucide-vue-next'
 import Button from '../../ui/Button.vue'
 import { useToast } from '../../plugins/toast'
 import Tabs from '../../ui/Tabs.vue'
@@ -126,8 +136,33 @@ const emit = defineEmits<{
 
 const toast = useToast()
 
-const activeTab = ref('')
-const tabsData = ref([] as any[])
+const activePlugin = ref('')
+const tabsPluginData = ref([] as any[])
+
+const activeTab = ref('general')
+const tabsData = [
+  {
+    key: 'general',
+    label: '通用配置',
+    icon: Settings2
+  },
+  {
+    'key': 'environment',
+    'label': '环境配置',
+    'icon': ContainerIcon
+  },
+  {
+    key: 'template',
+    label: '模板配置',
+    icon: FileIcon
+  },
+  {
+    key: 'advanced',
+    label: '高级配置',
+    icon: PickaxeIcon
+  }
+]
+
 const globalConfig = ref(null as any)
 const pluginConfig = ref<PluginConfig>({
   enabled: false,
@@ -144,18 +179,19 @@ const pluginConfig = ref<PluginConfig>({
 const getSupportedLanguages = async () => {
   try {
     const languages = await invoke<any[]>('get_supported_languages')
-    tabsData.value = languages.map((language) => ({
+    tabsPluginData.value = languages.map((language) => ({
       key: language.value,
-      label: language.name
+      label: language.name,
+      svgUrl: `/icons/${ language.value.replace(/\d+$/, '') }.svg`
     }))
 
-    if (tabsData.value.length > 0 && !activeTab.value) {
-      activeTab.value = tabsData.value[0].key
+    if (tabsPluginData.value.length > 0 && !activePlugin.value) {
+      activePlugin.value = tabsPluginData.value[0].key
     }
   }
   catch (error) {
     toast.error('获取支持的语言失败 - 错误信息: ' + error)
-    tabsData.value = []
+    tabsPluginData.value = []
   }
 }
 
@@ -172,7 +208,7 @@ const getConfigure = async () => {
 
 const handleTabChange = () => {
   if (globalConfig.value && globalConfig.value.plugins) {
-    pluginConfig.value = globalConfig.value.plugins.find((plugin: any) => plugin.language === activeTab.value)
+    pluginConfig.value = globalConfig.value.plugins.find((plugin: any) => plugin.language === activePlugin.value)
   }
 }
 
@@ -209,7 +245,7 @@ const updateGlobalConfig = async (updatedPlugin: PluginConfig) => {
 
   try {
     await invoke('update_app_config', { config: globalConfig.value })
-    toast.success(`${ tabsData.value.find((tab: any) => tab.key === updatedPlugin.language).label } 配置已保存`)
+    toast.success(`${ tabsPluginData.value.find((tab: any) => tab.key === updatedPlugin.language).label } 配置已保存`)
     emit('settings-changed', updatedPlugin)
   }
   catch (error) {
diff --git a/src/ui/Tabs.vue b/src/ui/Tabs.vue
index 73ad136..a428c96 100644
--- a/src/ui/Tabs.vue
+++ b/src/ui/Tabs.vue
@@ -21,8 +21,14 @@
                 :aria-controls="`tabpanel-${tab.key || tab.name || index}`"
                 role="tab"
                 :tabindex="isActiveTab(tab) ? 0 : -1">
-          <!-- 图标 -->
-          <component v-if="tab.icon" :is="tab.icon" :class="iconClasses"/>
+          <!-- 如果是组件图标 -->
+          <component v-if="tab.icon && !tab.svgIcon" :is="tab.icon" :class="iconClasses"/>
+
+          <!-- 如果是SVG字符串 -->
+          <div v-else-if="tab.svgIcon" v-html="tab.svgIcon" :class="iconClasses"/>
+
+          <!-- 如果是SVG URL -->
+          <img v-else-if="tab.svgUrl" :src="tab.svgUrl" :class="iconClasses" alt="icon"/>
 
           <!-- 文本 -->
           <span v-if="tab.label || tab.name" class="tab-text">
@@ -91,6 +97,8 @@ export interface Tab
   content?: Component
   html?: string
   text?: string
+  svgIcon?: string
+  svgUrl?: string
 
   [key: string]: any
 }

From aef36070dbe5744f5cd014dd3263468911f74c31 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Mon, 11 Aug 2025 11:26:07 +0800
Subject: [PATCH 2/3] =?UTF-8?q?feat=20(core):=20=E4=BC=98=E5=8C=96=20befor?=
 =?UTF-8?q?e=5Fcompile=20=E6=8C=87=E5=AE=9A=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/plugins/mod.rs | 132 +++++++++++++++++++++++++++--------
 1 file changed, 102 insertions(+), 30 deletions(-)

diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
index 0d0c739..3ec77cc 100644
--- a/src-tauri/src/plugins/mod.rs
+++ b/src-tauri/src/plugins/mod.rs
@@ -166,32 +166,15 @@ pub trait LanguagePlugin: Send + Sync {
         );
 
         if let Some(config) = self.get_config() {
-            // 1. 执行 before_compile 命令
+            // 1. 处理 before_compile 命令（直接在 Rust 中处理）
             if let Some(before_cmd) = &config.before_compile {
                 info!(
-                    "执行代码 -> 插件 [ {} ] 处理 pre_execute_hook 执行 before_compile 命令: {}",
+                    "执行代码 -> 插件 [ {} ] 处理 pre_execute_hook 处理环境变量: {}",
                     self.get_language_key(),
                     before_cmd
                 );
-                let output = std::process::Command::new(before_cmd)
-                    .output()
-                    .map_err(|e| {
-                        info!(
-                            "执行代码 -> 插件 [ {} ] 处理 pre_execute_hook 执行 before_compile 命令 {} 失败 {:?}",
-                            self.get_language_key(),
-                            before_cmd,
-                            e
-                        );
-
-                        format!("执行 before_compile 失败: {}", e)
-                    })?;
-
-                if !output.status.success() {
-                    return Err(format!(
-                        "before_compile 命令执行失败: {}",
-                        String::from_utf8_lossy(&output.stderr)
-                    ));
-                }
+
+                self.handle_environment_setup(before_cmd)?;
             }
 
             // 2. 切换到 execute_home 目录
@@ -201,15 +184,8 @@ pub trait LanguagePlugin: Send + Sync {
                     self.get_language_key(),
                     execute_home.display()
                 );
-                std::env::set_current_dir(&execute_home).map_err(|e| {
-                    info!(
-                        "执行代码 -> 插件 [ {} ] 处理 pre_execute_hook 切换到执行目录 {} 失败 {:?}",
-                        self.get_language_key(),
-                        execute_home.display(),
-                        e
-                    );
-                    format!("切换目录失败: {}", e)
-                })?;
+                std::env::set_current_dir(&execute_home)
+                    .map_err(|e| format!("切换目录失败: {}", e))?;
             }
         }
 
@@ -221,6 +197,102 @@ pub trait LanguagePlugin: Send + Sync {
         Ok(code.to_string())
     }
 
+    fn handle_environment_setup(&self, command: &str) -> Result<(), String> {
+        // 处理 export 命令（Unix/Linux/macOS）
+        if command.starts_with("export ") {
+            return self.handle_export_command(command);
+        }
+
+        // 处理 set 命令（Windows）
+        if command.starts_with("set ") {
+            return self.handle_set_command(command);
+        }
+
+        // 处理其他通用环境设置
+        self.execute_cross_platform_command(command)
+    }
+
+    fn handle_export_command(&self, command: &str) -> Result<(), String> {
+        if let Some(env_part) = command.strip_prefix("export ") {
+            if let Some((key, value)) = env_part.split_once("=") {
+                let value = value.trim_matches('"').trim_matches('\'');
+                let expanded_value = self.expand_env_vars(value);
+                let key = key.trim();
+
+                // 先记录日志，再设置环境变量
+                info!("设置环境变量 {}={}", key, expanded_value);
+
+                // 使用 unsafe 块设置环境变量
+                unsafe {
+                    std::env::set_var(key, expanded_value);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn handle_set_command(&self, command: &str) -> Result<(), String> {
+        if let Some(env_part) = command.strip_prefix("set ") {
+            if let Some((key, value)) = env_part.split_once("=") {
+                let value = value.trim_matches('"').trim_matches('\'');
+                let expanded_value = self.expand_env_vars(value);
+                let key = key.trim();
+
+                // 先记录日志，再设置环境变量
+                info!("设置环境变量 {}={}", key, expanded_value);
+
+                // 使用 unsafe 块设置环境变量
+                unsafe {
+                    std::env::set_var(key, expanded_value);
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn expand_env_vars(&self, value: &str) -> String {
+        let mut result = value.to_string();
+
+        // 处理 Unix 风格的环境变量 $VAR
+        if result.contains("$PATH") {
+            if let Ok(current_path) = std::env::var("PATH") {
+                result = result.replace("$PATH", &current_path);
+            }
+        }
+
+        // 处理 Windows 风格的环境变量 %VAR%
+        if result.contains("%PATH%") {
+            if let Ok(current_path) = std::env::var("PATH") {
+                result = result.replace("%PATH%", &current_path);
+            }
+        }
+
+        result
+    }
+
+    fn execute_cross_platform_command(&self, command: &str) -> Result<(), String> {
+        let output = if cfg!(target_os = "windows") {
+            std::process::Command::new("cmd")
+                .args(&["/C", command])
+                .output()
+        } else {
+            std::process::Command::new("sh")
+                .args(&["-c", command])
+                .output()
+        };
+
+        let output = output.map_err(|e| format!("执行命令失败: {}", e))?;
+
+        if !output.status.success() {
+            return Err(format!(
+                "命令执行失败: {}",
+                String::from_utf8_lossy(&output.stderr)
+            ));
+        }
+
+        Ok(())
+    }
+
     // 后执行钩子
     fn post_execute_hook(&self, result: &mut ExecutionResult) -> Result<(), String> {
         if result.success && result.stdout.is_empty() && result.stderr.is_empty() {

From 54271b707dd118ada2132d102e474ddfff1a51f0 Mon Sep 17 00:00:00 2001
From: qianmoQ <shicheng@devlive.org>
Date: Mon, 11 Aug 2025 11:32:26 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix=20(core):=20=E4=BF=AE=E5=A4=8D=E5=91=BD?=
 =?UTF-8?q?=E4=BB=A4=E6=8C=87=E5=90=91=E9=94=99=E8=AF=AF=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src-tauri/src/plugins/mod.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src-tauri/src/plugins/mod.rs b/src-tauri/src/plugins/mod.rs
index 3ec77cc..f003504 100644
--- a/src-tauri/src/plugins/mod.rs
+++ b/src-tauri/src/plugins/mod.rs
@@ -273,11 +273,11 @@ pub trait LanguagePlugin: Send + Sync {
     fn execute_cross_platform_command(&self, command: &str) -> Result<(), String> {
         let output = if cfg!(target_os = "windows") {
             std::process::Command::new("cmd")
-                .args(&["/C", command])
+                .args(["/C", command])
                 .output()
         } else {
             std::process::Command::new("sh")
-                .args(&["-c", command])
+                .args(["-c", command])
                 .output()
         };