From 1d028949572e653f2eb45800de7c48cc34ba3615 Mon Sep 17 00:00:00 2001
From: AoXuan <aoxuan233@gmail.com>
Date: Tue, 2 Sep 2025 00:02:43 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E5=A4=8D=E5=8E=9F=E7=96=91?=
 =?UTF-8?q?=E4=BC=BC=E8=A2=AB=E8=AF=AF=E5=A4=84=E7=90=86=E7=9A=84=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 42710ecf6009748b0587d69f8efb0247064dd1ea.
---
 frontend/src/views/Scripts.vue  | 64 ++++++++++++++++++++++-----------
 frontend/src/views/UserEdit.vue | 21 +++++++++--
 2 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/frontend/src/views/Scripts.vue b/frontend/src/views/Scripts.vue
index 7346909..a9c0c95 100644
--- a/frontend/src/views/Scripts.vue
+++ b/frontend/src/views/Scripts.vue
@@ -1,25 +1,31 @@
 <template>
-  <div class="scripts-header">
-    <div class="header-title">
-      <h1>脚本管理</h1>
-    </div>
-    <a-space size="middle">
-      <a-button type="primary" size="large" @click="handleAddScript" class="link">
-        <template #icon>
-          <PlusOutlined />
-        </template>
-        新建脚本
-      </a-button>
-      <a-button size="large" @click="handleRefresh" class="default">
-        <template #icon>
-          <ReloadOutlined />
-        </template>
-        刷新
-      </a-button>
-    </a-space>
+  <!-- 加载状态 -->
+  <div v-if="loading" class="loading-container">
+    <a-spin size="large" tip="加载中，请稍候..." />
   </div>
-  <!-- 如果没有脚本，显示占位符 -->
-  <div v-if="scripts.length === 0" class="placeholder-container">
+
+  <!-- 主要内容 -->
+    <div class="scripts-header">
+      <div class="header-title">
+        <h1>脚本管理</h1>
+      </div>
+      <a-space size="middle">
+        <a-button type="primary" size="large" @click="handleAddScript" class="link">
+          <template #icon>
+            <PlusOutlined />
+          </template>
+          新建脚本
+        </a-button>
+        <a-button size="large" @click="handleRefresh" class="default">
+          <template #icon>
+            <ReloadOutlined />
+          </template>
+          刷新
+        </a-button>
+      </a-space>
+    </div>
+    <!-- 如果没有脚本，显示占位符 -->
+    <div v-if="scripts.length === 0" class="placeholder-container">
     <div class="placeholder-content">
       <h2>当前没有脚本</h2>
       <p>您还没有创建任何脚本，点击下方的“新建脚本”按钮来创建您的第一个脚本。</p>
@@ -595,6 +601,22 @@ const handleToggleUserStatus = async (user: User) => {
 </script>
 
 <style scoped>
+.loading-container {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-height: 400px;
+}
+
+.scripts-main {
+  padding: 32px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: var(--ant-color-bg-layout);
+  min-height: 100vh;
+}
+
 .scripts-container {
   padding: 32px;
   height: 100%;
@@ -1011,7 +1033,7 @@ const handleToggleUserStatus = async (user: User) => {
 
 /* 响应式设计 */
 @media (max-width: 768px) {
-  .scripts-container {
+  .scripts-main {
     padding: 16px;
   }
 
diff --git a/frontend/src/views/UserEdit.vue b/frontend/src/views/UserEdit.vue
index 6f667a1..cabfc09 100644
--- a/frontend/src/views/UserEdit.vue
+++ b/frontend/src/views/UserEdit.vue
@@ -1047,6 +1047,7 @@ const getDefaultMAAUserData = () => ({
     Status: true,
     Mode: 'MAA',
     InfrastMode: '默认',
+    InfrastPath: '',
     Routine: true,
     Annihilation: '当期',
     Stage: '1-7',
@@ -1057,6 +1058,11 @@ const getDefaultMAAUserData = () => ({
     Stage_Remain: '',
     IfSkland: false,
     SklandToken: '',
+    // 添加 General 脚本的属性以确保兼容性
+    IfScriptBeforeTask: false,
+    IfScriptAfterTask: false,
+    ScriptBeforeTask: '',
+    ScriptAfterTask: '',
   },
   Task: {
     IfBase: true,
@@ -1108,6 +1114,7 @@ const getDefaultGeneralUserData = () => ({
     ToAddress: '',
     IfSendMail: false,
     IfSendStatistic: false,
+    IfSendSixStar: false,
     IfServerChan: false,
     IfCompanyWebHookBot: false,
     ServerChanKey: '',
@@ -1132,7 +1139,7 @@ const formData = reactive({
   userName: '',
   userId: '',
   // 嵌套的实际数据
-  ...getDefaultUserData(),
+  ...getDefaultMAAUserData(),
 })
 
 // 表单验证规则
@@ -1187,10 +1194,20 @@ const loadScriptInfo = async () => {
       scriptType.value = script.type // 设置脚本类型
 
       // 重新初始化表单数据（根据脚本类型）
+      const defaultData =
+        scriptType.value === 'MAA' ? getDefaultMAAUserData() : getDefaultGeneralUserData()
+
+      // 清空现有数据并重新赋值
+      Object.keys(formData).forEach(key => {
+        if (key !== 'userName' && key !== 'userId') {
+          delete formData[key]
+        }
+      })
+
       Object.assign(formData, {
         userName: '',
         userId: '',
-        ...getDefaultUserData(),
+        ...defaultData,
       })
 
       // 如果是编辑模式，加载用户数据