配置 mdx 与 turbopack 继承；修复退出登录后循环跳转的问题；button 统一复用可导出样式并微调样式

2025-06-06 16:17:33 +08:00
parent 7fff0308d0
commit ce4f7e272c
11 changed files with 175 additions and 68 deletions
--- a/src/actions/base.ts
+++ b/src/actions/base.ts
@@ -44,7 +44,6 @@ const _callByDevice = cache(async <R = undefined>(
  endpoint: string,
  data?: string,
 ): Promise<ApiResponse<R>> => {
-
  // 获取设备令牌
  if (!CLIENT_ID || !CLIENT_SECRET) {
    return {
@@ -74,7 +73,7 @@ async function callByUser<R = undefined>(
  endpoint: string,
  data?: unknown,
 ): Promise<ApiResponse<R>> {
-  return postCall(_callByUser(endpoint, data ? JSON.stringify(data) : undefined))
+  return _callByUser(endpoint, data ? JSON.stringify(data) : undefined)
 }

 const _callByUser = cache(async <R = undefined>(
@@ -107,7 +106,6 @@ const _callByUser = cache(async <R = undefined>(
  })
 })

-
 // ======================
 // call
 // ======================
@@ -150,7 +148,7 @@ async function call<R = undefined>(url: string, request: RequestInit): Promise<A
      return {
        success: false,
        status: response.status,
-        message: json.message || json.error_description || '请求失败' // 业务错误（message）或者 oauth 错误（error_description）
+        message: json.message || json.error_description || '请求失败', // 业务错误（message）或者 oauth 错误（error_description）
      }
    }
    return {
@@ -162,7 +160,6 @@ async function call<R = undefined>(url: string, request: RequestInit): Promise<A
  throw new Error(`无法解析响应数据，未处理的 Content-Type: ${type}`)
 }

-
 async function postCall<R = undefined>(rawResp: Promise<ApiResponse<R>>) {
  const header = await headers()
  const pathname = header.get('x-pathname') || '/'
--- a/src/app/(home)/@header/_client/provider.tsx
+++ b/src/app/(home)/@header/_client/provider.tsx
@@ -54,7 +54,7 @@ export default function Provider(props: ProviderProps) {
  // 用户信息
  // ======================

-  const profile = useProfileStore(store=>store.profile)
+  const profile = useProfileStore(store => store.profile)

  // ======================
  // render
@@ -144,7 +144,7 @@ export default function Provider(props: ProviderProps) {
              </>
              : (
                <Link href={`/admin`}>
-                  <Button theme={`gradient`}>
+                  <Button theme={`gradient`} className={`h-12`}>
                    进入控制台
                  </Button>
                </Link>
--- a/src/app/admin/_client/profile.tsx
+++ b/src/app/admin/_client/profile.tsx
@@ -3,22 +3,23 @@ import {Button} from '@/components/ui/button'
 import {logout} from '@/actions/auth'
 import {useProfileStore} from '@/components/providers/StoreProvider'
 import {useRouter} from 'next/navigation'
-import {toast} from 'sonner'

 export type ProfileProps = {}

 export default function Profile(props: ProfileProps) {
+  const router = useRouter()
  const refreshProfile = useProfileStore(store => store.refreshProfile)
  const doLogout = async () => {
    const resp = await logout()
    if (resp.success) {
-      await refreshProfile()
+      refreshProfile().then()
+      router.replace('/')
    }
  }

  return (
    <div className="flex gap-2 items-center">
-      <Button theme={`error`} onClick={doLogout}>
+      <Button theme={`fail`} onClick={doLogout}>
        退出登录
      </Button>
    </div>
--- a/src/app/admin/whitelist/page.tsx
+++ b/src/app/admin/whitelist/page.tsx
@@ -231,7 +231,7 @@ export default function WhitelistPage(props: WhitelistPageProps) {
          添加白名单
        </Button>
        <Button
-          theme={`error`}
+          theme={`fail`}
          className={`ml-2`}
          disabled={selection.size === 0 || wait}
          onClick={() => confirmRemove()}>
@@ -277,7 +277,7 @@ export default function WhitelistPage(props: WhitelistPageProps) {
                <Button
                  className={`h-9 w-9`}
                  onClick={() => confirmRemove(row.original.id)}
-                  theme={`error`}
+                  theme={`fail`}
                  disabled={wait}
                >
                  <Trash2 className="w-4 h-4"/>
@@ -332,7 +332,7 @@ export default function WhitelistPage(props: WhitelistPageProps) {
          </AlertDialogHeader>
          <AlertDialogFooter>
            <Button theme="outline" onClick={() => setAlertVisible(false)}>取消</Button>
-            <Button theme="error" onClick={() => remove()}>删除</Button>
+            <Button theme="fail" onClick={() => remove()}>删除</Button>
          </AlertDialogFooter>
        </AlertDialogContent>
      </AlertDialog>
--- a/src/components/date-range-picker.tsx
+++ b/src/components/date-range-picker.tsx
@@ -0,0 +1,129 @@
+'use client'
+
+import * as React from "react"
+import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
+import { Button } from './ui/button'
+import { merge } from '@/lib/utils'
+import { CalendarIcon } from 'lucide-react'
+import { format, isValid } from 'date-fns'
+import { Calendar } from './ui/calendar'
+import { DateRange } from 'react-day-picker'
+
+export type DateRangePickerProps = {
+  className?: string
+  onChange?: (dateRange: DateRange | undefined) => void
+  value?: DateRange
+  disabled?: boolean
+  required?: boolean
+  placeholder?: string
+  error?: boolean
+  errorMessage?: string
+  description?: string
+  helperText?: string
+  format?: string
+  name?: string
+  fromDate?: Date
+  toDate?: Date
+  numberOfMonths?: number
+  showOutsideDays?: boolean
+  fixedWeeks?: boolean
+  weekStartsOn?: 0 | 1 | 2 | 3 | 4 | 5 | 6
+  onBlur?: () => void
+  calendarClassName?: string
+}
+
+export default function DateRangePicker({
+  className,
+  onChange,
+  value,
+  disabled,
+  required,
+  placeholder = "选择日期范围",
+  format: dateFormat = "yyyy-MM-dd",
+  name,
+  fromDate,
+  toDate,
+  numberOfMonths = 2,
+  showOutsideDays = true,
+  fixedWeeks = false,
+  weekStartsOn = 1,
+  onBlur,
+  calendarClassName,
+}: DateRangePickerProps) {
+  const [open, setOpen] = React.useState(false)
+
+  const handleSelectRange = (range: DateRange | undefined) => {
+    onChange?.(range)
+    if (range?.from && range?.to) {
+      setOpen(false)
+    }
+  }
+  
+  const formatDate = (date: Date | undefined) => {
+    return date && isValid(date) ? format(date, dateFormat) : ''
+  }
+  
+  // 格式化显示的日期范围
+  const displayValue = React.useMemo(() => {
+    if (!value?.from) return placeholder
+    
+    if (!value.to) {
+      return `${formatDate(value.from)}`
+    }
+    
+    return `${formatDate(value.from)} ~ ${formatDate(value.to)}`
+  }, [value, placeholder, dateFormat])
+
+  const handleOpenChange = (isOpen: boolean) => {
+    setOpen(isOpen)
+    if (!isOpen) {
+      onBlur?.()
+    }
+  }
+
+  return (
+    <Popover open={open} onOpenChange={handleOpenChange}>
+      <PopoverTrigger asChild>
+        <Button
+          theme="outline"
+          className={merge(
+            'w-full justify-start text-left font-normal h-9',
+            !value && 'text-muted-foreground',
+            disabled && 'cursor-not-allowed opacity-70',
+            className,
+          )}
+          disabled={disabled}
+        >
+          <CalendarIcon className="mr-2 h-4 w-4" />
+          <span className={merge('flex-1', !value?.from && 'text-muted-foreground')}>
+            {displayValue}
+          </span>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-auto p-0" align="start">
+        <Calendar
+          mode="range"
+          defaultMonth={value?.from}
+          selected={value}
+          onSelect={handleSelectRange}
+          numberOfMonths={numberOfMonths}
+          showOutsideDays={showOutsideDays}
+          fixedWeeks={fixedWeeks}
+          weekStartsOn={weekStartsOn}
+          disabled={
+            !!fromDate && !!toDate ? { 
+              before: fromDate,
+              after: toDate 
+            } : !!fromDate ? {
+              before: fromDate
+            } : !!toDate ? {
+              after: toDate
+            } : undefined
+          }
+          initialFocus
+          className={calendarClassName}
+        />
+      </PopoverContent>
+    </Popover>
+  )
+}
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -1,67 +1,44 @@
 import * as React from 'react'
 import {merge} from '@/lib/utils'
-import {cva} from 'class-variance-authority'
+import {cva, VariantProps} from 'class-variance-authority'

-const buttonVariants = cva(
-  'inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0',
+export const buttonVariants = cva(
+  [
+    `transition-all duration-200 ease-in-out`,
+    `h-10 px-4 rounded-md cursor-pointer whitespace-nowrap`,
+    'inline-flex items-center justify-center gap-2',
+    '[&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 ',
+    'outline-none focus-visible:ring-4 ring-blue-200',
+    'disabled:pointer-events-none disabled:opacity-50 ',
+    'aria-invalid:ring-fail/20 dark:aria-invalid:ring-fail/40 aria-invalid:border-fail',
+  ],
  {
    variants: {
-      variant: {
-        default:
-          'bg-primary text-primary-foreground shadow hover:bg-primary/90',
-        destructive:
-          'bg-fail text-fail-foreground shadow-sm hover:bg-destructive/90',
-        outline:
-          'border border-input shadow-sm hover:bg-secondary hover:text-secondary-foreground bg-card',
-        secondary:
-          'bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80',
-        ghost: 'hover:bg-secondary hover:text-secondary-foreground',
-        link: 'text-primary underline-offset-4 hover:underline',
-      },
-      size: {
-        default: 'h-9 px-4 py-2',
-        sm: 'h-8 rounded-md px-3 text-xs',
-        lg: 'h-10 rounded-md px-8',
-        icon: 'h-9 w-9',
+      theme: {
+        gradient: 'bg-gradient-to-r from-blue-400 to-cyan-300 text-white ring-offset-2',
+        default: 'bg-primary text-primary-foreground hover:bg-primary/90',
+        outline: 'border bg-background hover:bg-secondary hover:text-secondary-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
+        ghost: 'text-foreground hover:bg-muted',
+        accent: 'bg-accent text-accent-foreground hover:bg-accent/90',
+        fail: 'bg-fail text-white hover:bg-fail/90',
+        warn: '',
+        done: '',
      },
    },
    defaultVariants: {
-      variant: 'default',
-      size: 'default',
+      theme: 'default',
    },
  },
 )

-type ButtonProps = React.ComponentProps<'button'> & {
-  theme?: 'default' | 'outline' | 'gradient' | 'error' | 'accent' | 'ghost'
-}
+type ButtonProps = React.ComponentProps<'button'> & VariantProps<typeof buttonVariants>

-function Button(rawProps: ButtonProps) {
+export function Button(rawProps: ButtonProps) {
  const {className, theme, ...props} = rawProps
  return (
    <button
      {...props}
-      className={merge(
-        `transition-all duration-200 ease-in-out`,
-        `h-10 px-4 rounded-md cursor-pointer`,
-        'whitespace-nowrap',
-        'inline-flex items-center justify-center gap-2',
-        'disabled:pointer-events-none disabled:opacity-50 ',
-        '[&_svg]:pointer-events-none [&_svg:not([class*=\'size-\'])]:size-4 shrink-0 [&_svg]:shrink-0 ',
-        'outline-none focus-visible:ring-4 ring-blue-200',
-        'aria-invalid:ring-fail/20 dark:aria-invalid:ring-fail/40 aria-invalid:border-fail',
-        {
-          gradient: 'bg-gradient-to-r from-blue-400 to-cyan-300 text-white ring-offset-2',
-          default: 'bg-primary text-primary-foreground hover:bg-primary/90',
-          accent: 'bg-accent text-accent-foreground hover:bg-accent/90',
-          error: 'bg-fail text-white hover:bg-fail/90',
-          outline: 'border bg-background hover:bg-secondary hover:text-secondary-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50',
-          ghost: 'text-foreground hover:bg-muted',
-        }[theme ?? 'default'],
-        className,
-      )}
+      className={merge(buttonVariants({theme}), className)}
    />
  )
 }
-
-export {Button, buttonVariants}
--- a/src/components/ui/calendar.tsx
+++ b/src/components/ui/calendar.tsx
@@ -24,7 +24,7 @@ function Calendar({
        caption_label: "text-sm font-medium",
        nav: "flex items-center gap-1",
        nav_button: merge(
-          buttonVariants({ variant: "outline" }),
+          buttonVariants({ theme: "outline" }),
          "size-7 bg-transparent p-0 opacity-50 hover:opacity-100"
        ),
        nav_button_previous: "absolute left-1",
@@ -41,7 +41,7 @@ function Calendar({
            : "[&:has([aria-selected])]:rounded-md"
        ),
        day: merge(
-          buttonVariants({ variant: "ghost" }),
+          buttonVariants({ theme: "ghost" }),
          "size-8 p-0 font-normal aria-selected:opacity-100"
        ),
        day_range_start:
--- a/src/components/ui/tabs.tsx
+++ b/src/components/ui/tabs.tsx
@@ -26,7 +26,7 @@ function TabsList({
    <TabsPrimitive.List
      data-slot="tabs-list"
      className={merge(
-        "bg-muted text-muted-foreground inline-flex w-fit items-center justify-center rounded-lg p-1 h-10",
+        "bg-muted text-muted-foreground inline-flex w-fit items-center justify-center rounded-lg p-1",
        className
      )}
      {...props}
--- a/src/lib/stores/profile.ts
+++ b/src/lib/stores/profile.ts
@@ -18,8 +18,9 @@ export const createProfileStore =  (init: User|null) => {
    profile: init,
    refreshProfile: async () => {
      const profile = await getProfile()
-      if (!profile.success) return
-      setState({profile: profile.data})
+      setState({
+        profile: profile.success ? profile.data : null,
+      })
    },
  }))
 }