add tabbar

This commit is contained in:
jyuesong
2022-01-14 10:25:40 +08:00
parent 659aabc282
commit 84da8495a2
8 changed files with 277 additions and 100 deletions

View File

@@ -6,6 +6,7 @@ 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/module/config/config_viewmodel.dart';
import 'package:qinglong_app/utils/qinglong_theme.dart';
class ConfigEditPage extends ConsumerStatefulWidget {
final String content;
@@ -33,7 +34,13 @@ class _ConfigEditPageState extends ConsumerState<ConfigEditPage> {
files: files,
styleOptions: EditorModelStyleOptions(
fontSize: 13,
heightOfContainer: MediaQuery.of(context).size.height - kToolbarHeight - kBottomNavigationBarHeight - 150,
editorBorderColor: Theme.of(context).scaffoldBackgroundColor,
editButtonBackgroundColor: Theme.of(context).scaffoldBackgroundColor,
editorColor: Theme.of(context).scaffoldBackgroundColor,
theme: qinglongLightTheme,
),
);
return Scaffold(
appBar: QlAppBar(

View File

@@ -1,9 +1,8 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:qinglong_app/base/base_state_widget.dart';
import 'package:code_editor/code_editor.dart';
import 'package:qinglong_app/base/routes.dart';
import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/utils/qinglong_theme.dart';
import 'config_viewmodel.dart';
@@ -15,76 +14,35 @@ class ConfigPage extends StatefulWidget {
}
class _ConfigPageState extends State<ConfigPage> {
final myController = TextEditingController();
@override
Widget build(BuildContext context) {
return BaseStateWidget<ConfigViewModel>(
builder: (ref, model, child) {
List<FileEditor> files = [
FileEditor(
name: model.title,
language: "sh",
code: model.content, // [code] needs a string
),
];
List<FileEditor> files = model.list
.map(
(e) => FileEditor(
name: e.title,
language: "sh",
code: model.content[e.title], // [code] needs a string
),
)
.toList();
EditorModel editMode = EditorModel(
files: files,
styleOptions: EditorModelStyleOptions(
fontSize: 13,
heightOfContainer: MediaQuery.of(context).size.height - kToolbarHeight - kBottomNavigationBarHeight - 150,
heightOfContainer: MediaQuery.of(context).size.height - kToolbarHeight - kBottomNavigationBarHeight - 90,
editorBorderColor: Theme.of(context).scaffoldBackgroundColor,
editButtonBackgroundColor: Theme.of(context).scaffoldBackgroundColor,
editorColor: Theme.of(context).scaffoldBackgroundColor,
editorFilenameColor: Theme.of(context).primaryColor,
theme: ref.watch(themeProvider).themeColor.codeEditorTheme(),
),
);
myController.text = model.content;
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
DropdownButton<String>(
value: model.title,
items: model.list
.map(
(e) => DropdownMenuItem<String>(
value: e.value ?? "",
child: Text(e.value ?? ""),
),
)
.toList(),
onChanged: (value) {
model.loadContent(value!);
},
),
const Spacer(),
CupertinoButton(
child: Text(
"编辑",
style: TextStyle(
color: Theme.of(context).primaryColor,
fontSize: 16,
),
),
onPressed: () {
Navigator.of(context).pushNamed(Routes.route_ConfigEdit, arguments: {
"title": model.title,
"content": model.content,
});
},
),
],
),
Expanded(
child: CodeEditor(
model: editMode,
edit: false,
textEditingController: myController,
disableNavigationbar: false,
),
),
],
return CodeEditor(
model: editMode,
edit: false,
disableNavigationbar: false,
);
},
model: configProvider,

View File

@@ -9,8 +9,7 @@ var configProvider = ChangeNotifierProvider((ref) => ConfigViewModel());
class ConfigViewModel extends BaseViewModel {
List<ConfigBean> list = [];
String content = "";
String title = "";
Map<String, String> content = {};
Future<void> loadData([isLoading = true]) async {
if (isLoading) {
@@ -22,9 +21,12 @@ class ConfigViewModel extends BaseViewModel {
if (result.success && result.bean != null) {
list.clear();
list.addAll(result.bean!);
title = list[0].value!;
for (var element in list) {
await loadContent(element.value!);
}
success();
loadContent(list[0].value!);
} else {
list.clear();
failed(result.message, notify: true);
@@ -32,15 +34,10 @@ class ConfigViewModel extends BaseViewModel {
}
Future<void> loadContent(String name) async {
title = name;
notifyListeners();
HttpResponse<String> result = await Api.content(name);
if (result.success && result.bean != null) {
content = result.bean!;
success();
} else {
failToast(result.message, notify: false);
content[name] = result.bean!;
}
}
}

View File

@@ -5,6 +5,7 @@ import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:qinglong_app/base/base_state_widget.dart';
import 'package:qinglong_app/base/routes.dart';
import 'package:qinglong_app/base/theme.dart';
import 'package:qinglong_app/base/ui/abs_underline_tabindicator.dart';
import 'package:qinglong_app/module/task/intime_log/intime_log_page.dart';
import 'package:qinglong_app/module/task/task_bean.dart';
import 'package:qinglong_app/module/task/task_viewmodel.dart';
@@ -30,27 +31,41 @@ class _TaskPageState extends State<TaskPage> {
Widget build(BuildContext context) {
return BaseStateWidget<TaskViewModel>(
builder: (ref, model, child) {
return RefreshIndicator(
color: Theme.of(context).primaryColor,
onRefresh: () async {
return model.loadData(false);
},
child: ListView.builder(
keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
itemBuilder: (context, index) {
if (index == 0) {
return searchCell(ref);
}
TaskBean item = model.list[index - 1];
if ((item.name == null || item.name!.contains(_searchKey ?? "")) || (item.command == null || item.command!.contains(_searchKey ?? ""))) {
return TaskItemCell(item, ref);
} else {
return const SizedBox.shrink();
}
},
itemCount: model.list.length + 1,
return DefaultTabController(
length: 3,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
TabBar(
tabs: const [
Tab(
text: "全部",
),
Tab(
text: "正在运行",
),
Tab(
text: "已禁用",
),
],
isScrollable: true,
indicator: AbsUnderlineTabIndicator(
wantWidth: 20,
borderSide: BorderSide(
color: Theme.of(context).primaryColor,
width: 2,
)),
),
Expanded(
child: TabBarView(
children: [
body(model, model.list, ref),
body(model, model.running, ref),
body(model, model.disabled, ref),
],
),
),
],
),
);
},
@@ -61,6 +76,32 @@ class _TaskPageState extends State<TaskPage> {
);
}
Widget body(TaskViewModel model, List<TaskBean> list, WidgetRef ref) {
return RefreshIndicator(
color: Theme.of(context).primaryColor,
onRefresh: () async {
return model.loadData(false);
},
child: ListView.builder(
keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
itemBuilder: (context, index) {
// if (index == 0) {
// return searchCell(ref);
// }
TaskBean item = list[index ];
if ((item.name == null || item.name!.contains(_searchKey ?? "")) || (item.command == null || item.command!.contains(_searchKey ?? ""))) {
return TaskItemCell(item, ref);
} else {
return const SizedBox.shrink();
}
},
itemCount: list.length,
),
);
}
Widget searchCell(WidgetRef context) {
return Container(
color: context.watch(themeProvider).themeColor.searchBarBg(),
@@ -112,6 +153,7 @@ class TaskItemCell extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Slidable(
enabled: false,
key: const ValueKey(0),
startActionPane: ActionPane(
motion: const ScrollMotion(),
@@ -220,7 +262,10 @@ class TaskItemCell extends StatelessWidget {
),
),
),
const Divider(height: 1,indent: 15,),
const Divider(
height: 1,
indent: 15,
),
],
);
}

View File

@@ -8,6 +8,8 @@ var taskProvider = ChangeNotifierProvider((ref) => TaskViewModel());
class TaskViewModel extends BaseViewModel {
List<TaskBean> list = [];
List<TaskBean> running = [];
List<TaskBean> disabled = [];
Future<void> loadData([isLoading = true]) async {
if (isLoading) {
@@ -31,14 +33,10 @@ class TaskViewModel extends BaseViewModel {
list.sort((a, b) {
return b.created!.compareTo(a.created!);
});
list.sort((a, b) {
return a.isDisabled!.compareTo(b.isDisabled!);
});
list.sort((a, b) {
return a.status!.compareTo(b.status!);
});
running.clear();
running.addAll(list.where((element) => element.status == 0));
disabled.clear();
disabled.addAll(list.where((element) => element.isDisabled == 1));
}
Future<void> runCrons(String cron) async {