diff --git a/api/sites/category.go b/api/sites/category.go index 8f3ed9ba..f141d3c0 100644 --- a/api/sites/category.go +++ b/api/sites/category.go @@ -4,6 +4,7 @@ import ( "github.com/0xJacky/Nginx-UI/model" "github.com/gin-gonic/gin" "github.com/uozi-tech/cosy" + "gorm.io/gorm" ) func GetCategory(c *gin.Context) { @@ -11,7 +12,9 @@ func GetCategory(c *gin.Context) { } func GetCategoryList(c *gin.Context) { - cosy.Core[model.SiteCategory](c).PagingList() + cosy.Core[model.SiteCategory](c).GormScope(func(tx *gorm.DB) *gorm.DB { + return tx.Order("order_id ASC") + }).PagingList() } func AddCategory(c *gin.Context) { @@ -39,3 +42,7 @@ func DeleteCategory(c *gin.Context) { func RecoverCategory(c *gin.Context) { cosy.Core[model.SiteCategory](c).Recover() } + +func UpdateCategoriesOrder(c *gin.Context) { + cosy.Core[model.SiteCategory](c).UpdateOrder() +} diff --git a/api/sites/router.go b/api/sites/router.go index 95af9680..1b247b0e 100644 --- a/api/sites/router.go +++ b/api/sites/router.go @@ -31,4 +31,5 @@ func InitCategoryRouter(r *gin.RouterGroup) { r.POST("site_categories/:id", ModifyCategory) r.DELETE("site_categories/:id", DeleteCategory) r.POST("site_categories/:id/recover", RecoverCategory) + r.POST("site_categories/order", UpdateCategoriesOrder) } diff --git a/app/src/views/site/site_category/SiteCategory.vue b/app/src/views/site/site_category/SiteCategory.vue index 0d92ac76..67e12ea8 100644 --- a/app/src/views/site/site_category/SiteCategory.vue +++ b/app/src/views/site/site_category/SiteCategory.vue @@ -11,6 +11,7 @@ import columns from '@/views/site/site_category/columns' :api="site_category" :columns="columns" :scroll-x="600" + sortable >