mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-18 22:33:42 +00:00
feat: complete tree view (#93)
* feat: complete tree view --------- Co-authored-by: wuke2022 <[email protected]>
This commit is contained in:
1 parent
56375c0edb
commit
8bae1a5850
8 files changed
+2217
-3815
No files matched your search
@@ -72,7 +72,7 @@ This project is divided into two parts, the front end uses `flutter`, the back e
|
|||||||
### Environment
|
### Environment
|
||||||
|
|
||||||
1. Golang 1.19+
|
1. Golang 1.19+
|
||||||
2. Flutter 3.0+
|
2. Flutter 3.7+
|
||||||
|
|
||||||
### Clone
|
### Clone
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -72,7 +72,7 @@ docker-compose up -d
|
|||||||
### 环境要求
|
### 环境要求
|
||||||
|
|
||||||
1. Golang 1.19+
|
1. Golang 1.19+
|
||||||
2. Flutter 3.0+
|
2. Flutter 3.7+
|
||||||
|
|
||||||
### 克隆项目
|
### 克隆项目
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
class CreateController extends GetxController {
|
class CreateController extends GetxController {
|
||||||
final files = [].obs;
|
// final files = [].obs;
|
||||||
|
final RxList fileInfos = [].obs;
|
||||||
final RxList selectedIndexes = [].obs;
|
final RxList selectedIndexes = [].obs;
|
||||||
|
final RxList openedFolders = [].obs;
|
||||||
}
|
}
|
||||||
@@ -104,7 +104,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _showResolveDialog(ResolveResult rr) async {
|
Future<void> _showResolveDialog(ResolveResult rr) async {
|
||||||
controller.files.value = rr.res.files;
|
final files = rr.res.files;
|
||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
|
|
||||||
final createFormKey = GlobalKey<FormState>();
|
final createFormKey = GlobalKey<FormState>();
|
||||||
@@ -129,7 +129,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
autovalidateMode: AutovalidateMode.always,
|
autovalidateMode: AutovalidateMode.always,
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Expanded(child: FileListView()),
|
Expanded(child: FileListView(files: files)),
|
||||||
DirectorySelector(
|
DirectorySelector(
|
||||||
controller: pathController,
|
controller: pathController,
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:fluent_ui/fluent_ui.dart' as fluent;
|
import 'package:fluent_ui/fluent_ui.dart' as fluent;
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:gopeed/api/model/resource.dart';
|
||||||
import 'package:path/path.dart' as path;
|
import 'package:path/path.dart' as path;
|
||||||
|
|
||||||
import '../../../util/file_icon.dart';
|
import '../../../util/file_icon.dart';
|
||||||
@@ -10,97 +11,164 @@ import '../../modules/app/controllers/app_controller.dart';
|
|||||||
import '../../modules/create/controllers/create_controller.dart';
|
import '../../modules/create/controllers/create_controller.dart';
|
||||||
|
|
||||||
class FileListView extends GetView {
|
class FileListView extends GetView {
|
||||||
|
final List<FileInfo> files;
|
||||||
|
|
||||||
FileListView({
|
FileListView({
|
||||||
Key? key,
|
Key? key,
|
||||||
|
required this.files,
|
||||||
}) : super(key: key);
|
}) : super(key: key);
|
||||||
final parentController = Get.find<CreateController>();
|
final parentController = Get.find<CreateController>();
|
||||||
final appController = Get.find<AppController>();
|
final appController = Get.find<AppController>();
|
||||||
|
|
||||||
late final List fileInfos;
|
List findChildFileIdsR(List children) {
|
||||||
|
|
||||||
List findChildFileIdsRecursive(children) {
|
|
||||||
List res = [];
|
List res = [];
|
||||||
for (var k in children) {
|
for (var k in children) {
|
||||||
if (fileInfos[k]['type'] == 'folder') {
|
if (parentController.fileInfos[k]['type'] == 'folder') {
|
||||||
res.addAll(findChildFileIdsRecursive(fileInfos[k]['children']));
|
res.addAll(
|
||||||
|
findChildFileIdsR(parentController.fileInfos[k]['children']));
|
||||||
} else {
|
} else {
|
||||||
res.add(fileInfos[k]['fileId']);
|
res.add(parentController.fileInfos[k]['fileId']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<fluent.TreeViewItem> buildTreeViewItemsRecursive(
|
void clearDescendantFolderSizeR(int id) {
|
||||||
int level, int parentId) {
|
if (parentController.fileInfos[id]['type'] == 'folder') {
|
||||||
|
parentController.fileInfos[id]['size'] = 0;
|
||||||
|
for (var childId in parentController.fileInfos[id]['children']) {
|
||||||
|
clearDescendantFolderSizeR(childId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void reduceAncestorFolderSizeR(int id, int size) {
|
||||||
|
int parentId = parentController.fileInfos[id]['parentId'];
|
||||||
|
|
||||||
|
if (parentId != -1) {
|
||||||
|
parentController.fileInfos[parentId]['size'] -= size;
|
||||||
|
reduceAncestorFolderSizeR(parentId, size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int addDescendantFolderSizeR(int id) {
|
||||||
|
if (parentController.fileInfos[id]['type'] == 'folder') {
|
||||||
|
for (var childId in parentController.fileInfos[id]['children']) {
|
||||||
|
parentController.fileInfos[id]['size'] +=
|
||||||
|
addDescendantFolderSizeR(childId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return parentController.fileInfos[id]['size'];
|
||||||
|
}
|
||||||
|
|
||||||
|
void addAncestorFolderSizeR(int id, int size) {
|
||||||
|
int parentId = parentController.fileInfos[id]['parentId'];
|
||||||
|
if (parentId != -1) {
|
||||||
|
parentController.fileInfos[parentId]['size'] += size;
|
||||||
|
addAncestorFolderSizeR(parentId, size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<fluent.TreeViewItem> buildTreeViewItemsR(int level, int parentId) {
|
||||||
List<fluent.TreeViewItem> res = [];
|
List<fluent.TreeViewItem> res = [];
|
||||||
List children = fileInfos
|
List children = parentController.fileInfos
|
||||||
.where((e) => e['level'] == level && e['parentId'] == parentId)
|
.where((e) => e['level'] == level && e['parentId'] == parentId)
|
||||||
.toList();
|
.toList();
|
||||||
for (int j = 0; j < children.length; j++) {
|
for (int j = 0; j < children.length; j++) {
|
||||||
Map fileInfo = children[j];
|
Map fileInfo = children[j];
|
||||||
|
|
||||||
if (fileInfo['type'] == 'folder') {
|
if (fileInfo['type'] == 'folder') {
|
||||||
// folder
|
// folder
|
||||||
res.add(fluent.TreeViewItem(
|
res.add(fluent.TreeViewItem(
|
||||||
// expanded: false, bug on init
|
// expanded: false, bug on init
|
||||||
// value: fileInfo['id'],
|
value: fileInfo['id'],
|
||||||
onInvoked: (item, reason) async {
|
onInvoked: (item, reason) async {
|
||||||
debugPrint('onItemInvoked(reason=$reason): $item');
|
if (reason == fluent.TreeViewItemInvokeReason.selectionToggle) {
|
||||||
if (reason.toString() ==
|
List childrenIds = findChildFileIdsR(fileInfo['children']);
|
||||||
'TreeViewItemInvokeReason.selectionToggle') {
|
|
||||||
List childrenIds =
|
|
||||||
findChildFileIdsRecursive(fileInfo['children']);
|
|
||||||
if (item.selected == true) {
|
if (item.selected == true) {
|
||||||
parentController.selectedIndexes.addAll(childrenIds);
|
parentController.selectedIndexes.addAll(childrenIds);
|
||||||
|
parentController.fileInfos[fileInfo['id']]['size'] = 0;
|
||||||
|
addDescendantFolderSizeR(item.value);
|
||||||
|
addAncestorFolderSizeR(item.value, fileInfo['size']);
|
||||||
|
parentController.fileInfos.refresh();
|
||||||
} else {
|
} else {
|
||||||
parentController.selectedIndexes
|
parentController.selectedIndexes
|
||||||
.removeWhere((index) => childrenIds.contains(index));
|
.removeWhere((index) => childrenIds.contains(index));
|
||||||
|
reduceAncestorFolderSizeR(item.value, fileInfo['size']);
|
||||||
|
clearDescendantFolderSizeR(item.value);
|
||||||
|
|
||||||
|
parentController.fileInfos.refresh();
|
||||||
}
|
}
|
||||||
debugPrint('${parentController.selectedIndexes.cast<int>()}');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
leading:
|
leading: Obx(() {
|
||||||
// parentController.openedFolders.contains(fileInfo['id'])
|
return parentController.openedFolders.contains(fileInfo['id'])
|
||||||
// ? const Icon(FaIcons.folder)
|
? const Icon(FaIcons.folder_open,
|
||||||
// : const Icon(FaIcons.folder_open),
|
color: Colors.lightBlueAccent)
|
||||||
const Icon(FaIcons.folder),
|
: const Icon(FaIcons.folder, color: Colors.lightBlueAccent);
|
||||||
|
}),
|
||||||
|
onExpandToggle: (fluent.TreeViewItem item, bool getExpanded) async {
|
||||||
|
getExpanded
|
||||||
|
? parentController.openedFolders.add(item.value)
|
||||||
|
: parentController.openedFolders.remove(item.value);
|
||||||
|
},
|
||||||
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
fileInfo['name'],
|
fileInfo['name'],
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
// style: context.textTheme.titleSmall,
|
// style: context.textTheme.titleSmall,
|
||||||
)),
|
),
|
||||||
|
),
|
||||||
|
Obx(() {
|
||||||
|
return parentController.fileInfos[fileInfo['id']]['size'] != 0
|
||||||
|
? Text(
|
||||||
|
Util.fmtByte(
|
||||||
|
parentController.fileInfos[fileInfo['id']]['size']),
|
||||||
|
// style: context.textTheme.labelMedium,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
)
|
||||||
|
: const SizedBox.shrink();
|
||||||
|
})
|
||||||
]),
|
]),
|
||||||
// onExpandToggle: (fluent.TreeViewItem item, bool getExpanded) async {
|
children: buildTreeViewItemsR(
|
||||||
// getExpanded
|
// parentController.fileInfos.where((e) => e['level'] > level).toList(),
|
||||||
// ? parentController.openedFolders.add(item.value)
|
|
||||||
// : parentController.openedFolders.remove(item.value);
|
|
||||||
// },
|
|
||||||
children: buildTreeViewItemsRecursive(
|
|
||||||
// fileInfos.where((e) => e['level'] > level).toList(),
|
|
||||||
level + 1,
|
level + 1,
|
||||||
fileInfo['id'])));
|
fileInfo['id'])));
|
||||||
} else {
|
} else {
|
||||||
// file
|
// file
|
||||||
// if (fileInfo['selected']) {
|
|
||||||
// parentController.selectedIndexs.add(fileInfo['fileId']);
|
|
||||||
// }
|
|
||||||
res.add(fluent.TreeViewItem(
|
res.add(fluent.TreeViewItem(
|
||||||
value: fileInfo['fileId'],
|
value: {'id': fileInfo['id'], 'fileId': fileInfo['fileId']},
|
||||||
selected: fileInfo['selected'],
|
selected: fileInfo['selected'],
|
||||||
onInvoked: (item, reason) async => {
|
onInvoked: (item, reason) async {
|
||||||
debugPrint('onItemInvoked(reason=$reason): $item'),
|
if (reason == fluent.TreeViewItemInvokeReason.selectionToggle) {
|
||||||
reason.toString() == 'TreeViewItemInvokeReason.selectionToggle'
|
if (item.selected == true) {
|
||||||
? item.selected == false
|
parentController.selectedIndexes.add(item.value['fileId']);
|
||||||
? parentController.selectedIndexes.remove(item.value)
|
addAncestorFolderSizeR(item.value['id'], fileInfo['size']);
|
||||||
: parentController.selectedIndexes.add(item.value)
|
parentController.fileInfos.refresh();
|
||||||
: null,
|
} else {
|
||||||
debugPrint('${parentController.selectedIndexes.cast<int>()}')
|
parentController.selectedIndexes.remove(item.value['fileId']);
|
||||||
|
reduceAncestorFolderSizeR(item.value['id'], fileInfo['size']);
|
||||||
|
parentController.fileInfos.refresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
collapsable: false,
|
collapsable: false,
|
||||||
leading: fileInfo['name'].lastIndexOf('.') == -1
|
leading: fileInfo['name'].lastIndexOf('.') == -1
|
||||||
? const Icon(FaIcons.file)
|
? Icon(
|
||||||
: Icon(FaIcons.allIcons[findIcon(fileInfo['name'])]),
|
FaIcons.doc,
|
||||||
|
color: appController.downloaderConfig.value.extra.themeMode ==
|
||||||
|
'dark'
|
||||||
|
? Colors.white
|
||||||
|
: Colors.black45,
|
||||||
|
)
|
||||||
|
: Icon(
|
||||||
|
FaIcons.allIcons[findIcon(fileInfo['name'])],
|
||||||
|
color: appController.downloaderConfig.value.extra.themeMode ==
|
||||||
|
'dark'
|
||||||
|
? Colors.white
|
||||||
|
: Colors.black45,
|
||||||
|
),
|
||||||
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
content: Row(mainAxisAlignment: MainAxisAlignment.end, children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
child: Text(
|
child: Text(
|
||||||
@@ -119,41 +187,45 @@ class FileListView extends GetView {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
List<fluent.TreeViewItem> items(files) {
|
List<fluent.TreeViewItem> get items {
|
||||||
List infos = [];
|
List infos = [];
|
||||||
int idNext = 0;
|
int idNext = 0;
|
||||||
List selectedFileIds = [];
|
List selectedFileIds = [];
|
||||||
// List openedFolders = [];
|
List openedFolders = [];
|
||||||
//make fileInfos list
|
//make fileInfos list
|
||||||
for (var i = 0; i < files.length; i++) {
|
for (var i = 0; i < files.length; i++) {
|
||||||
//parentId -1 means path root
|
//parentId -1 means path root
|
||||||
int parentId = -1;
|
int parentId = -1;
|
||||||
List folders = path.split(files[i].path);
|
List folders = path.split(files[i].path);
|
||||||
for (var folder in folders) {
|
for (var folder in folders) {
|
||||||
int indexInfileInfos = infos.lastIndexWhere((fileInfo) =>
|
int indexInInfos = infos.lastIndexWhere((fileInfo) =>
|
||||||
fileInfo['name'] == folder && fileInfo['parentId'] == parentId);
|
fileInfo['name'] == folder && fileInfo['parentId'] == parentId);
|
||||||
//TODO calculate folder size
|
|
||||||
if (indexInfileInfos != -1) {
|
if (indexInInfos != -1) {
|
||||||
// folder exists
|
// folder exists
|
||||||
parentId = infos[indexInfileInfos]['id'];
|
parentId = infos[indexInInfos]['id'];
|
||||||
|
// add size
|
||||||
|
infos[indexInInfos]['size'] += files[i].size;
|
||||||
} else {
|
} else {
|
||||||
// parent not exist
|
// parent not exist
|
||||||
// create one and add index to parent's children
|
// create one and add index to parent's children
|
||||||
infos.add({
|
infos.add({
|
||||||
|
'level': folders.indexOf(folder),
|
||||||
'id': idNext,
|
'id': idNext,
|
||||||
'type': 'folder',
|
'type': 'folder',
|
||||||
'name': folder,
|
'name': folder,
|
||||||
|
'size': files[i].size,
|
||||||
'parentId': parentId,
|
'parentId': parentId,
|
||||||
'level': folders.indexOf(folder),
|
|
||||||
'children': [],
|
'children': [],
|
||||||
});
|
});
|
||||||
|
openedFolders.add(idNext);
|
||||||
if (parentId != -1) {
|
if (parentId != -1) {
|
||||||
infos[parentId]['children'].add(idNext);
|
infos[parentId]['children'].add(idNext);
|
||||||
}
|
}
|
||||||
// openedFolders.add(idNext);
|
|
||||||
parentId = idNext;
|
parentId = idNext;
|
||||||
idNext++;
|
idNext++;
|
||||||
}
|
}
|
||||||
@@ -176,22 +248,19 @@ class FileListView extends GetView {
|
|||||||
}
|
}
|
||||||
idNext++;
|
idNext++;
|
||||||
}
|
}
|
||||||
fileInfos = infos;
|
parentController.fileInfos.value = infos;
|
||||||
parentController.selectedIndexes.value = selectedFileIds;
|
parentController.selectedIndexes.value = selectedFileIds;
|
||||||
// parentController.openedFolders.value = openedFolders;
|
parentController.openedFolders.value = openedFolders;
|
||||||
List<fluent.TreeViewItem> treeItems = buildTreeViewItemsRecursive(0, -1);
|
List<fluent.TreeViewItem> treeItems = buildTreeViewItemsR(0, -1);
|
||||||
return treeItems;
|
return treeItems;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final files = parentController.files;
|
|
||||||
return fluent.FluentTheme(
|
return fluent.FluentTheme(
|
||||||
data:
|
data: appController.downloaderConfig.value.extra.themeMode == 'dark'
|
||||||
Get.find<AppController>().downloaderConfig.value.extra.themeMode ==
|
? fluent.ThemeData(brightness: Brightness.dark)
|
||||||
'dark'
|
: fluent.ThemeData(brightness: Brightness.light),
|
||||||
? fluent.ThemeData(brightness: Brightness.dark)
|
|
||||||
: fluent.ThemeData(brightness: Brightness.light),
|
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
@@ -207,9 +276,11 @@ class FileListView extends GetView {
|
|||||||
border: Border.all(color: Colors.grey, width: 1),
|
border: Border.all(color: Colors.grey, width: 1),
|
||||||
borderRadius: BorderRadius.circular(5)),
|
borderRadius: BorderRadius.circular(5)),
|
||||||
child: fluent.TreeView(
|
child: fluent.TreeView(
|
||||||
|
selectionMode: fluent.TreeViewSelectionMode.multiple,
|
||||||
shrinkWrap: false,
|
shrinkWrap: false,
|
||||||
// addRepaintBoundaries: false,
|
// addRepaintBoundaries: false,
|
||||||
// usePrototypeItem: true,
|
usePrototypeItem: true,
|
||||||
|
// cacheExtent: 20,
|
||||||
// onItemInvoked: (item, reason) async => {},
|
// onItemInvoked: (item, reason) async => {},
|
||||||
onSecondaryTap: (item, details) async {
|
onSecondaryTap: (item, details) async {
|
||||||
debugPrint(
|
debugPrint(
|
||||||
@@ -217,11 +288,8 @@ class FileListView extends GetView {
|
|||||||
},
|
},
|
||||||
// onSelectionChanged: (selectedItems) async => {},
|
// onSelectionChanged: (selectedItems) async => {},
|
||||||
narrowSpacing: true,
|
narrowSpacing: true,
|
||||||
// cacheExtent: 2000,
|
items: items,
|
||||||
items: items(files),
|
|
||||||
// itemExtent: fileInfos.length.toDouble(),
|
|
||||||
// scrollPrimary: true,
|
// scrollPrimary: true,
|
||||||
selectionMode: fluent.TreeViewSelectionMode.multiple,
|
|
||||||
))),
|
))),
|
||||||
],
|
],
|
||||||
));
|
));
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
findIcon(String filename) {
|
findIcon(String filename) {
|
||||||
String res = 'file';
|
String res = 'doc';
|
||||||
String ext = filename.substring(filename.lastIndexOf('.') + 1);
|
String ext = filename.substring(filename.lastIndexOf('.') + 1);
|
||||||
for (var iconMap in iconMaps) {
|
for (var iconMap in iconMaps) {
|
||||||
if (iconMap['extensions'].contains(ext)) {
|
if (iconMap['extensions'].contains(ext)) {
|
||||||
|
|||||||
+2072
-3739
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user