feat(account): filter ungrouped accounts

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: DouDOU-start

backend/internal/app/account/types.go

@@ -88,6 +88,7 @@ type ListFilter struct {
 	State       string // active / rate_limited / degraded / disabled
 	AccountType string
 	GroupID     *int
+	Ungrouped   bool
 	ProxyID     *int
 	IDs         []int
 }

backend/internal/infra/store/account_store.go

@@ -41,6 +41,8 @@ func (s *AccountStore) List(ctx context.Context, filter appaccount.ListFilter) (
 	}
 	if filter.GroupID != nil {
 		query = query.Where(entaccount.HasGroupsWith(entgroup.ID(*filter.GroupID)))
+	} else if filter.Ungrouped {
+		query = query.Where(entaccount.Not(entaccount.HasGroups()))
 	}
 	if filter.ProxyID != nil {
 		query = query.Where(entaccount.HasProxyWith(entproxy.IDEQ(*filter.ProxyID)))
@@ -83,6 +85,8 @@ func (s *AccountStore) ListAll(ctx context.Context, filter appaccount.ListFilter
 	}
 	if filter.GroupID != nil {
 		query = query.Where(entaccount.HasGroupsWith(entgroup.ID(*filter.GroupID)))
+	} else if filter.Ungrouped {
+		query = query.Where(entaccount.Not(entaccount.HasGroups()))
 	}
 	if filter.ProxyID != nil {
 		query = query.Where(entaccount.HasProxyWith(entproxy.IDEQ(*filter.ProxyID)))

backend/internal/server/handler/account_handler.go

@@ -64,6 +64,15 @@ func parseOptionalInt(raw string) *int {
 	return &value
 }
 
+func parseOptionalBool(raw string) bool {
+	switch strings.ToLower(strings.TrimSpace(raw)) {
+	case "1", "true", "yes", "y", "on":
+		return true
+	default:
+		return false
+	}
+}
+
 // parseIDList 解析逗号分隔的整数列表（如 "1,2,3"），忽略空项与非法项。
 func parseIDList(raw string) []int {
 	if raw == "" {

backend/internal/server/handler/account_handler_routes.go

@@ -23,14 +23,18 @@ func (h *AccountHandler) ListAccounts(c *gin.Context) {
 		return
 	}
 
+	groupID := parseOptionalInt(c.Query("group_id"))
+	ungrouped := groupID == nil && parseOptionalBool(c.Query("ungrouped"))
+
 	result, err := h.service.List(c.Request.Context(), appaccount.ListFilter{
 		Page:        page.Page,
 		PageSize:    page.PageSize,
 		Keyword:     page.Keyword,
 		Platform:    c.Query("platform"),
 		State:       c.Query("state"),
 		AccountType: c.Query("account_type"),
-		GroupID:     parseOptionalInt(c.Query("group_id")),
+		GroupID:     groupID,
+		Ungrouped:   ungrouped,
 		ProxyID:     parseOptionalInt(c.Query("proxy_id")),
 	})
 	if err != nil {
@@ -54,12 +58,16 @@ func (h *AccountHandler) ListAccounts(c *gin.Context) {
 // ExportAccounts 按当前筛选条件导出账号（返回 JSON 数据，前端落盘为文件）。
 // 当前端传入 ids=1,2,3 时只导出这些账号；否则按查询条件导出全部匹配的账号。
 func (h *AccountHandler) ExportAccounts(c *gin.Context) {
+	groupID := parseOptionalInt(c.Query("group_id"))
+	ungrouped := groupID == nil && parseOptionalBool(c.Query("ungrouped"))
+
 	accounts, err := h.service.ExportAll(c.Request.Context(), appaccount.ListFilter{
 		Keyword:     c.Query("keyword"),
 		Platform:    c.Query("platform"),
 		State:       c.Query("state"),
 		AccountType: c.Query("account_type"),
-		GroupID:     parseOptionalInt(c.Query("group_id")),
+		GroupID:     groupID,
+		Ungrouped:   ungrouped,
 		ProxyID:     parseOptionalInt(c.Query("proxy_id")),
 		IDs:         parseIDList(c.Query("ids")),
 	})

web/src/i18n/en.json

@@ -426,6 +426,7 @@
     "enable_dispatch": "Enable Dispatch",
     "select_groups": "Select groups",
     "all_groups": "All groups",
+    "ungrouped": "Ungrouped",
     "all_proxies": "All proxies",
     "delete_title": "Delete Account",
     "delete_confirm": "Are you sure you want to delete account \"{{name}}\"? It will no longer participate in dispatch.",

web/src/i18n/zh.json

@@ -425,6 +425,7 @@
     "enable_dispatch": "启用调度",
     "select_groups": "选择分组",
     "all_groups": "全部分组",
+    "ungrouped": "未分组",
     "all_proxies": "全部代理",
     "delete_title": "删除账号",
     "delete_confirm": "确定要删除账号「{{name}}」吗？删除后该账号将不再参与调度。",

web/src/pages/admin/AccountsPage.tsx

@@ -48,6 +48,8 @@ import type {
   PagedData,
 } from '../../shared/types';
 
+const UNGROUPED_GROUP_FILTER = '__ungrouped__';
+
 // formatCountdown 把剩余毫秒格式化成 "Xd Yh"/"Xh Ym"/"Ym" 样式，
 // 与 sub2api 的"限流中 10h 16m 自动恢复"徽标一致。
 function formatCountdown(ms: number): string {
@@ -282,7 +284,8 @@ export default function AccountsPage() {
         platform: platformFilter || undefined,
         state: stateFilter || undefined,
         account_type: typeFilter || undefined,
-        group_id: groupFilter ? Number(groupFilter) : undefined,
+        group_id: groupFilter && groupFilter !== UNGROUPED_GROUP_FILTER ? Number(groupFilter) : undefined,
+        ungrouped: groupFilter === UNGROUPED_GROUP_FILTER ? true : undefined,
         proxy_id: proxyFilter ? Number(proxyFilter) : undefined,
       }),
   });
@@ -334,7 +337,8 @@ export default function AccountsPage() {
         platform: platformFilter || undefined,
         state: stateFilter || undefined,
         account_type: typeFilter || undefined,
-        group_id: groupFilter ? Number(groupFilter) : undefined,
+        group_id: groupFilter && groupFilter !== UNGROUPED_GROUP_FILTER ? Number(groupFilter) : undefined,
+        ungrouped: groupFilter === UNGROUPED_GROUP_FILTER ? true : undefined,
         proxy_id: proxyFilter ? Number(proxyFilter) : undefined,
       });
     },
@@ -979,6 +983,7 @@ export default function AccountsPage() {
           onChange={(e) => { setGroupFilter(e.target.value); setPage(1); }}
           options={[
             { value: '', label: t('accounts.all_groups') },
+            { value: UNGROUPED_GROUP_FILTER, label: t('accounts.ungrouped') },
             ...(allGroupsData?.list ?? []).map((g) => ({ value: String(g.id), label: g.name })),
           ]}
         />

web/src/shared/api/accounts.ts

@@ -6,7 +6,14 @@ import type {
   CredentialSchemaResp, ModelInfo, PageReq, PagedData,
 } from '../types';
 
-export type AccountListFilter = { platform?: string; state?: string; account_type?: string; group_id?: number; proxy_id?: number };
+export type AccountListFilter = {
+  platform?: string;
+  state?: string;
+  account_type?: string;
+  group_id?: number;
+  ungrouped?: boolean;
+  proxy_id?: number;
+};
 
 export const accountsApi = {
   list: (params: PageReq & AccountListFilter) =>