From 5c00a27de0a0da948e5f1b5f783c4d097e812f0f Mon Sep 17 00:00:00 2001 From: bwstudio Date: Wed, 9 Sep 2026 19:34:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(plugins):=20Cookie=20=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E8=A1=A8=E6=A0=BC=E9=A1=B5=20UI=20=E5=AF=B9?= =?UTF-8?q?=E9=BD=90=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E6=A0=87=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将「登录用户」与「登录网站」两个表格页统一为后台通用风格，未改动 framework。 过滤栏 - 由单一"关键词"改为按字段过滤： * cookie_user：用户名 / 网站名称 / 状态 * cookie_site：网站名称 / 域名 / 状态 - view 的 data() 同步支持上述字段（enable 为 0/1，None 不参与过滤） 表格工具栏与默认工具栏 - 新增 toolbar（新增按钮，带 authorize 权限判断） - 补齐 defaultToolbar：刷新 / 筛选列 / 打印 / 导出 状态与操作 - 状态列由徽章改为 switch 开关，点击即调既有 /enable、/disable 接口 - 操作列仅保留编辑/删除（带 authorize），删除原冗余的启用/禁用行按钮 - 统一 window.add/edit/remove/refresh 与 popup.success/popup.failure 提示 --- .../templates/system/cookie_site/main.html | 260 +++++++++------- .../templates/system/cookie_user/main.html | 278 +++++++++++------- plugins/cookieManager/view/cookie_site.py | 17 +- plugins/cookieManager/view/cookie_user.py | 18 +- 4 files changed, 341 insertions(+), 232 deletions(-) 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="请求成功",