bwadmin/pear-admin-flask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(cookieManager): 修复新增页重置按钮无效与网址校验过严

Browse Source 
1) 重置按钮无响应：4 个页面容器是 <div class="layui-form"> 而非 <form>，
   type="reset" 没有可重置的表单。改为 <form class="layui-form">...</form>
   （与标准用户管理页一致）。
2) 保存报错：lay-verify="required|url" 强制要求带协议头，
   输入 www.baidu.com 时前台校验直接拦截（提示“链接格式不正确”）、/save 未发出。
   改为自定义 siteurl 规则，允许省略协议；后端新增 _normalize_url 自动补 https://。
已 Playwright 验证：重置可清空全部字段；无协议网址保存成功且落库为 https:// 前缀。
This commit is contained in:
bwstudio
2026-09-09 22:34:23 +08:00
parent 63cb897f8c
commit 1193f7f56a
6 changed files with 78 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cookieManager/templates/system/cookie_site/add.html
+13 -3
View File
@@ -6,7 +6,7 @@
{% include 'system/common/header.html' %} {% include 'system/common/header.html' %}
</head> </head>
<body> <body>
<div class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;"> <form class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站名称</label> <label class="layui-form-label">网站名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
@@ -17,7 +17,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站URL</label> <label class="layui-form-label">网站URL</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="url" required lay-verify="required|url" placeholder="https://example.com" <input type="text" name="url" required lay-verify="required|siteurl" placeholder="https://example.com 或 example.com"
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
@@ -75,7 +75,7 @@
<button type="reset" class="layui-btn layui-btn-primary">重置</button> <button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div> </div>
</div> </div>
</div> </form>
{% include 'system/common/footer.html' %} {% include 'system/common/footer.html' %}
<script> <script>
@@ -87,6 +87,16 @@ layui.use(['form', 'layer', 'laydate'], function(){
laydate.render({ elem: '#expiry-picker', trigger: 'click' }); laydate.render({ elem: '#expiry-picker', trigger: 'click' });
// 放宽网址校验：允许省略 http(s):// 协议头，后端会自动补齐
form.verify({
siteurl: function (value) {
if (!value) return;
var ok = /^(https?|ftp):\/\/[^\s]+$/i.test(value)
|| /^[\w-]+(\.[\w-]+)+(:\d+)?([/?#][^\s]*)?$/i.test(value);
if (!ok) return '网址格式不正确，例如 https://example.com 或 example.com';
}
});
form.render(); form.render();
form.on('submit(cookie-site-form-submit)', function(){ form.on('submit(cookie-site-form-submit)', function(){
var data = form.val('cookie-site-form'); var data = form.val('cookie-site-form');
plugins/cookieManager/templates/system/cookie_site/edit.html
+13 -3
View File
@@ -6,7 +6,7 @@
{% include 'system/common/header.html' %} {% include 'system/common/header.html' %}
</head> </head>
<body> <body>
<div class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;"> <form class="layui-form" lay-filter="cookie-site-form" style="padding: 20px 30px 0 0;">
<input type="hidden" name="cookieSiteId" value="{{ obj.id }}"> <input type="hidden" name="cookieSiteId" value="{{ obj.id }}">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站名称</label> <label class="layui-form-label">网站名称</label>
@@ -18,7 +18,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站URL</label> <label class="layui-form-label">网站URL</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="url" value="{{ obj.url }}" lay-verify="required|url" <input type="text" name="url" value="{{ obj.url }}" lay-verify="required|siteurl"
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
@@ -77,7 +77,7 @@
<button type="reset" class="layui-btn layui-btn-primary">重置</button> <button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div> </div>
</div> </div>
</div> </form>
{% include 'system/common/footer.html' %} {% include 'system/common/footer.html' %}
<script> <script>
@@ -89,6 +89,16 @@ layui.use(['form', 'layer', 'laydate'], function(){
laydate.render({ elem: '#expiry-picker', trigger: 'click' }); laydate.render({ elem: '#expiry-picker', trigger: 'click' });
// 放宽网址校验：允许省略 http(s):// 协议头，后端会自动补齐
form.verify({
siteurl: function (value) {
if (!value) return;
var ok = /^(https?|ftp):\/\/[^\s]+$/i.test(value)
|| /^[\w-]+(\.[\w-]+)+(:\d+)?([/?#][^\s]*)?$/i.test(value);
if (!ok) return '网址格式不正确，例如 https://example.com 或 example.com';
}
});
form.render(); form.render();
form.on('submit(cookie-site-form-submit)', function(){ form.on('submit(cookie-site-form-submit)', function(){
var data = form.val('cookie-site-form'); var data = form.val('cookie-site-form');
plugins/cookieManager/templates/system/cookie_user/add.html
+13 -3
View File
@@ -6,7 +6,7 @@
{% include 'system/common/header.html' %} {% include 'system/common/header.html' %}
</head> </head>
<body> <body>
<div class="layui-form" lay-filter="cookie-user-form" style="padding: 20px 30px 0 0;"> <form class="layui-form" lay-filter="cookie-user-form" style="padding: 20px 30px 0 0;">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户名</label> <label class="layui-form-label">用户名</label>
<div class="layui-input-block"> <div class="layui-input-block">
@@ -31,7 +31,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站URL</label> <label class="layui-form-label">网站URL</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="website_url" required lay-verify="required|url" placeholder="https://example.com" <input type="text" name="website_url" required lay-verify="required|siteurl" placeholder="https://example.com 或 example.com"
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
@@ -69,7 +69,7 @@
<button type="reset" class="layui-btn layui-btn-primary">重置</button> <button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div> </div>
</div> </div>
</div> </form>
{% include 'system/common/footer.html' %} {% include 'system/common/footer.html' %}
<script> <script>
@@ -81,6 +81,16 @@ layui.use(['form', 'layer', 'laydate'], function(){
laydate.render({ elem: '#expiry-picker', trigger: 'click' }); laydate.render({ elem: '#expiry-picker', trigger: 'click' });
// 放宽网址校验：允许省略 http(s):// 协议头，后端会自动补齐
form.verify({
siteurl: function (value) {
if (!value) return;
var ok = /^(https?|ftp):\/\/[^\s]+$/i.test(value)
|| /^[\w-]+(\.[\w-]+)+(:\d+)?([/?#][^\s]*)?$/i.test(value);
if (!ok) return '网址格式不正确，例如 https://example.com 或 example.com';
}
});
form.render(); form.render();
form.on('submit(cookie-user-form-submit)', function(){ form.on('submit(cookie-user-form-submit)', function(){
var data = form.val('cookie-user-form'); var data = form.val('cookie-user-form');
plugins/cookieManager/templates/system/cookie_user/edit.html
+13 -3
View File
@@ -6,7 +6,7 @@
{% include 'system/common/header.html' %} {% include 'system/common/header.html' %}
</head> </head>
<body> <body>
<div class="layui-form" lay-filter="cookie-user-form" style="padding: 20px 30px 0 0;"> <form class="layui-form" lay-filter="cookie-user-form" style="padding: 20px 30px 0 0;">
<input type="hidden" name="cookieUserId" value="{{ obj.id }}"> <input type="hidden" name="cookieUserId" value="{{ obj.id }}">
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">用户名</label> <label class="layui-form-label">用户名</label>
@@ -32,7 +32,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">网站URL</label> <label class="layui-form-label">网站URL</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="website_url" value="{{ obj.website_url }}" lay-verify="required|url" <input type="text" name="website_url" value="{{ obj.website_url }}" lay-verify="required|siteurl"
autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div> </div>
</div> </div>
@@ -70,7 +70,7 @@
<button type="reset" class="layui-btn layui-btn-primary">重置</button> <button type="reset" class="layui-btn layui-btn-primary">重置</button>
</div> </div>
</div> </div>
</div> </form>
{% include 'system/common/footer.html' %} {% include 'system/common/footer.html' %}
<script> <script>
@@ -82,6 +82,16 @@ layui.use(['form', 'layer', 'laydate'], function(){
laydate.render({ elem: '#expiry-picker', trigger: 'click' }); laydate.render({ elem: '#expiry-picker', trigger: 'click' });
// 放宽网址校验：允许省略 http(s):// 协议头，后端会自动补齐
form.verify({
siteurl: function (value) {
if (!value) return;
var ok = /^(https?|ftp):\/\/[^\s]+$/i.test(value)
|| /^[\w-]+(\.[\w-]+)+(:\d+)?([/?#][^\s]*)?$/i.test(value);
if (!ok) return '网址格式不正确，例如 https://example.com 或 example.com';
}
});
form.render(); form.render();
form.on('submit(cookie-user-form-submit)', function(){ form.on('submit(cookie-user-form-submit)', function(){
var data = form.val('cookie-user-form'); var data = form.val('cookie-user-form');
plugins/cookieManager/view/cookie_site.py
+13 -2
View File
@@ -4,6 +4,7 @@ Cookie管理 - 登录网站视图
URL: /system/cookie-site URL: /system/cookie-site
""" """
import os import os
import re
from datetime import datetime from datetime import datetime
from flask import Blueprint, render_template, request from flask import Blueprint, render_template, request
from flask_login import current_user from flask_login import current_user
@@ -23,6 +24,16 @@ bp = Blueprint('cookie_site', __name__,
template_folder=os.path.join(dir_path, '..', 'templates')) template_folder=os.path.join(dir_path, '..', 'templates'))
def _normalize_url(raw):
"""网址补齐协议头：用户常省略 http(s)://，此处自动补 https://。"""
if not raw or not str(raw).strip():
return raw
u = str(raw).strip()
if re.match(r'^[a-zA-Z][a-zA-Z0-9+.\-]*://', u):
return u
return 'https://' + u
def _parse_expiry(raw): def _parse_expiry(raw):
"""过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。""" """过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。"""
if not raw or not str(raw).strip(): if not raw or not str(raw).strip():
@@ -82,7 +93,7 @@ def save():
try: try:
obj = CookieSite( obj = CookieSite(
name=name, name=name,
url=url, url=_normalize_url(url),
cookie_value=cookie_value, cookie_value=cookie_value,
domain=str_escape(req_json.get('domain')), domain=str_escape(req_json.get('domain')),
path=str_escape(req_json.get('path')) or '/', path=str_escape(req_json.get('path')) or '/',
@@ -125,7 +136,7 @@ def update():
return fail_api(msg="名称/网址/Cookie值不得为空") return fail_api(msg="名称/网址/Cookie值不得为空")
try: try:
obj.name = name obj.name = name
obj.url = url obj.url = _normalize_url(url)
obj.cookie_value = cookie_value obj.cookie_value = cookie_value
obj.domain = str_escape(req_json.get('domain')) obj.domain = str_escape(req_json.get('domain'))
obj.path = str_escape(req_json.get('path')) or '/' obj.path = str_escape(req_json.get('path')) or '/'
plugins/cookieManager/view/cookie_user.py
+13 -2
View File
@@ -4,6 +4,7 @@ Cookie管理 - 登录用户视图
URL: /system/cookie-user URL: /system/cookie-user
""" """
import os import os
import re
from datetime import datetime from datetime import datetime
from flask import Blueprint, render_template, request from flask import Blueprint, render_template, request
from flask_login import current_user from flask_login import current_user
@@ -23,6 +24,16 @@ bp = Blueprint('cookie_user', __name__,
template_folder=os.path.join(dir_path, '..', 'templates')) template_folder=os.path.join(dir_path, '..', 'templates'))
def _normalize_url(raw):
"""网址补齐协议头：用户常省略 http(s)://，此处自动补 https://。"""
if not raw or not str(raw).strip():
return raw
u = str(raw).strip()
if re.match(r'^[a-zA-Z][a-zA-Z0-9+.\-]*://', u):
return u
return 'https://' + u
def _parse_expiry(raw): def _parse_expiry(raw):
"""过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。""" """过期时间：空值转 None；非空字符串按常见格式解析为 datetime；解析失败返回 None。"""
if not raw or not str(raw).strip(): if not raw or not str(raw).strip():
@@ -83,7 +94,7 @@ def save():
obj = CookieUser( obj = CookieUser(
username=username, username=username,
nickname=str_escape(req_json.get('nickname')), nickname=str_escape(req_json.get('nickname')),
website_url=website_url, website_url=_normalize_url(website_url),
website_name=str_escape(req_json.get('website_name')), website_name=str_escape(req_json.get('website_name')),
cookie_value=cookie_value, cookie_value=cookie_value,
domain=str_escape(req_json.get('domain')), domain=str_escape(req_json.get('domain')),
@@ -125,7 +136,7 @@ def update():
try: try:
obj.username = username obj.username = username
obj.nickname = str_escape(req_json.get('nickname')) obj.nickname = str_escape(req_json.get('nickname'))
obj.website_url = website_url obj.website_url = _normalize_url(website_url)
obj.website_name = str_escape(req_json.get('website_name')) obj.website_name = str_escape(req_json.get('website_name'))
obj.cookie_value = cookie_value obj.cookie_value = cookie_value
obj.domain = str_escape(req_json.get('domain')) obj.domain = str_escape(req_json.get('domain'))