@@ -1542,23 +1563,23 @@ function SystemSettingsSection({ settings, domains, mailboxes, initialTab }: { s
const requestedTab = initialTab as SettingsTab | undefined
const [settingsTab, setSettingsTab] = React.useState(() => requestedTab && ["base", "smtp", "storage", "mail", "notifications", "externalImap", "templates", "security"].includes(requestedTab) ? requestedTab : "base")
const maildirHealth = useQuery({ queryKey: ["admin", "maildir-sync", "health"], queryFn: api.maildirSyncHealth, enabled: canSettingsView && settingsTab === "storage" })
- const [smtpRequireTls, setSmtpRequireTls] = React.useState(false)
- const [allowInsecureHttp, setAllowInsecureHttp] = React.useState(true)
- const [openRegistration, setOpenRegistration] = React.useState(false)
- const [twoFactorEnabled, setTwoFactorEnabled] = React.useState(false)
- const [turnstileEnabled, setTurnstileEnabled] = React.useState(false)
- const [catchAllEnabled, setCatchAllEnabled] = React.useState(false)
- const [mailAutoRefresh, setMailAutoRefresh] = React.useState(true)
- const [userMailboxApplyEnabled, setUserMailboxApplyEnabled] = React.useState(false)
- const [userMailboxDomainIds, setUserMailboxDomainIds] = React.useState([])
- const [externalImapEnabled, setExternalImapEnabled] = React.useState(false)
- const [externalImapAllowPrivateHosts, setExternalImapAllowPrivateHosts] = React.useState(false)
- const [telegramMailEnabled, setTelegramMailEnabled] = React.useState(false)
+ const [smtpRequireTls, setSmtpRequireTls] = React.useState(() => settings?.smtpRequireTls ?? false)
+ const [allowInsecureHttp, setAllowInsecureHttp] = React.useState(() => settings?.allowInsecureHttp ?? true)
+ const [openRegistration, setOpenRegistration] = React.useState(() => settings?.openRegistration ?? false)
+ const [twoFactorEnabled, setTwoFactorEnabled] = React.useState(() => settings?.twoFactorEnabled ?? false)
+ const [turnstileEnabled, setTurnstileEnabled] = React.useState(() => settings?.turnstileEnabled ?? false)
+ const [catchAllEnabled, setCatchAllEnabled] = React.useState(() => settings?.catchAllEnabled ?? false)
+ const [mailAutoRefresh, setMailAutoRefresh] = React.useState(() => settings?.mailAutoRefresh ?? true)
+ const [userMailboxApplyEnabled, setUserMailboxApplyEnabled] = React.useState(() => settings?.userMailboxApplyEnabled ?? false)
+ const [userMailboxDomainIds, setUserMailboxDomainIds] = React.useState(() => settings?.userMailboxDomainIds || [])
+ const [externalImapEnabled, setExternalImapEnabled] = React.useState(() => settings?.externalImapEnabled ?? false)
+ const [externalImapAllowPrivateHosts, setExternalImapAllowPrivateHosts] = React.useState(() => settings?.externalImapAllowPrivateHosts ?? false)
+ const [telegramMailEnabled, setTelegramMailEnabled] = React.useState(() => settings?.telegramMailEnabled ?? false)
const [telegramBotToken, setTelegramBotToken] = React.useState("")
- const [telegramPrivateChatId, setTelegramPrivateChatId] = React.useState("")
- const [telegramBodyMode, setTelegramBodyMode] = React.useState<"summary" | "full">("summary")
- const [telegramMailboxIds, setTelegramMailboxIds] = React.useState([])
- const [telegramIncludeUnregistered, setTelegramIncludeUnregistered] = React.useState(false)
+ const [telegramPrivateChatId, setTelegramPrivateChatId] = React.useState(() => settings?.telegramPrivateChatId || "")
+ const [telegramBodyMode, setTelegramBodyMode] = React.useState<"summary" | "full">(() => settings?.telegramBodyMode === "full" ? "full" : "summary")
+ const [telegramMailboxIds, setTelegramMailboxIds] = React.useState(() => settings?.telegramMailboxIds || [])
+ const [telegramIncludeUnregistered, setTelegramIncludeUnregistered] = React.useState(() => settings?.telegramIncludeUnregistered ?? false)
const [telegramPairing, setTelegramPairing] = React.useState(null)
React.useEffect(() => {
if (!settings) return
diff --git a/apps/web/src/pages/profile.tsx b/apps/web/src/pages/profile.tsx
index bbdb7cc..7789e28 100644
--- a/apps/web/src/pages/profile.tsx
+++ b/apps/web/src/pages/profile.tsx
@@ -26,13 +26,14 @@ import { Sheet, SheetContent, SheetTitle, SheetTrigger } from "@/components/ui/s
import { Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue } from "@/components/ui/select"
import { Separator } from "@/components/ui/separator"
import { ScrollArea } from "@/components/ui/scroll-area"
+import { Skeleton } from "@/components/ui/skeleton"
import { ConfirmDialog } from "@/components/confirm-dialog"
import { useToast } from "@/hooks/use-toast"
type Tab = "profile" | "mailboxes" | "contacts" | "cleanup" | "cleanupQueue" | "rules" | "blocked" | "stats" | "apiTokens"
type AccountSettingsTab = "account" | "mail" | "clients" | "security"
type PendingConfirm = { title: string; description?: string; confirmText: string; destructive?: boolean; onConfirm: () => void }
-type RetryableQuery = { isError: boolean; error: Error | null; refetch: () => Promise }
+type RetryableQuery = { isLoading: boolean; isError: boolean; error: Error | null; refetch: () => Promise }
const tabs: Record = {
profile: { label: "账号设置", icon: },
mailboxes: { label: "邮箱管理", icon: },
@@ -434,7 +435,8 @@ export function ProfilePage() {
)
function renderTab() {
- const failedQueries = visibleTabQueries().filter((query) => query.isError && query.error)
+ const visibleQueries = visibleTabQueries()
+ const failedQueries = visibleQueries.filter((query) => query.isError && query.error)
if (failedQueries.length > 0) {
return (
)
}
+ if (visibleQueries.some((query) => query.isLoading)) return
if (tab === "profile") return (
+
+
+ 加载中...
+
+ )
+}
+
function contentFrameClass(tab: Tab) {
return cn(
"w-full",