ext/new-api
2
0
Fork 0
mirror of https://github.com/QuantumNous/new-api.git synced 2026-09-03 04:43:01 +00:00
Code Activity

Merge branch 'main' into refactor/ui

Browse Source 
Resolve conflicts keeping the refactor/ui data-table row implementation (no memoization, so the upstream column-visibility memo fix is not needed) and adopting main's server-side user sorting and reworked high-risk retry dialog.

Additionally fix a debounce race that resurrected cleared column filters on toolbar Reset, and add a built-in refresh control (manual refresh + Grafana-style auto-refresh intervals with hidden-tab pausing and per-table persistence) wired into every data-table page.
This commit is contained in:
t0ng7u
2026-07-18 01:50:35 +08:00
parent 321c75d2ed 923a17ca8a
commit dfafb6d227
29 changed files with 615 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/user.go
+4 -2
View File
@@ -308,7 +308,8 @@ func Register(c *gin.Context) {
func GetAllUsers(c *gin.Context) {
pageInfo := common.GetPageQuery(c)
users, total, err := model.GetAllUsers(pageInfo)
sortOptions := model.NewUserSortOptions(c.Query("sort_by"), c.Query("sort_order"))
users, total, err := model.GetAllUsers(pageInfo, sortOptions)
if err != nil {
common.ApiError(c, err)
return
@@ -337,7 +338,8 @@ func SearchUsers(c *gin.Context) {
}
}
pageInfo := common.GetPageQuery(c)
users, total, err := model.SearchUsers(keyword, group, role, status, pageInfo.GetStartIdx(), pageInfo.GetPageSize())
sortOptions := model.NewUserSortOptions(c.Query("sort_by"), c.Query("sort_order"))
users, total, err := model.SearchUsers(keyword, group, role, status, pageInfo.GetStartIdx(), pageInfo.GetPageSize(), sortOptions)
if err != nil {
common.ApiError(c, err)
return