diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 7f75653..05c4294 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -29,10 +29,16 @@ const routes: RouteRecordRaw[] = [ meta: { title: '脚本管理' }, }, { - path: '/scripts/:id/edit', - name: 'ScriptEdit', - component: () => import('../views/ScriptEdit.vue'), - meta: { title: '编辑脚本' }, + path: '/scripts/:id/edit/maa', + name: 'MAAScriptEdit', + component: () => import('../views/MAAScriptEdit.vue'), + meta: { title: '编辑MAA脚本' }, + }, + { + path: '/scripts/:id/edit/general', + name: 'GeneralScriptEdit', + component: () => import('../views/GeneralScriptEdit.vue'), + meta: { title: '编辑通用脚本' }, }, { path: '/scripts/:scriptId/users/add/maa', diff --git a/frontend/src/views/GeneralScriptEdit.vue b/frontend/src/views/GeneralScriptEdit.vue new file mode 100644 index 0000000..a18e992 --- /dev/null +++ b/frontend/src/views/GeneralScriptEdit.vue @@ -0,0 +1,1517 @@ + + + + + diff --git a/frontend/src/views/GeneralUserEdit.vue b/frontend/src/views/GeneralUserEdit.vue index 9e0cdf6..613eeec 100644 --- a/frontend/src/views/GeneralUserEdit.vue +++ b/frontend/src/views/GeneralUserEdit.vue @@ -6,7 +6,7 @@ 脚本管理 - + {{ scriptName }} diff --git a/frontend/src/views/MAAScriptEdit.vue b/frontend/src/views/MAAScriptEdit.vue new file mode 100644 index 0000000..09c8dff --- /dev/null +++ b/frontend/src/views/MAAScriptEdit.vue @@ -0,0 +1,774 @@ + + + + + diff --git a/frontend/src/views/MAAUserEdit/MAAUserEditHeader.vue b/frontend/src/views/MAAUserEdit/MAAUserEditHeader.vue index 874c5c1..c45ad0f 100644 --- a/frontend/src/views/MAAUserEdit/MAAUserEditHeader.vue +++ b/frontend/src/views/MAAUserEdit/MAAUserEditHeader.vue @@ -6,7 +6,7 @@ 脚本管理 - + {{ scriptName }} diff --git a/frontend/src/views/ScriptEdit.vue b/frontend/src/views/ScriptEdit.vue deleted file mode 100644 index c5a8a8d..0000000 --- a/frontend/src/views/ScriptEdit.vue +++ /dev/null @@ -1,1797 +0,0 @@ - - - - - diff --git a/frontend/src/views/Scripts.vue b/frontend/src/views/Scripts.vue index ab40894..acb723d 100644 --- a/frontend/src/views/Scripts.vue +++ b/frontend/src/views/Scripts.vue @@ -331,7 +331,7 @@ const handleConfirmAddScript = async () => { typeSelectVisible.value = false // 跳转到编辑页面,传递API返回的数据 router.push({ - path: `/scripts/${result.scriptId}/edit`, + path: `/scripts/${result.scriptId}/edit/maa`, state: { scriptData: { id: result.scriptId, @@ -363,7 +363,7 @@ const handleConfirmGeneralMode = async () => { if (result) { message.success(result.message) router.push({ - path: `/scripts/${result.scriptId}/edit`, + path: `/scripts/${result.scriptId}/edit/general`, state: { scriptData: { id: result.scriptId, @@ -422,7 +422,7 @@ const handleConfirmTemplate = async () => { await loadScripts() // 跳转到编辑页面,不传递state数据,让编辑页面从API重新加载最新配置 - router.push(`/scripts/${createResult.scriptId}/edit`) + router.push(`/scripts/${createResult.scriptId}/edit/general`) } } catch (error) { console.error('使用模板创建脚本失败:', error) @@ -439,8 +439,12 @@ const handleCancelTemplate = () => { } const handleEditScript = (script: Script) => { - // 跳转到独立的编辑页面 - router.push(`/scripts/${script.id}/edit`) + // 根据脚本类型跳转到对应的编辑页面 + if (script.type === 'MAA') { + router.push(`/scripts/${script.id}/edit/maa`) + } else { + router.push(`/scripts/${script.id}/edit/general`) + } } const handleDeleteScript = async (script: Script) => { @@ -601,190 +605,87 @@ const handleToggleUserStatus = async (user: User) => { }) if (result) { - // 本地同步状态 - user.Info.Status = newStatus - // message.success(`用户 ${user.Info.Name} 已${newStatus ? '启用' : '禁用'}`) + message.success('用户状态更新成功') } } catch (error) { - console.error('切换用户状态失败:', error) - message.error('切换用户状态失败') + console.error('更新用户状态失败:', error) + message.error('更新用户状态失败') } }