diff --git a/plugins/cookieManager/templates/system/cookie_site/main.html b/plugins/cookieManager/templates/system/cookie_site/main.html index aa1e01b..dcf50ea 100644 --- a/plugins/cookieManager/templates/system/cookie_site/main.html +++ b/plugins/cookieManager/templates/system/cookie_site/main.html @@ -1,47 +1,78 @@ - 登录网站 {% include 'system/common/header.html' %} +{# 查询表单 #}
- +
- + +
+ +
+ +
+ +
+
-
- +{# 网站表格 #}
+ {% include 'system/common/footer.html' %} +{# 表格工具栏 #} + + +{# 行操作 #} + + {% raw %} - - - {% endraw %} - diff --git a/plugins/cookieManager/templates/system/cookie_user/main.html b/plugins/cookieManager/templates/system/cookie_user/main.html index 4503b37..563da23 100644 --- a/plugins/cookieManager/templates/system/cookie_user/main.html +++ b/plugins/cookieManager/templates/system/cookie_user/main.html @@ -1,47 +1,78 @@ - - - + + 登录用户 {% include 'system/common/header.html' %} - -
-
-
-
- -
- + +{# 查询表单 #} +
+
+ +
+ +
+
- - -
- -
-
- +{# 用户表格 #} +
+
+
+ {% include 'system/common/footer.html' %} +{# 表格工具栏 #} + + +{# 行操作 #} + + {% raw %} - - - {% endraw %} - diff --git a/plugins/cookieManager/view/cookie_site.py b/plugins/cookieManager/view/cookie_site.py index 923238a..942d780 100644 --- a/plugins/cookieManager/view/cookie_site.py +++ b/plugins/cookieManager/view/cookie_site.py @@ -32,15 +32,16 @@ def main(): @limiter.limit("60 per minute") @authorize("system:cookie-site:main") def data(): - keyword = str_escape(request.args.get('keyword', type=str)) + name = str_escape(request.args.get('name', type=str)) + domain = str_escape(request.args.get('domain', type=str)) + enable = request.args.get('enable', type=int) query = CookieSite.query.filter() - if keyword: - query = query.filter( - db.or_( - CookieSite.name.contains(keyword), - CookieSite.url.contains(keyword), - ) - ) + if name: + query = query.filter(CookieSite.name.contains(name)) + if domain: + query = query.filter(CookieSite.domain.contains(domain)) + if enable is not None: + query = query.filter(CookieSite.enable == enable) items = query.order_by(CookieSite.id.desc()).layui_paginate() return table_api( msg="请求成功", diff --git a/plugins/cookieManager/view/cookie_user.py b/plugins/cookieManager/view/cookie_user.py index e611b42..cf76bb2 100644 --- a/plugins/cookieManager/view/cookie_user.py +++ b/plugins/cookieManager/view/cookie_user.py @@ -32,16 +32,16 @@ def main(): @limiter.limit("60 per minute") @authorize("system:cookie-user:main") def data(): - keyword = str_escape(request.args.get('keyword', type=str)) + username = str_escape(request.args.get('username', type=str)) + website_name = str_escape(request.args.get('website_name', type=str)) + enable = request.args.get('enable', type=int) query = CookieUser.query.filter() - if keyword: - query = query.filter( - db.or_( - CookieUser.username.contains(keyword), - CookieUser.website_name.contains(keyword), - CookieUser.website_url.contains(keyword), - ) - ) + if username: + query = query.filter(CookieUser.username.contains(username)) + if website_name: + query = query.filter(CookieUser.website_name.contains(website_name)) + if enable is not None: + query = query.filter(CookieUser.enable == enable) items = query.order_by(CookieUser.id.desc()).layui_paginate() return table_api( msg="请求成功",