novalon/novalon-manage-system
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

develop #2

Merged
jenkins merged 49 commits from develop into main 2026-04-08 19:55:46 +08:00
Conversation 0 Commits 49 Files Changed 144
+10 -5
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 99c78954a3 - Show all commits
novalon-manage-web/e2e/customReporter.ts
+7 -3
View File
@@ -113,9 +113,13 @@ class CustomReporter implements Reporter {
if (stats.failedTests.length > 0) { if (stats.failedTests.length > 0) {
console.log('❌ 失败的测试:'); console.log('❌ 失败的测试:');
stats.failedTests.forEach((test, index) => { stats.failedTests.forEach((test, index) => {
console.log(` ${index + 1}. ${test.title}`); console.log(` ${index + 1}. ${test.title || '未命名测试'}`);
console.log(` 位置: ${test.location.file}:${test.location.line}`); if (test.location?.file) {
console.log(` 错误: ${test.error?.message}`); console.log(` 位置: ${test.location.file}:${test.location.line || 0}`);
}
if (test.error?.message) {
console.log(` 错误: ${test.error.message}`);
}
}); });
console.log(''); console.log('');
} }
novalon-manage-web/playwright/.auth/user.json
+1 -1
View File
@@ -6,7 +6,7 @@
"localStorage": [ "localStorage": [
{ {
"name": "token", "name": "token",
"value": "eyJhbGciOiJIUzM4NCJ9.eyJyb2xlcyI6WyJhZG1pbiJdLCJ1c2VySWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJzdWIiOiJhZG1pbiIsImlhdCI6MTc3NTYzMjQ5OCwiZXhwIjoxNzc1NzE4ODk4fQ.pBjBrFhB-aLbneWoasbZn-K-JUAAZQHEzXsRXyQ_042q24gWkbznWm9MVm9tPtDS" "value": "eyJhbGciOiJIUzM4NCJ9.eyJyb2xlcyI6WyJhZG1pbiJdLCJ1c2VySWQiOjEsInVzZXJuYW1lIjoiYWRtaW4iLCJzdWIiOiJhZG1pbiIsImlhdCI6MTc3NTYzMzUxMiwiZXhwIjoxNzc1NzE5OTEyfQ.z8GEm_YKF0jGh_KWAk9NVW41TL9JDY5RcgQaLEpktrk2JRDWs9gfuLV0fQSs3EJ5"
}, },
{ {
"name": "permission", "name": "permission",
novalon-manage-web/src/api/user.api.ts
+1
View File
@@ -35,6 +35,7 @@ export interface UpdateUserRequest {
export interface UserPageRequest { export interface UserPageRequest {
page: number page: number
size: number size: number
keyword?: string
username?: string username?: string
nickname?: string nickname?: string
status?: string status?: string
novalon-manage-web/src/views/system/UserManagement.vue
+1 -1
View File
@@ -291,7 +291,7 @@ const fetchData = async () => {
size: pagination.pageSize, size: pagination.pageSize,
sortBy: sortInfo.sortBy, sortBy: sortInfo.sortBy,
sortOrder: sortInfo.sortOrder, sortOrder: sortInfo.sortOrder,
username: searchKeyword.value || undefined keyword: searchKeyword.value || undefined
}) })
dataSource.value = res.content dataSource.value = res.content
pagination.total = res.totalElements pagination.total = res.totalElements