diff --git a/lib/widget_system/repositories/dao/widget_dao.dart b/lib/widget_system/repositories/dao/widget_dao.dart index 490935a..57ae22d 100644 --- a/lib/widget_system/repositories/dao/widget_dao.dart +++ b/lib/widget_system/repositories/dao/widget_dao.dart @@ -2,6 +2,7 @@ import 'package:flutter_unit/widget_system/repositories/model/enums.dart'; import 'package:flutter_unit/widget_system/repositories/model/widget_filter.dart'; import 'package:sqflite/sqflite.dart'; + import '../bean/widget_po.dart'; @@ -52,23 +53,24 @@ class WidgetDao { Future>> search(WidgetFilter arguments) async { // 保证 name 参数为空时,不进行搜索 - if(arguments.name.isEmpty){ + if (arguments.name.isEmpty) { return []; } - - bool hasFamily = arguments.family != null; - String familySql = hasFamily?' AND family = ?':''; - List familyArg = hasFamily?[arguments.family!.index]:[]; - List starArg = arguments.stars; - // 保证在星级参数是 [-1,-1,-1,-1,-1] 时,搜索全星级 - if(arguments.stars.reduce((a, b) => a+b)==-5){ - starArg = [1,2,3,4,5]; - } + // _表示 name 任意 + String name = arguments.name == '*' ? '' : arguments.name; + bool hasFamily = arguments.family != null; + String familySql = hasFamily ? ' AND family = ?' : ''; + List familyArg = hasFamily ? [arguments.family!.index] : []; + List starArg = arguments.stars; + // 保证在星级参数是 [-1,-1,-1,-1,-1] 时,搜索全星级 + if (arguments.stars.reduce((a, b) => a + b) == -5) { + starArg = [1, 2, 3, 4, 5]; + } return db.rawQuery( "SELECT * " "FROM widget WHERE name like ?$familySql AND lever IN(?,?,?,?,?) ORDER BY lever DESC", - ["%${arguments.name}%",...familyArg,...starArg]); + ["%$name%", ...familyArg, ...starArg]); } } diff --git a/lib/widget_system/repositories/model/widget_filter.dart b/lib/widget_system/repositories/model/widget_filter.dart index 7850313..0bf39a2 100644 --- a/lib/widget_system/repositories/model/widget_filter.dart +++ b/lib/widget_system/repositories/model/widget_filter.dart @@ -13,7 +13,7 @@ class WidgetFilter { WidgetFilter.family( this.family, { - this.name = '', + this.name = '*', this.stars = const [1, 2, 3, 4, 5], }); diff --git a/lib/widget_system/views/widget_home_view/background.dart b/lib/widget_system/views/widget_home_view/background.dart index 80fca07..4d65a12 100644 --- a/lib/widget_system/views/widget_home_view/background.dart +++ b/lib/widget_system/views/widget_home_view/background.dart @@ -5,13 +5,14 @@ class BackgroundShower extends StatelessWidget { @override Widget build(BuildContext context) { - return Opacity( + return const Opacity( opacity: 0.05, - child: Container( - decoration: const BoxDecoration( + child: DecoratedBox( + decoration: BoxDecoration( image: DecorationImage( - image: AssetImage('assets/images/sabar.webp'), - fit: BoxFit.cover), + image: AssetImage('assets/images/sabar.webp'), + fit: BoxFit.cover, + ), borderRadius: BorderRadius.only( bottomRight: Radius.circular(400), topLeft: Radius.circular(400))),