Prechádzať zdrojové kódy

✨ feat(admin): 新增省市区树形管理功能

- 新增省市区管理页面,支持树形结构展示和异步加载
- 实现省市区的新增、编辑、删除、启用/禁用功能
- 支持按层级智能创建子节点(省→市→区)
- 新增 AreaForm 表单组件,支持智能预填层级和父级信息
- 新增 AreaTreeAsync 异步树形组件,支持懒加载子节点
- 集成 React Hook Form 和 Zod 进行表单验证
- 使用 TanStack Query 进行数据管理和缓存优化
- 移除快递公司相关客户端代码,优化导入结构
yourname 1 mesiac pred
rodič
commit
2e8b92a930

+ 2 - 4
mini/src/api.ts

@@ -8,9 +8,8 @@ import type {
   DeliveryAddressRoutes,
   OrderRoutes,
   OrderGoodsRoutes,
-  ExpressCompanyRoutes,
   MerchantRoutes,
-  CityRoutes
+  AreaRoutes
 } from '@d8d/server'
 import { rpcClient } from './utils/rpc-client'
 
@@ -26,8 +25,7 @@ export const goodsCategoryClient = rpcClient<GoodsCategoryRoutes>().api.v1['good
 export const deliveryAddressClient = rpcClient<DeliveryAddressRoutes>().api.v1['delivery-addresses']
 export const orderClient = rpcClient<OrderRoutes>().api.v1.orders
 export const orderGoodsClient = rpcClient<OrderGoodsRoutes>().api.v1['orders-goods']
-export const expressCompanyClient = rpcClient<ExpressCompanyRoutes>().api.v1['express-companies']
 export const merchantClient = rpcClient<MerchantRoutes>().api.v1.merchants
 
 // 系统相关客户端
-export const cityClient = rpcClient<CityRoutes>().api.v1.cities
+export const areaClient = rpcClient<AreaRoutes>().api.v1.areas

+ 3 - 3
packages/geo-areas/src/api/admin/areas/index.ts

@@ -21,8 +21,8 @@ const areaRoutes = createCrudRoutes({
   relations: ['parent', 'children'],
   middleware: [authMiddleware]
 })
-
-export default new OpenAPIHono()
+const app = new OpenAPIHono()
   // 合并树形结构路由
   .route('/', treeRoutes)
-  .route('/', areaRoutes);
+  .route('/', areaRoutes);
+export default app;

+ 4 - 1
packages/server/src/index.ts

@@ -128,7 +128,7 @@ export const fileApiRoutes = api.route('/api/v1/files', fileModuleRoutes)
 export const roleRoutes = api.route('/api/v1/roles', roleModuleRoutes)
 
 // 导入已实现的包路由
-import { areasRoutes } from '@d8d/geo-areas'
+import { areasRoutes, adminAreasRoutes } from '@d8d/geo-areas'
 import { PaymentRoutes } from '@d8d/mini-payment'
 import { advertisementRoutes, advertisementTypeRoutes } from '@d8d/advertisements-module'
 import { userDeliveryAddressRoutes } from '@d8d/delivery-address-module'
@@ -140,6 +140,7 @@ import { userSupplierRoutes } from '@d8d/supplier-module'
 
 // 注册已实现的包路由
 export const areaApiRoutes = api.route('/api/v1/areas', areasRoutes)
+export const adminAreaApiRoutes = api.route('/api/v1/admin/areas', adminAreasRoutes)
 export const paymentApiRoutes = api.route('/api/v1/payments', PaymentRoutes)
 export const advertisementApiRoutes = api.route('/api/v1/advertisements', advertisementRoutes)
 export const advertisementTypeApiRoutes = api.route('/api/v1/advertisement-types', advertisementTypeRoutes)
@@ -167,6 +168,8 @@ export type DeliveryAddressRoutes = typeof deliveryAddressApiRoutes
 export type OrderRoutes = typeof orderApiRoutes
 export type OrderGoodsRoutes = typeof orderGoodsApiRoutes
 export type OrderRefundRoutes = typeof orderRefundApiRoutes
+export type AreaRoutes = typeof areaApiRoutes
+export type AdminAreaRoutes = typeof adminAreaApiRoutes
 
 app.route('/', api)
 export default app

+ 213 - 0
web/src/client/admin/components/AreaForm.tsx

@@ -0,0 +1,213 @@
+import React from 'react';
+import { useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Button } from '@/client/components/ui/button';
+import { Input } from '@/client/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/client/components/ui/select';
+import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/client/components/ui/form';
+import { createAreaSchema, updateAreaSchema } from '@d8d/server/modules/areas/area.schema';
+import type { CreateAreaInput, UpdateAreaInput } from '@d8d/server/modules/areas/area.schema';
+import { AreaLevel } from '@d8d/server/modules/areas/area.entity';
+import { DisabledStatus } from '@/share/types';
+
+interface AreaFormProps {
+  area?: UpdateAreaInput & { id?: number };
+  onSubmit: (data: CreateAreaInput | UpdateAreaInput) => Promise<void>;
+  onCancel: () => void;
+  isLoading?: boolean;
+  /** 智能预填的层级 */
+  smartLevel?: number;
+  /** 智能预填的父级ID */
+  smartParentId?: number;
+}
+
+// 辅助函数:根据层级值获取显示名称
+const getLevelDisplayName = (level: number | undefined): string => {
+  switch (level) {
+    case AreaLevel.PROVINCE:
+      return '省/直辖市';
+    case AreaLevel.CITY:
+      return '市';
+    case AreaLevel.DISTRICT:
+      return '区/县';
+    default:
+      return '未知层级';
+  }
+};
+
+export const AreaForm: React.FC<AreaFormProps> = ({
+  area,
+  onSubmit,
+  onCancel,
+  isLoading = false,
+  smartLevel,
+  smartParentId
+}) => {
+  const isEditing = !!area;
+
+  const form = useForm<CreateAreaInput | UpdateAreaInput>({
+    resolver: zodResolver(isEditing ? updateAreaSchema : createAreaSchema),
+    defaultValues: area ? {
+      parentId: area.parentId || undefined,
+      name: area.name,
+      level: area.level,
+      code: area.code,
+      isDisabled: area.isDisabled,
+    } : {
+      parentId: smartParentId || undefined,
+      name: '',
+      level: smartLevel ?? AreaLevel.PROVINCE,
+      code: '',
+      isDisabled: DisabledStatus.ENABLED,
+    },
+  });
+
+  const handleSubmit = async (data: CreateAreaInput | UpdateAreaInput) => {
+    await onSubmit(data);
+  };
+
+
+  return (
+    <Form {...form}>
+      <form onSubmit={form.handleSubmit(handleSubmit)} className="space-y-6">
+        <div className="grid grid-cols-1 gap-6">
+          {/* 层级显示(只读) */}
+          <FormField
+            control={form.control}
+            name="level"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>层级</FormLabel>
+                <FormControl>
+                  <Input
+                    value={getLevelDisplayName(field.value)}
+                    disabled
+                    className="bg-muted"
+                  />
+                </FormControl>
+                <FormDescription>
+                  根据操作上下文自动设置的层级
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          {/* 父级区域显示(只读) */}
+          <FormField
+            control={form.control}
+            name="parentId"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>父级区域</FormLabel>
+                <FormControl>
+                  <Input
+                    type="number"
+                    value={field.value || ''}
+                    disabled
+                    className="bg-muted"
+                    placeholder="顶级区域(无父级)"
+                  />
+                </FormControl>
+                <FormDescription>
+                  根据操作上下文自动设置的父级区域ID
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          {/* 区域名称 */}
+          <FormField
+            control={form.control}
+            name="name"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>区域名称</FormLabel>
+                <FormControl>
+                  <Input
+                    placeholder="输入区域名称"
+                    {...field}
+                  />
+                </FormControl>
+                <FormDescription>
+                  输入省市区名称,如:北京市、上海市、朝阳区等
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          {/* 行政区划代码 */}
+          <FormField
+            control={form.control}
+            name="code"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>行政区划代码</FormLabel>
+                <FormControl>
+                  <Input
+                    placeholder="输入行政区划代码"
+                    {...field}
+                  />
+                </FormControl>
+                <FormDescription>
+                  输入标准的行政区划代码
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+
+          {/* 状态选择 */}
+          <FormField
+            control={form.control}
+            name="isDisabled"
+            render={({ field }) => (
+              <FormItem>
+                <FormLabel>状态</FormLabel>
+                <Select onValueChange={(value) => field.onChange(Number(value))} defaultValue={field.value?.toString()}>
+                  <FormControl>
+                    <SelectTrigger>
+                      <SelectValue placeholder="选择状态" />
+                    </SelectTrigger>
+                  </FormControl>
+                  <SelectContent>
+                    <SelectItem value={DisabledStatus.ENABLED.toString()}>
+                      启用
+                    </SelectItem>
+                    <SelectItem value={DisabledStatus.DISABLED.toString()}>
+                      禁用
+                    </SelectItem>
+                  </SelectContent>
+                </Select>
+                <FormDescription>
+                  选择省市区状态
+                </FormDescription>
+                <FormMessage />
+              </FormItem>
+            )}
+          />
+        </div>
+
+        {/* 表单操作按钮 */}
+        <div className="flex justify-end gap-4">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={onCancel}
+            disabled={isLoading}
+          >
+            取消
+          </Button>
+          <Button
+            type="submit"
+            disabled={isLoading}
+          >
+            {isLoading ? '提交中...' : isEditing ? '更新' : '创建'}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};

+ 308 - 0
web/src/client/admin/components/AreaTreeAsync.tsx

@@ -0,0 +1,308 @@
+import React from 'react';
+import { ChevronRight, ChevronDown, Folder, FolderOpen, Loader2 } from 'lucide-react';
+import { Button } from '@/client/components/ui/button';
+import { Badge } from '@/client/components/ui/badge';
+import { cn } from '@/client/lib/utils';
+import { useQuery } from '@tanstack/react-query';
+import { areaClient } from '@/client/api';
+
+interface AreaNode {
+  id: number;
+  name: string;
+  code: string;
+  level: number;
+  parentId: number | null;
+  isDisabled: number;
+  children?: AreaNode[];
+}
+
+interface AreaTreeAsyncProps {
+  areas: AreaNode[];
+  expandedNodes: Set<number>;
+  onToggleNode: (nodeId: number) => void;
+  onEdit: (area: AreaNode) => void;
+  onDelete: (area: AreaNode) => void;
+  onToggleStatus: (area: AreaNode) => void;
+  onAddChild: (area: AreaNode) => void;
+}
+
+// 子树加载组件
+interface SubTreeLoaderProps {
+  nodeId: number;
+  isExpanded: boolean;
+  hasChildren: boolean;
+  depth: number;
+  expandedNodes: Set<number>;
+  onToggleNode: (nodeId: number) => void;
+  onEdit: (area: AreaNode) => void;
+  onDelete: (area: AreaNode) => void;
+  onToggleStatus: (area: AreaNode) => void;
+  onAddChild: (area: AreaNode) => void;
+}
+
+const SubTreeLoader: React.FC<SubTreeLoaderProps> = ({
+  nodeId,
+  isExpanded,
+  hasChildren,
+  depth,
+  expandedNodes,
+  onToggleNode,
+  onEdit,
+  onDelete,
+  onToggleStatus,
+  onAddChild
+}) => {
+  const { data: subTreeData, isLoading: isSubTreeLoading } = useQuery({
+    queryKey: ['areas-subtree', nodeId],
+    queryFn: async () => {
+      const res = await areaClient.$get({
+        query: { 
+          page: 1, 
+          pageSize: 100 , 
+          filters: JSON.stringify({ parentId: nodeId}),
+          sortBy: 'id',
+          sortOrder: 'ASC'
+        }
+      });
+      if (res.status !== 200) throw new Error('获取子树失败');
+      const response = await res.json();
+      return response.data;
+    },
+    enabled: isExpanded && hasChildren,
+    staleTime: 5 * 60 * 1000,
+    gcTime: 10 * 60 * 1000,
+  });
+
+  if (isSubTreeLoading) {
+    return (
+      <div className="flex items-center justify-center py-2 px-3 text-muted-foreground">
+        <Loader2 className="h-4 w-4 animate-spin mr-2" />
+        加载中...
+      </div>
+    );
+  }
+
+  if (!subTreeData) {
+    return (
+      <div className="py-2 px-3 text-muted-foreground text-sm">
+        暂无子节点
+      </div>
+    );
+  }
+
+  // subTreeData 是一个 AreaNode 数组,直接使用
+  const childNodes = subTreeData || [];
+
+  if (childNodes.length === 0) {
+    return (
+      <div className="py-2 px-3 text-muted-foreground text-sm">
+        暂无子节点
+      </div>
+    );
+  }
+
+  return (
+    <div>
+      {childNodes.map((node) => (
+        <TreeNode
+          key={node.id}
+          node={node}
+          depth={depth + 1}
+          expandedNodes={expandedNodes}
+          onToggleNode={onToggleNode}
+          onEdit={onEdit}
+          onDelete={onDelete}
+          onToggleStatus={onToggleStatus}
+          onAddChild={onAddChild}
+        />
+      ))}
+    </div>
+  );
+};
+
+// 树节点组件
+interface TreeNodeProps {
+  node: AreaNode;
+  depth?: number;
+  expandedNodes: Set<number>;
+  onToggleNode: (nodeId: number) => void;
+  onEdit: (area: AreaNode) => void;
+  onDelete: (area: AreaNode) => void;
+  onToggleStatus: (area: AreaNode) => void;
+  onAddChild: (area: AreaNode) => void;
+}
+
+const TreeNode: React.FC<TreeNodeProps> = ({
+  node,
+  depth = 0,
+  expandedNodes,
+  onToggleNode,
+  onEdit,
+  onDelete,
+  onToggleStatus,
+  onAddChild
+}) => {
+  const isExpanded = expandedNodes.has(node.id);
+  const isDisabled = node.isDisabled === 1;
+  const hasChildren = node.level < 3; // 省级和市级节点可能有子节点
+
+  return (
+    <div key={node.id} className="select-none">
+      {/* 节点行 */}
+      <div
+        className={cn(
+          "group flex items-center gap-2 py-2 px-3 hover:bg-muted/50 cursor-pointer border-b",
+          depth > 0 && "ml-6"
+        )}
+        style={{ marginLeft: `${depth * 24}px` }}
+      >
+        {/* 展开/收起按钮 */}
+        {hasChildren && (
+          <Button
+            variant="ghost"
+            size="sm"
+            className="h-6 w-6 p-0"
+            onClick={() => onToggleNode(node.id)}
+          >
+            {isExpanded ? (
+              <ChevronDown className="h-4 w-4" />
+            ) : (
+              <ChevronRight className="h-4 w-4" />
+            )}
+          </Button>
+        )}
+        {!hasChildren && <div className="w-6" />}
+
+        {/* 图标 */}
+        <div className="flex-shrink-0">
+          {hasChildren ? (
+            isExpanded ? (
+              <FolderOpen className="h-4 w-4 text-blue-500" />
+            ) : (
+              <Folder className="h-4 w-4 text-blue-400" />
+            )
+          ) : (
+            <div className="h-4 w-4" />
+          )}
+        </div>
+
+        {/* 节点信息 */}
+        <div className="flex-1 flex items-center gap-3">
+          <span className={cn("font-medium", isDisabled && "text-muted-foreground line-through")}>
+            {node.name}
+          </span>
+          <Badge variant="outline" className="text-xs">
+            {getLevelName(node.level)}
+          </Badge>
+          <span className="text-xs text-muted-foreground">
+            {node.code}
+          </span>
+          <Badge variant={isDisabled ? "secondary" : "default"} className="text-xs">
+            {isDisabled ? '禁用' : '启用'}
+          </Badge>
+        </div>
+
+        {/* 操作按钮 */}
+        <div className="flex gap-1 opacity-0 group-hover:opacity-100 transition-opacity">
+          {/* 新增子节点按钮 - 根据层级显示不同文本 */}
+          {node.level < 3 && (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={(e) => {
+                e.stopPropagation();
+                onAddChild(node);
+              }}
+            >
+              {node.level === 1 ? '新增市' : '新增区'}
+            </Button>
+          )}
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={(e) => {
+              e.stopPropagation();
+              onEdit(node);
+            }}
+          >
+            编辑
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={(e) => {
+              e.stopPropagation();
+              onToggleStatus(node);
+            }}
+          >
+            {isDisabled ? '启用' : '禁用'}
+          </Button>
+          <Button
+            variant="outline"
+            size="sm"
+            onClick={(e) => {
+              e.stopPropagation();
+              onDelete(node);
+            }}
+          >
+            删除
+          </Button>
+        </div>
+      </div>
+
+      {/* 子节点 */}
+      {isExpanded && hasChildren && (
+        <SubTreeLoader
+          nodeId={node.id}
+          isExpanded={isExpanded}
+          hasChildren={hasChildren}
+          depth={depth}
+          expandedNodes={expandedNodes}
+          onToggleNode={onToggleNode}
+          onEdit={onEdit}
+          onDelete={onDelete}
+          onToggleStatus={onToggleStatus}
+          onAddChild={onAddChild}
+        />
+      )}
+    </div>
+  );
+};
+
+export const AreaTreeAsync: React.FC<AreaTreeAsyncProps> = ({
+  areas,
+  expandedNodes,
+  onToggleNode,
+  onEdit,
+  onDelete,
+  onToggleStatus,
+  onAddChild
+}) => {
+  return (
+    <div className="border rounded-lg bg-background">
+      {areas.map(area => (
+        <TreeNode
+          key={area.id}
+          node={area}
+          depth={0}
+          expandedNodes={expandedNodes}
+          onToggleNode={onToggleNode}
+          onEdit={onEdit}
+          onDelete={onDelete}
+          onToggleStatus={onToggleStatus}
+          onAddChild={onAddChild}
+        />
+      ))}
+    </div>
+  );
+};
+
+// 获取层级显示名称
+const getLevelName = (level: number) => {
+  switch (level) {
+    case 1: return '省/直辖市';
+    case 2: return '市';
+    case 3: return '区/县';
+    default: return '未知';
+  }
+};

+ 463 - 0
web/src/client/admin/pages/AreasTreePage.tsx

@@ -0,0 +1,463 @@
+import React from 'react';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { Button } from '@/client/components/ui/button';
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/client/components/ui/card';
+import { Plus } from 'lucide-react';
+import { useState } from 'react';
+import { areaClient } from '@/client/api';
+import type { InferResponseType, InferRequestType } from 'hono/client';
+import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/client/components/ui/dialog';
+import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/client/components/ui/alert-dialog';
+import { AreaForm } from '../components/AreaForm';
+import { AreaTreeAsync } from '../components/AreaTreeAsync';
+import type { CreateAreaInput, UpdateAreaInput } from '@d8d/server/modules/areas/area.schema';
+import { toast } from 'sonner';
+
+// 类型提取规范
+type AreaResponse = InferResponseType<typeof areaClient.$get, 200>['data'][0];
+type CreateAreaRequest = InferRequestType<typeof areaClient.$post>['json'];
+type UpdateAreaRequest = InferRequestType<typeof areaClient[':id']['$put']>['json'];
+
+// 树形节点类型
+interface AreaNode {
+  id: number;
+  name: string;
+  code: string;
+  level: number;
+  parentId: number | null;
+  isDisabled: number;
+  children?: AreaNode[];
+}
+
+// 统一操作处理函数
+const handleOperation = async (operation: () => Promise<any>) => {
+  try {
+    await operation();
+    // toast.success('操作成功');
+    console.log('操作成功');
+  } catch (error) {
+    console.error('操作失败:', error);
+    // toast.error('操作失败,请重试');
+    throw error;
+  }
+};
+
+
+export const AreasTreePage: React.FC = () => {
+  const queryClient = useQueryClient();
+  const [expandedNodes, setExpandedNodes] = useState<Set<number>>(new Set());
+  const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
+  const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
+  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
+  const [isStatusDialogOpen, setIsStatusDialogOpen] = useState(false);
+  const [selectedArea, setSelectedArea] = useState<AreaResponse | null>(null);
+  const [isAddChildDialogOpen, setIsAddChildDialogOpen] = useState(false);
+  const [parentAreaForChild, setParentAreaForChild] = useState<AreaNode | null>(null);
+
+  // 查询省级数据(异步加载)
+  const { data: provinceData, isLoading: isProvinceLoading } = useQuery({
+    queryKey: ['areas-tree-province'],
+    queryFn: async () => {
+      const res = await areaClient.$get({
+        query: { 
+          page: 1, 
+          pageSize: 100 , 
+          filters: JSON.stringify({ level: 1}),
+          sortBy: 'id',
+          sortOrder: 'ASC'
+        }
+      });
+      if (res.status !== 200) throw new Error('获取省级数据失败');
+      const response = await res.json();
+      return response.data;
+    },
+    staleTime: 5 * 60 * 1000,
+    gcTime: 10 * 60 * 1000,
+  });
+
+  // 创建省市区
+  const createMutation = useMutation({
+    mutationFn: async (data: CreateAreaRequest) => {
+      await handleOperation(async () => {
+        const res = await areaClient.$post({ json: data });
+        if (res.status !== 201) throw new Error('创建省市区失败');
+      });
+    },
+    onSuccess: (_, variables) => {
+      // 更新根级缓存
+      queryClient.invalidateQueries({ queryKey: ['areas-tree-province'] });
+
+      // 如果创建的是子节点,更新父节点的子树缓存
+      if (variables.parentId) {
+        queryClient.invalidateQueries({ queryKey: ['areas-subtree', variables.parentId] });
+      }
+
+      // 显示成功提示
+      toast.success('省市区创建成功');
+
+      // 关闭对话框
+      setIsCreateDialogOpen(false);
+
+      // 如果是创建子节点,还需要关闭子节点对话框
+      if (variables.parentId) {
+        setIsAddChildDialogOpen(false);
+        setParentAreaForChild(null);
+      }
+    },
+    onError: () => {
+      toast.error('创建失败,请重试');
+    }
+  });
+
+  // 更新省市区
+  const updateMutation = useMutation({
+    mutationFn: async ({ id, data }: { id: number; data: UpdateAreaRequest }) => {
+      await handleOperation(async () => {
+        const res = await areaClient[':id'].$put({
+          param: { id },
+          json: data
+        });
+        if (res.status !== 200) throw new Error('更新省市区失败');
+      });
+    },
+    onSuccess: () => {
+      // 更新根级缓存
+      queryClient.invalidateQueries({ queryKey: ['areas-tree-province'] });
+
+      // 如果更新的节点有父节点,更新父节点的子树缓存
+      if (selectedArea?.parentId) {
+        queryClient.invalidateQueries({ queryKey: ['areas-subtree', selectedArea.parentId] });
+      }
+
+      // 显示成功提示
+      toast.success('省市区更新成功');
+
+      setIsEditDialogOpen(false);
+      setSelectedArea(null);
+    },
+    onError: () => {
+      toast.error('更新失败,请重试');
+    }
+  });
+
+  // 删除省市区
+  const deleteMutation = useMutation({
+    mutationFn: async (id: number) => {
+      await handleOperation(async () => {
+        const res = await areaClient[':id'].$delete({
+          param: { id }
+        });
+        if (res.status !== 204) throw new Error('删除省市区失败');
+      });
+    },
+    onSuccess: () => {
+      // 更新根级缓存
+      queryClient.invalidateQueries({ queryKey: ['areas-tree-province'] });
+
+      // 如果删除的节点有父节点,更新父节点的子树缓存
+      if (selectedArea?.parentId) {
+        queryClient.invalidateQueries({ queryKey: ['areas-subtree', selectedArea.parentId] });
+      }
+
+      // 显示成功提示
+      toast.success('省市区删除成功');
+
+      setIsDeleteDialogOpen(false);
+      setSelectedArea(null);
+    },
+    onError: () => {
+      toast.error('删除失败,请重试');
+    }
+  });
+
+  // 启用/禁用省市区
+  const toggleStatusMutation = useMutation({
+    mutationFn: async ({ id, isDisabled }: { id: number; isDisabled: number }) => {
+      await handleOperation(async () => {
+        const res = await areaClient[':id'].$put({
+          param: { id },
+          json: { isDisabled }
+        });
+        if (res.status !== 200) throw new Error('更新省市区状态失败');
+      });
+    },
+    onSuccess: () => {
+      // 更新根级缓存
+      queryClient.invalidateQueries({ queryKey: ['areas-tree-province'] });
+
+      // 如果状态切换的节点有父节点,更新父节点的子树缓存
+      if (selectedArea?.parentId) {
+        queryClient.invalidateQueries({ queryKey: ['areas-subtree', selectedArea.parentId] });
+      }
+
+      // 显示成功提示
+      toast.success(`省市区${selectedArea?.isDisabled === 0 ? '禁用' : '启用'}成功`);
+
+      setIsStatusDialogOpen(false);
+      setSelectedArea(null);
+    },
+    onError: () => {
+      toast.error('状态切换失败,请重试');
+    }
+  });
+
+
+  // 处理创建省市区
+  const handleCreateArea = async (data: CreateAreaInput | UpdateAreaInput) => {
+    await createMutation.mutateAsync(data as CreateAreaInput);
+  };
+
+  // 处理更新省市区
+  const handleUpdateArea = async (data: UpdateAreaInput) => {
+    if (!selectedArea) return;
+    await updateMutation.mutateAsync({ id: selectedArea.id, data });
+  };
+
+  // 处理删除省市区
+  const handleDeleteArea = async () => {
+    if (!selectedArea) return;
+    await deleteMutation.mutateAsync(selectedArea.id);
+  };
+
+  // 处理启用/禁用省市区
+  const handleToggleStatus = async (isDisabled: number) => {
+    if (!selectedArea) return;
+    await toggleStatusMutation.mutateAsync({ id: selectedArea.id, isDisabled });
+  };
+
+  // 处理新增子节点
+  const handleAddChild = (area: AreaNode) => {
+    setParentAreaForChild(area);
+    setIsAddChildDialogOpen(true);
+  };
+
+  // 处理创建子节点
+  const handleCreateChildArea = async (data: CreateAreaInput | UpdateAreaInput) => {
+    await createMutation.mutateAsync(data as CreateAreaInput);
+  };
+
+  // 打开编辑对话框
+  const handleEdit = (area: AreaNode) => {
+    // 将 AreaNode 转换为 AreaResponse
+    const areaResponse: AreaResponse = {
+      ...area,
+      isDeleted: 0,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      createdBy: null,
+      updatedBy: null
+    };
+    setSelectedArea(areaResponse);
+    setIsEditDialogOpen(true);
+  };
+
+  // 打开删除对话框
+  const handleDelete = (area: AreaNode) => {
+    // 将 AreaNode 转换为 AreaResponse
+    const areaResponse: AreaResponse = {
+      ...area,
+      isDeleted: 0,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      createdBy: null,
+      updatedBy: null
+    };
+    setSelectedArea(areaResponse);
+    setIsDeleteDialogOpen(true);
+  };
+
+  // 打开状态切换对话框
+  const handleToggleStatusDialog = (area: AreaNode) => {
+    // 将 AreaNode 转换为 AreaResponse
+    const areaResponse: AreaResponse = {
+      ...area,
+      isDeleted: 0,
+      createdAt: new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+      createdBy: null,
+      updatedBy: null
+    };
+    setSelectedArea(areaResponse);
+    setIsStatusDialogOpen(true);
+  };
+
+  // 切换节点展开状态
+  const handleToggleNode = (nodeId: number) => {
+    setExpandedNodes(prev => {
+      const newSet = new Set(prev);
+      if (newSet.has(nodeId)) {
+        newSet.delete(nodeId);
+      } else {
+        newSet.add(nodeId);
+      }
+      return newSet;
+    });
+  };
+
+
+  return (
+    <div className="space-y-6">
+      <div className="flex items-center justify-between">
+        <div>
+          <h1 className="text-3xl font-bold tracking-tight">省市区树形管理</h1>
+          <p className="text-muted-foreground">
+            异步加载树形结构,高效管理省市区数据
+          </p>
+        </div>
+        <Button onClick={() => setIsCreateDialogOpen(true)}>
+          <Plus className="mr-2 h-4 w-4" />
+          新增省
+        </Button>
+      </div>
+
+      <Card>
+        <CardHeader>
+          <CardTitle>省市区树形结构</CardTitle>
+          <CardDescription>
+            以树形结构查看和管理省市区层级关系,默认只加载省级数据
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          {/* 树形视图 */}
+          {isProvinceLoading ? (
+            <div className="text-center py-8">
+              加载中...
+            </div>
+          ) : !provinceData || provinceData.length === 0 ? (
+            <div className="text-center py-8">
+              暂无数据
+            </div>
+          ) : (
+            <AreaTreeAsync
+              areas={provinceData}
+              expandedNodes={expandedNodes}
+              onToggleNode={handleToggleNode}
+              onEdit={handleEdit}
+              onDelete={handleDelete}
+              onToggleStatus={handleToggleStatusDialog}
+              onAddChild={handleAddChild}
+            />
+          )}
+        </CardContent>
+      </Card>
+
+      {/* 创建省市区对话框 */}
+      <Dialog open={isCreateDialogOpen} onOpenChange={setIsCreateDialogOpen}>
+        <DialogContent className="max-w-2xl">
+          <DialogHeader>
+            <DialogTitle>新增省</DialogTitle>
+            <DialogDescription>
+              填写省信息
+            </DialogDescription>
+          </DialogHeader>
+          <AreaForm
+            onSubmit={handleCreateArea}
+            isLoading={createMutation.isPending}
+            onCancel={() => setIsCreateDialogOpen(false)}
+            smartLevel={1} // 默认设置为省级
+          />
+        </DialogContent>
+      </Dialog>
+
+      {/* 编辑省市区对话框 */}
+      <Dialog open={isEditDialogOpen} onOpenChange={setIsEditDialogOpen}>
+        <DialogContent className="max-w-2xl">
+          <DialogHeader>
+            <DialogTitle>编辑省市区</DialogTitle>
+            <DialogDescription>
+              修改省市区信息
+            </DialogDescription>
+          </DialogHeader>
+          {selectedArea && (
+            <AreaForm
+              area={{
+                id: selectedArea.id,
+                parentId: selectedArea.parentId || 0,
+                name: selectedArea.name,
+                level: selectedArea.level,
+                code: selectedArea.code,
+                isDisabled: selectedArea.isDisabled
+              }}
+              onSubmit={handleUpdateArea}
+              isLoading={updateMutation.isPending}
+              onCancel={() => {
+                setIsEditDialogOpen(false);
+                setSelectedArea(null);
+              }}
+            />
+          )}
+        </DialogContent>
+      </Dialog>
+
+      {/* 新增子节点对话框 */}
+      <Dialog open={isAddChildDialogOpen} onOpenChange={setIsAddChildDialogOpen}>
+        <DialogContent className="max-w-2xl">
+          <DialogHeader>
+            <DialogTitle>
+              {parentAreaForChild?.level === 1 ? '新增市' : '新增区'}
+            </DialogTitle>
+            <DialogDescription>
+              {parentAreaForChild?.level === 1
+                ? `在省份 "${parentAreaForChild?.name}" 下新增市`
+                : `在城市 "${parentAreaForChild?.name}" 下新增区/县`}
+            </DialogDescription>
+          </DialogHeader>
+          <AreaForm
+            onSubmit={handleCreateChildArea}
+            isLoading={createMutation.isPending}
+            onCancel={() => {
+              setIsAddChildDialogOpen(false);
+              setParentAreaForChild(null);
+            }}
+            smartLevel={(parentAreaForChild?.level ?? 0) + 1}
+            smartParentId={parentAreaForChild?.id}
+          />
+        </DialogContent>
+      </Dialog>
+
+      {/* 删除确认对话框 */}
+      <AlertDialog open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>确认删除</AlertDialogTitle>
+            <AlertDialogDescription>
+              确定要删除省市区 "{selectedArea?.name}" 吗?此操作不可恢复。
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>取消</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={handleDeleteArea}
+              disabled={deleteMutation.isPending}
+            >
+              {deleteMutation.isPending ? '删除中...' : '确认删除'}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+
+      {/* 状态切换确认对话框 */}
+      <AlertDialog open={isStatusDialogOpen} onOpenChange={setIsStatusDialogOpen}>
+        <AlertDialogContent>
+          <AlertDialogHeader>
+            <AlertDialogTitle>
+              {selectedArea?.isDisabled === 0 ? '禁用' : '启用'}确认
+            </AlertDialogTitle>
+            <AlertDialogDescription>
+              确定要{selectedArea?.isDisabled === 0 ? '禁用' : '启用'}省市区 "{selectedArea?.name}" 吗?
+            </AlertDialogDescription>
+          </AlertDialogHeader>
+          <AlertDialogFooter>
+            <AlertDialogCancel>取消</AlertDialogCancel>
+            <AlertDialogAction
+              onClick={() => handleToggleStatus(selectedArea?.isDisabled === 0 ? 1 : 0)}
+              disabled={toggleStatusMutation.isPending}
+            >
+              {toggleStatusMutation.isPending ? '处理中...' : '确认'}
+            </AlertDialogAction>
+          </AlertDialogFooter>
+        </AlertDialogContent>
+      </AlertDialog>
+    </div>
+  );
+};

+ 5 - 1
web/src/client/api.ts

@@ -4,7 +4,7 @@ import type {
   AuthRoutes, UserRoutes, RoleRoutes, FileRoutes,
   AdvertisementRoutes, AdvertisementTypeRoutes, GoodsCategoryRoutes, GoodsRoutes,
   SupplierRoutes, MerchantRoutes, 
-  DeliveryAddressRoutes, OrderRoutes, OrderGoodsRoutes, OrderRefundRoutes
+  DeliveryAddressRoutes, OrderRoutes, OrderGoodsRoutes, OrderRefundRoutes, AdminAreaRoutes
 } from '@d8d/server';
 
 // 创建 axios 适配器
@@ -102,6 +102,10 @@ export const merchantClient = hc<MerchantRoutes>('/', {
   fetch: axiosFetch,
 }).api.v1.merchants
 
+export const areaClient = hc<AdminAreaRoutes>('/', {
+  fetch: axiosFetch,
+}).api.v1.admin.areas
+
 export const deliveryAddressClient = hc<DeliveryAddressRoutes>('/', {
   fetch: axiosFetch,
 }).api.v1['delivery-addresses']