From 60d2f996750263e799f9fb55e93afacd60865139 Mon Sep 17 00:00:00 2001
From: li-xiaochen <397721316@qq.com>
Date: Thu, 28 Nov 2024 20:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E8=B5=96=E4=BF=AE=E5=A4=8D=20?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E2=80=9C=E7=A7=BB=E9=99=A4site-packages?=
 =?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E7=A7=BB=E9=99=A4=20python/Script?=
 =?UTF-8?q?=E2=80=9D=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 launcher.py          | 12 ++++-----
 ui/src/pages/Fix.vue | 59 +++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 42 deletions(-)

diff --git a/launcher.py b/launcher.py
index ebfb3bf..4220035 100644
--- a/launcher.py
+++ b/launcher.py
@@ -80,14 +80,14 @@ class Api:
         site_packages_path = Path("./python/Lib/site-packages")
         if site_packages_path.exists():
             rmtree(site_packages_path)
-            return "移除成功"
+            return "site-packages目录移除成功"
         return "python\\Lib\\site-packages目录不存在"
 
-    def rm_python_script(self):
-        python_script_path = Path("./python/Scripts")
-        if python_script_path.exists():
-            rmtree(python_script_path)
-            return "移除成功"
+    def rm_python_scripts(self):
+        python_scripts_path = Path("./python/Scripts")
+        if python_scripts_path.exists():
+            rmtree(python_scripts_path)
+            return "Scripts目录移除成功"
         return "python\\Scripts目录不存在"
 
     def run(self, command, cwd=None):
diff --git a/ui/src/pages/Fix.vue b/ui/src/pages/Fix.vue
index 89e1148..73f5757 100644
--- a/ui/src/pages/Fix.vue
+++ b/ui/src/pages/Fix.vue
@@ -1,37 +1,27 @@
 <script setup>
 const running = inject('running')
 const notification = useNotification()
-async function rm_site_packages() {
-  running.value = true
-  notification['info']({
-    content: '提示',
-    meta: '开始移除site-packages',
-    duration: 3000
-  })
-  const response = await pywebview.api.rm_site_packages()
-  notification['info']({
-    content: '提示',
-    meta: response,
-    duration: 3000
-  })
-  running.value = false
-}
 
-
-async function rm_python_script() {
-  running.value = true
-  notification['info']({
-    content: '提示',
-    meta: '开始移除python/Script',
-    duration: 3000
-  })
-  const response = await pywebview.api.rm_python_script()
-  notification['info']({
-    content: '提示',
-    meta: response,
-    duration: 3000
-  })
-  running.value = false
+async function rm_site_packages_and_python_scripts() {
+    running.value = true
+    notification['info']({
+        content: '提示',
+        meta: '开始移除site-packages和python/Script目录',
+        duration: 3000
+    })
+    const response = await pywebview.api.rm_site_packages()
+    notification['info']({
+        content: '提示',
+        meta: response,
+        duration: 3000
+    })
+    const response2 = await pywebview.api.rm_python_scripts()
+    notification['info']({
+        content: '提示',
+        meta: response2,
+        duration: 3000
+    })
+    running.value = false
 }
 </script>
 
@@ -44,18 +34,15 @@ async function rm_python_script() {
       justify-content: center;
       align-items: center;
     ">
-    <n-button class="fix-btn" type="error" secondary size="large" @click="rm_site_packages">
-      移除 site-packages
-    </n-button>
-    <n-button class="fix-btn" type="error" secondary size="large" @click="rm_python_script">
-      移除 python/Script
+    <n-button class="fix-btn" type="error" secondary size="large" @click="rm_site_packages_and_python_scripts">
+        移除 site-packages 和 python/Scripts 目录
     </n-button>
   </n-flex>
 </template>
 
 <style scoped>
 .fix-btn {
-  width: 200px;
+  width: 320px;
   height: 48px;
 }
 </style>