diff --git a/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart b/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart index cdfef350..174726f6 100644 --- a/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart +++ b/lib/pages/roles_and_permission/users_page/users_table/bloc/user_table_bloc.dart @@ -23,7 +23,7 @@ class UserTableBloc extends Bloc { on(_deleteUser); on(_filterClear); } - int itemsPerPage = 10; + int itemsPerPage = 20; int currentPage = 1; List users = []; List initialUsers = []; diff --git a/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart b/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart index 813e950c..6662a9e2 100644 --- a/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart +++ b/lib/pages/roles_and_permission/users_page/users_table/view/user_table.dart @@ -29,7 +29,9 @@ class _DynamicTableScreenState extends State @override void initState() { super.initState(); - columnWidths = List.filled(widget.titles.length, 150.0); + setState(() { + columnWidths = List.filled(widget.titles.length, 150.0); + }); WidgetsBinding.instance.addObserver(this); } @@ -212,6 +214,19 @@ class _DynamicTableScreenState extends State shrinkWrap: true, itemCount: widget.rows.length, itemBuilder: (context, rowIndex) { + if (columnWidths + .every((width) => width == 120.0)) { + columnWidths = List.generate( + widget.titles.length, (index) { + if (index == 1) { + return screenWidth * 0.11; + } else if (index == 9) { + return screenWidth * 0.2; + } + return screenWidth * 0.11; + }); + setState(() {}); + } final row = widget.rows[rowIndex]; return Column( children: [