core/oc-front
6
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
mr 2025-06-13 13:33:24 +02:00
parent c4ea1541c4
commit ab593a45b9
26 changed files with 219 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/core/sections/header/header.dart
View File

@ -42,14 +42,14 @@ class HeaderConstants {
static setTitle(String? v) {
title = v;
Future.delayed(Duration(milliseconds: 100), () {
Future.delayed(const Duration(milliseconds: 100), () {
HeaderConstants.headerWidget?.setState(() {});
});
}
static setDescription(String? v) {
description = v;
Future.delayed(Duration(milliseconds: 100), () {
Future.delayed(const Duration(milliseconds: 100), () {
HeaderConstants.headerWidget?.setState(() {});
});
}
@ -70,7 +70,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
return Container();
}
if (AppRouter.currentRoute.factory.searchFill()) {
return DefaultWidget();
return const DefaultWidget();
}
HeaderConstants.height = HeaderConstants.isNoHeader(AppRouter.currentRoute.route) || !AppRouter.currentRoute.factory.searchFill() ? 50 : 100;
return Column( children: [
@ -78,7 +78,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
height: 50, width: getMainWidth(context),
decoration: BoxDecoration(
color: midColor,
border: Border(bottom: BorderSide(color: Colors.white, width: 1),)
border: const Border(bottom: BorderSide(color: Colors.white, width: 1),)
),
child: Row(crossAxisAlignment: CrossAxisAlignment.stretch,
mainAxisAlignment: MainAxisAlignment.end,
@ -89,7 +89,7 @@ class HeaderWidgetState extends State<HeaderWidget> {
child:
Container(width: 50, height: 50,
color: Colors.black,
child: Center(child: Icon(Icons.keyboard_backspace, color: Colors.white))
child: const Center(child: Icon(Icons.keyboard_backspace, color: Colors.white))
),
),
ShallowTextInputWidget(
@ -112,10 +112,10 @@ class HeaderWidgetState extends State<HeaderWidget> {
AppRouter.currentRoute.factory.search(context, true);
} : null,
),
Container( padding: EdgeInsets.only(left: 50),
decoration: BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))),
Container( padding: const EdgeInsets.only(left: 50),
decoration: const BoxDecoration( border: Border( left: BorderSide( color: Colors.white ))),
child: ShallowDropdownInputWidget(
prefixIcon: Padding( padding: EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey)),
prefixIcon: const Padding( padding: EdgeInsets.only(right: 10), child: Icon(Icons.shopping_cart, color: Colors.grey)),
current: WorkspaceLocal.current,
width: 350,
all: () async => WorkspaceLocal.getWorkspacesShallow(),

2
lib/core/services/auth.service.dart
View File

@ -101,7 +101,7 @@ class AuthService {
'expiresIn',
DateTime.now()
.add(Duration(seconds: token.data?.value['expires_in']) -
Duration(seconds: 10))
const Duration(seconds: 10))
.toIso8601String());
}
});

3
lib/core/services/router.dart
View File

@ -17,7 +17,7 @@ import 'package:go_router/go_router.dart';
GlobalKey<RouterWidgetState> routerKey = GlobalKey<RouterWidgetState>();
class RouterWidget extends StatefulWidget {
const RouterWidget({Key? key}) : super(key: key);
const RouterWidget({super.key});
@override RouterWidgetState createState() => RouterWidgetState();
}
@ -94,7 +94,6 @@ class AppRouter {
var url = await getRouteCookie();
if (url != null && url != "") {
for (var zone in zones) {
print("URL: $url ${zone.route}");
if (zone.route == url.replaceAll("/", "")) {
Map<String, String> params = {};
var srcParams = await getRouteParamsCookie();

3
lib/models/logs.dart
View File

@ -72,7 +72,6 @@ class Log extends SerializerDeserializer<Log> {
String getMessage(String mess) {
var jsonString = mess;
print(mess);
try {
var j = JsonString(mess.replaceAll("\\", "")).decodedValue as Map<String, dynamic>;
map = j;
@ -81,7 +80,7 @@ class Log extends SerializerDeserializer<Log> {
} else {
jsonString = "${j["Name"]} : [${j["Namespace"]}] ${j["Status"]} ${j["Progress"]} (${j["Duration"].toString()})\nCreated at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}; Started at ${j["Created"].toString().replaceAllMapped(RegExp(r'\(\w+\)'), (match) { return ''; }).replaceAllMapped(RegExp(r'\+\w+'), (match) { return ''; })}";
}
} on JsonFormatException catch (e) { /* */ }
} on JsonFormatException catch (_) { /* */ }
message = jsonString;
return jsonString;
}

2
lib/models/workflow.dart
View File

@ -334,7 +334,7 @@ class Graph extends SerializerDeserializer<Graph> {
}
// should find arrow env info and add it to the env
List<Param> extParams = [];
var arrows = links.where( (e) => (e.source?.id?.contains(item.id ?? "") ?? false) || (e.destination?.id?.contains(item.id ?? "") ?? false));
// var arrows = links.where( (e) => (e.source?.id?.contains(item.id ?? "") ?? false) || (e.destination?.id?.contains(item.id ?? "") ?? false));
/*for (var arrow in arrows) {
for (var info in arrow.infos) {
var i = info as Map<String, dynamic>;

6
lib/pages/datacenter.dart
View File

@ -1,7 +1,6 @@
import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
import 'package:oc_front/core/services/specialized_services/booking_service.dart';
import 'package:oc_front/main.dart';
import 'package:intl/intl.dart' as intl;
import 'package:oc_front/pages/abstract_page.dart';
@ -22,7 +21,6 @@ class ComputePageWidget extends StatefulWidget {
bool isList = true;
DateTime start = DateTime.now();
DateTime end = DateTime.now().add(const Duration(days: 180));
final BookingExecutionService _service = BookingExecutionService();
ComputePageWidget () : super(key: DatacenterFactory.key);
@override ComputePageWidgetState createState() => ComputePageWidgetState();
@ -66,7 +64,7 @@ class ComputePageWidgetState extends State<ComputePageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),
@ -124,7 +122,7 @@ class ComputePageWidgetState extends State<ComputePageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),

9
lib/pages/map.dart
View File

@ -6,7 +6,6 @@ import 'package:go_router/go_router.dart';
import 'package:latlong2/latlong.dart';
import 'package:flutter_map/flutter_map.dart';
import 'package:oc_front/core/services/specialized_services/datacenter_service.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/models/resources/compute.dart';
import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/resources/storage.dart';
@ -24,6 +23,7 @@ class MapFactory implements AbstractFactory {
@override void search(BuildContext context, bool special) { }
}
double menuSize = 0;
// ignore: must_be_immutable
class MapPageWidget extends StatefulWidget {
bool isShowed = false;
final DatacenterService _service = DatacenterService();
@ -77,8 +77,6 @@ class MapPageWidgetState extends State<MapPageWidget> {
));
}
}
Rect rect = Rect.fromCenter( center: MediaQuery.of(context).size.center(Offset.zero),
width: selected ? menuSize : 0, height: (getMainHeight(context) - 50) > 0 ? (getMainHeight(context) - 50) : 0);
return Expanded(
child : FlutterMap(
mapController: _mapController,
@ -113,6 +111,7 @@ class HoverMenuController {
}
}
// ignore: must_be_immutable
class HoverMenu extends StatefulWidget {
final Widget title;
final double? width;
@ -122,12 +121,12 @@ class HoverMenu extends StatefulWidget {
HoverMenu({
Key? key,
super.key,
required this.title,
this.items = const [],
this.width,
this.controller,
}) : super(key: key);
});
@override
HoverMenuState createState() => HoverMenuState();

6
lib/pages/scheduler.dart
View File

@ -2,7 +2,6 @@ import 'package:datetime_picker_formfield/datetime_picker_formfield.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart' as intl;
import 'package:go_router/go_router.dart';
import 'package:oc_front/core/services/specialized_services/workflow_execution_service.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/pages/abstract_page.dart';
import 'package:oc_front/widgets/sheduler_items/schedule.dart';
@ -22,7 +21,6 @@ class SchedulerPageWidget extends StatefulWidget {
bool isList = true;
DateTime start = DateTime.now();
DateTime end = DateTime.now().add(const Duration(days: 180));
final WorkflowExecutionService _service = WorkflowExecutionService();
SchedulerPageWidget(): super(key: SchedulerFactory.key);
@override SchedulerPageWidgetState createState() => SchedulerPageWidgetState();
static void search(BuildContext context) { }
@ -62,7 +60,7 @@ class SchedulerPageWidgetState extends State<SchedulerPageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),
@ -120,7 +118,7 @@ class SchedulerPageWidgetState extends State<SchedulerPageWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),

1
lib/widgets/catalog.dart
View File

@ -4,6 +4,7 @@ import 'package:oc_front/widgets/items/item_row.dart';
import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/core/models/workspace_local.dart';
// ignore: must_be_immutable
class CatalogWidget extends StatefulWidget {
double? itemWidth;
bool readOnly = false;

14
lib/widgets/forms/scheduler_forms.dart
View File

@ -252,7 +252,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),
@ -353,7 +353,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),
@ -391,7 +391,7 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
cardTheme: CardTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
dialogTheme: DialogTheme(elevation: 0, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(0))),
colorScheme: ColorScheme.light(
background: midColor,
surface: midColor,
tertiary: Colors.grey,
secondary: Colors.grey,
primary: Colors.black),
@ -470,15 +470,15 @@ class SchedulerFormsWidgetState extends State<SchedulerFormsWidget> {
filled: true,
hintText: "enter cron command...",
labelText: "cron",
errorStyle: TextStyle(height: 0),
hintStyle: TextStyle(fontSize: 10),
labelStyle: TextStyle(fontSize: 10),
errorStyle: const TextStyle(height: 0),
hintStyle: const TextStyle(fontSize: 10),
labelStyle: const TextStyle(fontSize: 10),
focusedErrorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
errorBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
focusedBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.black)),
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)),
border: OutlineInputBorder(borderSide: BorderSide(color: widget.errorCron != null ? Colors.red : Colors.grey)),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
contentPadding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
),
))),
Container(

22
lib/widgets/forms/sub_expose_forms.dart
View File

@ -18,28 +18,6 @@ class SubExposeFormsWidget extends StatefulWidget {
}
class SubExposeFormsWidgetState extends State<SubExposeFormsWidget> {
@override Widget build(BuildContext context) {
print("qsfqs");
try {
var w = SubTextInputWidget(subkey: "reference port", readOnly: widget.readOnly,
initialValue: widget.item.port != null ? '${widget.item.port}' : null,
width: widget.width,
empty: widget.empty,
change: (value) {
try {
widget.item.port = int.parse(value);
Future.delayed(const Duration(seconds: 2), () {
if (widget.item.port == int.parse(value) && int.parse(value) != 0) {
widget.dash.saveDash(widget.dash.id, context);
}
});
} catch (e) { widget.item.port = null; }
var el = widget.dash.getElement(widget.elementID);
el!.element = widget.item as dynamic;
});
} catch (e,s) {
print(e);
print(s);
}
return Column( children : [
Container( margin: const EdgeInsets.only(left: 10, right: 10, top: 15),
decoration: const BoxDecoration(border: Border( top: BorderSide(color: Colors.grey, width: 1))),

5
lib/widgets/inputs/shallow_dropdown_input.dart
View File

@ -3,6 +3,7 @@ import 'package:oc_front/main.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/pages/shared.dart';
// ignore: must_be_immutable
class ShallowDropdownInputWidget extends StatefulWidget {
double? width;
double? height;
@ -30,10 +31,10 @@ class ShallowDropdownInputWidget extends StatefulWidget {
bool deletion = false;
ShallowDropdownInputWidget ({ Key? key, this.width, this.current, required this.all, this.prefixIcon,
ShallowDropdownInputWidget ({ super.key, this.width, this.current, required this.all, this.prefixIcon,
this.iconLoad, this.iconRemove, this.hint, this.filled, this.hintColor, this.color, this.height,
this.tooltipLoad, this.tooltipRemove, this.deletion = false, this.maptoDropdown, this.label,
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change }): super(key: key);
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change });
@override ShallowDropdownInputWidgetState createState() => ShallowDropdownInputWidgetState();
}
class ShallowDropdownInputWidgetState extends State<ShallowDropdownInputWidget> {

5
lib/widgets/inputs/shallow_text_input.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/pages/shared.dart';
// ignore: must_be_immutable
class ShallowTextInputWidget extends StatefulWidget {
double? width;
CollaborativeAreaType type = CollaborativeAreaType.workspace;
@ -31,11 +32,11 @@ class ShallowTextInputWidget extends StatefulWidget {
String? attr;
ShallowTextInputWidget ({ Key? key, this.width, this.current, this.attr, this.readOnly = false, this.alignment = MainAxisAlignment.start,
ShallowTextInputWidget ({ super.key, this.width, this.current, this.attr, this.readOnly = false, this.alignment = MainAxisAlignment.start,
this.iconLoad, this.iconRemove, this.hint, this.forms = const [], this.loadStr,
this.tooltipLoad = "", this.tooltipRemove = "",
this.filled, this.hintColor, this.color,
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change }): super(key: key);
required this.type, this.canLoad, this.canRemove, this.load, this.remove, this.change });
@override ShallowTextInputWidgetState createState() => ShallowTextInputWidgetState();
Map<String, dynamic> serialize() {

1
lib/widgets/inputs/sub_dropdown_input .dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
// ignore: must_be_immutable
class SubDropdownInputWidget extends StatefulWidget {
String subkey;
double width;

36
lib/widgets/items/item.dart
View File

@ -4,7 +4,6 @@ import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/pages/shared.dart';
import 'package:oc_front/widgets/inputs/shallow_dropdown_input.dart';
import 'package:oc_front/widgets/inputs/sub_dropdown_input%20.dart';
// ignore: must_be_immutable
class ItemWidget extends StatefulWidget {
@ -15,25 +14,26 @@ class ItemWidget extends StatefulWidget {
class ItemWidgetState extends State<ItemWidget> {
@override Widget build(BuildContext context) {
List<Widget> widgets = [
Container( margin: EdgeInsets.only(bottom: 20),
Container( margin: const EdgeInsets.only(bottom: 20),
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: midColor))),
width: getMainWidth(context) / 2,
child: Center(child: Padding( padding: EdgeInsets.only(bottom: 20),
child: const Center(child: Padding( padding: EdgeInsets.only(bottom: 20),
child: Text("RESOURCE INFORMATIONS", style: TextStyle(fontSize: 18, color: Colors.grey, fontWeight: FontWeight.w500)))))
];
var infos = widget.item.infos();
var count = 0;
for (var info in infos.keys) {
count++;
widgets.add(Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :", style: TextStyle(fontSize: 15, color: Colors.grey))),
widgets.add(Padding( padding: const EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: const EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :",
style: const TextStyle(fontSize: 15, color: Colors.grey))),
Text("${infos[info] is bool ? (infos[info] == true ? "yes" : "no") : infos[info] ?? "unknown"}",
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
style: const TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
])));
}
if (count == 0 ) {
widgets.add(Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
widgets.add(const Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("NO INFORMATION", style: TextStyle(fontSize: 15, color: Colors.grey))),
]))));
}
@ -43,7 +43,7 @@ class ItemWidgetState extends State<ItemWidget> {
dpItems.add(Shallow(id: "$i", name: instance.name ?? ""));
}
if (dpItems.isNotEmpty) {
widgetsInstance.add(Center( child: Padding(padding: EdgeInsets.only(bottom: 15), child:
widgetsInstance.add(Center( child: Padding(padding: const EdgeInsets.only(bottom: 15), child:
ShallowDropdownInputWidget( all: () async => dpItems, width: (getWidth(context) / 2) - 25,
label: "instances", type: CollaborativeAreaType.resource, height: 65,
current: "${widget.item.selectedInstance}", change: (value) {
@ -54,21 +54,27 @@ class ItemWidgetState extends State<ItemWidget> {
}
if (widget.item.instances.length > widget.item.selectedInstance) {
var instance = widget.item.instances[widget.item.selectedInstance];
widgetsInstance.add(Container(height: 20, width: getWidth(context) / 2,));
widgetsInstance.add(SizedBox(height: 20, width: getWidth(context) / 2,));
var count = 0;
for (var info in instance.infos().keys) {
if (instance.infos()[info] == null || instance.infos()[info] is List || instance.infos()[info] is Map) { continue; }
count++;
widgetsInstance.add(Center(child: Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("${info.toUpperCase().replaceAll("_", " ")} :", style: TextStyle(fontSize: 15, color: Colors.grey))),
widgetsInstance.add(Center(child: Padding( padding: const EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: const EdgeInsets.only(left: 50, right: 10),
child : Text("${info.toUpperCase().replaceAll("_", " ")} :",
style: const TextStyle(fontSize: 15, color: Colors.grey))),
Text("${instance.infos()[info] is bool ? (instance.infos()[info] == true ? "yes" : "no") : instance.infos()[info] ?? "unknown"}",
overflow: TextOverflow.ellipsis,
style: TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
style: const TextStyle(fontSize: 15, color: Colors.black, fontWeight: FontWeight.w500))
]))));
}
if (count == 0 ) {
widgetsInstance.add(Padding( padding: EdgeInsets.symmetric(vertical: 5), child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10), child : Text("NO INSTANCE INFORMATION", style: TextStyle(fontSize: 15, color: Colors.grey))),
widgetsInstance.add(const Padding(
padding: EdgeInsets.symmetric(vertical: 5),
child : Row(children: [
Padding( padding: EdgeInsets.only(left: 50, right: 10),
child : Text("NO INSTANCE INFORMATION",
style: TextStyle(fontSize: 15, color: Colors.grey))),
])));
}
}
@ -87,7 +93,7 @@ class ItemWidgetState extends State<ItemWidget> {
border: Border(bottom: BorderSide(color: midColor))),
padding: const EdgeInsets.symmetric(vertical: 30, horizontal: 50),
child: Text(widget.item.description!.length > 350 ? "${widget.item.description!.substring(0, 347)}..." : widget.item.description!,
style: TextStyle(fontSize: 15, color: Colors.grey, fontWeight: FontWeight.w500))),
style: const TextStyle(fontSize: 15, color: Colors.grey, fontWeight: FontWeight.w500))),
Row( children: [
Container(padding: const EdgeInsets.symmetric(vertical: 20),
height: getHeight(context) - 300,

63
lib/widgets/items/shallow_item_row.dart
View File

@ -1,5 +1,3 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:oc_front/main.dart';
@ -43,7 +41,7 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
child: Row( children: [
Padding( padding: const EdgeInsets.only(right: 5),
child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.edit!(widget.item.getID() + "~" + widget.item.getName()), child: const Icon(Icons.edit, color: Colors.grey,))),
onTap: () => widget.edit!( "${widget.item.getID()}~${widget.item.getName()}"), child: const Icon(Icons.edit, color: Colors.grey,))),
Padding( padding: const EdgeInsets.only(right: 5),
child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))),
@ -52,21 +50,19 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
Column( children: [
widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10),
constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth),
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xFFF67C0B9),)),
Container(
child: Padding(padding: widget.contextWidth != getMainWidth(context) ?
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
child: Column(crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, children: [
Row( children: [
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
style: const TextStyle(fontSize: 15,
overflow: TextOverflow.ellipsis,
fontWeight: FontWeight.w600, color: Colors.grey)),
))
]),
],)
)
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xfff67c0b9),)),
Padding(padding: widget.contextWidth != getMainWidth(context) ?
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
child: Column(crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, children: [
Row( children: [
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
style: const TextStyle(fontSize: 15,
overflow: TextOverflow.ellipsis,
fontWeight: FontWeight.w600, color: Colors.grey)),
))
]),
],)
),
])
]))));
@ -76,6 +72,7 @@ class ShallowItemRowWidgetState extends State<ShallowItemRowWidget> {
}
}
// ignore: must_be_immutable
class ShallowItemFlowDataRowWidget extends StatefulWidget {
bool readOnly = false;
double contextWidth = 0;
@ -114,7 +111,7 @@ class ShallowItemFlowDataRowWidgetState extends State<ShallowItemFlowDataRowWidg
child: Row( children: [
Padding( padding: const EdgeInsets.only(right: 5),
child: widget.edit == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.edit!(widget.item.getID() + "~" + widget.item.getName()), child: const Icon(Icons.edit, color: Colors.grey,))),
onTap: () => widget.edit!("${widget.item.getID()}~${widget.item.getName()}"), child: const Icon(Icons.edit, color: Colors.grey,))),
Padding( padding: const EdgeInsets.only(right: 5),
child: widget.delete == null ? Container() : InkWell( mouseCursor: SystemMouseCursors.click,
onTap: () => widget.delete!(widget.item.getID()), child: const Icon(Icons.delete, color: Colors.grey,))),
@ -126,21 +123,19 @@ class ShallowItemFlowDataRowWidgetState extends State<ShallowItemFlowDataRowWidg
Column( children: [
widget.low || widget.icon == null ? Container( padding: const EdgeInsets.only(left: 10),) : Container( padding: const EdgeInsets.all(10),
constraints: BoxConstraints(maxWidth: widget.contextWidth, minWidth: widget.contextWidth),
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xFFF67C0B9),)),
Container(
child: Padding(padding: widget.contextWidth != getMainWidth(context) ?
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
child: Column(crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, children: [
Row( children: [
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
style: const TextStyle(fontSize: 15,
overflow: TextOverflow.ellipsis,
fontWeight: FontWeight.w600, color: Colors.grey)),
))
]),
],)
)
child: Icon( widget.icon!, size: widget.contextWidth / 1.9, color: const Color(0xfff67c0b9),)),
Padding(padding: widget.contextWidth != getMainWidth(context) ?
const EdgeInsets.symmetric(horizontal: 10) : const EdgeInsets.symmetric(horizontal: 20),
child: Column(crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center, children: [
Row( children: [
Expanded( child: Center( child: Text(widget.item.getName().toUpperCase(),
style: const TextStyle(fontSize: 15,
overflow: TextOverflow.ellipsis,
fontWeight: FontWeight.w600, color: Colors.grey)),
))
]),
],)
),
])
]))));

12
lib/widgets/logs.dart
View File

@ -10,12 +10,13 @@ import 'package:oc_front/core/services/specialized_services/logs_service.dart';
bool isLoading = true;
Map<String, bool> valid = {};
// ignore: must_be_immutable
class LogsWidget extends StatefulWidget {
String? level;
String search = "";
WorkflowExecution? exec;
List<Log> logs = [];
LogsWidget ({ Key? key, this.search = "", this.level, this.exec }): super(key: key);
LogsWidget ({ super.key, this.search = "", this.level, this.exec });
@override LogsWidgetState createState() => LogsWidgetState();
}
@ -73,12 +74,12 @@ class LogsWidgetState extends State<LogsWidget> {
List<LogWidget> itemRows = logs.where((element) => (element.message?.toLowerCase().contains(widget.search.toLowerCase()) ?? true)
&& (widget.level?.contains(element.level ?? "") ?? true) ).map((e) => LogWidget(item: e)).toList();
if (isLoading) {
return Container( height: getMainHeight(context) - 100,
child: Center( child: CircularProgressIndicator()) );
return SizedBox( height: getMainHeight(context) - 100,
child: const Center( child: CircularProgressIndicator()) );
}
return Stack( children: [
SingleChildScrollView( child: itemRows.isEmpty ?
Container( height: getMainHeight(context) - 100,
SizedBox( height: getMainHeight(context) - 100,
child: const Center( child: Text("no log registered", style: TextStyle(color: Colors.grey, fontSize: 25 ),)))
: Column( children: [...itemRows, Container(height: 50,) ] ) ),
]);
@ -88,10 +89,11 @@ class LogsWidgetState extends State<LogsWidget> {
}
}
// ignore: must_be_immutable
class LogWidget extends StatefulWidget {
final Log item;
bool expanded = false;
LogWidget ({ Key? key, required this.item }): super(key: key);
LogWidget ({ super.key, required this.item });
@override LogWidgetState createState() => LogWidgetState();
}
class LogWidgetState extends State<LogWidget> {

11
lib/widgets/sheduler_items/schedule.dart
View File

@ -44,7 +44,6 @@ class ScheduleWidgetState extends State<ScheduleWidget> {
"${widget.end.year}-${widget.end.month > 9 ? widget.end.month : "0${widget.end.month}"}-${widget.end.day > 9 ? widget.end.day : "0${widget.end.day}"}"], {}),
builder: (ctx, as) {
Map<String, List<WorkflowExecution>> data = {};
DateTime? firstDate;
if (as.hasData && as.data!.data != null) {
for (var element in as.data!.data!.executions) {
if (element.startDate == null) { continue; }
@ -211,11 +210,11 @@ class ScheduleWidgetState extends State<ScheduleWidget> {
borderSide: BorderSide(color: midColor, width: 0)),
),
items: [
DropdownMenuItem(value: "debug,warning,error,info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.grey), Text(" all", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "debug", child: Row( children: [ Container( width: 10, height: 15, color: Colors.blue), Text(" debug", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "warning", child: Row( children: [ Container( width: 10, height: 15, color: Colors.orange), Text(" warning", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "error", child: Row( children: [ Container( width: 10, height: 15, color: redColor), Text(" error", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.green), Text(" info", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "debug,warning,error,info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.grey), const Text(" all", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "debug", child: Row( children: [ Container( width: 10, height: 15, color: Colors.blue), const Text(" debug", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "warning", child: Row( children: [ Container( width: 10, height: 15, color: Colors.orange), const Text(" warning", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "error", child: Row( children: [ Container( width: 10, height: 15, color: redColor), const Text(" error", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
DropdownMenuItem(value: "info", child: Row( children: [ Container( width: 10, height: 15, color: Colors.green), const Text(" info", style: TextStyle(fontSize: 12, color: Colors.black)) ])),
],
onChanged: (value) {
setState(() {

1
lib/widgets/sheduler_items/scheduler_calendar.dart
View File

@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:oc_front/core/sections/header/header.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/models/workflow.dart';
import 'package:oc_front/widgets/sheduler_items/schedule.dart';

4
library/flutter_flow_chart/lib/src/dashboard.dart
View File

@ -371,7 +371,7 @@ class Dashboard extends ChangeNotifier {
bool noHistory = false;
void addToHistory() {
if (noHistory) {
Future.delayed(Duration(seconds: 2), () {
Future.delayed(const Duration(seconds: 2), () {
noHistory = false;
});
return;
@ -379,7 +379,7 @@ class Dashboard extends ChangeNotifier {
if (tempHistory.length >= 50) { tempHistory.removeAt(0); }
tempHistory.add(toMap());
history = tempHistory.map((e) => e).toList();
Future.delayed(Duration(seconds: 1), () {
Future.delayed(const Duration(seconds: 1), () {
chartMenuKey.currentState?.setState(() { });
});
}

152
library/flutter_flow_chart/lib/src/flow_chart.dart
View File

@ -26,6 +26,7 @@ abstract class FlowData {
FlowData deserialize(Map<String, dynamic> data);
}
// ignore: must_be_immutable
class FlowChart<T extends FlowData> extends StatefulWidget {
FlowChart({
required this.dashboard,
@ -60,7 +61,7 @@ class FlowChart<T extends FlowData> extends StatefulWidget {
this.menuExtension,
this.itemLeftBottomBadges,
this.itemrightTopBadges,
}) {}
});
final String? current;
final List<String> categories;
final double width;
@ -170,7 +171,7 @@ class FlowChart<T extends FlowData> extends StatefulWidget {
/// Trigger for the scale change
final void Function(double scale)? onScaleUpdate;
bool dashboardSelected = true;
@override
State<FlowChart> createState() => FlowChartState<T>();
}
@ -182,6 +183,7 @@ class HoverMenuController {
currentState?.hideSubMenu();
}
}
// ignore: must_be_immutable
class HoverMenu extends StatefulWidget {
final Widget title;
final double? width;
@ -191,12 +193,12 @@ class HoverMenu extends StatefulWidget {
HoverMenu({
Key? key,
super.key,
required this.title,
this.items = const [],
this.width,
this.controller,
}) : super(key: key);
});
@override
HoverMenuState createState() => HoverMenuState();
@ -324,6 +326,7 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
widget.dashboard.inDialog = true;
showDialog(
barrierDismissible: false,
// ignore: use_build_context_synchronously
context: context, builder: (context) {
return AlertDialog(
titlePadding: EdgeInsets.zero,
@ -364,63 +367,63 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
autofocus: true,
onKeyEvent: (event) {
bool change = false;
if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyDownEvent) {
print("CTRL true");
isCtrl = true;
}
if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyUpEvent) {
print("CTRL false");
isCtrl = false;
}
if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyZ) && isCtrl) {
widget.dashboard.back();
}
if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyY) && isCtrl) {
widget.dashboard.forward();
}
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.add) {
change = true;
for (var el in widget.dashboard.elementSelected) {
widget.dashboard.addElement(FlowElement<T>(
element: el.element as T,
dashboard: widget.dashboard,
id: const Uuid().v4(),
position: el.position + const Offset(100, 100),
size: el.size,
text: el.text,
widget: el.widget,
kind: el.kind,
handlers: el.handlers,
handlerSize: el.handlerSize,
), context);
}
}
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.delete) {
change = true;
widget.dashboard.removeElements((element) {
if (element.isSelected) {
widget.dashboard.arrows.removeWhere( (e) => e.toID.contains(element.id) || e.fromID.contains(element.id));
}
return element.isSelected;
}, context);
for (var arrow in widget.dashboard.arrowsSelected) {
for (var el in widget.dashboard.elements.where((element) => element.id == arrow.fromID.split("_")[0])) {
el.next.removeAt(int.parse(arrow.fromID.split("_")[1]));
if (widget.dashboardSelected) {
if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyDownEvent) {
isCtrl = true;
}
if (event.logicalKey == LogicalKeyboardKey.controlLeft && event is KeyUpEvent) {
isCtrl = false;
}
if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyZ) && isCtrl) {
widget.dashboard.back();
}
if ((event is KeyDownEvent || event.logicalKey == LogicalKeyboardKey.keyY) && isCtrl) {
widget.dashboard.forward();
}
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.add) {
change = true;
for (var el in widget.dashboard.elementSelected) {
widget.dashboard.addElement(FlowElement<T>(
element: el.element as T,
dashboard: widget.dashboard,
id: const Uuid().v4(),
position: el.position + const Offset(100, 100),
size: el.size,
text: el.text,
widget: el.widget,
kind: el.kind,
handlers: el.handlers,
handlerSize: el.handlerSize,
), context);
}
}
widget.dashboard.removeArrows( (el) => el.isSelected, context );
}
if (change) {
DrawingArrow.instance.notifyListeners();
widget.dashboard.chartKey.currentState?.setState(() { });
node.requestFocus();
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.delete) {
change = true;
widget.dashboard.removeElements((element) {
if (element.isSelected) {
widget.dashboard.arrows.removeWhere( (e) => e.toID.contains(element.id) || e.fromID.contains(element.id));
}
return element.isSelected;
}, context);
for (var arrow in widget.dashboard.arrowsSelected) {
for (var el in widget.dashboard.elements.where((element) => element.id == arrow.fromID.split("_")[0])) {
el.next.removeAt(int.parse(arrow.fromID.split("_")[1]));
}
}
widget.dashboard.removeArrows( (el) => el.isSelected, context );
}
if (change) {
DrawingArrow.instance.notifyListeners();
widget.dashboard.chartKey.currentState?.setState(() { });
node.requestFocus();
}
}
},
child: ClipRect(
child: Stack(
clipBehavior: Clip.none,
children: [
Stack(children: [
Stack(children: [
// Draw the grid
DragTarget<T>(
builder: (
@ -428,7 +431,15 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
List<dynamic> accepted,
List<dynamic> rejected,
) {
return SizedBox(
return MouseRegion(
onEnter: (ev) {
print("sqfdsfd");
widget.dashboardSelected = true;
},
onExit: (ev) {
widget.dashboardSelected = false;
},
child: SizedBox(
width: widget.width,
height: widget.height,
child: ChartWidget<T>(
@ -449,7 +460,7 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
onHandlerPressed: widget.onHandlerLongPressed,
onHandlerLongPressed: widget.onHandlerLongPressed,
onPivotSecondaryPressed: widget.onPivotSecondaryPressed,
));
)));
},
onAcceptWithDetails: (DragTargetDetails<T> details) {
var e = details.data;
@ -479,24 +490,24 @@ class FlowChartState<T extends FlowData> extends State<FlowChart> {
);
widget.dashboard.addElement(el, context);
},
)]
)]
),
widget.dashboard.isMenu ? Positioned(top: 50, child: FlowChartSelectedMenu(
key: widget.dashboard.selectedMenuKey,
dashboard: widget.dashboard,
height: widget.height - 50) ) : Container(),
height: widget.height - 50)) : Container(),
widget.dashboard.isInfo ? Positioned(top: 50, right: 0, child:
FlowChartLeftMenu<T>(
key: widget.dashboard.selectedLeftMenuKey,
dashboard: widget.dashboard,
menuExtension: widget.menuExtension,
categories: widget.categories,
height: widget.height,
innerMenuWidth: widget.innerMenuWidth,
itemWidth: widget.itemWidth,
draggableItemBuilder: widget.draggableItemBuilder as List<T> Function(String cat),
getDraggable: getDraggable,
)) : Container()
key: widget.dashboard.selectedLeftMenuKey,
dashboard: widget.dashboard,
menuExtension: widget.menuExtension,
categories: widget.categories,
height: widget.height,
innerMenuWidth: widget.innerMenuWidth,
itemWidth: widget.itemWidth,
draggableItemBuilder: widget.draggableItemBuilder as List<T> Function(String cat),
getDraggable: getDraggable,
)) : Container()
])
));
}
@ -576,8 +587,9 @@ class _DrawingArrowWidgetState extends State<DrawingArrowWidget> {
}
}
// ignore: must_be_immutable
class ChartWidget<T extends FlowData> extends StatefulWidget {
ChartWidget ({ Key? key,
ChartWidget ({ super.key,
required this.flowChart,
this.onElementPressed,
this.onElementSecondaryTapped,
@ -597,7 +609,7 @@ class ChartWidget<T extends FlowData> extends StatefulWidget {
required this.dashboard,
this.onNewConnection,
this.menuWidget,
}) : super(key: key);
});
FlowChartState flowChart;
@ -764,7 +776,7 @@ class ChartWidgetState<T extends FlowData> extends State<ChartWidget> {
if (!hoverImportant) {
for (var sel in widget.dashboard.elements) { sel.isSelected = false; }
for (var sel in widget.dashboard.arrows) { sel.isSelected = false; }
Future.delayed(Duration(milliseconds: 100), () {
Future.delayed(const Duration(milliseconds: 100), () {
widget.dashboard.selectedMenuKey.currentState?.setState(() {});
DrawingArrow.instance.notifyListeners();
});

19
library/flutter_flow_chart/lib/src/flow_chart_left_menu.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart';
// ignore: must_be_immutable
class FlowChartLeftMenu<T extends FlowData> extends StatefulWidget {
Dashboard dashboard;
List<String> categories;
@ -39,10 +40,10 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
: Theme(
data: Theme.of(context).copyWith(dividerColor: widget.dashboard.midDashColor),
child: ExpansionTile(
collapsedShape: RoundedRectangleBorder(
collapsedShape: const RoundedRectangleBorder(
side: BorderSide.none,
),
shape: RoundedRectangleBorder(
shape: const RoundedRectangleBorder(
side: BorderSide.none,
),
initiallyExpanded: true,
@ -70,16 +71,16 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
);
}
return Container(
height: widget.height,
color: widget.dashboard.midDashColor,
child: Stack( children: [
Container(
height: widget.height,
color: widget.dashboard.midDashColor,
child: Stack( children: [
Container(
width: widget.innerMenuWidth,
height: 50,
decoration: BoxDecoration(border: Border(
bottom: BorderSide(color: Colors.grey.shade400),
right: BorderSide(color: widget.dashboard.midDashColor),
left: BorderSide(color: Colors.white))),
left: const BorderSide(color: Colors.white))),
child: TextFormField(
style: const TextStyle(color: Colors.black, fontSize: 15),
cursorColor: widget.dashboard.dashColor,
@ -91,7 +92,7 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
fillColor: widget.dashboard.midDashColor,
filled: true,
contentPadding: const EdgeInsets.only(left: 50, right: 50, top: 15, bottom: 15),
hintStyle: TextStyle(
hintStyle: const TextStyle(
color: Colors.grey,
fontSize: 15,
fontWeight: FontWeight.w400
@ -101,7 +102,7 @@ class FlowChartLeftMenuState<T extends FlowData> extends State<FlowChartLeftMenu
)
),
Container(
margin: EdgeInsets.only(top: 50),
margin: const EdgeInsets.only(top: 50),
height: widget.height - 100,
constraints: BoxConstraints(minWidth: widget.itemWidth),
width: widget.dashboard.isMenu ? widget.innerMenuWidth : 0,

37
library/flutter_flow_chart/lib/src/flow_chart_selected_menu.dart
View File

@ -6,6 +6,7 @@ import 'package:flutter_colorpicker/flutter_colorpicker.dart';
import 'package:number_text_input_formatter/number_text_input_formatter.dart';
import 'package:uuid/uuid.dart';
// ignore: must_be_immutable
class FlowChartSelectedMenu extends StatefulWidget {
Dashboard dashboard;
double height = 100;
@ -21,12 +22,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
width: 200,
height: widget.height,
color: widget.dashboard.midDashColor,
child: SingleChildScrollView( child: Column( children: [ ...widget.dashboard.infoItemWidget != null ?
child: SingleChildScrollView( child: Column( children: [
...widget.dashboard.infoItemWidget != null ?
widget.dashboard.infoItemWidget!(widget.dashboard.elementSelected.first.element, widget.dashboard.elementSelected.first.id) : [],
widget.dashboard.arrowsSelected.isNotEmpty || widget.dashboard.elementSelected.isNotEmpty ? Container(
width: 200,
margin: EdgeInsets.only(top: 15),
decoration: BoxDecoration(border: Border(
margin: const EdgeInsets.only(top: 15),
decoration: const BoxDecoration(border: Border(
top: BorderSide(color: Colors.grey, width: 1))),
child: Column(crossAxisAlignment: CrossAxisAlignment.center, children: [
Tooltip( message: "remove",
@ -38,13 +40,13 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
}
return element.isSelected;
}, context);
Future.delayed(Duration(milliseconds: 100), () {
Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.flutterChartKey.currentState?.setState(() { });
});
}, child: Container( margin: EdgeInsets.all(10),
}, child: Container( margin: const EdgeInsets.all(10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30,
child: Icon(Icons.delete_outline, color: Colors.black),
child: const Icon(Icons.delete_outline, color: Colors.black),
))
),
Tooltip( message: "copy",
@ -52,17 +54,17 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
onTap: () {
for (var sel in widget.dashboard.elementSelected) {
var el =FlowElement.fromMap(widget.dashboard, sel.toMap());
el.id = Uuid().v8();
el.id = const Uuid().v8();
widget.dashboard.addElement(FlowElement.fromMap(widget.dashboard, sel.toMap()), context);
widget.dashboard.elements.last.position += Offset(50, 50);
widget.dashboard.elements.last.position += const Offset(50, 50);
}
Future.delayed(Duration(milliseconds: 100), () {
Future.delayed( const Duration(milliseconds: 100), () {
widget.dashboard.chartKey.currentState?.setState(() { });
});
}, child: Container( margin: EdgeInsets.only(left: 10, right: 10, bottom: 10),
}, child: Container( margin: const EdgeInsets.only(left: 10, right: 10, bottom: 10),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(5), border: Border.all(color: Colors.black, width: 1)),
width: 200, height: 30,
child: Icon(Icons.copy, color: Colors.black),
child: const Icon(Icons.copy, color: Colors.black),
))
),
])
@ -120,11 +122,14 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
Container( padding: const EdgeInsets.all(10), width: 200, height: 60,
decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [
Text("STYLE ${widget.dashboard.elementSelected.isNotEmpty ? "ELEMENT" : "ARROW"}", style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
Text("<${widget.dashboard.arrowsSelected.isEmpty && widget.dashboard.elementSelected.isEmpty ? "general" : "selected"}>", style: TextStyle(fontSize: 12), textAlign: TextAlign.center),
Text("STYLE ${widget.dashboard.elementSelected.isNotEmpty ? "ELEMENT" : "ARROW"}",
style: const TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
Text("<${widget.dashboard.arrowsSelected.isEmpty && widget.dashboard.elementSelected.isEmpty ? "general" : "selected"}>",
style: const TextStyle(fontSize: 12), textAlign: TextAlign.center),
])),
SizedBox( width: 200, height: widget.height - 60, child: SingleChildScrollView( child: Column( children: [
widget.dashboard.elementSelected.isNotEmpty ? Container() : Container( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 20),
widget.dashboard.elementSelected.isNotEmpty ? Container() : Container(
padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 20),
decoration: const BoxDecoration(border: Border(bottom: BorderSide(color: Colors.grey, width: 1))),
child: Column( children: [
Row( children: [
@ -617,7 +622,9 @@ class FlowChartSelectedMenuState extends State<FlowChartSelectedMenu> {
]
)
),
widget.dashboard.error != null ? Container( width: 200, color: Colors.red, padding: EdgeInsets.all(10),
widget.dashboard.error != null ? Container( width: 200,
color: Colors.red,
padding: const EdgeInsets.all(10),
child: Center( child: Text(widget.dashboard.error!,
style: const TextStyle(color: Colors.white, fontSize: 15), textAlign: TextAlign.center))) : Container(),
w

6
library/flutter_flow_chart/lib/src/ui/element_widget.dart
View File

@ -177,7 +177,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
childWhenDragging: const SizedBox.shrink(),
feedback: Material(
color: Colors.transparent,
child: Padding( padding: EdgeInsets.all(6),
child: Padding( padding: const EdgeInsets.all(6),
child: Container(
decoration: BoxDecoration(border: Border.all( color: Colors.red, width: 2)),
width: widget.element.size.width - 12,
@ -262,7 +262,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
children: (!widget.isHovered ? [] : [
IconButton(tooltip: "remove element", onPressed: () {
widget.dashboard.removeElement(widget.element, context);
}, icon: Icon(Icons.delete_outline)),
}, icon: const Icon(Icons.delete_outline)),
IconButton(tooltip: "copy element", onPressed: () {
FlowElement<T> newElement = FlowElement<T>(
element: widget.element.element as T?,
@ -273,7 +273,7 @@ class ElementWidgetState<T extends FlowData> extends State<ElementWidget> {
widget: widget.element.widget,
);
widget.dashboard.addElement(newElement, context);
}, icon: Icon(Icons.copy, size: 20)),
}, icon: const Icon(Icons.copy, size: 20)),
]))
),
])

1
library/flutter_flow_chart/lib/src/ui/handler_widget.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
/// The arrow tip.
// ignore: must_be_immutable
class HandlerWidget extends StatelessWidget {
///
HandlerWidget({

3
library/flutter_flow_chart/lib/src/ui/resize_widget.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_flow_chart/src/ui/element_widget.dart';
import 'package:flutter_flow_chart/src/ui/handler_widget.dart';
/// The widget to press and drag to resize the element
// ignore: must_be_immutable
class ResizeWidget extends StatefulWidget {
Widget? bottomLeftBadge;
Widget? bottomRightBadge;
@ -23,7 +24,7 @@ class ResizeWidget extends StatefulWidget {
super.key,
});
Color handlerColor = Color.fromRGBO(38, 166, 154, 1);
Color handlerColor = const Color.fromRGBO(38, 166, 154, 1);
final ElementWidgetState comp;
///
final Dashboard dashboard;