Leaf-WAI/qinglong_app
1
0
Fork 0
mirror of https://github.com/qinglong-app/qinglong_app.git synced 2025-10-09 16:48:19 +08:00
Code Issues Projects Releases Wiki Activity

支持脚本的编辑删除

Browse Source
This commit is contained in:
jyuesong
2022-01-20 10:25:10 +08:00
parent 89ad8e38e5
commit 22f66d36a2
11 changed files with 703 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/base/http/api.dart
View File

@@ -66,6 +66,16 @@ class Api {
);
}
static Future<HttpResponse<NullResponse>> updatePassword(String name, String password) async {
return await Http.put<NullResponse>(
Url.updatePassword,
{
"username": name,
"password": password,
},
);
}
static Future<HttpResponse<String>> inTimeLog(String cron) async {
return await Http.get<String>(
Url.intimeLog(cron),
@@ -225,6 +235,27 @@ class Api {
);
}
static Future<HttpResponse<NullResponse>> updateScript(String name, String path, String content) async {
return await Http.put<NullResponse>(
Url.scriptDetail,
{
"filename": name,
"path": path,
"content": content,
},
);
}
static Future<HttpResponse<NullResponse>> delScript(String name, String path) async {
return await Http.delete<NullResponse>(
Url.scriptDetail,
{
"filename": name,
"path": path,
},
);
}
static Future<HttpResponse<String>> scriptDetail(String name, String? path) async {
return await Http.get<String>(
Url.scriptDetail + name,

2
lib/base/http/http.dart
View File

@@ -117,7 +117,7 @@ class Http {
if (!pushedLoginPage) {
"身份已过期,请重新登录".toast();
pushedLoginPage = true;
navigatorState.currentState?.pushReplacementNamed(Routes.routeLogin);
navigatorState.currentState?.pushNamedAndRemoveUntil(Routes.routeLogin, (route) => false);
}
}

6
lib/base/http/url.dart
View File

@@ -6,6 +6,8 @@ class Url {
static const loginByClientId = "/open/auth/token";
static const user = "/api/user";
static const updatePassword = "/api/user";
static get tasks => getIt<UserInfoViewModel>().useSecretLogined ? "/open/crons" : "/api/crons";
static get runTasks => getIt<UserInfoViewModel>().useSecretLogined ? "/open/crons/run" : "/api/crons/run";
@@ -47,6 +49,7 @@ class Url {
static get taskLogDetail => getIt<UserInfoViewModel>().useSecretLogined ? "/open/logs/" : "/api/logs/";
static get scripts => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts/files" : "/api/scripts/files";
static get scriptUpdate => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts" : "/api/scripts";
static get scriptDetail => getIt<UserInfoViewModel>().useSecretLogined ? "/open/scripts/" : "/api/scripts/";
@@ -54,6 +57,9 @@ class Url {
static get dependencyReinstall => getIt<UserInfoViewModel>().useSecretLogined ? "/open/dependencies/reinstall" : "/api/dependencies/reinstall";
static intimeLog(String cronId) {
return getIt<UserInfoViewModel>().useSecretLogined ? "/open/crons/$cronId/log" : "/api/crons/$cronId/log";
}

20
lib/base/routes.dart
View File

@@ -10,9 +10,11 @@ import 'package:qinglong_app/module/others/dependencies/add_dependency_page.dart
import 'package:qinglong_app/module/others/dependencies/dependency_page.dart';
import 'package:qinglong_app/module/others/login_log/login_log_page.dart';
import 'package:qinglong_app/module/others/scripts/script_detail_page.dart';
import 'package:qinglong_app/module/others/scripts/script_edit_page.dart';
import 'package:qinglong_app/module/others/scripts/script_page.dart';
import 'package:qinglong_app/module/others/task_log/task_log_detail_page.dart';
import 'package:qinglong_app/module/others/task_log/task_log_page.dart';
import 'package:qinglong_app/module/others/update_password_page.dart';
import 'package:qinglong_app/module/task/add_task_page.dart';
import 'package:qinglong_app/module/task/task_bean.dart';
import 'package:qinglong_app/module/task/task_detail/task_detail_page.dart';
@@ -31,7 +33,10 @@ class Routes {
static const String routeTaskLogDetail = "/log/taskDetail";
static const String routeScript = "/script";
static const String routeScriptDetail = "/script/detail";
static const String routeScriptUpdate = "/script/update";
static const String routeScriptAdd = "/script/add";
static const String routeDependency = "/Dependency";
static const String routeUpdatePassword = "/updatePassword";
static Route<dynamic>? generateRoute(RouteSettings settings) {
switch (settings.name) {
@@ -100,12 +105,25 @@ class Routes {
builder: (context) => TaskDetailPage(
settings.arguments as TaskBean,
),
); case routeEnvDetail:
);
case routeEnvDetail:
return CupertinoPageRoute(
builder: (context) => EnvDetailPage(
settings.arguments as EnvBean,
),
);
case routeUpdatePassword:
return CupertinoPageRoute(
builder: (context) => const UpdatePasswordPage(),
);
case routeScriptUpdate:
return CupertinoPageRoute(
builder: (context) => ScriptEditPage(
(settings.arguments as Map)["title"],
(settings.arguments as Map)["path"],
(settings.arguments as Map)["content"],
),
);
}
return null;

69
lib/module/others/other_page.dart
View File

@@ -6,6 +6,7 @@ import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/base/userinfo_viewmodel.dart';
import 'package:qinglong_app/main.dart';
import 'package:qinglong_app/utils/extension.dart';
class OtherPage extends ConsumerStatefulWidget {
const OtherPage({Key? key}) : super(key: key);
@@ -57,10 +58,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text(
"脚本管理",
style: TextStyle(
color: ref
.watch(themeProvider)
.themeColor
.titleColor(),
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
@@ -93,10 +91,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text(
"依赖管理",
style: TextStyle(
color: ref
.watch(themeProvider)
.themeColor
.titleColor(),
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
@@ -129,10 +124,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text(
"任务日志",
style: TextStyle(
color: ref
.watch(themeProvider)
.themeColor
.titleColor(),
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
@@ -170,10 +162,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text(
"登录日志",
style: TextStyle(
color: ref
.watch(themeProvider)
.themeColor
.titleColor(),
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
@@ -192,6 +181,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Container(
margin: const EdgeInsets.symmetric(
horizontal: 15,
vertical: 15,
),
decoration: BoxDecoration(
color: ref.watch(themeProvider).themeColor.settingBgColor(),
@@ -203,10 +193,47 @@ class _OtherPageState extends ConsumerState<OtherPage> {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
GestureDetector(
onTap: () {
if (getIt<UserInfoViewModel>().useSecretLogined) {
"使用client_id方式登录无法修改密码".toast();
} else {
Navigator.of(context).pushNamed(
Routes.routeUpdatePassword,
);
}
},
behavior: HitTestBehavior.opaque,
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 10,
horizontal: 15,
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
"修改密码",
style: TextStyle(
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
const Spacer(),
const Icon(
CupertinoIcons.right_chevron,
size: 16,
),
],
),
),
),
const Divider(
indent: 15,
),
Padding(
padding: const EdgeInsets.only(
top: 5,
bottom: 5,
left: 15,
right: 15,
),
@@ -217,8 +244,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
Text(
"夜间模式",
style: TextStyle(
color:
ref.watch(themeProvider).themeColor.titleColor(),
color: ref.watch(themeProvider).themeColor.titleColor(),
fontSize: 16,
),
),
@@ -267,8 +293,7 @@ class _OtherPageState extends ConsumerState<OtherPage> {
child: const Text("确定"),
onPressed: () {
getIt<UserInfoViewModel>().updateToken("");
Navigator.of(context)
.pushReplacementNamed(Routes.routeLogin);
Navigator.of(context).pushReplacementNamed(Routes.routeLogin);
},
),
],

188
lib/module/others/scripts/script_detail_page.dart
View File

@@ -5,6 +5,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:qinglong_app/base/http/api.dart';
import 'package:qinglong_app/base/http/http.dart';
import 'package:qinglong_app/base/ql_app_bar.dart';
import 'package:qinglong_app/base/routes.dart';
import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/base/ui/lazy_load_state.dart';
import 'package:qinglong_app/utils/extension.dart';
@@ -27,6 +28,105 @@ class ScriptDetailPage extends ConsumerStatefulWidget {
class _ScriptDetailPageState extends ConsumerState<ScriptDetailPage> with LazyLoadState<ScriptDetailPage> {
String? content;
List<Widget> actions = [];
@override
void initState() {
super.initState();
actions.addAll(
[
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navigator.of(context).pop();
if (content == null || content!.isEmpty) {
"未获取到脚本内容,请稍候重试".toast();
return;
}
Navigator.of(context).pushNamed(
Routes.routeScriptUpdate,
arguments: {
"title": widget.title,
"path": widget.path,
"content": content,
},
).then((value) {
if (value != null && value == true) {
Navigator.of(context).pop(true);
}
});
},
child: Container(
padding: const EdgeInsets.symmetric(
vertical: 15,
),
alignment: Alignment.center,
child: const Material(
color: Colors.transparent,
child: Text(
"编辑",
style: TextStyle(
fontSize: 16,
),
),
),
),
),
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () async {
Navigator.of(context).pop();
showCupertinoDialog(
context: context,
builder: (context) => CupertinoAlertDialog(
title: const Text("确认删除"),
content: const Text("确认删除该脚本吗"),
actions: [
CupertinoDialogAction(
child: const Text("取消"),
onPressed: () {
Navigator.of(context).pop();
},
),
CupertinoDialogAction(
child: const Text("确定"),
onPressed: () async {
Navigator.of(context).pop();
HttpResponse<NullResponse> result = await Api.delScript(widget.title, widget.path ?? "");
if (result.success) {
"删除成功".toast();
Navigator.of(context).pop(true);
} else {
result.message?.toast();
}
},
),
],
),
);
},
child: Container(
padding: const EdgeInsets.symmetric(
vertical: 15,
),
alignment: Alignment.center,
child: const Material(
color: Colors.transparent,
child: Text(
"删除",
style: TextStyle(
color: Colors.red,
fontSize: 16,
),
),
),
),
),
],
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
@@ -36,22 +136,82 @@ class _ScriptDetailPageState extends ConsumerState<ScriptDetailPage> with LazyLo
Navigator.of(context).pop();
},
title: "脚本详情",
),
body:content == null
? const Center(
child: CupertinoActivityIndicator(),
)
: SingleChildScrollView(
child: HighlightView(
content ?? "",
language: getLanguageType(widget.title),
padding: const EdgeInsets.symmetric(
horizontal: 15,
actions: [
InkWell(
onTap: () {
showCupertinoModalPopup(
context: context,
builder: (context) {
return CupertinoActionSheet(
title: Container(
alignment: Alignment.center,
child: const Material(
color: Colors.transparent,
child: Text(
"更多操作",
style: TextStyle(
fontSize: 16,
),
),
),
),
actions: actions,
cancelButton: GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
Navigator.pop(context);
},
child: Container(
alignment: Alignment.center,
padding: const EdgeInsets.symmetric(
vertical: 10,
),
child: const Material(
color: Colors.transparent,
child: Text(
"取消",
style: TextStyle(
color: Colors.red,
fontSize: 16,
),
),
),
),
),
);
},
);
},
child: const Padding(
padding: EdgeInsets.symmetric(
horizontal: 15,
),
child: Center(
child: Icon(
Icons.more_horiz,
color: Colors.white,
size: 26,
),
),
),
),
theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
tabSize: 14,
),
],
),
body: content == null
? const Center(
child: CupertinoActivityIndicator(),
)
: SingleChildScrollView(
child: HighlightView(
content ?? "",
language: getLanguageType(widget.title),
padding: const EdgeInsets.symmetric(
horizontal: 15,
),
theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
tabSize: 14,
),
),
);
}

93
lib/module/others/scripts/script_edit_page.dart Normal file
View File

@@ -0,0 +1,93 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:qinglong_app/base/http/api.dart';
import 'package:qinglong_app/base/http/http.dart';
import 'package:qinglong_app/base/ql_app_bar.dart';
import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/module/config/config_viewmodel.dart';
import 'package:qinglong_app/utils/extension.dart';
class ScriptEditPage extends ConsumerStatefulWidget {
final String content;
final String title;
final String path;
const ScriptEditPage(this.title, this.path, this.content, {Key? key}) : super(key: key);
@override
_ScriptEditPageState createState() => _ScriptEditPageState();
}
class _ScriptEditPageState extends ConsumerState<ScriptEditPage> {
late TextEditingController _controller;
FocusNode node = FocusNode();
@override
void initState() {
_controller = TextEditingController(text: widget.content);
super.initState();
WidgetsBinding.instance?.addPostFrameCallback(
(timeStamp) {
node.requestFocus();
},
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: QlAppBar(
canBack: true,
backCall: () {
Navigator.of(context).pop();
},
title: '编辑${widget.title}',
actions: [
InkWell(
onTap: () async {
HttpResponse<NullResponse> response = await Api.updateScript(widget.title, widget.path, _controller.text);
if (response.success) {
"提交成功".toast();
Navigator.of(context).pop(true);
} else {
(response.message ?? "").toast();
}
},
child: const Padding(
padding: EdgeInsets.symmetric(
horizontal: 15,
),
child: Center(
child: Text(
"提交",
style: TextStyle(
color: Colors.white,
fontSize: 16,
),
),
),
),
)
],
),
body: Container(
padding: const EdgeInsets.only(
left: 15,
right: 15,
),
child: SingleChildScrollView(
child: TextField(
focusNode: node,
style: TextStyle(
color: ref.read(themeProvider).themeColor.descColor(),
fontSize: 14,
),
controller: _controller,
minLines: 1,
maxLines: 100,
),
),
),
);
}
}

12
lib/module/others/scripts/script_page.dart
View File

@@ -60,7 +60,11 @@ class _ScriptPageState extends ConsumerState<ScriptPage> with LazyLoadState<Scri
"title": e.title,
"path": e.parent,
},
);
).then((value) {
if (value != null && value == true) {
loadData();
}
});
},
title: Text(
e.title ?? "",
@@ -82,6 +86,12 @@ class _ScriptPageState extends ConsumerState<ScriptPage> with LazyLoadState<Scri
"title": item.title,
"path": "",
},
).then(
(value) {
if (value != null && value == true) {
loadData();
}
},
);
},
title: Text(

207
lib/module/others/update_password_page.dart Normal file
View File

@@ -0,0 +1,207 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:qinglong_app/base/http/api.dart';
import 'package:qinglong_app/base/http/http.dart';
import 'package:qinglong_app/base/ql_app_bar.dart';
import 'package:qinglong_app/base/routes.dart';
import 'package:qinglong_app/base/userinfo_viewmodel.dart';
import 'package:qinglong_app/module/task/task_bean.dart';
import 'package:qinglong_app/module/task/task_viewmodel.dart';
import 'package:qinglong_app/utils/extension.dart';
import '../../main.dart';
class UpdatePasswordPage extends ConsumerStatefulWidget {
const UpdatePasswordPage({
Key? key,
}) : super(key: key);
@override
ConsumerState<UpdatePasswordPage> createState() => _UpdatePasswordPageState();
}
class _UpdatePasswordPageState extends ConsumerState<UpdatePasswordPage> {
final TextEditingController _nameController = TextEditingController();
final TextEditingController _passwordController = TextEditingController();
final TextEditingController _passwordAgainController = TextEditingController();
FocusNode focusNode = FocusNode();
@override
void initState() {
super.initState();
WidgetsBinding.instance?.addPostFrameCallback(
(timeStamp) {
focusNode.requestFocus();
},
);
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: QlAppBar(
canBack: true,
backCall: () {
Navigator.of(context).pop();
},
title: "修改用户名密码",
actions: [
InkWell(
onTap: () {
submit();
},
child: const Padding(
padding: EdgeInsets.symmetric(
horizontal: 15,
),
child: Center(
child: Text(
"提交",
style: TextStyle(
color: Colors.white,
fontSize: 16,
),
),
),
),
)
],
),
body: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 15,
),
const Text(
"用户名:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
focusNode: focusNode,
controller: _nameController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入用户名",
),
autofocus: false,
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 15,
),
const Text(
"新密码:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
obscureText: true,
controller: _passwordController,
maxLines: 1,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "请输入新密码",
),
autofocus: false,
),
],
),
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 15,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const SizedBox(
height: 15,
),
const Text(
"再次输入新密码:",
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
),
),
TextField(
obscureText: true,
maxLines: 1,
controller: _passwordAgainController,
decoration: const InputDecoration(
contentPadding: EdgeInsets.fromLTRB(0, 5, 0, 5),
hintText: "再次输入新密码",
),
autofocus: false,
),
],
),
),
],
),
);
}
void submit() async {
if (_nameController.text.isEmpty) {
"用户名不能为空".toast();
return;
}
if (_passwordController.text.isEmpty || _passwordAgainController.text.isEmpty) {
"密码不能为空".toast();
return;
}
if (_passwordAgainController.text != _passwordController.text) {
"两次输入的密码不一致".toast();
return;
}
commitReal();
}
void commitReal() async {
String name = _nameController.text;
String password = _passwordController.text;
HttpResponse<NullResponse> response = await Api.updatePassword(name, password);
if (response.success) {
"更新成功".toast();
if (!getIt<UserInfoViewModel>().useSecretLogined) {
getIt<UserInfoViewModel>().updateUserName(name, password);
}
Navigator.of(context).pushNamedAndRemoveUntil(Routes.routeLogin, (route) => false);
} else {
response.message.toast();
}
}
}