diff --git a/apps/web-antd/src/api/erp/finance/payment/index.ts b/apps/web-antd/src/api/erp/finance/payment/index.ts
index e87abfe16a29072e179c7acd9b379b8fd7b5002f..c988b128656a03579e6bc698d7410284823cd20e 100644
--- a/apps/web-antd/src/api/erp/finance/payment/index.ts
+++ b/apps/web-antd/src/api/erp/finance/payment/index.ts
@@ -2,7 +2,7 @@ import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
-namespace ErpFinancePaymentApi {
+export namespace ErpFinancePaymentApi {
   /** 付款单项 */
   export interface FinancePaymentItem {
     id?: number;
diff --git a/apps/web-antd/src/api/erp/stock/move/index.ts b/apps/web-antd/src/api/erp/stock/move/index.ts
index 8b63f29fab722414a5c0d6b30129f3feeed10e81..04bb46ee434cf359df5b311e9b91b84880dfaafa 100644
--- a/apps/web-antd/src/api/erp/stock/move/index.ts
+++ b/apps/web-antd/src/api/erp/stock/move/index.ts
@@ -43,6 +43,7 @@ export namespace ErpStockMoveApi {
     status?: number;
   }
 }
+
 /**
  * 查询库存调拨单分页
  */
@@ -102,7 +103,5 @@ export function deleteStockMove(ids: number[]) {
  * 导出库存调拨单 Excel
  */
 export function exportStockMove(params: ErpStockMoveApi.StockMovePageParams) {
-  return requestClient.download('/erp/stock-move/export-excel', {
-    params,
-  });
+  return requestClient.download('/erp/stock-move/export-excel', { params });
 }
diff --git a/apps/web-antd/src/api/iot/alert/config/index.ts b/apps/web-antd/src/api/iot/alert/config/index.ts
index ef4414f235185b47b753f598f714191fa198faf1..26e114c0c2caf2b20884c1a387259a7135cc9e65 100644
--- a/apps/web-antd/src/api/iot/alert/config/index.ts
+++ b/apps/web-antd/src/api/iot/alert/config/index.ts
@@ -51,7 +51,9 @@ export function getAlertConfig(id: number) {
 
 /** 查询所有告警配置列表 */
 export function getAlertConfigList() {
-  return requestClient.get<AlertConfigApi.AlertConfig[]>('/iot/alert-config/list');
+  return requestClient.get<AlertConfigApi.AlertConfig[]>(
+    '/iot/alert-config/list',
+  );
 }
 
 /** 新增告警配置 */
@@ -90,6 +92,3 @@ export function getSimpleAlertConfigList() {
     '/iot/alert-config/simple-list',
   );
 }
-
-export { AlertConfigApi };
-
diff --git a/apps/web-antd/src/api/iot/alert/record/index.ts b/apps/web-antd/src/api/iot/alert/record/index.ts
index 02e8768f18548a95eca574fdf82769c3c09a8e77..6d2afcfcf2f605bf1ce1f8906652510df00d1776 100644
--- a/apps/web-antd/src/api/iot/alert/record/index.ts
+++ b/apps/web-antd/src/api/iot/alert/record/index.ts
@@ -80,6 +80,3 @@ export function deleteAlertRecordList(ids: number[]) {
     params: { ids: ids.join(',') },
   });
 }
-
-export { AlertRecordApi };
-
diff --git a/apps/web-antd/src/api/iot/device/device/index.ts b/apps/web-antd/src/api/iot/device/device/index.ts
index 26770f975d7a2298c3d88eb86d26923cd67502a6..650fe08753d9ee4f717183713c0e242fd487de76 100644
--- a/apps/web-antd/src/api/iot/device/device/index.ts
+++ b/apps/web-antd/src/api/iot/device/device/index.ts
@@ -79,8 +79,8 @@ export namespace IotDeviceApi {
 /** IoT 设备状态枚举 */
 export enum DeviceStateEnum {
   INACTIVE = 0, // 未激活
-  ONLINE = 1, // 在线
   OFFLINE = 2, // 离线
+  ONLINE = 1, // 在线
 }
 
 /** 查询设备分页 */
@@ -194,31 +194,3 @@ export function getDeviceMessagePairPage(params: PageParam) {
 export function sendDeviceMessage(params: IotDeviceApi.DeviceMessageSendReq) {
   return requestClient.post('/iot/device/message/send', params);
 }
-
-// Export aliases for compatibility
-export const DeviceApi = {
-  getDevicePage,
-  getDevice,
-  createDevice,
-  updateDevice,
-  updateDeviceGroup,
-  deleteDevice,
-  deleteDeviceList,
-  exportDeviceExcel,
-  getDeviceCount,
-  getSimpleDeviceList,
-  getDeviceListByProductId,
-  importDeviceTemplate,
-  getLatestDeviceProperties,
-  getHistoryDevicePropertyList,
-  getDeviceAuthInfo,
-  getDeviceMessagePage,
-  getDeviceMessagePairPage,
-  sendDeviceMessage,
-};
-
-export type DeviceVO = IotDeviceApi.Device;
-export type IotDeviceAuthInfoVO = IotDeviceApi.DeviceAuthInfo;
-export type IotDevicePropertyDetailRespVO = IotDeviceApi.DevicePropertyDetail;
-export type IotDevicePropertyRespVO = IotDeviceApi.DeviceProperty;
-
diff --git a/apps/web-antd/src/api/iot/device/group/index.ts b/apps/web-antd/src/api/iot/device/group/index.ts
index 0b7da965f399632fd175efdd445e0cec38646e62..18cac3097f52a38be64076a4bc8cb721381f1adc 100644
--- a/apps/web-antd/src/api/iot/device/group/index.ts
+++ b/apps/web-antd/src/api/iot/device/group/index.ts
@@ -49,4 +49,3 @@ export function getSimpleDeviceGroupList() {
     '/iot/device-group/simple-list',
   );
 }
-
diff --git a/apps/web-antd/src/api/iot/ota/task/index.ts b/apps/web-antd/src/api/iot/ota/task/index.ts
index 89f12ca2937dbba738268e157ec4924529057ee3..25ef2429fc1e023d71a0edc935772b9b6500a7ca 100644
--- a/apps/web-antd/src/api/iot/ota/task/index.ts
+++ b/apps/web-antd/src/api/iot/ota/task/index.ts
@@ -96,6 +96,3 @@ export function pauseOtaTask(id: number) {
 export function resumeOtaTask(id: number) {
   return requestClient.put(`/iot/ota/task/resume?id=${id}`);
 }
-
-export { IoTOtaTaskApi };
-
diff --git a/apps/web-antd/src/api/iot/ota/task/record/index.ts b/apps/web-antd/src/api/iot/ota/task/record/index.ts
index 451ed42ba5a0369a70b894b4effec258898a666a..3ad7b0990d651fc9d2fd9a1e1e722c76a5d0b665 100644
--- a/apps/web-antd/src/api/iot/ota/task/record/index.ts
+++ b/apps/web-antd/src/api/iot/ota/task/record/index.ts
@@ -99,6 +99,3 @@ export function getOtaTaskRecordStatusStatistics(
     { params: { firmwareId, taskId } },
   );
 }
-
-export { IoTOtaTaskRecordApi };
-
diff --git a/apps/web-antd/src/api/iot/product/category/index.ts b/apps/web-antd/src/api/iot/product/category/index.ts
index 66faa608312d35d517625419193f4d04ddd32354..72f04b6b3c3f9e35af33246f69a53a81ce7504d7 100644
--- a/apps/web-antd/src/api/iot/product/category/index.ts
+++ b/apps/web-antd/src/api/iot/product/category/index.ts
@@ -55,4 +55,3 @@ export function getSimpleProductCategoryList() {
     '/iot/product-category/simple-list',
   );
 }
-
diff --git a/apps/web-antd/src/api/iot/product/product/index.ts b/apps/web-antd/src/api/iot/product/product/index.ts
index 586487ed917b8d30296fbbcb3064d5c407c504ba..71bc3ade331345caa179c0d19dd6829f6d6a76d3 100644
--- a/apps/web-antd/src/api/iot/product/product/index.ts
+++ b/apps/web-antd/src/api/iot/product/product/index.ts
@@ -30,15 +30,15 @@ export namespace IotProductApi {
 /** IOT 产品设备类型枚举类 */
 export enum DeviceTypeEnum {
   DEVICE = 0, // 直连设备
-  GATEWAY_SUB = 1, // 网关子设备
   GATEWAY = 2, // 网关设备
+  GATEWAY_SUB = 1, // 网关子设备
 }
 
 /** IOT 产品定位类型枚举类 */
 export enum LocationTypeEnum {
   IP = 1, // IP 定位
-  MODULE = 2, // 设备定位
   MANUAL = 3, // 手动定位
+  MODULE = 2, // 设备定位
 }
 
 /** IOT 数据格式（编解码器类型）枚举类 */
@@ -97,18 +97,3 @@ export function getProductByKey(productKey: string) {
     params: { productKey },
   });
 }
-
-// Export aliases for compatibility
-export const ProductApi = {
-  getProductPage,
-  getProduct,
-  createProduct,
-  updateProduct,
-  deleteProduct,
-  exportProduct,
-  updateProductStatus,
-  getSimpleProductList,
-  getProductByKey,
-};
-
-export type ProductVO = IotProductApi.Product;
diff --git a/apps/web-antd/src/api/iot/rule/data/rule/index.ts b/apps/web-antd/src/api/iot/rule/data/rule/index.ts
index a8120e6c33d0d942cfc27c2bc8e06ace9a385405..55e50184ac61377b8f9873098c7c27382a6e341a 100644
--- a/apps/web-antd/src/api/iot/rule/data/rule/index.ts
+++ b/apps/web-antd/src/api/iot/rule/data/rule/index.ts
@@ -81,4 +81,3 @@ export function updateDataRuleStatus(id: number, status: number) {
     status,
   });
 }
-
diff --git a/apps/web-antd/src/api/iot/rule/data/sink/index.ts b/apps/web-antd/src/api/iot/rule/data/sink/index.ts
index 9ec0307ee8f2e0eb0f71f04f2e1a53bff4ef07d2..4614c2a6e6a9747efd0e23f55de1748bc0af97bd 100644
--- a/apps/web-antd/src/api/iot/rule/data/sink/index.ts
+++ b/apps/web-antd/src/api/iot/rule/data/sink/index.ts
@@ -29,11 +29,11 @@ export interface DataSinkVO {
 /** IoT 数据目的类型枚举 */
 export enum IotDataSinkTypeEnum {
   HTTP = 'HTTP',
-  MQTT = 'MQTT',
   KAFKA = 'KAFKA',
+  MQTT = 'MQTT',
   RABBITMQ = 'RABBITMQ',
-  ROCKETMQ = 'ROCKETMQ',
   REDIS_STREAM = 'REDIS_STREAM',
+  ROCKETMQ = 'ROCKETMQ',
 }
 
 /** HTTP 配置 */
@@ -146,6 +146,3 @@ export function updateDataSinkStatus(id: number, status: number) {
     status,
   });
 }
-
-export { DataSinkApi };
-
diff --git a/apps/web-antd/src/api/iot/rule/scene/index.ts b/apps/web-antd/src/api/iot/rule/scene/index.ts
index 36f968066e0afd626157585afa68281f32448669..5fc3224e19b00ea87c36046665f1ca902df092dc 100644
--- a/apps/web-antd/src/api/iot/rule/scene/index.ts
+++ b/apps/web-antd/src/api/iot/rule/scene/index.ts
@@ -90,6 +90,7 @@ export interface TriggerCondition {
   operator?: string;
   value?: any;
   type?: string;
+  param?: string;
 }
 
 /** IoT 场景联动规则动作 */
@@ -153,11 +154,3 @@ export function getSimpleRuleSceneList() {
     '/iot/scene-rule/simple-list',
   );
 }
-
-// 别名导出（兼容旧代码）
-export {
-  getSceneRulePage as getRuleScenePage,
-  deleteSceneRule as deleteRuleScene,
-  updateSceneRuleStatus as updateRuleSceneStatus,
-};
-
diff --git a/apps/web-antd/src/api/iot/statistics/index.ts b/apps/web-antd/src/api/iot/statistics/index.ts
index bd8bf037b42b363fa92c5f70ea0852688ad93c71..588eefcc4425d90485159b13fbc4d595bedc6285 100644
--- a/apps/web-antd/src/api/iot/statistics/index.ts
+++ b/apps/web-antd/src/api/iot/statistics/index.ts
@@ -67,18 +67,3 @@ export function getDeviceMessageSummary(statType: number) {
     { params: { statType } },
   );
 }
-
-// 导出 API 对象（兼容旧代码）
-export const StatisticsApi = {
-  getStatisticsSummary,
-  getDeviceMessageSummaryByDate,
-  getDeviceMessageSummary,
-};
-
-// 导出类型别名（兼容旧代码）
-export type IotStatisticsSummaryRespVO = IotStatisticsApi.StatisticsSummary;
-export type IotStatisticsDeviceMessageSummaryRespVO =
-  IotStatisticsApi.DeviceMessageSummary;
-export type IotStatisticsDeviceMessageSummaryByDateRespVO =
-  IotStatisticsApi.DeviceMessageSummaryByDate;
-export type IotStatisticsDeviceMessageReqVO = IotStatisticsApi.DeviceMessageReq;
diff --git a/apps/web-antd/src/api/iot/thingmodel/index.ts b/apps/web-antd/src/api/iot/thingmodel/index.ts
index eac8bea39aa8e81e03994b8e5c23e2b53f8e0203..341e0964e361bbbbbe94a9f568d0c0f36239215d 100644
--- a/apps/web-antd/src/api/iot/thingmodel/index.ts
+++ b/apps/web-antd/src/api/iot/thingmodel/index.ts
@@ -114,13 +114,13 @@ export interface ThingModelFormRules {
 }
 
 /** 验证布尔型名称 */
-export const validateBoolName = (_rule: any, value: any, callback: any) => {
-  if (!value) {
-    callback(new Error('枚举描述不能为空'));
-  } else {
+export function validateBoolName(_rule: any, value: any, callback: any) {
+  if (value) {
     callback();
+  } else {
+    callback(new Error('枚举描述不能为空'));
   }
-};
+}
 
 /** 查询产品物模型分页 */
 export function getThingModelPage(params: PageParam) {
@@ -189,18 +189,3 @@ export function exportThingModelTSL(productId: number) {
     params: { productId },
   });
 }
-
-// Add a consolidated API object and getThingModelList alias
-export const ThingModelApi = {
-  getThingModelPage,
-  getThingModel,
-  getThingModelList: getThingModelListByProductId, // alias for compatibility
-  getThingModelListByProductId,
-  getThingModelListByProductKey,
-  createThingModel,
-  updateThingModel,
-  deleteThingModel,
-  deleteThingModelList,
-  importThingModelTSL,
-  exportThingModelTSL,
-};
diff --git a/apps/web-antd/src/api/mall/market/banner/index.ts b/apps/web-antd/src/api/mall/market/banner/index.ts
index 9f9b4fab25e79c1e46068293281d342dbe19409f..d3b68156bc6f2f9ab518e40c0564ed7ab32eff59 100644
--- a/apps/web-antd/src/api/mall/market/banner/index.ts
+++ b/apps/web-antd/src/api/mall/market/banner/index.ts
@@ -5,18 +5,18 @@ import { requestClient } from '#/api/request';
 export namespace MallBannerApi {
   /** Banner 信息 */
   export interface Banner {
-    id: number;
-    title: string;
-    picUrl: string;
-    status: number;
-    url: string;
-    position: number;
-    sort: number;
-    memo: string;
+    id: number; // Banner 编号
+    title: string; // Banner 标题
+    picUrl: string; // Banner 图片
+    status: number; // 状态
+    url: string; // 链接地址
+    position: number; // Banner 位置
+    sort: number; // 排序
+    memo: string; // 备注
   }
 }
 
-/** 查询Banner管理列表 */
+/** 查询 Banner 管理列表 */
 export function getBannerPage(params: PageParam) {
   return requestClient.get<PageResult<MallBannerApi.Banner>>(
     '/promotion/banner/page',
@@ -24,24 +24,24 @@ export function getBannerPage(params: PageParam) {
   );
 }
 
-/** 查询Banner管理详情 */
+/** 查询 Banner 管理详情 */
 export function getBanner(id: number) {
   return requestClient.get<MallBannerApi.Banner>(
     `/promotion/banner/get?id=${id}`,
   );
 }
 
-/** 新增Banner管理 */
+/** 新增 Banner 管理 */
 export function createBanner(data: MallBannerApi.Banner) {
   return requestClient.post('/promotion/banner/create', data);
 }
 
-/** 修改Banner管理 */
+/** 修改 Banner 管理 */
 export function updateBanner(data: MallBannerApi.Banner) {
   return requestClient.put('/promotion/banner/update', data);
 }
 
-/** 删除Banner管理 */
+/** 删除 Banner 管理 */
 export function deleteBanner(id: number) {
   return requestClient.delete(`/promotion/banner/delete?id=${id}`);
 }
diff --git a/apps/web-antd/src/api/mall/product/brand.ts b/apps/web-antd/src/api/mall/product/brand.ts
index 7b82eb728d38e3ae59e029165c9e4b9a46361135..d5483e218a4d78ddc800e3540a73b5e2530ed98b 100644
--- a/apps/web-antd/src/api/mall/product/brand.ts
+++ b/apps/web-antd/src/api/mall/product/brand.ts
@@ -5,18 +5,12 @@ import { requestClient } from '#/api/request';
 export namespace MallBrandApi {
   /** 商品品牌 */
   export interface Brand {
-    /** 品牌编号 */
-    id?: number;
-    /** 品牌名称 */
-    name: string;
-    /** 品牌图片 */
-    picUrl: string;
-    /** 品牌排序 */
-    sort?: number;
-    /** 品牌描述 */
-    description?: string;
-    /** 开启状态 */
-    status: number;
+    id?: number; // 品牌编号
+    name: string; // 品牌名称
+    picUrl: string; // 品牌图片
+    sort?: number; // 品牌排序
+    description?: string; // 品牌描述
+    status: number; // 开启状态
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/product/category.ts b/apps/web-antd/src/api/mall/product/category.ts
index f30d6c6b7005115f4f48ec5fa68b345b3600b2a4..a67662a7a654c800b19e506680b70f3b1e32b1b1 100644
--- a/apps/web-antd/src/api/mall/product/category.ts
+++ b/apps/web-antd/src/api/mall/product/category.ts
@@ -3,18 +3,12 @@ import { requestClient } from '#/api/request';
 export namespace MallCategoryApi {
   /** 产品分类 */
   export interface Category {
-    /** 分类编号 */
-    id?: number;
-    /** 父分类编号 */
-    parentId?: number;
-    /** 分类名称 */
-    name: string;
-    /** 移动端分类图 */
-    picUrl: string;
-    /** 分类排序 */
-    sort: number;
-    /** 开启状态 */
-    status: number;
+    id?: number; // 分类编号
+    parentId?: number; // 父分类编号
+    name: string; // 分类名称
+    picUrl: string; // 移动端分类图
+    sort: number; // 分类排序
+    status: number; // 开启状态
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/product/comment.ts b/apps/web-antd/src/api/mall/product/comment.ts
index 8990c204804d1bb64aa42297661ccb084f679c2e..83a94e9fee61630dd486163a7811a7d58adf0a4c 100644
--- a/apps/web-antd/src/api/mall/product/comment.ts
+++ b/apps/web-antd/src/api/mall/product/comment.ts
@@ -4,47 +4,47 @@ import { requestClient } from '#/api/request';
 
 export namespace MallCommentApi {
   export interface Property {
-    propertyId: number;
-    propertyName: string;
-    valueId: number;
-    valueName: string;
+    propertyId: number; // 属性 ID
+    propertyName: string; // 属性名称
+    valueId: number; // 属性值 ID
+    valueName: string; // 属性值名称
   }
   /** 商品评论 */
   export interface Comment {
-    id: number;
-    userId: number;
-    userNickname: string;
-    userAvatar: string;
-    anonymous: boolean;
-    orderId: number;
-    orderItemId: number;
-    spuId: number;
-    spuName: string;
-    skuId: number;
-    visible: boolean;
-    scores: number;
-    descriptionScores: number;
-    benefitScores: number;
-    content: string;
-    picUrls: string[];
-    replyStatus: boolean;
-    replyUserId: number;
-    replyContent: string;
-    replyTime: Date;
-    createTime: Date;
-    skuProperties: Property[];
+    id: number; // 评论编号
+    userId: number; // 用户编号
+    userNickname: string; // 用户昵称
+    userAvatar: string; // 用户头像
+    anonymous: boolean; // 是否匿名
+    orderId: number; // 订单编号
+    orderItemId: number; // 订单项编号
+    spuId: number; // 商品SPU编号
+    spuName: string; // 商品名称
+    skuId: number; // 商品SKU编号
+    visible: boolean; // 是否可见
+    scores: number; // 总评分
+    descriptionScores: number; // 描述评分
+    benefitScores: number; // 服务评分
+    content: string; // 评论内容
+    picUrls: string[]; // 评论图片
+    replyStatus: boolean; // 是否回复
+    replyUserId: number; // 回复人编号
+    replyContent: string; // 回复内容
+    replyTime: Date; // 回复时间
+    createTime: Date; // 创建时间
+    skuProperties: Property[]; // SKU 属性数组
   }
 
   /** 评论可见性更新 */
   export interface CommentVisibleUpdate {
-    id: number;
-    visible: boolean;
+    id: number; // 评论编号
+    visible: boolean; // 是否可见
   }
 
   /** 评论回复 */
   export interface CommentReply {
-    id: number;
-    replyContent: string;
+    id: number; // 评论编号
+    replyContent: string; // 回复内容
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/product/favorite.ts b/apps/web-antd/src/api/mall/product/favorite.ts
index 23f38d6bbb3abffa4ffcca02dac7baf941a885a1..d9d47f3fcb996e8a9568cd9020280ab0a3cda51b 100644
--- a/apps/web-antd/src/api/mall/product/favorite.ts
+++ b/apps/web-antd/src/api/mall/product/favorite.ts
@@ -5,12 +5,9 @@ import { requestClient } from '#/api/request';
 export namespace MallFavoriteApi {
   /** 商品收藏 */
   export interface Favorite {
-    /** 收藏编号 */
-    id?: number;
-    /** 用户编号 */
-    userId?: string;
-    /** 商品 SPU 编号 */
-    spuId?: null | number;
+    id?: number; // 收藏编号
+    userId?: string; // 用户编号
+    spuId?: number; // 商品 SPU 编号
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/product/history.ts b/apps/web-antd/src/api/mall/product/history.ts
index f8505a7388cac4fe3f317d9888204a4659fb581a..5a5599db413fcc819c7b7d09744ff10ce6b18694 100644
--- a/apps/web-antd/src/api/mall/product/history.ts
+++ b/apps/web-antd/src/api/mall/product/history.ts
@@ -5,21 +5,15 @@ import { requestClient } from '#/api/request';
 export namespace MallHistoryApi {
   /** 商品浏览记录 */
   export interface BrowseHistory {
-    /** 记录编号 */
-    id?: number;
-    /** 用户编号 */
-    userId?: number;
-    /** 商品 SPU 编号 */
-    spuId?: number;
-    /** 浏览时间 */
-    createTime?: Date;
+    id?: number; // 记录编号
+    userId?: number; // 用户编号
+    spuId?: number; // 商品 SPU 编号
+    createTime?: Date; // 浏览时间
   }
 }
 
 /**
  * 获得商品浏览记录分页
- *
- * @param params 请求参数
  */
 export function getBrowseHistoryPage(params: PageParam) {
   return requestClient.get<PageResult<MallHistoryApi.BrowseHistory>>(
diff --git a/apps/web-antd/src/api/mall/product/property.ts b/apps/web-antd/src/api/mall/product/property.ts
index e13a700fad0da59a2738c87b1159e64d45dea9ad..083ce1dabe26e34eae35149405cd312c293a883b 100644
--- a/apps/web-antd/src/api/mall/product/property.ts
+++ b/apps/web-antd/src/api/mall/product/property.ts
@@ -5,29 +5,22 @@ import { requestClient } from '#/api/request';
 export namespace MallPropertyApi {
   /** 商品属性 */
   export interface Property {
-    /** 属性编号 */
-    id?: number;
-    /** 名称 */
-    name: string;
-    /** 备注 */
-    remark?: string;
+    id?: number; // 属性编号
+    name: string; // 名称
+    remark?: string; // 备注
   }
 
   /** 属性值 */
   export interface PropertyValue {
-    /** 属性值编号 */
-    id?: number;
-    /** 属性项的编号 */
-    propertyId?: number;
-    /** 名称 */
-    name: string;
-    /** 备注 */
-    remark?: string;
+    id?: number; // 属性值编号
+    propertyId?: number; // 属性项的编号
+    name: string; // 名称
+    remark?: string; // 备注
   }
 
   /** 属性值查询参数 */
   export interface PropertyValueQuery extends PageParam {
-    propertyId?: number;
+    propertyId?: number; // 属性编号
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/product/spu.ts b/apps/web-antd/src/api/mall/product/spu.ts
index 76ca7b55ab658457f0869ed625971d5769603112..38e8403ed3d2d4f7d529bea7421e0ce2dbe891ab 100644
--- a/apps/web-antd/src/api/mall/product/spu.ts
+++ b/apps/web-antd/src/api/mall/product/spu.ts
@@ -5,124 +5,73 @@ import { requestClient } from '#/api/request';
 export namespace MallSpuApi {
   /** 商品属性 */
   export interface Property {
-    /** 属性编号 */
-    propertyId?: number;
-    /** 属性名称 */
-    propertyName?: string;
-    /** 属性值编号 */
-    valueId?: number;
-    /** 属性值名称 */
-    valueName?: string;
+    propertyId?: number; // 属性编号
+    propertyName?: string; // 属性名称
+    valueId?: number; // 属性值编号
+    valueName?: string; // 属性值名称
   }
 
   /** 商品 SKU */
   export interface Sku {
-    /** 商品 SKU 编号 */
-    id?: number;
-    /** 商品 SKU 名称 */
-    name?: string;
-    /** SPU 编号 */
-    spuId?: number;
-    /** 属性数组 */
-    properties?: Property[];
-    /** 商品价格 */
-    price?: number | string;
-    /** 市场价 */
-    marketPrice?: number | string;
-    /** 成本价 */
-    costPrice?: number | string;
-    /** 商品条码 */
-    barCode?: string;
-    /** 图片地址 */
-    picUrl?: string;
-    /** 库存 */
-    stock?: number;
-    /** 商品重量，单位：kg 千克 */
-    weight?: number;
-    /** 商品体积，单位：m^3 平米 */
-    volume?: number;
-    /** 一级分销的佣金 */
-    firstBrokeragePrice?: number | string;
-    /** 二级分销的佣金 */
-    secondBrokeragePrice?: number | string;
-    /** 商品销量 */
-    salesCount?: number;
+    id?: number; // 商品 SKU 编号
+    name?: string; // 商品 SKU 名称
+    spuId?: number; // SPU 编号
+    properties?: Property[]; // 属性数组
+    price?: number | string; // 商品价格
+    marketPrice?: number | string; // 市场价
+    costPrice?: number | string; // 成本价
+    barCode?: string; // 商品条码
+    picUrl?: string; // 图片地址
+    stock?: number; // 库存
+    weight?: number; // 商品重量，单位：kg 千克
+    volume?: number; // 商品体积，单位：m^3 平米
+    firstBrokeragePrice?: number | string; // 一级分销的佣金
+    secondBrokeragePrice?: number | string; // 二级分销的佣金
+    salesCount?: number; // 商品销量
   }
 
   /** 优惠券模板 */
   export interface GiveCouponTemplate {
-    /** 优惠券编号 */
-    id?: number;
-    /** 优惠券名称 */
-    name?: string;
+    id?: number; // 优惠券编号
+    name?: string; // 优惠券名称
   }
 
   /** 商品 SPU */
   export interface Spu {
-    /** 商品编号 */
-    id?: number;
-    /** 商品名称 */
-    name?: string;
-    /** 商品分类 */
-    categoryId?: number;
-    /** 关键字 */
-    keyword?: string;
-    /** 单位 */
-    unit?: number | undefined;
-    /** 商品封面图 */
-    picUrl?: string;
-    /** 商品轮播图 */
-    sliderPicUrls?: string[];
-    /** 商品简介 */
-    introduction?: string;
-    /** 配送方式 */
-    deliveryTypes?: number[];
-    /** 运费模版 */
-    deliveryTemplateId?: number | undefined;
-    /** 商品品牌编号 */
-    brandId?: number;
-    /** 商品规格 */
-    specType?: boolean;
-    /** 分销类型 */
-    subCommissionType?: boolean;
-    /** sku数组 */
-    skus?: Sku[];
-    /** 商品详情 */
-    description?: string;
-    /** 商品排序 */
-    sort?: number;
-    /** 赠送积分 */
-    giveIntegral?: number;
-    /** 虚拟销量 */
-    virtualSalesCount?: number;
-    /** 商品价格 */
-    price?: number;
-    /** 商品拼团价格 */
-    combinationPrice?: number;
-    /** 商品秒杀价格 */
-    seckillPrice?: number;
-    /** 商品销量 */
-    salesCount?: number;
-    /** 市场价 */
-    marketPrice?: number;
-    /** 成本价 */
-    costPrice?: number;
-    /** 商品库存 */
-    stock?: number;
-    /** 商品创建时间 */
-    createTime?: Date;
-    /** 商品状态 */
-    status?: number;
-    /** 浏览量 */
-    browseCount?: number;
+    id?: number; // 商品编号
+    name?: string; // 商品名称
+    categoryId?: number; // 商品分类
+    keyword?: string; // 关键字
+    unit?: number; // 单位
+    picUrl?: string; // 商品封面图
+    sliderPicUrls?: string[]; // 商品轮播图
+    introduction?: string; // 商品简介
+    deliveryTypes?: number[]; // 配送方式
+    deliveryTemplateId?: number; // 运费模版
+    brandId?: number; // 商品品牌编号
+    specType?: boolean; // 商品规格
+    subCommissionType?: boolean; // 分销类型
+    skus?: Sku[]; // sku数组
+    description?: string; // 商品详情
+    sort?: number; // 商品排序
+    giveIntegral?: number; // 赠送积分
+    virtualSalesCount?: number; // 虚拟销量
+    price?: number; // 商品价格
+    combinationPrice?: number; // 商品拼团价格
+    seckillPrice?: number; // 商品秒杀价格
+    salesCount?: number; // 商品销量
+    marketPrice?: number; // 市场价
+    costPrice?: number; // 成本价
+    stock?: number; // 商品库存
+    createTime?: Date; // 商品创建时间
+    status?: number; // 商品状态
+    browseCount?: number; // 浏览量
   }
 
   /** 商品状态更新 */
   export interface StatusUpdate {
-    /** 商品编号 */
-    id: number;
-    /** 商品状态 */
-    status: number;
+    id: number; // 商品编号
+    status: number; // 商品状态
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/article/index.ts b/apps/web-antd/src/api/mall/promotion/article/index.ts
index 9a2ac97d71efb9efc207fa1265b756579ce877d3..cf2f90b7a195d16a338f593d1d16fb741f8f6a29 100644
--- a/apps/web-antd/src/api/mall/promotion/article/index.ts
+++ b/apps/web-antd/src/api/mall/promotion/article/index.ts
@@ -5,32 +5,19 @@ import { requestClient } from '#/api/request';
 export namespace MallArticleApi {
   /** 文章管理 */
   export interface Article {
-    /** 文章编号 */
-    id: number;
-    /** 分类编号 */
-    categoryId: number;
-    /** 文章标题 */
-    title: string;
-    /** 作者 */
-    author: string;
-    /** 封面图 */
-    picUrl: string;
-    /** 文章简介 */
-    introduction: string;
-    /** 浏览数量 */
-    browseCount: string;
-    /** 排序 */
-    sort: number;
-    /** 状态 */
-    status: number;
-    /** 商品编号 */
-    spuId: number;
-    /** 是否热门 */
-    recommendHot: boolean;
-    /** 是否轮播图 */
-    recommendBanner: boolean;
-    /** 文章内容 */
-    content: string;
+    id: number; // 文章编号
+    categoryId: number; // 分类编号
+    title: string; // 文章标题
+    author: string; // 作者
+    picUrl: string; // 封面图
+    introduction: string; // 文章简介
+    browseCount: string; // 浏览数量
+    sort: number; // 排序
+    status: number; // 状态
+    spuId: number; // 商品编号
+    recommendHot: boolean; // 是否热门
+    recommendBanner: boolean; // 是否轮播图
+    content: string; // 文章内容
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/articleCategory/index.ts b/apps/web-antd/src/api/mall/promotion/articleCategory/index.ts
index 8bf1cff42a6f8df058dfec453435f1f8f20cfb7d..49297af3fdc368f05a5157d076bb39fb94ea1e1c 100644
--- a/apps/web-antd/src/api/mall/promotion/articleCategory/index.ts
+++ b/apps/web-antd/src/api/mall/promotion/articleCategory/index.ts
@@ -5,16 +5,11 @@ import { requestClient } from '#/api/request';
 export namespace MallArticleCategoryApi {
   /** 文章分类 */
   export interface ArticleCategory {
-    /** 分类编号 */
-    id: number;
-    /** 分类名称 */
-    name: string;
-    /** 分类图片 */
-    picUrl: string;
-    /** 状态 */
-    status: number;
-    /** 排序 */
-    sort: number;
+    id: number; // 分类编号
+    name: string; // 分类名称
+    picUrl: string; // 分类图片
+    status: number; // 状态
+    sort: number; // 排序
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts b/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts
index c2a3dfdf041adff30b7940510dbd5bf8160c0843..e8501c5cb1b8e1b612f3c6b58e2d3d4165f16757 100644
--- a/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts
@@ -7,62 +7,40 @@ import { requestClient } from '#/api/request';
 export namespace MallBargainActivityApi {
   /** 砍价活动 */
   export interface BargainActivity {
-    /** 活动编号 */
-    id?: number;
-    /** 活动名称 */
-    name?: string;
-    /** 开始时间 */
-    startTime?: Date;
-    /** 结束时间 */
-    endTime?: Date;
-    /** 状态 */
-    status?: number;
-    /** 达到该人数，才能砍到低价 */
-    helpMaxCount?: number;
-    /** 最大帮砍次数 */
-    bargainCount?: number;
-    /** 最大购买次数 */
-    totalLimitCount?: number;
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 砍价起始价格，单位分 */
-    bargainFirstPrice: number;
-    /** 砍价底价 */
-    bargainMinPrice: number;
-    /** 活动库存 */
-    stock: number;
-    /** 用户每次砍价的最小金额，单位：分 */
-    randomMinPrice?: number;
-    /** 用户每次砍价的最大金额，单位：分 */
-    randomMaxPrice?: number;
+    id?: number; // 活动编号
+    name?: string; // 活动名称
+    startTime?: Date; // 开始时间
+    endTime?: Date; // 结束时间
+    status?: number; // 状态
+    helpMaxCount?: number; // 达到该人数，才能砍到低价
+    bargainCount?: number; // 最大帮砍次数
+    totalLimitCount?: number; // 最大购买次数
+    spuId: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    bargainFirstPrice: number; // 砍价起始价格，单位分
+    bargainMinPrice: number; // 砍价底价
+    stock: number; // 活动库存
+    randomMinPrice?: number; // 用户每次砍价的最小金额，单位：分
+    randomMaxPrice?: number; // 用户每次砍价的最大金额，单位：分
   }
 
   /** 砍价活动所需属性。选择的商品和属性的时候使用方便使用活动的通用封装 */
   export interface BargainProduct {
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 砍价起始价格，单位分 */
-    bargainFirstPrice: number;
-    /** 砍价底价 */
-    bargainMinPrice: number;
-    /** 活动库存 */
-    stock: number;
+    spuId: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    bargainFirstPrice: number; // 砍价起始价格，单位分
+    bargainMinPrice: number; // 砍价底价
+    stock: number; // 活动库存
   }
 
   /** 扩展 SKU 配置 */
   export type SkuExtension = {
-    /** 砍价活动配置 */
-    productConfig: BargainProduct;
+    productConfig: BargainProduct; // 砍价活动配置
   } & MallSpuApi.Sku;
 
   /** 扩展 SPU 配置 */
   export interface SpuExtension extends MallSpuApi.Spu {
-    /** SKU 列表 */
-    skus: SkuExtension[];
+    skus: SkuExtension[]; // SKU 列表
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/bargain/bargainHelp.ts b/apps/web-antd/src/api/mall/promotion/bargain/bargainHelp.ts
index c8916b179495f612dc9cf278ed03f6862a87ec41..488d34f420eb1e1d0d3f89cdde5984717ceeb335 100644
--- a/apps/web-antd/src/api/mall/promotion/bargain/bargainHelp.ts
+++ b/apps/web-antd/src/api/mall/promotion/bargain/bargainHelp.ts
@@ -5,16 +5,11 @@ import { requestClient } from '#/api/request';
 export namespace MallBargainHelpApi {
   /** 砍价记录 */
   export interface BargainHelp {
-    /** 记录编号 */
-    id: number;
-    /** 砍价记录编号 */
-    record: number;
-    /** 用户编号 */
-    userId: number;
-    /** 砍掉金额 */
-    reducePrice: number;
-    /** 结束时间 */
-    endTime: Date;
+    id: number; // 记录编号
+    record: number; // 砍价记录编号
+    userId: number; // 用户编号
+    reducePrice: number; // 砍掉金额
+    endTime: Date; // 结束时间
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/bargain/bargainRecord.ts b/apps/web-antd/src/api/mall/promotion/bargain/bargainRecord.ts
index 880b9def318527e39a0b12b5e1ddd65c0a8fd840..345606b8ebe6a88af09293a3c8f851b1e87c4e91 100644
--- a/apps/web-antd/src/api/mall/promotion/bargain/bargainRecord.ts
+++ b/apps/web-antd/src/api/mall/promotion/bargain/bargainRecord.ts
@@ -5,26 +5,16 @@ import { requestClient } from '#/api/request';
 export namespace MallBargainRecordApi {
   /** 砍价记录 */
   export interface BargainRecord {
-    /** 记录编号 */
-    id: number;
-    /** 活动编号 */
-    activityId: number;
-    /** 用户编号 */
-    userId: number;
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 砍价起始价格 */
-    bargainFirstPrice: number;
-    /** 砍价价格 */
-    bargainPrice: number;
-    /** 状态 */
-    status: number;
-    /** 订单编号 */
-    orderId: number;
-    /** 结束时间 */
-    endTime: Date;
+    id: number; // 记录编号
+    activityId: number; // 活动编号
+    userId: number; // 用户编号
+    spuId: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    bargainFirstPrice: number; // 砍价起始价格
+    bargainPrice: number; // 砍价价格
+    status: number; // 状态
+    orderId: number; // 订单编号
+    endTime: Date; // 结束时间
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts
index c0d53d6b23f0dea9cfe6762c3ec4794cb9ee62d1..b6da6218df1aa464b2efb5987fa66573c86eae21 100644
--- a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts
@@ -7,59 +7,38 @@ import { requestClient } from '#/api/request';
 export namespace MallCombinationActivityApi {
   /** 拼团活动所需属性 */
   export interface CombinationProduct {
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 拼团价格 */
-    combinationPrice: number;
+    spuId: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    combinationPrice: number; // 拼团价格
   }
   /** 拼团活动 */
   export interface CombinationActivity {
-    /** 活动编号 */
-    id?: number;
-    /** 活动名称 */
-    name?: string;
-    /** 商品 SPU 编号 */
-    spuId?: number;
-    /** 总限购数量 */
-    totalLimitCount?: number;
-    /** 单次限购数量 */
-    singleLimitCount?: number;
-    /** 开始时间 */
-    startTime?: Date;
-    /** 结束时间 */
-    endTime?: Date;
-    /** 用户数量 */
-    userSize?: number;
-    /** 总数量 */
-    totalCount?: number;
-    /** 成功数量 */
-    successCount?: number;
-    /** 订单用户数量 */
-    orderUserCount?: number;
-    /** 虚拟成团 */
-    virtualGroup?: number;
-    /** 状态 */
-    status?: number;
-    /** 限制时长 */
-    limitDuration?: number;
-    /** 拼团价格 */
-    combinationPrice?: number;
-    /** 商品列表 */
-    products: CombinationProduct[];
+    id?: number; // 活动编号
+    name?: string; // 活动名称
+    spuId?: number; // 商品 SPU 编号
+    totalLimitCount?: number; // 总限购数量
+    singleLimitCount?: number; // 单次限购数量
+    startTime?: Date; // 开始时间
+    endTime?: Date; // 结束时间
+    userSize?: number; // 用户数量
+    totalCount?: number; // 总数量
+    successCount?: number; // 成功数量
+    orderUserCount?: number; // 订单用户数量
+    virtualGroup?: number; // 虚拟成团
+    status?: number; // 状态
+    limitDuration?: number; // 限制时长
+    combinationPrice?: number; // 拼团价格
+    products: CombinationProduct[]; // 商品列表
   }
 
   /** 扩展 SKU 配置 */
   export type SkuExtension = {
-    /** 拼团活动配置 */
-    productConfig: CombinationProduct;
+    productConfig: CombinationProduct; // 拼团活动配置
   } & MallSpuApi.Sku;
 
   /** 扩展 SPU 配置 */
   export interface SpuExtension extends MallSpuApi.Spu {
-    /** SKU 列表 */
-    skus: SkuExtension[];
+    skus: SkuExtension[]; // SKU 列表
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/combination/combinationRecord.ts b/apps/web-antd/src/api/mall/promotion/combination/combinationRecord.ts
index 3d2943febe7ff215b519ab9d9b10e07bdb2d15e3..3faa2e7bb91c342302e4f81bc8c5b282875f3e54 100644
--- a/apps/web-antd/src/api/mall/promotion/combination/combinationRecord.ts
+++ b/apps/web-antd/src/api/mall/promotion/combination/combinationRecord.ts
@@ -5,44 +5,27 @@ import { requestClient } from '#/api/request';
 export namespace MallCombinationRecordApi {
   /** 拼团记录 */
   export interface CombinationRecord {
-    /** 拼团记录编号 */
-    id: number;
-    /** 拼团活动编号 */
-    activityId: number;
-    /** 用户昵称 */
-    nickname: string;
-    /** 用户头像 */
-    avatar: string;
-    /** 团长编号 */
-    headId: number;
-    /** 过期时间 */
-    expireTime: string;
-    /** 可参团人数 */
-    userSize: number;
-    /** 已参团人数 */
-    userCount: number;
-    /** 拼团状态 */
-    status: number;
-    /** 商品名字 */
-    spuName: string;
-    /** 商品图片 */
-    picUrl: string;
-    /** 是否虚拟成团 */
-    virtualGroup: boolean;
-    /** 开始时间 (订单付款后开始的时间) */
-    startTime: string;
-    /** 结束时间（成团时间/失败时间） */
-    endTime: string;
+    id: number; // 拼团记录编号
+    activityId: number; // 拼团活动编号
+    nickname: string; // 用户昵称
+    avatar: string; // 用户头像
+    headId: number; // 团长编号
+    expireTime: string; // 过期时间
+    userSize: number; // 可参团人数
+    userCount: number; // 已参团人数
+    status: number; // 拼团状态
+    spuName: string; // 商品名字
+    picUrl: string; // 商品图片
+    virtualGroup: boolean; // 是否虚拟成团
+    startTime: string; // 开始时间 (订单付款后开始的时间)
+    endTime: string; // 结束时间（成团时间/失败时间）
   }
 
   /** 拼团记录概要信息 */
   export interface RecordSummary {
-    /** 待成团数量 */
-    pendingCount: number;
-    /** 已成团数量 */
-    successCount: number;
-    /** 已失败数量 */
-    failCount: number;
+    pendingCount: number; // 待成团数量
+    successCount: number; // 已成团数量
+    failCount: number; // 已失败数量
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/coupon/coupon.ts b/apps/web-antd/src/api/mall/promotion/coupon/coupon.ts
index 52bc962909ce980d6339e0d063a61e3e8775b472..99792e4ed1575ab2efc51586c3a091b0d59cb92c 100644
--- a/apps/web-antd/src/api/mall/promotion/coupon/coupon.ts
+++ b/apps/web-antd/src/api/mall/promotion/coupon/coupon.ts
@@ -5,46 +5,28 @@ import { requestClient } from '#/api/request';
 export namespace MallCouponApi {
   /** 优惠券 */
   export interface Coupon {
-    /** 优惠券编号 */
-    id: number;
-    /** 优惠券名称 */
-    name: string;
-    /** 优惠券状态 */
-    status: number;
-    /** 优惠券类型 */
-    type: number;
-    /** 优惠券金额 */
-    price: number;
-    /** 使用门槛 */
-    usePrice: number;
-    /** 商品范围 */
-    productScope: number;
-    /** 商品编号数组 */
-    productSpuIds: number[];
-    /** 有效期类型 */
-    validityType: number;
-    /** 固定日期-生效开始时间 */
-    validStartTime: Date;
-    /** 固定日期-生效结束时间 */
-    validEndTime: Date;
-    /** 领取日期-开始天数 */
-    fixedStartTerm: number;
-    /** 领取日期-结束天数 */
-    fixedEndTerm: number;
-    /** 每人限领个数 */
-    takeLimitCount: number;
-    /** 是否设置满多少金额可用 */
-    usePriceEnabled: boolean;
-    /** 商品分类编号数组 */
-    productCategoryIds: number[];
+    id: number; // 优惠券编号
+    name: string; // 优惠券名称
+    status: number; // 优惠券状态
+    type: number; // 优惠券类型
+    price: number; // 优惠券金额
+    usePrice: number; // 使用门槛
+    productScope: number; // 商品范围
+    productSpuIds: number[]; // 商品编号数组
+    validityType: number; // 有效期类型
+    validStartTime: Date; // 固定日期-生效开始时间
+    validEndTime: Date; // 固定日期-生效结束时间
+    fixedStartTerm: number; // 领取日期-开始天数
+    fixedEndTerm: number; // 领取日期-结束天数
+    takeLimitCount: number; // 每人限领个数
+    usePriceEnabled: boolean; // 是否设置满多少金额可用
+    productCategoryIds: number[]; // 商品分类编号数组
   }
 
   /** 发送优惠券 */
   export interface CouponSendReqVO {
-    /** 优惠券编号 */
-    templateId: number;
-    /** 用户编号数组 */
-    userIds: number[];
+    templateId: number; // 优惠券编号
+    userIds: number[]; // 用户编号数组
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts b/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts
index f09455a1c186a21d120fe981965f43380e2cc547..688e1db5bff247a5ce05bd10dd6aea77707eb62f 100644
--- a/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts
+++ b/apps/web-antd/src/api/mall/promotion/coupon/couponTemplate.ts
@@ -5,54 +5,32 @@ import { requestClient } from '#/api/request';
 export namespace MallCouponTemplateApi {
   /** 优惠券模板 */
   export interface CouponTemplate {
-    /** 模板编号 */
-    id: number;
-    /** 模板名称 */
-    name: string;
-    /** 状态 */
-    status: number;
-    /** 发放数量 */
-    totalCount: number;
-    /** 每人限领个数 */
-    takeLimitCount: number;
-    /** 领取方式 */
-    takeType: number;
-    /** 使用门槛 */
-    usePrice: number;
-    /** 商品范围 */
-    productScope: number;
-    /** 商品范围值 */
-    productScopeValues: number[];
-    /** 有效期类型 */
-    validityType: number;
-    /** 固定日期-生效开始时间 */
-    validStartTime: Date;
-    /** 固定日期-生效结束时间 */
-    validEndTime: Date;
-    /** 领取日期-开始天数 */
-    fixedStartTerm: number;
-    /** 领取日期-结束天数 */
-    fixedEndTerm: number;
-    /** 优惠类型 */
-    discountType: number;
-    /** 折扣百分比 */
-    discountPercent: number;
-    /** 优惠金额 */
-    discountPrice: number;
-    /** 折扣上限 */
-    discountLimitPrice: number;
-    /** 已领取数量 */
-    takeCount: number;
-    /** 已使用数量 */
-    useCount: number;
+    id: number; // 模板编号
+    name: string; // 模板名称
+    status: number; // 状态
+    totalCount: number; // 发放数量
+    takeLimitCount: number; // 每人限领个数
+    takeType: number; // 领取方式
+    usePrice: number; // 使用门槛
+    productScope: number; // 商品范围
+    productScopeValues: number[]; // 商品范围值
+    validityType: number; // 有效期类型
+    validStartTime: Date; // 固定日期-生效开始时间
+    validEndTime: Date; // 固定日期-生效结束时间
+    fixedStartTerm: number; // 领取日期-开始天数
+    fixedEndTerm: number; // 领取日期-结束天数
+    discountType: number; // 优惠类型
+    discountPercent: number; // 折扣百分比
+    discountPrice: number; // 优惠金额
+    discountLimitPrice: number; // 折扣上限
+    takeCount: number; // 已领取数量
+    useCount: number; // 已使用数量
   }
 
   /** 优惠券模板状态更新 */
   export interface StatusUpdate {
-    /** 模板编号 */
-    id: number;
-    /** 状态 */
-    status: 0 | 1;
+    id: number; // 模板编号
+    status: 0 | 1; // 状态
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts b/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts
index f1e34ef74177d893fab7d78f10fa217573b41e68..9e469bcbb29f98631bba021789a874423287fc25 100644
--- a/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts
@@ -7,48 +7,33 @@ import { requestClient } from '#/api/request';
 export namespace MallDiscountActivityApi {
   /** 限时折扣相关属性 */
   export interface DiscountProduct {
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 折扣类型 */
-    discountType: number;
-    /** 折扣百分比 */
-    discountPercent: number;
-    /** 折扣价格 */
-    discountPrice: number;
+    spuId: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    discountType: number; // 折扣类型
+    discountPercent: number; // 折扣百分比
+    discountPrice: number; // 折扣价格
   }
 
   /** 限时折扣活动 */
   export interface DiscountActivity {
-    /** 活动编号 */
-    id?: number;
-    /** 商品 SPU 编号 */
-    spuId?: number;
-    /** 活动名称 */
-    name?: string;
-    /** 状态 */
-    status?: number;
-    /** 备注 */
-    remark?: string;
-    /** 开始时间 */
-    startTime?: Date;
-    /** 结束时间 */
-    endTime?: Date;
-    /** 商品列表 */
-    products?: DiscountProduct[];
+    id?: number; // 活动编号
+    spuId?: number; // 商品 SPU 编号
+    name?: string; // 活动名称
+    status?: number; // 状态
+    remark?: string; // 备注
+    startTime?: Date; // 开始时间
+    endTime?: Date; // 结束时间
+    products?: DiscountProduct[]; // 商品列表
   }
 
   /** 扩展 SKU 配置 */
   export type SkuExtension = {
-    /** 限时折扣配置 */
-    productConfig: DiscountProduct;
+    productConfig: DiscountProduct; // 限时折扣配置
   } & MallSpuApi.Sku;
 
   /** 扩展 SPU 配置 */
   export interface SpuExtension extends MallSpuApi.Spu {
-    /** SKU 列表 */
-    skus: SkuExtension[];
+    skus: SkuExtension[]; // SKU 列表
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/diy/page.ts b/apps/web-antd/src/api/mall/promotion/diy/page.ts
index daa5e4b060a577e9027e8726141c8b87f5a01492..d332cc09eca186b858722a04ffce61df19783de5 100644
--- a/apps/web-antd/src/api/mall/promotion/diy/page.ts
+++ b/apps/web-antd/src/api/mall/promotion/diy/page.ts
@@ -5,18 +5,12 @@ import { requestClient } from '#/api/request';
 export namespace MallDiyPageApi {
   /** 装修页面 */
   export interface DiyPage {
-    /** 页面编号 */
-    id?: number;
-    /** 模板编号 */
-    templateId?: number;
-    /** 页面名称 */
-    name: string;
-    /** 备注 */
-    remark: string;
-    /** 预览图片地址数组 */
-    previewPicUrls: string[];
-    /** 页面属性 */
-    property: string;
+    id?: number; // 页面编号
+    templateId?: number; // 模板编号
+    name: string; // 页面名称
+    remark: string; // 备注
+    previewPicUrls: string[]; // 预览图片地址数组
+    property: string; // 页面属性
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/diy/template.ts b/apps/web-antd/src/api/mall/promotion/diy/template.ts
index f7d82d35203112b4b90337b30374d646d25effb0..9b7596e85334dd36551af2257704bed4e542eb58 100644
--- a/apps/web-antd/src/api/mall/promotion/diy/template.ts
+++ b/apps/web-antd/src/api/mall/promotion/diy/template.ts
@@ -7,26 +7,18 @@ import { requestClient } from '#/api/request';
 export namespace MallDiyTemplateApi {
   /** 装修模板 */
   export interface DiyTemplate {
-    /** 模板编号 */
-    id?: number;
-    /** 模板名称 */
-    name: string;
-    /** 是否使用 */
-    used: boolean;
-    /** 使用时间 */
-    usedTime?: Date;
-    /** 备注 */
-    remark: string;
-    /** 预览图片地址数组 */
-    previewPicUrls: string[];
-    /** 模板属性 */
-    property: string;
+    id?: number; // 模板编号
+    name: string; // 模板名称
+    used: boolean; // 是否使用
+    usedTime?: Date; // 使用时间
+    remark: string; // 备注
+    previewPicUrls: string[]; // 预览图片地址数组
+    property: string; // 模板属性
   }
 
   /** 装修模板属性（包含页面列表） */
   export interface DiyTemplateProperty extends DiyTemplate {
-    /** 页面列表 */
-    pages: MallDiyPageApi.DiyPage[];
+    pages: MallDiyPageApi.DiyPage[]; // 页面列表
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts b/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts
index c2cdaf2557033943d18ec76f58659d1bbdcd84d1..6510dc0ec3d5664e27525085c2216a9fcb3aabc1 100644
--- a/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts
+++ b/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts
@@ -5,38 +5,24 @@ import { requestClient } from '#/api/request';
 export namespace MallKefuConversationApi {
   /** 客服会话 */
   export interface Conversation {
-    /** 编号 */
-    id: number;
-    /** 会话所属用户 */
-    userId: number;
-    /** 会话所属用户头像 */
-    userAvatar: string;
-    /** 会话所属用户昵称 */
-    userNickname: string;
-    /** 最后聊天时间 */
-    lastMessageTime: Date;
-    /** 最后聊天内容 */
-    lastMessageContent: string;
-    /** 最后发送的消息类型 */
-    lastMessageContentType: number;
-    /** 管理端置顶 */
-    adminPinned: boolean;
-    /** 用户是否可见 */
-    userDeleted: boolean;
-    /** 管理员是否可见 */
-    adminDeleted: boolean;
-    /** 管理员未读消息数 */
-    adminUnreadMessageCount: number;
-    /** 创建时间 */
-    createTime?: string;
+    id: number; // 编号
+    userId: number; // 会话所属用户
+    userAvatar: string; // 会话所属用户头像
+    userNickname: string; // 会话所属用户昵称
+    lastMessageTime: Date; // 最后聊天时间
+    lastMessageContent: string; // 最后聊天内容
+    lastMessageContentType: number; // 最后发送的消息类型
+    adminPinned: boolean; // 管理端置顶
+    userDeleted: boolean; // 用户是否可见
+    adminDeleted: boolean; // 管理员是否可见
+    adminUnreadMessageCount: number; // 管理员未读消息数
+    createTime?: string; // 创建时间
   }
 
   /** 会话置顶请求 */
   export interface ConversationPinnedUpdate {
-    /** 会话编号 */
-    id: number;
-    /** 是否置顶 */
-    pinned: boolean;
+    id: number; // 会话编号
+    pinned: boolean; // 是否置顶
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts b/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts
index 4bf08306eb9213f52fc72b921eae048cf4879838..3fb363267098a2b361b896a7c97b803f4d78d52f 100644
--- a/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts
+++ b/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts
@@ -5,44 +5,29 @@ import { requestClient } from '#/api/request';
 export namespace MallKefuMessageApi {
   /** 客服消息 */
   export interface Message {
-    /** 编号 */
-    id: number;
-    /** 会话编号 */
-    conversationId: number;
-    /** 发送人编号 */
-    senderId: number;
-    /** 发送人头像 */
-    senderAvatar: string;
-    /** 发送人类型 */
-    senderType: number;
-    /** 接收人编号 */
-    receiverId: number;
-    /** 接收人类型 */
-    receiverType: number;
-    /** 消息类型 */
-    contentType: number;
-    /** 消息内容 */
-    content: string;
-    /** 是否已读 */
-    readStatus: boolean;
-    /** 创建时间 */
-    createTime: Date;
+    id: number; // 编号
+    conversationId: number; // 会话编号
+    senderId: number; // 发送人编号
+    senderAvatar: string; // 发送人头像
+    senderType: number; // 发送人类型
+    receiverId: number; // 接收人编号
+    receiverType: number; // 接收人类型
+    contentType: number; // 消息类型
+    content: string; // 消息内容
+    readStatus: boolean; // 是否已读
+    createTime: Date; // 创建时间
   }
 
   /** 发送消息请求 */
   export interface MessageSend {
-    /** 会话编号 */
-    conversationId: number;
-    /** 消息类型 */
-    contentType: number;
-    /** 消息内容 */
-    content: string;
+    conversationId: number; // 会话编号
+    contentType: number; // 消息类型
+    content: string; // 消息内容
   }
 
   /** 消息列表查询参数 */
   export interface MessageQuery extends PageParam {
-    /** 会话编号 */
-    conversationId: number;
+    conversationId: number; // 会话编号
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/point/index.ts b/apps/web-antd/src/api/mall/promotion/point/index.ts
index dcde0f21d6ec22363deb7adb00e52443defc7806..72441875ab14bd9824d9fc82fda3c30f28fc87fb 100644
--- a/apps/web-antd/src/api/mall/promotion/point/index.ts
+++ b/apps/web-antd/src/api/mall/promotion/point/index.ts
@@ -7,80 +7,51 @@ import { requestClient } from '#/api/request';
 export namespace MallPointActivityApi {
   /** 积分商城商品 */
   export interface PointProduct {
-    /** 积分商城商品编号 */
-    id?: number;
-    /** 积分商城活动 id */
-    activityId?: number;
-    /** 商品 SPU 编号 */
-    spuId?: number;
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 可兑换数量 */
-    count: number;
-    /** 兑换积分 */
-    point: number;
-    /** 兑换金额，单位：分 */
-    price: number;
-    /** 积分商城商品库存 */
-    stock: number;
-    /** 积分商城商品状态 */
-    activityStatus?: number;
+    id?: number; // 积分商城商品编号
+    activityId?: number; // 积分商城活动 id
+    spuId?: number; // 商品 SPU 编号
+    skuId: number; // 商品 SKU 编号
+    count: number; // 可兑换数量
+    point: number; // 兑换积分
+    price: number; // 兑换金额，单位：分
+    stock: number; // 积分商城商品库存
+    activityStatus?: number; // 积分商城商品状态
   }
 
   /** 积分商城活动 */
   export interface PointActivity {
-    /** 积分商城活动编号 */
-    id: number;
-    /** 积分商城活动商品 */
-    spuId: number;
-    /** 活动状态 */
-    status: number;
-    /** 积分商城活动库存 */
-    stock: number;
-    /** 积分商城活动总库存 */
-    totalStock: number;
-    /** 备注 */
-    remark?: string;
-    /** 排序 */
-    sort: number;
-    /** 创建时间 */
-    createTime: string;
-    /** 积分商城商品 */
-    products: PointProduct[];
-    /** 商品名称 */
-    spuName: string;
-    /** 商品主图 */
-    picUrl: string;
-    /** 商品市场价，单位：分 */
-    marketPrice: number;
-    /** 兑换积分 */
-    point: number;
-    /** 兑换金额，单位：分 */
-    price: number;
+    id: number; // 积分商城活动编号
+    spuId: number; // 积分商城活动商品
+    status: number; // 活动状态
+    stock: number; // 积分商城活动库存
+    totalStock: number; // 积分商城活动总库存
+    remark?: string; // 备注
+    sort: number; // 排序
+    createTime: string; // 创建时间
+    products: PointProduct[]; // 积分商城商品
+    spuName: string; // 商品名称
+    picUrl: string; // 商品主图
+    marketPrice: number; // 商品市场价，单位：分
+    point: number; // 兑换积分
+    price: number; // 兑换金额，单位：分
   }
 
   /** 扩展 SKU 配置 */
   export type SkuExtension = {
-    /** 积分商城商品配置 */
-    productConfig: PointProduct;
+    productConfig: PointProduct; // 积分商城商品配置
   } & MallSpuApi.Sku;
 
   /** 扩展 SPU 配置 */
   export interface SpuExtension extends MallSpuApi.Spu {
-    /** SKU 列表 */
-    skus: SkuExtension[];
+    skus: SkuExtension[]; // SKU 列表
   }
 
   /** 扩展 SPU 配置（带积分信息） */
   export interface SpuExtensionWithPoint extends MallSpuApi.Spu {
-    /** 积分商城活动库存 */
-    pointStock: number;
-    /** 积分商城活动总库存 */
-    pointTotalStock: number;
-    /** 兑换积分 */
-    point: number;
-    /** 兑换金额，单位：分 */
-    pointPrice: number;
+    pointStock: number; // 积分商城活动库存
+    pointTotalStock: number; // 积分商城活动总库存
+    point: number; // 兑换积分
+    pointPrice: number; // 兑换金额，单位：分
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts b/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts
index e972daf2e0c07a2f96b9a8a990a5bf5021c4a581..2faf443b8f258658a69a9da49657011fbbd34078 100644
--- a/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts
@@ -5,46 +5,29 @@ import { requestClient } from '#/api/request';
 export namespace MallRewardActivityApi {
   /** 优惠规则 */
   export interface RewardRule {
-    /** 满足金额 */
-    limit?: number;
-    /** 优惠金额 */
-    discountPrice?: number;
-    /** 是否包邮 */
-    freeDelivery?: boolean;
-    /** 赠送积分 */
-    point: number;
-    /** 赠送优惠券数量 */
+    limit?: number; // 满足金额
+    discountPrice?: number; // 优惠金额
+    freeDelivery?: boolean; // 是否包邮
+    point: number; // 赠送积分
     giveCouponTemplateCounts?: {
       [key: number]: number;
-    };
+    }; // 赠送优惠券数量
   }
 
   /** 满减送活动 */
   export interface RewardActivity {
-    /** 活动编号 */
-    id?: number;
-    /** 活动名称 */
-    name?: string;
-    /** 开始时间 */
-    startTime?: Date;
-    /** 结束时间 */
-    endTime?: Date;
-    /** 开始和结束时间（仅前端使用） */
-    startAndEndTime?: Date[];
-    /** 备注 */
-    remark?: string;
-    /** 条件类型 */
-    conditionType?: number;
-    /** 商品范围 */
-    productScope?: number;
-    /** 优惠规则列表 */
-    rules: RewardRule[];
-    /** 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表 */
-    productScopeValues?: number[];
-    /** 商品分类编号列表（仅表单使用） */
-    productCategoryIds?: number[];
-    /** 商品 SPU 编号列表（仅表单使用） */
-    productSpuIds?: number[];
+    id?: number; // 活动编号
+    name?: string; // 活动名称
+    startTime?: Date; // 开始时间
+    endTime?: Date; // 结束时间
+    startAndEndTime?: Date[]; // 开始和结束时间（仅前端使用）
+    remark?: string; // 备注
+    conditionType?: number; // 条件类型
+    productScope?: number; // 商品范围
+    rules: RewardRule[]; // 优惠规则列表
+    productScopeValues?: number[]; // 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表
+    productCategoryIds?: number[]; // 商品分类编号列表（仅表单使用）
+    productSpuIds?: number[]; // 商品 SPU 编号列表（仅表单使用）
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts
index 5159c90e11f0fb4551a7e62b52eba70fc85794a8..3abb1fad2dd272f4378bffccb1517e9089361c25 100644
--- a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts
+++ b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts
@@ -7,66 +7,42 @@ import { requestClient } from '#/api/request';
 export namespace MallSeckillActivityApi {
   /** 秒杀商品 */
   export interface SeckillProduct {
-    /** 商品 SKU 编号 */
-    skuId: number;
-    /** 商品 SPU 编号 */
-    spuId: number;
-    /** 秒杀价格 */
-    seckillPrice: number;
-    /** 秒杀库存 */
-    stock: number;
+    skuId: number; // 商品 SKU 编号
+    spuId: number; // 商品 SPU 编号
+    seckillPrice: number; // 秒杀价格
+    stock: number; // 秒杀库存
   }
 
   /** 秒杀活动 */
   export interface SeckillActivity {
-    /** 活动编号 */
-    id?: number;
-    /** 商品 SPU 编号 */
-    spuId?: number;
-    /** 活动名称 */
-    name?: string;
-    /** 活动状态 */
-    status?: number;
-    /** 备注 */
-    remark?: string;
-    /** 开始时间 */
-    startTime?: Date;
-    /** 结束时间 */
-    endTime?: Date;
-    /** 排序 */
-    sort?: number;
-    /** 配置编号 */
-    configIds?: string;
-    /** 订单数量 */
-    orderCount?: number;
-    /** 用户数量 */
-    userCount?: number;
-    /** 总金额 */
-    totalPrice?: number;
-    /** 总限购数量 */
-    totalLimitCount?: number;
-    /** 单次限购数量 */
-    singleLimitCount?: number;
-    /** 秒杀库存 */
-    stock?: number;
-    /** 秒杀总库存 */
-    totalStock?: number;
-    /** 秒杀价格 */
-    seckillPrice?: number;
-    /** 秒杀商品列表 */
-    products?: SeckillProduct[];
+    id?: number; // 活动编号
+    spuId?: number; // 商品 SPU 编号
+    name?: string; // 活动名称
+    status?: number; // 活动状态
+    remark?: string; // 备注
+    startTime?: Date; // 开始时间
+    endTime?: Date; // 结束时间
+    sort?: number; // 排序
+    configIds?: string; // 配置编号
+    orderCount?: number; // 订单数量
+    userCount?: number; // 用户数量
+    totalPrice?: number; // 总金额
+    totalLimitCount?: number; // 总限购数量
+    singleLimitCount?: number; // 单次限购数量
+    stock?: number; // 秒杀库存
+    totalStock?: number; // 秒杀总库存
+    seckillPrice?: number; // 秒杀价格
+    products?: SeckillProduct[]; // 秒杀商品列表
   }
 
   /** 扩展 SKU 配置 */
   export type SkuExtension = {
-    /** 秒杀商品配置 */
-    productConfig: SeckillProduct;
+    productConfig: SeckillProduct; // 秒杀商品配置
   } & MallSpuApi.Sku;
 
   /** 扩展 SPU 配置 */
   export interface SpuExtension extends MallSpuApi.Spu {
-    /** SKU 列表 */
-    skus: SkuExtension[];
+    skus: SkuExtension[]; // SKU 列表
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts b/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts
index 39be3012e6b4e2238c76ebf33415cda90f0f7029..da76dbdfd9f58649e1b592ef96793b24cd5504c8 100644
--- a/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts
+++ b/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts
@@ -5,26 +5,18 @@ import { requestClient } from '#/api/request';
 export namespace MallSeckillConfigApi {
   /** 秒杀时段 */
   export interface SeckillConfig {
-    /** 编号 */
-    id: number;
-    /** 秒杀时段名称 */
-    name: string;
-    /** 开始时间点 */
-    startTime: string;
-    /** 结束时间点 */
-    endTime: string;
-    /** 秒杀轮播图 */
-    sliderPicUrls: string[];
-    /** 活动状态 */
-    status: number;
+    id: number; // 编号
+    name: string; // 秒杀时段名称
+    startTime: string; // 开始时间点
+    endTime: string; // 结束时间点
+    sliderPicUrls: string[]; // 秒杀轮播图
+    status: number; // 活动状态
   }
 
   /** 时段配置状态更新 */
   export interface StatusUpdate {
-    /** 编号 */
-    id: number;
-    /** 状态 */
-    status: number;
+    id: number; // 编号
+    status: number; // 状态
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/statistics/member.ts b/apps/web-antd/src/api/mall/statistics/member.ts
index fb7a6b01a3c9a0a91031889783b28883ac72af5d..ea90af372f07324d9090078ab1253072e06a6ac0 100644
--- a/apps/web-antd/src/api/mall/statistics/member.ts
+++ b/apps/web-antd/src/api/mall/statistics/member.ts
@@ -7,67 +7,65 @@ import { requestClient } from '#/api/request';
 export namespace MallMemberStatisticsApi {
   /** 会员分析 Request */
   export interface AnalyseReq {
-    times: Date[];
+    times: Date[]; // 时间范围
   }
 
   /** 会员分析对照数据 Response */
   export interface AnalyseComparison {
-    registerUserCount: number;
-    visitUserCount: number;
-    rechargeUserCount: number;
+    registerUserCount: number; // 注册用户数
+    visitUserCount: number; // 访问用户数
+    rechargeUserCount: number; // 充值用户数
   }
 
   /** 会员分析 Response */
   export interface Analyse {
-    visitUserCount: number;
-    orderUserCount: number;
-    payUserCount: number;
-    atv: number;
-    comparison: MallDataComparisonResp<AnalyseComparison>;
+    visitUserCount: number; // 访问用户数
+    orderUserCount: number; // 下单用户数
+    payUserCount: number; // 支付用户数
+    atv: number; // 平均客单价
+    comparison: MallDataComparisonResp<AnalyseComparison>; // 对照数据
   }
 
   /** 会员地区统计 Response */
   export interface AreaStatistics {
-    areaId: number;
-    areaName: string;
-    userCount: number;
-    orderCreateUserCount: number;
-    orderPayUserCount: number;
-    orderPayPrice: number;
+    areaId: number; // 地区ID
+    areaName: string; // 地区名称
+    userCount: number; // 用户数
+    orderCreateUserCount: number; // 下单用户数
+    orderPayUserCount: number; // 支付用户数
+    orderPayPrice: number; // 支付金额
   }
 
   /** 会员性别统计 Response */
   export interface SexStatistics {
-    sex: number;
-    userCount: number;
+    sex: number; // 性别
+    userCount: number; // 用户数
   }
 
   /** 会员统计 Response */
   export interface Summary {
-    userCount: number;
-    rechargeUserCount: number;
-    rechargePrice: number;
-    expensePrice: number;
+    userCount: number; // 用户数
+    rechargeUserCount: number; // 充值用户数
+    rechargePrice: number; // 充值金额
+    expensePrice: number; // 消费金额
   }
 
   /** 会员终端统计 Response */
   export interface TerminalStatistics {
-    terminal: number;
-    userCount: number;
+    terminal: number; // 终端
+    userCount: number; // 用户数
   }
 
   /** 会员数量统计 Response */
   export interface Count {
-    /** 用户访问量 */
-    visitUserCount: string;
-    /** 注册用户数量 */
-    registerUserCount: number;
+    visitUserCount: string; // 用户访问量
+    registerUserCount: number; // 注册用户数量
   }
 
   /** 会员注册数量 Response */
   export interface RegisterCount {
-    date: string;
-    count: number;
+    date: string; // 日期
+    count: number; // 数量
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/trade/brokerage/record/index.ts b/apps/web-antd/src/api/mall/trade/brokerage/record/index.ts
index 86ce41bafd8374e5bc5665a1d29eb2daa8f581d2..1b6e8b3a41d792d4d2d806650b10aa8d92b46b85 100644
--- a/apps/web-antd/src/api/mall/trade/brokerage/record/index.ts
+++ b/apps/web-antd/src/api/mall/trade/brokerage/record/index.ts
@@ -5,28 +5,17 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageRecordApi {
   /** 佣金记录 */
   export interface BrokerageRecord {
-    /** 编号 */
-    id: number;
-    /** 用户编号 */
-    userId: number;
-    /** 用户昵称 */
-    userNickname: string;
-    /** 用户头像 */
-    userAvatar: string;
-    /** 佣金金额，单位：分 */
-    price: number;
-    /** 佣金类型 */
-    type: number;
-    /** 关联订单编号 */
-    orderId: number;
-    /** 关联订单号 */
-    orderNo: string;
-    /** 创建时间 */
-    createTime: Date;
-    /** 状态 */
-    status: number;
-    /** 结算时间 */
-    settlementTime: Date;
+    id: number; // 编号
+    userId: number; // 用户编号
+    userNickname: string; // 用户昵称
+    userAvatar: string; // 用户头像
+    price: number; // 佣金金额，单位：分
+    type: number; // 佣金类型
+    orderId: number; // 关联订单编号
+    orderNo: string; // 关联订单号
+    createTime: Date; // 创建时间
+    status: number; // 状态
+    settlementTime: Date; // 结算时间
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/trade/brokerage/user/index.ts b/apps/web-antd/src/api/mall/trade/brokerage/user/index.ts
index 51c24f25afa1e7c4786b48cefb0d80d9239be5c6..4ef235af89c4d46e7d5302146f62c16854d142eb 100644
--- a/apps/web-antd/src/api/mall/trade/brokerage/user/index.ts
+++ b/apps/web-antd/src/api/mall/trade/brokerage/user/index.ts
@@ -5,59 +5,45 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageUserApi {
   /** 分销用户 */
   export interface BrokerageUser {
-    /** 编号 */
-    id: number;
-    /** 推广员编号 */
-    bindUserId: number;
-    /** 推广员绑定时间 */
-    bindUserTime: Date;
-    /** 是否启用分销 */
-    brokerageEnabled: boolean;
-    /** 分销资格时间 */
-    brokerageTime: Date;
-    /** 可提现金额，单位：分 */
-    price: number;
-    /** 冻结金额，单位：分 */
-    frozenPrice: number;
-    /** 用户昵称 */
-    nickname: string;
-    /** 用户头像 */
-    avatar: string;
+    id: number; // 编号
+    bindUserId: number; // 推广员编号
+    bindUserTime: Date; // 推广员绑定时间
+    brokerageEnabled: boolean; // 是否启用分销
+    brokerageTime: Date; // 分销资格时间
+    price: number; // 可提现金额，单位：分
+    frozenPrice: number; // 冻结金额，单位：分
+    nickname: string; // 用户昵称
+    avatar: string; // 用户头像
   }
 
   /** 创建分销用户请求 */
-  export interface CreateRequest {
-    /** 用户编号 */
-    userId: number;
-    /** 推广员编号 */
-    bindUserId: number;
+  export interface BrokerageUserCreateReqVO {
+    userId: number; // 用户编号
+    bindUserId: number; // 推广员编号
   }
 
   /** 修改推广员请求 */
-  export interface UpdateBindUserRequest {
-    /** 用户编号 */
-    id: number;
-    /** 推广员编号 */
-    bindUserId: number;
+  export interface BrokerageUserUpdateReqVO {
+    id: number; // 用户编号
+    bindUserId: number; // 推广员编号
   }
 
   /** 清除推广员请求 */
-  export interface ClearBindUserRequest {
-    /** 用户编号 */
-    id: number;
+  export interface BrokerageUserClearBrokerageUserReqVO {
+    id: number; // 用户编号
   }
 
   /** 修改推广资格请求 */
-  export interface UpdateBrokerageEnabledRequest {
-    /** 用户编号 */
-    id: number;
-    /** 是否启用分销 */
-    enabled: boolean;
+  export interface BrokerageUserUpdateBrokerageEnabledReqVO {
+    id: number; // 用户编号
+    enabled: boolean; // 是否启用分销
   }
 }
 
 /** 创建分销用户 */
-export function createBrokerageUser(data: MallBrokerageUserApi.CreateRequest) {
+export function createBrokerageUser(
+  data: MallBrokerageUserApi.BrokerageUserCreateReqVO,
+) {
   return requestClient.post('/trade/brokerage-user/create', data);
 }
 
@@ -78,19 +64,21 @@ export function getBrokerageUser(id: number) {
 
 /** 修改推广员 */
 export function updateBindUser(
-  data: MallBrokerageUserApi.UpdateBindUserRequest,
+  data: MallBrokerageUserApi.BrokerageUserUpdateReqVO,
 ) {
   return requestClient.put('/trade/brokerage-user/update-bind-user', data);
 }
 
 /** 清除推广员 */
-export function clearBindUser(data: MallBrokerageUserApi.ClearBindUserRequest) {
+export function clearBindUser(
+  data: MallBrokerageUserApi.BrokerageUserClearBrokerageUserReqVO,
+) {
   return requestClient.put('/trade/brokerage-user/clear-bind-user', data);
 }
 
 /** 修改推广资格 */
 export function updateBrokerageEnabled(
-  data: MallBrokerageUserApi.UpdateBrokerageEnabledRequest,
+  data: MallBrokerageUserApi.BrokerageUserUpdateBrokerageEnabledReqVO,
 ) {
   return requestClient.put(
     '/trade/brokerage-user/update-brokerage-enable',
diff --git a/apps/web-antd/src/api/mall/trade/brokerage/withdraw/index.ts b/apps/web-antd/src/api/mall/trade/brokerage/withdraw/index.ts
index 08acdb4fc47380ff26500141cf95949cd2970e63..12af60518bbae19819a099d6f018f5514f316d78 100644
--- a/apps/web-antd/src/api/mall/trade/brokerage/withdraw/index.ts
+++ b/apps/web-antd/src/api/mall/trade/brokerage/withdraw/index.ts
@@ -5,52 +5,31 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageWithdrawApi {
   /** 佣金提现 */
   export interface BrokerageWithdraw {
-    /** 编号 */
-    id: number;
-    /** 用户编号 */
-    userId: number;
-    /** 提现金额，单位：分 */
-    price: number;
-    /** 手续费，单位：分 */
-    feePrice: number;
-    /** 总金额，单位：分 */
-    totalPrice: number;
-    /** 提现类型 */
-    type: number;
-    /** 用户名称 */
-    userName: string;
-    /** 用户账号 */
-    userAccount: string;
-    /** 银行名称 */
-    bankName: string;
-    /** 银行地址 */
-    bankAddress: string;
-    /** 收款码地址 */
-    qrCodeUrl: string;
-    /** 状态 */
-    status: number;
-    /** 审核备注 */
-    auditReason: string;
-    /** 审核时间 */
-    auditTime: Date;
-    /** 备注 */
-    remark: string;
-    /** 支付转账编号 */
-    payTransferId?: number;
-    /** 转账渠道编码 */
-    transferChannelCode?: string;
-    /** 转账时间 */
-    transferTime?: Date;
-    /** 转账错误信息 */
-    transferErrorMsg?: string;
+    id: number; // 编号
+    userId: number; // 用户编号
+    price: number; // 提现金额，单位：分
+    feePrice: number; // 手续费，单位：分
+    totalPrice: number; // 总金额，单位：分
+    type: number; // 提现类型
+    userName: string; // 用户名称
+    userAccount: string; // 用户账号
+    bankName: string; // 银行名称
+    bankAddress: string; // 银行地址
+    qrCodeUrl: string; // 收款码地址
+    status: number; // 状态
+    auditReason: string; // 审核备注
+    auditTime: Date; // 审核时间
+    remark: string; // 备注
+    payTransferId?: number; // 支付转账编号
+    transferChannelCode?: string; // 转账渠道编码
+    transferTime?: Date; // 转账时间
+    transferErrorMsg?: string; // 转账错误信息
   }
 
   /** 驳回申请请求 */
   export interface RejectRequest {
-    /** 编号 */
-    id: number;
-    /** 驳回原因 */
-    auditReason: string;
+    id: number; // 编号
+    auditReason: string; // 驳回原因
   }
 }
 
diff --git a/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts b/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts
index fa81b169bab6619dbb705ec1666d30bfae6ee58c..be6a38a6da2de0faed4a21973ba3ffa9c3aa351d 100644
--- a/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts
+++ b/apps/web-antd/src/api/mall/trade/delivery/expressTemplate/index.ts
@@ -38,9 +38,9 @@ export namespace MallDeliveryExpressTemplateApi {
     /** 排序 */
     sort: number;
     /** 计费区域列表 */
-    templateCharge: TemplateCharge[];
+    charges: TemplateCharge[];
     /** 包邮区域列表 */
-    templateFree: TemplateFree[];
+    frees: TemplateFree[];
   }
 
   /** 运费模板精简信息 */
diff --git a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
index b97f2c3d587a1ebe46dacc6278beea8fc33bad56..321df41fbc05dcefefad18ce200501633497c6cf 100644
--- a/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
+++ b/apps/web-antd/src/api/mall/trade/delivery/pickUpStore/index.ts
@@ -29,21 +29,18 @@ export namespace MallDeliveryPickUpStoreApi {
     longitude: number;
     /** 状态 */
     status: number;
-    /** 绑定用户编号组数 */
-    verifyUserIds: number[];
     /** 营业时间 用于fieldMappingTime */
     rangeTime: any[];
+    /** 绑定用户编号组数 */
+    verifyUserIds?: number[];
+    verifyUsers?: any[];
   }
 
   /** 绑定自提店员请求 */
-  export interface BindStaffRequest {
+  export interface DeliveryPickUpBindReqVO {
     id?: number;
-    /** 门店名称 */
-    name: string;
-    /** 门店编号 */
-    storeId: number;
     /** 用户编号列表 */
-    userIds: number[];
+    verifyUserIds: number[];
   }
 }
 
@@ -89,8 +86,8 @@ export function deleteDeliveryPickUpStore(id: number) {
 }
 
 /** 绑定自提店员 */
-export function bindStoreStaffId(
-  data: MallDeliveryPickUpStoreApi.BindStaffRequest,
+export function bindDeliveryPickUpStore(
+  data: MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO,
 ) {
   return requestClient.post('/trade/delivery/pick-up-store/bind', data);
 }
diff --git a/apps/web-antd/src/api/system/dict/data/index.ts b/apps/web-antd/src/api/system/dict/data/index.ts
index 674eb01e4a5f14a590075397fde8f1ea57f4180f..28f94d504ea4da01fa1b68eb66c5f46cc1f71c58 100644
--- a/apps/web-antd/src/api/system/dict/data/index.ts
+++ b/apps/web-antd/src/api/system/dict/data/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -20,17 +20,24 @@ export namespace SystemDictDataApi {
 
 // 查询字典数据（精简)列表
 export function getSimpleDictDataList() {
-  return requestClient.get('/system/dict-data/simple-list');
+  return requestClient.get<SystemDictDataApi.DictData[]>(
+    '/system/dict-data/simple-list',
+  );
 }
 
 // 查询字典数据列表
 export function getDictDataPage(params: PageParam) {
-  return requestClient.get('/system/dict-data/page', { params });
+  return requestClient.get<PageResult<SystemDictDataApi.DictData>>(
+    '/system/dict-data/page',
+    { params },
+  );
 }
 
 // 查询字典数据详情
 export function getDictData(id: number) {
-  return requestClient.get(`/system/dict-data/get?id=${id}`);
+  return requestClient.get<SystemDictDataApi.DictData>(
+    `/system/dict-data/get?id=${id}`,
+  );
 }
 
 // 新增字典数据
diff --git a/apps/web-antd/src/api/system/dict/type/index.ts b/apps/web-antd/src/api/system/dict/type/index.ts
index eb2f9c9d4847278e6b1a3643d8d322363664efe8..7fb426337803ce4ef39e5b88d15559cb92a41a79 100644
--- a/apps/web-antd/src/api/system/dict/type/index.ts
+++ b/apps/web-antd/src/api/system/dict/type/index.ts
@@ -1,3 +1,5 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace SystemDictTypeApi {
@@ -14,17 +16,24 @@ export namespace SystemDictTypeApi {
 
 // 查询字典（精简)列表
 export function getSimpleDictTypeList() {
-  return requestClient.get('/system/dict-type/list-all-simple');
+  return requestClient.get<SystemDictTypeApi.DictType[]>(
+    '/system/dict-type/list-all-simple',
+  );
 }
 
 // 查询字典列表
-export function getDictTypePage(params: any) {
-  return requestClient.get('/system/dict-type/page', { params });
+export function getDictTypePage(params: PageParam) {
+  return requestClient.get<PageResult<SystemDictTypeApi.DictType>>(
+    '/system/dict-type/page',
+    { params },
+  );
 }
 
 // 查询字典详情
 export function getDictType(id: number) {
-  return requestClient.get(`/system/dict-type/get?id=${id}`);
+  return requestClient.get<SystemDictTypeApi.DictType>(
+    `/system/dict-type/get?id=${id}`,
+  );
 }
 
 // 新增字典
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
index 4fdca3d869bfb21df3eedb60600250220aa7d412..eb0dd63cf62b62ba70b779151f0e752406877ad4 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/ProcessViewer.vue
@@ -3,7 +3,7 @@ import { h, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { BpmProcessInstanceStatus, DICT_TYPE } from '@vben/constants';
 import { UndoOutlined, ZoomInOutlined, ZoomOutOutlined } from '@vben/icons';
-import { dateFormatter, formatPast2 } from '@vben/utils';
+import { formatDate, formatPast2 } from '@vben/utils';
 
 import { Button, ButtonGroup, Modal, Row, Table } from 'ant-design-vue';
 import BpmnViewer from 'bpmn-js/lib/Viewer';
@@ -345,14 +345,14 @@ onBeforeUnmount(() => {
             </template>
           </Table.Column>
           <Table.Column
-            :custom-render="({ text }) => dateFormatter(text)"
+            :custom-render="({ text }) => formatDate(text)"
             align="center"
             title="开始时间"
             data-index="createTime"
             width="140"
           />
           <Table.Column
-            :custom-render="({ text }) => dateFormatter(text)"
+            :custom-render="({ text }) => formatDate(text)"
             align="center"
             title="结束时间"
             data-index="endTime"
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-designer.scss b/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-designer.scss
index 9649244e0ee3d18d3dd8800656e52a71d7c926ce..f35e1ee5b2fa442a34b0594dfae5fa94f3477c3e 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-designer.scss
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-designer.scss
@@ -18,23 +18,23 @@
     width: 100%;
     min-height: 36px;
 
-    .el-button {
+    .ant-button {
       text-align: center;
     }
 
-    .el-button-group {
+    .ant-button-group {
       margin: 4px;
     }
 
-    .el-tooltip__popper {
-      .el-button {
+    .ant-tooltip__popper {
+      .ant-button {
         width: 100%;
         padding-right: 8px;
         padding-left: 8px;
         text-align: left;
       }
 
-      .el-button:hover {
+      .ant-button:hover {
         color: #fff;
         background: rgb(64 158 255 / 80%);
       }
@@ -175,7 +175,6 @@ pre {
 }
 
 .hljs {
-  word-break: break-word;
   white-space: pre-wrap;
 }
 
diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-panel.scss b/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-panel.scss
index d7e8cfbcd9e70672fa78fac8677b0ca51d6c7af6..1fbe34e1ef247a41193335ba32b0be277b40d3b9 100644
--- a/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-panel.scss
+++ b/apps/web-antd/src/components/bpmn-process-designer/package/theme/process-panel.scss
@@ -59,7 +59,7 @@
     line-height: 32px;
   }
 
-  .el-form-item {
+  .ant-form-item {
     width: 100%;
     padding-bottom: 18px;
     margin-bottom: 0;
@@ -106,22 +106,22 @@
   margin-top: 8px;
 }
 
-.element-drawer__button > .el-button {
+.element-drawer__button > .ant-button {
   width: 100%;
 }
 
-.el-collapse-item__content {
+.ant-collapse-item__content {
   padding-bottom: 0;
 }
 
-.el-input.is-disabled .el-input__inner {
+.ant-input.is-disabled .ant-input__inner {
   color: #999;
 }
 
-.el-form-item.el-form-item--mini {
+.ant-form-item.ant-form-item--mini {
   margin-bottom: 0;
 
-  & + .el-form-item {
+  & + .ant-form-item {
     margin-top: 16px;
   }
 }
diff --git a/apps/web-antd/src/components/upload/file-upload.vue b/apps/web-antd/src/components/upload/file-upload.vue
index fdf4ae1672fe1b10aba7634cffdf40291e79b02e..e4ff57871e1f8ef966af906ba6cc96bc77a3b97e 100644
--- a/apps/web-antd/src/components/upload/file-upload.vue
+++ b/apps/web-antd/src/components/upload/file-upload.vue
@@ -314,11 +314,11 @@ function getValue() {
 
 <style scoped>
 .upload-drag-area {
-  border: 2px dashed #d9d9d9;
-  border-radius: 8px;
   padding: 20px;
   text-align: center;
   background-color: #fafafa;
+  border: 2px dashed #d9d9d9;
+  border-radius: 8px;
   transition: border-color 0.3s;
 }
 
@@ -327,15 +327,15 @@ function getValue() {
 }
 
 .ant-upload-drag-icon {
+  margin-bottom: 16px;
   font-size: 48px;
   color: #d9d9d9;
-  margin-bottom: 16px;
 }
 
 .ant-upload-text {
+  margin-bottom: 8px;
   font-size: 16px;
   color: #666;
-  margin-bottom: 8px;
 }
 
 .ant-upload-hint {
diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 6795fb919f8c0231d2a8372803cc47f386f6a052..e8715a895472a2f0c47f7a6d3383d2fa4a619f82 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -13,7 +13,7 @@ import {
   AntdProfileOutlined,
   BookOpenText,
   CircleHelp,
-  MdiGithub,
+  SvgGithubIcon,
 } from '@vben/icons';
 import {
   BasicLayout,
@@ -79,7 +79,7 @@ const menus = computed(() => [
         target: '_blank',
       });
     },
-    icon: MdiGithub,
+    icon: SvgGithubIcon,
     text: 'GitHub',
   },
   {
@@ -202,11 +202,16 @@ onMounted(() => {
 });
 
 watch(
-  () => preferences.app.watermark,
-  async (enable) => {
+  () => ({
+    enable: preferences.app.watermark,
+    content: preferences.app.watermarkContent,
+  }),
+  async ({ enable, content }) => {
     if (enable) {
       await updateWatermark({
-        content: `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
+        content:
+          content ||
+          `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
       });
     } else {
       destroyWatermark();
diff --git a/apps/web-antd/src/views/erp/finance/account/data.ts b/apps/web-antd/src/views/erp/finance/account/data.ts
index a93b42b8fd2ef3274d1c77c9c94296e1354d1176..0b4495b1a294bca2077c0833e374414771510c5c 100644
--- a/apps/web-antd/src/views/erp/finance/account/data.ts
+++ b/apps/web-antd/src/views/erp/finance/account/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ErpAccountApi } from '#/api/erp/finance/account';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -123,10 +124,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = ErpAccountApi.Account>(
+export function useGridColumns(
   onDefaultStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: ErpAccountApi.Account,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/erp/stock/warehouse/data.ts b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
index fead0d5aba9776810198d59f7e261799ae5a461f..ff8045b839900d2e0255b791081d43625c4583b8 100644
--- a/apps/web-antd/src/views/erp/stock/warehouse/data.ts
+++ b/apps/web-antd/src/views/erp/stock/warehouse/data.ts
@@ -121,10 +121,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = ErpWarehouseApi.Warehouse>(
+export function useGridColumns(
   onDefaultStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: ErpWarehouseApi.Warehouse,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/infra/fileConfig/data.ts b/apps/web-antd/src/views/infra/fileConfig/data.ts
index 808d48a0ae57861f828095b8da7a6f578b30ba15..efe5823f8c63297beecd16c88e426b856fdd8017 100644
--- a/apps/web-antd/src/views/infra/fileConfig/data.ts
+++ b/apps/web-antd/src/views/infra/fileConfig/data.ts
@@ -37,7 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       dependencies: {
         triggerFields: ['id'],
-        show: (formValues) => !formValues.id,
+        disabled: (formValues) => formValues.id,
       },
     },
     {
diff --git a/apps/web-antd/src/views/iot/alert/config/index.vue b/apps/web-antd/src/views/iot/alert/config/index.vue
index bae250661cec61a10b8838fde22c6e0c56f9f31d..0e25afb69fd320352e83f649c4a40aa735cf5a6d 100644
--- a/apps/web-antd/src/views/iot/alert/config/index.vue
+++ b/apps/web-antd/src/views/iot/alert/config/index.vue
@@ -4,14 +4,14 @@ import type { AlertConfigApi } from '#/api/iot/alert/config';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 
-import { message } from 'ant-design-vue';
+import { message, Tag } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteAlertConfig, getAlertConfigPage } from '#/api/iot/alert/config';
 import { $t } from '#/locales';
 
-import { useGridColumns, useGridFormSchema } from './data';
 import AlertConfigForm from '../modules/AlertConfigForm.vue';
+import { useGridColumns, useGridFormSchema } from './data';
 
 defineOptions({ name: 'IoTAlertConfig' });
 
@@ -26,7 +26,7 @@ function onRefresh() {
 }
 
 // 获取告警级别文本
-const getLevelText = (level?: number) => {
+function getLevelText(level?: number) {
   const levelMap: Record<number, string> = {
     1: '提示',
     2: '一般',
@@ -35,10 +35,10 @@ const getLevelText = (level?: number) => {
     5: '紧急',
   };
   return level ? levelMap[level] || `级别${level}` : '-';
-};
+}
 
 // 获取告警级别颜色
-const getLevelColor = (level?: number) => {
+function getLevelColor(level?: number) {
   const colorMap: Record<number, string> = {
     1: 'blue',
     2: 'green',
@@ -47,10 +47,10 @@ const getLevelColor = (level?: number) => {
     5: 'purple',
   };
   return level ? colorMap[level] || 'default' : 'default';
-};
+}
 
 // 获取接收类型文本
-const getReceiveTypeText = (type?: number) => {
+function getReceiveTypeText(type?: number) {
   const typeMap: Record<number, string> = {
     1: '站内信',
     2: '邮箱',
@@ -59,7 +59,7 @@ const getReceiveTypeText = (type?: number) => {
     5: '钉钉',
   };
   return type ? typeMap[type] || `类型${type}` : '-';
-};
+}
 
 /** 创建告警配置 */
 function handleCreate() {
@@ -138,9 +138,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
       <!-- 告警级别列 -->
       <template #level="{ row }">
-        <a-tag :color="getLevelColor(row.level)">
+        <Tag :color="getLevelColor(row.level)">
           {{ getLevelText(row.level) }}
-        </a-tag>
+        </Tag>
       </template>
 
       <!-- 关联场景联动规则列 -->
@@ -150,13 +150,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
       <!-- 接收类型列 -->
       <template #receiveTypes="{ row }">
-        <a-tag
+        <Tag
           v-for="(type, index) in row.receiveTypes"
           :key="index"
           class="mr-1"
         >
           {{ getReceiveTypeText(type) }}
-        </a-tag>
+        </Tag>
       </template>
 
       <!-- 操作列 -->
diff --git a/apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue b/apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue
index af90da10a7e5ac9c2d52285df0b546c0633917d4..76172f8f522d38af012ca65fdcab7db1bd5d7f8a 100644
--- a/apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue
+++ b/apps/web-antd/src/views/iot/alert/modules/AlertConfigForm.vue
@@ -49,7 +49,9 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as AlertConfigApi.AlertConfig;
     try {
-      await (formData.value?.id ? updateAlertConfig(data) : createAlertConfig(data));
+      await (formData.value?.id
+        ? updateAlertConfig(data)
+        : createAlertConfig(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
diff --git a/apps/web-antd/src/views/iot/alert/record/index.vue b/apps/web-antd/src/views/iot/alert/record/index.vue
index 0cdb9b513612f81f54d5fb234e227a624dca940f..4492483b04eb916f6f53b04ace2cac8f374484e7 100644
--- a/apps/web-antd/src/views/iot/alert/record/index.vue
+++ b/apps/web-antd/src/views/iot/alert/record/index.vue
@@ -1,14 +1,15 @@
 <script setup lang="ts">
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { AlertRecord } from '#/api/iot/alert/record';
 
 import { h, onMounted, ref } from 'vue';
 
 import { Page } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
 
-import { Modal, message } from 'ant-design-vue';
+import { Button, message, Modal, Popover, Tag } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import type { AlertRecord } from '#/api/iot/alert/record';
 import { getAlertRecordPage, processAlertRecord } from '#/api/iot/alert/record';
 import { getSimpleDeviceList } from '#/api/iot/device/device';
 import { getSimpleProductList } from '#/api/iot/product/product';
@@ -26,13 +27,13 @@ function onRefresh() {
 }
 
 // 加载产品和设备列表
-const loadData = async () => {
+async function loadData() {
   productList.value = await getSimpleProductList();
   deviceList.value = await getSimpleDeviceList();
-};
+}
 
 // 获取告警级别文本
-const getLevelText = (level?: number) => {
+function getLevelText(level?: number) {
   const levelMap: Record<number, string> = {
     1: '提示',
     2: '一般',
@@ -41,10 +42,10 @@ const getLevelText = (level?: number) => {
     5: '紧急',
   };
   return level ? levelMap[level] || `级别${level}` : '-';
-};
+}
 
 // 获取告警级别颜色
-const getLevelColor = (level?: number) => {
+function getLevelColor(level?: number) {
   const colorMap: Record<number, string> = {
     1: 'blue',
     2: 'green',
@@ -53,24 +54,24 @@ const getLevelColor = (level?: number) => {
     5: 'purple',
   };
   return level ? colorMap[level] || 'default' : 'default';
-};
+}
 
 // 获取产品名称
-const getProductName = (productId?: number) => {
+function getProductName(productId?: number) {
   if (!productId) return '-';
   const product = productList.value.find((p: any) => p.id === productId);
   return product?.name || '加载中...';
-};
+}
 
 // 获取设备名称
-const getDeviceName = (deviceId?: number) => {
+function getDeviceName(deviceId?: number) {
   if (!deviceId) return '-';
   const device = deviceList.value.find((d: any) => d.id === deviceId);
   return device?.deviceName || '加载中...';
-};
+}
 
 // 处理告警记录
-const handleProcess = async (row: AlertRecord) => {
+async function handleProcess(row: AlertRecord) {
   Modal.confirm({
     title: '处理告警记录',
     content: h('div', [
@@ -83,14 +84,16 @@ const handleProcess = async (row: AlertRecord) => {
       }),
     ]),
     async onOk() {
-      const textarea = document.getElementById('processRemark') as HTMLTextAreaElement;
+      const textarea = document.querySelector(
+        '#processRemark',
+      ) as HTMLTextAreaElement;
       const processRemark = textarea?.value || '';
-      
+
       if (!processRemark) {
         message.warning('请输入处理原因');
-        return Promise.reject();
+        throw new Error('请输入处理原因');
       }
-      
+
       const hideLoading = message.loading({
         content: '正在处理...',
         duration: 0,
@@ -101,16 +104,16 @@ const handleProcess = async (row: AlertRecord) => {
         onRefresh();
       } catch (error) {
         console.error('处理失败:', error);
-        return Promise.reject();
+        throw error;
       } finally {
         hideLoading();
       }
     },
   });
-};
+}
 
 // 查看告警记录详情
-const handleView = (row: AlertRecord) => {
+function handleView(row: AlertRecord) {
   Modal.info({
     title: '告警记录详情',
     width: 600,
@@ -125,7 +128,11 @@ const handleView = (row: AlertRecord) => {
       ]),
       h('div', [
         h('span', { class: 'font-semibold' }, '设备消息：'),
-        h('pre', { class: 'mt-1 text-xs bg-gray-50 p-2 rounded' }, row.deviceMessage || '-'),
+        h(
+          'pre',
+          { class: 'mt-1 text-xs bg-gray-50 p-2 rounded' },
+          row.deviceMessage || '-',
+        ),
       ]),
       h('div', [
         h('span', { class: 'font-semibold' }, '处理结果：'),
@@ -133,11 +140,16 @@ const handleView = (row: AlertRecord) => {
       ]),
       h('div', [
         h('span', { class: 'font-semibold' }, '处理时间：'),
-        h('span', row.processTime ? new Date(row.processTime).toLocaleString('zh-CN') : '-'),
+        h(
+          'span',
+          row.processTime
+            ? new Date(row.processTime).toLocaleString('zh-CN')
+            : '-',
+        ),
       ]),
     ]),
   });
-};
+}
 
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
@@ -179,9 +191,9 @@ onMounted(() => {
     <Grid table-title="告警记录列表">
       <!-- 告警级别列 -->
       <template #configLevel="{ row }">
-        <a-tag :color="getLevelColor(row.configLevel)">
+        <Tag :color="getLevelColor(row.configLevel)">
           {{ getLevelText(row.configLevel) }}
-        </a-tag>
+        </Tag>
       </template>
 
       <!-- 产品名称列 -->
@@ -196,20 +208,20 @@ onMounted(() => {
 
       <!-- 设备消息列 -->
       <template #deviceMessage="{ row }">
-        <a-popover
+        <Popover
           v-if="row.deviceMessage"
           placement="topLeft"
           trigger="hover"
-          :overlayStyle="{ maxWidth: '600px' }"
+          :overlay-style="{ maxWidth: '600px' }"
         >
           <template #content>
             <pre class="text-xs">{{ row.deviceMessage }}</pre>
           </template>
-          <VbenButton size="small" type="link">
-            <Icon icon="ant-design:eye-outlined" class="mr-1" />
+          <Button size="small" type="link">
+            <IconifyIcon icon="ant-design:eye-outlined" class="mr-1" />
             查看消息
-          </VbenButton>
-        </a-popover>
+          </Button>
+        </Popover>
         <span v-else class="text-gray-400">-</span>
       </template>
 
diff --git a/apps/web-antd/src/views/iot/device/device/data.ts b/apps/web-antd/src/views/iot/device/device/data.ts
index 903c1d9f0c26fe70b1df34d412ece97f38d81443..e825055dc41655b0e46d52389fc6409d688a4da9 100644
--- a/apps/web-antd/src/views/iot/device/device/data.ts
+++ b/apps/web-antd/src/views/iot/device/device/data.ts
@@ -6,7 +6,10 @@ import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
 import { getSimpleDeviceGroupList } from '#/api/iot/device/group';
-import { DeviceTypeEnum, getSimpleProductList } from '#/api/iot/product/product';
+import {
+  DeviceTypeEnum,
+  getSimpleProductList,
+} from '#/api/iot/product/product';
 
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -43,7 +46,7 @@ export function useFormSchema(): VbenFormSchema[] {
         .min(4, 'DeviceName 长度不能少于 4 个字符')
         .max(32, 'DeviceName 长度不能超过 32 个字符')
         .regex(
-          /^[a-zA-Z0-9_.\-:@]{4,32}$/,
+          /^[\w.\-:@]{4,32}$/,
           '支持英文字母、数字、下划线（_）、中划线（-）、点号（.）、半角冒号（:）和特殊字符@',
         ),
     },
@@ -79,7 +82,7 @@ export function useFormSchema(): VbenFormSchema[] {
         .min(4, '备注名称长度限制为 4~64 个字符')
         .max(64, '备注名称长度限制为 4~64 个字符')
         .regex(
-          /^[\u4e00-\u9fa5\u3040-\u30ff_a-zA-Z0-9]+$/,
+          /^[\u4E00-\u9FA5\u3040-\u30FF\w]+$/,
           '备注名称只能包含中文、英文字母、日文、数字和下划线（_）',
         )
         .optional()
@@ -106,7 +109,7 @@ export function useFormSchema(): VbenFormSchema[] {
       },
       rules: z
         .string()
-        .regex(/^[a-zA-Z0-9-_]+$/, '序列号只能包含字母、数字、中划线和下划线')
+        .regex(/^[\w-]+$/, '序列号只能包含字母、数字、中划线和下划线')
         .optional()
         .or(z.literal('')),
     },
@@ -318,4 +321,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-
diff --git a/apps/web-antd/src/views/iot/device/device/index.vue b/apps/web-antd/src/views/iot/device/device/index.vue
index 5d694f3cbb4072c37ba287fea1ea4bd4665d4f03..06e34ac5ed5d7c7adf43123838780550c8dc0b2b 100644
--- a/apps/web-antd/src/views/iot/device/device/index.vue
+++ b/apps/web-antd/src/views/iot/device/device/index.vue
@@ -4,30 +4,39 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import { Button, Card, Input, message, Select, Space, Tag } from 'ant-design-vue';
 import { Page, useVbenModal } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
-import { downloadFileFromBlobPart } from '@vben/utils';
 import { IconifyIcon } from '@vben/icons';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import {
+  Button,
+  Card,
+  Input,
+  message,
+  Select,
+  Space,
+  Tag,
+} from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
-import { 
+import {
   deleteDevice,
   deleteDeviceList,
   exportDeviceExcel,
-  getDevicePage
+  getDevicePage,
 } from '#/api/iot/device/device';
-import { getSimpleProductList } from '#/api/iot/product/product';
 import { getSimpleDeviceGroupList } from '#/api/iot/device/group';
+import { getSimpleProductList } from '#/api/iot/product/product';
 import { $t } from '#/locales';
 
+import { useGridColumns } from './data';
+// @ts-ignore
+import DeviceCardView from './modules/DeviceCardView.vue';
 import DeviceForm from './modules/DeviceForm.vue';
 import DeviceGroupForm from './modules/DeviceGroupForm.vue';
 import DeviceImportForm from './modules/DeviceImportForm.vue';
-// @ts-ignore
-import DeviceCardView from './modules/DeviceCardView.vue';
-import { useGridColumns } from './data';
 
 /** IoT 设备列表 */
 defineOptions({ name: 'IoTDevice' });
@@ -36,7 +45,7 @@ const route = useRoute();
 const router = useRouter();
 const products = ref<any[]>([]);
 const deviceGroups = ref<any[]>([]);
-const viewMode = ref<'list' | 'card'>('card');
+const viewMode = ref<'card' | 'list'>('card');
 const cardViewRef = ref();
 
 // Modal instances
@@ -120,7 +129,11 @@ function openProductDetail(productId: number) {
 
 /** 打开物模型数据 */
 function openModel(id: number) {
-  router.push({ name: 'IoTDeviceDetail', params: { id }, query: { tab: 'model' } });
+  router.push({
+    name: 'IoTDeviceDetail',
+    params: { id },
+    query: { tab: 'model' },
+  });
 }
 
 /** 新增设备 */
@@ -141,7 +154,7 @@ async function handleDelete(row: any) {
   });
   try {
     await deleteDevice(row.id);
-    message.success($t('common.delSuccess'));
+    message.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
     hideLoading();
@@ -162,7 +175,7 @@ async function handleDeleteBatch() {
   try {
     const ids = checkedRows.map((row: any) => row.id);
     await deleteDeviceList(ids);
-    message.success($t('common.delSuccess'));
+    message.success($t('ui.actionMessage.deleteSuccess'));
     handleRefresh();
   } finally {
     hideLoading();
@@ -219,7 +232,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions,
 });
 
-/** 初始化 **/
+/** 初始化 */
 onMounted(async () => {
   // 获取产品列表
   products.value = await getSimpleProductList();
@@ -241,11 +254,11 @@ onMounted(async () => {
     <DeviceFormModal @success="handleRefresh" />
     <DeviceGroupFormModal @success="handleRefresh" />
     <DeviceImportFormModal @success="handleRefresh" />
-    
+
     <!-- 统一搜索工具栏 -->
     <Card :body-style="{ padding: '16px' }" class="mb-4">
       <!-- 搜索表单 -->
-      <div class="flex flex-wrap items-center gap-3 mb-3">
+      <div class="mb-3 flex flex-wrap items-center gap-3">
         <Select
           v-model:value="searchParams.productId"
           placeholder="请选择产品"
@@ -265,14 +278,14 @@ onMounted(async () => {
           placeholder="请输入 DeviceName"
           allow-clear
           style="width: 200px"
-          @pressEnter="handleSearch"
+          @press-enter="handleSearch"
         />
         <Input
           v-model:value="searchParams.nickname"
           placeholder="请输入备注名称"
           allow-clear
           style="width: 200px"
-          @pressEnter="handleSearch"
+          @press-enter="handleSearch"
         />
         <Select
           v-model:value="searchParams.deviceType"
@@ -329,22 +342,30 @@ onMounted(async () => {
       <!-- 操作按钮 -->
       <div class="flex items-center justify-between">
         <Space :size="12">
-          <Button type="primary" @click="handleCreate" v-hasPermi="['iot:device:create']">
+          <Button
+            type="primary"
+            @click="handleCreate"
+            v-access:code="['iot:device:create']"
+          >
             <IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
             新增
           </Button>
-          <Button type="primary" @click="handleExport" v-hasPermi="['iot:device:export']">
+          <Button
+            type="primary"
+            @click="handleExport"
+            v-access:code="['iot:device:export']"
+          >
             <IconifyIcon icon="ant-design:download-outlined" class="mr-1" />
             导出
           </Button>
-          <Button @click="handleImport" v-hasPermi="['iot:device:import']">
+          <Button @click="handleImport" v-access:code="['iot:device:import']">
             <IconifyIcon icon="ant-design:upload-outlined" class="mr-1" />
             导入
           </Button>
           <Button
             v-show="viewMode === 'list'"
             @click="handleAddToGroup"
-            v-hasPermi="['iot:device:update']"
+            v-access:code="['iot:device:update']"
           >
             <IconifyIcon icon="ant-design:folder-add-outlined" class="mr-1" />
             添加到分组
@@ -353,13 +374,13 @@ onMounted(async () => {
             v-show="viewMode === 'list'"
             danger
             @click="handleDeleteBatch"
-            v-hasPermi="['iot:device:delete']"
+            v-access:code="['iot:device:delete']"
           >
             <IconifyIcon icon="ant-design:delete-outlined" class="mr-1" />
             批量删除
           </Button>
         </Space>
-        
+
         <!-- 视图切换 -->
         <Space :size="4">
           <Button
@@ -385,7 +406,10 @@ onMounted(async () => {
 
       <!-- 所属产品列 -->
       <template #product="{ row }">
-        <a class="cursor-pointer text-primary" @click="openProductDetail(row.productId)">
+        <a
+          class="text-primary cursor-pointer"
+          @click="openProductDetail(row.productId)"
+        >
           {{ products.find((p: any) => p.id === row.productId)?.name || '-' }}
         </a>
       </template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/DeviceCardView.vue b/apps/web-antd/src/views/iot/device/device/modules/DeviceCardView.vue
index 924d6d7db0b570ad404589fdfdbfe6c0df40d47d..29565e52ee9282b354d82568543aba4873d5557e 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceCardView.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceCardView.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
+
 import {
   Button,
   Card,
@@ -11,38 +15,35 @@ import {
   Row,
   Tag,
 } from 'ant-design-vue';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictLabel } from '@vben/hooks';
-import { IconifyIcon } from '@vben/icons';
 
 import { DeviceStateEnum, getDevicePage } from '#/api/iot/device/device';
 
 defineOptions({ name: 'DeviceCardView' });
 
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+  create: [];
+  delete: [row: any];
+  detail: [id: number];
+  edit: [row: any];
+  model: [id: number];
+  productDetail: [productId: number];
+}>();
+
 interface Props {
   products: any[];
   deviceGroups: any[];
   searchParams?: {
     deviceName: string;
+    deviceType?: number;
+    groupId?: number;
     nickname: string;
     productId?: number;
-    deviceType?: number;
     status?: number;
-    groupId?: number;
   };
 }
 
-const props = defineProps<Props>();
-
-const emit = defineEmits<{
-  create: [];
-  edit: [row: any];
-  delete: [row: any];
-  detail: [id: number];
-  model: [id: number];
-  productDetail: [productId: number];
-}>();
-
 const loading = ref(false);
 const list = ref<any[]>([]);
 const total = ref(0);
@@ -52,13 +53,13 @@ const queryParams = ref({
 });
 
 // 获取产品名称
-const getProductName = (productId: number) => {
+function getProductName(productId: number) {
   const product = props.products.find((p: any) => p.id === productId);
   return product?.name || '-';
-};
+}
 
 // 获取设备列表
-const getList = async () => {
+async function getList() {
   loading.value = true;
   try {
     const data = await getDevicePage({
@@ -70,26 +71,26 @@ const getList = async () => {
   } finally {
     loading.value = false;
   }
-};
+}
 
 // 处理页码变化
-const handlePageChange = (page: number, pageSize: number) => {
+function handlePageChange(page: number, pageSize: number) {
   queryParams.value.pageNo = page;
   queryParams.value.pageSize = pageSize;
   getList();
-};
+}
 
 // 获取设备类型颜色
-const getDeviceTypeColor = (deviceType: number) => {
+function getDeviceTypeColor(deviceType: number) {
   const colors: Record<number, string> = {
     0: 'blue',
     1: 'cyan',
   };
   return colors[deviceType] || 'default';
-};
+}
 
 // 获取设备状态信息
-const getStatusInfo = (state: number) => {
+function getStatusInfo(state: number) {
   if (state === DeviceStateEnum.ONLINE) {
     return {
       text: '在线',
@@ -104,14 +105,14 @@ const getStatusInfo = (state: number) => {
     bgColor: '#fff1f0',
     borderColor: '#ffccc7',
   };
-};
+}
 
 onMounted(() => {
   getList();
 });
 
 // 暴露方法供父组件调用
-defineExpose({ 
+defineExpose({
   reload: getList,
   search: () => {
     queryParams.value.pageNo = 1;
@@ -145,7 +146,7 @@ defineExpose({
                 <div class="device-icon">
                   <IconifyIcon icon="mdi:chip" />
                 </div>
-                <div 
+                <div
                   class="status-badge"
                   :style="{
                     color: getStatusInfo(item.state).color,
@@ -167,17 +168,30 @@ defineExpose({
               <div class="info-section">
                 <div class="info-item">
                   <span class="label">所属产品</span>
-                  <a 
+                  <a
                     class="value link"
-                    @click="(e: MouseEvent) => { e.stopPropagation(); emit('productDetail', item.productId); }"
+                    @click="
+                      (e) => {
+                        e.stopPropagation();
+                        emit('productDetail', item.productId);
+                      }
+                    "
                   >
                     {{ getProductName(item.productId) }}
                   </a>
                 </div>
                 <div class="info-item">
                   <span class="label">设备类型</span>
-                  <Tag :color="getDeviceTypeColor(item.deviceType)" size="small">
-                    {{ getDictLabel(DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE, item.deviceType) }}
+                  <Tag
+                    :color="getDeviceTypeColor(item.deviceType)"
+                    size="small"
+                  >
+                    {{
+                      getDictLabel(
+                        DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE,
+                        item.deviceType,
+                      )
+                    }}
                   </Tag>
                 </div>
                 <div class="info-item">
@@ -190,29 +204,44 @@ defineExpose({
 
               <!-- 操作按钮 -->
               <div class="action-bar">
-                <Button 
+                <Button
                   type="default"
                   size="small"
                   class="action-btn btn-edit"
-                  @click="(e: MouseEvent) => { e.stopPropagation(); emit('edit', item); }"
+                  @click="
+                    (e) => {
+                      e.stopPropagation();
+                      emit('edit', item);
+                    }
+                  "
                 >
                   <IconifyIcon icon="ph:note-pencil" />
                   编辑
                 </Button>
-                <Button 
+                <Button
                   type="default"
                   size="small"
                   class="action-btn btn-view"
-                  @click="(e: MouseEvent) => { e.stopPropagation(); emit('detail', item.id); }"
+                  @click="
+                    (e: MouseEvent) => {
+                      e.stopPropagation();
+                      emit('detail', item.id);
+                    }
+                  "
                 >
                   <IconifyIcon icon="ph:eye" />
                   详情
                 </Button>
-                <Button 
+                <Button
                   type="default"
                   size="small"
                   class="action-btn btn-data"
-                  @click="(e: MouseEvent) => { e.stopPropagation(); emit('model', item.id); }"
+                  @click="
+                    (e: MouseEvent) => {
+                      e.stopPropagation();
+                      emit('model', item.id);
+                    }
+                  "
                 >
                   <IconifyIcon icon="ph:database" />
                   数据
@@ -221,7 +250,7 @@ defineExpose({
                   title="确认删除该设备吗?"
                   @confirm="() => emit('delete', item)"
                 >
-                  <Button 
+                  <Button
                     type="default"
                     size="small"
                     class="action-btn btn-delete"
@@ -260,17 +289,23 @@ defineExpose({
 .device-card-view {
   .device-card {
     height: 100%;
-    border-radius: 8px;
     overflow: hidden;
-    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.03), 0 1px 6px -1px rgba(0, 0, 0, 0.02), 0 2px 4px 0 rgba(0, 0, 0, 0.02);
-    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
-    border: 1px solid #f0f0f0;
     background: #fff;
+    border: 1px solid #f0f0f0;
+    border-radius: 8px;
+    box-shadow:
+      0 1px 2px 0 rgb(0 0 0 / 3%),
+      0 1px 6px -1px rgb(0 0 0 / 2%),
+      0 2px 4px 0 rgb(0 0 0 / 2%);
+    transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
 
     &:hover {
-      box-shadow: 0 1px 2px -2px rgba(0, 0, 0, 0.16), 0 3px 6px 0 rgba(0, 0, 0, 0.12), 0 5px 12px 4px rgba(0, 0, 0, 0.09);
-      transform: translateY(-4px);
       border-color: #e6e6e6;
+      box-shadow:
+        0 1px 2px -2px rgb(0 0 0 / 16%),
+        0 3px 6px 0 rgb(0 0 0 / 12%),
+        0 5px 12px 4px rgb(0 0 0 / 9%);
+      transform: translateY(-4px);
     }
 
     :deep(.ant-card-body) {
@@ -278,10 +313,10 @@ defineExpose({
     }
 
     .card-content {
-      padding: 16px;
       display: flex;
       flex-direction: column;
       height: 100%;
+      padding: 16px;
     }
 
     // 头部区域
@@ -292,48 +327,48 @@ defineExpose({
       margin-bottom: 16px;
 
       .device-icon {
-        width: 32px;
-        height: 32px;
-        border-radius: 6px;
-        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
         display: flex;
         align-items: center;
         justify-content: center;
-        color: #fff;
+        width: 32px;
+        height: 32px;
         font-size: 18px;
-        box-shadow: 0 2px 8px rgba(102, 126, 234, 0.25);
+        color: #fff;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        border-radius: 6px;
+        box-shadow: 0 2px 8px rgb(102 126 234 / 25%);
       }
 
       .status-badge {
+        display: flex;
+        gap: 4px;
+        align-items: center;
         padding: 2px 10px;
-        border-radius: 12px;
         font-size: 12px;
         font-weight: 500;
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        border: 1px solid;
         line-height: 18px;
+        border: 1px solid;
+        border-radius: 12px;
 
         .status-dot {
           width: 6px;
           height: 6px;
+          background: currentcolor;
           border-radius: 50%;
-          background: currentColor;
         }
       }
     }
 
     // 设备名称
     .device-name {
-      font-size: 16px;
-      font-weight: 600;
-      color: #262626;
       margin-bottom: 16px;
       overflow: hidden;
       text-overflow: ellipsis;
-      white-space: nowrap;
+      font-size: 16px;
+      font-weight: 600;
       line-height: 24px;
+      color: #262626;
+      white-space: nowrap;
     }
 
     // 信息区域
@@ -343,30 +378,30 @@ defineExpose({
 
       .info-item {
         display: flex;
+        gap: 8px;
         align-items: center;
         justify-content: space-between;
         margin-bottom: 12px;
-        gap: 8px;
 
         &:last-child {
           margin-bottom: 0;
         }
 
         .label {
+          flex-shrink: 0;
           font-size: 13px;
           color: #8c8c8c;
-          flex-shrink: 0;
         }
 
         .value {
-          font-size: 13px;
-          color: #262626;
+          flex: 1;
+          min-width: 0;
           overflow: hidden;
           text-overflow: ellipsis;
-          white-space: nowrap;
+          font-size: 13px;
+          color: #262626;
           text-align: right;
-          flex: 1;
-          min-width: 0;
+          white-space: nowrap;
 
           &.link {
             color: #1890ff;
@@ -379,10 +414,11 @@ defineExpose({
           }
 
           &.code {
-            font-family: 'SF Mono', 'Monaco', 'Inconsolata', 'Fira Code', 'Consolas', monospace;
+            font-family:
+              'SF Mono', Monaco, Inconsolata, 'Fira Code', Consolas, monospace;
             font-size: 12px;
-            color: #595959;
             font-weight: 500;
+            color: #595959;
           }
         }
       }
@@ -390,28 +426,28 @@ defineExpose({
 
     // 操作按钮栏
     .action-bar {
+      position: relative;
+      z-index: 1;
       display: flex;
       gap: 8px;
       padding-top: 12px;
       border-top: 1px solid #f5f5f5;
-      position: relative;
-      z-index: 1;
 
       .action-btn {
+        display: flex;
         flex: 1;
+        gap: 4px;
+        align-items: center;
+        justify-content: center;
         height: 32px;
         padding: 4px 8px;
-        border-radius: 6px;
         font-size: 13px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        gap: 4px;
-        transition: all 0.2s;
         font-weight: 400;
-        border: 1px solid;
-        cursor: pointer;
         pointer-events: auto;
+        cursor: pointer;
+        border: 1px solid;
+        border-radius: 6px;
+        transition: all 0.2s;
 
         :deep(.anticon) {
           font-size: 16px;
diff --git a/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue b/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue
index 1e811afa0774afab9ffb9d5bd0e456f915f6438c..39fe16a999d76a4c944c2f5bb4698f0f4491ea31 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceForm.vue
@@ -1,15 +1,13 @@
 <script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+
 import { computed, ref } from 'vue';
 
-import { message } from 'ant-design-vue';
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
 
-import { 
-  createDevice, 
-  getDevice, 
-  updateDevice,
-  type IotDeviceApi 
-} from '#/api/iot/device/device';
+import { message } from 'ant-design-vue';
+
+import { createDevice, getDevice, updateDevice } from '#/api/iot/device/device';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/iot/device/device/modules/DeviceGroupForm.vue b/apps/web-antd/src/views/iot/device/device/modules/DeviceGroupForm.vue
index cf091a79ecce1b0caea7b3cd238d0a12fd9e47d2..dbb75faa021a561ec6b03722035bfa0c39003ea8 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceGroupForm.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceGroupForm.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 
-import { message } from 'ant-design-vue';
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
 
+import { message } from 'ant-design-vue';
+
 import { updateDeviceGroup } from '#/api/iot/device/device';
 import { $t } from '#/locales';
 
diff --git a/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue b/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue
index 9d12d3228ae68322970e8979b1ef25e8516ad17e..1bf1e0a4f27fcc67d4d52c0d14381b0bbfe156cb 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 
-import { message } from 'ant-design-vue';
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
 
 import { importDeviceTemplate } from '#/api/iot/device/device';
-import { downloadFileFromBlobPart } from '@vben/utils';
 
 import { useImportFormSchema } from '../data';
 
@@ -31,22 +32,22 @@ const [Modal, modalApi] = useVbenModal({
     if (!valid) {
       return;
     }
-    
+
     const values = await formApi.getValues();
     const file = values.file;
-    
-    if (!file || !file.length) {
+
+    if (!file || file.length === 0) {
       message.error('请上传文件');
       return;
     }
-    
+
     modalApi.lock();
     try {
       // 构建表单数据
       const formData = new FormData();
       formData.append('file', file[0].originFileObj);
       formData.append('updateSupport', values.updateSupport ? 'true' : 'false');
-      
+
       // 使用 fetch 上传文件
       const accessToken = localStorage.getItem('accessToken') || '';
       const response = await fetch(
@@ -57,21 +58,21 @@ const [Modal, modalApi] = useVbenModal({
             Authorization: `Bearer ${accessToken}`,
           },
           body: formData,
-        }
+        },
       );
-      
+
       const result = await response.json();
-      
+
       if (result.code !== 0) {
         message.error(result.msg || '导入失败');
         return;
       }
-      
+
       // 拼接提示语
       const data = result.data;
       let text = `上传成功数量：${data.createDeviceNames?.length || 0};`;
       if (data.createDeviceNames) {
-        for (let deviceName of data.createDeviceNames) {
+        for (const deviceName of data.createDeviceNames) {
           text += `< ${deviceName} >`;
         }
       }
@@ -88,7 +89,7 @@ const [Modal, modalApi] = useVbenModal({
         }
       }
       message.info(text);
-      
+
       // 关闭并提示
       await modalApi.close();
       emit('success');
diff --git a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue b/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue
index 9e73072c24b3993597294c83c9edd8ecb4ecdbe9..969d7c7a1c6e53dfbfcced7d16e0aa909168089e 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/components/DeviceTableSelect.vue
@@ -1,218 +1,72 @@
 <!-- IoT 设备选择，使用弹窗展示 -->
-<template>
-  <a-modal 
-    :title="dialogTitle" 
-    v-model:open="dialogVisible" 
-    width="60%" 
-    :footer="null"
-  >
-    <ContentWrap>
-      <!-- 搜索工作栏 -->
-      <a-form
-        ref="queryFormRef"
-        layout="inline"
-        :model="queryParams"
-        class="-mb-15px"
-      >
-        <a-form-item v-if="!props.productId" label="产品" name="productId">
-          <a-select
-            v-model:value="queryParams.productId"
-            placeholder="请选择产品"
-            allow-clear
-            style="width: 240px"
-          >
-            <a-select-option
-              v-for="product in products"
-              :key="product.id"
-              :value="product.id"
-            >
-              {{ product.name }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="DeviceName" name="deviceName">
-          <a-input
-            v-model:value="queryParams.deviceName"
-            placeholder="请输入 DeviceName"
-            allow-clear
-            @pressEnter="handleQuery"
-            style="width: 240px"
-          />
-        </a-form-item>
-        <a-form-item label="备注名称" name="nickname">
-          <a-input
-            v-model:value="queryParams.nickname"
-            placeholder="请输入备注名称"
-            allow-clear
-            @pressEnter="handleQuery"
-            style="width: 240px"
-          />
-        </a-form-item>
-        <a-form-item label="设备类型" name="deviceType">
-          <a-select
-            v-model:value="queryParams.deviceType"
-            placeholder="请选择设备类型"
-            allow-clear
-            style="width: 240px"
-          >
-            <a-select-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE)"
-              :key="dict.value"
-              :value="dict.value"
-            >
-              {{ dict.label }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="设备状态" name="status">
-          <a-select
-            v-model:value="queryParams.status"
-            placeholder="请选择设备状态"
-            allow-clear
-            style="width: 240px"
-          >
-            <a-select-option
-              v-for="dict in getIntDictOptions(DICT_TYPE.IOT_DEVICE_STATUS)"
-              :key="dict.value"
-              :value="dict.value"
-            >
-              {{ dict.label }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item label="设备分组" name="groupId">
-          <a-select
-            v-model:value="queryParams.groupId"
-            placeholder="请选择设备分组"
-            allow-clear
-            style="width: 240px"
-          >
-            <a-select-option
-              v-for="group in deviceGroups"
-              :key="group.id"
-              :value="group.id"
-            >
-              {{ group.name }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-        <a-form-item>
-          <a-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
-            搜索
-          </a-button>
-          <a-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
-            重置
-          </a-button>
-        </a-form-item>
-      </a-form>
-    </ContentWrap>
+<script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { IotDeviceGroupApi } from '#/api/iot/device/group';
+import type { IotProductApi } from '#/api/iot/product/product';
 
-    <!-- 列表 -->
-    <ContentWrap>
-      <a-table
-        ref="tableRef"
-        :loading="loading"
-        :dataSource="list"
-        :columns="columns"
-        :pagination="false"
-        :row-selection="multiple ? rowSelection : undefined"
-        @row-click="handleRowClick"
-        :row-key="(record: IotDeviceApi.Device) => record.id"
-      >
-        <template #bodyCell="{ column, record }">
-          <template v-if="column.key === 'radio'">
-            <a-radio
-              :checked="selectedId === record.id"
-              @click="() => handleRadioChange(record)"
-            />
-          </template>
-          <template v-else-if="column.key === 'productId'">
-            {{ products.find((p) => p.id === record.productId)?.name || '-' }}
-          </template>
-          <template v-else-if="column.key === 'deviceType'">
-            <dict-tag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="record.deviceType" />
-          </template>
-          <template v-else-if="column.key === 'groupIds'">
-            <template v-if="record.groupIds?.length">
-              <a-tag v-for="id in record.groupIds" :key="id" class="ml-5px" size="small">
-                {{ deviceGroups.find((g) => g.id === id)?.name }}
-              </a-tag>
-            </template>
-          </template>
-          <template v-else-if="column.key === 'status'">
-            <dict-tag :type="DICT_TYPE.IOT_DEVICE_STATUS" :value="record.status" />
-          </template>
-          <template v-else-if="column.key === 'onlineTime'">
-            {{ dateFormatter(null, null, record.onlineTime) }}
-          </template>
-        </template>
-      </a-table>
+import { computed, onMounted, reactive, ref } from 'vue';
 
-      <!-- 分页 -->
-      <Pagination
-        v-model:limit="queryParams.pageSize"
-        v-model:page="queryParams.pageNo"
-        :total="total"
-        @pagination="getList"
-      />
-    </ContentWrap>
+import { ContentWrap } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
 
-    <template #footer>
-      <a-button @click="submitForm" type="primary" :disabled="formLoading">确 定</a-button>
-      <a-button @click="dialogVisible = false">取 消</a-button>
-    </template>
-  </a-modal>
-</template>
+import {
+  Button,
+  Form,
+  Input,
+  message,
+  Modal,
+  Pagination,
+  Radio,
+  Select,
+  Table,
+  Tag,
+} from 'ant-design-vue';
 
-<script setup lang="ts">
-import { ref, reactive, onMounted, computed } from 'vue'
-import { DICT_TYPE } from '@vben/constants'
-import { getDictOptions } from '@vben/hooks'
-import { formatDate } from '@vben/utils'
-import type { IotDeviceApi } from '#/api/iot/device/device'
-import { getDevicePage } from '#/api/iot/device/device'
-import type { IotProductApi } from '#/api/iot/product/product'
-import { getSimpleProductList } from '#/api/iot/product/product'
-import type { IotDeviceGroupApi } from '#/api/iot/device/group'
-import { getSimpleDeviceGroupList } from '#/api/iot/device/group'
-import { message } from 'ant-design-vue'
+import { getDevicePage } from '#/api/iot/device/device';
+import { getSimpleDeviceGroupList } from '#/api/iot/device/group';
+import { getSimpleProductList } from '#/api/iot/product/product';
+import { DictTag } from '#/components/dict-tag';
 
-defineOptions({ name: 'IoTDeviceTableSelect' })
+defineOptions({ name: 'IoTDeviceTableSelect' });
 
 const props = defineProps({
   multiple: {
     type: Boolean,
-    default: false
+    default: false,
   },
   productId: {
     type: Number,
-    default: null
-  }
-})
+    default: null,
+  },
+});
+
+/** 提交表单 */
+const emit = defineEmits(['success']);
 
 // 获取字典选项
-const getIntDictOptions = (dictType: string) => {
-  return getDictOptions(dictType, 'number')
+function getIntDictOptions(dictType: string) {
+  return getDictOptions(dictType, 'number');
 }
 
 // 日期格式化
-const dateFormatter = (_row: any, _column: any, cellValue: any) => {
-  return cellValue ? formatDate(cellValue, 'YYYY-MM-DD HH:mm:ss') : ''
+function dateFormatter(_row: any, _column: any, cellValue: any) {
+  return cellValue ? formatDate(cellValue, 'YYYY-MM-DD HH:mm:ss') : '';
 }
 
-const dialogVisible = ref(false)
-const dialogTitle = ref('设备选择器')
-const formLoading = ref(false)
-const loading = ref(true) // 列表的加载中
-const list = ref<IotDeviceApi.Device[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const selectedDevices = ref<IotDeviceApi.Device[]>([]) // 选中的设备列表
-const selectedId = ref<number>() // 单选模式下选中的ID
-const products = ref<IotProductApi.Product[]>([]) // 产品列表
-const deviceGroups = ref<IotDeviceGroupApi.DeviceGroup[]>([]) // 设备分组列表
-const selectedRowKeys = ref<number[]>([]) // 多选模式下选中的keys
+const dialogVisible = ref(false);
+const dialogTitle = ref('设备选择器');
+const formLoading = ref(false);
+const loading = ref(true); // 列表的加载中
+const list = ref<IotDeviceApi.Device[]>([]); // 列表的数据
+const total = ref(0); // 列表的总页数
+const selectedDevices = ref<IotDeviceApi.Device[]>([]); // 选中的设备列表
+const selectedId = ref<number>(); // 单选模式下选中的ID
+const products = ref<IotProductApi.Product[]>([]); // 产品列表
+const deviceGroups = ref<IotDeviceGroupApi.DeviceGroup[]>([]); // 设备分组列表
+const selectedRowKeys = ref<number[]>([]); // 多选模式下选中的keys
 
 const queryParams = reactive({
   pageNo: 1,
@@ -222,9 +76,9 @@ const queryParams = reactive({
   deviceType: undefined as number | undefined,
   nickname: undefined as string | undefined,
   status: undefined as number | undefined,
-  groupId: undefined as number | undefined
-})
-const queryFormRef = ref() // 搜索的表单
+  groupId: undefined as number | undefined,
+});
+const queryFormRef = ref(); // 搜索的表单
 
 // 表格列定义
 const columns = computed(() => {
@@ -233,41 +87,34 @@ const columns = computed(() => {
       title: 'DeviceName',
       dataIndex: 'deviceName',
       key: 'deviceName',
-      align: 'center'
     },
     {
       title: '备注名称',
       dataIndex: 'nickname',
       key: 'nickname',
-      align: 'center'
     },
     {
       title: '所属产品',
       key: 'productId',
-      align: 'center'
     },
     {
       title: '设备类型',
       key: 'deviceType',
-      align: 'center'
     },
     {
       title: '所属分组',
       key: 'groupIds',
-      align: 'center'
     },
     {
       title: '设备状态',
       key: 'status',
-      align: 'center'
     },
     {
       title: '最后上线时间',
       key: 'onlineTime',
-      align: 'center',
-      width: 180
-    }
-  ]
+      width: 180,
+    },
+  ];
 
   // 单选模式添加单选列
   if (!props.multiple) {
@@ -275,96 +122,281 @@ const columns = computed(() => {
       title: '',
       key: 'radio',
       width: 55,
-      align: 'center'
-    } as any)
+      align: 'center',
+    } as any);
   }
 
-  return baseColumns
-})
+  return baseColumns;
+});
 
 // 多选配置
 const rowSelection = computed(() => ({
   selectedRowKeys: selectedRowKeys.value,
-  onChange: (keys: number[], rows: IotDeviceApi.Device[]) => {
-    selectedRowKeys.value = keys
-    selectedDevices.value = rows
-  }
-}))
+  onChange: (keys: any[], rows: IotDeviceApi.Device[]) => {
+    selectedRowKeys.value = keys;
+    selectedDevices.value = rows;
+  },
+}));
 
 /** 查询列表 */
 const getList = async () => {
-  loading.value = true
+  loading.value = true;
   try {
     if (props.productId) {
-      queryParams.productId = props.productId
+      queryParams.productId = props.productId;
     }
-    const data = await getDevicePage(queryParams)
-    list.value = data.list
-    total.value = data.total
+    const data = await getDevicePage(queryParams);
+    list.value = data.list;
+    total.value = data.total;
   } finally {
-    loading.value = false
+    loading.value = false;
   }
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
+  queryParams.pageNo = 1;
+  getList();
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields()
-  handleQuery()
-}
+  queryFormRef.value.resetFields();
+  handleQuery();
+};
 
 /** 打开弹窗 */
 const open = async () => {
-  dialogVisible.value = true
+  dialogVisible.value = true;
   // 重置选择状态
-  selectedDevices.value = []
-  selectedId.value = undefined
-  selectedRowKeys.value = []
+  selectedDevices.value = [];
+  selectedId.value = undefined;
+  selectedRowKeys.value = [];
   if (!props.productId) {
     // 获取产品列表
-    products.value = await getSimpleProductList()
+    products.value = await getSimpleProductList();
   }
   // 获取设备列表
-  await getList()
-}
-defineExpose({ open })
+  await getList();
+};
+defineExpose({ open });
 
 /** 处理行点击事件 */
-const tableRef = ref()
-const handleRowClick = (row: IotDeviceApi.Device) => {
+const tableRef = ref();
+function handleRowClick(row: IotDeviceApi.Device) {
   if (!props.multiple) {
-    selectedId.value = row.id
-    selectedDevices.value = [row]
+    selectedId.value = row.id;
+    selectedDevices.value = [row];
   }
 }
 
 /** 处理单选变更事件 */
-const handleRadioChange = (row: IotDeviceApi.Device) => {
-  selectedId.value = row.id
-  selectedDevices.value = [row]
+function handleRadioChange(row: IotDeviceApi.Device) {
+  selectedId.value = row.id;
+  selectedDevices.value = [row];
 }
 
-/** 提交表单 */
-const emit = defineEmits(['success'])
-const submitForm = async () => {
+async function submitForm() {
   if (selectedDevices.value.length === 0) {
-    message.warning({ content: props.multiple ? '请至少选择一个设备' : '请选择一个设备' })
-    return
+    message.warning({
+      content: props.multiple ? '请至少选择一个设备' : '请选择一个设备',
+    });
+    return;
   }
-  emit('success', props.multiple ? selectedDevices.value : selectedDevices.value[0])
-  dialogVisible.value = false
+  emit(
+    'success',
+    props.multiple ? selectedDevices.value : selectedDevices.value[0],
+  );
+  dialogVisible.value = false;
 }
 
-/** 初始化 **/
+/** 初始化 */
 onMounted(async () => {
   // 获取产品列表
-  products.value = await getSimpleProductList()
+  products.value = await getSimpleProductList();
   // 获取分组列表
-  deviceGroups.value = await getSimpleDeviceGroupList()
-})
+  deviceGroups.value = await getSimpleDeviceGroupList();
+});
 </script>
+
+<template>
+  <Modal
+    :title="dialogTitle"
+    v-model:open="dialogVisible"
+    width="60%"
+    :footer="null"
+  >
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <Form
+        ref="queryFormRef"
+        layout="inline"
+        :model="queryParams"
+        class="-mb-15px"
+      >
+        <Form.Item v-if="!props.productId" label="产品" name="productId">
+          <Select
+            v-model:value="queryParams.productId"
+            placeholder="请选择产品"
+            allow-clear
+            style="width: 240px"
+          >
+            <Select.Option
+              v-for="product in products"
+              :key="product.id"
+              :value="product.id"
+            >
+              {{ product.name }}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+        <Form.Item label="DeviceName" name="deviceName">
+          <Input
+            v-model:value="queryParams.deviceName"
+            placeholder="请输入 DeviceName"
+            allow-clear
+            @press-enter="handleQuery"
+            style="width: 240px"
+          />
+        </Form.Item>
+        <Form.Item label="备注名称" name="nickname">
+          <Input
+            v-model:value="queryParams.nickname"
+            placeholder="请输入备注名称"
+            allow-clear
+            @press-enter="handleQuery"
+            style="width: 240px"
+          />
+        </Form.Item>
+        <Form.Item label="设备类型" name="deviceType">
+          <Select
+            v-model:value="queryParams.deviceType"
+            placeholder="请选择设备类型"
+            allow-clear
+            style="width: 240px"
+          >
+            <Select.Option
+              v-for="dict in getIntDictOptions(
+                DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE,
+              )"
+              :key="dict.value"
+              :value="dict.value"
+            >
+              {{ dict.label }}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+        <Form.Item label="设备状态" name="status">
+          <Select
+            v-model:value="queryParams.status"
+            placeholder="请选择设备状态"
+            allow-clear
+            style="width: 240px"
+          >
+            <Select.Option
+              v-for="dict in getIntDictOptions(DICT_TYPE.IOT_DEVICE_STATUS)"
+              :key="dict.value"
+              :value="dict.value"
+            >
+              {{ dict.label }}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+        <Form.Item label="设备分组" name="groupId">
+          <Select
+            v-model:value="queryParams.groupId"
+            placeholder="请选择设备分组"
+            allow-clear
+            style="width: 240px"
+          >
+            <Select.Option
+              v-for="group in deviceGroups"
+              :key="group.id"
+              :value="group.id"
+            >
+              {{ group.name }}
+            </Select.Option>
+          </Select>
+        </Form.Item>
+        <Form.Item>
+          <Button @click="handleQuery">
+            <IconifyIcon class="mr-5px" icon="ep:search" />
+            搜索
+          </Button>
+          <Button @click="resetQuery">
+            <IconifyIcon class="mr-5px" icon="ep:refresh" />
+            重置
+          </Button>
+        </Form.Item>
+      </Form>
+    </ContentWrap>
+
+    <!-- 列表 -->
+    <ContentWrap>
+      <Table
+        ref="tableRef"
+        :loading="loading"
+        :data-source="list"
+        :columns="columns"
+        :pagination="false"
+        :row-selection="multiple ? rowSelection : undefined"
+        @row-click="handleRowClick"
+        :row-key="(record: IotDeviceApi.Device) => record.id?.toString() ?? ''"
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'radio'">
+            <Radio
+              :checked="selectedId === record.id"
+              @click="() => handleRadioChange(record as IotDeviceApi.Device)"
+            />
+          </template>
+          <template v-else-if="column.key === 'productId'">
+            {{ products.find((p) => p.id === record.productId)?.name || '-' }}
+          </template>
+          <template v-else-if="column.key === 'deviceType'">
+            <DictTag
+              :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE"
+              :value="record.deviceType"
+            />
+          </template>
+          <template v-else-if="column.key === 'groupIds'">
+            <template v-if="record.groupIds?.length">
+              <Tag
+                v-for="id in record.groupIds"
+                :key="id"
+                class="ml-5px"
+                size="small"
+              >
+                {{ deviceGroups.find((g) => g.id === id)?.name }}
+              </Tag>
+            </template>
+          </template>
+          <template v-else-if="column.key === 'status'">
+            <DictTag
+              :type="DICT_TYPE.IOT_DEVICE_STATUS"
+              :value="record.status"
+            />
+          </template>
+          <template v-else-if="column.key === 'onlineTime'">
+            {{ dateFormatter(null, null, record.onlineTime) }}
+          </template>
+        </template>
+      </Table>
+
+      <!-- 分页 -->
+      <Pagination
+        v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNo"
+        :total="total"
+        @pagination="getList"
+      />
+    </ContentWrap>
+
+    <template #footer>
+      <Button @click="submitForm" type="primary" :disabled="formLoading">
+        确 定
+      </Button>
+      <Button @click="dialogVisible = false">取 消</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue
index 167380ffbb5242e4ee5e49cf9b6f9542d2196f7f..6dd12c0a693a42f42169c099bab7951185cb31e2 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailConfig.vue
@@ -1,140 +1,152 @@
 <!-- 设备配置 -->
-<template>
-  <div>
-    <a-alert
-      message="支持远程更新设备的配置文件(JSON 格式)，可以在下方编辑配置模板，对设备的系统参数、网络参数等进行远程配置。配置完成后，需点击「下发」按钮，设备即可进行远程配置。"
-      type="info"
-      show-icon
-      class="my-4"
-      description="如需编辑文件，请点击下方编辑按钮"
-    />
-    <JsonEditor
-      v-model="config"
-      :mode="isEditing ? 'code' : 'view'"
-      height="600px"
-      @error="onError"
-    />
-    <div class="mt-5 text-center">
-      <a-button v-if="isEditing" @click="cancelEdit">取消</a-button>
-      <a-button v-if="isEditing" type="primary" @click="saveConfig" :disabled="hasJsonError">
-        保存
-      </a-button>
-      <a-button v-else @click="enableEdit">编辑</a-button>
-      <a-button v-if="!isEditing" type="primary" @click="handleConfigPush" :loading="pushLoading">
-        配置推送
-      </a-button>
-    </div>
-  </div>
-</template>
-
 <script lang="ts" setup>
-import { ref, watchEffect } from 'vue'
-import { message } from 'ant-design-vue'
-import { DeviceApi } from '#/api/iot/device/device'
-import type { DeviceVO } from '#/api/iot/device/device'
-import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants'
+import type { IotDeviceApi } from '#/api/iot/device/device';
+
+import { ref, watchEffect } from 'vue';
+
+import { Alert, Button, message } from 'ant-design-vue';
 
-defineOptions({ name: 'DeviceDetailConfig' })
+import { sendDeviceMessage, updateDevice } from '#/api/iot/device/device';
+import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants';
+
+defineOptions({ name: 'DeviceDetailConfig' });
 
 const props = defineProps<{
-  device: DeviceVO
-}>()
+  device: IotDeviceApi.Device;
+}>();
 
 const emit = defineEmits<{
-  (e: 'success'): void // 定义 success 事件，不需要参数
-}>()
-
+  (e: 'success'): void; // 定义 success 事件，不需要参数
+}>();
 
-const loading = ref(false) // 加载中
-const pushLoading = ref(false) // 推送加载中
-const config = ref<any>({}) // 只存储 config 字段
-const hasJsonError = ref(false) // 是否有 JSON 格式错误
+const loading = ref(false); // 加载中
+const pushLoading = ref(false); // 推送加载中
+const config = ref<any>({}); // 只存储 config 字段
+const hasJsonError = ref(false); // 是否有 JSON 格式错误
 
 /** 监听 props.device 的变化，只更新 config 字段 */
 watchEffect(() => {
   try {
-    config.value = props.device.config ? JSON.parse(props.device.config) : {}
-  } catch (e) {
-    config.value = {}
+    config.value = props.device.config ? JSON.parse(props.device.config) : {};
+  } catch {
+    config.value = {};
   }
-})
+});
 
-const isEditing = ref(false) // 编辑状态
+const isEditing = ref(false); // 编辑状态
 /** 启用编辑模式的函数 */
-const enableEdit = () => {
-  isEditing.value = true
-  hasJsonError.value = false // 重置错误状态
+function enableEdit() {
+  isEditing.value = true;
+  hasJsonError.value = false; // 重置错误状态
 }
 
 /** 取消编辑的函数 */
-const cancelEdit = () => {
+function cancelEdit() {
   try {
-    config.value = props.device.config ? JSON.parse(props.device.config) : {}
-  } catch (e) {
-    config.value = {}
+    config.value = props.device.config ? JSON.parse(props.device.config) : {};
+  } catch {
+    config.value = {};
   }
-  isEditing.value = false
-  hasJsonError.value = false // 重置错误状态
+  isEditing.value = false;
+  hasJsonError.value = false; // 重置错误状态
 }
 
 /** 保存配置的函数 */
-const saveConfig = async () => {
+async function saveConfig() {
   if (hasJsonError.value) {
-    message.error({ content: 'JSON格式错误，请修正后再提交！' })
-    return
+    message.error({ content: 'JSON格式错误，请修正后再提交！' });
+    return;
   }
-  await updateDeviceConfig()
-  isEditing.value = false
+  await updateDeviceConfig();
+  isEditing.value = false;
 }
 
 /** 配置推送处理函数 */
-const handleConfigPush = async () => {
+async function handleConfigPush() {
   try {
-    pushLoading.value = true
+    pushLoading.value = true;
 
     // 调用配置推送接口
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.CONFIG_PUSH.method,
-      params: config.value
-    })
+      params: config.value,
+    });
 
-    message.success({ content: '配置推送成功！' })
+    message.success({ content: '配置推送成功！' });
   } catch (error) {
     if (error !== 'cancel') {
-      message.error({ content: '配置推送失败！' })
-      console.error('配置推送错误:', error)
+      message.error({ content: '配置推送失败！' });
+      console.error('配置推送错误:', error);
     }
   } finally {
-    pushLoading.value = false
+    pushLoading.value = false;
   }
 }
 
 /** 更新设备配置 */
-const updateDeviceConfig = async () => {
+async function updateDeviceConfig() {
   try {
     // 提交请求
-    loading.value = true
-    await DeviceApi.updateDevice({
+    loading.value = true;
+    await updateDevice({
       id: props.device.id,
-      config: JSON.stringify(config.value)
-    } as DeviceVO)
-    message.success({ content: '更新成功！' })
+      config: JSON.stringify(config.value),
+    } as IotDeviceApi.Device);
+    message.success({ content: '更新成功！' });
     // 触发 success 事件
-    emit('success')
+    emit('success');
   } catch (error) {
-    console.error(error)
+    console.error(error);
   } finally {
-    loading.value = false
+    loading.value = false;
   }
 }
 
 /** 处理 JSON 编辑器错误的函数 */
-const onError = (errors: any) => {
+function onError(errors: any) {
   if (!errors || (Array.isArray(errors) && errors.length === 0)) {
-    hasJsonError.value = false
-    return
+    hasJsonError.value = false;
+    return;
   }
-  hasJsonError.value = true
+  hasJsonError.value = true;
 }
 </script>
+
+<template>
+  <div>
+    <Alert
+      message="支持远程更新设备的配置文件(JSON 格式)，可以在下方编辑配置模板，对设备的系统参数、网络参数等进行远程配置。配置完成后，需点击「下发」按钮，设备即可进行远程配置。"
+      type="info"
+      show-icon
+      class="my-4"
+      description="如需编辑文件，请点击下方编辑按钮"
+    />
+    <JsonEditor
+      v-model="config"
+      :mode="isEditing ? 'code' : 'view'"
+      height="600px"
+      @error="onError"
+    />
+    <div class="mt-5 text-center">
+      <Button v-if="isEditing" @click="cancelEdit">取消</Button>
+      <Button
+        v-if="isEditing"
+        type="primary"
+        @click="saveConfig"
+        :disabled="hasJsonError"
+      >
+        保存
+      </Button>
+      <Button v-else @click="enableEdit">编辑</Button>
+      <Button
+        v-if="!isEditing"
+        type="primary"
+        @click="handleConfigPush"
+        :loading="pushLoading"
+      >
+        配置推送
+      </Button>
+    </div>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue
index 2465707eab3a95c20aca608f0cd2c4a64886b2fa..8c0acd85abde2bf76cc51cd392dcd750ad11fb30 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsHeader.vue
@@ -1,87 +1,97 @@
 <!-- 设备信息（头部） -->
-<template>
-  <div class="mb-4">
-    <div class="flex items-start justify-between">
-      <div>
-        <h2 class="text-xl font-bold">{{ device.deviceName }}</h2>
-      </div>
-      <div class="space-x-2">
-        <!-- 右上：按钮 -->
-        <a-button
-          v-if="product.status === 0"
-          v-hasPermi="['iot:device:update']"
-          @click="openForm('update', device.id)"
-        >
-          编辑
-        </a-button>
-      </div>
-    </div>
+<script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { IotProductApi } from '#/api/iot/product/product';
 
-    <a-card class="mt-4">
-      <a-descriptions :column="1">
-        <a-descriptions-item label="产品">
-          <a @click="goToProductDetail(product.id)" class="cursor-pointer text-blue-600">
-            {{ product.name }}
-          </a>
-        </a-descriptions-item>
-        <a-descriptions-item label="ProductKey">
-          {{ product.productKey }}
-          <a-button size="small" class="ml-2" @click="copyToClipboard(product.productKey)">
-            复制
-          </a-button>
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-card>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
 
-    <!-- 表单弹窗：添加/修改 -->
-    <DeviceForm ref="formRef" @success="emit('refresh')" />
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import DeviceForm from '../DeviceForm.vue'
-import type { ProductVO } from '#/api/iot/product/product'
-import type { DeviceVO } from '#/api/iot/device/device'
+import { Button, Card, Descriptions, message } from 'ant-design-vue';
+
+import DeviceForm from '../DeviceForm.vue';
 
 interface Props {
-  product: ProductVO
-  device: DeviceVO
-  loading?: boolean
+  product: IotProductApi.Product;
+  device: IotDeviceApi.Device;
+  loading?: boolean;
 }
 
 withDefaults(defineProps<Props>(), {
   loading: false,
-})
+});
 
 const emit = defineEmits<{
-  refresh: []
-}>()
+  refresh: [];
+}>();
 
-const router = useRouter()
+const router = useRouter();
 
 /** 操作修改 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const formRef = ref();
+function openForm(type: string, id?: number) {
+  formRef.value.open(type, id);
 }
 
 /** 复制到剪贴板方法 */
-const copyToClipboard = async (text: string | undefined) => {
-  if (!text) return
+async function copyToClipboard(text: string | undefined) {
+  if (!text) return;
   try {
-    await navigator.clipboard.writeText(text)
-    message.success({ content: '复制成功' })
-  } catch (error) {
-    message.error({ content: '复制失败' })
+    await navigator.clipboard.writeText(text);
+    message.success({ content: '复制成功' });
+  } catch {
+    message.error({ content: '复制失败' });
   }
 }
 
 /** 跳转到产品详情页面 */
-const goToProductDetail = (productId: number | undefined) => {
+function goToProductDetail(productId: number | undefined) {
   if (productId) {
-    router.push({ name: 'IoTProductDetail', params: { id: productId } })
+    router.push({ name: 'IoTProductDetail', params: { id: productId } });
   }
 }
 </script>
+<template>
+  <div class="mb-4">
+    <div class="flex items-start justify-between">
+      <div>
+        <h2 class="text-xl font-bold">{{ device.deviceName }}</h2>
+      </div>
+      <div class="space-x-2">
+        <!-- 右上：按钮 -->
+        <Button
+          v-if="product.status === 0"
+          v-access:code="['iot:device:update']"
+          @click="openForm('update', device.id)"
+        >
+          编辑
+        </Button>
+      </div>
+    </div>
+
+    <Card class="mt-4">
+      <Descriptions :column="1">
+        <Descriptions.Item label="产品">
+          <a
+            @click="goToProductDetail(product.id)"
+            class="cursor-pointer text-blue-600"
+          >
+            {{ product.name }}
+          </a>
+        </Descriptions.Item>
+        <Descriptions.Item label="ProductKey">
+          {{ product.productKey }}
+          <Button
+            size="small"
+            class="ml-2"
+            @click="copyToClipboard(product.productKey)"
+          >
+            复制
+          </Button>
+        </Descriptions.Item>
+      </Descriptions>
+    </Card>
+
+    <!-- 表单弹窗：添加/修改 -->
+    <DeviceForm ref="formRef" @success="emit('refresh')" />
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue
index 3d758332bf450efc94bad28d9a94a8702660a4d6..aced9b29063d40195b279781c659def885e78a23 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsInfo.vue
@@ -1,179 +1,227 @@
 <!-- 设备信息 -->
+<script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { IotProductApi } from '#/api/iot/product/product';
+
+import { computed, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
+
+import {
+  Button,
+  Card,
+  Col,
+  Descriptions,
+  Form,
+  Input,
+  message,
+  Modal,
+  Row,
+} from 'ant-design-vue';
+
+import { getDeviceAuthInfo } from '#/api/iot/device/device';
+import { DictTag } from '#/components/dict-tag';
+
+// 消息提示
+
+const { product, device } = defineProps<{
+  device: IotDeviceApi.Device;
+  product: IotProductApi.Product;
+}>(); // 定义 Props
+// const emit = defineEmits(['refresh']); // 定义 Emits
+
+const authDialogVisible = ref(false); // 定义设备认证信息弹框的可见性
+const authPasswordVisible = ref(false); // 定义密码可见性状态
+const authInfo = ref<IotDeviceApi.DeviceAuthInfo>(
+  {} as IotDeviceApi.DeviceAuthInfo,
+); // 定义设备认证信息对象
+
+/** 控制地图显示的标志 */
+const showMap = computed(() => {
+  return !!(device.longitude && device.latitude);
+});
+
+/** 复制到剪贴板方法 */
+async function copyToClipboard(text: string) {
+  try {
+    await navigator.clipboard.writeText(text);
+    message.success({ content: '复制成功' });
+  } catch {
+    message.error({ content: '复制失败' });
+  }
+}
+
+/** 打开设备认证信息弹框的方法 */
+async function handleAuthInfoDialogOpen() {
+  if (!device.id) return;
+  try {
+    authInfo.value = await getDeviceAuthInfo(device.id);
+    // 显示设备认证信息弹框
+    authDialogVisible.value = true;
+  } catch (error) {
+    console.error('获取设备认证信息出错：', error);
+    message.error({
+      content: '获取设备认证信息失败，请检查网络连接或联系管理员',
+    });
+  }
+}
+
+/** 关闭设备认证信息弹框的方法 */
+function handleAuthInfoDialogClose() {
+  authDialogVisible.value = false;
+}
+</script>
 <template>
   <div>
-    <a-row :gutter="16">
+    <Row :gutter="16">
       <!-- 左侧设备信息 -->
-      <a-col :span="12">
-        <a-card class="h-full">
+      <Col :span="12">
+        <Card class="h-full">
           <template #title>
             <div class="flex items-center">
-              <Icon icon="ep:info-filled" class="mr-2 text-primary" />
+              <IconifyIcon icon="ep:info-filled" class="text-primary mr-2" />
               <span>设备信息</span>
             </div>
           </template>
-          <a-descriptions :column="1" bordered>
-            <a-descriptions-item label="产品名称">
+          <Descriptions :column="1" bordered>
+            <Descriptions.Item label="产品名称">
               {{ product.name }}
-            </a-descriptions-item>
-            <a-descriptions-item label="ProductKey">
+            </Descriptions.Item>
+            <Descriptions.Item label="ProductKey">
               {{ product.productKey }}
-            </a-descriptions-item>
-            <a-descriptions-item label="设备类型">
-              <dict-tag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="product.deviceType" />
-            </a-descriptions-item>
-            <a-descriptions-item label="DeviceName">
+            </Descriptions.Item>
+            <Descriptions.Item label="设备类型">
+              <DictTag
+                :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE"
+                :value="product.deviceType"
+              />
+            </Descriptions.Item>
+            <Descriptions.Item label="DeviceName">
               {{ device.deviceName }}
-            </a-descriptions-item>
-            <a-descriptions-item label="备注名称">
+            </Descriptions.Item>
+            <Descriptions.Item label="备注名称">
               {{ device.nickname || '--' }}
-            </a-descriptions-item>
-            <a-descriptions-item label="当前状态">
-              <dict-tag :type="DICT_TYPE.IOT_DEVICE_STATUS" :value="device.state" />
-            </a-descriptions-item>
-            <a-descriptions-item label="创建时间">
+            </Descriptions.Item>
+            <Descriptions.Item label="当前状态">
+              <DictTag
+                :type="DICT_TYPE.IOT_DEVICE_STATUS"
+                :value="device.state"
+              />
+            </Descriptions.Item>
+            <Descriptions.Item label="创建时间">
               {{ formatDate(device.createTime) }}
-            </a-descriptions-item>
-            <a-descriptions-item label="激活时间">
+            </Descriptions.Item>
+            <Descriptions.Item label="激活时间">
               {{ formatDate(device.activeTime) }}
-            </a-descriptions-item>
-            <a-descriptions-item label="最后上线时间">
+            </Descriptions.Item>
+            <Descriptions.Item label="最后上线时间">
               {{ formatDate(device.onlineTime) }}
-            </a-descriptions-item>
-            <a-descriptions-item label="最后离线时间">
+            </Descriptions.Item>
+            <Descriptions.Item label="最后离线时间">
               {{ formatDate(device.offlineTime) }}
-            </a-descriptions-item>
-            <a-descriptions-item label="MQTT 连接参数">
-              <a-button type="link" @click="handleAuthInfoDialogOpen" size="small">
+            </Descriptions.Item>
+            <Descriptions.Item label="MQTT 连接参数">
+              <Button
+                type="link"
+                @click="handleAuthInfoDialogOpen"
+                size="small"
+              >
                 查看
-              </a-button>
-            </a-descriptions-item>
-          </a-descriptions>
-        </a-card>
-      </a-col>
+              </Button>
+            </Descriptions.Item>
+          </Descriptions>
+        </Card>
+      </Col>
 
       <!-- 右侧地图 -->
-      <a-col :span="12">
-        <a-card class="h-full">
+      <Col :span="12">
+        <Card class="h-full">
           <template #title>
             <div class="flex items-center justify-between">
               <div class="flex items-center">
-                <Icon icon="ep:location" class="mr-2 text-primary" />
+                <IconifyIcon icon="ep:location" class="text-primary mr-2" />
                 <span>设备位置</span>
               </div>
             </div>
           </template>
           <div class="h-[500px] w-full">
-            <div v-if="showMap" class="h-full w-full bg-gray-100 flex items-center justify-center rounded">
+            <div
+              v-if="showMap"
+              class="flex h-full w-full items-center justify-center rounded bg-gray-100"
+            >
               <span class="text-gray-400">地图组件</span>
             </div>
             <div
               v-else
-              class="flex items-center justify-center h-full w-full bg-gray-50 text-gray-400 rounded"
+              class="flex h-full w-full items-center justify-center rounded bg-gray-50 text-gray-400"
             >
-              <Icon icon="ep:warning" class="mr-2" />
+              <IconifyIcon icon="ep:warning" class="mr-2" />
               <span>暂无位置信息</span>
             </div>
           </div>
-        </a-card>
-      </a-col>
-    </a-row>
+        </Card>
+      </Col>
+    </Row>
 
     <!-- 认证信息弹框 -->
-    <a-modal
+    <Modal
       v-model:open="authDialogVisible"
       title="MQTT 连接参数"
       width="640px"
       :footer="null"
     >
-      <a-form :label-col="{ span: 6 }">
-        <a-form-item label="clientId">
-          <a-input-group compact>
-            <a-input v-model:value="authInfo.clientId" readonly style="width: calc(100% - 80px)" />
-            <a-button @click="copyToClipboard(authInfo.clientId)" type="primary">
-              <Icon icon="ph:copy" />
-            </a-button>
-          </a-input-group>
-        </a-form-item>
-        <a-form-item label="username">
-          <a-input-group compact>
-            <a-input v-model:value="authInfo.username" readonly style="width: calc(100% - 80px)" />
-            <a-button @click="copyToClipboard(authInfo.username)" type="primary">
-              <Icon icon="ph:copy" />
-            </a-button>
-          </a-input-group>
-        </a-form-item>
-        <a-form-item label="password">
-          <a-input-group compact>
-            <a-input
+      <Form :label-col="{ span: 6 }">
+        <Form.Item label="clientId">
+          <Input.Group compact>
+            <Input
+              v-model:value="authInfo.clientId"
+              readonly
+              style="width: calc(100% - 80px)"
+            />
+            <Button @click="copyToClipboard(authInfo.clientId)" type="primary">
+              <IconifyIcon icon="ph:copy" />
+            </Button>
+          </Input.Group>
+        </Form.Item>
+        <Form.Item label="username">
+          <Input.Group compact>
+            <Input
+              v-model:value="authInfo.username"
+              readonly
+              style="width: calc(100% - 80px)"
+            />
+            <Button @click="copyToClipboard(authInfo.username)" type="primary">
+              <IconifyIcon icon="ph:copy" />
+            </Button>
+          </Input.Group>
+        </Form.Item>
+        <Form.Item label="password">
+          <Input.Group compact>
+            <Input
               v-model:value="authInfo.password"
               readonly
               :type="authPasswordVisible ? 'text' : 'password'"
               style="width: calc(100% - 160px)"
             />
-            <a-button @click="authPasswordVisible = !authPasswordVisible" type="primary">
-              <Icon :icon="authPasswordVisible ? 'ph:eye-slash' : 'ph:eye'" />
-            </a-button>
-            <a-button @click="copyToClipboard(authInfo.password)" type="primary">
-              <Icon icon="ph:copy" />
-            </a-button>
-          </a-input-group>
-        </a-form-item>
-      </a-form>
-      <div class="text-right mt-4">
-        <a-button @click="handleAuthInfoDialogClose">关闭</a-button>
+            <Button
+              @click="authPasswordVisible = !authPasswordVisible"
+              type="primary"
+            >
+              <IconifyIcon
+                :icon="authPasswordVisible ? 'ph:eye-slash' : 'ph:eye'"
+              />
+            </Button>
+            <Button @click="copyToClipboard(authInfo.password)" type="primary">
+              <IconifyIcon icon="ph:copy" />
+            </Button>
+          </Input.Group>
+        </Form.Item>
+      </Form>
+      <div class="mt-4 text-right">
+        <Button @click="handleAuthInfoDialogClose">关闭</Button>
       </div>
-    </a-modal>
+    </Modal>
   </div>
 </template>
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { message } from 'ant-design-vue'
-import { DICT_TYPE } from '@vben/constants'
-import type { ProductVO } from '#/api/iot/product/product'
-import { formatDate } from '@vben/utils'
-import type { DeviceVO } from '#/api/iot/device/device'
-import { DeviceApi } from '#/api/iot/device/device'
-import type { IotDeviceAuthInfoVO } from '#/api/iot/device/device'
-
- // 消息提示
-
-const { product, device } = defineProps<{ product: ProductVO; device: DeviceVO }>() // 定义 Props
-const emit = defineEmits(['refresh']) // 定义 Emits
-
-const authDialogVisible = ref(false) // 定义设备认证信息弹框的可见性
-const authPasswordVisible = ref(false) // 定义密码可见性状态
-const authInfo = ref<IotDeviceAuthInfoVO>({} as IotDeviceAuthInfoVO) // 定义设备认证信息对象
-
-/** 控制地图显示的标志 */
-const showMap = computed(() => {
-  return !!(device.longitude && device.latitude)
-})
-
-/** 复制到剪贴板方法 */
-const copyToClipboard = async (text: string) => {
-  try {
-    await navigator.clipboard.writeText(text)
-    message.success({ content: '复制成功' })
-  } catch (error) {
-    message.error({ content: '复制失败' })
-  }
-}
-
-/** 打开设备认证信息弹框的方法 */
-const handleAuthInfoDialogOpen = async () => {
-  if (!device.id) return
-  try {
-    authInfo.value = await DeviceApi.getDeviceAuthInfo(device.id)
-    // 显示设备认证信息弹框
-    authDialogVisible.value = true
-  } catch (error) {
-    console.error('获取设备认证信息出错：', error)
-    message.error({ content: '获取设备认证信息失败，请检查网络连接或联系管理员' })
-  }
-}
-
-/** 关闭设备认证信息弹框的方法 */
-const handleAuthInfoDialogClose = () => {
-  authDialogVisible.value = false
-}
-</script>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue
index 86e55975da634c62f4fb7f23528c092657fff9aa..20f8f150a96741af982586ee264b4da7ac744195 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsMessage.vue
@@ -1,92 +1,36 @@
 <!-- 设备消息列表 -->
-<template>
-  <ContentWrap>
-    <!-- 搜索区域 -->
-    <a-form :model="queryParams" layout="inline">
-      <a-form-item>
-        <a-select v-model:value="queryParams.method" placeholder="所有方法" style="width: 160px" allow-clear>
-          <a-select-option
-            v-for="item in methodOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-            {{ item.label }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item>
-        <a-select
-          v-model:value="queryParams.upstream"
-          placeholder="上行/下行"
-          style="width: 160px"
-          allow-clear
-        >
-          <a-select-option label="上行" value="true">上行</a-select-option>
-          <a-select-option label="下行" value="false">下行</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item>
-        <a-button type="primary" @click="handleQuery">
-          <Icon icon="ep:search" class="mr-5px" /> 搜索
-        </a-button>
-        <a-switch
-          v-model:checked="autoRefresh"
-          class="ml-20px"
-          checked-children="定时刷新"
-          un-checked-children="定时刷新"
-        />
-      </a-form-item>
-    </a-form>
+<script setup lang="ts">
+import {
+  computed,
+  onBeforeUnmount,
+  onMounted,
+  reactive,
+  ref,
+  watch,
+} from 'vue';
 
-    <!-- 消息列表 -->
-    <a-table :loading="loading" :dataSource="list" :columns="columns" :pagination="false" class="whitespace-nowrap">
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'ts'">
-          {{ formatDate(record.ts) }}
-        </template>
-        <template v-else-if="column.key === 'upstream'">
-          <a-tag :color="record.upstream ? 'blue' : 'green'">
-            {{ record.upstream ? '上行' : '下行' }}
-          </a-tag>
-        </template>
-        <template v-else-if="column.key === 'reply'">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="record.reply" />
-        </template>
-        <template v-else-if="column.key === 'method'">
-          {{ methodOptions.find((item) => item.value === record.method)?.label }}
-        </template>
-        <template v-else-if="column.key === 'params'">
-          <span v-if="record.reply">
-            {{ `{"code":${record.code},"msg":"${record.msg}","data":${record.data}\}` }}
-          </span>
-          <span v-else>{{ record.params }}</span>
-        </template>
-      </template>
-    </a-table>
+import { ContentWrap } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
 
-    <!-- 分页 -->
-    <div class="mt-10px flex justify-end">
-      <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getMessageList"
-      />
-    </div>
-  </ContentWrap>
-</template>
+import {
+  Button,
+  Form,
+  Pagination,
+  Select,
+  Switch,
+  Table,
+  Tag,
+} from 'ant-design-vue';
 
-<script setup lang="ts">
-import { ref, reactive, computed, watch, onMounted, onBeforeUnmount } from 'vue'
-import { DICT_TYPE } from '@vben/constants'
-import { DeviceApi } from '#/api/iot/device/device'
-import { formatDate } from '@vben/utils'
-import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants'
+import { getDeviceMessagePage } from '#/api/iot/device/device';
+import { DictTag } from '#/components/dict-tag';
+import { IotDeviceMessageMethodEnum } from '#/views/iot/utils/constants';
 
 const props = defineProps<{
-  deviceId: number
-}>()
+  deviceId: number;
+}>();
 
 // 查询参数
 const queryParams = reactive({
@@ -94,23 +38,23 @@ const queryParams = reactive({
   method: undefined,
   upstream: undefined,
   pageNo: 1,
-  pageSize: 10
-})
+  pageSize: 10,
+});
 
 // 列表数据
-const loading = ref(false)
-const total = ref(0)
-const list = ref<any[]>([])
-const autoRefresh = ref(false) // 自动刷新开关
-let autoRefreshTimer: any = null // 自动刷新定时器
+const loading = ref(false);
+const total = ref(0);
+const list = ref<any[]>([]);
+const autoRefresh = ref(false); // 自动刷新开关
+let autoRefreshTimer: any = null; // 自动刷新定时器
 
 // 消息方法选项
 const methodOptions = computed(() => {
   return Object.values(IotDeviceMessageMethodEnum).map((item) => ({
     label: item.name,
-    value: item.method
-  }))
-})
+    value: item.method,
+  }));
+});
 
 // 表格列定义
 const columns = [
@@ -118,115 +62,206 @@ const columns = [
     title: '时间',
     dataIndex: 'ts',
     key: 'ts',
-    align: 'center',
-    width: 180
+    width: 180,
   },
   {
     title: '上行/下行',
     dataIndex: 'upstream',
     key: 'upstream',
-    align: 'center',
-    width: 140
+    width: 140,
   },
   {
     title: '是否回复',
     dataIndex: 'reply',
     key: 'reply',
-    align: 'center',
-    width: 140
+    width: 140,
   },
   {
     title: '请求编号',
     dataIndex: 'requestId',
     key: 'requestId',
-    align: 'center',
-    width: 300
+    width: 300,
   },
   {
     title: '请求方法',
     dataIndex: 'method',
     key: 'method',
-    align: 'center',
-    width: 140
+    width: 140,
   },
   {
     title: '请求/响应数据',
     dataIndex: 'params',
     key: 'params',
-    align: 'center',
-    ellipsis: true
-  }
-]
+    ellipsis: true,
+  },
+];
 
 /** 查询消息列表 */
-const getMessageList = async () => {
-  if (!props.deviceId) return
-  loading.value = true
+async function getMessageList() {
+  if (!props.deviceId) return;
+  loading.value = true;
   try {
-    const data = await DeviceApi.getDeviceMessagePage(queryParams)
-    total.value = data.total
-    list.value = data.list
+    const data = await getDeviceMessagePage(queryParams);
+    total.value = data.total;
+    list.value = data.list;
   } finally {
-    loading.value = false
+    loading.value = false;
   }
 }
 
 /** 搜索操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getMessageList()
+function handleQuery() {
+  queryParams.pageNo = 1;
+  getMessageList();
 }
 
 /** 监听自动刷新 */
 watch(autoRefresh, (newValue) => {
   if (newValue) {
     autoRefreshTimer = setInterval(() => {
-      getMessageList()
-    }, 5000)
+      getMessageList();
+    }, 5000);
   } else {
-    clearInterval(autoRefreshTimer)
-    autoRefreshTimer = null
+    clearInterval(autoRefreshTimer);
+    autoRefreshTimer = null;
   }
-})
+});
 
 /** 监听设备标识变化 */
 watch(
   () => props.deviceId,
   (newValue) => {
     if (newValue) {
-      handleQuery()
+      handleQuery();
     }
-  }
-)
+  },
+);
 
 /** 组件卸载时清除定时器 */
 onBeforeUnmount(() => {
   if (autoRefreshTimer) {
-    clearInterval(autoRefreshTimer)
-    autoRefreshTimer = null
+    clearInterval(autoRefreshTimer);
+    autoRefreshTimer = null;
   }
-})
+});
 
 /** 初始化 */
 onMounted(() => {
   if (props.deviceId) {
-    getMessageList()
+    getMessageList();
   }
-})
+});
 
 /** 刷新消息列表 */
-const refresh = (delay = 0) => {
+function refresh(delay = 0) {
   if (delay > 0) {
     setTimeout(() => {
-      handleQuery()
-    }, delay)
+      handleQuery();
+    }, delay);
   } else {
-    handleQuery()
+    handleQuery();
   }
 }
 
 /** 暴露方法给父组件 */
 defineExpose({
-  refresh
-})
+  refresh,
+});
 </script>
+
+<template>
+  <ContentWrap>
+    <!-- 搜索区域 -->
+    <Form :model="queryParams" layout="inline">
+      <Form.Item>
+        <Select
+          v-model:value="queryParams.method"
+          placeholder="所有方法"
+          style="width: 160px"
+          allow-clear
+        >
+          <Select.Option
+            v-for="item in methodOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+            {{ item.label }}
+          </Select.Option>
+        </Select>
+      </Form.Item>
+      <Form.Item>
+        <Select
+          v-model:value="queryParams.upstream"
+          placeholder="上行/下行"
+          style="width: 160px"
+          allow-clear
+        >
+          <Select.Option label="上行" value="true">上行</Select.Option>
+          <Select.Option label="下行" value="false">下行</Select.Option>
+        </Select>
+      </Form.Item>
+      <Form.Item>
+        <Button type="primary" @click="handleQuery">
+          <IconifyIcon icon="ep:search" class="mr-5px" /> 搜索
+        </Button>
+        <Switch
+          v-model:checked="autoRefresh"
+          class="ml-20px"
+          checked-children="定时刷新"
+          un-checked-children="定时刷新"
+        />
+      </Form.Item>
+    </Form>
+
+    <!-- 消息列表 -->
+    <Table
+      :loading="loading"
+      :data-source="list"
+      :columns="columns"
+      :pagination="false"
+      align="center"
+      class="whitespace-nowrap"
+    >
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'ts'">
+          {{ formatDate(record.ts) }}
+        </template>
+        <template v-else-if="column.key === 'upstream'">
+          <Tag :color="record.upstream ? 'blue' : 'green'">
+            {{ record.upstream ? '上行' : '下行' }}
+          </Tag>
+        </template>
+        <template v-else-if="column.key === 'reply'">
+          <DictTag
+            :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+            :value="record.reply"
+          />
+        </template>
+        <template v-else-if="column.key === 'method'">
+          {{
+            methodOptions.find((item) => item.value === record.method)?.label
+          }}
+        </template>
+        <template v-else-if="column.key === 'params'">
+          <span v-if="record.reply">
+            {{
+              `{"code":${record.code},"msg":"${record.msg}","data":${record.data}\}`
+            }}
+          </span>
+          <span v-else>{{ record.params }}</span>
+        </template>
+      </template>
+    </Table>
+
+    <!-- 分页 -->
+    <div class="mt-10px flex justify-end">
+      <Pagination
+        :total="total"
+        v-model:page="queryParams.pageNo"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getMessageList"
+      />
+    </div>
+  </ContentWrap>
+</template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue
index f6c9a1292a7d9b09b9c9ff11fa09e3ecde3f1075..eb6fbbc0cca5adf8a17ed6b969c9af723dfbdd3f 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsSimulator.vue
@@ -1,247 +1,104 @@
 <!-- 模拟设备 -->
-<template>
-  <ContentWrap>
-    <a-row :gutter="20">
-      <!-- 左侧指令调试区域 -->
-      <a-col :span="12">
-        <a-card>
-          <a-tabs v-model:active-key="activeTab">
-            <!-- 上行指令调试 -->
-            <a-tab-pane key="upstream" tab="上行指令调试">
-              <a-tabs v-if="activeTab === 'upstream'" v-model:active-key="upstreamTab">
-                <!-- 属性上报 -->
-                <a-tab-pane :key="IotDeviceMessageMethodEnum.PROPERTY_POST.method" tab="属性上报">
-                  <ContentWrap>
-                    <a-table :dataSource="propertyList" :columns="propertyColumns" :pagination="false">
-                      <template #bodyCell="{ column, record }">
-                        <template v-if="column.key === 'dataType'">
-                          {{ record.property?.dataType ?? '-' }}
-                        </template>
-                        <template v-else-if="column.key === 'dataDefinition'">
-                          <DataDefinition :data="record" />
-                        </template>
-                        <template v-else-if="column.key === 'value'">
-                          <a-input
-                            :value="getFormValue(record.identifier)"
-                            @update:value="setFormValue(record.identifier, $event)"
-                            placeholder="输入值"
-                            size="small"
-                          />
-                        </template>
-                      </template>
-                    </a-table>
-                    <div class="flex justify-between items-center mt-4">
-                      <span class="text-sm text-gray-600">
-                        设置属性值后，点击「发送属性上报」按钮
-                      </span>
-                      <a-button type="primary" @click="handlePropertyPost">发送属性上报</a-button>
-                    </div>
-                  </ContentWrap>
-                </a-tab-pane>
-
-                <!-- 事件上报 -->
-                <a-tab-pane :key="IotDeviceMessageMethodEnum.EVENT_POST.method" tab="事件上报">
-                  <ContentWrap>
-                    <a-table :dataSource="eventList" :columns="eventColumns" :pagination="false">
-                      <template #bodyCell="{ column, record }">
-                        <template v-if="column.key === 'dataType'">
-                          {{ record.event?.dataType ?? '-' }}
-                        </template>
-                        <template v-else-if="column.key === 'dataDefinition'">
-                          <DataDefinition :data="record" />
-                        </template>
-                        <template v-else-if="column.key === 'value'">
-                          <a-textarea
-                            :value="getFormValue(record.identifier)"
-                            @update:value="setFormValue(record.identifier, $event)"
-                            :rows="3"
-                            placeholder="输入事件参数（JSON格式）"
-                            size="small"
-                          />
-                        </template>
-                        <template v-else-if="column.key === 'action'">
-                          <a-button type="primary" size="small" @click="handleEventPost(record)">
-                            上报事件
-                          </a-button>
-                        </template>
-                      </template>
-                    </a-table>
-                  </ContentWrap>
-                </a-tab-pane>
-
-                <!-- 状态变更 -->
-                <a-tab-pane :key="IotDeviceMessageMethodEnum.STATE_UPDATE.method" tab="状态变更">
-                  <ContentWrap>
-                    <div class="flex gap-4">
-                      <a-button type="primary" @click="handleDeviceState(DeviceStateEnum.ONLINE)">
-                        设备上线
-                      </a-button>
-                      <a-button danger @click="handleDeviceState(DeviceStateEnum.OFFLINE)">
-                        设备下线
-                      </a-button>
-                    </div>
-                  </ContentWrap>
-                </a-tab-pane>
-              </a-tabs>
-            </a-tab-pane>
-
-            <!-- 下行指令调试 -->
-            <a-tab-pane key="downstream" tab="下行指令调试">
-              <a-tabs v-if="activeTab === 'downstream'" v-model:active-key="downstreamTab">
-                <!-- 属性调试 -->
-                <a-tab-pane :key="IotDeviceMessageMethodEnum.PROPERTY_SET.method" tab="属性设置">
-                  <ContentWrap>
-                    <a-table :dataSource="propertyList" :columns="propertyColumns" :pagination="false">
-                      <template #bodyCell="{ column, record }">
-                        <template v-if="column.key === 'dataType'">
-                          {{ record.property?.dataType ?? '-' }}
-                        </template>
-                        <template v-else-if="column.key === 'dataDefinition'">
-                          <DataDefinition :data="record" />
-                        </template>
-                        <template v-else-if="column.key === 'value'">
-                          <a-input
-                            :value="getFormValue(record.identifier)"
-                            @update:value="setFormValue(record.identifier, $event)"
-                            placeholder="输入值"
-                            size="small"
-                          />
-                        </template>
-                      </template>
-                    </a-table>
-                    <div class="flex justify-between items-center mt-4">
-                      <span class="text-sm text-gray-600">
-                        设置属性值后，点击「发送属性设置」按钮
-                      </span>
-                      <a-button type="primary" @click="handlePropertySet">发送属性设置</a-button>
-                    </div>
-                  </ContentWrap>
-                </a-tab-pane>
-
-                <!-- 服务调用 -->
-                <a-tab-pane :key="IotDeviceMessageMethodEnum.SERVICE_INVOKE.method" tab="设备服务调用">
-                  <ContentWrap>
-                    <a-table :dataSource="serviceList" :columns="serviceColumns" :pagination="false">
-                      <template #bodyCell="{ column, record }">
-                        <template v-if="column.key === 'dataDefinition'">
-                          <DataDefinition :data="record" />
-                        </template>
-                        <template v-else-if="column.key === 'value'">
-                          <a-textarea
-                            :value="getFormValue(record.identifier)"
-                            @update:value="setFormValue(record.identifier, $event)"
-                            :rows="3"
-                            placeholder="输入服务参数（JSON格式）"
-                            size="small"
-                          />
-                        </template>
-                        <template v-else-if="column.key === 'action'">
-                          <a-button
-                            type="primary"
-                            size="small"
-                            @click="handleServiceInvoke(record)"
-                          >
-                            服务调用
-                          </a-button>
-                        </template>
-                      </template>
-                    </a-table>
-                  </ContentWrap>
-                </a-tab-pane>
-              </a-tabs>
-            </a-tab-pane>
-          </a-tabs>
-        </a-card>
-      </a-col>
-
-      <!-- 右侧设备日志区域 -->
-      <a-col :span="12">
-        <ContentWrap title="设备消息">
-          <DeviceDetailsMessage v-if="device.id" ref="deviceMessageRef" :device-id="device.id" />
-        </ContentWrap>
-      </a-col>
-    </a-row>
-  </ContentWrap>
-</template>
-
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
-import { message } from 'ant-design-vue'
-import type { ProductVO } from '#/api/iot/product/product'
-import type { ThingModelData } from '#/api/iot/thingmodel'
-import { DeviceApi, DeviceStateEnum } from '#/api/iot/device/device'
-import type { DeviceVO } from '#/api/iot/device/device'
-import DeviceDetailsMessage from './DeviceDetailsMessage.vue'
-import { IotDeviceMessageMethodEnum, IoTThingModelTypeEnum } from '#/views/iot/utils/constants'
+import type { TableColumnType } from 'ant-design-vue';
+
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { IotProductApi } from '#/api/iot/product/product';
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { computed, ref } from 'vue';
+
+import {
+  Button,
+  Card,
+  Col,
+  Input,
+  message,
+  Row,
+  Table,
+  Tabs,
+  Textarea,
+} from 'ant-design-vue';
+
+import { DeviceStateEnum, sendDeviceMessage } from '#/api/iot/device/device';
+import {
+  IotDeviceMessageMethodEnum,
+  IoTThingModelTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import DeviceDetailsMessage from './DeviceDetailsMessage.vue';
 
 const props = defineProps<{
-  product: ProductVO
-  device: DeviceVO
-  thingModelList: ThingModelData[]
-}>()
-
- // 消息弹窗
-const activeTab = ref('upstream') // 上行upstream、下行downstream
-const upstreamTab = ref(IotDeviceMessageMethodEnum.PROPERTY_POST.method) // 上行子标签
-const downstreamTab = ref(IotDeviceMessageMethodEnum.PROPERTY_SET.method) // 下行子标签
-const deviceMessageRef = ref() // 设备消息组件引用
-const deviceMessageRefreshDelay = 2000 // 延迟 N 秒，保证模拟上行的消息被处理
+  device: IotDeviceApi.Device;
+  product: IotProductApi.Product;
+  thingModelList: ThingModelData[];
+}>();
+
+// 消息弹窗
+const activeTab = ref('upstream'); // 上行upstream、下行downstream
+const upstreamTab = ref(IotDeviceMessageMethodEnum.PROPERTY_POST.method); // 上行子标签
+const downstreamTab = ref(IotDeviceMessageMethodEnum.PROPERTY_SET.method); // 下行子标签
+const deviceMessageRef = ref(); // 设备消息组件引用
+const deviceMessageRefreshDelay = 2000; // 延迟 N 秒，保证模拟上行的消息被处理
 
 // 表单数据：存储用户输入的模拟值
-const formData = ref<Record<string, string>>({})
+const formData = ref<Record<string, string>>({});
 
 // 根据类型过滤物模型数据
 const getFilteredThingModelList = (type: number) => {
-  return props.thingModelList.filter((item) => String(item.type) === String(type))
-}
+  return props.thingModelList.filter(
+    (item) => String(item.type) === String(type),
+  );
+};
 
 // 计算属性：属性列表
-const propertyList = computed(() => getFilteredThingModelList(IoTThingModelTypeEnum.PROPERTY))
+const propertyList = computed(() =>
+  getFilteredThingModelList(IoTThingModelTypeEnum.PROPERTY),
+);
 
 // 计算属性：事件列表
-const eventList = computed(() => getFilteredThingModelList(IoTThingModelTypeEnum.EVENT))
+const eventList = computed(() =>
+  getFilteredThingModelList(IoTThingModelTypeEnum.EVENT),
+);
 
 // 计算属性：服务列表
-const serviceList = computed(() => getFilteredThingModelList(IoTThingModelTypeEnum.SERVICE))
+const serviceList = computed(() =>
+  getFilteredThingModelList(IoTThingModelTypeEnum.SERVICE),
+);
 
 // 属性表格列定义
-const propertyColumns = [
+const propertyColumns: TableColumnType[] = [
   {
     title: '功能名称',
     dataIndex: 'name',
     key: 'name',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '标识符',
     dataIndex: 'identifier',
     key: 'identifier',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '数据类型',
     key: 'dataType',
     width: 100,
-    align: 'center'
   },
   {
     title: '数据定义',
     key: 'dataDefinition',
     minWidth: 200,
-    align: 'left'
   },
   {
     title: '值',
     key: 'value',
     width: 150,
-    align: 'center',
-    fixed: 'right'
-  }
-]
+    fixed: 'right' as any,
+  },
+];
 
 // 事件表格列定义
 const eventColumns = [
@@ -250,43 +107,37 @@ const eventColumns = [
     dataIndex: 'name',
     key: 'name',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '标识符',
     dataIndex: 'identifier',
     key: 'identifier',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '数据类型',
     key: 'dataType',
     width: 100,
-    align: 'center'
   },
   {
     title: '数据定义',
     key: 'dataDefinition',
     minWidth: 200,
-    align: 'left'
   },
   {
     title: '值',
     key: 'value',
     width: 200,
-    align: 'center'
   },
   {
     title: '操作',
     key: 'action',
     width: 100,
-    align: 'center',
-    fixed: 'right'
-  }
-]
+    fixed: 'right' as any,
+  },
+];
 
 // 服务表格列定义
 const serviceColumns = [
@@ -295,191 +146,418 @@ const serviceColumns = [
     dataIndex: 'name',
     key: 'name',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '标识符',
     dataIndex: 'identifier',
     key: 'identifier',
     width: 120,
-    align: 'center',
-    fixed: 'left'
+    fixed: 'left' as any,
   },
   {
     title: '输入参数',
     key: 'dataDefinition',
     minWidth: 200,
-    align: 'left'
   },
   {
     title: '参数值',
     key: 'value',
     width: 200,
-    align: 'center'
   },
   {
     title: '操作',
     key: 'action',
     width: 100,
-    align: 'center',
-    fixed: 'right'
-  }
-]
+    fixed: 'right' as any,
+  },
+];
 
 // 获取表单值
-const getFormValue = (identifier: string) => {
-  return formData.value[identifier] || ''
+function getFormValue(identifier: string) {
+  return formData.value[identifier] || '';
 }
 
 // 设置表单值
-const setFormValue = (identifier: string, value: string) => {
-  formData.value[identifier] = value
+function setFormValue(identifier: string, value: string) {
+  formData.value[identifier] = value;
 }
 
 // 属性上报
-const handlePropertyPost = async () => {
+async function handlePropertyPost() {
   try {
-    const params: Record<string, any> = {}
+    const params: Record<string, any> = {};
     propertyList.value.forEach((item) => {
-      const value = formData.value[item.identifier!]
+      const value = formData.value[item.identifier!];
       if (value) {
-        params[item.identifier!] = value
+        params[item.identifier!] = value;
       }
-    })
+    });
 
     if (Object.keys(params).length === 0) {
-      message.warning({ content: '请至少输入一个属性值' })
-      return
+      message.warning({ content: '请至少输入一个属性值' });
+      return;
     }
 
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.PROPERTY_POST.method,
-      params
-    })
+      params,
+    });
 
-    message.success({ content: '属性上报成功' })
+    message.success({ content: '属性上报成功' });
     // 延迟刷新设备消息列表
-    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay)
+    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay);
   } catch (error) {
-    message.error({ content: '属性上报失败' })
-    console.error(error)
+    message.error({ content: '属性上报失败' });
+    console.error(error);
   }
 }
 
 // 事件上报
-const handleEventPost = async (row: ThingModelData) => {
+async function handleEventPost(row: ThingModelData) {
   try {
-    const valueStr = formData.value[row.identifier!]
-    let params: any = {}
+    const valueStr = formData.value[row.identifier!];
+    let params: any = {};
 
     if (valueStr) {
       try {
-        params = JSON.parse(valueStr)
-      } catch (e) {
-        message.error({ content: '事件参数格式错误，请输入有效的JSON格式' })
-        return
+        params = JSON.parse(valueStr);
+      } catch {
+        message.error({ content: '事件参数格式错误，请输入有效的JSON格式' });
+        return;
       }
     }
 
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.EVENT_POST.method,
       params: {
         identifier: row.identifier,
-        params
-      }
-    })
+        params,
+      },
+    });
 
-    message.success({ content: '事件上报成功' })
+    message.success({ content: '事件上报成功' });
     // 延迟刷新设备消息列表
-    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay)
+    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay);
   } catch (error) {
-    message.error({ content: '事件上报失败' })
-    console.error(error)
+    message.error({ content: '事件上报失败' });
+    console.error(error);
   }
 }
 
 // 状态变更
-const handleDeviceState = async (state: number) => {
+async function handleDeviceState(state: number) {
   try {
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.STATE_UPDATE.method,
-      params: { state }
-    })
+      params: { state },
+    });
 
-    message.success({ content: '状态变更成功' })
+    message.success({ content: '状态变更成功' });
     // 延迟刷新设备消息列表
-    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay)
+    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay);
   } catch (error) {
-    message.error({ content: '状态变更失败' })
-    console.error(error)
+    message.error({ content: '状态变更失败' });
+    console.error(error);
   }
 }
 
 // 属性设置
-const handlePropertySet = async () => {
+async function handlePropertySet() {
   try {
-    const params: Record<string, any> = {}
+    const params: Record<string, any> = {};
     propertyList.value.forEach((item) => {
-      const value = formData.value[item.identifier!]
+      const value = formData.value[item.identifier!];
       if (value) {
-        params[item.identifier!] = value
+        params[item.identifier!] = value;
       }
-    })
+    });
 
     if (Object.keys(params).length === 0) {
-      message.warning({ content: '请至少输入一个属性值' })
-      return
+      message.warning({ content: '请至少输入一个属性值' });
+      return;
     }
 
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.PROPERTY_SET.method,
-      params
-    })
+      params,
+    });
 
-    message.success({ content: '属性设置成功' })
+    message.success({ content: '属性设置成功' });
     // 延迟刷新设备消息列表
-    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay)
+    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay);
   } catch (error) {
-    message.error({ content: '属性设置失败' })
-    console.error(error)
+    message.error({ content: '属性设置失败' });
+    console.error(error);
   }
 }
 
 // 服务调用
-const handleServiceInvoke = async (row: ThingModelData) => {
+async function handleServiceInvoke(row: ThingModelData) {
   try {
-    const valueStr = formData.value[row.identifier!]
-    let params: any = {}
+    const valueStr = formData.value[row.identifier!];
+    let params: any = {};
 
     if (valueStr) {
       try {
-        params = JSON.parse(valueStr)
-      } catch (e) {
-        message.error({ content: '服务参数格式错误，请输入有效的JSON格式' })
-        return
+        params = JSON.parse(valueStr);
+      } catch {
+        message.error({ content: '服务参数格式错误，请输入有效的JSON格式' });
+        return;
       }
     }
 
-    await DeviceApi.sendDeviceMessage({
+    await sendDeviceMessage({
       deviceId: props.device.id!,
       method: IotDeviceMessageMethodEnum.SERVICE_INVOKE.method,
       params: {
         identifier: row.identifier,
-        params
-      }
-    })
+        params,
+      },
+    });
 
-    message.success({ content: '服务调用成功' })
+    message.success({ content: '服务调用成功' });
     // 延迟刷新设备消息列表
-    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay)
+    deviceMessageRef.value?.refresh(deviceMessageRefreshDelay);
   } catch (error) {
-    message.error({ content: '服务调用失败' })
-    console.error(error)
+    message.error({ content: '服务调用失败' });
+    console.error(error);
   }
 }
 </script>
+
+<template>
+  <ContentWrap>
+    <Row :gutter="20">
+      <!-- 左侧指令调试区域 -->
+      <Col :span="12">
+        <Card>
+          <Tabs v-model:active-key="activeTab">
+            <!-- 上行指令调试 -->
+            <Tabs.Pane key="upstream" tab="上行指令调试">
+              <Tabs
+                v-if="activeTab === 'upstream'"
+                v-model:active-key="upstreamTab"
+              >
+                <!-- 属性上报 -->
+                <Tabs.Pane
+                  :key="IotDeviceMessageMethodEnum.PROPERTY_POST.method"
+                  tab="属性上报"
+                >
+                  <ContentWrap>
+                    <Table
+                      :data-source="propertyList"
+                      align="center"
+                      :columns="propertyColumns"
+                      :pagination="false"
+                    >
+                      <template #bodyCell="{ column, record }">
+                        <template v-if="column.key === 'dataType'">
+                          {{ record.property?.dataType ?? '-' }}
+                        </template>
+                        <template v-else-if="column.key === 'dataDefinition'">
+                          <DataDefinition :data="record" />
+                        </template>
+                        <template v-else-if="column.key === 'value'">
+                          <Input
+                            :value="getFormValue(record.identifier)"
+                            @update:value="
+                              setFormValue(record.identifier, $event)
+                            "
+                            placeholder="输入值"
+                            size="small"
+                          />
+                        </template>
+                      </template>
+                    </Table>
+                    <div class="mt-4 flex items-center justify-between">
+                      <span class="text-sm text-gray-600">
+                        设置属性值后，点击「发送属性上报」按钮
+                      </span>
+                      <Button type="primary" @click="handlePropertyPost">
+                        发送属性上报
+                      </Button>
+                    </div>
+                  </ContentWrap>
+                </Tabs.Pane>
+
+                <!-- 事件上报 -->
+                <Tabs.Pane
+                  :key="IotDeviceMessageMethodEnum.EVENT_POST.method"
+                  tab="事件上报"
+                >
+                  <ContentWrap>
+                    <Table
+                      :data-source="eventList"
+                      align="center"
+                      :columns="eventColumns"
+                      :pagination="false"
+                    >
+                      <template #bodyCell="{ column, record }">
+                        <template v-if="column.key === 'dataType'">
+                          {{ record.event?.dataType ?? '-' }}
+                        </template>
+                        <template v-else-if="column.key === 'dataDefinition'">
+                          <DataDefinition :data="record" />
+                        </template>
+                        <template v-else-if="column.key === 'value'">
+                          <Textarea
+                            :value="getFormValue(record.identifier)"
+                            @update:value="
+                              setFormValue(record.identifier, $event)
+                            "
+                            :rows="3"
+                            placeholder="输入事件参数（JSON格式）"
+                            size="small"
+                          />
+                        </template>
+                        <template v-else-if="column.key === 'action'">
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="handleEventPost(record)"
+                          >
+                            上报事件
+                          </Button>
+                        </template>
+                      </template>
+                    </Table>
+                  </ContentWrap>
+                </Tabs.Pane>
+
+                <!-- 状态变更 -->
+                <Tabs.Pane
+                  :key="IotDeviceMessageMethodEnum.STATE_UPDATE.method"
+                  tab="状态变更"
+                >
+                  <ContentWrap>
+                    <div class="flex gap-4">
+                      <Button
+                        type="primary"
+                        @click="handleDeviceState(DeviceStateEnum.ONLINE)"
+                      >
+                        设备上线
+                      </Button>
+                      <Button
+                        danger
+                        @click="handleDeviceState(DeviceStateEnum.OFFLINE)"
+                      >
+                        设备下线
+                      </Button>
+                    </div>
+                  </ContentWrap>
+                </Tabs.Pane>
+              </Tabs>
+            </Tabs.Pane>
+
+            <!-- 下行指令调试 -->
+            <Tabs.Pane key="downstream" tab="下行指令调试">
+              <Tabs
+                v-if="activeTab === 'downstream'"
+                v-model:active-key="downstreamTab"
+              >
+                <!-- 属性调试 -->
+                <Tabs.Pane
+                  :key="IotDeviceMessageMethodEnum.PROPERTY_SET.method"
+                  tab="属性设置"
+                >
+                  <ContentWrap>
+                    <Table
+                      :data-source="propertyList"
+                      align="center"
+                      :columns="propertyColumns"
+                      :pagination="false"
+                    >
+                      <template #bodyCell="{ column, record }">
+                        <template v-if="column.key === 'dataType'">
+                          {{ record.property?.dataType ?? '-' }}
+                        </template>
+                        <template v-else-if="column.key === 'dataDefinition'">
+                          <DataDefinition :data="record" />
+                        </template>
+                        <template v-else-if="column.key === 'value'">
+                          <Input
+                            :value="getFormValue(record.identifier)"
+                            @update:value="
+                              setFormValue(record.identifier, $event)
+                            "
+                            placeholder="输入值"
+                            size="small"
+                          />
+                        </template>
+                      </template>
+                    </Table>
+                    <div class="mt-4 flex items-center justify-between">
+                      <span class="text-sm text-gray-600">
+                        设置属性值后，点击「发送属性设置」按钮
+                      </span>
+                      <Button type="primary" @click="handlePropertySet">
+                        发送属性设置
+                      </Button>
+                    </div>
+                  </ContentWrap>
+                </Tabs.Pane>
+
+                <!-- 服务调用 -->
+                <Tabs.Pane
+                  :key="IotDeviceMessageMethodEnum.SERVICE_INVOKE.method"
+                  tab="设备服务调用"
+                >
+                  <ContentWrap>
+                    <Table
+                      :data-source="serviceList"
+                      align="center"
+                      :columns="serviceColumns"
+                      :pagination="false"
+                    >
+                      <template #bodyCell="{ column, record }">
+                        <template v-if="column.key === 'dataDefinition'">
+                          <DataDefinition :data="record" />
+                        </template>
+                        <template v-else-if="column.key === 'value'">
+                          <Textarea
+                            :value="getFormValue(record.identifier)"
+                            @update:value="
+                              setFormValue(record.identifier, $event)
+                            "
+                            :rows="3"
+                            placeholder="输入服务参数（JSON格式）"
+                            size="small"
+                          />
+                        </template>
+                        <template v-else-if="column.key === 'action'">
+                          <Button
+                            type="primary"
+                            size="small"
+                            @click="handleServiceInvoke(record)"
+                          >
+                            服务调用
+                          </Button>
+                        </template>
+                      </template>
+                    </Table>
+                  </ContentWrap>
+                </Tabs.Pane>
+              </Tabs>
+            </Tabs.Pane>
+          </Tabs>
+        </Card>
+      </Col>
+
+      <!-- 右侧设备日志区域 -->
+      <Col :span="12">
+        <ContentWrap title="设备消息">
+          <DeviceDetailsMessage
+            v-if="device.id"
+            ref="deviceMessageRef"
+            :device-id="device.id"
+          />
+        </ContentWrap>
+      </Col>
+    </Row>
+  </ContentWrap>
+</template>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModel.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModel.vue
index fdd8d85a2f0866dc475bc8b3ea3d80eb0b95446a..7cac1c2050be12390741e8a9dac42de295de4f23 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModel.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModel.vue
@@ -1,47 +1,42 @@
 <!-- 设备物模型：设备属性、事件管理、服务调用 -->
+<script setup lang="ts">
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { ref } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+
+import { Tabs } from 'ant-design-vue';
+
+import DeviceDetailsThingModelEvent from './DeviceDetailsThingModelEvent.vue';
+import DeviceDetailsThingModelProperty from './DeviceDetailsThingModelProperty.vue';
+import DeviceDetailsThingModelService from './DeviceDetailsThingModelService.vue';
+
+const props = defineProps<{
+  deviceId: number;
+  thingModelList: ThingModelData[];
+}>();
+
+const activeTab = ref('property'); // 默认选中设备属性
+</script>
 <template>
   <ContentWrap>
-    <a-tabs v-model:active-key="activeTab" class="thing-model-tabs">
-      <a-tab-pane key="property" tab="设备属性（运行状态）">
+    <Tabs v-model:active-key="activeTab" class="!h-auto !p-0">
+      <Tabs.Pane key="property" tab="设备属性（运行状态）">
         <DeviceDetailsThingModelProperty :device-id="deviceId" />
-      </a-tab-pane>
-      <a-tab-pane key="event" tab="设备事件上报">
+      </Tabs.Pane>
+      <Tabs.Pane key="event" tab="设备事件上报">
         <DeviceDetailsThingModelEvent
           :device-id="props.deviceId"
           :thing-model-list="props.thingModelList"
         />
-      </a-tab-pane>
-      <a-tab-pane key="service" tab="设备服务调用">
+      </Tabs.Pane>
+      <Tabs.Pane key="service" tab="设备服务调用">
         <DeviceDetailsThingModelService
           :device-id="deviceId"
           :thing-model-list="props.thingModelList"
         />
-      </a-tab-pane>
-    </a-tabs>
+      </Tabs.Pane>
+    </Tabs>
   </ContentWrap>
 </template>
-<script setup lang="ts">
-import { ref } from 'vue'
-import { ContentWrap } from '@vben/common-ui'
-import type { ThingModelData } from '#/api/iot/thingmodel'
-import DeviceDetailsThingModelProperty from './DeviceDetailsThingModelProperty.vue'
-import DeviceDetailsThingModelEvent from './DeviceDetailsThingModelEvent.vue'
-import DeviceDetailsThingModelService from './DeviceDetailsThingModelService.vue'
-
-const props = defineProps<{
-  deviceId: number
-  thingModelList: ThingModelData[]
-}>()
-
-const activeTab = ref('property') // 默认选中设备属性
-</script>
-
-<style scoped>
-.thing-model-tabs :deep(.ant-tabs-content) {
-  height: auto !important;
-}
-
-.thing-model-tabs :deep(.ant-tabs-tabpane) {
-  padding: 0 !important;
-}
-</style>
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue
index dd2997ac408b69f62c7955fb80e80b689eaad845..a7a7c558bb91fac4956bb4ebaf2e42cd5beadd92 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelEvent.vue
@@ -1,84 +1,228 @@
 <!-- 设备事件管理 -->
+<script setup lang="ts">
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { computed, onMounted, reactive, ref } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
+
+import {
+  Button,
+  Divider,
+  Form,
+  Pagination,
+  RangePicker,
+  Select,
+  Table,
+  Tag,
+} from 'ant-design-vue';
+
+import { getDeviceMessagePairPage } from '#/api/iot/device/device';
+import {
+  getEventTypeLabel,
+  IotDeviceMessageMethodEnum,
+  IoTThingModelTypeEnum,
+} from '#/views/iot/utils/constants';
+
+const props = defineProps<{
+  deviceId: number;
+  thingModelList: ThingModelData[];
+}>();
+
+const loading = ref(false); // 列表的加载中
+const total = ref(0); // 列表的总页数
+const list = ref([] as any[]); // 列表的数据
+const queryParams = reactive({
+  deviceId: props.deviceId,
+  method: IotDeviceMessageMethodEnum.EVENT_POST.method, // 固定筛选事件消息
+  identifier: '',
+  times: undefined,
+  pageNo: 1,
+  pageSize: 10,
+});
+const queryFormRef = ref(); // 搜索的表单
+
+/** 事件类型的物模型数据 */
+const eventThingModels = computed(() => {
+  return props.thingModelList.filter(
+    (item: ThingModelData) =>
+      String(item.type) === String(IoTThingModelTypeEnum.EVENT),
+  );
+});
+
+/** 查询列表 */
+async function getList() {
+  if (!props.deviceId) return;
+  loading.value = true;
+  try {
+    const data = await getDeviceMessagePairPage(queryParams);
+    list.value = data.list || [];
+    total.value = data.total || 0;
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.pageNo = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  queryFormRef.value?.resetFields();
+  queryParams.identifier = '';
+  queryParams.times = undefined;
+  handleQuery();
+}
+
+/** 获取事件名称 */
+function getEventName(identifier: string | undefined) {
+  if (!identifier) return '-';
+  const event = eventThingModels.value.find(
+    (item: ThingModelData) => item.identifier === identifier,
+  );
+  return event?.name || identifier;
+}
+
+/** 获取事件类型 */
+function getEventType(identifier: string | undefined) {
+  if (!identifier) return '-';
+  const event = eventThingModels.value.find(
+    (item: ThingModelData) => item.identifier === identifier,
+  );
+  if (!event?.event?.type) return '-';
+  return getEventTypeLabel(event.event.type) || '-';
+}
+
+/** 解析参数 */
+function parseParams(params: string) {
+  try {
+    const parsed = JSON.parse(params);
+    if (parsed.params) {
+      return parsed.params;
+    }
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+
+/** 初始化 */
+onMounted(() => {
+  getList();
+});
+</script>
+
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <a-form
+    <Form
       :model="queryParams"
       ref="queryFormRef"
       layout="inline"
       @submit.prevent
-      style="margin-bottom: 16px;"
+      style="margin-bottom: 16px"
     >
-      <a-form-item label="标识符" name="identifier">
-        <a-select
+      <Form.Item label="标识符" name="identifier">
+        <Select
           v-model:value="queryParams.identifier"
           placeholder="请选择事件标识符"
           allow-clear
-          style="width: 240px;"
+          style="width: 240px"
         >
-          <a-select-option
+          <Select.Option
             v-for="event in eventThingModels"
             :key="event.identifier"
             :value="event.identifier!"
           >
             {{ event.name }}({{ event.identifier }})
-          </a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item label="时间范围" name="times">
-        <a-range-picker
+          </Select.Option>
+        </Select>
+      </Form.Item>
+      <Form.Item label="时间范围" name="times">
+        <RangePicker
           v-model:value="queryParams.times"
           show-time
           format="YYYY-MM-DD HH:mm:ss"
-          style="width: 360px;"
+          style="width: 360px"
         />
-      </a-form-item>
-      <a-form-item>
-        <a-button type="primary" @click="handleQuery">
+      </Form.Item>
+      <Form.Item>
+        <Button type="primary" @click="handleQuery">
           <template #icon>
             <IconifyIcon icon="ep:search" />
           </template>
           搜索
-        </a-button>
-        <a-button @click="resetQuery" style="margin-left: 8px;">
+        </Button>
+        <Button @click="resetQuery" style="margin-left: 8px">
           <template #icon>
             <IconifyIcon icon="ep:refresh" />
           </template>
           重置
-        </a-button>
-      </a-form-item>
-    </a-form>
+        </Button>
+      </Form.Item>
+    </Form>
+
+    <Divider style="margin: 16px 0" />
 
-    <a-divider style="margin: 16px 0;" />
-    
     <!-- 事件列表 -->
-    <a-table v-loading="loading" :data-source="list" :pagination="false">
-      <a-table-column title="上报时间" align="center" data-index="reportTime" :width="180">
+    <Table v-loading="loading" :data-source="list" :pagination="false">
+      <Table.Column
+        title="上报时间"
+        align="center"
+        data-index="reportTime"
+        :width="180"
+      >
         <template #default="{ record }">
-          {{ record.request?.reportTime ? formatDate(record.request.reportTime) : '-' }}
+          {{
+            record.request?.reportTime
+              ? formatDate(record.request.reportTime)
+              : '-'
+          }}
         </template>
-      </a-table-column>
-      <a-table-column title="标识符" align="center" data-index="identifier" :width="160">
+      </Table.Column>
+      <Table.Column
+        title="标识符"
+        align="center"
+        data-index="identifier"
+        :width="160"
+      >
         <template #default="{ record }">
-          <a-tag color="blue" size="small">
+          <Tag color="blue" size="small">
             {{ record.request?.identifier }}
-          </a-tag>
+          </Tag>
         </template>
-      </a-table-column>
-      <a-table-column title="事件名称" align="center" data-index="eventName" :width="160">
+      </Table.Column>
+      <Table.Column
+        title="事件名称"
+        align="center"
+        data-index="eventName"
+        :width="160"
+      >
         <template #default="{ record }">
           {{ getEventName(record.request?.identifier) }}
         </template>
-      </a-table-column>
-      <a-table-column title="事件类型" align="center" data-index="eventType" :width="100">
+      </Table.Column>
+      <Table.Column
+        title="事件类型"
+        align="center"
+        data-index="eventType"
+        :width="100"
+      >
         <template #default="{ record }">
           {{ getEventType(record.request?.identifier) }}
         </template>
-      </a-table-column>
-      <a-table-column title="输入参数" align="center" data-index="params">
-        <template #default="{ record }"> {{ parseParams(record.request.params) }} </template>
-      </a-table-column>
-    </a-table>
+      </Table.Column>
+      <Table.Column title="输入参数" align="center" data-index="params">
+        <template #default="{ record }">
+          {{ parseParams(record.request.params) }}
+        </template>
+      </Table.Column>
+    </Table>
 
     <!-- 分页 -->
     <Pagination
@@ -89,108 +233,3 @@
     />
   </ContentWrap>
 </template>
-
-<script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue'
-import { Pagination } from 'ant-design-vue'
-import { ContentWrap } from '@vben/common-ui'
-import { IconifyIcon } from '@vben/icons'
-import { DeviceApi } from '#/api/iot/device/device'
-import type { ThingModelData } from '#/api/iot/thingmodel'
-import { formatDate } from '@vben/utils'
-import {
-  getEventTypeLabel,
-  IotDeviceMessageMethodEnum,
-  IoTThingModelTypeEnum
-} from '#/views/iot/utils/constants'
-
-const props = defineProps<{
-  deviceId: number
-  thingModelList: ThingModelData[]
-}>()
-
-const loading = ref(false) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([] as any[]) // 列表的数据
-const queryParams = reactive({
-  deviceId: props.deviceId,
-  method: IotDeviceMessageMethodEnum.EVENT_POST.method, // 固定筛选事件消息
-  identifier: '',
-  times: [] as any[],
-  pageNo: 1,
-  pageSize: 10
-})
-const queryFormRef = ref() // 搜索的表单
-
-/** 事件类型的物模型数据 */
-const eventThingModels = computed(() => {
-  return props.thingModelList.filter(
-    (item: ThingModelData) => String(item.type) === String(IoTThingModelTypeEnum.EVENT)
-  )
-})
-
-/** 查询列表 */
-const getList = async () => {
-  if (!props.deviceId) return
-  loading.value = true
-  try {
-    const data = await DeviceApi.getDeviceMessagePairPage(queryParams)
-    list.value = data.list || []
-    total.value = data.total || 0
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields()
-  queryParams.identifier = ''
-  queryParams.times = []
-  handleQuery()
-}
-
-/** 获取事件名称 */
-const getEventName = (identifier: string | undefined) => {
-  if (!identifier) return '-'
-  const event = eventThingModels.value.find(
-    (item: ThingModelData) => item.identifier === identifier
-  )
-  return event?.name || identifier
-}
-
-/** 获取事件类型 */
-const getEventType = (identifier: string | undefined) => {
-  if (!identifier) return '-'
-  const event = eventThingModels.value.find(
-    (item: ThingModelData) => item.identifier === identifier
-  )
-  if (!event?.event?.type) return '-'
-  return getEventTypeLabel(event.event.type) || '-'
-}
-
-/** 解析参数 */
-const parseParams = (params: string) => {
-  try {
-    const parsed = JSON.parse(params)
-    if (parsed.params) {
-      return parsed.params
-    }
-    return parsed
-  } catch (error) {
-    return {}
-  }
-}
-
-/** 初始化 */
-onMounted(() => {
-  getList()
-})
-</script>
-
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue
index 67b804cbeb3c3c0c1e28e68811b30f1cd6f9ad97..893cd817123f1e7e62be83842650ba6ac6b9e2c4 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelProperty.vue
@@ -1,41 +1,156 @@
 <!-- 设备属性管理 -->
+<script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+
+import { onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
+
+import {
+  Button,
+  Card,
+  Col,
+  Divider,
+  Input,
+  Row,
+  Switch,
+  Table,
+  Tag,
+} from 'ant-design-vue';
+
+import { getLatestDeviceProperties } from '#/api/iot/device/device';
+
+import DeviceDetailsThingModelPropertyHistory from './DeviceDetailsThingModelPropertyHistory.vue';
+
+const props = defineProps<{ deviceId: number }>();
+
+const loading = ref(true); // 列表的加载中
+const list = ref<IotDeviceApi.DevicePropertyDetail[]>([]); // 显示的列表数据
+const filterList = ref<IotDeviceApi.DevicePropertyDetail[]>([]); // 完整的数据列表
+const queryParams = reactive({
+  keyword: '' as string,
+});
+const autoRefresh = ref(false); // 自动刷新开关
+let autoRefreshTimer: any = null; // 定时器
+const viewMode = ref<'card' | 'list'>('card'); // 视图模式状态
+
+/** 查询列表 */
+async function getList() {
+  loading.value = true;
+  try {
+    const params = {
+      deviceId: props.deviceId,
+      identifier: undefined as string | undefined,
+      name: undefined as string | undefined,
+    };
+    filterList.value = await getLatestDeviceProperties(params);
+    handleFilter();
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 前端筛选数据 */
+function handleFilter() {
+  if (queryParams.keyword.trim()) {
+    const keyword = queryParams.keyword.toLowerCase();
+    list.value = filterList.value.filter(
+      (item: IotDeviceApi.DevicePropertyDetail) =>
+        item.identifier?.toLowerCase().includes(keyword) ||
+        item.name?.toLowerCase().includes(keyword),
+    );
+  } else {
+    list.value = filterList.value;
+  }
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  handleFilter();
+}
+
+/** 历史操作 */
+const historyRef = ref();
+function openHistory(deviceId: number, identifier: string, dataType: string) {
+  historyRef.value.open(deviceId, identifier, dataType);
+}
+
+/** 格式化属性值和单位 */
+function formatValueWithUnit(item: IotDeviceApi.DevicePropertyDetail) {
+  if (item.value === null || item.value === undefined || item.value === '') {
+    return '-';
+  }
+  const unitName = item.dataSpecs?.unitName;
+  return unitName ? `${item.value} ${unitName}` : item.value;
+}
+
+/** 监听自动刷新 */
+watch(autoRefresh, (newValue) => {
+  if (newValue) {
+    autoRefreshTimer = setInterval(() => {
+      getList();
+    }, 5000); // 每 5 秒刷新一次
+  } else {
+    clearInterval(autoRefreshTimer);
+    autoRefreshTimer = null;
+  }
+});
+
+/** 组件卸载时清除定时器 */
+onBeforeUnmount(() => {
+  if (autoRefreshTimer) {
+    clearInterval(autoRefreshTimer);
+  }
+});
+
+/** 初始化 */
+onMounted(() => {
+  getList();
+});
+</script>
+
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <div class="flex items-center justify-between" style="margin-bottom: 16px;">
-      <div class="flex items-center" style="gap: 16px;">
-        <a-input
+    <div class="flex items-center justify-between" style="margin-bottom: 16px">
+      <div class="flex items-center" style="gap: 16px">
+        <Input
           v-model:value="queryParams.keyword"
           placeholder="请输入属性名称、标识符"
           allow-clear
-          style="width: 240px;"
-          @pressEnter="handleQuery"
+          style="width: 240px"
+          @press-enter="handleQuery"
         />
-        <div class="flex items-center" style="gap: 8px;">
-          <span style="font-size: 14px; color: #666;">自动刷新</span>
-          <a-switch
-            v-model:checked="autoRefresh"
-            size="small"
-          />
+        <div class="flex items-center" style="gap: 8px">
+          <span style="font-size: 14px; color: #666">自动刷新</span>
+          <Switch v-model:checked="autoRefresh" size="small" />
         </div>
       </div>
-      <a-button-group>
-        <a-button :type="viewMode === 'card' ? 'primary' : 'default'" @click="viewMode = 'card'">
+      <Button.Group>
+        <Button
+          :type="viewMode === 'card' ? 'primary' : 'default'"
+          @click="viewMode = 'card'"
+        >
           <IconifyIcon icon="ep:grid" />
-        </a-button>
-        <a-button :type="viewMode === 'list' ? 'primary' : 'default'" @click="viewMode = 'list'">
+        </Button>
+        <Button
+          :type="viewMode === 'list' ? 'primary' : 'default'"
+          @click="viewMode = 'list'"
+        >
           <IconifyIcon icon="ep:list" />
-        </a-button>
-      </a-button-group>
+        </Button>
+      </Button.Group>
     </div>
-    
+
     <!-- 分隔线 -->
-    <a-divider style="margin: 16px 0;" />
-    
+    <Divider style="margin: 16px 0" />
+
     <!-- 卡片视图 -->
     <template v-if="viewMode === 'card'">
-      <a-row :gutter="16" v-loading="loading">
-        <a-col
+      <Row :gutter="16" v-loading="loading">
+        <Col
           v-for="item in list"
           :key="item.identifier"
           :xs="24"
@@ -44,75 +159,82 @@
           :lg="6"
           class="mb-4"
         >
-          <a-card
-            class="h-full transition-colors relative overflow-hidden"
+          <Card
+            class="relative h-full overflow-hidden transition-colors"
             :body-style="{ padding: '0' }"
           >
             <!-- 添加渐变背景层 -->
             <div
-              class="absolute top-0 left-0 right-0 h-[50px] pointer-events-none bg-gradient-to-b from-[#eefaff] to-transparent"
-            >
-            </div>
-            <div class="p-4 relative">
+              class="pointer-events-none absolute left-0 right-0 top-0 h-[50px] bg-gradient-to-b from-[#eefaff] to-transparent"
+            ></div>
+            <div class="relative p-4">
               <!-- 标题区域 -->
-              <div class="flex items-center mb-3">
+              <div class="mb-3 flex items-center">
                 <div class="mr-2.5 flex items-center">
-                  <IconifyIcon icon="ep:cpu" class="text-[18px] text-[#0070ff]" />
+                  <IconifyIcon
+                    icon="ep:cpu"
+                    class="text-[18px] text-[#0070ff]"
+                  />
                 </div>
-                <div class="text-[16px] font-600 flex-1">{{ item.name }}</div>
+                <div class="font-600 flex-1 text-[16px]">{{ item.name }}</div>
                 <!-- 标识符 -->
-                <div class="inline-flex items-center mr-2">
-                  <a-tag size="small" color="blue">
+                <div class="mr-2 inline-flex items-center">
+                  <Tag size="small" color="blue">
                     {{ item.identifier }}
-                  </a-tag>
+                  </Tag>
                 </div>
                 <!-- 数据类型标签 -->
-                <div class="inline-flex items-center mr-2">
-                  <a-tag size="small">
+                <div class="mr-2 inline-flex items-center">
+                  <Tag size="small">
                     {{ item.dataType }}
-                  </a-tag>
+                  </Tag>
                 </div>
                 <!-- 数据图标 - 可点击 -->
                 <div
-                  class="cursor-pointer flex items-center justify-center w-8 h-8 rounded-full hover:bg-blue-50 transition-colors"
-                  @click="openHistory(props.deviceId, item.identifier, item.dataType)"
+                  class="flex h-8 w-8 cursor-pointer items-center justify-center rounded-full transition-colors hover:bg-blue-50"
+                  @click="
+                    openHistory(props.deviceId, item.identifier, item.dataType)
+                  "
                 >
-                  <IconifyIcon icon="ep:data-line" class="text-[18px] text-[#0070ff]" />
+                  <IconifyIcon
+                    icon="ep:data-line"
+                    class="text-[18px] text-[#0070ff]"
+                  />
                 </div>
               </div>
 
               <!-- 信息区域 -->
               <div class="text-[14px]">
                 <div class="mb-2.5 last:mb-0">
-                  <span class="text-[#717c8e] mr-2.5">属性值</span>
-                  <span class="text-[#0b1d30] font-600">
+                  <span class="mr-2.5 text-[#717c8e]">属性值</span>
+                  <span class="font-600 text-[#0b1d30]">
                     {{ formatValueWithUnit(item) }}
                   </span>
                 </div>
                 <div class="mb-2.5 last:mb-0">
-                  <span class="text-[#717c8e] mr-2.5">更新时间</span>
-                  <span class="text-[#0b1d30] text-[12px]">
+                  <span class="mr-2.5 text-[#717c8e]">更新时间</span>
+                  <span class="text-[12px] text-[#0b1d30]">
                     {{ item.updateTime ? formatDate(item.updateTime) : '-' }}
                   </span>
                 </div>
               </div>
             </div>
-          </a-card>
-        </a-col>
-      </a-row>
+          </Card>
+        </Col>
+      </Row>
     </template>
 
     <!-- 列表视图 -->
-    <a-table v-else v-loading="loading" :data-source="list" :pagination="false">
-      <a-table-column title="属性标识符" align="center" data-index="identifier" />
-      <a-table-column title="属性名称" align="center" data-index="name" />
-      <a-table-column title="数据类型" align="center" data-index="dataType" />
-      <a-table-column title="属性值" align="center" data-index="value">
+    <Table v-else v-loading="loading" :data-source="list" :pagination="false">
+      <Table.Column title="属性标识符" align="center" data-index="identifier" />
+      <Table.Column title="属性名称" align="center" data-index="name" />
+      <Table.Column title="数据类型" align="center" data-index="dataType" />
+      <Table.Column title="属性值" align="center" data-index="value">
         <template #default="{ record }">
           {{ formatValueWithUnit(record) }}
         </template>
-      </a-table-column>
-      <a-table-column
+      </Table.Column>
+      <Table.Column
         title="更新时间"
         align="center"
         data-index="updateTime"
@@ -121,123 +243,32 @@
         <template #default="{ record }">
           {{ record.updateTime ? formatDate(record.updateTime) : '-' }}
         </template>
-      </a-table-column>
-      <a-table-column title="操作" align="center">
+      </Table.Column>
+      <Table.Column title="操作" align="center">
         <template #default="{ record }">
-          <a-button
+          <Button
             type="link"
-            @click="openHistory(props.deviceId, record.identifier, record.dataType)"
+            @click="
+              openHistory(props.deviceId, record.identifier, record.dataType)
+            "
           >
             查看数据
-          </a-button>
+          </Button>
         </template>
-      </a-table-column>
-    </a-table>
+      </Table.Column>
+    </Table>
 
     <!-- 表单弹窗：添加/修改 -->
-    <DeviceDetailsThingModelPropertyHistory ref="historyRef" :deviceId="props.deviceId" />
+    <DeviceDetailsThingModelPropertyHistory
+      ref="historyRef"
+      :device-id="props.deviceId"
+    />
   </ContentWrap>
 </template>
-
 <style scoped>
 /* 移除 a-row 的额外边距 */
 :deep(.ant-row) {
-  margin-left: -8px !important;
   margin-right: -8px !important;
+  margin-left: -8px !important;
 }
 </style>
-<script setup lang="ts">
-import { ref, reactive, watch, onMounted, onBeforeUnmount } from 'vue'
-import { ContentWrap } from '@vben/common-ui'
-import { IconifyIcon } from '@vben/icons'
-import { DeviceApi, type IotDevicePropertyDetailRespVO } from '#/api/iot/device/device'
-import { formatDate } from '@vben/utils'
-import DeviceDetailsThingModelPropertyHistory from './DeviceDetailsThingModelPropertyHistory.vue'
-
-const props = defineProps<{ deviceId: number }>()
-
-const loading = ref(true) // 列表的加载中
-const list = ref<IotDevicePropertyDetailRespVO[]>([]) // 显示的列表数据
-const filterList = ref<IotDevicePropertyDetailRespVO[]>([]) // 完整的数据列表
-const queryParams = reactive({
-  keyword: '' as string
-})
-const autoRefresh = ref(false) // 自动刷新开关
-let autoRefreshTimer: any = null // 定时器
-const viewMode = ref<'card' | 'list'>('card') // 视图模式状态
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const params = {
-      deviceId: props.deviceId,
-      identifier: undefined as string | undefined,
-      name: undefined as string | undefined
-    }
-    filterList.value = await DeviceApi.getLatestDeviceProperties(params)
-    handleFilter()
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 前端筛选数据 */
-const handleFilter = () => {
-  if (!queryParams.keyword.trim()) {
-    list.value = filterList.value
-  } else {
-    const keyword = queryParams.keyword.toLowerCase()
-    list.value = filterList.value.filter(
-      (item: IotDevicePropertyDetailRespVO) =>
-        item.identifier?.toLowerCase().includes(keyword) ||
-        item.name?.toLowerCase().includes(keyword)
-    )
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  handleFilter()
-}
-
-/** 历史操作 */
-const historyRef = ref()
-const openHistory = (deviceId: number, identifier: string, dataType: string) => {
-  historyRef.value.open(deviceId, identifier, dataType)
-}
-
-/** 格式化属性值和单位 */
-const formatValueWithUnit = (item: IotDevicePropertyDetailRespVO) => {
-  if (item.value === null || item.value === undefined || item.value === '') {
-    return '-'
-  }
-  const unitName = item.dataSpecs?.unitName
-  return unitName ? `${item.value} ${unitName}` : item.value
-}
-
-/** 监听自动刷新 */
-watch(autoRefresh, (newValue) => {
-  if (newValue) {
-    autoRefreshTimer = setInterval(() => {
-      getList()
-    }, 5000) // 每 5 秒刷新一次
-  } else {
-    clearInterval(autoRefreshTimer)
-    autoRefreshTimer = null
-  }
-})
-
-/** 组件卸载时清除定时器 */
-onBeforeUnmount(() => {
-  if (autoRefreshTimer) {
-    clearInterval(autoRefreshTimer)
-  }
-})
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>
-
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue
index fa3dadfa3fc60e6ee8e7a11336323d3c8a9f7499..9eabb6019363c07f2ac2b34f236ea409f2c2e542 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelPropertyHistory.vue
@@ -1,192 +1,98 @@
 <!-- 设备物模型 -> 运行状态 -> 查看数据（设备的属性值历史）-->
-<template>
-  <Modal
-    v-model:open="dialogVisible"
-    title="查看数据"
-    width="1200px"
-    :destroy-on-close="true"
-    @cancel="handleClose"
-  >
-    <div class="property-history-container">
-      <!-- 工具栏 -->
-      <div class="toolbar-wrapper mb-4">
-        <a-space :size="12" class="w-full" wrap>
-          <!-- 时间选择 -->
-          <a-range-picker
-            v-model:value="dateRange"
-            :show-time="{ format: 'HH:mm:ss' }"
-            format="YYYY-MM-DD HH:mm:ss"
-            :placeholder="['开始时间', '结束时间']"
-            class="!w-[400px]"
-            @change="handleTimeChange"
-          />
-
-          <!-- 刷新按钮 -->
-          <a-button @click="handleRefresh" :loading="loading">
-            <template #icon>
-              <Icon icon="ant-design:reload-outlined" />
-            </template>
-            刷新
-          </a-button>
-
-          <!-- 导出按钮 -->
-          <a-button @click="handleExport" :loading="exporting" :disabled="list.length === 0">
-            <template #icon>
-              <Icon icon="ant-design:export-outlined" />
-            </template>
-            导出
-          </a-button>
-
-          <!-- 视图切换 -->
-          <a-button-group class="ml-auto">
-            <a-button
-              :type="viewMode === 'chart' ? 'primary' : 'default'"
-              @click="viewMode = 'chart'"
-              :disabled="isComplexDataType"
-            >
-              <template #icon>
-                <Icon icon="ant-design:line-chart-outlined" />
-              </template>
-              图表
-            </a-button>
-            <a-button :type="viewMode === 'list' ? 'primary' : 'default'" @click="viewMode = 'list'">
-              <template #icon>
-                <Icon icon="ant-design:table-outlined" />
-              </template>
-              列表
-            </a-button>
-          </a-button-group>
-        </a-space>
-
-        <!-- 数据统计信息 -->
-        <div v-if="list.length > 0" class="mt-3 text-sm text-gray-600">
-          <a-space :size="16">
-            <span>共 {{ total }} 条数据</span>
-            <span v-if="viewMode === 'chart' && !isComplexDataType">
-              最大值: {{ maxValue }} | 最小值: {{ minValue }} | 平均值: {{ avgValue }}
-            </span>
-          </a-space>
-        </div>
-      </div>
-
-      <!-- 数据展示区域 -->
-      <a-spin :spinning="loading" :delay="200">
-        <!-- 图表模式 -->
-        <div v-if="viewMode === 'chart'" class="chart-container">
-          <a-empty
-            v-if="list.length === 0"
-            :image="Empty.PRESENTED_IMAGE_SIMPLE"
-            description="暂无数据"
-            class="py-20"
-          />
-          <EchartsUI v-else ref="chartRef" height="500px" />
-        </div>
-
-        <!-- 表格模式 -->
-        <div v-else class="table-container">
-          <a-table
-            :dataSource="list"
-            :columns="tableColumns"
-            :pagination="paginationConfig"
-            :scroll="{ y: 500 }"
-            row-key="updateTime"
-            size="small"
-          >
-            <template #bodyCell="{ column, record }">
-              <template v-if="column.key === 'updateTime'">
-                {{ formatDate(new Date(record.updateTime)) }}
-              </template>
-              <template v-else-if="column.key === 'value'">
-                <a-tag v-if="isComplexDataType" color="processing">
-                  {{ formatComplexValue(record.value) }}
-                </a-tag>
-                <span v-else class="font-medium">{{ record.value }}</span>
-              </template>
-            </template>
-          </a-table>
-        </div>
-      </a-spin>
-    </div>
-
-    <template #footer>
-      <a-button @click="handleClose">关闭</a-button>
-    </template>
-  </Modal>
-</template>
 <script setup lang="ts">
-import type { EchartsUIType } from '@vben/plugins/echarts'
-import type { IotDevicePropertyRespVO } from '#/api/iot/device/device'
+import type { Dayjs } from 'dayjs';
 
-import { computed, nextTick, reactive, ref, watch } from 'vue'
+import type { EchartsUIType } from '@vben/plugins/echarts';
 
-import { EchartsUI, useEcharts } from '@vben/plugins/echarts'
-import { beginOfDay, endOfDay, formatDate } from '@vben/utils'
+import type { IotDeviceApi } from '#/api/iot/device/device';
 
-import { Empty, message, Modal } from 'ant-design-vue'
-import dayjs, { type Dayjs } from 'dayjs'
+import { computed, nextTick, reactive, ref, watch } from 'vue';
 
-import { DeviceApi } from '#/api/iot/device/device'
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants'
+import { IconifyIcon } from '@vben/icons';
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+import { beginOfDay, endOfDay, formatDate } from '@vben/utils';
 
-defineProps<{ deviceId: number }>()
+import {
+  Button,
+  Empty,
+  message,
+  Modal,
+  RangePicker,
+  Space,
+  Spin,
+  Tag,
+} from 'ant-design-vue';
+import dayjs from 'dayjs';
+
+import { getHistoryDevicePropertyList } from '#/api/iot/device/device';
+import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
 
 /** IoT 设备属性历史数据详情 */
-defineOptions({ name: 'DeviceDetailsThingModelPropertyHistory' })
-
-const dialogVisible = ref(false) // 弹窗的是否展示
-const loading = ref(false)
-const exporting = ref(false)
-const viewMode = ref<'chart' | 'list'>('chart') // 视图模式状态
-const list = ref<IotDevicePropertyRespVO[]>([]) // 列表的数据
-const total = ref(0) // 总数据量
-const thingModelDataType = ref<string>('') // 物模型数据类型
-const propertyIdentifier = ref<string>('') // 属性标识符
+defineOptions({ name: 'DeviceDetailsThingModelPropertyHistory' });
+
+defineProps<{ deviceId: number }>();
+
+const dialogVisible = ref(false); // 弹窗的是否展示
+const loading = ref(false);
+const exporting = ref(false);
+const viewMode = ref<'chart' | 'list'>('chart'); // 视图模式状态
+const list = ref<IotDeviceApi.DevicePropertyDetail[]>([]); // 列表的数据
+const total = ref(0); // 总数据量
+const thingModelDataType = ref<string>(''); // 物模型数据类型
+const propertyIdentifier = ref<string>(''); // 属性标识符
 const dateRange = ref<[Dayjs, Dayjs]>([
   dayjs().subtract(7, 'day').startOf('day'),
-  dayjs().endOf('day')
-])
+  dayjs().endOf('day'),
+]);
 
 const queryParams = reactive({
   deviceId: -1,
   identifier: '',
   times: [
-    formatDate(beginOfDay(new Date(new Date().getTime() - 3600 * 1000 * 24 * 7))),
-    formatDate(endOfDay(new Date()))
-  ]
-})
+    formatDate(beginOfDay(new Date(Date.now() - 3600 * 1000 * 24 * 7))),
+    formatDate(endOfDay(new Date())),
+  ],
+});
 
 // Echarts 相关
-const chartRef = ref<EchartsUIType>()
-const { renderEcharts } = useEcharts(chartRef)
+const chartRef = ref<EchartsUIType>();
+const { renderEcharts } = useEcharts(chartRef);
 
 // 判断是否为复杂数据类型（struct 或 array）
 const isComplexDataType = computed(() => {
-  if (!thingModelDataType.value) return false
-  return [IoTDataSpecsDataTypeEnum.STRUCT, IoTDataSpecsDataTypeEnum.ARRAY].includes(
-    thingModelDataType.value as any
-  )
-})
+  if (!thingModelDataType.value) return false;
+  return [
+    IoTDataSpecsDataTypeEnum.ARRAY,
+    IoTDataSpecsDataTypeEnum.STRUCT,
+  ].includes(thingModelDataType.value as any);
+});
 
 // 统计数据
 const maxValue = computed(() => {
-  if (isComplexDataType.value || list.value.length === 0) return '-'
-  const values = list.value.map((item) => Number(item.value)).filter((v) => !isNaN(v))
-  return values.length > 0 ? Math.max(...values).toFixed(2) : '-'
-})
+  if (isComplexDataType.value || list.value.length === 0) return '-';
+  const values = list.value
+    .map((item) => Number(item.value))
+    .filter((v) => !Number.isNaN(v));
+  return values.length > 0 ? Math.max(...values).toFixed(2) : '-';
+});
 
 const minValue = computed(() => {
-  if (isComplexDataType.value || list.value.length === 0) return '-'
-  const values = list.value.map((item) => Number(item.value)).filter((v) => !isNaN(v))
-  return values.length > 0 ? Math.min(...values).toFixed(2) : '-'
-})
+  if (isComplexDataType.value || list.value.length === 0) return '-';
+  const values = list.value
+    .map((item) => Number(item.value))
+    .filter((v) => !Number.isNaN(v));
+  return values.length > 0 ? Math.min(...values).toFixed(2) : '-';
+});
 
 const avgValue = computed(() => {
-  if (isComplexDataType.value || list.value.length === 0) return '-'
-  const values = list.value.map((item) => Number(item.value)).filter((v) => !isNaN(v))
-  if (values.length === 0) return '-'
-  const sum = values.reduce((acc, val) => acc + val, 0)
-  return (sum / values.length).toFixed(2)
-})
+  if (isComplexDataType.value || list.value.length === 0) return '-';
+  const values = list.value
+    .map((item) => Number(item.value))
+    .filter((v) => !Number.isNaN(v));
+  if (values.length === 0) return '-';
+  const sum = values.reduce((acc, val) => acc + val, 0);
+  return (sum / values.length).toFixed(2);
+});
 
 // 表格列配置
 const tableColumns = computed(() => [
@@ -195,22 +101,22 @@ const tableColumns = computed(() => [
     key: 'index',
     width: 80,
     align: 'center',
-    customRender: ({ index }: { index: number }) => index + 1
+    customRender: ({ index }: { index: number }) => index + 1,
   },
   {
     title: '时间',
     key: 'updateTime',
     dataIndex: 'updateTime',
     width: 200,
-    align: 'center'
+    align: 'center',
   },
   {
     title: '属性值',
     key: 'value',
     dataIndex: 'value',
-    align: 'center'
-  }
-])
+    align: 'center',
+  },
+]);
 
 // 分页配置
 const paginationConfig = computed(() => ({
@@ -220,36 +126,40 @@ const paginationConfig = computed(() => ({
   showSizeChanger: true,
   showQuickJumper: true,
   pageSizeOptions: ['10', '20', '50', '100'],
-  showTotal: (total: number) => `共 ${total} 条数据`
-}))
+  showTotal: (total: number) => `共 ${total} 条数据`,
+}));
 
 /** 获得设备历史数据 */
-const getList = async () => {
-  loading.value = true
+async function getList() {
+  loading.value = true;
   try {
-    const data = await DeviceApi.getHistoryDevicePropertyList(queryParams)
-    list.value = data?.list || []
-    total.value = list.value.length
-    
+    const data = await getHistoryDevicePropertyList(queryParams);
+    list.value = (data?.list as IotDeviceApi.DevicePropertyDetail[]) || [];
+    total.value = list.value.length;
+
     // 如果是图表模式且不是复杂数据类型，渲染图表
-    if (viewMode.value === 'chart' && !isComplexDataType.value && list.value.length > 0) {
-      await nextTick()
-      renderChart()
+    if (
+      viewMode.value === 'chart' &&
+      !isComplexDataType.value &&
+      list.value.length > 0
+    ) {
+      await nextTick();
+      renderChart();
     }
-  } catch (error) {
-    message.error('获取数据失败')
-    list.value = []
-    total.value = 0
+  } catch {
+    message.error('获取数据失败');
+    list.value = [];
+    total.value = 0;
   } finally {
-    loading.value = false
+    loading.value = false;
   }
 }
 
 /** 渲染图表 */
-const renderChart = () => {
-  if (!list.value || list.value.length === 0) return
+function renderChart() {
+  if (!list.value || list.value.length === 0) return;
 
-  const chartData = list.value.map((item) => [item.updateTime, item.value])
+  const chartData = list.value.map((item) => [item.updateTime, item.value]);
 
   renderEcharts({
     title: {
@@ -257,23 +167,23 @@ const renderChart = () => {
       left: 'center',
       textStyle: {
         fontSize: 16,
-        fontWeight: 'normal'
-      }
+        fontWeight: 'normal',
+      },
     },
     grid: {
       left: 60,
       right: 60,
       bottom: 100,
       top: 80,
-      containLabel: true
+      containLabel: true,
     },
     tooltip: {
       trigger: 'axis',
       axisPointer: {
-        type: 'cross'
+        type: 'cross',
       },
       formatter: (params: any) => {
-        const param = params[0]
+        const param = params[0];
         return `
           <div style="padding: 8px;">
             <div style="margin-bottom: 4px; font-weight: bold;">
@@ -284,27 +194,27 @@ const renderChart = () => {
               <span>属性值: <strong>${param.value[1]}</strong></span>
             </div>
           </div>
-        `
-      }
+        `;
+      },
     },
     xAxis: {
       type: 'time',
       name: '时间',
       nameTextStyle: {
-        padding: [10, 0, 0, 0]
+        padding: [10, 0, 0, 0],
       },
       axisLabel: {
         formatter: (value: number) => {
-          return String(formatDate(new Date(value), 'MM-DD HH:mm') || '')
-        }
-      }
+          return String(formatDate(new Date(value), 'MM-DD HH:mm') || '');
+        },
+      },
     },
     yAxis: {
       type: 'value',
       name: '属性值',
       nameTextStyle: {
-        padding: [0, 0, 10, 0]
-      }
+        padding: [0, 0, 10, 0],
+      },
     },
     series: [
       {
@@ -315,10 +225,10 @@ const renderChart = () => {
         symbolSize: 6,
         lineStyle: {
           width: 2,
-          color: '#1890FF'
+          color: '#1890FF',
         },
         itemStyle: {
-          color: '#1890FF'
+          color: '#1890FF',
         },
         areaStyle: {
           color: {
@@ -330,141 +240,267 @@ const renderChart = () => {
             colorStops: [
               {
                 offset: 0,
-                color: 'rgba(24, 144, 255, 0.3)'
+                color: 'rgba(24, 144, 255, 0.3)',
               },
               {
                 offset: 1,
-                color: 'rgba(24, 144, 255, 0.05)'
-              }
-            ]
-          }
+                color: 'rgba(24, 144, 255, 0.05)',
+              },
+            ],
+          },
         },
-        data: chartData
-      }
+        data: chartData,
+      },
     ],
     dataZoom: [
       {
         type: 'inside',
         start: 0,
-        end: 100
+        end: 100,
       },
       {
         type: 'slider',
         height: 30,
-        bottom: 20
-      }
-    ]
-  })
+        bottom: 20,
+      },
+    ],
+  });
 }
 
 /** 打开弹窗 */
-const open = async (deviceId: number, identifier: string, dataType: string) => {
-  dialogVisible.value = true
-  queryParams.deviceId = deviceId
-  queryParams.identifier = identifier
-  propertyIdentifier.value = identifier
-  thingModelDataType.value = dataType
+async function open(deviceId: number, identifier: string, dataType: string) {
+  dialogVisible.value = true;
+  queryParams.deviceId = deviceId;
+  queryParams.identifier = identifier;
+  propertyIdentifier.value = identifier;
+  thingModelDataType.value = dataType;
 
   // 如果物模型是 struct、array，需要默认使用 list 模式
-  if (isComplexDataType.value) {
-    viewMode.value = 'list'
-  } else {
-    viewMode.value = 'chart'
-  }
+  viewMode.value = isComplexDataType.value ? 'list' : 'chart';
 
   // 等待弹窗完全渲染后再获取数据
-  await nextTick()
-  await getList()
+  await nextTick();
+  await getList();
 }
 
 /** 时间变化处理 */
-const handleTimeChange = () => {
+function handleTimeChange() {
   if (!dateRange.value || dateRange.value.length !== 2) {
-    return
+    return;
   }
 
   queryParams.times = [
     formatDate(dateRange.value[0].toDate()),
-    formatDate(dateRange.value[1].toDate())
-  ]
-  
-  getList()
+    formatDate(dateRange.value[1].toDate()),
+  ];
+
+  getList();
 }
 
 /** 刷新数据 */
-const handleRefresh = () => {
-  getList()
+function handleRefresh() {
+  getList();
 }
 
 /** 导出数据 */
-const handleExport = async () => {
+async function handleExport() {
   if (list.value.length === 0) {
-    message.warning('暂无数据可导出')
-    return
+    message.warning('暂无数据可导出');
+    return;
   }
 
-  exporting.value = true
+  exporting.value = true;
   try {
     // 构建CSV内容
-    const headers = ['序号', '时间', '属性值']
+    const headers = ['序号', '时间', '属性值'];
     const csvContent = [
       headers.join(','),
       ...list.value.map((item, index) => {
         return [
           index + 1,
           formatDate(new Date(item.updateTime)),
-          isComplexDataType.value ? `"${JSON.stringify(item.value)}"` : item.value
-        ].join(',')
-      })
-    ].join('\n')
+          isComplexDataType.value
+            ? `"${JSON.stringify(item.value)}"`
+            : item.value,
+        ].join(',');
+      }),
+    ].join('\n');
 
     // 创建 BOM 头,解决中文乱码
-    const BOM = '\uFEFF'
-    const blob = new Blob([BOM + csvContent], { type: 'text/csv;charset=utf-8' })
-    
+    const BOM = '\uFEFF';
+    const blob = new Blob([BOM + csvContent], {
+      type: 'text/csv;charset=utf-8',
+    });
+
     // 下载文件
-    const url = window.URL.createObjectURL(blob)
-    const link = document.createElement('a')
-    link.href = url
-    link.download = `设备属性历史_${propertyIdentifier.value}_${formatDate(new Date(), 'YYYYMMDDHHmmss')}.csv`
-    document.body.appendChild(link)
-    link.click()
-    document.body.removeChild(link)
-    window.URL.revokeObjectURL(url)
-
-    message.success('导出成功')
-  } catch (error) {
-    message.error('导出失败')
+    const url = window.URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.download = `设备属性历史_${propertyIdentifier.value}_${formatDate(new Date(), 'YYYYMMDDHHmmss')}.csv`;
+    document.body.append(link);
+    link.click();
+    link.remove();
+    window.URL.revokeObjectURL(url);
+
+    message.success('导出成功');
+  } catch {
+    message.error('导出失败');
   } finally {
-    exporting.value = false
+    exporting.value = false;
   }
 }
 
 /** 关闭弹窗 */
-const handleClose = () => {
-  dialogVisible.value = false
-  list.value = []
-  total.value = 0
+function handleClose() {
+  dialogVisible.value = false;
+  list.value = [];
+  total.value = 0;
 }
 
 /** 格式化复杂数据类型 */
-const formatComplexValue = (value: any) => {
+function formatComplexValue(value: any) {
   if (typeof value === 'object') {
-    return JSON.stringify(value)
+    return JSON.stringify(value);
   }
-  return String(value)
+  return String(value);
 }
 
 /** 监听视图模式变化，重新渲染图表 */
 watch(viewMode, async (newMode) => {
-  if (newMode === 'chart' && !isComplexDataType.value && list.value.length > 0) {
-    await nextTick()
-    renderChart()
+  if (
+    newMode === 'chart' &&
+    !isComplexDataType.value &&
+    list.value.length > 0
+  ) {
+    await nextTick();
+    renderChart();
   }
-})
+});
 
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+defineExpose({ open }); // 提供 open 方法，用于打开弹窗
 </script>
+<template>
+  <Modal
+    v-model:open="dialogVisible"
+    title="查看数据"
+    width="1200px"
+    :destroy-on-close="true"
+    @cancel="handleClose"
+  >
+    <div class="property-history-container">
+      <!-- 工具栏 -->
+      <div class="toolbar-wrapper mb-4">
+        <Space :size="12" class="w-full" wrap>
+          <!-- 时间选择 -->
+          <RangePicker
+            v-model:value="dateRange"
+            :show-time="{ format: 'HH:mm:ss' }"
+            format="YYYY-MM-DD HH:mm:ss"
+            :placeholder="['开始时间', '结束时间']"
+            class="!w-[400px]"
+            @press-enter="handleTimeChange"
+          />
+
+          <!-- 刷新按钮 -->
+          <Button @click="handleRefresh" :loading="loading">
+            <template #icon>
+              <IconifyIcon icon="ant-design:reload-outlined" />
+            </template>
+            刷新
+          </Button>
+
+          <!-- 导出按钮 -->
+          <Button
+            @click="handleExport"
+            :loading="exporting"
+            :disabled="list.length === 0"
+          >
+            <template #icon>
+              <IconifyIcon icon="ant-design:export-outlined" />
+            </template>
+            导出
+          </Button>
+
+          <!-- 视图切换 -->
+          <Button.Group class="ml-auto">
+            <Button
+              :type="viewMode === 'chart' ? 'primary' : 'default'"
+              @click="viewMode = 'chart'"
+              :disabled="isComplexDataType"
+            >
+              <template #icon>
+                <IconifyIcon icon="ant-design:line-chart-outlined" />
+              </template>
+              图表
+            </Button>
+            <Button
+              :type="viewMode === 'list' ? 'primary' : 'default'"
+              @click="viewMode = 'list'"
+            >
+              <template #icon>
+                <IconifyIcon icon="ant-design:table-outlined" />
+              </template>
+              列表
+            </Button>
+          </Button.Group>
+        </Space>
+
+        <!-- 数据统计信息 -->
+        <div v-if="list.length > 0" class="mt-3 text-sm text-gray-600">
+          <Space :size="16">
+            <span>共 {{ total }} 条数据</span>
+            <span v-if="viewMode === 'chart' && !isComplexDataType">
+              最大值: {{ maxValue }} | 最小值: {{ minValue }} | 平均值:
+              {{ avgValue }}
+            </span>
+          </Space>
+        </div>
+      </div>
+
+      <!-- 数据展示区域 -->
+      <Spin :spinning="loading" :delay="200">
+        <!-- 图表模式 -->
+        <div v-if="viewMode === 'chart'" class="chart-container">
+          <Empty
+            v-if="list.length === 0"
+            :image="Empty.PRESENTED_IMAGE_SIMPLE"
+            description="暂无数据"
+            class="py-20"
+          />
+          <EchartsUI v-else ref="chartRef" height="500px" />
+        </div>
+
+        <!-- 表格模式 -->
+        <div v-else class="table-container">
+          <Table
+            :data-source="list"
+            :columns="tableColumns"
+            :pagination="paginationConfig"
+            :scroll="{ y: 500 }"
+            row-key="updateTime"
+            size="small"
+          >
+            <template #bodyCell="{ column, record }">
+              <template v-if="column.key === 'updateTime'">
+                {{ formatDate(new Date(record.updateTime)) }}
+              </template>
+              <template v-else-if="column.key === 'value'">
+                <Tag v-if="isComplexDataType" color="processing">
+                  {{ formatComplexValue(record.value) }}
+                </Tag>
+                <span v-else class="font-medium">{{ record.value }}</span>
+              </template>
+            </template>
+          </Table>
+        </div>
+      </Spin>
+    </div>
+
+    <template #footer>
+      <Button @click="handleClose">关闭</Button>
+    </template>
+  </Modal>
+</template>
 
 <style scoped lang="scss">
 .property-history-container {
@@ -485,4 +521,3 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
   }
 }
 </style>
-
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue
index e91ca8b3b28e39cf3e2d00d05161fb9463026c29..dfe22c13387895c41fb5d61415f2343794360fdc 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/DeviceDetailsThingModelService.vue
@@ -1,89 +1,240 @@
 <!-- 设备服务调用 -->
+<script setup lang="ts">
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { computed, onMounted, reactive, ref } from 'vue';
+
+import { ContentWrap } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
+
+import {
+  Button,
+  Divider,
+  Form,
+  Pagination,
+  Select,
+  Table,
+  Tag,
+} from 'ant-design-vue';
+
+import { getDeviceMessagePairPage } from '#/api/iot/device/device';
+import {
+  getThingModelServiceCallTypeLabel,
+  IotDeviceMessageMethodEnum,
+  IoTThingModelTypeEnum,
+} from '#/views/iot/utils/constants';
+
+const props = defineProps<{
+  deviceId: number;
+  thingModelList: ThingModelData[];
+}>();
+
+const loading = ref(false); // 列表的加载中
+const total = ref(0); // 列表的总页数
+const list = ref([] as any[]); // 列表的数据
+const queryParams = reactive({
+  deviceId: props.deviceId,
+  method: IotDeviceMessageMethodEnum.SERVICE_INVOKE.method, // 固定筛选服务调用消息
+  identifier: '',
+  times: [] as any[],
+  pageNo: 1,
+  pageSize: 10,
+});
+const queryFormRef = ref(); // 搜索的表单
+
+/** 服务类型的物模型数据 */
+const serviceThingModels = computed(() => {
+  return props.thingModelList.filter(
+    (item: ThingModelData) =>
+      String(item.type) === String(IoTThingModelTypeEnum.SERVICE),
+  );
+});
+
+/** 查询列表 */
+const getList = async () => {
+  if (!props.deviceId) return;
+  loading.value = true;
+  try {
+    const data = await getDeviceMessagePairPage(queryParams);
+    list.value = data.list || [];
+    total.value = data.total;
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.identifier = '';
+  queryParams.times = [];
+  handleQuery();
+};
+
+/** 获取服务名称 */
+const getServiceName = (identifier: string | undefined) => {
+  if (!identifier) return '-';
+  const service = serviceThingModels.value.find(
+    (item: ThingModelData) => item.identifier === identifier,
+  );
+  return service?.name || identifier;
+};
+
+/** 获取调用方式 */
+const getCallType = (identifier: string | undefined) => {
+  if (!identifier) return '-';
+  const service = serviceThingModels.value.find(
+    (item: ThingModelData) => item.identifier === identifier,
+  );
+  if (!service?.service?.callType) return '-';
+  return getThingModelServiceCallTypeLabel(service.service.callType) || '-';
+};
+
+/** 解析参数 */
+const parseParams = (params: string) => {
+  if (!params) return '-';
+  try {
+    const parsed = JSON.parse(params);
+    if (parsed.params) {
+      return JSON.stringify(parsed.params, null, 2);
+    }
+    return JSON.stringify(parsed, null, 2);
+  } catch {
+    return params;
+  }
+};
+
+/** 初始化 */
+onMounted(() => {
+  getList();
+});
+</script>
+
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <a-form
+    <Form
       :model="queryParams"
       ref="queryFormRef"
       layout="inline"
       @submit.prevent
-      style="margin-bottom: 16px;"
+      style="margin-bottom: 16px"
     >
-      <a-form-item label="标识符" name="identifier">
-        <a-select
+      <Form.Item label="标识符" name="identifier">
+        <Select
           v-model:value="queryParams.identifier"
           placeholder="请选择服务标识符"
           allow-clear
-          style="width: 240px;"
+          style="width: 240px"
         >
-          <a-select-option
+          <Select.Option
             v-for="service in serviceThingModels"
             :key="service.identifier"
             :value="service.identifier!"
           >
             {{ service.name }}({{ service.identifier }})
-          </a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item label="时间范围" name="times">
-        <a-range-picker
+          </Select.Option>
+        </Select>
+      </Form.Item>
+      <Form.Item label="时间范围" name="times">
+        <RangePicker
           v-model:value="queryParams.times"
           show-time
           format="YYYY-MM-DD HH:mm:ss"
-          style="width: 360px;"
+          style="width: 360px"
         />
-      </a-form-item>
-      <a-form-item>
-        <a-button type="primary" @click="handleQuery">
+      </Form.Item>
+      <Form.Item>
+        <Button type="primary" @click="handleQuery">
           <template #icon>
             <IconifyIcon icon="ep:search" />
           </template>
           搜索
-        </a-button>
-        <a-button @click="resetQuery" style="margin-left: 8px;">
+        </Button>
+        <Button @click="resetQuery" style="margin-left: 8px">
           <template #icon>
             <IconifyIcon icon="ep:refresh" />
           </template>
           重置
-        </a-button>
-      </a-form-item>
-    </a-form>
+        </Button>
+      </Form.Item>
+    </Form>
+
+    <Divider style="margin: 16px 0" />
 
-    <a-divider style="margin: 16px 0;" />
-    
     <!-- 服务调用列表 -->
-    <a-table v-loading="loading" :data-source="list" :pagination="false">
-      <a-table-column title="调用时间" align="center" data-index="requestTime" :width="180">
+    <Table v-loading="loading" :data-source="list" :pagination="false">
+      <Table.Column
+        title="调用时间"
+        align="center"
+        data-index="requestTime"
+        :width="180"
+      >
         <template #default="{ record }">
-          {{ record.request?.reportTime ? formatDate(record.request.reportTime) : '-' }}
+          {{
+            record.request?.reportTime
+              ? formatDate(record.request.reportTime)
+              : '-'
+          }}
         </template>
-      </a-table-column>
-      <a-table-column title="响应时间" align="center" data-index="responseTime" :width="180">
+      </Table.Column>
+      <Table.Column
+        title="响应时间"
+        align="center"
+        data-index="responseTime"
+        :width="180"
+      >
         <template #default="{ record }">
-          {{ record.reply?.reportTime ? formatDate(record.reply.reportTime) : '-' }}
+          {{
+            record.reply?.reportTime ? formatDate(record.reply.reportTime) : '-'
+          }}
         </template>
-      </a-table-column>
-      <a-table-column title="标识符" align="center" data-index="identifier" :width="160">
+      </Table.Column>
+      <Table.Column
+        title="标识符"
+        align="center"
+        data-index="identifier"
+        :width="160"
+      >
         <template #default="{ record }">
-          <a-tag color="blue" size="small">
+          <Tag color="blue" size="small">
             {{ record.request?.identifier }}
-          </a-tag>
+          </Tag>
         </template>
-      </a-table-column>
-      <a-table-column title="服务名称" align="center" data-index="serviceName" :width="160">
+      </Table.Column>
+      <Table.Column
+        title="服务名称"
+        align="center"
+        data-index="serviceName"
+        :width="160"
+      >
         <template #default="{ record }">
           {{ getServiceName(record.request?.identifier) }}
         </template>
-      </a-table-column>
-      <a-table-column title="调用方式" align="center" data-index="callType" :width="100">
+      </Table.Column>
+      <Table.Column
+        title="调用方式"
+        align="center"
+        data-index="callType"
+        :width="100"
+      >
         <template #default="{ record }">
           {{ getCallType(record.request?.identifier) }}
         </template>
-      </a-table-column>
-      <a-table-column title="输入参数" align="center" data-index="inputParams">
-        <template #default="{ record }"> {{ parseParams(record.request?.params) }} </template>
-      </a-table-column>
-      <a-table-column title="输出参数" align="center" data-index="outputParams">
+      </Table.Column>
+      <Table.Column title="输入参数" align="center" data-index="inputParams">
+        <template #default="{ record }">
+          {{ parseParams(record.request?.params) }}
+        </template>
+      </Table.Column>
+      <Table.Column title="输出参数" align="center" data-index="outputParams">
         <template #default="{ record }">
           <span v-if="record.reply">
             {{
@@ -92,8 +243,8 @@
           </span>
           <span v-else>-</span>
         </template>
-      </a-table-column>
-    </a-table>
+      </Table.Column>
+    </Table>
 
     <!-- 分页 -->
     <Pagination
@@ -104,109 +255,3 @@
     />
   </ContentWrap>
 </template>
-
-<script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue'
-import { Pagination } from 'ant-design-vue'
-import { ContentWrap } from '@vben/common-ui'
-import { IconifyIcon } from '@vben/icons'
-import { DeviceApi } from '#/api/iot/device/device'
-import type { ThingModelData } from '#/api/iot/thingmodel'
-import { formatDate } from '@vben/utils'
-import {
-  getThingModelServiceCallTypeLabel,
-  IotDeviceMessageMethodEnum,
-  IoTThingModelTypeEnum
-} from '#/views/iot/utils/constants'
-
-const props = defineProps<{
-  deviceId: number
-  thingModelList: ThingModelData[]
-}>()
-
-const loading = ref(false) // 列表的加载中
-const total = ref(0) // 列表的总页数
-const list = ref([] as any[]) // 列表的数据
-const queryParams = reactive({
-  deviceId: props.deviceId,
-  method: IotDeviceMessageMethodEnum.SERVICE_INVOKE.method, // 固定筛选服务调用消息
-  identifier: '',
-  times: [] as any[],
-  pageNo: 1,
-  pageSize: 10
-})
-const queryFormRef = ref() // 搜索的表单
-
-/** 服务类型的物模型数据 */
-const serviceThingModels = computed(() => {
-  return props.thingModelList.filter(
-    (item: ThingModelData) => String(item.type) === String(IoTThingModelTypeEnum.SERVICE)
-  )
-})
-
-/** 查询列表 */
-const getList = async () => {
-  if (!props.deviceId) return
-  loading.value = true
-  try {
-    const data = await DeviceApi.getDeviceMessagePairPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.pageNo = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryFormRef.value?.resetFields()
-  queryParams.identifier = ''
-  queryParams.times = []
-  handleQuery()
-}
-
-/** 获取服务名称 */
-const getServiceName = (identifier: string | undefined) => {
-  if (!identifier) return '-'
-  const service = serviceThingModels.value.find(
-    (item: ThingModelData) => item.identifier === identifier
-  )
-  return service?.name || identifier
-}
-
-/** 获取调用方式 */
-const getCallType = (identifier: string | undefined) => {
-  if (!identifier) return '-'
-  const service = serviceThingModels.value.find(
-    (item: ThingModelData) => item.identifier === identifier
-  )
-  if (!service?.service?.callType) return '-'
-  return getThingModelServiceCallTypeLabel(service.service.callType) || '-'
-}
-
-/** 解析参数 */
-const parseParams = (params: string) => {
-  if (!params) return '-'
-  try {
-    const parsed = JSON.parse(params)
-    if (parsed.params) {
-      return JSON.stringify(parsed.params, null, 2)
-    }
-    return JSON.stringify(parsed, null, 2)
-  } catch (error) {
-    return params
-  }
-}
-
-/** 初始化 */
-onMounted(() => {
-  getList()
-})
-</script>
-
diff --git a/apps/web-antd/src/views/iot/device/device/modules/detail/index.vue b/apps/web-antd/src/views/iot/device/device/modules/detail/index.vue
index 89812ea98941b5b0426632f2dbbec7de0c199414..ef6e4037072501c0e40687a5d645241559992140 100644
--- a/apps/web-antd/src/views/iot/device/device/modules/detail/index.vue
+++ b/apps/web-antd/src/views/iot/device/device/modules/detail/index.vue
@@ -1,3 +1,79 @@
+<script lang="ts" setup>
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { IotProductApi } from '#/api/iot/product/product';
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { onMounted, ref, unref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+
+import { Page } from '@vben/common-ui';
+import { useTabbarStore } from '@vben/stores';
+
+import { message, Tabs } from 'ant-design-vue';
+
+import { getDevice } from '#/api/iot/device/device';
+import { DeviceTypeEnum, getProduct } from '#/api/iot/product/product';
+import { getThingModelListByProductId } from '#/api/iot/thingmodel';
+
+import DeviceDetailConfig from './DeviceDetailConfig.vue';
+import DeviceDetailsHeader from './DeviceDetailsHeader.vue';
+import DeviceDetailsInfo from './DeviceDetailsInfo.vue';
+import DeviceDetailsMessage from './DeviceDetailsMessage.vue';
+import DeviceDetailsSimulator from './DeviceDetailsSimulator.vue';
+import DeviceDetailsThingModel from './DeviceDetailsThingModel.vue';
+
+defineOptions({ name: 'IoTDeviceDetail' });
+
+const route = useRoute();
+const id = Number(route.params.id); // 将字符串转换为数字
+const loading = ref(true); // 加载中
+const product = ref<IotProductApi.Product>({} as IotProductApi.Product); // 产品详情
+const device = ref<IotDeviceApi.Device>({} as IotDeviceApi.Device); // 设备详情
+const activeTab = ref('info'); // 默认激活的标签页
+const thingModelList = ref<ThingModelData[]>([]); // 物模型列表数据
+
+/** 获取设备详情 */
+async function getDeviceData() {
+  loading.value = true;
+  try {
+    device.value = await getDevice(id);
+    await getProductData(device.value.productId);
+    await getThingModelList(device.value.productId);
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 获取产品详情 */
+async function getProductData(id: number) {
+  product.value = await getProduct(id);
+}
+
+/** 获取物模型列表 */
+async function getThingModelList(productId: number) {
+  try {
+    const data = await getThingModelListByProductId(productId);
+    thingModelList.value = data || [];
+  } catch (error) {
+    console.error('获取物模型列表失败:', error);
+    thingModelList.value = [];
+  }
+}
+
+/** 初始化 */
+const tabbarStore = useTabbarStore(); // 视图操作
+const router = useRouter(); // 路由
+const { currentRoute } = router;
+onMounted(async () => {
+  if (!id) {
+    message.warning({ content: '参数错误，产品不能为空！' });
+    await tabbarStore.closeTab(unref(currentRoute), router);
+    return;
+  }
+  await getDeviceData();
+  activeTab.value = (route.query.tab as string) || 'info';
+});
+</script>
 <template>
   <Page>
     <DeviceDetailsHeader
@@ -6,109 +82,48 @@
       :device="device"
       @refresh="getDeviceData"
     />
-    
-    <a-tabs v-model:active-key="activeTab" class="device-detail-tabs mt-4">
-      <a-tab-pane key="info" tab="设备信息">
-        <DeviceDetailsInfo v-if="activeTab === 'info'" :product="product" :device="device" />
-      </a-tab-pane>
-      <a-tab-pane key="model" tab="物模型数据">
+
+    <Tabs v-model:active-key="activeTab" class="device-detail-tabs mt-4">
+      <Tabs.Pane key="info" tab="设备信息">
+        <DeviceDetailsInfo
+          v-if="activeTab === 'info'"
+          :product="product"
+          :device="device"
+        />
+      </Tabs.Pane>
+      <Tabs.Pane key="model" tab="物模型数据">
         <DeviceDetailsThingModel
           v-if="activeTab === 'model' && device.id"
           :device-id="device.id"
           :thing-model-list="thingModelList"
         />
-      </a-tab-pane>
-      <a-tab-pane v-if="product.deviceType === DeviceTypeEnum.GATEWAY" key="sub-device" tab="子设备管理" />
-      <a-tab-pane key="log" tab="设备消息">
-        <DeviceDetailsMessage v-if="activeTab === 'log' && device.id" :device-id="device.id" />
-      </a-tab-pane>
-      <a-tab-pane key="simulator" tab="模拟设备">
+      </Tabs.Pane>
+      <Tabs.Pane
+        v-if="product.deviceType === DeviceTypeEnum.GATEWAY"
+        key="sub-device"
+        tab="子设备管理"
+      />
+      <Tabs.Pane key="log" tab="设备消息">
+        <DeviceDetailsMessage
+          v-if="activeTab === 'log' && device.id"
+          :device-id="device.id"
+        />
+      </Tabs.Pane>
+      <Tabs.Pane key="simulator" tab="模拟设备">
         <DeviceDetailsSimulator
           v-if="activeTab === 'simulator'"
           :product="product"
           :device="device"
           :thing-model-list="thingModelList"
         />
-      </a-tab-pane>
-      <a-tab-pane key="config" tab="设备配置">
+      </Tabs.Pane>
+      <Tabs.Pane key="config" tab="设备配置">
         <DeviceDetailConfig
           v-if="activeTab === 'config'"
           :device="device"
           @success="getDeviceData"
         />
-      </a-tab-pane>
-    </a-tabs>
+      </Tabs.Pane>
+    </Tabs>
   </Page>
 </template>
-<script lang="ts" setup>
-import { ref, unref, onMounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
-import { message } from 'ant-design-vue'
-import { useTabbarStore } from '@vben/stores'
-import { Page } from '@vben/common-ui'
-import { DeviceApi } from '#/api/iot/device/device'
-import type { DeviceVO } from '#/api/iot/device/device'
-import { DeviceTypeEnum, ProductApi } from '#/api/iot/product/product'
-import type { ProductVO } from '#/api/iot/product/product'
-import { ThingModelApi } from '#/api/iot/thingmodel'
-import type { ThingModelData } from '#/api/iot/thingmodel'
-import DeviceDetailsHeader from './DeviceDetailsHeader.vue'
-import DeviceDetailsInfo from './DeviceDetailsInfo.vue'
-import DeviceDetailsThingModel from './DeviceDetailsThingModel.vue'
-import DeviceDetailsMessage from './DeviceDetailsMessage.vue'
-import DeviceDetailsSimulator from './DeviceDetailsSimulator.vue'
-import DeviceDetailConfig from './DeviceDetailConfig.vue'
-
-defineOptions({ name: 'IoTDeviceDetail' })
-
-const route = useRoute()
-const id = Number(route.params.id) // 将字符串转换为数字
-const loading = ref(true) // 加载中
-const product = ref<ProductVO>({} as ProductVO) // 产品详情
-const device = ref<DeviceVO>({} as DeviceVO) // 设备详情
-const activeTab = ref('info') // 默认激活的标签页
-const thingModelList = ref<ThingModelData[]>([]) // 物模型列表数据
-
-/** 获取设备详情 */
-const getDeviceData = async () => {
-  loading.value = true
-  try {
-    device.value = await DeviceApi.getDevice(id)
-    await getProductData(device.value.productId)
-    await getThingModelList(device.value.productId)
-  } finally {
-    loading.value = false
-  }
-}
-
-/** 获取产品详情 */
-const getProductData = async (id: number) => {
-  product.value = await ProductApi.getProduct(id)
-}
-
-/** 获取物模型列表 */
-const getThingModelList = async (productId: number) => {
-  try {
-    const data = await ThingModelApi.getThingModelList(productId)
-    thingModelList.value = data || []
-  } catch (error) {
-    console.error('获取物模型列表失败:', error)
-    thingModelList.value = []
-  }
-}
-
-/** 初始化 */
-const tabbarStore = useTabbarStore() // 视图操作
-const router = useRouter() // 路由
-const { currentRoute } = router
-onMounted(async () => {
-  if (!id) {
-    message.warning({ content: '参数错误，产品不能为空！' })
-    await tabbarStore.closeTab(unref(currentRoute), router)
-    return
-  }
-  await getDeviceData()
-  activeTab.value = (route.query.tab as string) || 'info'
-})
-</script>
-
diff --git a/apps/web-antd/src/views/iot/device/group/modules/device-group-form.vue b/apps/web-antd/src/views/iot/device/group/modules/device-group-form.vue
index 0f9ee29f70993a39bbe277d122842c47401ab472..fe010aba1777358c80472f2a5e623eb24cd076b7 100644
--- a/apps/web-antd/src/views/iot/device/group/modules/device-group-form.vue
+++ b/apps/web-antd/src/views/iot/device/group/modules/device-group-form.vue
@@ -48,19 +48,17 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
-    
+
     try {
       const values = await formApi.getValues();
-      
-      if (formData.value?.id) {
-        await updateDeviceGroup({
-          ...values,
-          id: formData.value.id,
-        } as IotDeviceGroupApi.DeviceGroup);
-      } else {
-        await createDeviceGroup(values as IotDeviceGroupApi.DeviceGroup);
-      }
-      
+
+      await (formData.value?.id
+        ? updateDeviceGroup({
+            ...values,
+            id: formData.value.id,
+          } as IotDeviceGroupApi.DeviceGroup)
+        : createDeviceGroup(values as IotDeviceGroupApi.DeviceGroup));
+
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -68,20 +66,20 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-  
+
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
       return;
     }
-    
+
     const data = modalApi.getData<IotDeviceGroupApi.DeviceGroup>();
     // 如果没有数据或没有 id，表示是新增
     if (!data || !data.id) {
       formData.value = undefined;
       return;
     }
-    
+
     // 编辑模式：加载数据
     modalApi.lock();
     try {
diff --git a/apps/web-antd/src/views/iot/home/chartOptions.ts b/apps/web-antd/src/views/iot/home/chartOptions.ts
index 556766624e3852e0950f67cae41a3d89c78526b3..e989538e09550e7dada77ba06e90b3a32f91da2c 100644
--- a/apps/web-antd/src/views/iot/home/chartOptions.ts
+++ b/apps/web-antd/src/views/iot/home/chartOptions.ts
@@ -1,9 +1,11 @@
 /**
  * 设备数量饼图配置
  */
-export function getDeviceCountChartOptions(productCategoryDeviceCounts: Record<string, number>): any {
+export function getDeviceCountChartOptions(
+  productCategoryDeviceCounts: Record<string, number>,
+): any {
   const data = Object.entries(productCategoryDeviceCounts).map(
-    ([name, value]) => ({ name, value })
+    ([name, value]) => ({ name, value }),
   );
 
   return {
@@ -22,7 +24,7 @@ export function getDeviceCountChartOptions(productCategoryDeviceCounts: Record<s
         type: 'pie',
         radius: ['50%', '80%'],
         center: ['30%', '50%'],
-        data: data,
+        data,
         emphasis: {
           itemStyle: {
             shadowBlur: 10,
@@ -42,7 +44,12 @@ export function getDeviceCountChartOptions(productCategoryDeviceCounts: Record<s
 /**
  * 仪表盘图表配置
  */
-export function getGaugeChartOptions(value: number, max: number, color: string, title: string): any {
+export function getGaugeChartOptions(
+  value: number,
+  max: number,
+  color: string,
+  title: string,
+): any {
   return {
     series: [
       {
@@ -50,14 +57,14 @@ export function getGaugeChartOptions(value: number, max: number, color: string,
         startAngle: 180,
         endAngle: 0,
         min: 0,
-        max: max,
+        max,
         center: ['50%', '70%'],
         radius: '120%',
         progress: {
           show: true,
           width: 12,
           itemStyle: {
-            color: color,
+            color,
           },
         },
         axisLine: {
@@ -74,7 +81,7 @@ export function getGaugeChartOptions(value: number, max: number, color: string,
           valueAnimation: true,
           fontSize: 24,
           fontWeight: 'bold',
-          color: color,
+          color,
           offsetCenter: [0, '-20%'],
           formatter: '{value}',
         },
@@ -84,10 +91,8 @@ export function getGaugeChartOptions(value: number, max: number, color: string,
           fontSize: 14,
           color: '#666',
         },
-        data: [{ value: value, name: title }],
+        data: [{ value, name: title }],
       },
     ],
   };
 }
-
-
diff --git a/apps/web-antd/src/views/iot/home/data.ts b/apps/web-antd/src/views/iot/home/data.ts
index 320c3fb3feded88dda56b8b8ab89775de4ffc264..a91d606a093f9f2d380ae2ba9cfeee7832cf2d28 100644
--- a/apps/web-antd/src/views/iot/home/data.ts
+++ b/apps/web-antd/src/views/iot/home/data.ts
@@ -1,16 +1,16 @@
 /**
  * IoT 首页数据配置文件
- * 
+ *
  * 该文件封装了 IoT 首页所需的:
  * - 统计数据接口定义
  * - 业务逻辑函数
  * - 工具函数
  */
 
-import { ref, onMounted } from 'vue';
-
 import type { IotStatisticsApi } from '#/api/iot/statistics';
 
+import { onMounted, ref } from 'vue';
+
 import { getStatisticsSummary } from '#/api/iot/statistics';
 
 /** 统计数据接口 - 使用 API 定义的类型 */
@@ -43,13 +43,13 @@ export async function loadStatisticsData(): Promise<StatsData> {
   } catch (error) {
     console.error('获取统计数据出错:', error);
     console.warn('使用 Mock 数据，请检查后端接口是否已实现');
-    
+
     // 返回 Mock 数据用于开发调试
     return {
       productCategoryCount: 12,
       productCount: 45,
       deviceCount: 328,
-      deviceMessageCount: 15678,
+      deviceMessageCount: 15_678,
       productCategoryTodayCount: 2,
       productTodayCount: 5,
       deviceTodayCount: 23,
@@ -58,10 +58,10 @@ export async function loadStatisticsData(): Promise<StatsData> {
       deviceOfflineCount: 48,
       deviceInactiveCount: 24,
       productCategoryDeviceCounts: {
-        '智能家居': 120,
-        '工业设备': 98,
-        '环境监测': 65,
-        '智能穿戴': 45,
+        智能家居: 120,
+        工业设备: 98,
+        环境监测: 65,
+        智能穿戴: 45,
       },
     };
   }
@@ -102,13 +102,12 @@ export function useIotHome() {
 }
 
 /** 格式化数字 - 大数字显示为 K/M */
-export const formatNumber = (num: number): string => {
-  if (num >= 1000000) {
-    return (num / 1000000).toFixed(1) + 'M';
+export function formatNumber(num: number): string {
+  if (num >= 1_000_000) {
+    return `${(num / 1_000_000).toFixed(1)}M`;
   }
   if (num >= 1000) {
-    return (num / 1000).toFixed(1) + 'K';
+    return `${(num / 1000).toFixed(1)}K`;
   }
   return num.toString();
-};
-
+}
diff --git a/apps/web-antd/src/views/iot/home/index.vue b/apps/web-antd/src/views/iot/home/index.vue
index d52e02a08fa440aeda9be17dbfafd65e8f21900c..a0ee5476280bf1913fc424b89ddd741ccd3f0b74 100644
--- a/apps/web-antd/src/views/iot/home/index.vue
+++ b/apps/web-antd/src/views/iot/home/index.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import { Row, Col } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
 
+import { Col, Row } from 'ant-design-vue';
+
+// 导入业务逻辑
+import { useIotHome } from './data';
 // 导入组件
 import ComparisonCard from './modules/ComparisonCard.vue';
 import DeviceCountCard from './modules/DeviceCountCard.vue';
 import DeviceStateCountCard from './modules/DeviceStateCountCard.vue';
 import MessageTrendCard from './modules/MessageTrendCard.vue';
 
-// 导入业务逻辑
-import { useIotHome } from './data';
-
 defineOptions({ name: 'IoTHome' });
 
 // 使用业务逻辑 Hook
@@ -25,9 +25,9 @@ const { loading, statsData } = useIotHome();
         <ComparisonCard
           title="分类数量"
           :value="statsData.productCategoryCount"
-          :todayCount="statsData.productCategoryTodayCount"
+          :today-count="statsData.productCategoryTodayCount"
           icon="menu"
-          iconColor="text-blue-500"
+          icon-color="text-blue-500"
           :loading="loading"
         />
       </Col>
@@ -35,9 +35,9 @@ const { loading, statsData } = useIotHome();
         <ComparisonCard
           title="产品数量"
           :value="statsData.productCount"
-          :todayCount="statsData.productTodayCount"
+          :today-count="statsData.productTodayCount"
           icon="box"
-          iconColor="text-orange-500"
+          icon-color="text-orange-500"
           :loading="loading"
         />
       </Col>
@@ -45,9 +45,9 @@ const { loading, statsData } = useIotHome();
         <ComparisonCard
           title="设备数量"
           :value="statsData.deviceCount"
-          :todayCount="statsData.deviceTodayCount"
+          :today-count="statsData.deviceTodayCount"
           icon="cpu"
-          iconColor="text-purple-500"
+          icon-color="text-purple-500"
           :loading="loading"
         />
       </Col>
@@ -55,9 +55,9 @@ const { loading, statsData } = useIotHome();
         <ComparisonCard
           title="设备消息数"
           :value="statsData.deviceMessageCount"
-          :todayCount="statsData.deviceMessageTodayCount"
+          :today-count="statsData.deviceMessageTodayCount"
           icon="message"
-          iconColor="text-teal-500"
+          icon-color="text-teal-500"
           :loading="loading"
         />
       </Col>
@@ -66,10 +66,10 @@ const { loading, statsData } = useIotHome();
     <!-- 第二行：图表 -->
     <Row :gutter="16" class="mb-4">
       <Col :span="12">
-        <DeviceCountCard :statsData="statsData" :loading="loading" />
+        <DeviceCountCard :stats-data="statsData" :loading="loading" />
       </Col>
       <Col :span="12">
-        <DeviceStateCountCard :statsData="statsData" :loading="loading" />
+        <DeviceStateCountCard :stats-data="statsData" :loading="loading" />
       </Col>
     </Row>
 
diff --git a/apps/web-antd/src/views/iot/home/modules/ComparisonCard.vue b/apps/web-antd/src/views/iot/home/modules/ComparisonCard.vue
index eadc6c714e425f818f84cd7cf603e19d36b0b66a..7f1ad732b27aec1d2b251fc7eb8171a58dfeff3a 100644
--- a/apps/web-antd/src/views/iot/home/modules/ComparisonCard.vue
+++ b/apps/web-antd/src/views/iot/home/modules/ComparisonCard.vue
@@ -1,9 +1,40 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+
+import { CountTo } from '@vben/common-ui';
+import { createIconifyIcon } from '@vben/icons';
+
+import { Card } from 'ant-design-vue';
+
+defineOptions({ name: 'ComparisonCard' });
+
+const props = defineProps<{
+  icon: string;
+  iconColor?: string;
+  loading?: boolean;
+  title: string;
+  todayCount: number;
+  value: number;
+}>();
+
+const iconMap: Record<string, any> = {
+  menu: createIconifyIcon('ant-design:appstore-outlined'),
+  box: createIconifyIcon('ant-design:box-plot-outlined'),
+  cpu: createIconifyIcon('ant-design:cluster-outlined'),
+  message: createIconifyIcon('ant-design:message-outlined'),
+};
+
+const IconComponent = computed(() => iconMap[props.icon] || iconMap.menu);
+</script>
+
 <template>
   <Card class="stat-card" :loading="loading">
-    <div class="flex flex-col h-full">
-      <div class="flex justify-between items-start mb-4">
-        <div class="flex flex-col flex-1">
-          <span class="text-gray-500 text-sm font-medium mb-2">{{ title }}</span>
+    <div class="flex h-full flex-col">
+      <div class="mb-4 flex items-start justify-between">
+        <div class="flex flex-1 flex-col">
+          <span class="mb-2 text-sm font-medium text-gray-500">
+            {{ title }}
+          </span>
           <span class="text-3xl font-bold text-gray-800">
             <span v-if="value === -1">--</span>
             <CountTo v-else :end-val="value" :duration="1000" />
@@ -13,60 +44,35 @@
           <IconComponent />
         </div>
       </div>
-      
-      <div class="mt-auto pt-3 border-t border-gray-100">
-        <div class="flex justify-between items-center text-sm">
+
+      <div class="mt-auto border-t border-gray-100 pt-3">
+        <div class="flex items-center justify-between text-sm">
           <span class="text-gray-400">今日新增</span>
           <span v-if="todayCount === -1" class="text-gray-400">--</span>
-          <span v-else class="text-green-500 font-medium">+{{ todayCount }}</span>
+          <span v-else class="font-medium text-green-500">
+            +{{ todayCount }}
+          </span>
         </div>
       </div>
     </div>
   </Card>
 </template>
 
-<script setup lang="ts">
-import { Card } from 'ant-design-vue';
-import { CountTo } from '@vben/common-ui';
-import { createIconifyIcon } from '@vben/icons';
-import { computed } from 'vue';
-
-defineOptions({ name: 'ComparisonCard' });
-
-const props = defineProps<{
-  title: string;
-  value: number;
-  todayCount: number;
-  icon: string;
-  iconColor?: string;
-  loading?: boolean;
-}>();
-
-const iconMap: Record<string, any> = {
-  'menu': createIconifyIcon('ant-design:appstore-outlined'),
-  'box': createIconifyIcon('ant-design:box-plot-outlined'),
-  'cpu': createIconifyIcon('ant-design:cluster-outlined'),
-  'message': createIconifyIcon('ant-design:message-outlined'),
-};
-
-const IconComponent = computed(() => iconMap[props.icon] || iconMap.menu);
-</script>
-
 <style scoped>
 .stat-card {
   height: 160px;
-  transition: all 0.3s ease;
   cursor: pointer;
+  transition: all 0.3s ease;
 }
 
 .stat-card:hover {
+  box-shadow: 0 6px 20px rgb(0 0 0 / 8%);
   transform: translateY(-4px);
-  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.08);
 }
 
 .stat-card :deep(.ant-card-body) {
-  height: 100%;
   display: flex;
   flex-direction: column;
+  height: 100%;
 }
 </style>
diff --git a/apps/web-antd/src/views/iot/home/modules/DeviceCountCard.vue b/apps/web-antd/src/views/iot/home/modules/DeviceCountCard.vue
index 5005a32b13c032f2a827979e5bf436b53474fd95..397648dce214addfb8d78026740120bfcd210461 100644
--- a/apps/web-antd/src/views/iot/home/modules/DeviceCountCard.vue
+++ b/apps/web-antd/src/views/iot/home/modules/DeviceCountCard.vue
@@ -1,28 +1,17 @@
-<template>
-  <Card title="设备数量统计" :loading="loading" class="chart-card">
-    <div v-if="loading && !hasData" class="h-[300px] flex justify-center items-center">
-      <Empty description="加载中..." />
-    </div>
-    <div v-else-if="!hasData" class="h-[300px] flex justify-center items-center">
-      <Empty description="暂无数据" />
-    </div>
-    <div v-else>
-      <EchartsUI ref="deviceCountChartRef" class="h-[400px] w-full" />
-    </div>
-  </Card>
-</template>
-
 <script setup lang="ts">
-import { ref, computed, watch, onMounted, nextTick } from 'vue';
-import { Card, Empty } from 'ant-design-vue';
-import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import type { IotStatisticsApi } from '#/api/iot/statistics';
 
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { Card, Empty } from 'ant-design-vue';
+
 defineOptions({ name: 'DeviceCountCard' });
 
 const props = defineProps<{
-  statsData: IotStatisticsApi.StatisticsSummary;
   loading?: boolean;
+  statsData: IotStatisticsApi.StatisticsSummary;
 }>();
 
 const deviceCountChartRef = ref();
@@ -31,18 +20,20 @@ const { renderEcharts } = useEcharts(deviceCountChartRef);
 /** 是否有数据 */
 const hasData = computed(() => {
   if (!props.statsData) return false;
-  const categories = Object.entries(props.statsData.productCategoryDeviceCounts || {});
+  const categories = Object.entries(
+    props.statsData.productCategoryDeviceCounts || {},
+  );
   return categories.length > 0 && props.statsData.deviceCount !== 0;
 });
 
 /** 初始化图表 */
-const initChart = () => {
+function initChart() {
   if (!hasData.value) return;
-  
+
   nextTick(() => {
-    const data = Object.entries(props.statsData.productCategoryDeviceCounts).map(
-      ([name, value]) => ({ name, value })
-    );
+    const data = Object.entries(
+      props.statsData.productCategoryDeviceCounts,
+    ).map(([name, value]) => ({ name, value }));
 
     renderEcharts({
       tooltip: {
@@ -98,12 +89,12 @@ const initChart = () => {
           labelLine: {
             show: false,
           },
-          data: data,
+          data,
         },
       ],
     });
   });
-};
+}
 
 /** 监听数据变化 */
 watch(
@@ -111,7 +102,7 @@ watch(
   () => {
     initChart();
   },
-  { deep: true }
+  { deep: true },
 );
 
 /** 组件挂载时初始化图表 */
@@ -120,6 +111,26 @@ onMounted(() => {
 });
 </script>
 
+<template>
+  <Card title="设备数量统计" :loading="loading" class="chart-card">
+    <div
+      v-if="loading && !hasData"
+      class="flex h-[300px] items-center justify-center"
+    >
+      <Empty description="加载中..." />
+    </div>
+    <div
+      v-else-if="!hasData"
+      class="flex h-[300px] items-center justify-center"
+    >
+      <Empty description="暂无数据" />
+    </div>
+    <div v-else>
+      <EchartsUI ref="deviceCountChartRef" class="h-[400px] w-full" />
+    </div>
+  </Card>
+</template>
+
 <style scoped>
 .chart-card {
   height: 100%;
diff --git a/apps/web-antd/src/views/iot/home/modules/DeviceStateCountCard.vue b/apps/web-antd/src/views/iot/home/modules/DeviceStateCountCard.vue
index 334b7f6ea23772812f140e17aaaee8640c06872c..0aa77d2d8552c89b0954186be1557ae7097eaa5b 100644
--- a/apps/web-antd/src/views/iot/home/modules/DeviceStateCountCard.vue
+++ b/apps/web-antd/src/views/iot/home/modules/DeviceStateCountCard.vue
@@ -1,36 +1,17 @@
-<template>
-  <Card title="设备状态统计" :loading="loading" class="chart-card">
-    <div v-if="loading && !hasData" class="h-[300px] flex justify-center items-center">
-      <Empty description="加载中..." />
-    </div>
-    <div v-else-if="!hasData" class="h-[300px] flex justify-center items-center">
-      <Empty description="暂无数据" />
-    </div>
-    <Row v-else class="h-[280px]">
-      <Col :span="8" class="flex items-center justify-center">
-        <EchartsUI ref="deviceOnlineChartRef" class="h-[250px] w-full" />
-      </Col>
-      <Col :span="8" class="flex items-center justify-center">
-        <EchartsUI ref="deviceOfflineChartRef" class="h-[250px] w-full" />
-      </Col>
-      <Col :span="8" class="flex items-center justify-center">
-        <EchartsUI ref="deviceInactiveChartRef" class="h-[250px] w-full" />
-      </Col>
-    </Row>
-  </Card>
-</template>
-
 <script setup lang="ts">
-import { ref, computed, watch, onMounted, nextTick } from 'vue';
-import { Card, Empty, Row, Col } from 'ant-design-vue';
-import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import type { IotStatisticsApi } from '#/api/iot/statistics';
 
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { Card, Col, Empty, Row } from 'ant-design-vue';
+
 defineOptions({ name: 'DeviceStateCountCard' });
 
 const props = defineProps<{
-  statsData: IotStatisticsApi.StatisticsSummary;
   loading?: boolean;
+  statsData: IotStatisticsApi.StatisticsSummary;
 }>();
 
 const deviceOnlineChartRef = ref();
@@ -39,7 +20,9 @@ const deviceInactiveChartRef = ref();
 
 const { renderEcharts: renderOnlineChart } = useEcharts(deviceOnlineChartRef);
 const { renderEcharts: renderOfflineChart } = useEcharts(deviceOfflineChartRef);
-const { renderEcharts: renderInactiveChart } = useEcharts(deviceInactiveChartRef);
+const { renderEcharts: renderInactiveChart } = useEcharts(
+  deviceInactiveChartRef,
+);
 
 /** 是否有数据 */
 const hasData = computed(() => {
@@ -63,7 +46,7 @@ const getGaugeOption = (value: number, color: string, title: string): any => {
           show: true,
           width: 12,
           itemStyle: {
-            color: color,
+            color,
           },
         },
         axisLine: {
@@ -86,35 +69,39 @@ const getGaugeOption = (value: number, color: string, title: string): any => {
           valueAnimation: true,
           fontSize: 32,
           fontWeight: 'bold',
-          color: color,
+          color,
           offsetCenter: [0, '10%'],
           formatter: (val: number) => `${val} 个`,
         },
-        data: [{ value: value, name: title }],
+        data: [{ value, name: title }],
       },
     ],
   };
 };
 
 /** 初始化图表 */
-const initCharts = () => {
+function initCharts() {
   if (!hasData.value) return;
 
   nextTick(() => {
     // 在线设备
     renderOnlineChart(
-      getGaugeOption(props.statsData.deviceOnlineCount, '#52c41a', '在线设备')
+      getGaugeOption(props.statsData.deviceOnlineCount, '#52c41a', '在线设备'),
     );
     // 离线设备
     renderOfflineChart(
-      getGaugeOption(props.statsData.deviceOfflineCount, '#ff4d4f', '离线设备')
+      getGaugeOption(props.statsData.deviceOfflineCount, '#ff4d4f', '离线设备'),
     );
     // 待激活设备
     renderInactiveChart(
-      getGaugeOption(props.statsData.deviceInactiveCount, '#1890ff', '待激活设备')
+      getGaugeOption(
+        props.statsData.deviceInactiveCount,
+        '#1890ff',
+        '待激活设备',
+      ),
     );
   });
-};
+}
 
 /** 监听数据变化 */
 watch(
@@ -122,7 +109,7 @@ watch(
   () => {
     initCharts();
   },
-  { deep: true }
+  { deep: true },
 );
 
 /** 组件挂载时初始化图表 */
@@ -131,6 +118,34 @@ onMounted(() => {
 });
 </script>
 
+<template>
+  <Card title="设备状态统计" :loading="loading" class="chart-card">
+    <div
+      v-if="loading && !hasData"
+      class="flex h-[300px] items-center justify-center"
+    >
+      <Empty description="加载中..." />
+    </div>
+    <div
+      v-else-if="!hasData"
+      class="flex h-[300px] items-center justify-center"
+    >
+      <Empty description="暂无数据" />
+    </div>
+    <Row v-else class="h-[280px]">
+      <Col :span="8" class="flex items-center justify-center">
+        <EchartsUI ref="deviceOnlineChartRef" class="h-[250px] w-full" />
+      </Col>
+      <Col :span="8" class="flex items-center justify-center">
+        <EchartsUI ref="deviceOfflineChartRef" class="h-[250px] w-full" />
+      </Col>
+      <Col :span="8" class="flex items-center justify-center">
+        <EchartsUI ref="deviceInactiveChartRef" class="h-[250px] w-full" />
+      </Col>
+    </Row>
+  </Card>
+</template>
+
 <style scoped>
 .chart-card {
   height: 100%;
diff --git a/apps/web-antd/src/views/iot/home/modules/MessageTrendCard.vue b/apps/web-antd/src/views/iot/home/modules/MessageTrendCard.vue
index 27b9ca5e0a125024dc82784602388d769a948d3c..4f4a118150d7c1712776f1dc4503df8a88d341ac 100644
--- a/apps/web-antd/src/views/iot/home/modules/MessageTrendCard.vue
+++ b/apps/web-antd/src/views/iot/home/modules/MessageTrendCard.vue
@@ -1,79 +1,30 @@
-<template>
-  <Card class="chart-card" :loading="loading">
-    <template #title>
-      <div class="flex items-center justify-between flex-wrap gap-2">
-        <span class="text-base font-medium">上下行消息量统计</span>
-        <Space :size="8">
-          <Button 
-            :type="activeTimeRange === '1h' ? 'primary' : 'default'"
-            size="small"
-            @click="setTimeRange('1h')"
-          >
-            最近1小时
-          </Button>
-          <Button 
-            :type="activeTimeRange === '24h' ? 'primary' : 'default'"
-            size="small"
-            @click="setTimeRange('24h')"
-          >
-            最近24小时
-          </Button>
-          <Button 
-            :type="activeTimeRange === '7d' ? 'primary' : 'default'"
-            size="small"
-            @click="setTimeRange('7d')"
-          >
-            近一周
-          </Button>
-          <RangePicker
-            v-model:value="dateRange"
-            format="YYYY-MM-DD"
-            :placeholder="['开始时间', '结束时间']"
-            @change="handleDateChange"
-            size="small"
-            style="width: 240px"
-          />
-        </Space>
-      </div>
-    </template>
-    
-    <div v-if="loading" class="h-[350px] flex justify-center items-center">
-      <Empty description="加载中..." />
-    </div>
-    <div v-else-if="!hasData" class="h-[350px] flex justify-center items-center">
-      <Empty description="暂无数据" />
-    </div>
-    <div v-else>
-      <EchartsUI ref="messageChartRef" class="h-[350px] w-full" />
-    </div>
-  </Card>
-</template>
-
 <script setup lang="ts">
-import { ref, reactive, computed, onMounted, nextTick } from 'vue';
-import { Card, Empty, Space, DatePicker, Button } from 'ant-design-vue';
-import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import type { Dayjs } from 'dayjs';
+
+import type { IotStatisticsApi } from '#/api/iot/statistics';
+
+import { computed, nextTick, onMounted, reactive, ref } from 'vue';
+
+import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
+
+import { Button, Card, DatePicker, Empty, Space } from 'ant-design-vue';
 import dayjs from 'dayjs';
-import {
-  StatisticsApi,
-  type IotStatisticsDeviceMessageSummaryByDateRespVO,
-  type IotStatisticsDeviceMessageReqVO,
-} from '#/api/iot/statistics';
 
-const { RangePicker } = DatePicker;
+import { getDeviceMessageSummaryByDate } from '#/api/iot/statistics';
 
 defineOptions({ name: 'MessageTrendCard' });
 
+const { RangePicker } = DatePicker;
+
 const messageChartRef = ref();
 const { renderEcharts } = useEcharts(messageChartRef);
 
 const loading = ref(false);
-const messageData = ref<IotStatisticsDeviceMessageSummaryByDateRespVO[]>([]);
+const messageData = ref<IotStatisticsApi.DeviceMessageSummaryByDate[]>([]);
 const activeTimeRange = ref('7d'); // 当前选中的时间范围
 const dateRange = ref<[Dayjs, Dayjs] | undefined>(undefined);
 
-const queryParams = reactive<IotStatisticsDeviceMessageReqVO>({
+const queryParams = reactive<IotStatisticsApi.DeviceMessageReq>({
   interval: 1, // 按天
   times: [],
 });
@@ -84,41 +35,45 @@ const hasData = computed(() => {
 });
 
 // 设置时间范围
-const setTimeRange = (range: string) => {
+function setTimeRange(range: string) {
   activeTimeRange.value = range;
   dateRange.value = undefined; // 清空自定义时间选择
-  
+
   let start: Dayjs;
-  let end = dayjs();
-  
+  const end = dayjs();
+
   switch (range) {
-    case '1h':
+    case '1h': {
       start = dayjs().subtract(1, 'hour');
       queryParams.interval = 1; // 按分钟
       break;
-    case '24h':
-      start = dayjs().subtract(24, 'hour');
-      queryParams.interval = 1; // 按小时
-      break;
-    case '7d':
+    }
+    case '7d': {
       start = dayjs().subtract(7, 'day');
       queryParams.interval = 1; // 按天
       break;
-    default:
+    }
+    case '24h': {
+      start = dayjs().subtract(24, 'hour');
+      queryParams.interval = 1; // 按小时
+      break;
+    }
+    default: {
       start = dayjs().subtract(7, 'day');
       queryParams.interval = 1;
+    }
   }
-  
+
   queryParams.times = [
     start.format('YYYY-MM-DD HH:mm:ss'),
     end.format('YYYY-MM-DD HH:mm:ss'),
   ];
-  
+
   fetchMessageData();
-};
+}
 
 // 处理自定义日期选择
-const handleDateChange = () => {
+function handleDateChange() {
   if (dateRange.value && dateRange.value.length === 2) {
     activeTimeRange.value = ''; // 清空快捷选择
     queryParams.interval = 1; // 按天
@@ -128,15 +83,15 @@ const handleDateChange = () => {
     ];
     fetchMessageData();
   }
-};
+}
 
 // 获取消息统计数据
-const fetchMessageData = async () => {
+async function fetchMessageData() {
   if (!queryParams.times || queryParams.times.length !== 2) return;
-  
+
   loading.value = true;
   try {
-    messageData.value = await StatisticsApi.getDeviceMessageSummaryByDate(queryParams);
+    messageData.value = await getDeviceMessageSummaryByDate(queryParams);
     await nextTick();
     initChart();
   } catch (error) {
@@ -145,10 +100,10 @@ const fetchMessageData = async () => {
   } finally {
     loading.value = false;
   }
-};
+}
 
 // 初始化图表
-const initChart = () => {
+function initChart() {
   if (!hasData.value) return;
 
   const times = messageData.value.map((item) => item.time);
@@ -222,7 +177,7 @@ const initChart = () => {
       },
     ],
   });
-};
+}
 
 // 组件挂载时查询数据
 onMounted(() => {
@@ -230,6 +185,60 @@ onMounted(() => {
 });
 </script>
 
+<template>
+  <Card class="chart-card" :loading="loading">
+    <template #title>
+      <div class="flex flex-wrap items-center justify-between gap-2">
+        <span class="text-base font-medium">上下行消息量统计</span>
+        <Space :size="8">
+          <Button
+            :type="activeTimeRange === '1h' ? 'primary' : 'default'"
+            size="small"
+            @click="setTimeRange('1h')"
+          >
+            最近1小时
+          </Button>
+          <Button
+            :type="activeTimeRange === '24h' ? 'primary' : 'default'"
+            size="small"
+            @click="setTimeRange('24h')"
+          >
+            最近24小时
+          </Button>
+          <Button
+            :type="activeTimeRange === '7d' ? 'primary' : 'default'"
+            size="small"
+            @click="setTimeRange('7d')"
+          >
+            近一周
+          </Button>
+          <RangePicker
+            v-model:value="dateRange"
+            format="YYYY-MM-DD"
+            :placeholder="['开始时间', '结束时间']"
+            @change="handleDateChange"
+            size="small"
+            style="width: 240px"
+          />
+        </Space>
+      </div>
+    </template>
+
+    <div v-if="loading" class="flex h-[350px] items-center justify-center">
+      <Empty description="加载中..." />
+    </div>
+    <div
+      v-else-if="!hasData"
+      class="flex h-[350px] items-center justify-center"
+    >
+      <Empty description="暂无数据" />
+    </div>
+    <div v-else>
+      <EchartsUI ref="messageChartRef" class="h-[350px] w-full" />
+    </div>
+  </Card>
+</template>
+
 <style scoped>
 .chart-card {
   height: 100%;
diff --git a/apps/web-antd/src/views/iot/ota/firmware/data.ts b/apps/web-antd/src/views/iot/ota/firmware/data.ts
index 7d93d2166271e87bca7f4926d58666d610bbe5c1..c3e44ec47f8c0db9ee06f74385ab9a4ae621c4e8 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/data.ts
+++ b/apps/web-antd/src/views/iot/ota/firmware/data.ts
@@ -1,12 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
 
-import { message } from 'ant-design-vue';
-
-import { deleteOtaFirmware, getOtaFirmwarePage } from '#/api/iot/ota/firmware';
 import { getSimpleProductList } from '#/api/iot/product/product';
-import { $t } from '#/locales';
 import { getRangePickerDefaultProps } from '#/utils';
 
 /** 新增/修改固件的表单 */
@@ -157,51 +152,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-
-/** Grid 配置项 */
-export function useGridOptions(): VxeTableGridOptions<IoTOtaFirmwareApi.Firmware> {
-  return {
-    columns: useGridColumns(),
-    height: 'auto',
-    keepSource: true,
-    proxyConfig: {
-      ajax: {
-        query: async ({ page }, formValues) => {
-          return await getOtaFirmwarePage({
-            pageNo: page.currentPage,
-            pageSize: page.pageSize,
-            ...formValues,
-          });
-        },
-      },
-    },
-    rowConfig: {
-      keyField: 'id',
-      isHover: true,
-    },
-    toolbarConfig: {
-      refresh: true,
-      search: true,
-    },
-  };
-}
-
-/** 删除固件 */
-export async function handleDeleteFirmware(
-  row: IoTOtaFirmwareApi.Firmware,
-  onSuccess: () => void,
-) {
-  const hideLoading = message.loading({
-    content: $t('ui.actionMessage.deleting', [row.name]),
-    duration: 0,
-  });
-  try {
-    await deleteOtaFirmware(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onSuccess();
-  } finally {
-    hideLoading();
-  }
-}
diff --git a/apps/web-antd/src/views/iot/ota/firmware/index.vue b/apps/web-antd/src/views/iot/ota/firmware/index.vue
index 9d1298bec8f8369aab608373c780fc5f287601bf..13a132dec88c3c4d2ca745ff4a9ff4eff69232dc 100644
--- a/apps/web-antd/src/views/iot/ota/firmware/index.vue
+++ b/apps/web-antd/src/views/iot/ota/firmware/index.vue
@@ -1,17 +1,18 @@
 <script lang="ts" setup>
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
 
 import { Page, useVbenModal } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import { deleteOtaFirmware, getOtaFirmwarePage } from '#/api/iot/ota/firmware';
 import { $t } from '#/locales';
 
-import {
-  handleDeleteFirmware,
-  useGridFormSchema,
-  useGridOptions,
-} from './data';
 import Form from '../modules/OtaFirmwareForm.vue';
+import { useGridColumns, useGridFormSchema } from './data';
 
 defineOptions({ name: 'IoTOtaFirmware' });
 
@@ -35,21 +36,56 @@ function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
   formModalApi.setData({ type: 'update', id: row.id }).open();
 }
 
-/** 删除固件 */
-async function handleDelete(row: IoTOtaFirmwareApi.Firmware) {
-  await handleDeleteFirmware(row, onRefresh);
-}
-
 /** 查看固件详情 */
 function handleDetail(row: IoTOtaFirmwareApi.Firmware) {
   formModalApi.setData({ type: 'view', id: row.id }).open();
 }
 
+/** 删除固件 */
+async function handleDelete(row: IoTOtaFirmwareApi.Firmware) {
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteOtaFirmware(row.id as number);
+    message.success({
+      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
+    });
+    onRefresh();
+  } finally {
+    hideLoading();
+  }
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
   },
-  gridOptions: useGridOptions(),
+  gridOptions: {
+    columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
+    proxyConfig: {
+      ajax: {
+        query: async ({ page }, formValues) => {
+          return await getOtaFirmwarePage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+        },
+      },
+    },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<IoTOtaFirmwareApi.Firmware>,
 });
 </script>
 
@@ -84,7 +120,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
           download
           class="text-primary cursor-pointer hover:underline"
         >
-          <Icon icon="ant-design:download-outlined" class="mr-1" />
+          <IconifyIcon icon="ant-design:download-outlined" class="mr-1" />
           下载固件
         </a>
         <span v-else class="text-gray-400">无文件</span>
diff --git a/apps/web-antd/src/views/iot/ota/modules/OtaFirmwareForm.vue b/apps/web-antd/src/views/iot/ota/modules/OtaFirmwareForm.vue
index 691c49070e514f7f3bf93717f256b0b467319ff7..896544c6f46bb7c4bd8d33bf4e0f43ce105ae7dd 100644
--- a/apps/web-antd/src/views/iot/ota/modules/OtaFirmwareForm.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/OtaFirmwareForm.vue
@@ -52,7 +52,9 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as IoTOtaFirmwareApi.Firmware;
     try {
-      await (formData.value?.id ? updateOtaFirmware(data) : createOtaFirmware(data));
+      await (formData.value?.id
+        ? updateOtaFirmware(data)
+        : createOtaFirmware(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
diff --git a/apps/web-antd/src/views/iot/ota/modules/detail/index.vue b/apps/web-antd/src/views/iot/ota/modules/detail/index.vue
index 579f53df6fbab95fdb393032de9101dcc87ac550..8bd43420c133a9a090aa75bc5ca913548448b4bf 100644
--- a/apps/web-antd/src/views/iot/ota/modules/detail/index.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/detail/index.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
+import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
+
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { Card, Col, Descriptions, Row } from 'ant-design-vue';
+
 import { formatDate } from '@vben/utils';
-import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
+
+import { Card, Col, Descriptions, Row } from 'ant-design-vue';
+
 import * as IoTOtaFirmwareApi from '#/api/iot/ota/firmware';
 import * as IoTOtaTaskRecordApi from '#/api/iot/ota/task/record';
 import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
+
 import OtaTaskList from '../task/OtaTaskList.vue';
 
 /** IoT OTA 固件详情 */
@@ -22,26 +27,27 @@ const firmwareStatisticsLoading = ref(false);
 const firmwareStatistics = ref<Record<string, number>>({});
 
 /** 获取固件信息 */
-const getFirmwareInfo = async () => {
+async function getFirmwareInfo() {
   firmwareLoading.value = true;
   try {
     firmware.value = await IoTOtaFirmwareApi.getOtaFirmware(firmwareId.value);
   } finally {
     firmwareLoading.value = false;
   }
-};
+}
 
 /** 获取升级统计 */
-const getStatistics = async () => {
+async function getStatistics() {
   firmwareStatisticsLoading.value = true;
   try {
-    firmwareStatistics.value = await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
-      firmwareId.value,
-    );
+    firmwareStatistics.value =
+      await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
+        firmwareId.value,
+      );
   } finally {
     firmwareStatisticsLoading.value = false;
   }
-};
+}
 
 /** 初始化 */
 onMounted(() => {
@@ -65,7 +71,11 @@ onMounted(() => {
           {{ firmware?.version }}
         </Descriptions.Item>
         <Descriptions.Item label="创建时间">
-          {{ firmware?.createTime ? formatDate(firmware.createTime, 'YYYY-MM-DD HH:mm:ss') : '-' }}
+          {{
+            firmware?.createTime
+              ? formatDate(firmware.createTime, 'YYYY-MM-DD HH:mm:ss')
+              : '-'
+          }}
         </Descriptions.Item>
         <Descriptions.Item label="固件描述" :span="2">
           {{ firmware?.description }}
@@ -74,63 +84,101 @@ onMounted(() => {
     </Card>
 
     <!-- 升级设备统计 -->
-    <Card title="升级设备统计" class="mb-5" :loading="firmwareStatisticsLoading">
+    <Card
+      title="升级设备统计"
+      class="mb-5"
+      :loading="firmwareStatisticsLoading"
+    >
       <Row :gutter="20" class="py-5">
         <Col :span="6">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-blue-500">
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-blue-500">
               {{
-                Object.values(firmwareStatistics).reduce((sum: number, count) => sum + (count || 0), 0) ||
-                0
+                Object.values(firmwareStatistics).reduce(
+                  (sum: number, count) => sum + (count || 0),
+                  0,
+                ) || 0
               }}
             </div>
             <div class="text-sm text-gray-600">升级设备总数</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-gray-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-gray-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">待推送</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-blue-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-blue-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0
+              }}
             </div>
             <div class="text-sm text-gray-600">已推送</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-yellow-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.UPGRADING.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-yellow-500">
+              {{
+                firmwareStatistics[
+                  IoTOtaTaskRecordStatusEnum.UPGRADING.value
+                ] || 0
+              }}
             </div>
             <div class="text-sm text-gray-600">正在升级</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-green-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-green-500">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级成功</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-red-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-red-500">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级失败</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-gray-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-gray-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级取消</div>
           </div>
diff --git a/apps/web-antd/src/views/iot/ota/modules/firmware-detail/index.vue b/apps/web-antd/src/views/iot/ota/modules/firmware-detail/index.vue
index 579f53df6fbab95fdb393032de9101dcc87ac550..8bd43420c133a9a090aa75bc5ca913548448b4bf 100644
--- a/apps/web-antd/src/views/iot/ota/modules/firmware-detail/index.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/firmware-detail/index.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
+import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
+
 import { onMounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
-import { Card, Col, Descriptions, Row } from 'ant-design-vue';
+
 import { formatDate } from '@vben/utils';
-import type { IoTOtaFirmware } from '#/api/iot/ota/firmware';
+
+import { Card, Col, Descriptions, Row } from 'ant-design-vue';
+
 import * as IoTOtaFirmwareApi from '#/api/iot/ota/firmware';
 import * as IoTOtaTaskRecordApi from '#/api/iot/ota/task/record';
 import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
+
 import OtaTaskList from '../task/OtaTaskList.vue';
 
 /** IoT OTA 固件详情 */
@@ -22,26 +27,27 @@ const firmwareStatisticsLoading = ref(false);
 const firmwareStatistics = ref<Record<string, number>>({});
 
 /** 获取固件信息 */
-const getFirmwareInfo = async () => {
+async function getFirmwareInfo() {
   firmwareLoading.value = true;
   try {
     firmware.value = await IoTOtaFirmwareApi.getOtaFirmware(firmwareId.value);
   } finally {
     firmwareLoading.value = false;
   }
-};
+}
 
 /** 获取升级统计 */
-const getStatistics = async () => {
+async function getStatistics() {
   firmwareStatisticsLoading.value = true;
   try {
-    firmwareStatistics.value = await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
-      firmwareId.value,
-    );
+    firmwareStatistics.value =
+      await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
+        firmwareId.value,
+      );
   } finally {
     firmwareStatisticsLoading.value = false;
   }
-};
+}
 
 /** 初始化 */
 onMounted(() => {
@@ -65,7 +71,11 @@ onMounted(() => {
           {{ firmware?.version }}
         </Descriptions.Item>
         <Descriptions.Item label="创建时间">
-          {{ firmware?.createTime ? formatDate(firmware.createTime, 'YYYY-MM-DD HH:mm:ss') : '-' }}
+          {{
+            firmware?.createTime
+              ? formatDate(firmware.createTime, 'YYYY-MM-DD HH:mm:ss')
+              : '-'
+          }}
         </Descriptions.Item>
         <Descriptions.Item label="固件描述" :span="2">
           {{ firmware?.description }}
@@ -74,63 +84,101 @@ onMounted(() => {
     </Card>
 
     <!-- 升级设备统计 -->
-    <Card title="升级设备统计" class="mb-5" :loading="firmwareStatisticsLoading">
+    <Card
+      title="升级设备统计"
+      class="mb-5"
+      :loading="firmwareStatisticsLoading"
+    >
       <Row :gutter="20" class="py-5">
         <Col :span="6">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-blue-500">
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-blue-500">
               {{
-                Object.values(firmwareStatistics).reduce((sum: number, count) => sum + (count || 0), 0) ||
-                0
+                Object.values(firmwareStatistics).reduce(
+                  (sum: number, count) => sum + (count || 0),
+                  0,
+                ) || 0
               }}
             </div>
             <div class="text-sm text-gray-600">升级设备总数</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-gray-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-gray-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">待推送</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-blue-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-blue-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0
+              }}
             </div>
             <div class="text-sm text-gray-600">已推送</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-yellow-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.UPGRADING.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-yellow-500">
+              {{
+                firmwareStatistics[
+                  IoTOtaTaskRecordStatusEnum.UPGRADING.value
+                ] || 0
+              }}
             </div>
             <div class="text-sm text-gray-600">正在升级</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-green-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-green-500">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级成功</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-red-500">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-red-500">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级失败</div>
           </div>
         </Col>
         <Col :span="3">
-          <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-            <div class="text-3xl font-bold mb-2 text-gray-400">
-              {{ firmwareStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] || 0 }}
+          <div
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+          >
+            <div class="mb-2 text-3xl font-bold text-gray-400">
+              {{
+                firmwareStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] ||
+                0
+              }}
             </div>
             <div class="text-sm text-gray-600">升级取消</div>
           </div>
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskDetail.vue b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskDetail.vue
index 74d8a6732697b7927fc1c356a276bc1b2e3cc5bc..8a19d63d7a8f19d09594860b7579a42f6fd412b2 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskDetail.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskDetail.vue
@@ -1,14 +1,29 @@
 <script setup lang="ts">
-import { computed, reactive, ref } from 'vue';
-import { useVbenModal } from '@vben/common-ui';
-import { Card, Col, Descriptions, Modal, Row, Table, Tabs, Tag, message } from 'ant-design-vue';
 import type { TableColumnsType } from 'ant-design-vue';
+
 import type { OtaTask } from '#/api/iot/ota/task';
-import * as IoTOtaTaskApi from '#/api/iot/ota/task';
 import type { OtaTaskRecord } from '#/api/iot/ota/task/record';
+
+import { computed, reactive, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+import { formatDate } from '@vben/utils';
+
+import {
+  Card,
+  Col,
+  Descriptions,
+  message,
+  Modal,
+  Row,
+  Table,
+  Tabs,
+  Tag,
+} from 'ant-design-vue';
+
+import * as IoTOtaTaskApi from '#/api/iot/ota/task';
 import * as IoTOtaTaskRecordApi from '#/api/iot/ota/task/record';
 import { IoTOtaTaskRecordStatusEnum } from '#/views/iot/utils/constants';
-import { formatDate } from '@vben/utils';
 
 /** OTA 任务详情组件 */
 defineOptions({ name: 'OtaTaskDetail' });
@@ -98,7 +113,7 @@ const columns: TableColumnsType = [
 const [ModalComponent, modalApi] = useVbenModal();
 
 /** 获取任务详情 */
-const getTaskInfo = async () => {
+async function getTaskInfo() {
   if (!taskId.value) {
     return;
   }
@@ -108,26 +123,27 @@ const getTaskInfo = async () => {
   } finally {
     taskLoading.value = false;
   }
-};
+}
 
 /** 获取统计数据 */
-const getStatistics = async () => {
+async function getStatistics() {
   if (!taskId.value) {
     return;
   }
   taskStatisticsLoading.value = true;
   try {
-    taskStatistics.value = await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
-      undefined,
-      taskId.value,
-    );
+    taskStatistics.value =
+      await IoTOtaTaskRecordApi.getOtaTaskRecordStatusStatistics(
+        undefined,
+        taskId.value,
+      );
   } finally {
     taskStatisticsLoading.value = false;
   }
-};
+}
 
 /** 获取升级记录列表 */
-const getRecordList = async () => {
+async function getRecordList() {
   if (!taskId.value) {
     return;
   }
@@ -140,25 +156,26 @@ const getRecordList = async () => {
   } finally {
     recordLoading.value = false;
   }
-};
+}
 
 /** 切换标签 */
-const handleTabChange = (tabKey: string | number) => {
+function handleTabChange(tabKey: number | string) {
   activeTab.value = String(tabKey);
   queryParams.pageNo = 1;
-  queryParams.status = activeTab.value === '' ? undefined : parseInt(String(tabKey));
+  queryParams.status =
+    activeTab.value === '' ? undefined : Number.parseInt(String(tabKey));
   getRecordList();
-};
+}
 
 /** 分页变化 */
-const handleTableChange = (pagination: any) => {
+function handleTableChange(pagination: any) {
   queryParams.pageNo = pagination.current;
   queryParams.pageSize = pagination.pageSize;
   getRecordList();
-};
+}
 
 /** 取消升级 */
-const handleCancelUpgrade = async (record: OtaTaskRecord) => {
+async function handleCancelUpgrade(record: OtaTaskRecord) {
   Modal.confirm({
     title: '确认取消',
     content: '确认要取消该设备的升级任务吗？',
@@ -175,10 +192,10 @@ const handleCancelUpgrade = async (record: OtaTaskRecord) => {
       }
     },
   });
-};
+}
 
 /** 打开弹窗 */
-const open = (id: number) => {
+function open(id: number) {
   modalApi.open();
   taskId.value = id;
   activeTab.value = '';
@@ -189,7 +206,7 @@ const open = (id: number) => {
   getTaskInfo();
   getStatistics();
   getRecordList();
-};
+}
 
 /** 暴露方法 */
 defineExpose({ open });
@@ -202,7 +219,9 @@ defineExpose({ open });
       <Card title="任务信息" class="mb-5" :loading="taskLoading">
         <Descriptions :column="3" bordered>
           <Descriptions.Item label="任务编号">{{ task.id }}</Descriptions.Item>
-          <Descriptions.Item label="任务名称">{{ task.name }}</Descriptions.Item>
+          <Descriptions.Item label="任务名称">
+            {{ task.name }}
+          </Descriptions.Item>
           <Descriptions.Item label="升级范围">
             <Tag v-if="task.deviceScope === 1" color="blue">全部设备</Tag>
             <Tag v-else-if="task.deviceScope === 2" color="green">指定设备</Tag>
@@ -216,7 +235,11 @@ defineExpose({ open });
             <Tag v-else>{{ task.status }}</Tag>
           </Descriptions.Item>
           <Descriptions.Item label="创建时间">
-            {{ task.createTime ? formatDate(task.createTime, 'YYYY-MM-DD HH:mm:ss') : '-' }}
+            {{
+              task.createTime
+                ? formatDate(task.createTime, 'YYYY-MM-DD HH:mm:ss')
+                : '-'
+            }}
           </Descriptions.Item>
           <Descriptions.Item label="任务描述" :span="3">
             {{ task.description }}
@@ -228,59 +251,89 @@ defineExpose({ open });
       <Card title="升级设备统计" class="mb-5" :loading="taskStatisticsLoading">
         <Row :gutter="20" class="py-5">
           <Col :span="6">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-blue-500">
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-blue-500">
                 {{
-                  Object.values(taskStatistics).reduce((sum, count) => sum + (count || 0), 0) || 0
+                  Object.values(taskStatistics).reduce(
+                    (sum, count) => sum + (count || 0),
+                    0,
+                  ) || 0
                 }}
               </div>
               <div class="text-sm text-gray-600">升级设备总数</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-gray-400">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-gray-400">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] || 0
+                }}
               </div>
               <div class="text-sm text-gray-600">待推送</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-blue-400">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-blue-400">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0
+                }}
               </div>
               <div class="text-sm text-gray-600">已推送</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-yellow-500">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.UPGRADING.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-yellow-500">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.UPGRADING.value] ||
+                  0
+                }}
               </div>
               <div class="text-sm text-gray-600">正在升级</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-green-500">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-green-500">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] || 0
+                }}
               </div>
               <div class="text-sm text-gray-600">升级成功</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-red-500">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-red-500">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] || 0
+                }}
               </div>
               <div class="text-sm text-gray-600">升级失败</div>
             </div>
           </Col>
           <Col :span="3">
-            <div class="text-center p-5 border border-solid border-gray-200 rounded bg-gray-50">
-              <div class="text-3xl font-bold mb-2 text-gray-400">
-                {{ taskStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] || 0 }}
+            <div
+              class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            >
+              <div class="mb-2 text-3xl font-bold text-gray-400">
+                {{
+                  taskStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] || 0
+                }}
               </div>
               <div class="text-sm text-gray-600">升级取消</div>
             </div>
@@ -290,8 +343,16 @@ defineExpose({ open });
 
       <!-- 设备管理 -->
       <Card title="升级设备记录">
-        <Tabs v-model:activeKey="activeTab" @change="handleTabChange" class="mb-4">
-          <Tabs.TabPane v-for="tab in statusTabs" :key="tab.key" :tab="tab.label" />
+        <Tabs
+          v-model:active-key="activeTab"
+          @change="handleTabChange"
+          class="mb-4"
+        >
+          <Tabs.TabPane
+            v-for="tab in statusTabs"
+            :key="tab.key"
+            :tab="tab.label"
+          />
         </Tabs>
 
         <Table
@@ -313,7 +374,9 @@ defineExpose({ open });
             <template v-if="column.key === 'status'">
               <Tag v-if="record.status === 0" color="default">待推送</Tag>
               <Tag v-else-if="record.status === 1" color="blue">已推送</Tag>
-              <Tag v-else-if="record.status === 2" color="processing">升级中</Tag>
+              <Tag v-else-if="record.status === 2" color="processing">
+                升级中
+              </Tag>
               <Tag v-else-if="record.status === 3" color="success">成功</Tag>
               <Tag v-else-if="record.status === 4" color="error">失败</Tag>
               <Tag v-else-if="record.status === 5" color="warning">已取消</Tag>
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskForm.vue b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskForm.vue
index 468f28b962c72c572d6b3199438f1faaf67e9c2a..0971ac2ef2cf7ab5c0a28b4f84bae0011c3215d2 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskForm.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskForm.vue
@@ -1,12 +1,16 @@
 <script setup lang="ts">
+import type { IotDeviceApi } from '#/api/iot/device/device';
+import type { OtaTask } from '#/api/iot/ota/task';
+
 import { computed, ref } from 'vue';
+
 import { useVbenModal } from '@vben/common-ui';
-import { message, Form, Input, Select, Spin } from 'ant-design-vue';
-import type { OtaTask } from '#/api/iot/ota/task';
+
+import { Form, Input, message, Select, Spin } from 'ant-design-vue';
+
+import * as DeviceApi from '#/api/iot/device/device';
 import * as IoTOtaTaskApi from '#/api/iot/ota/task';
 import { IoTOtaTaskDeviceScopeEnum } from '#/views/iot/utils/constants';
-import type { DeviceVO } from '#/api/iot/device/device';
-import * as DeviceApi from '#/api/iot/device/device';
 
 /** IoT OTA 升级任务表单 */
 defineOptions({ name: 'OtaTaskForm' });
@@ -28,11 +32,32 @@ const formData = ref<OtaTask>({
 });
 const formRef = ref();
 const formRules = {
-  name: [{ required: true, message: '请输入任务名称', trigger: 'blur' as const, type: 'string' as const }],
-  deviceScope: [{ required: true, message: '请选择升级范围', trigger: 'change' as const, type: 'number' as const }],
-  deviceIds: [{ required: true, message: '请至少选择一个设备', trigger: 'change' as const, type: 'array' as const }],
+  name: [
+    {
+      required: true,
+      message: '请输入任务名称',
+      trigger: 'blur' as const,
+      type: 'string' as const,
+    },
+  ],
+  deviceScope: [
+    {
+      required: true,
+      message: '请选择升级范围',
+      trigger: 'change' as const,
+      type: 'number' as const,
+    },
+  ],
+  deviceIds: [
+    {
+      required: true,
+      message: '请至少选择一个设备',
+      trigger: 'change' as const,
+      type: 'array' as const,
+    },
+  ],
 };
-const devices = ref<DeviceVO[]>([]);
+const devices = ref<IotDeviceApi.Device[]>([]);
 
 /** 设备选项 */
 const deviceOptions = computed(() => {
@@ -73,7 +98,8 @@ const [Modal, modalApi] = useVbenModal({
     // 加载设备列表
     formLoading.value = true;
     try {
-      devices.value = (await DeviceApi.getDeviceListByProductId(props.productId)) || [];
+      devices.value =
+        (await DeviceApi.getDeviceListByProductId(props.productId)) || [];
     } finally {
       formLoading.value = false;
     }
@@ -81,7 +107,7 @@ const [Modal, modalApi] = useVbenModal({
 });
 
 /** 重置表单 */
-const resetForm = () => {
+function resetForm() {
   formData.value = {
     name: '',
     deviceScope: IoTOtaTaskDeviceScopeEnum.ALL.value,
@@ -90,12 +116,12 @@ const resetForm = () => {
     deviceIds: [],
   };
   formRef.value?.resetFields();
-};
+}
 
 /** 打开弹窗 */
-const open = async () => {
+async function open() {
   await modalApi.open();
-};
+}
 
 defineExpose({ open });
 </script>
diff --git a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskList.vue b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskList.vue
index 645446c510d23528eb4781d434ff6eb62b283134..130f344fc950d14a586625afe796c64178149396 100644
--- a/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskList.vue
+++ b/apps/web-antd/src/views/iot/ota/modules/task/OtaTaskList.vue
@@ -1,14 +1,29 @@
 <script setup lang="ts">
+import type { TableColumnsType } from 'ant-design-vue';
+
+import type { OtaTask } from '#/api/iot/ota/task';
+
 import { onMounted, reactive, ref } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
 import { formatDate } from '@vben/utils';
-import type { OtaTask } from '#/api/iot/ota/task';
+
+import {
+  Button,
+  Card,
+  Input,
+  message,
+  Modal,
+  Space,
+  Table,
+  Tag,
+} from 'ant-design-vue';
+
 import * as IoTOtaTaskApi from '#/api/iot/ota/task';
 import { IoTOtaTaskStatusEnum } from '#/views/iot/utils/constants';
-import OtaTaskForm from './OtaTaskForm.vue';
+
 import OtaTaskDetail from './OtaTaskDetail.vue';
-import { Card, Input, Table, Space, Modal, message, Tag } from 'ant-design-vue';
-import type { TableColumnsType } from 'ant-design-vue';
-import { VbenButton } from '@vben/common-ui';
+import OtaTaskForm from './OtaTaskForm.vue';
 
 /** IoT OTA 任务列表 */
 defineOptions({ name: 'OtaTaskList' });
@@ -34,7 +49,7 @@ const taskFormRef = ref(); // 任务表单引用
 const taskDetailRef = ref(); // 任务详情引用
 
 /** 获取任务列表 */
-const getTaskList = async () => {
+async function getTaskList() {
   taskLoading.value = true;
   try {
     const data = await IoTOtaTaskApi.getOtaTaskPage(queryParams);
@@ -43,32 +58,32 @@ const getTaskList = async () => {
   } finally {
     taskLoading.value = false;
   }
-};
+}
 
 /** 搜索 */
-const handleQuery = () => {
+function handleQuery() {
   queryParams.pageNo = 1;
   getTaskList();
-};
+}
 
 /** 打开任务表单 */
-const openTaskForm = () => {
+function openTaskForm() {
   taskFormRef.value?.open();
-};
+}
 
 /** 处理任务创建成功 */
-const handleTaskCreateSuccess = () => {
+function handleTaskCreateSuccess() {
   getTaskList();
   emit('success');
-};
+}
 
 /** 查看任务详情 */
-const handleTaskDetail = (id: number) => {
+function handleTaskDetail(id: number) {
   taskDetailRef.value?.open(id);
-};
+}
 
 /** 取消任务 */
-const handleCancelTask = async (id: number) => {
+async function handleCancelTask(id: number) {
   Modal.confirm({
     title: '确认取消',
     content: '确认要取消该升级任务吗？',
@@ -82,20 +97,20 @@ const handleCancelTask = async (id: number) => {
       }
     },
   });
-};
+}
 
 /** 刷新数据 */
-const refresh = async () => {
+async function refresh() {
   await getTaskList();
   emit('success');
-};
+}
 
 /** 分页变化 */
-const handleTableChange = (pagination: any) => {
+function handleTableChange(pagination: any) {
   queryParams.pageNo = pagination.current;
   queryParams.pageSize = pagination.pageSize;
   getTaskList();
-};
+}
 
 /** 表格列配置 */
 const columns: TableColumnsType = [
@@ -160,11 +175,11 @@ onMounted(() => {
 <template>
   <Card title="升级任务管理" class="mb-5">
     <!-- 搜索栏 -->
-    <div class="mb-4 flex justify-between items-center">
-      <VbenButton type="primary" @click="openTaskForm">
-        <Icon icon="ant-design:plus-outlined" class="mr-1" />
+    <div class="mb-4 flex items-center justify-between">
+      <Button type="primary" @click="openTaskForm">
+        <IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
         新增
-      </VbenButton>
+      </Button>
       <Input
         v-model:value="queryParams.name"
         placeholder="请输入任务名称"
diff --git a/apps/web-antd/src/views/iot/plugin/index.vue b/apps/web-antd/src/views/iot/plugin/index.vue
index cfaf8e752d809204cfed3f74f6d350d509180a64..420af66534237bb42a47a684a7a4b891afdbbd61 100644
--- a/apps/web-antd/src/views/iot/plugin/index.vue
+++ b/apps/web-antd/src/views/iot/plugin/index.vue
@@ -1,15 +1,13 @@
 <script lang="ts" setup>
 import { Page } from '@vben/common-ui';
+
 import { Button } from 'ant-design-vue';
 
 defineOptions({ name: 'IotPlugin' });
 </script>
 
 <template>
-  <Page
-    description="物聯網插件管理"
-    title="插件管理"
-  >
+  <Page description="物聯網插件管理" title="插件管理">
     <div class="p-4">
       <Button
         danger
diff --git a/apps/web-antd/src/views/iot/product/category/data.ts b/apps/web-antd/src/views/iot/product/category/data.ts
index 63fefc2183952cc4c907da0f14e5f3da9ca7e9d3..16806ac003b2f0771b3b6309a7d7ded9f5c3ab8d 100644
--- a/apps/web-antd/src/views/iot/product/category/data.ts
+++ b/apps/web-antd/src/views/iot/product/category/data.ts
@@ -1,19 +1,10 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { IotProductCategoryApi } from '#/api/iot/product/category';
 
 import { DICT_TYPE } from '@vben/constants';
-import { handleTree } from '@vben/utils';
-
-import { message } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
-import { 
-  deleteProductCategory, 
-  getProductCategoryPage,
-  getSimpleProductCategoryList 
-} from '#/api/iot/product/category';
-import { $t } from '#/locales';
+import { getSimpleProductCategoryList } from '#/api/iot/product/category';
 
 /** 新增/修改产品分类的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -160,32 +151,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-
-/** 删除分类 */
-export async function handleDeleteCategory(row: IotProductCategoryApi.ProductCategory, onSuccess?: () => void) {
-  const hideLoading = message.loading({
-    content: $t('ui.actionMessage.deleting', [row.name]),
-    duration: 0,
-  });
-  try {
-    await deleteProductCategory(row.id!);
-    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onSuccess?.();
-  } finally {
-    hideLoading();
-  }
-}
-
-/** 查询分类列表 */
-export async function queryProductCategoryList({ page }: any, formValues: any) {
-  const data = await getProductCategoryPage({
-    pageNo: page.currentPage,
-    pageSize: page.pageSize,
-    ...formValues,
-  });
-  // 转换为树形结构
-  return {
-    ...data,
-    list: handleTree(data.list, 'id', 'parentId'),
-  };
-}
diff --git a/apps/web-antd/src/views/iot/product/category/index.vue b/apps/web-antd/src/views/iot/product/category/index.vue
index 740eabc441aacdf0582ce72306ce885b1008e58a..7344bd5de4bedac559b47c4b8d7759b404596b4b 100644
--- a/apps/web-antd/src/views/iot/product/category/index.vue
+++ b/apps/web-antd/src/views/iot/product/category/index.vue
@@ -3,16 +3,18 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { IotProductCategoryApi } from '#/api/iot/product/category';
 
 import { Page, useVbenModal } from '@vben/common-ui';
+import { handleTree } from '@vben/utils';
+
+import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProductCategory,
+  getProductCategoryPage,
+} from '#/api/iot/product/category';
 import { $t } from '#/locales';
 
-import { 
-  handleDeleteCategory, 
-  queryProductCategoryList,
-  useGridColumns, 
-  useGridFormSchema 
-} from './data';
+import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/ProductCategoryForm.vue';
 
 defineOptions({ name: 'IoTProductCategory' });
@@ -39,7 +41,17 @@ function handleEdit(row: IotProductCategoryApi.ProductCategory) {
 
 /** 删除分类 */
 async function handleDelete(row: IotProductCategoryApi.ProductCategory) {
-  await handleDeleteCategory(row, handleRefresh);
+  const hideLoading = message.loading({
+    content: $t('ui.actionMessage.deleting', [row.name]),
+    duration: 0,
+  });
+  try {
+    await deleteProductCategory(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -57,7 +69,18 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     proxyConfig: {
       ajax: {
-        query: queryProductCategoryList,
+        query: async ({ page }, formValues) => {
+          const data = await getProductCategoryPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...formValues,
+          });
+          // 转换为树形结构
+          return {
+            ...data,
+            list: handleTree(data.list, 'id', 'parentId'),
+          };
+        },
       },
     },
     rowConfig: {
@@ -66,7 +89,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     toolbarConfig: {
       refresh: true,
-      search:true,
+      search: true,
     },
     treeConfig: {
       parentField: 'parentId',
@@ -95,7 +118,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
               icon: ACTION_ICON.ADD,
               onClick: handleCreate,
             },
-            
           ]"
         />
       </template>
diff --git a/apps/web-antd/src/views/iot/product/product/data.ts b/apps/web-antd/src/views/iot/product/product/data.ts
index 2e53f5d0fc36c459a0ed368d8246d46a60f05616..68fd51b46e98c868a13e7eb9add4c76e7faf365b 100644
--- a/apps/web-antd/src/views/iot/product/product/data.ts
+++ b/apps/web-antd/src/views/iot/product/product/data.ts
@@ -5,17 +5,10 @@ import { ref } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
-import { downloadFileFromBlobPart } from '@vben/utils';
-
-import { message } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { getSimpleProductCategoryList } from '#/api/iot/product/category';
-import { 
-  deleteProduct, 
-  exportProduct, 
-  getProductPage 
-} from '#/api/iot/product/product';
+import { getProductPage } from '#/api/iot/product/product';
 
 /** 新增/修改产品的表单 */
 export function useFormSchema(): VbenFormSchema[] {
@@ -208,38 +201,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 加载产品分类列表 */
-export async function loadCategoryList() {
-  return await getSimpleProductCategoryList();
-}
-
-/** 获取分类名称 */
-export function getCategoryName(categoryList: any[], categoryId: number) {
-  const category = categoryList.find((c: any) => c.id === categoryId);
-  return category?.name || '未分类';
-}
-
-/** 删除产品 */
-export async function handleDeleteProduct(row: any, onSuccess?: () => void) {
-  const hideLoading = message.loading({
-    content: `正在删除 ${row.name}...`,
-    duration: 0,
-  });
-  try {
-    await deleteProduct(row.id);
-    message.success(`删除 ${row.name} 成功`);
-    onSuccess?.();
-  } finally {
-    hideLoading();
-  }
-}
-
-/** 导出产品 */
-export async function handleExportProduct(searchParams: any) {
-  const data = await exportProduct(searchParams);
-  downloadFileFromBlobPart({ fileName: '产品列表.xls', source: data });
-}
-
 /** 查询产品列表 */
 export async function queryProductList({ page }: any, searchParams: any) {
   return await getProductPage({
diff --git a/apps/web-antd/src/views/iot/product/product/index.vue b/apps/web-antd/src/views/iot/product/product/index.vue
index 15f5ff540962447501548f6bb925a795061a1043..ad056a811810c290a4cc53356d798bd879cfa92c 100644
--- a/apps/web-antd/src/views/iot/product/product/index.vue
+++ b/apps/web-antd/src/views/iot/product/product/index.vue
@@ -4,31 +4,31 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { Button, Card, Image, Input, Space } from 'ant-design-vue';
 import { Page, useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
+import { downloadFileFromBlobPart } from '@vben/utils';
+
+import { Button, Card, Image, Input, message, Space } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+import {
+  deleteProduct,
+  exportProduct,
+  getProductPage,
+} from '#/api/crm/product';
+import { getSimpleProductCategoryList } from '#/api/iot/product/category';
 import { $t } from '#/locales';
 
-import ProductForm from './modules/ProductForm.vue';
+import { useGridColumns, useImagePreview } from './data';
 // @ts-ignore
 import ProductCardView from './modules/ProductCardView.vue';
-import { 
-  getCategoryName,
-  handleDeleteProduct,
-  handleExportProduct,
-  loadCategoryList,
-  queryProductList,
-  useGridColumns,
-  useImagePreview,
-} from './data';
+import ProductForm from './modules/ProductForm.vue';
 
 defineOptions({ name: 'IoTProduct' });
 
 const router = useRouter();
 const categoryList = ref<any[]>([]);
-const viewMode = ref<'list' | 'card'>('card');
+const viewMode = ref<'card' | 'list'>('card');
 const cardViewRef = ref();
 
 // 搜索参数
@@ -46,14 +46,15 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 // 加载产品分类列表
-const loadCategories = async () => {
-  categoryList.value = await loadCategoryList();
-};
+async function loadCategories() {
+  categoryList.value = await getSimpleProductCategoryList();
+}
 
 // 获取分类名称
-const getCategoryNameByValue = (categoryId: number) => {
-  return getCategoryName(categoryList.value, categoryId);
-};
+function getCategoryNameByValue(categoryId: number) {
+  const category = categoryList.value.find((c: any) => c.id === categoryId);
+  return category?.name || '未分类';
+}
 
 /** 搜索 */
 function handleSearch() {
@@ -83,7 +84,8 @@ function handleRefresh() {
 
 /** 导出表格 */
 async function handleExport() {
-  await handleExportProduct(searchParams.value);
+  const data = await exportProduct(searchParams.value);
+  await downloadFileFromBlobPart({ fileName: '产品列表.xls', source: data });
 }
 
 /** 打开产品详情 */
@@ -115,7 +117,17 @@ function handleEdit(row: any) {
 
 /** 删除产品 */
 async function handleDelete(row: any) {
-  await handleDeleteProduct(row, handleRefresh);
+  const hideLoading = message.loading({
+    content: `正在删除 ${row.name}...`,
+    duration: 0,
+  });
+  try {
+    await deleteProduct(row.id);
+    message.success(`删除 ${row.name} 成功`);
+    handleRefresh();
+  } finally {
+    hideLoading();
+  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -128,7 +140,13 @@ const [Grid, gridApi] = useVbenVxeGrid({
     keepSource: true,
     proxyConfig: {
       ajax: {
-        query: ({ page }) => queryProductList({ page }, searchParams.value),
+        query: async ({ page }) => {
+          return await getProductPage({
+            pageNo: page.currentPage,
+            pageSize: page.pageSize,
+            ...searchParams.value,
+          });
+        },
       },
     },
     rowConfig: {
@@ -150,17 +168,17 @@ onMounted(() => {
 <template>
   <Page auto-content-height>
     <FormModal @success="handleRefresh" />
-    
+
     <!-- 统一搜索工具栏 -->
     <Card :body-style="{ padding: '16px' }" class="mb-4">
       <!-- 搜索表单 -->
-      <div class="flex items-center gap-3 mb-3">
+      <div class="mb-3 flex items-center gap-3">
         <Input
           v-model:value="searchParams.name"
           placeholder="请输入产品名称"
           allow-clear
           style="width: 200px"
-          @pressEnter="handleSearch"
+          @press-enter="handleSearch"
         >
           <template #prefix>
             <span class="text-gray-400">产品名称</span>
@@ -171,7 +189,7 @@ onMounted(() => {
           placeholder="请输入产品标识"
           allow-clear
           style="width: 200px"
-          @pressEnter="handleSearch"
+          @press-enter="handleSearch"
         >
           <template #prefix>
             <span class="text-gray-400">ProductKey</span>
@@ -199,7 +217,7 @@ onMounted(() => {
             导出
           </Button>
         </Space>
-        
+
         <!-- 视图切换 -->
         <Space :size="4">
           <Button
@@ -335,6 +353,6 @@ onMounted(() => {
 }
 
 .ant-image-preview-operations {
-  background: rgba(0, 0, 0, 0.7) !important;
+  background: rgb(0 0 0 / 70%) !important;
 }
 </style>
diff --git a/apps/web-antd/src/views/iot/product/product/modules/ProductCardView.vue b/apps/web-antd/src/views/iot/product/product/modules/ProductCardView.vue
index eec04b2d84dfa3a2f62f1c7bbaa1322d2df8d6bf..124428fb94b3ebb4686489e9b1522235e3c8d143 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/ProductCardView.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/ProductCardView.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import { onMounted, ref } from 'vue';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictLabel } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
+
 import {
   Button,
   Card,
@@ -12,32 +16,29 @@ import {
   Tag,
   Tooltip,
 } from 'ant-design-vue';
-import { DICT_TYPE } from '@vben/constants';
-import { getDictLabel } from '@vben/hooks';
-import { IconifyIcon } from '@vben/icons';
 
 import { getProductPage } from '#/api/iot/product/product';
 
 defineOptions({ name: 'ProductCardView' });
 
-interface Props {
-  categoryList: any[];
-  searchParams?: {
-    name: string;
-    productKey: string;
-  };
-}
-
 const props = defineProps<Props>();
 
 const emit = defineEmits<{
   create: [];
-  edit: [row: any];
   delete: [row: any];
   detail: [productId: number];
+  edit: [row: any];
   thingModel: [productId: number];
 }>();
 
+interface Props {
+  categoryList: any[];
+  searchParams?: {
+    name: string;
+    productKey: string;
+  };
+}
+
 const loading = ref(false);
 const list = ref<any[]>([]);
 const total = ref(0);
@@ -47,13 +48,13 @@ const queryParams = ref({
 });
 
 // 获取分类名称
-const getCategoryName = (categoryId: number) => {
+function getCategoryName(categoryId: number) {
   const category = props.categoryList.find((c: any) => c.id === categoryId);
   return category?.name || '未分类';
-};
+}
 
 // 获取产品列表
-const getList = async () => {
+async function getList() {
   loading.value = true;
   try {
     const data = await getProductPage({
@@ -65,30 +66,30 @@ const getList = async () => {
   } finally {
     loading.value = false;
   }
-};
+}
 
 // 处理页码变化
-const handlePageChange = (page: number, pageSize: number) => {
+function handlePageChange(page: number, pageSize: number) {
   queryParams.value.pageNo = page;
   queryParams.value.pageSize = pageSize;
   getList();
-};
+}
 
 // 获取设备类型颜色
-const getDeviceTypeColor = (deviceType: number) => {
+function getDeviceTypeColor(deviceType: number) {
   const colors: Record<number, string> = {
     0: 'blue',
     1: 'green',
   };
   return colors[deviceType] || 'default';
-};
+}
 
 onMounted(() => {
   getList();
 });
 
 // 暴露方法供父组件调用
-defineExpose({ 
+defineExpose({
   reload: getList,
   search: () => {
     queryParams.value.pageNo = 1;
@@ -111,42 +112,57 @@ defineExpose({
           :lg="6"
           class="mb-4"
         >
-          <Card
-            :body-style="{ padding: '20px' }"
-            class="product-card h-full"
-          >
+          <Card :body-style="{ padding: '20px' }" class="product-card h-full">
             <!-- 顶部标题区域 -->
-            <div class="flex items-start mb-4">
+            <div class="mb-4 flex items-start">
               <div class="product-icon">
-                <IconifyIcon icon="ant-design:inbox-outlined" class="text-[32px]" />
+                <IconifyIcon
+                  icon="ant-design:inbox-outlined"
+                  class="text-[32px]"
+                />
               </div>
-              <div class="ml-3 flex-1 min-w-0">
+              <div class="ml-3 min-w-0 flex-1">
                 <div class="product-title">{{ item.name }}</div>
               </div>
             </div>
 
             <!-- 内容区域 -->
-            <div class="flex items-start mb-4">
-              <div class="flex-1 info-list">
+            <div class="mb-4 flex items-start">
+              <div class="info-list flex-1">
                 <div class="info-item">
                   <span class="info-label">产品分类</span>
-                  <span class="info-value text-primary">{{ getCategoryName(item.categoryId) }}</span>
+                  <span class="info-value text-primary">
+                    {{ getCategoryName(item.categoryId) }}
+                  </span>
                 </div>
                 <div class="info-item">
                   <span class="info-label">产品类型</span>
-                  <Tag :color="getDeviceTypeColor(item.deviceType)" class="m-0 info-tag">
-                    {{ getDictLabel(DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE, item.deviceType) }}
+                  <Tag
+                    :color="getDeviceTypeColor(item.deviceType)"
+                    class="info-tag m-0"
+                  >
+                    {{
+                      getDictLabel(
+                        DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE,
+                        item.deviceType,
+                      )
+                    }}
                   </Tag>
                 </div>
                 <div class="info-item">
                   <span class="info-label">产品标识</span>
                   <Tooltip :title="item.productKey || item.id" placement="top">
-                    <span class="info-value product-key">{{ item.productKey || item.id }}</span>
+                    <span class="info-value product-key">
+                      {{ item.productKey || item.id }}
+                    </span>
                   </Tooltip>
                 </div>
               </div>
               <div class="product-3d-icon">
-                <IconifyIcon icon="ant-design:box-plot-outlined" class="text-[80px]" />
+                <IconifyIcon
+                  icon="ant-design:box-plot-outlined"
+                  class="text-[80px]"
+                />
               </div>
             </div>
 
@@ -173,7 +189,10 @@ defineExpose({
                 class="action-btn action-btn-model"
                 @click="emit('thingModel', item.id)"
               >
-                <IconifyIcon icon="ant-design:apartment-outlined" class="mr-1" />
+                <IconifyIcon
+                  icon="ant-design:apartment-outlined"
+                  class="mr-1"
+                />
                 物模型
               </Button>
               <Popconfirm
@@ -217,44 +236,44 @@ defineExpose({
 .product-card-view {
   .product-card {
     height: 100%;
-    transition: all 0.3s ease;
+    overflow: hidden;
     border: 1px solid #e8e8e8;
     border-radius: 8px;
-    overflow: hidden;
+    transition: all 0.3s ease;
 
     &:hover {
-      box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
       border-color: #d9d9d9;
+      box-shadow: 0 4px 16px rgb(0 0 0 / 8%);
       transform: translateY(-2px);
     }
 
     :deep(.ant-card-body) {
-      height: 100%;
       display: flex;
       flex-direction: column;
+      height: 100%;
     }
 
     // 产品图标
     .product-icon {
-      width: 48px;
-      height: 48px;
       display: flex;
+      flex-shrink: 0;
       align-items: center;
       justify-content: center;
+      width: 48px;
+      height: 48px;
+      color: white;
       background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
       border-radius: 8px;
-      color: white;
-      flex-shrink: 0;
     }
 
     // 产品标题
     .product-title {
+      overflow: hidden;
+      text-overflow: ellipsis;
       font-size: 16px;
       font-weight: 600;
-      color: #1f2937;
       line-height: 1.5;
-      overflow: hidden;
-      text-overflow: ellipsis;
+      color: #1f2937;
       white-space: nowrap;
     }
 
@@ -271,16 +290,16 @@ defineExpose({
         }
 
         .info-label {
-          color: #6b7280;
-          margin-right: 8px;
           flex-shrink: 0;
+          margin-right: 8px;
+          color: #6b7280;
         }
 
         .info-value {
-          color: #1f2937;
-          font-weight: 500;
           overflow: hidden;
           text-overflow: ellipsis;
+          font-weight: 500;
+          color: #1f2937;
           white-space: nowrap;
 
           &.text-primary {
@@ -289,15 +308,15 @@ defineExpose({
         }
 
         .product-key {
-          font-family: 'Courier New', monospace;
-          font-size: 12px;
-          color: #374151;
           display: inline-block;
           max-width: 150px;
           overflow: hidden;
           text-overflow: ellipsis;
-          white-space: nowrap;
+          font-family: 'Courier New', monospace;
+          font-size: 12px;
           vertical-align: middle;
+          color: #374151;
+          white-space: nowrap;
           cursor: help;
         }
 
@@ -309,15 +328,15 @@ defineExpose({
 
     // 3D 图标
     .product-3d-icon {
-      width: 100px;
-      height: 100px;
       display: flex;
+      flex-shrink: 0;
       align-items: center;
       justify-content: center;
+      width: 100px;
+      height: 100px;
+      color: #667eea;
       background: linear-gradient(135deg, #667eea15 0%, #764ba215 100%);
       border-radius: 8px;
-      flex-shrink: 0;
-      color: #667eea;
     }
 
     // 按钮组
@@ -325,8 +344,8 @@ defineExpose({
       display: flex;
       gap: 8px;
       padding-top: 12px;
-      border-top: 1px solid #f0f0f0;
       margin-top: auto;
+      border-top: 1px solid #f0f0f0;
 
       .action-btn {
         flex: 1;
@@ -340,8 +359,8 @@ defineExpose({
           border-color: #1890ff;
 
           &:hover {
-            background: #1890ff;
             color: white;
+            background: #1890ff;
           }
         }
 
@@ -350,8 +369,8 @@ defineExpose({
           border-color: #52c41a;
 
           &:hover {
-            background: #52c41a;
             color: white;
+            background: #52c41a;
           }
         }
 
@@ -360,8 +379,8 @@ defineExpose({
           border-color: #722ed1;
 
           &:hover {
-            background: #722ed1;
             color: white;
+            background: #722ed1;
           }
         }
 
@@ -374,4 +393,3 @@ defineExpose({
   }
 }
 </style>
-
diff --git a/apps/web-antd/src/views/iot/product/product/modules/ProductForm.vue b/apps/web-antd/src/views/iot/product/product/modules/ProductForm.vue
index b792f2246106117c7b879a7b085a2dbc9e7d8714..e21d6f85c016177afdacf9992ab1bb9923f42fce 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/ProductForm.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/ProductForm.vue
@@ -1,10 +1,17 @@
 <script setup lang="ts">
+import type { IotProductApi } from '#/api/iot/product/product';
+
 import { computed, ref } from 'vue';
 
-import { message } from 'ant-design-vue';
 import { useVbenForm, useVbenModal } from '@vben/common-ui';
 
-import { createProduct, getProduct, updateProduct, type IotProductApi } from '#/api/iot/product/product';
+import { message } from 'ant-design-vue';
+
+import {
+  createProduct,
+  getProduct,
+  updateProduct,
+} from '#/api/iot/product/product';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
diff --git a/apps/web-antd/src/views/iot/product/product/modules/components/ProductTableSelect.vue b/apps/web-antd/src/views/iot/product/product/modules/components/ProductTableSelect.vue
index fa577bdf17add5e64a806056aba6f40fdfd1c17c..8e95973b3e16db8d6755f65eaf8c6c358ef4d2ab 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/components/ProductTableSelect.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/components/ProductTableSelect.vue
@@ -1,20 +1,19 @@
 <!-- IoT 产品选择器，使用弹窗展示 -->
 <script setup lang="ts">
+import type { IotProductApi } from '#/api/iot/product/product';
+
 import { reactive, ref } from 'vue';
 
-import { message } from 'ant-design-vue';
 import { useVbenModal } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { Button, Form, Input, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProductPage } from '#/api/iot/product/product';
-import type { IotProductApi } from '#/api/iot/product/product';
 
 defineOptions({ name: 'IoTProductTableSelect' });
 
-interface Props {
-  multiple?: boolean;
-}
-
 const props = withDefaults(defineProps<Props>(), {
   multiple: false,
 });
@@ -23,6 +22,10 @@ const emit = defineEmits<{
   success: [product: IotProductApi.Product | IotProductApi.Product[]];
 }>();
 
+interface Props {
+  multiple?: boolean;
+}
+
 const [Modal, modalApi] = useVbenModal({
   title: '产品选择器',
   onConfirm: handleConfirm,
@@ -99,24 +102,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
 });
 
 // 打开选择器
-const open = async () => {
+async function open() {
   selectedProducts.value = [];
   selectedRowKeys.value = [];
   modalApi.open();
   gridApi.reload();
-};
+}
 
 // 搜索
-const handleSearch = () => {
+function handleSearch() {
   gridApi.reload();
-};
+}
 
 // 重置搜索
-const handleReset = () => {
+function handleReset() {
   queryParams.name = '';
   queryParams.productKey = '';
   gridApi.reload();
-};
+}
 
 // 确认选择
 async function handleConfirm() {
@@ -149,40 +152,40 @@ defineExpose({ open });
 <template>
   <Modal class="!w-[900px]">
     <div class="mb-4">
-      <a-form layout="inline" :model="queryParams">
-        <a-form-item label="产品名称">
-          <a-input
+      <Form layout="inline" :model="queryParams">
+        <Form.Item label="产品名称">
+          <Input
             v-model:value="queryParams.name"
             placeholder="请输入产品名称"
             allow-clear
             class="!w-[200px]"
             @press-enter="handleSearch"
           />
-        </a-form-item>
-        <a-form-item label="ProductKey">
-          <a-input
+        </Form.Item>
+        <Form.Item label="ProductKey">
+          <Input
             v-model:value="queryParams.productKey"
             placeholder="请输入产品标识"
             allow-clear
             class="!w-[200px]"
             @press-enter="handleSearch"
           />
-        </a-form-item>
-        <a-form-item>
-          <a-button type="primary" @click="handleSearch">
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" @click="handleSearch">
             <template #icon>
-              <Icon icon="ant-design:search-outlined" />
+              <IconifyIcon icon="ant-design:search-outlined" />
             </template>
             搜索
-          </a-button>
-          <a-button class="ml-2" @click="handleReset">
+          </Button>
+          <Button class="ml-2" @click="handleReset">
             <template #icon>
-              <Icon icon="ant-design:reload-outlined" />
+              <IconifyIcon icon="ant-design:reload-outlined" />
             </template>
             重置
-          </a-button>
-        </a-form-item>
-      </a-form>
+          </Button>
+        </Form.Item>
+      </Form>
     </div>
 
     <Grid />
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsHeader.vue b/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsHeader.vue
index 52a56229ac539de5b214d0e3ad46d21c679e88ca..afe5844657c9b86f666afd2bcb9a44db47f6a271 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsHeader.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsHeader.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
+import type { IotProductApi } from '#/api/iot/product/product';
+
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { message } from 'ant-design-vue';
+import { Button, Card, Descriptions, message } from 'ant-design-vue';
 
 import { updateProductStatus } from '#/api/iot/product/product';
-import type { IotProductApi } from '#/api/iot/product/product';
 
 import ProductForm from '../ProductForm.vue';
 
@@ -26,27 +27,30 @@ const router = useRouter();
 const formRef = ref();
 
 /** 复制到剪贴板 */
-const copyToClipboard = async (text: string) => {
+async function copyToClipboard(text: string) {
   try {
     await navigator.clipboard.writeText(text);
     message.success('复制成功');
   } catch {
     message.error('复制失败');
   }
-};
+}
 
 /** 跳转到设备管理 */
-const goToDeviceList = (productId: number) => {
-  router.push({ path: '/iot/device/device', query: { productId: String(productId) } });
-};
+function goToDeviceList(productId: number) {
+  router.push({
+    path: '/iot/device/device',
+    query: { productId: String(productId) },
+  });
+}
 
 /** 打开编辑表单 */
-const openForm = (type: string, id?: number) => {
+function openForm(type: string, id?: number) {
   formRef.value?.open(type, id);
-};
+}
 
 /** 发布产品 */
-const confirmPublish = async (id: number) => {
+async function confirmPublish(id: number) {
   try {
     await updateProductStatus(id, 1);
     message.success('发布成功');
@@ -54,10 +58,10 @@ const confirmPublish = async (id: number) => {
   } catch {
     message.error('发布失败');
   }
-};
+}
 
 /** 撤销发布 */
-const confirmUnpublish = async (id: number) => {
+async function confirmUnpublish(id: number) {
   try {
     await updateProductStatus(id, 0);
     message.success('撤销发布成功');
@@ -65,7 +69,7 @@ const confirmUnpublish = async (id: number) => {
   } catch {
     message.error('撤销发布失败');
   }
-};
+}
 </script>
 
 <template>
@@ -75,45 +79,51 @@ const confirmUnpublish = async (id: number) => {
         <h2 class="text-xl font-bold">{{ product.name }}</h2>
       </div>
       <div class="space-x-2">
-        <a-button
+        <Button
           :disabled="product.status === 1"
           @click="openForm('update', product.id)"
         >
           编辑
-        </a-button>
-        <a-button
+        </Button>
+        <Button
           v-if="product.status === 0"
           type="primary"
           @click="confirmPublish(product.id!)"
         >
           发布
-        </a-button>
-        <a-button
+        </Button>
+        <Button
           v-if="product.status === 1"
           danger
           @click="confirmUnpublish(product.id!)"
         >
           撤销发布
-        </a-button>
+        </Button>
       </div>
     </div>
 
-    <a-card class="mt-4">
-      <a-descriptions :column="1">
-        <a-descriptions-item label="ProductKey">
+    <Card class="mt-4">
+      <Descriptions :column="1">
+        <Descriptions.Item label="ProductKey">
           {{ product.productKey }}
-          <a-button size="small" class="ml-2" @click="copyToClipboard(product.productKey || '')">
+          <Button
+            size="small"
+            class="ml-2"
+            @click="copyToClipboard(product.productKey || '')"
+          >
             复制
-          </a-button>
-        </a-descriptions-item>
-        <a-descriptions-item label="设备总数">
-          <span class="ml-5 mr-2">{{ product.deviceCount ?? '加载中...' }}</span>
-          <a-button size="small" @click="goToDeviceList(product.id!)">
+          </Button>
+        </Descriptions.Item>
+        <Descriptions.Item label="设备总数">
+          <span class="ml-5 mr-2">
+            {{ product.deviceCount ?? '加载中...' }}
+          </span>
+          <Button size="small" @click="goToDeviceList(product.id!)">
             前往管理
-          </a-button>
-        </a-descriptions-item>
-      </a-descriptions>
-    </a-card>
+          </Button>
+        </Descriptions.Item>
+      </Descriptions>
+    </Card>
 
     <!-- 表单弹窗 -->
     <ProductForm ref="formRef" @success="emit('refresh')" />
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsInfo.vue b/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsInfo.vue
index 82145bdc7b0c3219a7a3b1d5a702d33677b3ecaa..711c258ab899b882b8587354764bc92344b13e88 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsInfo.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/detail/ProductDetailsInfo.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
+import type { IotProductApi } from '#/api/iot/product/product';
+
 import { DICT_TYPE } from '@vben/constants';
 
-import { DictTag } from '#/components/dict-tag';
-import type { IotProductApi } from '#/api/iot/product/product';
+import { Card, Descriptions } from 'ant-design-vue';
+
 import { DeviceTypeEnum } from '#/api/iot/product/product';
+import { DictTag } from '#/components/dict-tag';
 
 interface Props {
   product: IotProductApi.Product;
@@ -19,38 +22,45 @@ const formatDate = (date?: Date | string) => {
 </script>
 
 <template>
-  <a-card title="产品信息">
-    <a-descriptions bordered :column="3">
-      <a-descriptions-item label="产品名称">
+  <Card title="产品信息">
+    <Descriptions bordered :column="3">
+      <Descriptions.Item label="产品名称">
         {{ product.name }}
-      </a-descriptions-item>
-      <a-descriptions-item label="所属分类">
+      </Descriptions.Item>
+      <Descriptions.Item label="所属分类">
         {{ product.categoryName || '-' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="设备类型">
-        <DictTag :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE" :value="product.deviceType" />
-      </a-descriptions-item>
-      <a-descriptions-item label="定位类型">
+      </Descriptions.Item>
+      <Descriptions.Item label="设备类型">
+        <DictTag
+          :type="DICT_TYPE.IOT_PRODUCT_DEVICE_TYPE"
+          :value="product.deviceType"
+        />
+      </Descriptions.Item>
+      <Descriptions.Item label="定位类型">
         {{ product.locationType ?? '-' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="创建时间">
+      </Descriptions.Item>
+      <Descriptions.Item label="创建时间">
         {{ formatDate(product.createTime) }}
-      </a-descriptions-item>
-      <a-descriptions-item label="数据格式">
+      </Descriptions.Item>
+      <Descriptions.Item label="数据格式">
         {{ product.codecType || '-' }}
-      </a-descriptions-item>
-      <a-descriptions-item label="产品状态">
+      </Descriptions.Item>
+      <Descriptions.Item label="产品状态">
         <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="product.status" />
-      </a-descriptions-item>
-      <a-descriptions-item
-        v-if="[DeviceTypeEnum.DEVICE, DeviceTypeEnum.GATEWAY].includes(product.deviceType!)"
+      </Descriptions.Item>
+      <Descriptions.Item
+        v-if="
+          [DeviceTypeEnum.DEVICE, DeviceTypeEnum.GATEWAY].includes(
+            product.deviceType!,
+          )
+        "
         label="联网方式"
       >
         <DictTag :type="DICT_TYPE.IOT_NET_TYPE" :value="product.netType" />
-      </a-descriptions-item>
-      <a-descriptions-item label="产品描述" :span="3">
+      </Descriptions.Item>
+      <Descriptions.Item label="产品描述" :span="3">
         {{ product.description || '-' }}
-      </a-descriptions-item>
-    </a-descriptions>
-  </a-card>
+      </Descriptions.Item>
+    </Descriptions>
+  </Card>
 </template>
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue b/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue
index 4bcf877f2e02927a23a3ac7ae0c7241c554f479f..36d24887fdf6fc9757c8c1907ad046d137d8f9be 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue
@@ -1,17 +1,19 @@
 <script setup lang="ts">
+import type { IotProductApi } from '#/api/iot/product/product';
+
 import { onMounted, provide, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
-import { message } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
 
-import { getProduct } from '#/api/iot/product/product';
-import type { IotProductApi } from '#/api/iot/product/product';
+import { message, Tabs } from 'ant-design-vue';
+
 import { getDeviceCount } from '#/api/iot/device/device';
+import { getProduct } from '#/api/iot/product/product';
+import IoTProductThingModel from '#/views/iot/thingmodel/index.vue';
 
 import ProductDetailsHeader from './ProductDetailsHeader.vue';
 import ProductDetailsInfo from './ProductDetailsInfo.vue';
-import IoTProductThingModel from '#/views/iot/thingmodel/index.vue';
 
 defineOptions({ name: 'IoTProductDetail' });
 
@@ -27,7 +29,7 @@ const activeTab = ref('info');
 provide('product', product);
 
 /** 获取产品详情 */
-const getProductData = async (productId: number) => {
+async function getProductData(productId: number) {
   loading.value = true;
   try {
     product.value = await getProduct(productId);
@@ -36,17 +38,22 @@ const getProductData = async (productId: number) => {
   } finally {
     loading.value = false;
   }
-};
+}
 
 /** 查询设备数量 */
-const getDeviceCountData = async (productId: number) => {
+async function getDeviceCountData(productId: number) {
   try {
     return await getDeviceCount(productId);
   } catch (error) {
-    console.error('Error fetching device count:', error, 'productId:', productId);
+    console.error(
+      'Error fetching device count:',
+      error,
+      'productId:',
+      productId,
+    );
     return 0;
   }
-};
+}
 
 /** 初始化 */
 onMounted(async () => {
@@ -55,15 +62,15 @@ onMounted(async () => {
     router.back();
     return;
   }
-  
+
   await getProductData(id);
-  
+
   // 处理 tab 参数
   const { tab } = route.query;
   if (tab) {
     activeTab.value = tab as string;
   }
-  
+
   // 查询设备数量
   if (product.value.id) {
     product.value.deviceCount = await getDeviceCountData(product.value.id);
@@ -79,13 +86,16 @@ onMounted(async () => {
       @refresh="() => getProductData(id)"
     />
 
-    <a-tabs v-model:active-key="activeTab" class="mt-4">
-      <a-tab-pane key="info" tab="产品信息">
+    <Tabs v-model:active-key="activeTab" class="mt-4">
+      <Tabs.TabPane key="info" tab="产品信息">
         <ProductDetailsInfo v-if="activeTab === 'info'" :product="product" />
-      </a-tab-pane>
-      <a-tab-pane key="thingModel" tab="物模型（功能定义）">
-        <IoTProductThingModel v-if="activeTab === 'thingModel'" :product-id="id" />
-      </a-tab-pane>
-    </a-tabs>
+      </Tabs.TabPane>
+      <Tabs.TabPane key="thingModel" tab="物模型（功能定义）">
+        <IoTProductThingModel
+          v-if="activeTab === 'thingModel'"
+          :product-id="id"
+        />
+      </Tabs.TabPane>
+    </Tabs>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/iot/rule/data/rule/DataRuleForm.vue b/apps/web-antd/src/views/iot/rule/data/rule/DataRuleForm.vue
index 4c5c73a556db9bc443ac59eecba96e09825777b8..b2fcda7a2bdcda09855614f2b44a7035c51beeec 100644
--- a/apps/web-antd/src/views/iot/rule/data/rule/DataRuleForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/rule/DataRuleForm.vue
@@ -14,8 +14,8 @@ import {
 import { getDataSinkSimpleList } from '#/api/iot/rule/data/sink';
 import { $t } from '#/locales';
 
-import { useRuleFormSchema } from './data';
 import SourceConfigForm from './components/SourceConfigForm.vue';
+import { useRuleFormSchema } from './data';
 
 const emit = defineEmits(['success']);
 const formData = ref<any>();
@@ -49,7 +49,7 @@ const [Modal, modalApi] = useVbenModal({
 
     // 校验数据源配置
     await sourceConfigRef.value?.validate();
-    
+
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as any;
@@ -73,7 +73,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data = modalApi.getData<any>();
-    
+
     // 加载数据目的列表
     const sinkList = await getDataSinkSimpleList();
     formApi.updateSchema([
@@ -110,7 +110,7 @@ const [Modal, modalApi] = useVbenModal({
   <Modal class="w-4/5" :title="getTitle">
     <Form class="mx-4" />
     <div class="mx-4 mt-4">
-      <div class="text-sm font-medium mb-2">数据源配置</div>
+      <div class="mb-2 text-sm font-medium">数据源配置</div>
       <SourceConfigForm ref="sourceConfigRef" />
     </div>
   </Modal>
diff --git a/apps/web-antd/src/views/iot/rule/data/rule/components/SourceConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/rule/components/SourceConfigForm.vue
index da818fd0434726e8914c5865cbd69a05d33050a7..9ad95d0486505c85e8250fdd81a8f6ab52ee8046 100644
--- a/apps/web-antd/src/views/iot/rule/data/rule/components/SourceConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/rule/components/SourceConfigForm.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
 import { computed, onMounted, reactive, ref } from 'vue';
 
-import { Table, Select, Button, Form, FormItem } from 'ant-design-vue';
+import { IconifyIcon } from '@vben/icons';
+
+import { Button, Form, Select, Table } from 'ant-design-vue';
 
-import { getSimpleProductList } from '#/api/iot/product/product';
 import { getSimpleDeviceList } from '#/api/iot/device/device';
+import { getSimpleProductList } from '#/api/iot/product/product';
 import { getThingModelListByProductId } from '#/api/iot/thingmodel';
 import {
   IotDeviceMessageMethodEnum,
@@ -25,25 +27,29 @@ const formRef = ref(); // 表单 Ref
 
 // 获取上行消息方法列表
 const upstreamMethods = computed(() => {
-  return Object.values(IotDeviceMessageMethodEnum).filter((item) => item.upstream);
+  return Object.values(IotDeviceMessageMethodEnum).filter(
+    (item) => item.upstream,
+  );
 });
 
 /** 根据产品 ID 过滤设备 */
-const getFilteredDevices = (productId: number) => {
+function getFilteredDevices(productId: number) {
   if (!productId) return [];
-  return deviceList.value.filter((device: any) => device.productId === productId);
-};
+  return deviceList.value.filter(
+    (device: any) => device.productId === productId,
+  );
+}
 
 /** 判断是否需要显示标识符选择器 */
-const shouldShowIdentifierSelect = (row: any) => {
+function shouldShowIdentifierSelect(row: any) {
   return [
     IotDeviceMessageMethodEnum.EVENT_POST.method,
     IotDeviceMessageMethodEnum.PROPERTY_POST.method,
   ].includes(row.method);
-};
+}
 
 /** 获取物模型选项 */
-const getThingModelOptions = (row: any) => {
+function getThingModelOptions(row: any) {
   if (!row.productId || !shouldShowIdentifierSelect(row)) {
     return [];
   }
@@ -62,28 +68,28 @@ const getThingModelOptions = (row: any) => {
     label: `${item.name} (${item.identifier})`,
     value: item.identifier,
   }));
-};
+}
 
 /** 加载产品列表 */
-const loadProductList = async () => {
+async function loadProductList() {
   try {
     productList.value = await getSimpleProductList();
   } catch (error) {
     console.error('加载产品列表失败:', error);
   }
-};
+}
 
 /** 加载设备列表 */
-const loadDeviceList = async () => {
+async function loadDeviceList() {
   try {
     deviceList.value = await getSimpleDeviceList();
   } catch (error) {
     console.error('加载设备列表失败:', error);
   }
-};
+}
 
 /** 加载物模型数据 */
-const loadThingModel = async (productId: number) => {
+async function loadThingModel(productId: number) {
   // 已缓存，无需重复加载
   if (thingModelCache.value.has(productId)) {
     return;
@@ -94,18 +100,18 @@ const loadThingModel = async (productId: number) => {
   } catch (error) {
     console.error('加载物模型失败:', error);
   }
-};
+}
 
 /** 产品变化时处理 */
-const handleProductChange = async (row: any, _index: number) => {
+async function handleProductChange(row: any, _index: number) {
   row.deviceId = 0;
   row.method = undefined;
   row.identifier = undefined;
   row.identifierLoading = false;
-};
+}
 
 /** 消息方法变化时处理 */
-const handleMethodChange = async (row: any, _index: number) => {
+async function handleMethodChange(row: any, _index: number) {
   // 清空标识符
   row.identifier = undefined;
   // 如果需要加载物模型数据
@@ -114,10 +120,10 @@ const handleMethodChange = async (row: any, _index: number) => {
     await loadThingModel(row.productId);
     row.identifierLoading = false;
   }
-};
+}
 
 /** 新增按钮操作 */
-const handleAdd = () => {
+function handleAdd() {
   const row = {
     productId: undefined,
     deviceId: undefined,
@@ -126,25 +132,25 @@ const handleAdd = () => {
     identifierLoading: false,
   };
   formData.value.push(row);
-};
+}
 
 /** 删除按钮操作 */
-const handleDelete = (index: number) => {
+function handleDelete(index: number) {
   formData.value.splice(index, 1);
-};
+}
 
 /** 表单校验 */
-const validate = () => {
+function validate() {
   return formRef.value.validate();
-};
+}
 
 /** 表单值 */
-const getData = () => {
+function getData() {
   return formData.value;
-};
+}
 
 /** 设置表单值 */
-const setData = (data: any[]) => {
+function setData(data: any[]) {
   // 确保每个项都有必要的字段
   formData.value = (data || []).map((item) => ({
     ...item,
@@ -156,7 +162,7 @@ const setData = (data: any[]) => {
       await loadThingModel(item.productId);
     }
   });
-};
+}
 
 /** 初始化 */
 onMounted(async () => {
@@ -205,7 +211,7 @@ defineExpose({ validate, getData, setData });
     >
       <template #bodyCell="{ column, record, index }">
         <template v-if="column.dataIndex === 'productId'">
-          <FormItem
+          <Form.Item
             :name="['data', index, 'productId']"
             :rules="formRules.productId"
             class="mb-0"
@@ -223,10 +229,10 @@ defineExpose({ validate, getData, setData });
               "
               @change="() => handleProductChange(record, index)"
             />
-          </FormItem>
+          </Form.Item>
         </template>
         <template v-else-if="column.dataIndex === 'deviceId'">
-          <FormItem
+          <Form.Item
             :name="['data', index, 'deviceId']"
             :rules="formRules.deviceId"
             class="mb-0"
@@ -247,10 +253,10 @@ defineExpose({ validate, getData, setData });
                 })),
               ]"
             />
-          </FormItem>
+          </Form.Item>
         </template>
         <template v-else-if="column.dataIndex === 'method'">
-          <FormItem
+          <Form.Item
             :name="['data', index, 'method']"
             :rules="formRules.method"
             class="mb-0"
@@ -271,10 +277,10 @@ defineExpose({ validate, getData, setData });
               "
               @change="() => handleMethodChange(record, index)"
             />
-          </FormItem>
+          </Form.Item>
         </template>
         <template v-else-if="column.dataIndex === 'identifier'">
-          <FormItem :name="['data', index, 'identifier']" class="mb-0">
+          <Form.Item :name="['data', index, 'identifier']" class="mb-0">
             <Select
               v-if="shouldShowIdentifierSelect(record)"
               v-model:value="record.identifier"
@@ -287,7 +293,7 @@ defineExpose({ validate, getData, setData });
               "
               :options="getThingModelOptions(record)"
             />
-          </FormItem>
+          </Form.Item>
         </template>
         <template v-else-if="column.title === '操作'">
           <Button type="link" danger @click="handleDelete(index)">删除</Button>
@@ -296,7 +302,7 @@ defineExpose({ validate, getData, setData });
     </Table>
     <div class="mt-3 text-center">
       <Button type="primary" @click="handleAdd">
-        <Icon icon="ant-design:plus-outlined" class="mr-1" />
+        <IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
         添加数据源
       </Button>
     </div>
diff --git a/apps/web-antd/src/views/iot/rule/data/rule/data.ts b/apps/web-antd/src/views/iot/rule/data/rule/data.ts
index a07777490e9a39bc2014e93e141db79ecec44457..8237e2f8be234c100306db0f88034f7062c81d6b 100644
--- a/apps/web-antd/src/views/iot/rule/data/rule/data.ts
+++ b/apps/web-antd/src/views/iot/rule/data/rule/data.ts
@@ -145,4 +145,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/DataSinkForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/DataSinkForm.vue
index 676fa11d690f112c4affeb94006e297228c6e4e7..a1c20998ba6bd0e82cc4aa7a660e5f03f4640a27 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/DataSinkForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/DataSinkForm.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -10,10 +10,9 @@ import {
   createDataSink,
   getDataSink,
   updateDataSink,
-} from '#/api/iot/rule/data';
+} from '#/api/iot/rule/data/sink';
 import { $t } from '#/locales';
 
-import { useSinkFormSchema } from './data';
 import {
   HttpConfigForm,
   KafkaMQConfigForm,
@@ -22,6 +21,9 @@ import {
   RedisStreamConfigForm,
   RocketMQConfigForm,
 } from './config';
+import { useSinkFormSchema } from './data';
+
+const emit = defineEmits(['success']);
 
 const IotDataSinkTypeEnum = {
   HTTP: 1,
@@ -32,7 +34,6 @@ const IotDataSinkTypeEnum = {
   REDIS_STREAM: 6,
 } as const;
 
-const emit = defineEmits(['success']);
 const formData = ref<any>();
 
 const getTitle = computed(() => {
@@ -105,7 +106,7 @@ const [Modal, modalApi] = useVbenModal({
 
 // 监听类型变化，重置配置
 watch(
-  () => formApi.form.type,
+  () => formApi.getValues().then((values) => values.type),
   (newType) => {
     if (formData.value && newType !== formData.value.type) {
       formData.value.config = {};
@@ -118,7 +119,7 @@ watch(
   <Modal class="w-3/5" :title="getTitle">
     <Form class="mx-4" />
     <div v-if="formData" class="mx-4 mt-4">
-      <div class="text-sm font-medium mb-2">配置信息</div>
+      <div class="mb-2 text-sm font-medium">配置信息</div>
       <HttpConfigForm
         v-if="IotDataSinkTypeEnum.HTTP === formData.type"
         v-model="formData.config"
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/HttpConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/HttpConfigForm.vue
index b29cae14626fe7e041c31f5c4ac3617fb9e3dccc..744ab2dc21f482fd0a57238f51cf0be252a14eca 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/HttpConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/HttpConfigForm.vue
@@ -1,8 +1,11 @@
 <script lang="ts" setup>
-import { Input, Select, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { computed, onMounted, ref, watch } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input, Select } from 'ant-design-vue';
+
 import KeyValueEditor from './components/KeyValueEditor.vue';
 
 defineOptions({ name: 'HttpConfigForm' });
@@ -11,7 +14,7 @@ const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 // noinspection HttpUrlsUsage
 /** URL处理 */
@@ -33,10 +36,10 @@ onMounted(() => {
     if (config.value.url) {
       if (config.value.url.startsWith('https://')) {
         urlPrefix.value = 'https://';
-        urlPath.value = config.value.url.substring(8);
+        urlPath.value = config.value.url.slice(8);
       } else if (config.value.url.startsWith('http://')) {
         urlPrefix.value = 'http://';
-        urlPath.value = config.value.url.substring(7);
+        urlPath.value = config.value.url.slice(7);
       } else {
         urlPath.value = config.value.url;
       }
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/KafkaMQConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/KafkaMQConfigForm.vue
index 21c215f1d30c0fdba1a7bcd3f6e8f63cea2182d2..8a3616513e649653ab5431827cf8037482e14d60 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/KafkaMQConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/KafkaMQConfigForm.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { Input, Switch, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { onMounted } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input, Switch } from 'ant-design-vue';
+
 defineOptions({ name: 'KafkaMQConfigForm' });
 
 const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 /** 组件初始化 */
 onMounted(() => {
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/MqttConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/MqttConfigForm.vue
index c49602e95236275d6d3cf1ffa9a2e1b3382c051c..e903bc8f5a9c9be329fda46c88bff90d320d132f 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/MqttConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/MqttConfigForm.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { Input, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { onMounted } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input } from 'ant-design-vue';
+
 defineOptions({ name: 'MqttConfigForm' });
 
 const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 /** 组件初始化 */
 onMounted(() => {
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/RabbitMQConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/RabbitMQConfigForm.vue
index 50e3da64ab658cce5a64caa52dcd665a7bde0b75..7a3a3d50cd38822c4fe578a9d0f37e37d62a55c8 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/RabbitMQConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/RabbitMQConfigForm.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { Input, InputNumber, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { onMounted } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input, InputNumber } from 'ant-design-vue';
+
 defineOptions({ name: 'RabbitMQConfigForm' });
 
 const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 /** 组件初始化 */
 onMounted(() => {
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/RedisStreamConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/RedisStreamConfigForm.vue
index 9b146ce298dac3f1253c93092dd50a0423787881..75f4e4c5d5a99a780027245e085f99224899ee1d 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/RedisStreamConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/RedisStreamConfigForm.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { Input, InputNumber, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { onMounted } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input, InputNumber } from 'ant-design-vue';
+
 defineOptions({ name: 'RedisStreamConfigForm' });
 
 const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 /** 组件初始化 */
 onMounted(() => {
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/RocketMQConfigForm.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/RocketMQConfigForm.vue
index 63263cecc11261ebfa86231d272d807181fec776..384e7e0b449d0af75c0d01e334e6d3e7d91daf79 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/RocketMQConfigForm.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/RocketMQConfigForm.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { Input, FormItem } from 'ant-design-vue';
-import { useVModel } from '@vueuse/core';
+import { onMounted } from 'vue';
+
 import { isEmpty } from '@vben/utils';
 
+import { useVModel } from '@vueuse/core';
+import { FormItem, Input } from 'ant-design-vue';
+
 defineOptions({ name: 'RocketMQConfigForm' });
 
 const props = defineProps<{
   modelValue: any;
 }>();
 const emit = defineEmits(['update:modelValue']);
-const config = useVModel(props, 'modelValue', emit) as Ref<any>;
+const config = useVModel(props, 'modelValue', emit) as any;
 
 /** 组件初始化 */
 onMounted(() => {
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/components/KeyValueEditor.vue b/apps/web-antd/src/views/iot/rule/data/sink/config/components/KeyValueEditor.vue
index 919a9289805108d1ddff498c2ee005d4ff3c5ad7..2d33d8e1bf9c9e4bec369920d8c950ea73e8955e 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/components/KeyValueEditor.vue
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/components/KeyValueEditor.vue
@@ -1,73 +1,78 @@
-<template>
-  <div v-for="(item, index) in items" :key="index" class="flex mb-2 w-full">
-    <el-input v-model="item.key" class="mr-2" placeholder="键" />
-    <el-input v-model="item.value" placeholder="值" />
-    <el-button class="ml-2" text type="danger" @click="removeItem(index)">
-      <el-icon>
-        <Delete />
-      </el-icon>
-      删除
-    </el-button>
-  </div>
-  <el-button text type="primary" @click="addItem">
-    <el-icon>
-      <Plus />
-    </el-icon>
-    {{ addButtonText }}
-  </el-button>
-</template>
-
 <script lang="ts" setup>
-import { Delete, Plus } from '@element-plus/icons-vue'
-import { isEmpty } from '@vben/utils'
+import { ref, watch } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+import { isEmpty } from '@vben/utils';
+
+import { Button, Input } from 'ant-design-vue';
+
+defineOptions({ name: 'KeyValueEditor' });
 
-defineOptions({ name: 'KeyValueEditor' })
+const props = defineProps<{
+  addButtonText: string;
+  modelValue: Record<string, string>;
+}>();
+
+const emit = defineEmits(['update:modelValue']);
 
 interface KeyValueItem {
-  key: string
-  value: string
+  key: string;
+  value: string;
 }
 
-const props = defineProps<{
-  modelValue: Record<string, string>
-  addButtonText: string
-}>()
-const emit = defineEmits(['update:modelValue'])
-const items = ref<KeyValueItem[]>([]) // 内部 key-value 项列表
+const items = ref<KeyValueItem[]>([]); // 内部 key-value 项列表
 
 /** 添加项目 */
-const addItem = () => {
-  items.value.push({ key: '', value: '' })
-  updateModelValue()
+function addItem() {
+  items.value.push({ key: '', value: '' });
+  updateModelValue();
 }
 
 /** 移除项目 */
-const removeItem = (index: number) => {
-  items.value.splice(index, 1)
-  updateModelValue()
+function removeItem(index: number) {
+  items.value.splice(index, 1);
+  updateModelValue();
 }
 
 /** 更新 modelValue */
-const updateModelValue = () => {
-  const result: Record<string, string> = {}
+function updateModelValue() {
+  const result: Record<string, string> = {};
   items.value.forEach((item) => {
     if (item.key) {
-      result[item.key] = item.value
+      result[item.key] = item.value;
     }
-  })
-  emit('update:modelValue', result)
+  });
+  emit('update:modelValue', result);
 }
 
 /** 监听项目变化 */
-watch(items, updateModelValue, { deep: true })
+watch(items, updateModelValue, { deep: true });
 watch(
   () => props.modelValue,
   (val) => {
     // 列表有值后以列表中的值为准
     if (isEmpty(val) || !isEmpty(items.value)) {
-      return
+      return;
     }
-    items.value = Object.entries(props.modelValue).map(([key, value]) => ({ key, value }))
-  }
-)
+    items.value = Object.entries(props.modelValue).map(([key, value]) => ({
+      key,
+      value,
+    }));
+  },
+);
 </script>
+
+<template>
+  <div v-for="(item, index) in items" :key="index" class="mb-2 flex w-full">
+    <Input v-model="item.key" class="mr-2" placeholder="键" />
+    <Input v-model="item.value" placeholder="值" />
+    <Button class="ml-2" text danger @click="removeItem(index)">
+      <IconifyIcon icon="ant-design:delete-outlined" />
+      删除
+    </Button>
+  </div>
+  <Button text type="primary" @click="addItem">
+    <IconifyIcon icon="ant-design:plus-outlined" />
+    {{ addButtonText }}
+  </Button>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/config/index.ts b/apps/web-antd/src/views/iot/rule/data/sink/config/index.ts
index b3927dc9446caf1ebbace50f14817357cebd8c52..2aa76ddf3236263d082fcffa964fe57100dc8faf 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/config/index.ts
+++ b/apps/web-antd/src/views/iot/rule/data/sink/config/index.ts
@@ -1,15 +1,6 @@
-import HttpConfigForm from './HttpConfigForm.vue'
-import MqttConfigForm from './MqttConfigForm.vue'
-import RocketMQConfigForm from './RocketMQConfigForm.vue'
-import KafkaMQConfigForm from './KafkaMQConfigForm.vue'
-import RabbitMQConfigForm from './RabbitMQConfigForm.vue'
-import RedisStreamConfigForm from './RedisStreamConfigForm.vue'
-
-export {
-  HttpConfigForm,
-  MqttConfigForm,
-  RocketMQConfigForm,
-  KafkaMQConfigForm,
-  RabbitMQConfigForm,
-  RedisStreamConfigForm
-}
+export { default as HttpConfigForm } from './HttpConfigForm.vue';
+export { default as KafkaMQConfigForm } from './KafkaMQConfigForm.vue';
+export { default as MqttConfigForm } from './MqttConfigForm.vue';
+export { default as RabbitMQConfigForm } from './RabbitMQConfigForm.vue';
+export { default as RedisStreamConfigForm } from './RedisStreamConfigForm.vue';
+export { default as RocketMQConfigForm } from './RocketMQConfigForm.vue';
diff --git a/apps/web-antd/src/views/iot/rule/data/sink/data.ts b/apps/web-antd/src/views/iot/rule/data/sink/data.ts
index 65f83828d587fb54fcb144224b95c6d282e9383f..bc70eae18acb9564961850867bd218779a18b31d 100644
--- a/apps/web-antd/src/views/iot/rule/data/sink/data.ts
+++ b/apps/web-antd/src/views/iot/rule/data/sink/data.ts
@@ -150,4 +150,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
-
diff --git a/apps/web-antd/src/views/iot/rule/databridge/index.vue b/apps/web-antd/src/views/iot/rule/databridge/index.vue
index 5bd7ebf7982ff18cc078dc7cf55ed2254982144e..6f4624158f1fe74e9858c9d765b71dba2de4dba5 100644
--- a/apps/web-antd/src/views/iot/rule/databridge/index.vue
+++ b/apps/web-antd/src/views/iot/rule/databridge/index.vue
@@ -1,15 +1,13 @@
 <script lang="ts" setup>
 import { Page } from '@vben/common-ui';
+
 import { Button } from 'ant-design-vue';
 
 defineOptions({ name: 'IotRuleDataBridge' });
 </script>
 
 <template>
-  <Page
-    description="物聯網規則引擎 - 數據橋接"
-    title="數據橋接"
-  >
+  <Page description="物聯網規則引擎 - 數據橋接" title="數據橋接">
     <div class="p-4">
       <Button
         danger
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue b/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue
index 62ed8e6cb9bdad8d6ba0e2dd446aa475830629bc..e2004c963b478d243ed1f4cfddabbc25ce01df72 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/RuleSceneForm.vue
@@ -1,97 +1,71 @@
-<template>
-  <el-drawer
-    v-model="drawerVisible"
-    :title="drawerTitle"
-    size="80%"
-    direction="rtl"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    @close="handleClose"
-  >
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="110px">
-      <!-- 基础信息配置 -->
-      <BasicInfoSection v-model="formData" :rules="formRules" />
-      <!-- 触发器配置 -->
-      <TriggerSection v-model:triggers="formData.triggers" />
-      <!-- 执行器配置 -->
-      <ActionSection v-model:actions="formData.actions" />
-    </el-form>
-    <template #footer>
-      <div class="drawer-footer">
-        <el-button :disabled="submitLoading" type="primary" @click="handleSubmit">
-          <Icon icon="ep:check" />
-          确 定
-        </el-button>
-        <el-button @click="handleClose">
-          <Icon icon="ep:close" />
-          取 消
-        </el-button>
-      </div>
-    </template>
-  </el-drawer>
-</template>
-
 <script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import BasicInfoSection from './sections/BasicInfoSection.vue'
-import TriggerSection from './sections/TriggerSection.vue'
-import ActionSection from './sections/ActionSection.vue'
-import { IotSceneRule } from '#/api/iot/rule/scene'
-import { RuleSceneApi } from '#/api/iot/rule/scene'
+import type { IotSceneRule } from '#/api/iot/rule/scene';
+
+import { computed, nextTick, reactive, ref, watch } from 'vue';
+
+import { CommonStatusEnum } from '@vben/constants';
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Drawer, Form, message } from 'ant-design-vue';
+
+import { createSceneRule, updateSceneRule } from '#/api/iot/rule/scene';
 import {
-  IotRuleSceneTriggerTypeEnum,
   IotRuleSceneActionTypeEnum,
-  isDeviceTrigger
-} from '#/views/iot/utils/constants'
-import { ElMessage } from 'element-plus'
-import { CommonStatusEnum } from '@/utils/constants'
+  IotRuleSceneTriggerTypeEnum,
+  isDeviceTrigger,
+} from '#/views/iot/utils/constants';
+
+import ActionSection from './sections/ActionSection.vue';
+import BasicInfoSection from './sections/BasicInfoSection.vue';
+import TriggerSection from './sections/TriggerSection.vue';
 
 /** IoT 场景联动规则表单 - 主表单组件 */
-defineOptions({ name: 'RuleSceneForm' })
+defineOptions({ name: 'RuleSceneForm' });
 
 /** 组件属性定义 */
 const props = defineProps<{
   /** 抽屉显示状态 */
-  modelValue: boolean
+  modelValue: boolean;
   /** 编辑的场景联动规则数据 */
-  ruleScene?: IotSceneRule
-}>()
+  ruleScene?: IotSceneRule;
+}>();
 
 /** 组件事件定义 */
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: boolean): void
-  (e: 'success'): void
-}>()
+  (e: 'update:modelValue', value: boolean): void;
+  (e: 'success'): void;
+}>();
 
-const drawerVisible = useVModel(props, 'modelValue', emit) // 抽屉显示状态
+const drawerVisible = useVModel(props, 'modelValue', emit); // 抽屉显示状态
 
 /**
  * 创建默认的表单数据
  * @returns 默认表单数据对象
  */
-const createDefaultFormData = (): IotSceneRule => {
+function createDefaultFormData(): IotSceneRule {
   return {
     name: '',
     description: '',
     status: CommonStatusEnum.ENABLE, // 默认启用状态
     triggers: [
       {
-        type: IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST,
+        type: IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST.toString(),
         productId: undefined,
         deviceId: undefined,
         identifier: undefined,
         operator: undefined,
         value: undefined,
         cronExpression: undefined,
-        conditionGroups: [] // 空的条件组数组
-      }
+        conditionGroups: [], // 空的条件组数组
+      },
     ],
-    actions: []
-  }
+    actions: [],
+  };
 }
 
-const formRef = ref() // 表单引用
-const formData = ref<IotSceneRule>(createDefaultFormData()) // 表单数据
+const formRef = ref(); // 表单引用
+const formData = ref<IotSceneRule>(createDefaultFormData()); // 表单数据
 
 /**
  * 触发器校验器
@@ -99,55 +73,58 @@ const formData = ref<IotSceneRule>(createDefaultFormData()) // 表单数据
  * @param value 校验值
  * @param callback 回调函数
  */
-const validateTriggers = (_rule: any, value: any, callback: any) => {
+function validateTriggers(_rule: any, value: any, callback: any) {
   if (!value || !Array.isArray(value) || value.length === 0) {
-    callback(new Error('至少需要一个触发器'))
-    return
+    callback(new Error('至少需要一个触发器'));
+    return;
   }
 
-  for (let i = 0; i < value.length; i++) {
-    const trigger = value[i]
-
+  for (const [i, trigger] of value.entries()) {
     // 校验触发器类型
     if (!trigger.type) {
-      callback(new Error(`触发器 ${i + 1}: 触发器类型不能为空`))
-      return
+      callback(new Error(`触发器 ${i + 1}: 触发器类型不能为空`));
+      return;
     }
 
     // 校验设备触发器
     if (isDeviceTrigger(trigger.type)) {
       if (!trigger.productId) {
-        callback(new Error(`触发器 ${i + 1}: 产品不能为空`))
-        return
+        callback(new Error(`触发器 ${i + 1}: 产品不能为空`));
+        return;
       }
       if (!trigger.deviceId) {
-        callback(new Error(`触发器 ${i + 1}: 设备不能为空`))
-        return
+        callback(new Error(`触发器 ${i + 1}: 设备不能为空`));
+        return;
       }
       if (!trigger.identifier) {
-        callback(new Error(`触发器 ${i + 1}: 物模型标识符不能为空`))
-        return
+        callback(new Error(`触发器 ${i + 1}: 物模型标识符不能为空`));
+        return;
       }
       if (!trigger.operator) {
-        callback(new Error(`触发器 ${i + 1}: 操作符不能为空`))
-        return
+        callback(new Error(`触发器 ${i + 1}: 操作符不能为空`));
+        return;
       }
-      if (trigger.value === undefined || trigger.value === null || trigger.value === '') {
-        callback(new Error(`触发器 ${i + 1}: 参数值不能为空`))
-        return
+      if (
+        trigger.value === undefined ||
+        trigger.value === null ||
+        trigger.value === ''
+      ) {
+        callback(new Error(`触发器 ${i + 1}: 参数值不能为空`));
+        return;
       }
     }
 
     // 校验定时触发器
-    if (trigger.type === IotRuleSceneTriggerTypeEnum.TIMER) {
-      if (!trigger.cronExpression) {
-        callback(new Error(`触发器 ${i + 1}: CRON表达式不能为空`))
-        return
-      }
+    if (
+      trigger.type === IotRuleSceneTriggerTypeEnum.TIMER &&
+      !trigger.cronExpression
+    ) {
+      callback(new Error(`触发器 ${i + 1}: CRON表达式不能为空`));
+      return;
     }
   }
 
-  callback()
+  callback();
 }
 
 /**
@@ -156,19 +133,17 @@ const validateTriggers = (_rule: any, value: any, callback: any) => {
  * @param value 校验值
  * @param callback 回调函数
  */
-const validateActions = (_rule: any, value: any, callback: any) => {
+function validateActions(_rule: any, value: any, callback: any) {
   if (!value || !Array.isArray(value) || value.length === 0) {
-    callback(new Error('至少需要一个执行器'))
-    return
+    callback(new Error('至少需要一个执行器'));
+    return;
   }
 
-  for (let i = 0; i < value.length; i++) {
-    const action = value[i]
-
+  for (const [i, action] of value.entries()) {
     // 校验执行器类型
     if (!action.type) {
-      callback(new Error(`执行器 ${i + 1}: 执行器类型不能为空`))
-      return
+      callback(new Error(`执行器 ${i + 1}: 执行器类型不能为空`));
+      return;
     }
 
     // 校验设备控制执行器
@@ -177,47 +152,53 @@ const validateActions = (_rule: any, value: any, callback: any) => {
       action.type === IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE
     ) {
       if (!action.productId) {
-        callback(new Error(`执行器 ${i + 1}: 产品不能为空`))
-        return
+        callback(new Error(`执行器 ${i + 1}: 产品不能为空`));
+        return;
       }
       if (!action.deviceId) {
-        callback(new Error(`执行器 ${i + 1}: 设备不能为空`))
-        return
+        callback(new Error(`执行器 ${i + 1}: 设备不能为空`));
+        return;
       }
 
       // 服务调用需要验证服务标识符
-      if (action.type === IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE) {
-        if (!action.identifier) {
-          callback(new Error(`执行器 ${i + 1}: 服务不能为空`))
-          return
-        }
+      if (
+        action.type === IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE &&
+        !action.identifier
+      ) {
+        callback(new Error(`执行器 ${i + 1}: 服务不能为空`));
+        return;
       }
 
       if (!action.params || Object.keys(action.params).length === 0) {
-        callback(new Error(`执行器 ${i + 1}: 参数配置不能为空`))
-        return
+        callback(new Error(`执行器 ${i + 1}: 参数配置不能为空`));
+        return;
       }
     }
 
     // 校验告警执行器
     if (
-      action.type === IotRuleSceneActionTypeEnum.ALERT_TRIGGER ||
-      action.type === IotRuleSceneActionTypeEnum.ALERT_RECOVER
+      (action.type === IotRuleSceneActionTypeEnum.ALERT_TRIGGER ||
+        action.type === IotRuleSceneActionTypeEnum.ALERT_RECOVER) &&
+      !action.alertConfigId
     ) {
-      if (!action.alertConfigId) {
-        callback(new Error(`执行器 ${i + 1}: 告警配置不能为空`))
-        return
-      }
+      callback(new Error(`执行器 ${i + 1}: 告警配置不能为空`));
+      return;
     }
   }
 
-  callback()
+  callback();
 }
 
 const formRules = reactive({
   name: [
     { required: true, message: '场景名称不能为空', trigger: 'blur' },
-    { type: 'string', min: 1, max: 50, message: '场景名称长度应在1-50个字符之间', trigger: 'blur' }
+    {
+      type: 'string',
+      min: 1,
+      max: 50,
+      message: '场景名称长度应在1-50个字符之间',
+      trigger: 'blur',
+    },
   ],
   status: [
     { required: true, message: '场景状态不能为空', trigger: 'change' },
@@ -225,65 +206,74 @@ const formRules = reactive({
       type: 'enum',
       enum: [CommonStatusEnum.ENABLE, CommonStatusEnum.DISABLE],
       message: '状态值必须为启用或禁用',
-      trigger: 'change'
-    }
+      trigger: 'change',
+    },
   ],
   description: [
-    { type: 'string', max: 200, message: '场景描述不能超过200个字符', trigger: 'blur' }
+    {
+      type: 'string',
+      max: 200,
+      message: '场景描述不能超过200个字符',
+      trigger: 'blur',
+    },
+  ],
+  triggers: [
+    { required: true, validator: validateTriggers, trigger: 'change' },
   ],
-  triggers: [{ required: true, validator: validateTriggers, trigger: 'change' }],
-  actions: [{ required: true, validator: validateActions, trigger: 'change' }]
-}) // 表单校验规则
+  actions: [{ required: true, validator: validateActions, trigger: 'change' }],
+}); // 表单校验规则
 
-const submitLoading = ref(false) // 提交加载状态
-const isEdit = ref(false) // 是否为编辑模式
-const drawerTitle = computed(() => (isEdit.value ? '编辑场景联动规则' : '新增场景联动规则')) // 抽屉标题
+const submitLoading = ref(false); // 提交加载状态
+const isEdit = ref(false); // 是否为编辑模式
+const drawerTitle = computed(() =>
+  isEdit.value ? '编辑场景联动规则' : '新增场景联动规则',
+); // 抽屉标题
 
 /** 提交表单 */
-const handleSubmit = async () => {
+async function handleSubmit() {
   // 校验表单
-  if (!formRef.value) return
-  const valid = await formRef.value.validate()
-  if (!valid) return
+  if (!formRef.value) return;
+  const valid = await formRef.value.validate();
+  if (!valid) return;
 
   // 提交请求
-  submitLoading.value = true
+  submitLoading.value = true;
   try {
     if (isEdit.value) {
       // 更新场景联动规则
-      await RuleSceneApi.updateRuleScene(formData.value)
-      ElMessage.success('更新成功')
+      await updateSceneRule(formData.value);
+      message.success('更新成功');
     } else {
       // 创建场景联动规则
-      await RuleSceneApi.createRuleScene(formData.value)
-      ElMessage.success('创建成功')
+      await createSceneRule(formData.value);
+      message.success('创建成功');
     }
 
     // 关闭抽屉并触发成功事件
-    drawerVisible.value = false
-    emit('success')
+    drawerVisible.value = false;
+    emit('success');
   } catch (error) {
-    console.error('保存失败:', error)
-    ElMessage.error(isEdit.value ? '更新失败' : '创建失败')
+    console.error('保存失败:', error);
+    message.error(isEdit.value ? '更新失败' : '创建失败');
   } finally {
-    submitLoading.value = false
+    submitLoading.value = false;
   }
 }
 
 /** 处理抽屉关闭事件 */
 const handleClose = () => {
-  drawerVisible.value = false
-}
+  drawerVisible.value = false;
+};
 
 /** 初始化表单数据 */
-const initFormData = () => {
+function initFormData() {
   if (props.ruleScene) {
     // 编辑模式：数据结构已对齐，直接使用后端数据
-    isEdit.value = true
+    isEdit.value = true;
     formData.value = {
       ...props.ruleScene,
       // 确保触发器数组不为空
-      triggers: props.ruleScene.triggers?.length
+      triggers: (props.ruleScene.triggers?.length as any)
         ? props.ruleScene.triggers
         : [
             {
@@ -294,37 +284,75 @@ const initFormData = () => {
               operator: undefined,
               value: undefined,
               cronExpression: undefined,
-              conditionGroups: []
-            }
+              conditionGroups: [],
+            },
           ],
       // 确保执行器数组不为空
-      actions: props.ruleScene.actions || []
-    }
+      actions: props.ruleScene.actions || [],
+    };
   } else {
     // 新增模式：使用默认数据
-    isEdit.value = false
-    formData.value = createDefaultFormData()
+    isEdit.value = false;
+    formData.value = createDefaultFormData();
   }
 }
 
 /** 监听抽屉显示 */
 watch(drawerVisible, async (visible) => {
   if (visible) {
-    initFormData()
+    initFormData();
     // 重置表单验证状态
-    await nextTick()
-    formRef.value?.clearValidate()
+    await nextTick();
+    formRef.value?.clearValidate();
   }
-})
+});
 
 /** 监听编辑数据变化 */
 watch(
   () => props.ruleScene,
   () => {
     if (drawerVisible.value) {
-      initFormData()
+      initFormData();
     }
   },
-  { deep: true }
-)
+  { deep: true },
+);
 </script>
+
+<template>
+  <Drawer
+    v-model="drawerVisible"
+    :title="drawerTitle"
+    width="80%"
+    direction="rtl"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    @close="handleClose"
+  >
+    <Form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules as any"
+      label-width="110px"
+    >
+      <!-- 基础信息配置 -->
+      <BasicInfoSection v-model="formData" :rules="formRules" />
+      <!-- 触发器配置 -->
+      <TriggerSection v-model:triggers="formData.triggers as any" />
+      <!-- 执行器配置 -->
+      <ActionSection v-model:actions="formData.actions as any" />
+    </Form>
+    <template #footer>
+      <div class="drawer-footer">
+        <Button :disabled="submitLoading" type="primary" @click="handleSubmit">
+          <IconifyIcon icon="ep:check" />
+          确 定
+        </Button>
+        <Button @click="handleClose">
+          <IconifyIcon icon="ep:close" />
+          取 消
+        </Button>
+      </div>
+    </template>
+  </Drawer>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/AlertConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/AlertConfig.vue
index bb6d393b9eded73efdc0b04f7d992b91a3fcce18..1edf04e921cfb56775e2fcce5e32a9045deaa28f 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/AlertConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/AlertConfig.vue
@@ -1,81 +1,85 @@
 <!-- 告警配置组件 -->
-<template>
-  <div class="w-full">
-    <el-form-item label="告警配置" required>
-      <el-select
-        v-model="localValue"
-        placeholder="请选择告警配置"
-        filterable
-        clearable
-        @change="handleChange"
-        class="w-full"
-        :loading="loading"
-      >
-        <el-option
-          v-for="config in alertConfigs"
-          :key="config.id"
-          :label="config.name"
-          :value="config.id"
-        >
-          <div class="flex items-center justify-between">
-            <span>{{ config.name }}</span>
-            <el-tag :type="config.enabled ? 'success' : 'danger'" size="small">
-              {{ config.enabled ? '启用' : '禁用' }}
-            </el-tag>
-          </div>
-        </el-option>
-      </el-select>
-    </el-form-item>
-  </div>
-</template>
-
 <script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import { AlertConfigApi } from '#/api/iot/alert/config'
+import { onMounted, ref } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { Form, Select, Tag } from 'ant-design-vue';
+
+import { getAlertConfigPage } from '#/api/iot/alert/config';
 
 /** 告警配置组件 */
-defineOptions({ name: 'AlertConfig' })
+defineOptions({ name: 'AlertConfig' });
 
 const props = defineProps<{
-  modelValue?: number
-}>()
+  modelValue?: number;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value?: number): void
-}>()
+  (e: 'update:modelValue', value?: number): void;
+}>();
 
-const localValue = useVModel(props, 'modelValue', emit)
+const localValue = useVModel(props, 'modelValue', emit);
 
-const loading = ref(false) // 加载状态
-const alertConfigs = ref<any[]>([]) // 告警配置列表
+const loading = ref(false); // 加载状态
+const alertConfigs = ref<any[]>([]); // 告警配置列表
 
 /**
  * 处理选择变化事件
  * @param value 选中的值
  */
-const handleChange = (value?: number) => {
-  emit('update:modelValue', value)
+function handleChange(value?: any) {
+  emit('update:modelValue', value);
 }
 
 /**
  * 加载告警配置列表
  */
-const loadAlertConfigs = async () => {
-  loading.value = true
+async function loadAlertConfigs() {
+  loading.value = true;
   try {
-    const data = await AlertConfigApi.getAlertConfigPage({
+    const data = await getAlertConfigPage({
       pageNo: 1,
       pageSize: 100,
-      enabled: true // 只加载启用的配置
-    })
-    alertConfigs.value = data.list || []
+      enabled: true, // 只加载启用的配置
+    });
+    alertConfigs.value = data.list || [];
   } finally {
-    loading.value = false
+    loading.value = false;
   }
 }
 
 // 组件挂载时加载数据
 onMounted(() => {
-  loadAlertConfigs()
-})
+  loadAlertConfigs();
+});
 </script>
+
+<template>
+  <div class="w-full">
+    <Form.Item label="告警配置" required>
+      <Select
+        v-model="localValue"
+        placeholder="请选择告警配置"
+        filterable
+        clearable
+        @change="handleChange"
+        class="w-full"
+        :loading="loading"
+      >
+        <Select.Option
+          v-for="config in alertConfigs"
+          :key="config.id"
+          :label="config.name"
+          :value="config.id"
+        >
+          <div class="flex items-center justify-between">
+            <span>{{ config.name }}</span>
+            <Tag :type="config.enabled ? 'success' : 'danger'" size="small">
+              {{ config.enabled ? '启用' : '禁用' }}
+            </Tag>
+          </div>
+        </Select.Option>
+      </Select>
+    </Form.Item>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/ConditionConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/ConditionConfig.vue
index 7f904e61890ea60526e00ffd6abcd6c189636b78..f33ae49a54af24b8dcd1bd2c5d721fbb2c393333 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/ConditionConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/ConditionConfig.vue
@@ -1,301 +1,336 @@
 <!-- 单个条件配置组件 -->
+<script setup lang="ts">
+import type { TriggerCondition } from '#/api/iot/rule/scene';
+
+import { computed, ref } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { Col, Form, Row, Select } from 'ant-design-vue';
+
+import {
+  getConditionTypeOptions,
+  IoTDeviceStatusEnum,
+  IotRuleSceneTriggerConditionParameterOperatorEnum,
+  IotRuleSceneTriggerConditionTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import ValueInput from '../inputs/ValueInput.vue';
+import DeviceSelector from '../selectors/DeviceSelector.vue';
+import OperatorSelector from '../selectors/OperatorSelector.vue';
+import ProductSelector from '../selectors/ProductSelector.vue';
+import PropertySelector from '../selectors/PropertySelector.vue';
+import CurrentTimeConditionConfig from './CurrentTimeConditionConfig.vue';
+
+/** 单个条件配置组件 */
+defineOptions({ name: 'ConditionConfig' });
+
+const props = defineProps<{
+  modelValue: TriggerCondition;
+  triggerType: number;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: TriggerCondition): void;
+}>();
+
+/** 获取设备状态选项 */
+const deviceStatusOptions = [
+  {
+    value: IoTDeviceStatusEnum.ONLINE.value,
+    label: IoTDeviceStatusEnum.ONLINE.label,
+  },
+  {
+    value: IoTDeviceStatusEnum.OFFLINE.value,
+    label: IoTDeviceStatusEnum.OFFLINE.label,
+  },
+];
+
+/** 获取状态操作符选项 */
+const statusOperatorOptions = [
+  {
+    value: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value,
+    label: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.name,
+  },
+  {
+    value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.value,
+    label: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.name,
+  },
+];
+
+const condition = useVModel(props, 'modelValue', emit);
+
+const propertyType = ref<string>('string'); // 属性类型
+const propertyConfig = ref<any>(null); // 属性配置
+const isDeviceCondition = computed(() => {
+  return (
+    condition.value.type ===
+      IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS.toString() ||
+    condition.value.type ===
+      IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY.toString()
+  );
+}); // 计算属性：判断是否为设备相关条件
+
+/**
+ * 更新条件字段
+ * @param field 字段名
+ * @param value 字段值
+ */
+function updateConditionField(field: any, value: any) {
+  (condition.value as any)[field] = value;
+  emit('update:modelValue', condition.value);
+}
+
+/**
+ * 更新整个条件对象
+ * @param newCondition 新的条件对象
+ */
+function updateCondition(newCondition: TriggerCondition) {
+  condition.value = newCondition;
+  emit('update:modelValue', condition.value);
+}
+
+/**
+ * 处理条件类型变化事件
+ * @param type 条件类型
+ */
+function handleConditionTypeChange(type: any) {
+  // 根据条件类型清理字段
+  const isCurrentTime =
+    type === IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME;
+  const isDeviceStatus =
+    type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS;
+
+  // 清理标识符字段（时间条件和设备状态条件都不需要）
+  if (isCurrentTime || isDeviceStatus) {
+    condition.value.identifier = undefined;
+  }
+
+  // 清理设备相关字段（仅时间条件需要）
+  if (isCurrentTime) {
+    condition.value.productId = undefined;
+    condition.value.deviceId = undefined;
+  }
+
+  // 设置默认操作符
+  condition.value.operator = isCurrentTime
+    ? 'at_time'
+    : IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value;
+
+  // 清空参数值
+  condition.value.param = '';
+}
+
+/** 处理产品变化事件 */
+function handleProductChange(_: any) {
+  // 产品变化时清空设备和属性
+  condition.value.deviceId = undefined;
+  condition.value.identifier = '';
+}
+
+/** 处理设备变化事件 */
+function handleDeviceChange(_: any) {
+  // 设备变化时清空属性
+  condition.value.identifier = '';
+}
+
+/**
+ * 处理属性变化事件
+ * @param propertyInfo 属性信息对象
+ */
+function handlePropertyChange(propertyInfo: { config: any; type: string }) {
+  propertyType.value = propertyInfo.type;
+  propertyConfig.value = propertyInfo.config;
+
+  // 重置操作符和值
+  condition.value.operator =
+    IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value;
+  condition.value.param = '';
+}
+
+/** 处理操作符变化事件 */
+function handleOperatorChange() {
+  // 重置值
+  condition.value.param = '';
+}
+</script>
+
 <template>
-  <div class="flex flex-col gap-16px">
+  <div class="gap-16px flex flex-col">
     <!-- 条件类型选择 -->
-    <el-row :gutter="16">
-      <el-col :span="8">
-        <el-form-item label="条件类型" required>
-          <el-select
+    <Row :gutter="16">
+      <Col :span="8">
+        <Form.Item label="条件类型" required>
+          <Select
             :model-value="condition.type"
-            @update:model-value="(value) => updateConditionField('type', value)"
+            @update:model-value="
+              (value: any) => updateConditionField('type', value)
+            "
             @change="handleConditionTypeChange"
             placeholder="请选择条件类型"
             class="w-full"
           >
-            <el-option
+            <Select.Option
               v-for="option in getConditionTypeOptions()"
               :key="option.value"
               :label="option.label"
               :value="option.value"
             />
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
+          </Select>
+        </Form.Item>
+      </Col>
+    </Row>
 
     <!-- 产品设备选择 - 设备相关条件的公共部分 -->
-    <el-row v-if="isDeviceCondition" :gutter="16">
-      <el-col :span="12">
-        <el-form-item label="产品" required>
+    <Row v-if="isDeviceCondition" :gutter="16">
+      <Col :span="12">
+        <Form.Item label="产品" required>
           <ProductSelector
             :model-value="condition.productId"
-            @update:model-value="(value) => updateConditionField('productId', value)"
+            @update:model-value="
+              (value) => updateConditionField('productId', value)
+            "
             @change="handleProductChange"
           />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="设备" required>
+        </Form.Item>
+      </Col>
+      <Col :span="12">
+        <Form.Item label="设备" required>
           <DeviceSelector
             :model-value="condition.deviceId"
-            @update:model-value="(value) => updateConditionField('deviceId', value)"
+            @update:model-value="
+              (value) => updateConditionField('deviceId', value)
+            "
             :product-id="condition.productId"
             @change="handleDeviceChange"
           />
-        </el-form-item>
-      </el-col>
-    </el-row>
+        </Form.Item>
+      </Col>
+    </Row>
 
     <!-- 设备状态条件配置 -->
     <div
-      v-if="condition.type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS"
-      class="flex flex-col gap-16px"
+      v-if="
+        condition.type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS
+      "
+      class="gap-16px flex flex-col"
     >
       <!-- 状态和操作符选择 -->
-      <el-row :gutter="16">
+      <Row :gutter="16">
         <!-- 操作符选择 -->
-        <el-col :span="12">
-          <el-form-item label="操作符" required>
-            <el-select
+        <Col :span="12">
+          <Form.Item label="操作符" required>
+            <Select
               :model-value="condition.operator"
-              @update:model-value="(value) => updateConditionField('operator', value)"
+              @update:model-value="
+                (value) => updateConditionField('operator', value)
+              "
               placeholder="请选择操作符"
               class="w-full"
             >
-              <el-option
+              <Select.Option
                 v-for="option in statusOperatorOptions"
                 :key="option.value"
                 :label="option.label"
                 :value="option.value"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
+            </Select>
+          </Form.Item>
+        </Col>
 
         <!-- 状态选择 -->
-        <el-col :span="12">
-          <el-form-item label="设备状态" required>
-            <el-select
+        <Col :span="12">
+          <Form.Item label="设备状态" required>
+            <Select
               :model-value="condition.param"
-              @update:model-value="(value) => updateConditionField('param', value)"
+              @update:model-value="
+                (value: any) => updateConditionField('param', value)
+              "
               placeholder="请选择设备状态"
               class="w-full"
             >
-              <el-option
+              <Select.Option
                 v-for="option in deviceStatusOptions"
                 :key="option.value"
                 :label="option.label"
                 :value="option.value"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </Select>
+          </Form.Item>
+        </Col>
+      </Row>
     </div>
 
     <!-- 设备属性条件配置 -->
     <div
-      v-else-if="condition.type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY"
+      v-else-if="
+        condition.type ===
+        IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY.toString()
+      "
       class="space-y-16px"
     >
       <!-- 属性配置 -->
-      <el-row :gutter="16">
+      <Row :gutter="16">
         <!-- 属性/事件/服务选择 -->
-        <el-col :span="6">
-          <el-form-item label="监控项" required>
+        <Col :span="6">
+          <Form.Item label="监控项" required>
             <PropertySelector
               :model-value="condition.identifier"
-              @update:model-value="(value) => updateConditionField('identifier', value)"
+              @update:model-value="
+                (value) => updateConditionField('identifier', value)
+              "
               :trigger-type="triggerType"
               :product-id="condition.productId"
               :device-id="condition.deviceId"
               @change="handlePropertyChange"
             />
-          </el-form-item>
-        </el-col>
+          </Form.Item>
+        </Col>
 
         <!-- 操作符选择 -->
-        <el-col :span="6">
-          <el-form-item label="操作符" required>
+        <Col :span="6">
+          <Form.Item label="操作符" required>
             <OperatorSelector
               :model-value="condition.operator"
-              @update:model-value="(value) => updateConditionField('operator', value)"
+              @update:model-value="
+                (value) => updateConditionField('operator', value)
+              "
               :property-type="propertyType"
               @change="handleOperatorChange"
             />
-          </el-form-item>
-        </el-col>
+          </Form.Item>
+        </Col>
 
         <!-- 值输入 -->
-        <el-col :span="12">
-          <el-form-item label="比较值" required>
+        <Col :span="12">
+          <Form.Item label="比较值" required>
             <ValueInput
               :model-value="condition.param"
-              @update:model-value="(value) => updateConditionField('param', value)"
+              @update:model-value="
+                (value) => updateConditionField('param', value)
+              "
               :property-type="propertyType"
               :operator="condition.operator"
               :property-config="propertyConfig"
             />
-          </el-form-item>
-        </el-col>
-      </el-row>
+          </Form.Item>
+        </Col>
+      </Row>
     </div>
 
     <!-- 当前时间条件配置 -->
     <CurrentTimeConditionConfig
-      v-else-if="condition.type === IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME"
+      v-else-if="
+        condition.type ===
+        IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME.toString()
+      "
       :model-value="condition"
       @update:model-value="updateCondition"
     />
   </div>
 </template>
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import CurrentTimeConditionConfig from './CurrentTimeConditionConfig.vue'
-import ProductSelector from '../selectors/ProductSelector.vue'
-import DeviceSelector from '../selectors/DeviceSelector.vue'
-import PropertySelector from '../selectors/PropertySelector.vue'
-import OperatorSelector from '../selectors/OperatorSelector.vue'
-import ValueInput from '../inputs/ValueInput.vue'
-import type { TriggerCondition } from '#/api/iot/rule/scene'
-import {
-  IotRuleSceneTriggerConditionTypeEnum,
-  IotRuleSceneTriggerConditionParameterOperatorEnum,
-  getConditionTypeOptions,
-  IoTDeviceStatusEnum
-} from '#/views/iot/utils/constants'
-
-/** 单个条件配置组件 */
-defineOptions({ name: 'ConditionConfig' })
-
-const props = defineProps<{
-  modelValue: TriggerCondition
-  triggerType: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: TriggerCondition): void
-}>()
-
-/** 获取设备状态选项 */
-const deviceStatusOptions = [
-  {
-    value: IoTDeviceStatusEnum.ONLINE.value,
-    label: IoTDeviceStatusEnum.ONLINE.label
-  },
-  {
-    value: IoTDeviceStatusEnum.OFFLINE.value,
-    label: IoTDeviceStatusEnum.OFFLINE.label
-  }
-]
-
-/** 获取状态操作符选项 */
-const statusOperatorOptions = [
-  {
-    value: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value,
-    label: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.name
-  },
-  {
-    value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.value,
-    label: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.name
-  }
-]
-
-const condition = useVModel(props, 'modelValue', emit)
-
-const propertyType = ref<string>('string') // 属性类型
-const propertyConfig = ref<any>(null) // 属性配置
-const isDeviceCondition = computed(() => {
-  return (
-    condition.value.type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS ||
-    condition.value.type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY
-  )
-}) // 计算属性：判断是否为设备相关条件
-
-/**
- * 更新条件字段
- * @param field 字段名
- * @param value 字段值
- */
-const updateConditionField = (field: any, value: any) => {
-  ;(condition.value as any)[field] = value
-  emit('update:modelValue', condition.value)
-}
-
-/**
- * 更新整个条件对象
- * @param newCondition 新的条件对象
- */
-const updateCondition = (newCondition: TriggerCondition) => {
-  condition.value = newCondition
-  emit('update:modelValue', condition.value)
-}
-
-/**
- * 处理条件类型变化事件
- * @param type 条件类型
- */
-const handleConditionTypeChange = (type: number) => {
-  // 根据条件类型清理字段
-  const isCurrentTime = type === IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME
-  const isDeviceStatus = type === IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS
-
-  // 清理标识符字段（时间条件和设备状态条件都不需要）
-  if (isCurrentTime || isDeviceStatus) {
-    condition.value.identifier = undefined
-  }
-
-  // 清理设备相关字段（仅时间条件需要）
-  if (isCurrentTime) {
-    condition.value.productId = undefined
-    condition.value.deviceId = undefined
-  }
-
-  // 设置默认操作符
-  condition.value.operator = isCurrentTime
-    ? 'at_time'
-    : IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value
-
-  // 清空参数值
-  condition.value.param = ''
-}
-
-/** 处理产品变化事件 */
-const handleProductChange = (_: number) => {
-  // 产品变化时清空设备和属性
-  condition.value.deviceId = undefined
-  condition.value.identifier = ''
-}
-
-/** 处理设备变化事件 */
-const handleDeviceChange = (_: number) => {
-  // 设备变化时清空属性
-  condition.value.identifier = ''
-}
-
-/**
- * 处理属性变化事件
- * @param propertyInfo 属性信息对象
- */
-const handlePropertyChange = (propertyInfo: { type: string; config: any }) => {
-  propertyType.value = propertyInfo.type
-  propertyConfig.value = propertyInfo.config
-
-  // 重置操作符和值
-  condition.value.operator = IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value
-  condition.value.param = ''
-}
-
-/** 处理操作符变化事件 */
-const handleOperatorChange = () => {
-  // 重置值
-  condition.value.param = ''
-}
-</script>
-
 <style scoped>
-:deep(.el-form-item) {
+:deep(.ant-form-item) {
   margin-bottom: 0;
 }
 </style>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue
index 92b64223a087c943b5b8e2246f6a46669485a7fb..f6628181ce39fa469f0693c76d8e3ed8d7f65d61 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/CurrentTimeConditionConfig.vue
@@ -1,107 +1,36 @@
 <!-- 当前时间条件配置组件 -->
-<template>
-  <div class="flex flex-col gap-16px">
-    <el-row :gutter="16">
-      <!-- 时间操作符选择 -->
-      <el-col :span="8">
-        <el-form-item label="时间条件" required>
-          <el-select
-            :model-value="condition.operator"
-            @update:model-value="(value) => updateConditionField('operator', value)"
-            placeholder="请选择时间条件"
-            class="w-full"
-          >
-            <el-option
-              v-for="option in timeOperatorOptions"
-              :key="option.value"
-              :label="option.label"
-              :value="option.value"
-            >
-              <div class="flex items-center justify-between w-full">
-                <div class="flex items-center gap-8px">
-                  <Icon :icon="option.icon" :class="option.iconClass" />
-                  <span>{{ option.label }}</span>
-                </div>
-                <el-tag :type="option.tag as any" size="small">{{ option.category }}</el-tag>
-              </div>
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
+<script setup lang="ts">
+import type { TriggerCondition } from '#/api/iot/rule/scene';
 
-      <!-- 时间值输入 -->
-      <el-col :span="8">
-        <el-form-item label="时间值" required>
-          <el-time-picker
-            v-if="needsTimeInput"
-            :model-value="timeValue"
-            @update:model-value="handleTimeValueChange"
-            placeholder="请选择时间"
-            format="HH:mm:ss"
-            value-format="HH:mm:ss"
-            class="w-full"
-          />
-          <el-date-picker
-            v-else-if="needsDateInput"
-            :model-value="timeValue"
-            @update:model-value="handleTimeValueChange"
-            type="datetime"
-            placeholder="请选择日期时间"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            class="w-full"
-          />
-          <div v-else class="text-[var(--el-text-color-placeholder)] text-14px">
-            无需设置时间值
-          </div>
-        </el-form-item>
-      </el-col>
+import { computed, watch } from 'vue';
 
-      <!-- 第二个时间值（范围条件） -->
-      <el-col :span="8" v-if="needsSecondTimeInput">
-        <el-form-item label="结束时间" required>
-          <el-time-picker
-            v-if="needsTimeInput"
-            :model-value="timeValue2"
-            @update:model-value="handleTimeValue2Change"
-            placeholder="请选择结束时间"
-            format="HH:mm:ss"
-            value-format="HH:mm:ss"
-            class="w-full"
-          />
-          <el-date-picker
-            v-else
-            :model-value="timeValue2"
-            @update:model-value="handleTimeValue2Change"
-            type="datetime"
-            placeholder="请选择结束日期时间"
-            format="YYYY-MM-DD HH:mm:ss"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            class="w-full"
-          />
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </div>
-</template>
+import { IconifyIcon } from '@vben/icons';
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import { IotRuleSceneTriggerTimeOperatorEnum } from '#/views/iot/utils/constants'
-import type { TriggerCondition } from '#/api/iot/rule/scene'
+import { useVModel } from '@vueuse/core';
+import {
+  Col,
+  DatePicker,
+  Form,
+  Row,
+  Select,
+  Tag,
+  TimePicker,
+} from 'ant-design-vue';
+
+import { IotRuleSceneTriggerTimeOperatorEnum } from '#/views/iot/utils/constants';
 
 /** 当前时间条件配置组件 */
-defineOptions({ name: 'CurrentTimeConditionConfig' })
+defineOptions({ name: 'CurrentTimeConditionConfig' });
 
 const props = defineProps<{
-  modelValue: TriggerCondition
-}>()
+  modelValue: TriggerCondition;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: TriggerCondition): void
-}>()
+  (e: 'update:modelValue', value: TriggerCondition): void;
+}>();
 
-const condition = useVModel(props, 'modelValue', emit)
+const condition = useVModel(props, 'modelValue', emit);
 
 // 时间操作符选项
 const timeOperatorOptions = [
@@ -111,7 +40,7 @@ const timeOperatorOptions = [
     icon: 'ep:arrow-left',
     iconClass: 'text-blue-500',
     tag: 'primary',
-    category: '时间点'
+    category: '时间点',
   },
   {
     value: IotRuleSceneTriggerTimeOperatorEnum.AFTER_TIME.value,
@@ -119,7 +48,7 @@ const timeOperatorOptions = [
     icon: 'ep:arrow-right',
     iconClass: 'text-green-500',
     tag: 'success',
-    category: '时间点'
+    category: '时间点',
   },
   {
     value: IotRuleSceneTriggerTimeOperatorEnum.BETWEEN_TIME.value,
@@ -127,7 +56,7 @@ const timeOperatorOptions = [
     icon: 'ep:sort',
     iconClass: 'text-orange-500',
     tag: 'warning',
-    category: '时间段'
+    category: '时间段',
   },
   {
     value: IotRuleSceneTriggerTimeOperatorEnum.AT_TIME.value,
@@ -135,7 +64,7 @@ const timeOperatorOptions = [
     icon: 'ep:position',
     iconClass: 'text-purple-500',
     tag: 'info',
-    category: '时间点'
+    category: '时间点',
   },
   {
     value: IotRuleSceneTriggerTimeOperatorEnum.TODAY.value,
@@ -143,9 +72,9 @@ const timeOperatorOptions = [
     icon: 'ep:calendar',
     iconClass: 'text-red-500',
     tag: 'danger',
-    category: '日期'
-  }
-]
+    category: '日期',
+  },
+];
 
 // 计算属性：是否需要时间输入
 const needsTimeInput = computed(() => {
@@ -153,68 +82,73 @@ const needsTimeInput = computed(() => {
     IotRuleSceneTriggerTimeOperatorEnum.BEFORE_TIME.value,
     IotRuleSceneTriggerTimeOperatorEnum.AFTER_TIME.value,
     IotRuleSceneTriggerTimeOperatorEnum.BETWEEN_TIME.value,
-    IotRuleSceneTriggerTimeOperatorEnum.AT_TIME.value
-  ]
-  return timeOnlyOperators.includes(condition.value.operator as any)
-})
+    IotRuleSceneTriggerTimeOperatorEnum.AT_TIME.value,
+  ];
+  return timeOnlyOperators.includes(condition.value.operator as any);
+});
 
 // 计算属性：是否需要日期输入
 const needsDateInput = computed(() => {
-  return false // 暂时不支持日期输入，只支持时间
-})
+  return false; // 暂时不支持日期输入，只支持时间
+});
 
 // 计算属性：是否需要第二个时间输入
 const needsSecondTimeInput = computed(() => {
-  return condition.value.operator === IotRuleSceneTriggerTimeOperatorEnum.BETWEEN_TIME.value
-})
+  return (
+    condition.value.operator ===
+    IotRuleSceneTriggerTimeOperatorEnum.BETWEEN_TIME.value
+  );
+});
 
 // 计算属性：从 param 中解析时间值
 const timeValue = computed(() => {
-  if (!condition.value.param) return ''
-  const params = condition.value.param.split(',')
-  return params[0] || ''
-})
+  if (!condition.value.param) return '';
+  const params = condition.value.param.split(',');
+  return params[0] || '';
+});
 
 // 计算属性：从 param 中解析第二个时间值
 const timeValue2 = computed(() => {
-  if (!condition.value.param) return ''
-  const params = condition.value.param.split(',')
-  return params[1] || ''
-})
+  if (!condition.value.param) return '';
+  const params = condition.value.param.split(',');
+  return params[1] || '';
+});
 
 /**
  * 更新条件字段
  * @param field 字段名
  * @param value 字段值
  */
-const updateConditionField = (field: any, value: any) => {
-  condition.value[field] = value
+function updateConditionField(field: any, value: any) {
+  condition.value[field] = value;
 }
 
 /**
  * 处理第一个时间值变化
  * @param value 时间值
  */
-const handleTimeValueChange = (value: string) => {
-  const currentParams = condition.value.param ? condition.value.param.split(',') : []
-  currentParams[0] = value || ''
+function handleTimeValueChange(value: string) {
+  const currentParams = condition.value.param
+    ? condition.value.param.split(',')
+    : [];
+  currentParams[0] = value || '';
 
   // 如果是范围条件，保留第二个值；否则只保留第一个值
-  if (needsSecondTimeInput.value) {
-    condition.value.param = currentParams.slice(0, 2).join(',')
-  } else {
-    condition.value.param = currentParams[0]
-  }
+  condition.value.param = needsSecondTimeInput.value
+    ? currentParams.slice(0, 2).join(',')
+    : currentParams[0];
 }
 
 /**
  * 处理第二个时间值变化
  * @param value 时间值
  */
-const handleTimeValue2Change = (value: string) => {
-  const currentParams = condition.value.param ? condition.value.param.split(',') : ['']
-  currentParams[1] = value || ''
-  condition.value.param = currentParams.slice(0, 2).join(',')
+function handleTimeValue2Change(value: string) {
+  const currentParams = condition.value.param
+    ? condition.value.param.split(',')
+    : [''];
+  currentParams[1] = value || '';
+  condition.value.param = currentParams.slice(0, 2).join(',');
 }
 
 /** 监听操作符变化，清理不相关的时间值 */
@@ -223,12 +157,104 @@ watch(
   (newOperator) => {
     if (newOperator === IotRuleSceneTriggerTimeOperatorEnum.TODAY.value) {
       // 今日条件不需要时间参数
-      condition.value.param = ''
+      condition.value.param = '';
     } else if (!needsSecondTimeInput.value) {
       // 非范围条件只保留第一个时间值
-      const currentParams = condition.value.param ? condition.value.param.split(',') : []
-      condition.value.param = currentParams[0] || ''
+      const currentParams = condition.value.param
+        ? condition.value.param.split(',')
+        : [];
+      condition.value.param = currentParams[0] || '';
     }
-  }
-)
+  },
+);
 </script>
+
+<template>
+  <div class="gap-16px flex flex-col">
+    <Row :gutter="16">
+      <!-- 时间操作符选择 -->
+      <Col :span="8">
+        <Form.Item label="时间条件" required>
+          <Select
+            :model-value="condition.operator"
+            @update:model-value="
+              (value: any) => updateConditionField('operator', value)
+            "
+            placeholder="请选择时间条件"
+            class="w-full"
+          >
+            <Select.Option
+              v-for="option in timeOperatorOptions"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
+            >
+              <div class="flex w-full items-center justify-between">
+                <div class="gap-8px flex items-center">
+                  <IconifyIcon :icon="option.icon" :class="option.iconClass" />
+                  <span>{{ option.label }}</span>
+                </div>
+                <Tag :type="option.tag as any" size="small">
+                  {{ option.category }}
+                </Tag>
+              </div>
+            </Select.Option>
+          </Select>
+        </Form.Item>
+      </Col>
+
+      <!-- 时间值输入 -->
+      <Col :span="8">
+        <Form.Item label="时间值" required>
+          <TimePicker
+            v-if="needsTimeInput"
+            :model-value="timeValue"
+            @update:model-value="handleTimeValueChange"
+            placeholder="请选择时间"
+            format="HH:mm:ss"
+            value-format="HH:mm:ss"
+            class="w-full"
+          />
+          <DatePicker
+            v-else-if="needsDateInput"
+            :model-value="timeValue"
+            @update:model-value="handleTimeValueChange"
+            type="datetime"
+            placeholder="请选择日期时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            class="w-full"
+          />
+          <div v-else class="text-14px text-[var(--el-text-color-placeholder)]">
+            无需设置时间值
+          </div>
+        </Form.Item>
+      </Col>
+
+      <!-- 第二个时间值（范围条件） -->
+      <Col :span="8" v-if="needsSecondTimeInput">
+        <Form.Item label="结束时间" required>
+          <TimePicker
+            v-if="needsTimeInput"
+            :model-value="timeValue2"
+            @update:model-value="handleTimeValue2Change"
+            placeholder="请选择结束时间"
+            format="HH:mm:ss"
+            value-format="HH:mm:ss"
+            class="w-full"
+          />
+          <DatePicker
+            v-else
+            :model-value="timeValue2"
+            @update:model-value="handleTimeValue2Change"
+            type="datetime"
+            placeholder="请选择结束日期时间"
+            format="YYYY-MM-DD HH:mm:ss"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            class="w-full"
+          />
+        </Form.Item>
+      </Col>
+    </Row>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceControlConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceControlConfig.vue
index 2b18ccee1fb8d97b5594a2deb6806bdff9ab0550..00f7fc0f116ed6a6a2c80cb4caa57a9fa0859e57 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceControlConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceControlConfig.vue
@@ -1,159 +1,100 @@
 <!-- 设备控制配置组件 -->
-<template>
-  <div class="flex flex-col gap-16px">
-    <!-- 产品和设备选择 - 与触发器保持一致的分离式选择器 -->
-    <el-row :gutter="16">
-      <el-col :span="12">
-        <el-form-item label="产品" required>
-          <ProductSelector v-model="action.productId" @change="handleProductChange" />
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item label="设备" required>
-          <DeviceSelector
-            v-model="action.deviceId"
-            :product-id="action.productId"
-            @change="handleDeviceChange"
-          />
-        </el-form-item>
-      </el-col>
-    </el-row>
+<script setup lang="ts">
+import type { Action } from '#/api/iot/rule/scene';
+import type {
+  ThingModelProperty,
+  ThingModelService,
+} from '#/api/iot/thingmodel';
 
-    <!-- 服务选择 - 服务调用类型时显示 -->
-    <div v-if="action.productId && isServiceInvokeAction" class="space-y-16px">
-      <el-form-item label="服务" required>
-        <el-select
-          v-model="action.identifier"
-          placeholder="请选择服务"
-          filterable
-          clearable
-          class="w-full"
-          :loading="loadingServices"
-          @change="handleServiceChange"
-        >
-          <el-option
-            v-for="service in serviceList"
-            :key="service.identifier"
-            :label="service.name"
-            :value="service.identifier"
-          >
-            <div class="flex items-center justify-between">
-              <span>{{ service.name }}</span>
-              <el-tag :type="service.callType === 'sync' ? 'primary' : 'success'" size="small">
-                {{ service.callType === 'sync' ? '同步' : '异步' }}
-              </el-tag>
-            </div>
-          </el-option>
-        </el-select>
-      </el-form-item>
+import { computed, onMounted, ref, watch } from 'vue';
 
-      <!-- 服务参数配置 -->
-      <div v-if="action.identifier" class="space-y-16px">
-        <el-form-item label="服务参数" required>
-          <JsonParamsInput
-            v-model="paramsValue"
-            type="service"
-            :config="{ service: selectedService } as any"
-            placeholder="请输入 JSON 格式的服务参数"
-          />
-        </el-form-item>
-      </div>
-    </div>
+import { isObject } from '@vben/utils';
 
-    <!-- 控制参数配置 - 属性设置类型时显示 -->
-    <div v-if="action.productId && isPropertySetAction" class="space-y-16px">
-      <!-- 参数配置 -->
-      <el-form-item label="参数" required>
-        <JsonParamsInput
-          v-model="paramsValue"
-          type="property"
-          :config="{ properties: thingModelProperties }"
-          placeholder="请输入 JSON 格式的控制参数"
-        />
-      </el-form-item>
-    </div>
-  </div>
-</template>
+import { useVModel } from '@vueuse/core';
+import { Col, Form, Row, Select, Tag } from 'ant-design-vue';
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import ProductSelector from '../selectors/ProductSelector.vue'
-import DeviceSelector from '../selectors/DeviceSelector.vue'
-import JsonParamsInput from '../inputs/JsonParamsInput.vue'
-import type { Action } from '#/api/iot/rule/scene'
-import type { ThingModelProperty, ThingModelService } from '#/api/iot/thingmodel'
+import { getThingModelListByProductId } from '#/api/iot/thingmodel';
 import {
+  IoTDataSpecsDataTypeEnum,
   IotRuleSceneActionTypeEnum,
   IoTThingModelAccessModeEnum,
-  IoTDataSpecsDataTypeEnum
-} from '#/views/iot/utils/constants'
-import { ThingModelApi } from '#/api/iot/thingmodel'
+} from '#/views/iot/utils/constants';
+
+import JsonParamsInput from '../inputs/JsonParamsInput.vue';
+import DeviceSelector from '../selectors/DeviceSelector.vue';
+import ProductSelector from '../selectors/ProductSelector.vue';
 
 /** 设备控制配置组件 */
-defineOptions({ name: 'DeviceControlConfig' })
+defineOptions({ name: 'DeviceControlConfig' });
 
 const props = defineProps<{
-  modelValue: Action
-}>()
+  modelValue: Action;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: Action): void
-}>()
+  (e: 'update:modelValue', value: Action): void;
+}>();
 
-const action = useVModel(props, 'modelValue', emit)
+const action = useVModel(props, 'modelValue', emit);
 
-const thingModelProperties = ref<ThingModelProperty[]>([]) // 物模型属性列表
-const loadingThingModel = ref(false) // 物模型加载状态
-const selectedService = ref<ThingModelService | null>(null) // 选中的服务对象
-const serviceList = ref<ThingModelService[]>([]) // 服务列表
-const loadingServices = ref(false) // 服务加载状态
+const thingModelProperties = ref<ThingModelProperty[]>([]); // 物模型属性列表
+const loadingThingModel = ref(false); // 物模型加载状态
+const selectedService = ref<null | ThingModelService>(null); // 选中的服务对象
+const serviceList = ref<ThingModelService[]>([]); // 服务列表
+const loadingServices = ref(false); // 服务加载状态
 
 // 参数值的计算属性，用于双向绑定
 const paramsValue = computed({
   get: () => {
     // 如果 params 是对象，转换为 JSON 字符串（兼容旧数据）
-    if (action.value.params && typeof action.value.params === 'object') {
-      return JSON.stringify(action.value.params, null, 2)
+    if (action.value.params && isObject(action.value.params)) {
+      return JSON.stringify(action.value.params, null, 2);
     }
     // 如果 params 已经是字符串，直接返回
-    return action.value.params || ''
+    return action.value.params || '';
   },
   set: (value: string) => {
     // 直接保存为 JSON 字符串，不进行解析转换
-    action.value.params = value.trim() || ''
-  }
-})
+    action.value.params = value.trim() || '';
+  },
+});
 
 // 计算属性：是否为属性设置类型
 const isPropertySetAction = computed(() => {
-  return action.value.type === IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET
-})
+  return (
+    action.value.type ===
+    IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET.toString()
+  );
+});
 
 // 计算属性：是否为服务调用类型
 const isServiceInvokeAction = computed(() => {
-  return action.value.type === IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE
-})
+  return (
+    action.value.type ===
+    IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE.toString()
+  );
+});
 
 /**
  * 处理产品变化事件
  * @param productId 产品 ID
  */
-const handleProductChange = (productId?: number) => {
+function handleProductChange(productId?: number) {
   // 当产品变化时，清空设备选择和参数配置
   if (action.value.productId !== productId) {
-    action.value.deviceId = undefined
-    action.value.identifier = undefined // 清空服务标识符
-    action.value.params = '' // 清空参数，保存为空字符串
-    selectedService.value = null // 清空选中的服务
-    serviceList.value = [] // 清空服务列表
+    action.value.deviceId = undefined;
+    action.value.identifier = undefined; // 清空服务标识符
+    action.value.params = ''; // 清空参数，保存为空字符串
+    selectedService.value = null; // 清空选中的服务
+    serviceList.value = []; // 清空服务列表
   }
 
   // 加载新产品的物模型属性或服务列表
   if (productId) {
     if (isPropertySetAction.value) {
-      loadThingModelProperties(productId)
+      loadThingModelProperties(productId);
     } else if (isServiceInvokeAction.value) {
-      loadServiceList(productId)
+      loadServiceList(productId);
     }
   }
 }
@@ -162,10 +103,10 @@ const handleProductChange = (productId?: number) => {
  * 处理设备变化事件
  * @param deviceId 设备 ID
  */
-const handleDeviceChange = (deviceId?: number) => {
+function handleDeviceChange(deviceId?: number) {
   // 当设备变化时，清空参数配置
   if (action.value.deviceId !== deviceId) {
-    action.value.params = '' // 清空参数，保存为空字符串
+    action.value.params = ''; // 清空参数，保存为空字符串
   }
 }
 
@@ -173,22 +114,23 @@ const handleDeviceChange = (deviceId?: number) => {
  * 处理服务变化事件
  * @param serviceIdentifier 服务标识符
  */
-const handleServiceChange = (serviceIdentifier?: string) => {
+function handleServiceChange(serviceIdentifier?: any) {
   // 根据服务标识符找到对应的服务对象
-  const service = serviceList.value.find((s) => s.identifier === serviceIdentifier) || null
-  selectedService.value = service
+  const service =
+    serviceList.value.find((s) => s.identifier === serviceIdentifier) || null;
+  selectedService.value = service;
 
   // 当服务变化时，清空参数配置
-  action.value.params = ''
+  action.value.params = '';
 
   // 如果选择了服务且有输入参数，生成默认参数结构
   if (service && service.inputParams && service.inputParams.length > 0) {
-    const defaultParams = {}
+    const defaultParams = {};
     service.inputParams.forEach((param) => {
-      defaultParams[param.identifier] = getDefaultValueForParam(param)
-    })
+      defaultParams[param.identifier] = getDefaultValueForParam(param);
+    });
     // 将默认参数转换为 JSON 字符串保存
-    action.value.params = JSON.stringify(defaultParams, null, 2)
+    action.value.params = JSON.stringify(defaultParams, null, 2);
   }
 }
 
@@ -197,14 +139,14 @@ const handleServiceChange = (serviceIdentifier?: string) => {
  * @param productId 产品ID
  * @returns 物模型TSL数据
  */
-const getThingModelTSL = async (productId: number) => {
-  if (!productId) return null
+async function getThingModelTSL(productId: number) {
+  if (!productId) return null;
 
   try {
-    return await ThingModelApi.getThingModelTSLByProductId(productId)
+    return await getThingModelListByProductId(productId);
   } catch (error) {
-    console.error('获取物模型TSL数据失败:', error)
-    return null
+    console.error('获取物模型TSL数据失败:', error);
+    return null;
   }
 }
 
@@ -212,19 +154,19 @@ const getThingModelTSL = async (productId: number) => {
  * 加载物模型属性（可写属性）
  * @param productId 产品ID
  */
-const loadThingModelProperties = async (productId: number) => {
+async function loadThingModelProperties(productId: number) {
   if (!productId) {
-    thingModelProperties.value = []
-    return
+    thingModelProperties.value = [];
+    return;
   }
 
   try {
-    loadingThingModel.value = true
-    const tslData = await getThingModelTSL(productId)
+    loadingThingModel.value = true;
+    const tslData = await getThingModelTSL(productId);
 
     if (!tslData?.properties) {
-      thingModelProperties.value = []
-      return
+      thingModelProperties.value = [];
+      return;
     }
 
     // 过滤出可写的属性（accessMode 包含 'w'）
@@ -232,13 +174,13 @@ const loadThingModelProperties = async (productId: number) => {
       (property: ThingModelProperty) =>
         property.accessMode &&
         (property.accessMode === IoTThingModelAccessModeEnum.READ_WRITE.value ||
-          property.accessMode === IoTThingModelAccessModeEnum.WRITE_ONLY.value)
-    )
+          property.accessMode === IoTThingModelAccessModeEnum.WRITE_ONLY.value),
+    );
   } catch (error) {
-    console.error('加载物模型属性失败:', error)
-    thingModelProperties.value = []
+    console.error('加载物模型属性失败:', error);
+    thingModelProperties.value = [];
   } finally {
-    loadingThingModel.value = false
+    loadingThingModel.value = false;
   }
 }
 
@@ -246,27 +188,27 @@ const loadThingModelProperties = async (productId: number) => {
  * 加载服务列表
  * @param productId 产品ID
  */
-const loadServiceList = async (productId: number) => {
+async function loadServiceList(productId: number) {
   if (!productId) {
-    serviceList.value = []
-    return
+    serviceList.value = [];
+    return;
   }
 
   try {
-    loadingServices.value = true
-    const tslData = await getThingModelTSL(productId)
+    loadingServices.value = true;
+    const tslData = await getThingModelTSL(productId);
 
     if (!tslData?.services) {
-      serviceList.value = []
-      return
+      serviceList.value = [];
+      return;
     }
 
-    serviceList.value = tslData.services
+    serviceList.value = tslData.services;
   } catch (error) {
-    console.error('加载服务列表失败:', error)
-    serviceList.value = []
+    console.error('加载服务列表失败:', error);
+    serviceList.value = [];
   } finally {
-    loadingServices.value = false
+    loadingServices.value = false;
   }
 }
 
@@ -275,14 +217,19 @@ const loadServiceList = async (productId: number) => {
  * @param productId 产品ID
  * @param serviceIdentifier 服务标识符
  */
-const loadServiceFromTSL = async (productId: number, serviceIdentifier: string) => {
+async function loadServiceFromTSL(
+  productId: number,
+  serviceIdentifier: string,
+) {
   // 先加载服务列表
-  await loadServiceList(productId)
+  await loadServiceList(productId);
 
   // 然后设置选中的服务
-  const service = serviceList.value.find((s: any) => s.identifier === serviceIdentifier)
+  const service = serviceList.value.find(
+    (s: any) => s.identifier === serviceIdentifier,
+  );
   if (service) {
-    selectedService.value = service
+    selectedService.value = service;
   }
 }
 
@@ -291,71 +238,84 @@ const loadServiceFromTSL = async (productId: number, serviceIdentifier: string)
  * @param param 参数对象
  * @returns 默认值
  */
-const getDefaultValueForParam = (param: any) => {
+function getDefaultValueForParam(param: any) {
   switch (param.dataType) {
-    case IoTDataSpecsDataTypeEnum.INT:
-      return 0
-    case IoTDataSpecsDataTypeEnum.FLOAT:
+    case IoTDataSpecsDataTypeEnum.BOOL: {
+      return false;
+    }
     case IoTDataSpecsDataTypeEnum.DOUBLE:
-      return 0.0
-    case IoTDataSpecsDataTypeEnum.BOOL:
-      return false
-    case IoTDataSpecsDataTypeEnum.TEXT:
-      return ''
-    case IoTDataSpecsDataTypeEnum.ENUM:
+    case IoTDataSpecsDataTypeEnum.FLOAT: {
+      return 0;
+    }
+    case IoTDataSpecsDataTypeEnum.ENUM: {
       // 如果有枚举值，使用第一个
-      if (param.dataSpecs?.dataSpecsList && param.dataSpecs.dataSpecsList.length > 0) {
-        return param.dataSpecs.dataSpecsList[0].value
+      if (
+        param.dataSpecs?.dataSpecsList &&
+        param.dataSpecs.dataSpecsList.length > 0
+      ) {
+        return param.dataSpecs.dataSpecsList[0].value;
       }
-      return ''
-    default:
-      return ''
+      return '';
+    }
+    case IoTDataSpecsDataTypeEnum.INT: {
+      return 0;
+    }
+    case IoTDataSpecsDataTypeEnum.TEXT: {
+      return '';
+    }
+    default: {
+      return '';
+    }
   }
 }
 
-const isInitialized = ref(false) // 防止重复初始化的标志
+const isInitialized = ref(false); // 防止重复初始化的标志
 
 /**
  * 初始化组件数据
  */
-const initializeComponent = async () => {
-  if (isInitialized.value) return
+async function initializeComponent() {
+  if (isInitialized.value) return;
 
-  const currentAction = action.value
-  if (!currentAction) return
+  const currentAction = action.value;
+  if (!currentAction) return;
 
   // 如果已经选择了产品且是属性设置类型，加载物模型
   if (currentAction.productId && isPropertySetAction.value) {
-    await loadThingModelProperties(currentAction.productId)
+    await loadThingModelProperties(currentAction.productId);
   }
 
   // 如果是服务调用类型且已有标识符，初始化服务选择
-  if (currentAction.productId && isServiceInvokeAction.value && currentAction.identifier) {
+  if (
+    currentAction.productId &&
+    isServiceInvokeAction.value &&
+    currentAction.identifier
+  ) {
     // 加载物模型TSL以获取服务信息
-    await loadServiceFromTSL(currentAction.productId, currentAction.identifier)
+    await loadServiceFromTSL(currentAction.productId, currentAction.identifier);
   }
 
-  isInitialized.value = true
+  isInitialized.value = true;
 }
 
 /** 组件初始化 */
 onMounted(() => {
-  initializeComponent()
-})
+  initializeComponent();
+});
 
 /** 监听关键字段的变化，避免深度监听导致的性能问题 */
 watch(
   () => [action.value.productId, action.value.type, action.value.identifier],
   async ([newProductId, , newIdentifier], [oldProductId, , oldIdentifier]) => {
     // 避免初始化时的重复调用
-    if (!isInitialized.value) return
+    if (!isInitialized.value) return;
 
     // 产品变化时重新加载数据
     if (newProductId !== oldProductId) {
       if (newProductId && isPropertySetAction.value) {
-        await loadThingModelProperties(newProductId as number)
+        await loadThingModelProperties(newProductId as number);
       } else if (newProductId && isServiceInvokeAction.value) {
-        await loadServiceList(newProductId as number)
+        await loadServiceList(newProductId as number);
       }
     }
 
@@ -366,11 +326,95 @@ watch(
       isServiceInvokeAction.value &&
       newIdentifier
     ) {
-      const service = serviceList.value.find((s: any) => s.identifier === newIdentifier)
+      const service = serviceList.value.find(
+        (s: any) => s.identifier === newIdentifier,
+      );
       if (service) {
-        selectedService.value = service
+        selectedService.value = service;
       }
     }
-  }
-)
+  },
+);
 </script>
+
+<template>
+  <div class="gap-16px flex flex-col">
+    <!-- 产品和设备选择 - 与触发器保持一致的分离式选择器 -->
+    <Row :gutter="16">
+      <Col :span="12">
+        <Form.Item label="产品" required>
+          <ProductSelector
+            v-model="action.productId"
+            @change="handleProductChange"
+          />
+        </Form.Item>
+      </Col>
+      <Col :span="12">
+        <Form.Item label="设备" required>
+          <DeviceSelector
+            v-model="action.deviceId"
+            :product-id="action.productId"
+            @change="handleDeviceChange"
+          />
+        </Form.Item>
+      </Col>
+    </Row>
+
+    <!-- 服务选择 - 服务调用类型时显示 -->
+    <div v-if="action.productId && isServiceInvokeAction" class="space-y-16px">
+      <Form.Item label="服务" required>
+        <Select
+          v-model="action.identifier"
+          placeholder="请选择服务"
+          filterable
+          clearable
+          class="w-full"
+          :loading="loadingServices"
+          @change="handleServiceChange"
+        >
+          <Select.Option
+            v-for="service in serviceList"
+            :key="service.identifier"
+            :label="service.name"
+            :value="service.identifier"
+          >
+            <div class="flex items-center justify-between">
+              <span>{{ service.name }}</span>
+              <Tag
+                :type="service.callType === 'sync' ? 'primary' : 'success'"
+                size="small"
+              >
+                {{ service.callType === 'sync' ? '同步' : '异步' }}
+              </Tag>
+            </div>
+          </Select.Option>
+        </Select>
+      </Form.Item>
+
+      <!-- 服务参数配置 -->
+      <div v-if="action.identifier" class="space-y-16px">
+        <Form.Item label="服务参数" required>
+          <JsonParamsInput
+            v-model="paramsValue"
+            type="service"
+            :config="{ service: selectedService } as any"
+            placeholder="请输入 JSON 格式的服务参数"
+          />
+        </Form.Item>
+      </div>
+    </div>
+
+    <!-- 控制参数配置 - 属性设置类型时显示 -->
+    <div v-if="action.productId && isPropertySetAction" class="space-y-16px">
+      <!-- 参数配置 -->
+      <Form.Item label="参数" required>
+        <JsonParamsInput
+          v-model="paramsValue"
+          type="property"
+          :config="{ properties: thingModelProperties }"
+          placeholder="请输入 JSON 格式的控制参数"
+        />
+      </Form.Item>
+    </div>
+  </div>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceTriggerConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceTriggerConfig.vue
index b458ec80ee988939bf020cf173437f5dbe64b036..f03e05d351dbe2c0554a8552b72efdd456f3dfa3 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceTriggerConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/DeviceTriggerConfig.vue
@@ -1,20 +1,115 @@
 <!-- 设备触发配置组件 -->
+<script setup lang="ts">
+import type { RuleSceneApi } from '#/api/iot/rule/scene';
+
+import { nextTick } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Tag } from 'ant-design-vue';
+
+import MainConditionInnerConfig from './MainConditionInnerConfig.vue';
+import SubConditionGroupConfig from './SubConditionGroupConfig.vue';
+
+/** 设备触发配置组件 */
+defineOptions({ name: 'DeviceTriggerConfig' });
+
+const props = defineProps<{
+  index: number;
+  modelValue: RuleSceneApi.Trigger;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: RuleSceneApi.Trigger): void;
+  (e: 'triggerTypeChange', type: number): void;
+}>();
+
+const trigger = useVModel(props, 'modelValue', emit);
+
+const maxSubGroups = 3; // 最多 3 个子条件组
+const maxConditionsPerGroup = 3; // 每组最多 3 个条件
+
+/**
+ * 更新条件
+ * @param condition 条件对象
+ */
+function updateCondition(condition: RuleSceneApi.Trigger) {
+  trigger.value = condition;
+}
+
+/**
+ * 处理触发器类型变化事件
+ * @param type 触发器类型
+ */
+function handleTriggerTypeChange(type: number) {
+  trigger.value.type = type.toString();
+  emit('triggerTypeChange', type);
+}
+
+/** 添加子条件组 */
+async function addSubGroup() {
+  if (!trigger.value.conditionGroups) {
+    trigger.value.conditionGroups = [];
+  }
+
+  // 检查是否达到最大子组数量限制
+  if (trigger.value.conditionGroups?.length >= maxSubGroups) {
+    return;
+  }
+
+  // 使用 nextTick 确保响应式更新完成后再添加新的子组
+  await nextTick();
+  if (trigger.value.conditionGroups) {
+    trigger.value.conditionGroups.push([] as any);
+  }
+}
+
+/**
+ * 移除子条件组
+ * @param index 子条件组索引
+ */
+function removeSubGroup(index: number) {
+  if (trigger.value.conditionGroups) {
+    trigger.value.conditionGroups.splice(index, 1);
+  }
+}
+
+/**
+ * 更新子条件组
+ * @param index 子条件组索引
+ * @param subGroup 子条件组数据
+ */
+function updateSubGroup(index: number, subGroup: any) {
+  if (trigger.value.conditionGroups) {
+    trigger.value.conditionGroups[index] = subGroup;
+  }
+}
+
+/** 移除整个条件组 */
+function removeConditionGroup() {
+  trigger.value.conditionGroups = undefined;
+}
+</script>
+
 <template>
-  <div class="flex flex-col gap-16px">
+  <div class="gap-16px flex flex-col">
     <!-- 主条件配置 - 默认直接展示 -->
     <div class="space-y-16px">
       <!-- 主条件配置 -->
-      <div class="flex flex-col gap-16px">
+      <div class="gap-16px flex flex-col">
         <!-- 主条件配置 -->
         <div class="space-y-16px">
           <!-- 主条件头部 - 与附加条件组保持一致的绿色风格 -->
           <div
-            class="flex items-center justify-between p-16px bg-gradient-to-r from-green-50 to-emerald-50 border border-green-200 rounded-8px"
+            class="p-16px rounded-8px flex items-center justify-between border border-green-200 bg-gradient-to-r from-green-50 to-emerald-50"
           >
-            <div class="flex items-center gap-12px">
-              <div class="flex items-center gap-8px text-16px font-600 text-green-700">
+            <div class="gap-12px flex items-center">
+              <div
+                class="gap-8px text-16px font-600 flex items-center text-green-700"
+              >
                 <div
-                  class="w-24px h-24px bg-green-500 text-white rounded-full flex items-center justify-center text-12px font-bold"
+                  class="w-24px h-24px text-12px flex items-center justify-center rounded-full bg-green-500 font-bold text-white"
                 >
                   主
                 </div>
@@ -28,7 +123,7 @@
           <MainConditionInnerConfig
             :model-value="trigger"
             @update:model-value="updateCondition"
-            :trigger-type="trigger.type"
+            :trigger-type="trigger.type as any"
             @trigger-type-change="handleTriggerTypeChange"
           />
         </div>
@@ -38,15 +133,17 @@
     <!-- 条件组配置 -->
     <div class="space-y-16px">
       <!-- 条件组配置 -->
-      <div class="flex flex-col gap-16px">
+      <div class="gap-16px flex flex-col">
         <!-- 条件组容器头部 -->
         <div
-          class="flex items-center justify-between p-16px bg-gradient-to-r from-green-50 to-emerald-50 border border-green-200 rounded-8px"
+          class="p-16px rounded-8px flex items-center justify-between border border-green-200 bg-gradient-to-r from-green-50 to-emerald-50"
         >
-          <div class="flex items-center gap-12px">
-            <div class="flex items-center gap-8px text-16px font-600 text-green-700">
+          <div class="gap-12px flex items-center">
+            <div
+              class="gap-8px text-16px font-600 flex items-center text-green-700"
+            >
               <div
-                class="w-24px h-24px bg-green-500 text-white rounded-full flex items-center justify-center text-12px font-bold"
+                class="w-24px h-24px text-12px flex items-center justify-center rounded-full bg-green-500 font-bold text-white"
               >
                 组
               </div>
@@ -57,20 +154,20 @@
               {{ trigger.conditionGroups?.length || 0 }} 个子条件组
             </el-tag>
           </div>
-          <div class="flex items-center gap-8px">
-            <el-button
+          <div class="gap-8px flex items-center">
+            <Button
               type="primary"
               size="small"
               @click="addSubGroup"
               :disabled="(trigger.conditionGroups?.length || 0) >= maxSubGroups"
             >
-              <Icon icon="ep:plus" />
+              <IconifyIcon icon="ep:plus" />
               添加子条件组
-            </el-button>
-            <el-button type="danger" size="small" text @click="removeConditionGroup">
-              <Icon icon="ep:delete" />
+            </Button>
+            <Button danger size="small" text @click="removeConditionGroup">
+              <IconifyIcon icon="ep:delete" />
               删除条件组
-            </el-button>
+            </Button>
           </div>
         </div>
 
@@ -88,53 +185,63 @@
             >
               <!-- 子条件组容器 -->
               <div
-                class="border-2 border-orange-200 rounded-8px bg-orange-50 shadow-sm hover:shadow-md transition-shadow"
+                class="rounded-8px border-2 border-orange-200 bg-orange-50 shadow-sm transition-shadow hover:shadow-md"
               >
                 <div
-                  class="flex items-center justify-between p-16px bg-gradient-to-r from-orange-50 to-yellow-50 border-b border-orange-200 rounded-t-6px"
+                  class="p-16px rounded-t-6px flex items-center justify-between border-b border-orange-200 bg-gradient-to-r from-orange-50 to-yellow-50"
                 >
-                  <div class="flex items-center gap-12px">
-                    <div class="flex items-center gap-8px text-16px font-600 text-orange-700">
+                  <div class="gap-12px flex items-center">
+                    <div
+                      class="gap-8px text-16px font-600 flex items-center text-orange-700"
+                    >
                       <div
-                        class="w-24px h-24px bg-orange-500 text-white rounded-full flex items-center justify-center text-12px font-bold"
+                        class="w-24px h-24px text-12px flex items-center justify-center rounded-full bg-orange-500 font-bold text-white"
                       >
                         {{ subGroupIndex + 1 }}
                       </div>
                       <span>子条件组 {{ subGroupIndex + 1 }}</span>
                     </div>
-                    <el-tag size="small" type="warning" class="font-500">组内条件为"且"关系</el-tag>
-                    <el-tag size="small" type="info"> {{ subGroup?.length || 0 }}个条件 </el-tag>
+                    <Tag size="small" type="warning" class="font-500">
+                      组内条件为"且"关系
+                    </Tag>
+                    <Tag size="small" type="info">
+                      {{ (subGroup as any)?.length || 0 }}个条件
+                    </Tag>
                   </div>
-                  <el-button
-                    type="danger"
+                  <Button
+                    danger
                     size="small"
                     text
                     @click="removeSubGroup(subGroupIndex)"
                     class="hover:bg-red-50"
                   >
-                    <Icon icon="ep:delete" />
+                    <IconifyIcon icon="ep:delete" />
                     删除组
-                  </el-button>
+                  </Button>
                 </div>
 
                 <SubConditionGroupConfig
-                  :model-value="subGroup"
-                  @update:model-value="(value) => updateSubGroup(subGroupIndex, value)"
-                  :trigger-type="trigger.type"
+                  :model-value="subGroup as any"
+                  @update:model-value="
+                    (value) => updateSubGroup(subGroupIndex, value)
+                  "
+                  :trigger-type="trigger.type as any"
                   :max-conditions="maxConditionsPerGroup"
                 />
               </div>
 
-              <!-- 子条件组间的"或"连接符 -->
+              <!-- 子条件组间的'或'连接符 -->
               <div
                 v-if="subGroupIndex < trigger.conditionGroups!.length - 1"
-                class="flex items-center justify-center py-12px"
+                class="py-12px flex items-center justify-center"
               >
-                <div class="flex items-center gap-8px">
+                <div class="gap-8px flex items-center">
                   <!-- 连接线 -->
                   <div class="w-32px h-1px bg-orange-300"></div>
                   <!-- 或标签 -->
-                  <div class="px-16px py-6px bg-orange-100 border-2 border-orange-300 rounded-full">
+                  <div
+                    class="px-16px py-6px rounded-full border-2 border-orange-300 bg-orange-100"
+                  >
                     <span class="text-14px font-600 text-orange-600">或</span>
                   </div>
                   <!-- 连接线 -->
@@ -148,10 +255,10 @@
         <!-- 空状态 -->
         <div
           v-else
-          class="p-24px border-2 border-dashed border-orange-200 rounded-8px text-center bg-orange-50"
+          class="p-24px rounded-8px border-2 border-dashed border-orange-200 bg-orange-50 text-center"
         >
-          <div class="flex flex-col items-center gap-12px">
-            <Icon icon="ep:plus" class="text-32px text-orange-400" />
+          <div class="gap-12px flex flex-col items-center">
+            <IconifyIcon icon="ep:plus" class="text-32px text-orange-400" />
             <div class="text-orange-600">
               <p class="text-14px font-500 mb-4px">暂无子条件组</p>
               <p class="text-12px">点击上方"添加子条件组"按钮开始配置</p>
@@ -162,90 +269,3 @@
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-
-import MainConditionInnerConfig from './MainConditionInnerConfig.vue'
-import SubConditionGroupConfig from './SubConditionGroupConfig.vue'
-import type { Trigger } from '#/api/iot/rule/scene'
-
-/** 设备触发配置组件 */
-defineOptions({ name: 'DeviceTriggerConfig' })
-
-const props = defineProps<{
-  modelValue: Trigger
-  index: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: Trigger): void
-  (e: 'trigger-type-change', type: number): void
-}>()
-
-const trigger = useVModel(props, 'modelValue', emit)
-
-const maxSubGroups = 3 // 最多 3 个子条件组
-const maxConditionsPerGroup = 3 // 每组最多 3 个条件
-
-/**
- * 更新条件
- * @param condition 条件对象
- */
-const updateCondition = (condition: Trigger) => {
-  trigger.value = condition
-}
-
-/**
- * 处理触发器类型变化事件
- * @param type 触发器类型
- */
-const handleTriggerTypeChange = (type: number) => {
-  trigger.value.type = type
-  emit('trigger-type-change', type)
-}
-
-/** 添加子条件组 */
-const addSubGroup = async () => {
-  if (!trigger.value.conditionGroups) {
-    trigger.value.conditionGroups = []
-  }
-
-  // 检查是否达到最大子组数量限制
-  if (trigger.value.conditionGroups?.length >= maxSubGroups) {
-    return
-  }
-
-  // 使用 nextTick 确保响应式更新完成后再添加新的子组
-  await nextTick()
-  if (trigger.value.conditionGroups) {
-    trigger.value.conditionGroups.push([])
-  }
-}
-
-/**
- * 移除子条件组
- * @param index 子条件组索引
- */
-const removeSubGroup = (index: number) => {
-  if (trigger.value.conditionGroups) {
-    trigger.value.conditionGroups.splice(index, 1)
-  }
-}
-
-/**
- * 更新子条件组
- * @param index 子条件组索引
- * @param subGroup 子条件组数据
- */
-const updateSubGroup = (index: number, subGroup: any) => {
-  if (trigger.value.conditionGroups) {
-    trigger.value.conditionGroups[index] = subGroup
-  }
-}
-
-/** 移除整个条件组 */
-const removeConditionGroup = () => {
-  trigger.value.conditionGroups = undefined
-}
-</script>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
index 35c811792409d11c11ab6c569410398480a06372..98e43ad5f639585d870a6f93fafd43f265f234b6 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/MainConditionInnerConfig.vue
@@ -1,170 +1,371 @@
+<script setup lang="ts">
+import type { Trigger } from '#/api/iot/rule/scene';
+
+import { computed, ref } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { Col, Form, Row, Select } from 'ant-design-vue';
+
+import {
+  getTriggerTypeLabel,
+  IoTDeviceStatusEnum,
+  IotRuleSceneTriggerConditionParameterOperatorEnum,
+  IotRuleSceneTriggerTypeEnum,
+  triggerTypeOptions,
+} from '#/views/iot/utils/constants';
+
+import JsonParamsInput from '../inputs/JsonParamsInput.vue';
+import ValueInput from '../inputs/ValueInput.vue';
+import DeviceSelector from '../selectors/DeviceSelector.vue';
+import OperatorSelector from '../selectors/OperatorSelector.vue';
+import ProductSelector from '../selectors/ProductSelector.vue';
+import PropertySelector from '../selectors/PropertySelector.vue';
+
+/** 主条件内部配置组件 */
+defineOptions({ name: 'MainConditionInnerConfig' });
+
+const props = defineProps<{
+  modelValue: Trigger;
+  triggerType: number;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: Trigger): void;
+  (e: 'triggerTypeChange', value: number): void;
+}>();
+
+/** 获取设备状态变更选项（用于触发器配置） */
+const deviceStatusChangeOptions = [
+  {
+    label: IoTDeviceStatusEnum.ONLINE.label,
+    value: IoTDeviceStatusEnum.ONLINE.value,
+  },
+  {
+    label: IoTDeviceStatusEnum.OFFLINE.label,
+    value: IoTDeviceStatusEnum.OFFLINE.value,
+  },
+];
+
+const condition = useVModel(props, 'modelValue', emit);
+const propertyType = ref(''); // 属性类型
+const propertyConfig = ref<any>(null); // 属性配置
+
+// 计算属性：是否为设备属性触发器
+const isDevicePropertyTrigger = computed(() => {
+  return (
+    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST ||
+    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST ||
+    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
+  );
+});
+
+// 计算属性：是否为设备状态触发器
+const isDeviceStatusTrigger = computed(() => {
+  return props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE;
+});
+
+// 计算属性：是否需要操作符选择（服务调用和事件上报不需要操作符）
+const needsOperatorSelector = computed(() => {
+  const noOperatorTriggerTypes = [
+    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
+    IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
+  ] as number[];
+  return !noOperatorTriggerTypes.includes(props.triggerType);
+});
+
+// 计算属性：是否需要宽列布局（服务调用和事件上报不需要操作符列，所以值输入列更宽）
+const isWideValueColumn = computed(() => {
+  const wideColumnTriggerTypes = [
+    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
+    IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
+  ] as number[];
+  return wideColumnTriggerTypes.includes(props.triggerType);
+});
+
+// 计算属性：值输入字段的标签文本
+const valueInputLabel = computed(() => {
+  return props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
+    ? '服务参数'
+    : '比较值';
+});
+
+// 计算属性：服务配置 - 用于 JsonParamsInput
+const serviceConfig = computed(() => {
+  if (
+    propertyConfig.value &&
+    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
+  ) {
+    return {
+      service: {
+        name: propertyConfig.value.name || '服务',
+        inputParams: propertyConfig.value.inputParams || [],
+      },
+    };
+  }
+  return undefined;
+});
+
+// 计算属性：事件配置 - 用于 JsonParamsInput
+const eventConfig = computed(() => {
+  if (
+    propertyConfig.value &&
+    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST
+  ) {
+    return {
+      event: {
+        name: propertyConfig.value.name || '事件',
+        outputParams: propertyConfig.value.outputParams || [],
+      },
+    };
+  }
+  return undefined;
+});
+
+/**
+ * 更新条件字段
+ * @param field 字段名
+ * @param value 字段值
+ */
+function updateConditionField(field: any, value: any) {
+  (condition.value as any)[field] = value;
+}
+
+/**
+ * 处理触发器类型变化事件
+ * @param type 触发器类型
+ */
+function handleTriggerTypeChange(type: number) {
+  emit('triggerTypeChange', type);
+}
+
+/** 处理产品变化事件 */
+function handleProductChange() {
+  // 产品变化时清空设备和属性
+  condition.value.deviceId = undefined;
+  condition.value.identifier = '';
+}
+
+/** 处理设备变化事件 */
+function handleDeviceChange() {
+  // 设备变化时清空属性
+  condition.value.identifier = '';
+}
+
+/**
+ * 处理属性变化事件
+ * @param propertyInfo 属性信息对象
+ */
+function handlePropertyChange(propertyInfo: any) {
+  if (propertyInfo) {
+    propertyType.value = propertyInfo.type;
+    propertyConfig.value = propertyInfo.config;
+
+    // 对于事件上报和服务调用，自动设置操作符为 '='
+    if (
+      props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST ||
+      props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
+    ) {
+      condition.value.operator =
+        IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value;
+    }
+  }
+}
+</script>
+
 <template>
   <div class="space-y-16px">
     <!-- 触发事件类型选择 -->
-    <el-form-item label="触发事件类型" required>
-      <el-select
+    <Form.Item label="触发事件类型" required>
+      <Select
         :model-value="triggerType"
         @update:model-value="handleTriggerTypeChange"
         placeholder="请选择触发事件类型"
         class="w-full"
       >
-        <el-option
+        <Select.Option
           v-for="option in triggerTypeOptions"
           :key="option.value"
           :label="option.label"
           :value="option.value"
         />
-      </el-select>
-    </el-form-item>
+      </Select>
+    </Form.Item>
 
     <!-- 设备属性条件配置 -->
     <div v-if="isDevicePropertyTrigger" class="space-y-16px">
       <!-- 产品设备选择 -->
-      <el-row :gutter="16">
-        <el-col :span="12">
-          <el-form-item label="产品" required>
+      <Row :gutter="16">
+        <Col :span="12">
+          <Form.Item label="产品" required>
             <ProductSelector
               :model-value="condition.productId"
-              @update:model-value="(value) => updateConditionField('productId', value)"
+              @update:model-value="
+                (value) => updateConditionField('productId', value)
+              "
               @change="handleProductChange"
             />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="设备" required>
+          </Form.Item>
+        </Col>
+        <Col :span="12">
+          <Form.Item label="设备" required>
             <DeviceSelector
               :model-value="condition.deviceId"
-              @update:model-value="(value) => updateConditionField('deviceId', value)"
+              @update:model-value="
+                (value) => updateConditionField('deviceId', value)
+              "
               :product-id="condition.productId"
               @change="handleDeviceChange"
             />
-          </el-form-item>
-        </el-col>
-      </el-row>
+          </Form.Item>
+        </Col>
+      </Row>
 
       <!-- 属性配置 -->
-      <el-row :gutter="16">
+      <Row :gutter="16">
         <!-- 属性/事件/服务选择 -->
-        <el-col :span="6">
-          <el-form-item label="监控项" required>
+        <Col :span="6">
+          <Form.Item label="监控项" required>
             <PropertySelector
               :model-value="condition.identifier"
-              @update:model-value="(value) => updateConditionField('identifier', value)"
+              @update:model-value="
+                (value) => updateConditionField('identifier', value)
+              "
               :trigger-type="triggerType"
               :product-id="condition.productId"
               :device-id="condition.deviceId"
               @change="handlePropertyChange"
             />
-          </el-form-item>
-        </el-col>
+          </Form.Item>
+        </Col>
 
         <!-- 操作符选择 - 服务调用和事件上报不需要操作符 -->
-        <el-col v-if="needsOperatorSelector" :span="6">
-          <el-form-item label="操作符" required>
+        <Col v-if="needsOperatorSelector" :span="6">
+          <Form.Item label="操作符" required>
             <OperatorSelector
               :model-value="condition.operator"
-              @update:model-value="(value) => updateConditionField('operator', value)"
+              @update:model-value="
+                (value) => updateConditionField('operator', value)
+              "
               :property-type="propertyType"
             />
-          </el-form-item>
-        </el-col>
+          </Form.Item>
+        </Col>
 
         <!-- 值输入 -->
-        <el-col :span="isWideValueColumn ? 18 : 12">
-          <el-form-item :label="valueInputLabel" required>
+        <Col :span="isWideValueColumn ? 18 : 12">
+          <Form.Item :label="valueInputLabel" required>
             <!-- 服务调用参数配置 -->
             <JsonParamsInput
-              v-if="triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE"
+              v-if="
+                triggerType ===
+                IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
+              "
               v-model="condition.value"
               type="service"
-              :config="serviceConfig"
+              :config="serviceConfig as any"
               placeholder="请输入 JSON 格式的服务参数"
             />
             <!-- 事件上报参数配置 -->
             <JsonParamsInput
-              v-else-if="triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST"
+              v-else-if="
+                triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST
+              "
               v-model="condition.value"
               type="event"
-              :config="eventConfig"
+              :config="eventConfig as any"
               placeholder="请输入 JSON 格式的事件参数"
             />
             <!-- 普通值输入 -->
             <ValueInput
               v-else
               :model-value="condition.value"
-              @update:model-value="(value) => updateConditionField('value', value)"
+              @update:model-value="
+                (value) => updateConditionField('value', value)
+              "
               :property-type="propertyType"
               :operator="condition.operator"
               :property-config="propertyConfig"
             />
-          </el-form-item>
-        </el-col>
-      </el-row>
+          </Form.Item>
+        </Col>
+      </Row>
     </div>
 
     <!-- 设备状态条件配置 -->
     <div v-else-if="isDeviceStatusTrigger" class="space-y-16px">
       <!-- 设备状态触发器使用简化的配置 -->
-      <el-row :gutter="16">
-        <el-col :span="12">
-          <el-form-item label="产品" required>
+      <Row :gutter="16">
+        <Col :span="12">
+          <Form.Item label="产品" required>
             <ProductSelector
               :model-value="condition.productId"
-              @update:model-value="(value) => updateConditionField('productId', value)"
+              @update:model-value="
+                (value) => updateConditionField('productId', value)
+              "
               @change="handleProductChange"
             />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="设备" required>
+          </Form.Item>
+        </Col>
+        <Col :span="12">
+          <Form.Item label="设备" required>
             <DeviceSelector
               :model-value="condition.deviceId"
-              @update:model-value="(value) => updateConditionField('deviceId', value)"
+              @update:model-value="
+                (value) => updateConditionField('deviceId', value)
+              "
               :product-id="condition.productId"
               @change="handleDeviceChange"
             />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="16">
-        <el-col :span="6">
-          <el-form-item label="操作符" required>
-            <el-select
+          </Form.Item>
+        </Col>
+      </Row>
+      <Row :gutter="16">
+        <Col :span="6">
+          <Form.Item label="操作符" required>
+            <Select
               :model-value="condition.operator"
-              @update:model-value="(value) => updateConditionField('operator', value)"
+              @update:model-value="
+                (value: any) => updateConditionField('operator', value)
+              "
               placeholder="请选择操作符"
               class="w-full"
             >
-              <el-option
-                :label="IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.name"
-                :value="IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value"
+              <Select.Option
+                :label="
+                  IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.name
+                "
+                :value="
+                  IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value
+                "
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-          <el-form-item label="参数" required>
-            <el-select
+            </Select>
+          </Form.Item>
+        </Col>
+        <Col :span="6">
+          <Form.Item label="参数" required>
+            <Select
               :model-value="condition.value"
-              @update:model-value="(value) => updateConditionField('value', value)"
+              @update:model-value="
+                (value: any) => updateConditionField('value', value)
+              "
               placeholder="请选择操作符"
               class="w-full"
             >
-              <el-option
+              <Select.Option
                 v-for="option in deviceStatusChangeOptions"
                 :key="option.value"
                 :label="option.label"
                 :value="option.value"
               />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
+            </Select>
+          </Form.Item>
+        </Col>
+      </Row>
     </div>
 
     <!-- 其他触发类型的提示 -->
-    <div v-else class="text-center py-20px">
-      <p class="text-14px text-[var(--el-text-color-secondary)] mb-4px">
+    <div v-else class="py-20px text-center">
+      <p class="text-14px mb-4px text-[var(--el-text-color-secondary)]">
         当前触发事件类型：{{ getTriggerTypeLabel(triggerType) }}
       </p>
       <p class="text-12px text-[var(--el-text-color-placeholder)]">
@@ -173,168 +374,3 @@
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import ProductSelector from '../selectors/ProductSelector.vue'
-import DeviceSelector from '../selectors/DeviceSelector.vue'
-import PropertySelector from '../selectors/PropertySelector.vue'
-import OperatorSelector from '../selectors/OperatorSelector.vue'
-import ValueInput from '../inputs/ValueInput.vue'
-import JsonParamsInput from '../inputs/JsonParamsInput.vue'
-
-import type { Trigger } from '#/api/iot/rule/scene'
-import {
-  IotRuleSceneTriggerTypeEnum,
-  triggerTypeOptions,
-  getTriggerTypeLabel,
-  IotRuleSceneTriggerConditionParameterOperatorEnum,
-  IoTDeviceStatusEnum
-} from '#/views/iot/utils/constants'
-import { useVModel } from '@vueuse/core'
-
-/** 主条件内部配置组件 */
-defineOptions({ name: 'MainConditionInnerConfig' })
-
-const props = defineProps<{
-  modelValue: Trigger
-  triggerType: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: Trigger): void
-  (e: 'trigger-type-change', value: number): void
-}>()
-
-/** 获取设备状态变更选项（用于触发器配置） */
-const deviceStatusChangeOptions = [
-  {
-    label: IoTDeviceStatusEnum.ONLINE.label,
-    value: IoTDeviceStatusEnum.ONLINE.value
-  },
-  {
-    label: IoTDeviceStatusEnum.OFFLINE.label,
-    value: IoTDeviceStatusEnum.OFFLINE.value
-  }
-]
-
-const condition = useVModel(props, 'modelValue', emit)
-const propertyType = ref('') // 属性类型
-const propertyConfig = ref<any>(null) // 属性配置
-
-// 计算属性：是否为设备属性触发器
-const isDevicePropertyTrigger = computed(() => {
-  return (
-    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST ||
-    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST ||
-    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
-  )
-})
-
-// 计算属性：是否为设备状态触发器
-const isDeviceStatusTrigger = computed(() => {
-  return props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE
-})
-
-// 计算属性：是否需要操作符选择（服务调用和事件上报不需要操作符）
-const needsOperatorSelector = computed(() => {
-  const noOperatorTriggerTypes = [
-    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
-    IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST
-  ] as number[]
-  return !noOperatorTriggerTypes.includes(props.triggerType)
-})
-
-// 计算属性：是否需要宽列布局（服务调用和事件上报不需要操作符列，所以值输入列更宽）
-const isWideValueColumn = computed(() => {
-  const wideColumnTriggerTypes = [
-    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
-    IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST
-  ] as number[]
-  return wideColumnTriggerTypes.includes(props.triggerType)
-})
-
-// 计算属性：值输入字段的标签文本
-const valueInputLabel = computed(() => {
-  return props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
-    ? '服务参数'
-    : '比较值'
-})
-
-// 计算属性：服务配置 - 用于 JsonParamsInput
-const serviceConfig = computed(() => {
-  if (
-    propertyConfig.value &&
-    props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
-  ) {
-    return {
-      service: {
-        name: propertyConfig.value.name || '服务',
-        inputParams: propertyConfig.value.inputParams || []
-      }
-    }
-  }
-  return undefined
-})
-
-// 计算属性：事件配置 - 用于 JsonParamsInput
-const eventConfig = computed(() => {
-  if (propertyConfig.value && props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST) {
-    return {
-      event: {
-        name: propertyConfig.value.name || '事件',
-        outputParams: propertyConfig.value.outputParams || []
-      }
-    }
-  }
-  return undefined
-})
-
-/**
- * 更新条件字段
- * @param field 字段名
- * @param value 字段值
- */
-const updateConditionField = (field: any, value: any) => {
-  condition.value[field] = value
-}
-
-/**
- * 处理触发器类型变化事件
- * @param type 触发器类型
- */
-const handleTriggerTypeChange = (type: number) => {
-  emit('trigger-type-change', type)
-}
-
-/** 处理产品变化事件 */
-const handleProductChange = () => {
-  // 产品变化时清空设备和属性
-  condition.value.deviceId = undefined
-  condition.value.identifier = ''
-}
-
-/** 处理设备变化事件 */
-const handleDeviceChange = () => {
-  // 设备变化时清空属性
-  condition.value.identifier = ''
-}
-
-/**
- * 处理属性变化事件
- * @param propertyInfo 属性信息对象
- */
-const handlePropertyChange = (propertyInfo: any) => {
-  if (propertyInfo) {
-    propertyType.value = propertyInfo.type
-    propertyConfig.value = propertyInfo.config
-
-    // 对于事件上报和服务调用，自动设置操作符为 '='
-    if (
-      props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST ||
-      props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
-    ) {
-      condition.value.operator = IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value
-    }
-  }
-}
-</script>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/configs/SubConditionGroupConfig.vue b/apps/web-antd/src/views/iot/rule/scene/form/configs/SubConditionGroupConfig.vue
index ace2519323edfb6c46b1c1986233efee9fba5f53..9190abe3b82a857fded5019e1b5d14acbc90d4e6 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/configs/SubConditionGroupConfig.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/configs/SubConditionGroupConfig.vue
@@ -1,17 +1,104 @@
+<script setup lang="ts">
+import type { TriggerCondition } from '#/api/iot/rule/scene';
+
+import { computed, nextTick } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button } from 'ant-design-vue';
+
+import {
+  IotRuleSceneTriggerConditionParameterOperatorEnum,
+  IotRuleSceneTriggerConditionTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import ConditionConfig from './ConditionConfig.vue';
+
+/** 子条件组配置组件 */
+defineOptions({ name: 'SubConditionGroupConfig' });
+
+const props = defineProps<{
+  maxConditions?: number;
+  modelValue: TriggerCondition[];
+  triggerType: number;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: TriggerCondition[]): void;
+}>();
+
+const subGroup = useVModel(props, 'modelValue', emit);
+
+const maxConditions = computed(() => props.maxConditions || 3); // 最大条件数量
+
+/** 添加条件 */
+const addCondition = async () => {
+  // 确保 subGroup.value 是一个数组
+  if (!subGroup.value) {
+    subGroup.value = [];
+  }
+
+  // 检查是否达到最大条件数量限制
+  if (subGroup.value?.length >= maxConditions.value) {
+    return;
+  }
+
+  const newCondition: TriggerCondition = {
+    type: IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY.toString(), // 默认为设备属性
+    productId: undefined,
+    deviceId: undefined,
+    identifier: '',
+    operator: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value, // 使用枚举默认值
+    param: '',
+  };
+
+  // 使用 nextTick 确保响应式更新完成后再添加新条件
+  await nextTick();
+  if (subGroup.value) {
+    subGroup.value.push(newCondition);
+  }
+};
+
+/**
+ * 移除条件
+ * @param index 条件索引
+ */
+function removeCondition(index: number) {
+  if (subGroup.value) {
+    subGroup.value.splice(index, 1);
+  }
+}
+
+/**
+ * 更新条件
+ * @param index 条件索引
+ * @param condition 条件对象
+ */
+function updateCondition(index: number, condition: TriggerCondition) {
+  if (subGroup.value) {
+    subGroup.value[index] = condition;
+  }
+}
+</script>
+
 <template>
   <div class="p-16px">
     <!-- 空状态 -->
-    <div v-if="!subGroup || subGroup.length === 0" class="text-center py-24px">
-      <div class="flex flex-col items-center gap-12px">
-        <Icon icon="ep:plus" class="text-32px text-[var(--el-text-color-placeholder)]" />
+    <div v-if="!subGroup || subGroup.length === 0" class="py-24px text-center">
+      <div class="gap-12px flex flex-col items-center">
+        <IconifyIcon
+          icon="ep:plus"
+          class="text-32px text-[var(--el-text-color-placeholder)]"
+        />
         <div class="text-[var(--el-text-color-secondary)]">
           <p class="text-14px font-500 mb-4px">暂无条件</p>
           <p class="text-12px">点击下方按钮添加第一个条件</p>
         </div>
-        <el-button type="primary" @click="addCondition">
-          <Icon icon="ep:plus" />
+        <Button type="primary" @click="addCondition">
+          <IconifyIcon icon="ep:plus" />
           添加条件
-        </el-button>
+        </Button>
       </div>
     </div>
 
@@ -24,37 +111,42 @@
       >
         <!-- 条件配置 -->
         <div
-          class="border border-[var(--el-border-color-lighter)] rounded-6px bg-[var(--el-fill-color-blank)] shadow-sm"
+          class="rounded-6px border border-[var(--el-border-color-lighter)] bg-[var(--el-fill-color-blank)] shadow-sm"
         >
           <div
-            class="flex items-center justify-between p-12px bg-[var(--el-fill-color-light)] border-b border-[var(--el-border-color-lighter)] rounded-t-4px"
+            class="p-12px rounded-t-4px flex items-center justify-between border-b border-[var(--el-border-color-lighter)] bg-[var(--el-fill-color-light)]"
           >
-            <div class="flex items-center gap-8px">
+            <div class="gap-8px flex items-center">
               <div
-                class="w-20px h-20px bg-blue-500 text-white rounded-full flex items-center justify-center text-10px font-bold"
+                class="w-20px h-20px text-10px flex items-center justify-center rounded-full bg-blue-500 font-bold text-white"
               >
                 {{ conditionIndex + 1 }}
               </div>
-              <span class="text-12px font-500 text-[var(--el-text-color-primary)]"
-                >条件 {{ conditionIndex + 1 }}</span
+              <span
+                class="text-12px font-500 text-[var(--el-text-color-primary)]"
               >
+                条件 {{ conditionIndex + 1 }}
+              </span>
             </div>
-            <el-button
-              type="danger"
+            <Button
+              danger
               size="small"
               text
               @click="removeCondition(conditionIndex)"
               v-if="subGroup!.length > 1"
               class="hover:bg-red-50"
             >
-              <Icon icon="ep:delete" />
-            </el-button>
+              <IconifyIcon icon="ep:delete" />
+            </Button>
           </div>
 
           <div class="p-12px">
             <ConditionConfig
               :model-value="condition"
-              @update:model-value="(value) => updateCondition(conditionIndex, value)"
+              @update:model-value="
+                (value: TriggerCondition) =>
+                  updateCondition(conditionIndex, value)
+              "
               :trigger-type="triggerType"
             />
           </div>
@@ -63,94 +155,21 @@
 
       <!-- 添加条件按钮 -->
       <div
-        v-if="subGroup && subGroup.length > 0 && subGroup.length < maxConditions"
-        class="text-center py-16px"
+        v-if="
+          subGroup && subGroup.length > 0 && subGroup.length < maxConditions
+        "
+        class="py-16px text-center"
       >
-        <el-button type="primary" plain @click="addCondition">
-          <Icon icon="ep:plus" />
+        <Button type="primary" plain @click="addCondition">
+          <IconifyIcon icon="ep:plus" />
           继续添加条件
-        </el-button>
-        <span class="block mt-8px text-12px text-[var(--el-text-color-secondary)]">
+        </Button>
+        <span
+          class="mt-8px text-12px block text-[var(--el-text-color-secondary)]"
+        >
           最多可添加 {{ maxConditions }} 个条件
         </span>
       </div>
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import { nextTick } from 'vue'
-import { useVModel } from '@vueuse/core'
-import ConditionConfig from './ConditionConfig.vue'
-import type { TriggerCondition } from '#/api/iot/rule/scene'
-import {
-  IotRuleSceneTriggerConditionTypeEnum,
-  IotRuleSceneTriggerConditionParameterOperatorEnum
-} from '#/views/iot/utils/constants'
-
-/** 子条件组配置组件 */
-defineOptions({ name: 'SubConditionGroupConfig' })
-
-const props = defineProps<{
-  modelValue: TriggerCondition[]
-  triggerType: number
-  maxConditions?: number
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: TriggerCondition[]): void
-}>()
-
-const subGroup = useVModel(props, 'modelValue', emit)
-
-const maxConditions = computed(() => props.maxConditions || 3) // 最大条件数量
-
-/** 添加条件 */
-const addCondition = async () => {
-  // 确保 subGroup.value 是一个数组
-  if (!subGroup.value) {
-    subGroup.value = []
-  }
-
-  // 检查是否达到最大条件数量限制
-  if (subGroup.value?.length >= maxConditions.value) {
-    return
-  }
-
-  const newCondition: TriggerCondition = {
-    type: IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY, // 默认为设备属性
-    productId: undefined,
-    deviceId: undefined,
-    identifier: '',
-    operator: IotRuleSceneTriggerConditionParameterOperatorEnum.EQUALS.value, // 使用枚举默认值
-    param: ''
-  }
-
-  // 使用 nextTick 确保响应式更新完成后再添加新条件
-  await nextTick()
-  if (subGroup.value) {
-    subGroup.value.push(newCondition)
-  }
-}
-
-/**
- * 移除条件
- * @param index 条件索引
- */
-const removeCondition = (index: number) => {
-  if (subGroup.value) {
-    subGroup.value.splice(index, 1)
-  }
-}
-
-/**
- * 更新条件
- * @param index 条件索引
- * @param condition 条件对象
- */
-const updateCondition = (index: number, condition: TriggerCondition) => {
-  if (subGroup.value) {
-    subGroup.value[index] = condition
-  }
-}
-</script>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/inputs/JsonParamsInput.vue b/apps/web-antd/src/views/iot/rule/scene/form/inputs/JsonParamsInput.vue
index 344d283d6958cfe4e5994feac604430b70a57f2e..1da80425e012df067927458e760a37023a9c2fec 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/inputs/JsonParamsInput.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/inputs/JsonParamsInput.vue
@@ -1,367 +1,282 @@
 <!-- JSON参数输入组件 - 通用版本 -->
-<template>
-  <!-- 参数配置 -->
-  <div class="w-full space-y-12px">
-    <!-- JSON 输入框 -->
-    <div class="relative">
-      <el-input
-        v-model="paramsJson"
-        type="textarea"
-        :rows="4"
-        :placeholder="placeholder"
-        @input="handleParamsChange"
-        :class="{ 'is-error': jsonError }"
-      />
-      <!-- 查看详细示例弹出层 -->
-      <div class="absolute top-8px right-8px">
-        <el-popover
-          placement="left-start"
-          :width="450"
-          trigger="click"
-          :show-arrow="true"
-          :offset="8"
-          popper-class="json-params-detail-popover"
-        >
-          <template #reference>
-            <el-button
-              type="info"
-              :icon="InfoFilled"
-              circle
-              size="small"
-              :title="JSON_PARAMS_INPUT_CONSTANTS.VIEW_EXAMPLE_TITLE"
-            />
-          </template>
-
-          <!-- 弹出层内容 -->
-          <div class="json-params-detail-content">
-            <div class="flex items-center gap-8px mb-16px">
-              <Icon :icon="titleIcon" class="text-[var(--el-color-primary)] text-18px" />
-              <span class="text-16px font-600 text-[var(--el-text-color-primary)]">
-                {{ title }}
-              </span>
-            </div>
-
-            <div class="space-y-16px">
-              <!-- 参数列表 -->
-              <div v-if="paramsList.length > 0">
-                <div class="flex items-center gap-8px mb-8px">
-                  <Icon :icon="paramsIcon" class="text-[var(--el-color-primary)] text-14px" />
-                  <span class="text-14px font-500 text-[var(--el-text-color-primary)]">
-                    {{ paramsLabel }}
-                  </span>
-                </div>
-                <div class="ml-22px space-y-8px">
-                  <div
-                    v-for="param in paramsList"
-                    :key="param.identifier"
-                    class="flex items-center justify-between p-8px bg-[var(--el-fill-color-lighter)] rounded-4px"
-                  >
-                    <div class="flex-1">
-                      <div class="text-12px font-500 text-[var(--el-text-color-primary)]">
-                        {{ param.name }}
-                        <el-tag v-if="param.required" size="small" type="danger" class="ml-4px">
-                          {{ JSON_PARAMS_INPUT_CONSTANTS.REQUIRED_TAG }}
-                        </el-tag>
-                      </div>
-                      <div class="text-11px text-[var(--el-text-color-secondary)]">
-                        {{ param.identifier }}
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-8px">
-                      <el-tag :type="getParamTypeTag(param.dataType)" size="small">
-                        {{ getParamTypeName(param.dataType) }}
-                      </el-tag>
-                      <span class="text-11px text-[var(--el-text-color-secondary)]">
-                        {{ getExampleValue(param) }}
-                      </span>
-                    </div>
-                  </div>
-                </div>
-
-                <div class="mt-12px ml-22px">
-                  <div class="text-12px text-[var(--el-text-color-secondary)] mb-6px">
-                    {{ JSON_PARAMS_INPUT_CONSTANTS.COMPLETE_JSON_FORMAT }}
-                  </div>
-                  <pre
-                    class="p-12px bg-[var(--el-fill-color-light)] rounded-4px text-11px text-[var(--el-text-color-primary)] overflow-x-auto border-l-3px border-[var(--el-color-primary)]"
-                  >
-                      <code>{{ generateExampleJson() }}</code>
-                    </pre>
-                </div>
-              </div>
+<script setup lang="ts">
+import type { JsonParamsInputType } from '#/views/iot/utils/constants';
 
-              <!-- 无参数提示 -->
-              <div v-else>
-                <div class="text-center py-16px">
-                  <p class="text-14px text-[var(--el-text-color-secondary)]">{{ emptyMessage }}</p>
-                </div>
-              </div>
-            </div>
-          </div>
-        </el-popover>
-      </div>
-    </div>
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
-    <!-- 验证状态和错误提示 -->
-    <div class="flex items-center justify-between">
-      <div class="flex items-center gap-8px">
-        <Icon
-          :icon="
-            jsonError
-              ? JSON_PARAMS_INPUT_ICONS.STATUS_ICONS.ERROR
-              : JSON_PARAMS_INPUT_ICONS.STATUS_ICONS.SUCCESS
-          "
-          :class="jsonError ? 'text-[var(--el-color-danger)]' : 'text-[var(--el-color-success)]'"
-          class="text-14px"
-        />
-        <span
-          :class="jsonError ? 'text-[var(--el-color-danger)]' : 'text-[var(--el-color-success)]'"
-          class="text-12px"
-        >
-          {{ jsonError || JSON_PARAMS_INPUT_CONSTANTS.JSON_FORMAT_CORRECT }}
-        </span>
-      </div>
+import { IconifyIcon } from '@vben/icons';
 
-      <!-- 快速填充按钮 -->
-      <div v-if="paramsList.length > 0" class="flex items-center gap-8px">
-        <span class="text-12px text-[var(--el-text-color-secondary)]">{{
-          JSON_PARAMS_INPUT_CONSTANTS.QUICK_FILL_LABEL
-        }}</span>
-        <el-button size="small" type="primary" plain @click="fillExampleJson">
-          {{ JSON_PARAMS_INPUT_CONSTANTS.EXAMPLE_DATA_BUTTON }}
-        </el-button>
-        <el-button size="small" type="danger" plain @click="clearParams">{{
-          JSON_PARAMS_INPUT_CONSTANTS.CLEAR_BUTTON
-        }}</el-button>
-      </div>
-    </div>
-  </div>
-</template>
+import { useVModel } from '@vueuse/core';
+import { Button, Input, Popover, Tag } from 'ant-design-vue';
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import { InfoFilled } from '@element-plus/icons-vue'
 import {
   IoTDataSpecsDataTypeEnum,
+  JSON_PARAMS_EXAMPLE_VALUES,
   JSON_PARAMS_INPUT_CONSTANTS,
   JSON_PARAMS_INPUT_ICONS,
-  JSON_PARAMS_EXAMPLE_VALUES,
   JsonParamsInputTypeEnum,
-  type JsonParamsInputType
-} from '#/views/iot/utils/constants'
+} from '#/views/iot/utils/constants';
 
 /** JSON参数输入组件 - 通用版本 */
-defineOptions({ name: 'JsonParamsInput' })
+defineOptions({ name: 'JsonParamsInput' });
+
+const props = withDefaults(defineProps<Props>(), {
+  type: JsonParamsInputTypeEnum.SERVICE,
+  placeholder: JSON_PARAMS_INPUT_CONSTANTS.PLACEHOLDER,
+});
+
+const emit = defineEmits<Emits>();
 
 interface JsonParamsConfig {
   // 服务配置
   service?: {
-    name: string
-    inputParams?: any[]
-  }
+    inputParams?: any[];
+    name: string;
+  };
   // 事件配置
   event?: {
-    name: string
-    outputParams?: any[]
-  }
+    name: string;
+    outputParams?: any[];
+  };
   // 属性配置
-  properties?: any[]
+  properties?: any[];
   // 自定义配置
   custom?: {
-    name: string
-    params: any[]
-  }
+    name: string;
+    params: any[];
+  };
 }
 
 interface Props {
-  modelValue?: string
-  config?: JsonParamsConfig
-  type?: JsonParamsInputType
-  placeholder?: string
+  modelValue: string;
+  config: JsonParamsConfig;
+  type: JsonParamsInputType;
+  placeholder: string;
 }
 
 interface Emits {
-  (e: 'update:modelValue', value: string): void
+  (e: 'update:modelValue', value: string): void;
 }
 
-const props = withDefaults(defineProps<Props>(), {
-  type: JsonParamsInputTypeEnum.SERVICE,
-  placeholder: JSON_PARAMS_INPUT_CONSTANTS.PLACEHOLDER
-})
-
-const emit = defineEmits<Emits>()
-
 const localValue = useVModel(props, 'modelValue', emit, {
-  defaultValue: ''
-})
+  defaultValue: '',
+});
 
-const paramsJson = ref('') // JSON参数字符串
-const jsonError = ref('') // JSON验证错误信息
+const paramsJson = ref(''); // JSON参数字符串
+const jsonError = ref(''); // JSON验证错误信息
 
 // 计算属性：参数列表
 const paramsList = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return props.config?.service?.inputParams || []
-    case JsonParamsInputTypeEnum.EVENT:
-      return props.config?.event?.outputParams || []
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return props.config?.properties || []
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return props.config?.custom?.params || []
-    default:
-      return []
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return props.config?.custom?.params || [];
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return props.config?.event?.outputParams || [];
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return props.config?.properties || [];
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return props.config?.service?.inputParams || [];
+    }
+    default: {
+      return [];
+    }
   }
-})
+});
 
 // 计算属性：标题
 const title = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.SERVICE(props.config?.service?.name)
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.EVENT(props.config?.event?.name)
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.CUSTOM(props.config?.custom?.name)
-    default:
-      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.CUSTOM(
+        props.config?.custom?.name,
+      );
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.EVENT(
+        props.config?.event?.name,
+      );
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.SERVICE(
+        props.config?.service?.name,
+      );
+    }
+    default: {
+      return JSON_PARAMS_INPUT_CONSTANTS.TITLES.DEFAULT;
+    }
   }
-})
+});
 
 // 计算属性：标题图标
 const titleIcon = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.SERVICE
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.EVENT
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.CUSTOM
-    default:
-      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.CUSTOM;
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.EVENT;
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.SERVICE;
+    }
+    default: {
+      return JSON_PARAMS_INPUT_ICONS.TITLE_ICONS.DEFAULT;
+    }
   }
-})
+});
 
 // 计算属性：参数图标
 const paramsIcon = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.SERVICE
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.EVENT
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.CUSTOM
-    default:
-      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.CUSTOM;
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.EVENT;
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.SERVICE;
+    }
+    default: {
+      return JSON_PARAMS_INPUT_ICONS.PARAMS_ICONS.DEFAULT;
+    }
   }
-})
+});
 
 // 计算属性：参数标签
 const paramsLabel = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.SERVICE
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.EVENT
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.CUSTOM
-    default:
-      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.CUSTOM;
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.EVENT;
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.SERVICE;
+    }
+    default: {
+      return JSON_PARAMS_INPUT_CONSTANTS.PARAMS_LABELS.DEFAULT;
+    }
   }
-})
+});
 
 // 计算属性：空状态消息
 const emptyMessage = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.SERVICE
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.EVENT
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.CUSTOM
-    default:
-      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.CUSTOM;
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.EVENT;
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.SERVICE;
+    }
+    default: {
+      return JSON_PARAMS_INPUT_CONSTANTS.EMPTY_MESSAGES.DEFAULT;
+    }
   }
-})
+});
 
 // 计算属性：无配置消息
 const noConfigMessage = computed(() => {
   switch (props.type) {
-    case JsonParamsInputTypeEnum.SERVICE:
-      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.SERVICE
-    case JsonParamsInputTypeEnum.EVENT:
-      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.EVENT
-    case JsonParamsInputTypeEnum.PROPERTY:
-      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.PROPERTY
-    case JsonParamsInputTypeEnum.CUSTOM:
-      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.CUSTOM
-    default:
-      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.DEFAULT
+    case JsonParamsInputTypeEnum.CUSTOM: {
+      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.CUSTOM;
+    }
+    case JsonParamsInputTypeEnum.EVENT: {
+      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.EVENT;
+    }
+    case JsonParamsInputTypeEnum.PROPERTY: {
+      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.PROPERTY;
+    }
+    case JsonParamsInputTypeEnum.SERVICE: {
+      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.SERVICE;
+    }
+    default: {
+      return JSON_PARAMS_INPUT_CONSTANTS.NO_CONFIG_MESSAGES.DEFAULT;
+    }
   }
-})
+});
 
 /**
  * 处理参数变化事件
  */
-const handleParamsChange = () => {
+function handleParamsChange() {
   try {
-    jsonError.value = '' // 清除之前的错误
+    jsonError.value = ''; // 清除之前的错误
 
     if (paramsJson.value.trim()) {
-      const parsed = JSON.parse(paramsJson.value)
-      localValue.value = paramsJson.value
+      const parsed = JSON.parse(paramsJson.value);
+      localValue.value = paramsJson.value;
 
       // 额外的参数验证
       if (typeof parsed !== 'object' || parsed === null) {
-        jsonError.value = JSON_PARAMS_INPUT_CONSTANTS.PARAMS_MUST_BE_OBJECT
-        return
+        jsonError.value = JSON_PARAMS_INPUT_CONSTANTS.PARAMS_MUST_BE_OBJECT;
+        return;
       }
 
       // 验证必填参数
       for (const param of paramsList.value) {
-        if (param.required && (!parsed[param.identifier] || parsed[param.identifier] === '')) {
-          jsonError.value = JSON_PARAMS_INPUT_CONSTANTS.PARAM_REQUIRED_ERROR(param.name)
-          return
+        if (
+          param.required &&
+          (!parsed[param.identifier] || parsed[param.identifier] === '')
+        ) {
+          jsonError.value = JSON_PARAMS_INPUT_CONSTANTS.PARAM_REQUIRED_ERROR(
+            param.name,
+          );
+          return;
         }
       }
     } else {
-      localValue.value = ''
+      localValue.value = '';
     }
 
     // 验证通过
-    jsonError.value = ''
+    jsonError.value = '';
   } catch (error) {
     jsonError.value = JSON_PARAMS_INPUT_CONSTANTS.JSON_FORMAT_ERROR(
-      error instanceof Error ? error.message : JSON_PARAMS_INPUT_CONSTANTS.UNKNOWN_ERROR
-    )
+      error instanceof Error
+        ? error.message
+        : JSON_PARAMS_INPUT_CONSTANTS.UNKNOWN_ERROR,
+    );
   }
 }
 
 /**
  * 快速填充示例数据
  */
-const fillExampleJson = () => {
-  paramsJson.value = generateExampleJson()
-  handleParamsChange()
+function fillExampleJson() {
+  paramsJson.value = generateExampleJson();
+  handleParamsChange();
 }
 
 /**
  * 清空参数
  */
-const clearParams = () => {
-  paramsJson.value = ''
-  localValue.value = ''
-  jsonError.value = ''
+function clearParams() {
+  paramsJson.value = '';
+  localValue.value = '';
+  jsonError.value = '';
 }
 
 /**
@@ -369,9 +284,9 @@ const clearParams = () => {
  * @param dataType 数据类型
  * @returns 类型名称
  */
-const getParamTypeName = (dataType: string) => {
+function getParamTypeName(dataType: string) {
   // 使用 constants.ts 中已有的 getDataTypeName 函数逻辑
-  const typeMap = {
+  const typeMap: Record<string, string> = {
     [IoTDataSpecsDataTypeEnum.INT]: '整数',
     [IoTDataSpecsDataTypeEnum.FLOAT]: '浮点数',
     [IoTDataSpecsDataTypeEnum.DOUBLE]: '双精度',
@@ -380,9 +295,9 @@ const getParamTypeName = (dataType: string) => {
     [IoTDataSpecsDataTypeEnum.ENUM]: '枚举',
     [IoTDataSpecsDataTypeEnum.DATE]: '日期',
     [IoTDataSpecsDataTypeEnum.STRUCT]: '结构体',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: '数组'
-  }
-  return typeMap[dataType] || dataType
+    [IoTDataSpecsDataTypeEnum.ARRAY]: '数组',
+  };
+  return typeMap[dataType] || dataType;
 }
 
 /**
@@ -390,8 +305,8 @@ const getParamTypeName = (dataType: string) => {
  * @param dataType 数据类型
  * @returns 标签样式
  */
-const getParamTypeTag = (dataType: string) => {
-  const tagMap = {
+function getParamTypeTag(dataType: string) {
+  const tagMap: Record<string, string> = {
     [IoTDataSpecsDataTypeEnum.INT]: 'primary',
     [IoTDataSpecsDataTypeEnum.FLOAT]: 'success',
     [IoTDataSpecsDataTypeEnum.DOUBLE]: 'success',
@@ -400,9 +315,9 @@ const getParamTypeTag = (dataType: string) => {
     [IoTDataSpecsDataTypeEnum.ENUM]: 'danger',
     [IoTDataSpecsDataTypeEnum.DATE]: 'primary',
     [IoTDataSpecsDataTypeEnum.STRUCT]: 'info',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning'
-  }
-  return tagMap[dataType] || 'info'
+    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning',
+  };
+  return tagMap[dataType] || 'info';
 }
 
 /**
@@ -410,51 +325,53 @@ const getParamTypeTag = (dataType: string) => {
  * @param param 参数对象
  * @returns 示例值
  */
-const getExampleValue = (param: any) => {
-  const exampleConfig =
-    JSON_PARAMS_EXAMPLE_VALUES[param.dataType] || JSON_PARAMS_EXAMPLE_VALUES.DEFAULT
-  return exampleConfig.display
+function getExampleValue(param: any) {
+  const exampleConfig: any =
+    JSON_PARAMS_EXAMPLE_VALUES[param.dataType] ||
+    JSON_PARAMS_EXAMPLE_VALUES.DEFAULT;
+  return exampleConfig.display;
 }
 
 /**
  * 生成示例JSON
  * @returns JSON字符串
  */
-const generateExampleJson = () => {
+function generateExampleJson() {
   if (paramsList.value.length === 0) {
-    return '{}'
+    return '{}';
   }
 
-  const example = {}
+  const example: Record<string, any> = {};
   paramsList.value.forEach((param) => {
-    const exampleConfig =
-      JSON_PARAMS_EXAMPLE_VALUES[param.dataType] || JSON_PARAMS_EXAMPLE_VALUES.DEFAULT
-    example[param.identifier] = exampleConfig.value
-  })
+    const exampleConfig: any =
+      JSON_PARAMS_EXAMPLE_VALUES[param.dataType] ||
+      JSON_PARAMS_EXAMPLE_VALUES.DEFAULT;
+    example[param.identifier] = exampleConfig.value;
+  });
 
-  return JSON.stringify(example, null, 2)
+  return JSON.stringify(example, null, 2);
 }
 
 /**
  * 处理数据回显
  * @param value 值字符串
  */
-const handleDataDisplay = (value: string) => {
+function handleDataDisplay(value: string) {
   if (!value || !value.trim()) {
-    paramsJson.value = ''
-    jsonError.value = ''
-    return
+    paramsJson.value = '';
+    jsonError.value = '';
+    return;
   }
 
   try {
     // 尝试解析JSON，如果成功则格式化
-    const parsed = JSON.parse(value)
-    paramsJson.value = JSON.stringify(parsed, null, 2)
-    jsonError.value = ''
+    const parsed = JSON.parse(value);
+    paramsJson.value = JSON.stringify(parsed, null, 2);
+    jsonError.value = '';
   } catch {
     // 如果不是有效的JSON，直接使用原字符串
-    paramsJson.value = value
-    jsonError.value = ''
+    paramsJson.value = value;
+    jsonError.value = '';
   }
 }
 
@@ -463,39 +380,213 @@ watch(
   () => localValue.value,
   async (newValue, oldValue) => {
     // 避免循环更新
-    if (newValue === oldValue) return
+    if (newValue === oldValue) return;
 
     // 使用 nextTick 确保在下一个 tick 中处理数据
-    await nextTick()
-    handleDataDisplay(newValue || '')
+    await nextTick();
+    handleDataDisplay(newValue || '');
   },
-  { immediate: true }
-)
+  { immediate: true },
+);
 
 // 组件挂载后也尝试处理一次数据回显
 onMounted(async () => {
-  await nextTick()
+  await nextTick();
   if (localValue.value) {
-    handleDataDisplay(localValue.value)
+    handleDataDisplay(localValue.value);
   }
-})
+});
 
 // 监听配置变化
 watch(
   () => props.config,
   (newConfig, oldConfig) => {
     // 只有在配置真正变化时才清空数据
-    if (JSON.stringify(newConfig) !== JSON.stringify(oldConfig)) {
-      // 如果没有外部传入的值，才清空数据
-      if (!localValue.value) {
-        paramsJson.value = ''
-        jsonError.value = ''
-      }
+    if (
+      JSON.stringify(newConfig) !== JSON.stringify(oldConfig) && // 如果没有外部传入的值，才清空数据
+      !localValue.value
+    ) {
+      paramsJson.value = '';
+      jsonError.value = '';
     }
-  }
-)
+  },
+);
 </script>
 
+<template>
+  <!-- 参数配置 -->
+  <div class="space-y-12px w-full">
+    <!-- JSON 输入框 -->
+    <div class="relative">
+      <Input.TextArea
+        v-model="paramsJson"
+        type="text"
+        :rows="4"
+        :placeholder="placeholder"
+        @input="handleParamsChange"
+        :class="{ 'is-error': jsonError }"
+      />
+      <!-- 查看详细示例弹出层 -->
+      <div class="top-8px right-8px absolute">
+        <Popover
+          placement="leftTop"
+          :width="450"
+          trigger="click"
+          :show-arrow="true"
+          :offset="8"
+          popper-class="json-params-detail-popover"
+        >
+          <template #reference>
+            <Button
+              text
+              type="primary"
+              circle
+              size="small"
+              :title="JSON_PARAMS_INPUT_CONSTANTS.VIEW_EXAMPLE_TITLE"
+            >
+              <IconifyIcon icon="ep:info-filled" />
+            </Button>
+          </template>
+
+          <!-- 弹出层内容 -->
+          <div class="json-params-detail-content">
+            <div class="gap-8px mb-16px flex items-center">
+              <IconifyIcon
+                :icon="titleIcon"
+                class="text-18px text-[var(--el-color-primary)]"
+              />
+              <span
+                class="text-16px font-600 text-[var(--el-text-color-primary)]"
+              >
+                {{ title }}
+              </span>
+            </div>
+
+            <div class="space-y-16px">
+              <!-- 参数列表 -->
+              <div v-if="paramsList.length > 0">
+                <div class="gap-8px mb-8px flex items-center">
+                  <IconifyIcon
+                    :icon="paramsIcon"
+                    class="text-14px text-[var(--el-color-primary)]"
+                  />
+                  <span
+                    class="text-14px font-500 text-[var(--el-text-color-primary)]"
+                  >
+                    {{ paramsLabel }}
+                  </span>
+                </div>
+                <div class="ml-22px space-y-8px">
+                  <div
+                    v-for="param in paramsList"
+                    :key="param.identifier"
+                    class="p-8px rounded-4px flex items-center justify-between bg-[var(--el-fill-color-lighter)]"
+                  >
+                    <div class="flex-1">
+                      <div
+                        class="text-12px font-500 text-[var(--el-text-color-primary)]"
+                      >
+                        {{ param.name }}
+                        <Tag
+                          v-if="param.required"
+                          size="small"
+                          type="danger"
+                          class="ml-4px"
+                        >
+                          {{ JSON_PARAMS_INPUT_CONSTANTS.REQUIRED_TAG }}
+                        </Tag>
+                      </div>
+                      <div
+                        class="text-11px text-[var(--el-text-color-secondary)]"
+                      >
+                        {{ param.identifier }}
+                      </div>
+                    </div>
+                    <div class="gap-8px flex items-center">
+                      <Tag :type="getParamTypeTag(param.dataType)" size="small">
+                        {{ getParamTypeName(param.dataType) }}
+                      </Tag>
+                      <span
+                        class="text-11px text-[var(--el-text-color-secondary)]"
+                      >
+                        {{ getExampleValue(param) }}
+                      </span>
+                    </div>
+                  </div>
+                </div>
+
+                <div class="mt-12px ml-22px">
+                  <div
+                    class="text-12px mb-6px text-[var(--el-text-color-secondary)]"
+                  >
+                    {{ JSON_PARAMS_INPUT_CONSTANTS.COMPLETE_JSON_FORMAT }}
+                  </div>
+                  <pre
+                    class="p-12px rounded-4px text-11px border-l-3px overflow-x-auto border-[var(--el-color-primary)] bg-[var(--el-fill-color-light)] text-[var(--el-text-color-primary)]"
+                  >
+                      <code>{{ generateExampleJson() }}</code>
+                    </pre>
+                </div>
+              </div>
+
+              <!-- 无参数提示 -->
+              <div v-else>
+                <div class="py-16px text-center">
+                  <p class="text-14px text-[var(--el-text-color-secondary)]">
+                    {{ emptyMessage }}
+                  </p>
+                </div>
+              </div>
+            </div>
+          </div>
+        </Popover>
+      </div>
+    </div>
+
+    <!-- 验证状态和错误提示 -->
+    <div class="flex items-center justify-between">
+      <div class="gap-8px flex items-center">
+        <IconifyIcon
+          :icon="
+            jsonError
+              ? JSON_PARAMS_INPUT_ICONS.STATUS_ICONS.ERROR
+              : JSON_PARAMS_INPUT_ICONS.STATUS_ICONS.SUCCESS
+          "
+          :class="
+            jsonError
+              ? 'text-[var(--el-color-danger)]'
+              : 'text-[var(--el-color-success)]'
+          "
+          class="text-14px"
+        />
+        <span
+          :class="
+            jsonError
+              ? 'text-[var(--el-color-danger)]'
+              : 'text-[var(--el-color-success)]'
+          "
+          class="text-12px"
+        >
+          {{ jsonError || JSON_PARAMS_INPUT_CONSTANTS.JSON_FORMAT_CORRECT }}
+        </span>
+      </div>
+
+      <!-- 快速填充按钮 -->
+      <div v-if="paramsList.length > 0" class="gap-8px flex items-center">
+        <span class="text-12px text-[var(--el-text-color-secondary)]">{{
+          JSON_PARAMS_INPUT_CONSTANTS.QUICK_FILL_LABEL
+        }}</span>
+        <Button size="small" type="primary" plain @click="fillExampleJson">
+          {{ JSON_PARAMS_INPUT_CONSTANTS.EXAMPLE_DATA_BUTTON }}
+        </Button>
+        <Button size="small" danger type="primary" @click="clearParams">
+          {{ JSON_PARAMS_INPUT_CONSTANTS.CLEAR_BUTTON }}
+        </Button>
+      </div>
+    </div>
+  </div>
+</template>
+
 <style scoped>
 /* 弹出层内容样式 */
 .json-params-detail-content {
@@ -507,7 +598,7 @@ watch(
   max-width: 500px !important;
 }
 
-:global(.json-params-detail-popover .el-popover__content) {
+:global(.json-params-detail-popover .ant-popover__content) {
   padding: 16px !important;
 }
 
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/inputs/ValueInput.vue b/apps/web-antd/src/views/iot/rule/scene/form/inputs/ValueInput.vue
index 0ef0fddfcc357b6549208198d8c976e413965ca2..979843b479ca97f2d89fc51550e9209b542a8c6b 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/inputs/ValueInput.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/inputs/ValueInput.vue
@@ -1,80 +1,256 @@
 <!-- 值输入组件 -->
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { DatePicker, Input, Select, Tag, Tooltip } from 'ant-design-vue';
+
+import {
+  IoTDataSpecsDataTypeEnum,
+  IotRuleSceneTriggerConditionParameterOperatorEnum,
+} from '#/views/iot/utils/constants';
+
+/** 值输入组件 */
+defineOptions({ name: 'ValueInput' });
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<Emits>();
+
+interface Props {
+  modelValue?: string;
+  propertyType?: string;
+  operator?: string;
+  propertyConfig?: any;
+}
+
+interface Emits {
+  (e: 'update:modelValue', value: string): void;
+}
+
+const localValue = useVModel(props, 'modelValue', emit, {
+  defaultValue: '',
+});
+
+const rangeStart = ref(''); // 范围开始值
+const rangeEnd = ref(''); // 范围结束值
+const dateValue = ref(''); // 日期值
+const numberValue = ref<number>(); // 数字值
+
+/** 计算属性：枚举选项 */
+const enumOptions = computed(() => {
+  if (props.propertyConfig?.enum) {
+    return props.propertyConfig.enum.map((item: any) => ({
+      label: item.name || item.label || item.value,
+      value: item.value,
+    }));
+  }
+  return [];
+});
+
+/** 计算属性：列表预览 */
+const listPreview = computed(() => {
+  if (
+    props.operator ===
+      IotRuleSceneTriggerConditionParameterOperatorEnum.IN.value &&
+    localValue.value
+  ) {
+    return localValue.value
+      .split(',')
+      .map((item) => item.trim())
+      .filter(Boolean);
+  }
+  return [];
+});
+
+/** 判断是否为数字类型 */
+function isNumericType() {
+  return [
+    IoTDataSpecsDataTypeEnum.DOUBLE,
+    IoTDataSpecsDataTypeEnum.FLOAT,
+    IoTDataSpecsDataTypeEnum.INT,
+  ].includes((props.propertyType || '') as any);
+}
+
+/** 获取输入框类型 */
+function getInputType() {
+  switch (props.propertyType) {
+    case IoTDataSpecsDataTypeEnum.DOUBLE:
+    case IoTDataSpecsDataTypeEnum.FLOAT:
+    case IoTDataSpecsDataTypeEnum.INT: {
+      return 'number';
+    }
+    default: {
+      return 'text';
+    }
+  }
+}
+
+/** 获取占位符文本 */
+function getPlaceholder() {
+  const typeMap: Record<string, string> = {
+    [IoTDataSpecsDataTypeEnum.TEXT]: '请输入字符串',
+    [IoTDataSpecsDataTypeEnum.INT]: '请输入整数',
+    [IoTDataSpecsDataTypeEnum.FLOAT]: '请输入浮点数',
+    [IoTDataSpecsDataTypeEnum.DOUBLE]: '请输入双精度数',
+    [IoTDataSpecsDataTypeEnum.STRUCT]: '请输入 JSON 格式数据',
+    [IoTDataSpecsDataTypeEnum.ARRAY]: '请输入数组格式数据',
+  };
+  return typeMap[props.propertyType || ''] || '请输入值';
+}
+
+/** 获取数字精度 */
+function getPrecision() {
+  return props.propertyType === IoTDataSpecsDataTypeEnum.INT ? 0 : 2;
+}
+
+/** 获取数字步长 */
+function getStep() {
+  return props.propertyType === IoTDataSpecsDataTypeEnum.INT ? 1 : 0.1;
+}
+
+/** 获取最小值 */
+function getMin() {
+  return props.propertyConfig?.min || undefined;
+}
+
+/** 获取最大值 */
+function getMax() {
+  return props.propertyConfig?.max || undefined;
+}
+
+/** 处理范围变化事件 */
+function handleRangeChange() {
+  localValue.value =
+    rangeStart.value && rangeEnd.value
+      ? `${rangeStart.value},${rangeEnd.value}`
+      : '';
+}
+
+/** 处理日期变化事件 */
+function handleDateChange(value: any) {
+  localValue.value = value || '';
+}
+
+/** 处理数字变化事件 */
+function handleNumberChange(value: number | undefined) {
+  localValue.value = value?.toString() || '';
+}
+
+/** 监听操作符变化 */
+watch(
+  () => props.operator,
+  () => {
+    localValue.value = '';
+    rangeStart.value = '';
+    rangeEnd.value = '';
+    dateValue.value = '';
+    numberValue.value = undefined;
+  },
+);
+</script>
+
 <template>
   <div class="w-full min-w-0">
     <!-- 布尔值选择 -->
-    <el-select
+    <Select
       v-if="propertyType === IoTDataSpecsDataTypeEnum.BOOL"
       v-model="localValue"
       placeholder="请选择布尔值"
       class="w-full!"
     >
-      <el-option label="真 (true)" value="true" />
-      <el-option label="假 (false)" value="false" />
-    </el-select>
+      <Select.Option label="真 (true)" :value="true" />
+      <Select.Option label="假 (false)" :value="false" />
+    </Select>
 
     <!-- 枚举值选择 -->
-    <el-select
-      v-else-if="propertyType === IoTDataSpecsDataTypeEnum.ENUM && enumOptions.length > 0"
+    <Select
+      v-else-if="
+        propertyType === IoTDataSpecsDataTypeEnum.ENUM && enumOptions.length > 0
+      "
       v-model="localValue"
       placeholder="请选择枚举值"
       class="w-full!"
     >
-      <el-option
+      <Select.Option
         v-for="option in enumOptions"
         :key="option.value"
         :label="option.label"
         :value="option.value"
       />
-    </el-select>
+    </Select>
 
     <!-- 范围输入 (between 操作符) -->
     <div
-      v-else-if="operator === IotRuleSceneTriggerConditionParameterOperatorEnum.BETWEEN.value"
-      class="w-full! flex items-center gap-8px"
+      v-else-if="
+        operator ===
+        IotRuleSceneTriggerConditionParameterOperatorEnum.BETWEEN.value
+      "
+      class="w-full! gap-8px flex items-center"
     >
-      <el-input
+      <Input
         v-model="rangeStart"
         :type="getInputType()"
         placeholder="最小值"
         @input="handleRangeChange"
-        class="flex-1 min-w-0"
+        class="min-w-0 flex-1"
         style="width: auto !important"
       />
-      <span class="text-12px text-[var(--el-text-color-secondary)] whitespace-nowrap">至</span>
-      <el-input
+      <span
+        class="text-12px whitespace-nowrap text-[var(--el-text-color-secondary)]"
+      >
+        至
+      </span>
+      <Input
         v-model="rangeEnd"
         :type="getInputType()"
         placeholder="最大值"
         @input="handleRangeChange"
-        class="flex-1 min-w-0"
+        class="min-w-0 flex-1"
       />
     </div>
 
     <!-- 列表输入 (in 操作符) -->
     <div
-      v-else-if="operator === IotRuleSceneTriggerConditionParameterOperatorEnum.IN.value"
+      v-else-if="
+        operator === IotRuleSceneTriggerConditionParameterOperatorEnum.IN.value
+      "
       class="w-full!"
     >
-      <el-input v-model="localValue" placeholder="请输入值列表，用逗号分隔" class="w-full!">
+      <Input
+        v-model="localValue"
+        placeholder="请输入值列表，用逗号分隔"
+        class="w-full!"
+      >
         <template #suffix>
-          <el-tooltip content="多个值用逗号分隔，如：1,2,3" placement="top">
-            <Icon
+          <Tooltip content="多个值用逗号分隔，如：1,2,3" placement="top">
+            <IconifyIcon
               icon="ep:question-filled"
-              class="text-[var(--el-text-color-placeholder)] cursor-help"
+              class="cursor-help text-[var(--el-text-color-placeholder)]"
             />
-          </el-tooltip>
+          </Tooltip>
         </template>
-      </el-input>
-      <div v-if="listPreview.length > 0" class="mt-8px flex items-center gap-6px flex-wrap">
-        <span class="text-12px text-[var(--el-text-color-secondary)]">解析结果：</span>
-        <el-tag v-for="(item, index) in listPreview" :key="index" size="small" class="m-0">
+      </Input>
+      <div
+        v-if="listPreview.length > 0"
+        class="mt-8px gap-6px flex flex-wrap items-center"
+      >
+        <span class="text-12px text-[var(--el-text-color-secondary)]">
+          解析结果：
+        </span>
+        <Tag
+          v-for="(item, index) in listPreview"
+          :key="index"
+          size="small"
+          class="m-0"
+        >
           {{ item }}
-        </el-tag>
+        </Tag>
       </div>
     </div>
 
     <!-- 日期时间输入 -->
-    <el-date-picker
+    <DatePicker
       v-else-if="propertyType === IoTDataSpecsDataTypeEnum.DATE"
       v-model="dateValue"
       type="datetime"
@@ -86,7 +262,7 @@
     />
 
     <!-- 数字输入 -->
-    <el-input-number
+    <Input.Number
       v-else-if="isNumericType()"
       v-model="numberValue"
       :precision="getPrecision()"
@@ -99,7 +275,7 @@
     />
 
     <!-- 文本输入 -->
-    <el-input
+    <Input
       v-else
       v-model="localValue"
       :type="getInputType()"
@@ -107,160 +283,16 @@
       class="w-full!"
     >
       <template #suffix>
-        <el-tooltip
+        <Tooltip
           v-if="propertyConfig?.unit"
           :content="`单位：${propertyConfig.unit}`"
           placement="top"
         >
-          <span class="text-12px text-[var(--el-text-color-secondary)] px-4px">
+          <span class="text-12px px-4px text-[var(--el-text-color-secondary)]">
             {{ propertyConfig.unit }}
           </span>
-        </el-tooltip>
+        </Tooltip>
       </template>
-    </el-input>
+    </Input>
   </div>
 </template>
-
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import {
-  IoTDataSpecsDataTypeEnum,
-  IotRuleSceneTriggerConditionParameterOperatorEnum
-} from '#/views/iot/utils/constants'
-
-/** 值输入组件 */
-defineOptions({ name: 'ValueInput' })
-
-interface Props {
-  modelValue?: string
-  propertyType?: string
-  operator?: string
-  propertyConfig?: any
-}
-
-interface Emits {
-  (e: 'update:modelValue', value: string): void
-}
-
-const props = defineProps<Props>()
-const emit = defineEmits<Emits>()
-
-const localValue = useVModel(props, 'modelValue', emit, {
-  defaultValue: ''
-})
-
-const rangeStart = ref('') // 范围开始值
-const rangeEnd = ref('') // 范围结束值
-const dateValue = ref('') // 日期值
-const numberValue = ref<number>() // 数字值
-
-/** 计算属性：枚举选项 */
-const enumOptions = computed(() => {
-  if (props.propertyConfig?.enum) {
-    return props.propertyConfig.enum.map((item: any) => ({
-      label: item.name || item.label || item.value,
-      value: item.value
-    }))
-  }
-  return []
-})
-
-/** 计算属性：列表预览 */
-const listPreview = computed(() => {
-  if (
-    props.operator === IotRuleSceneTriggerConditionParameterOperatorEnum.IN.value &&
-    localValue.value
-  ) {
-    return localValue.value
-      .split(',')
-      .map((item) => item.trim())
-      .filter((item) => item)
-  }
-  return []
-})
-
-/** 判断是否为数字类型 */
-const isNumericType = () => {
-  return [
-    IoTDataSpecsDataTypeEnum.INT,
-    IoTDataSpecsDataTypeEnum.FLOAT,
-    IoTDataSpecsDataTypeEnum.DOUBLE
-  ].includes((props.propertyType || '') as any)
-}
-
-/** 获取输入框类型 */
-const getInputType = () => {
-  switch (props.propertyType) {
-    case IoTDataSpecsDataTypeEnum.INT:
-    case IoTDataSpecsDataTypeEnum.FLOAT:
-    case IoTDataSpecsDataTypeEnum.DOUBLE:
-      return 'number'
-    default:
-      return 'text'
-  }
-}
-
-/** 获取占位符文本 */
-const getPlaceholder = () => {
-  const typeMap = {
-    [IoTDataSpecsDataTypeEnum.TEXT]: '请输入字符串',
-    [IoTDataSpecsDataTypeEnum.INT]: '请输入整数',
-    [IoTDataSpecsDataTypeEnum.FLOAT]: '请输入浮点数',
-    [IoTDataSpecsDataTypeEnum.DOUBLE]: '请输入双精度数',
-    [IoTDataSpecsDataTypeEnum.STRUCT]: '请输入 JSON 格式数据',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: '请输入数组格式数据'
-  }
-  return typeMap[props.propertyType || ''] || '请输入值'
-}
-
-/** 获取数字精度 */
-const getPrecision = () => {
-  return props.propertyType === IoTDataSpecsDataTypeEnum.INT ? 0 : 2
-}
-
-/** 获取数字步长 */
-const getStep = () => {
-  return props.propertyType === IoTDataSpecsDataTypeEnum.INT ? 1 : 0.1
-}
-
-/** 获取最小值 */
-const getMin = () => {
-  return props.propertyConfig?.min || undefined
-}
-
-/** 获取最大值 */
-const getMax = () => {
-  return props.propertyConfig?.max || undefined
-}
-
-/** 处理范围变化事件 */
-const handleRangeChange = () => {
-  if (rangeStart.value && rangeEnd.value) {
-    localValue.value = `${rangeStart.value},${rangeEnd.value}`
-  } else {
-    localValue.value = ''
-  }
-}
-
-/** 处理日期变化事件 */
-const handleDateChange = (value: string) => {
-  localValue.value = value || ''
-}
-
-/** 处理数字变化事件 */
-const handleNumberChange = (value: number | undefined) => {
-  localValue.value = value?.toString() || ''
-}
-
-/** 监听操作符变化 */
-watch(
-  () => props.operator,
-  () => {
-    localValue.value = ''
-    rangeStart.value = ''
-    rangeEnd.value = ''
-    dateValue.value = ''
-    numberValue.value = undefined
-  }
-)
-</script>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/sections/ActionSection.vue b/apps/web-antd/src/views/iot/rule/scene/form/sections/ActionSection.vue
index 95b3b201e0965b02c7d5b8005f878f04d16fd7fc..f8dfa3b5dd49f560e65bc1f2ca805343776c3b0d 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/sections/ActionSection.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/sections/ActionSection.vue
@@ -1,219 +1,97 @@
 <!-- 执行器配置组件 -->
-<template>
-  <el-card class="border border-[var(--el-border-color-light)] rounded-8px" shadow="never">
-    <template #header>
-      <div class="flex items-center justify-between">
-        <div class="flex items-center gap-8px">
-          <Icon icon="ep:setting" class="text-[var(--el-color-primary)] text-18px" />
-          <span class="text-16px font-600 text-[var(--el-text-color-primary)]">执行器配置</span>
-          <el-tag size="small" type="info">{{ actions.length }} 个执行器</el-tag>
-        </div>
-        <div class="flex items-center gap-8px">
-          <el-button type="primary" size="small" @click="addAction">
-            <Icon icon="ep:plus" />
-            添加执行器
-          </el-button>
-        </div>
-      </div>
-    </template>
-
-    <div class="p-0">
-      <!-- 空状态 -->
-      <div v-if="actions.length === 0">
-        <el-empty description="暂无执行器配置">
-          <el-button type="primary" @click="addAction">
-            <Icon icon="ep:plus" />
-            添加第一个执行器
-          </el-button>
-        </el-empty>
-      </div>
-
-      <!-- 执行器列表 -->
-      <div v-else class="space-y-24px">
-        <div
-          v-for="(action, index) in actions"
-          :key="`action-${index}`"
-          class="border-2 border-blue-200 rounded-8px bg-blue-50 shadow-sm hover:shadow-md transition-shadow"
-        >
-          <!-- 执行器头部 - 蓝色主题 -->
-          <div
-            class="flex items-center justify-between p-16px bg-gradient-to-r from-blue-50 to-sky-50 border-b border-blue-200 rounded-t-6px"
-          >
-            <div class="flex items-center gap-12px">
-              <div class="flex items-center gap-8px text-16px font-600 text-blue-700">
-                <div
-                  class="w-24px h-24px bg-blue-500 text-white rounded-full flex items-center justify-center text-12px font-bold"
-                >
-                  {{ index + 1 }}
-                </div>
-                <span>执行器 {{ index + 1 }}</span>
-              </div>
-              <el-tag :type="getActionTypeTag(action.type)" size="small" class="font-500">
-                {{ getActionTypeLabel(action.type) }}
-              </el-tag>
-            </div>
-            <div class="flex items-center gap-8px">
-              <el-button
-                v-if="actions.length > 1"
-                type="danger"
-                size="small"
-                text
-                @click="removeAction(index)"
-                class="hover:bg-red-50"
-              >
-                <Icon icon="ep:delete" />
-                删除
-              </el-button>
-            </div>
-          </div>
-
-          <!-- 执行器内容区域 -->
-          <div class="p-16px space-y-16px">
-            <!-- 执行类型选择 -->
-            <div class="w-full">
-              <el-form-item label="执行类型" required>
-                <el-select
-                  :model-value="action.type"
-                  @update:model-value="(value) => updateActionType(index, value)"
-                  @change="(value) => onActionTypeChange(action, value)"
-                  placeholder="请选择执行类型"
-                  class="w-full"
-                >
-                  <el-option
-                    v-for="option in getActionTypeOptions()"
-                    :key="option.value"
-                    :label="option.label"
-                    :value="option.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </div>
-
-            <!-- 设备控制配置 -->
-            <DeviceControlConfig
-              v-if="isDeviceAction(action.type)"
-              :model-value="action"
-              @update:model-value="(value) => updateAction(index, value)"
-            />
-
-            <!-- 告警配置 - 只有恢复告警时才显示 -->
-            <AlertConfig
-              v-if="action.type === IotRuleSceneActionTypeEnum.ALERT_RECOVER"
-              :model-value="action.alertConfigId"
-              @update:model-value="(value) => updateActionAlertConfig(index, value)"
-            />
+<script setup lang="ts">
+import type { Action } from '#/api/iot/rule/scene';
 
-            <!-- 触发告警提示 - 触发告警时显示 -->
-            <div
-              v-if="action.type === IotRuleSceneActionTypeEnum.ALERT_TRIGGER"
-              class="border border-[var(--el-border-color-light)] rounded-6px p-16px bg-[var(--el-fill-color-blank)]"
-            >
-              <div class="flex items-center gap-8px mb-8px">
-                <Icon icon="ep:warning" class="text-[var(--el-color-warning)] text-16px" />
-                <span class="text-14px font-600 text-[var(--el-text-color-primary)]">触发告警</span>
-                <el-tag size="small" type="warning">自动执行</el-tag>
-              </div>
-              <div class="text-12px text-[var(--el-text-color-secondary)] leading-relaxed">
-                当触发条件满足时，系统将自动发送告警通知，可在菜单 [告警中心 -> 告警配置] 管理。
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
+import { IconifyIcon } from '@vben/icons';
 
-      <!-- 添加提示 -->
-      <div v-if="actions.length > 0" class="text-center py-16px">
-        <el-button type="primary" plain @click="addAction">
-          <Icon icon="ep:plus" />
-          继续添加执行器
-        </el-button>
-      </div>
-    </div>
-  </el-card>
-</template>
+import { useVModel } from '@vueuse/core';
+import { Button, Card, Empty, Form, Select, Tag } from 'ant-design-vue';
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import DeviceControlConfig from '../configs/DeviceControlConfig.vue'
-import AlertConfig from '../configs/AlertConfig.vue'
-import type { Action } from '#/api/iot/rule/scene'
 import {
   getActionTypeLabel,
   getActionTypeOptions,
-  IotRuleSceneActionTypeEnum
-} from '#/views/iot/utils/constants'
+  IotRuleSceneActionTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import AlertConfig from '../configs/AlertConfig.vue';
+import DeviceControlConfig from '../configs/DeviceControlConfig.vue';
 
 /** 执行器配置组件 */
-defineOptions({ name: 'ActionSection' })
+defineOptions({ name: 'ActionSection' });
 
 const props = defineProps<{
-  actions: Action[]
-}>()
+  actions: Action[];
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:actions', value: Action[]): void
-}>()
+  (e: 'update:actions', value: Action[]): void;
+}>();
 
-const actions = useVModel(props, 'actions', emit)
+const actions = useVModel(props, 'actions', emit);
 
 /** 获取执行器标签类型（用于 el-tag 的 type 属性） */
-const getActionTypeTag = (type: number): 'primary' | 'success' | 'info' | 'warning' | 'danger' => {
-  const actionTypeTags = {
+function getActionTypeTag(
+  type: number,
+): 'danger' | 'info' | 'primary' | 'success' | 'warning' {
+  const actionTypeTags: Record<
+    number,
+    'danger' | 'info' | 'primary' | 'success' | 'warning'
+  > = {
     [IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET]: 'primary',
     [IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE]: 'success',
     [IotRuleSceneActionTypeEnum.ALERT_TRIGGER]: 'danger',
-    [IotRuleSceneActionTypeEnum.ALERT_RECOVER]: 'warning'
-  } as const
-  return actionTypeTags[type] || 'info'
+    [IotRuleSceneActionTypeEnum.ALERT_RECOVER]: 'warning',
+  } as const;
+  return actionTypeTags[type] || 'info';
 }
 
 /** 判断是否为设备执行器类型 */
-const isDeviceAction = (type: number): boolean => {
+function isDeviceAction(type: number): boolean {
   const deviceActionTypes = [
     IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET,
-    IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE
-  ] as number[]
-  return deviceActionTypes.includes(type)
+    IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE,
+  ] as number[];
+  return deviceActionTypes.includes(type);
 }
 
 /** 判断是否为告警执行器类型 */
-const isAlertAction = (type: number): boolean => {
+function isAlertAction(type: number): boolean {
   const alertActionTypes = [
     IotRuleSceneActionTypeEnum.ALERT_TRIGGER,
-    IotRuleSceneActionTypeEnum.ALERT_RECOVER
-  ] as number[]
-  return alertActionTypes.includes(type)
+    IotRuleSceneActionTypeEnum.ALERT_RECOVER,
+  ] as number[];
+  return alertActionTypes.includes(type);
 }
 
 /**
  * 创建默认的执行器数据
  * @returns 默认执行器对象
  */
-const createDefaultActionData = (): Action => {
+function createDefaultActionData(): Action {
   return {
-    type: IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET, // 默认为设备属性设置
+    type: IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET.toString(), // 默认为设备属性设置
     productId: undefined,
     deviceId: undefined,
     identifier: undefined, // 物模型标识符（服务调用时使用）
     params: undefined,
-    alertConfigId: undefined
-  }
+    alertConfigId: undefined,
+  };
 }
 
 /**
  * 添加执行器
  */
-const addAction = () => {
-  const newAction = createDefaultActionData()
-  actions.value.push(newAction)
+function addAction() {
+  const newAction = createDefaultActionData();
+  actions.value.push(newAction);
 }
 
 /**
  * 删除执行器
  * @param index 执行器索引
  */
-const removeAction = (index: number) => {
-  actions.value.splice(index, 1)
+function removeAction(index: number) {
+  actions.value.splice(index, 1);
 }
 
 /**
@@ -221,9 +99,9 @@ const removeAction = (index: number) => {
  * @param index 执行器索引
  * @param type 执行器类型
  */
-const updateActionType = (index: number, type: number) => {
-  actions.value[index].type = type
-  onActionTypeChange(actions.value[index], type)
+function updateActionType(index: number, type: number) {
+  actions.value[index].type = type.toString();
+  onActionTypeChange(actions.value[index] as Action, type);
 }
 
 /**
@@ -231,8 +109,8 @@ const updateActionType = (index: number, type: number) => {
  * @param index 执行器索引
  * @param action 执行器对象
  */
-const updateAction = (index: number, action: Action) => {
-  actions.value[index] = action
+function updateAction(index: number, action: Action) {
+  actions.value[index] = action;
 }
 
 /**
@@ -240,8 +118,11 @@ const updateAction = (index: number, action: Action) => {
  * @param index 执行器索引
  * @param alertConfigId 告警配置ID
  */
-const updateActionAlertConfig = (index: number, alertConfigId?: number) => {
-  actions.value[index].alertConfigId = alertConfigId
+function updateActionAlertConfig(index: number, alertConfigId?: number) {
+  actions.value[index].alertConfigId = alertConfigId;
+  if (actions.value[index]) {
+    actions.value[index].alertConfigId = alertConfigId;
+  }
 }
 
 /**
@@ -249,24 +130,176 @@ const updateActionAlertConfig = (index: number, alertConfigId?: number) => {
  * @param action 执行器对象
  * @param type 执行器类型
  */
-const onActionTypeChange = (action: Action, type: number) => {
+function onActionTypeChange(action: Action, type: any) {
   // 清理不相关的配置，确保数据结构干净
   if (isDeviceAction(type)) {
     // 设备控制类型：清理告警配置，确保设备参数存在
-    action.alertConfigId = undefined
-    if (!action.params) {
-      action.params = ''
+    action.alertConfigId = undefined;
+    if (!(action as any).params) {
+      (action as any).params = '';
     }
     // 如果从其他类型切换到设备控制类型，清空identifier（让用户重新选择）
-    if (action.identifier && type !== action.type) {
-      action.identifier = undefined
+    if (action.identifier && type !== (action as any).type) {
+      action.identifier = undefined;
     }
   } else if (isAlertAction(type)) {
-    action.productId = undefined
-    action.deviceId = undefined
-    action.identifier = undefined // 清理服务标识符
-    action.params = undefined
-    action.alertConfigId = undefined
+    action.productId = undefined;
+    action.deviceId = undefined;
+    action.identifier = undefined; // 清理服务标识符
+    action.params = undefined;
+    action.alertConfigId = undefined;
   }
 }
 </script>
+
+<template>
+  <Card class="rounded-8px border-primary border" shadow="never">
+    <template #title>
+      <div class="flex items-center justify-between">
+        <div class="gap-8px flex items-center">
+          <IconifyIcon icon="ep:setting" class="text-18px text-primary" />
+          <span class="text-16px font-600 text-primary"> 执行器配置 </span>
+          <Tag size="small" type="info"> {{ actions.length }} 个执行器 </Tag>
+        </div>
+        <div class="gap-8px flex items-center">
+          <Button type="primary" size="small" @click="addAction">
+            <IconifyIcon icon="ep:plus" />
+            添加执行器
+          </Button>
+        </div>
+      </div>
+    </template>
+
+    <div class="p-0">
+      <!-- 空状态 -->
+      <div v-if="actions.length === 0">
+        <Empty description="暂无执行器配置">
+          <Button type="primary" @click="addAction">
+            <IconifyIcon icon="ep:plus" />
+            添加第一个执行器
+          </Button>
+        </Empty>
+      </div>
+
+      <!-- 执行器列表 -->
+      <div v-else class="space-y-24px">
+        <div
+          v-for="(action, index) in actions"
+          :key="`action-${index}`"
+          class="rounded-8px border-2 border-blue-200 bg-blue-50 shadow-sm transition-shadow hover:shadow-md"
+        >
+          <!-- 执行器头部 - 蓝色主题 -->
+          <div
+            class="p-16px rounded-t-6px flex items-center justify-between border-b border-blue-200 bg-gradient-to-r from-blue-50 to-sky-50"
+          >
+            <div class="gap-12px flex items-center">
+              <div
+                class="gap-8px text-16px font-600 flex items-center text-blue-700"
+              >
+                <div
+                  class="w-24px h-24px text-12px flex items-center justify-center rounded-full bg-blue-500 font-bold text-white"
+                >
+                  {{ index + 1 }}
+                </div>
+                <span>执行器 {{ index + 1 }}</span>
+              </div>
+              <Tag
+                :type="getActionTypeTag(action.type as any)"
+                size="small"
+                class="font-500"
+              >
+                {{ getActionTypeLabel(action.type as any) }}
+              </Tag>
+            </div>
+            <div class="gap-8px flex items-center">
+              <Button
+                v-if="actions.length > 1"
+                danger
+                size="small"
+                text
+                @click="removeAction(index)"
+                class="hover:bg-red-50"
+              >
+                <IconifyIcon icon="ep:delete" />
+                删除
+              </Button>
+            </div>
+          </div>
+
+          <!-- 执行器内容区域 -->
+          <div class="p-16px space-y-16px">
+            <!-- 执行类型选择 -->
+            <div class="w-full">
+              <Form.Item label="执行类型" required>
+                <Select
+                  :model-value="action.type"
+                  @update:model-value="
+                    (value: number) => updateActionType(index, value)
+                  "
+                  @change="(value) => onActionTypeChange(action, value)"
+                  placeholder="请选择执行类型"
+                  class="w-full"
+                >
+                  <Select.Option
+                    v-for="option in getActionTypeOptions()"
+                    :key="option.value"
+                    :label="option.label"
+                    :value="option.value"
+                  />
+                </Select>
+              </Form.Item>
+            </div>
+
+            <!-- 设备控制配置 -->
+            <DeviceControlConfig
+              v-if="isDeviceAction(action.type as any)"
+              :model-value="action"
+              @update:model-value="(value) => updateAction(index, value)"
+            />
+
+            <!-- 告警配置 - 只有恢复告警时才显示 -->
+            <AlertConfig
+              v-if="
+                action.type ===
+                IotRuleSceneActionTypeEnum.ALERT_RECOVER.toString()
+              "
+              :model-value="action.alertConfigId"
+              @update:model-value="
+                (value) => updateActionAlertConfig(index, value)
+              "
+            />
+
+            <!-- 触发告警提示 - 触发告警时显示 -->
+            <div
+              v-if="
+                action.type ===
+                IotRuleSceneActionTypeEnum.ALERT_TRIGGER.toString()
+              "
+              class="rounded-6px p-16px border-border bg-fill-color-blank border"
+            >
+              <div class="gap-8px mb-8px flex items-center">
+                <IconifyIcon icon="ep:warning" class="text-16px text-warning" />
+                <span class="text-14px font-600 text-primary">触发告警</span>
+                <Tag size="small" type="warning">自动执行</Tag>
+              </div>
+              <div
+                class="text-12px leading-relaxed text-[var(--el-text-color-secondary)]"
+              >
+                当触发条件满足时，系统将自动发送告警通知，可在菜单 [告警中心 ->
+                告警配置] 管理。
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <!-- 添加提示 -->
+      <div v-if="actions.length > 0" class="py-16px text-center">
+        <Button type="primary" plain @click="addAction">
+          <IconifyIcon icon="ep:plus" />
+          继续添加执行器
+        </Button>
+      </div>
+    </div>
+  </Card>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/sections/BasicInfoSection.vue b/apps/web-antd/src/views/iot/rule/scene/form/sections/BasicInfoSection.vue
index b115f0a4fa55189c0b561d74baca199e6fe8779b..1c859cfd9a9866216d78b60bd0d22b9d6d4140b6 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/sections/BasicInfoSection.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/sections/BasicInfoSection.vue
@@ -1,80 +1,88 @@
 <!-- 基础信息配置组件 -->
+<script setup lang="ts">
+import type { IotSceneRule } from '#/api/iot/rule/scene';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Card, Col, Form, Input, Radio, Row } from 'ant-design-vue';
+
+/** 基础信息配置组件 */
+defineOptions({ name: 'BasicInfoSection' });
+
+const props = defineProps<{
+  modelValue: IotSceneRule;
+  rules?: any;
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: IotSceneRule): void;
+}>();
+
+const formData = useVModel(props, 'modelValue', emit); // 表单数据
+</script>
+
 <template>
-  <el-card class="border border-[var(--el-border-color-light)] rounded-8px mb-10px" shadow="never">
-    <template #header>
+  <Card class="rounded-8px mb-10px border-primary border" shadow="never">
+    <template #title>
       <div class="flex items-center justify-between">
-        <div class="flex items-center gap-8px">
-          <Icon icon="ep:info-filled" class="text-[var(--el-color-primary)] text-18px" />
-          <span class="text-16px font-600 text-[var(--el-text-color-primary)]">基础信息</span>
+        <div class="gap-8px flex items-center">
+          <IconifyIcon icon="ep:info-filled" class="text-18px text-primary" />
+          <span class="text-16px font-600 text-primary">基础信息</span>
         </div>
-        <div class="flex items-center gap-8px">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="formData.status" />
+        <div class="gap-8px flex items-center">
+          <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="formData.status" />
         </div>
       </div>
     </template>
 
     <div class="p-0">
-      <el-row :gutter="24" class="mb-24px">
-        <el-col :span="12">
-          <el-form-item label="场景名称" prop="name" required>
-            <el-input
+      <Row :gutter="24" class="mb-24px">
+        <Col :span="12">
+          <Form.Item label="场景名称" prop="name" required>
+            <Input
               v-model="formData.name"
               placeholder="请输入场景名称"
-              maxlength="50"
+              :maxlength="50"
               show-word-limit
               clearable
             />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="场景状态" prop="status" required>
-            <el-radio-group v-model="formData.status">
-              <el-radio
-                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
-                :key="dict.value"
+          </Form.Item>
+        </Col>
+        <Col :span="12">
+          <Form.Item label="场景状态" prop="status" required>
+            <Radio.Group v-model="formData.status">
+              <Radio
+                v-for="(dict, index) in getDictOptions(
+                  DICT_TYPE.COMMON_STATUS,
+                  'number',
+                )"
+                :key="index"
                 :label="dict.value"
               >
                 {{ dict.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="场景描述" prop="description">
-        <el-input
+              </Radio>
+            </Radio.Group>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Form.Item label="场景描述" prop="description">
+        <Input.TextArea
           v-model="formData.description"
-          type="textarea"
+          type="text"
           placeholder="请输入场景描述（可选）"
           :rows="3"
-          maxlength="200"
+          :maxlength="200"
           show-word-limit
           resize="none"
         />
-      </el-form-item>
+      </Form.Item>
     </div>
-  </el-card>
+  </Card>
 </template>
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import { DICT_TYPE, getIntDictOptions } from '@vben/constants'
-import type { IotSceneRule } from '#/api/iot/rule/scene'
-
-/** 基础信息配置组件 */
-defineOptions({ name: 'BasicInfoSection' })
-
-const props = defineProps<{
-  modelValue: IotSceneRule
-  rules?: any
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: IotSceneRule): void
-}>()
-
-const formData = useVModel(props, 'modelValue', emit) // 表单数据
-</script>
-
 <style scoped>
 :deep(.el-form-item) {
   margin-bottom: 20px;
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/sections/TriggerSection.vue b/apps/web-antd/src/views/iot/rule/scene/form/sections/TriggerSection.vue
index fdec510d0fa0c5084e822333fac680b17676d23b..4f938f54a66da0550deacbf2b7adf173b3bd9a52 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/sections/TriggerSection.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/sections/TriggerSection.vue
@@ -1,16 +1,135 @@
+<script setup lang="ts">
+import type { Trigger } from '#/api/iot/rule/scene';
+
+import { onMounted } from 'vue';
+
+import { IconifyIcon } from '@vben/icons';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Card, Empty, Form, Tag } from 'ant-design-vue';
+
+import { CronTab } from '#/components/cron-tab';
+import {
+  getTriggerTypeLabel,
+  IotRuleSceneTriggerTypeEnum,
+  isDeviceTrigger,
+} from '#/views/iot/utils/constants';
+
+import DeviceTriggerConfig from '../configs/DeviceTriggerConfig.vue';
+
+/** 触发器配置组件 */
+defineOptions({ name: 'TriggerSection' });
+
+const props = defineProps<{
+  triggers: Trigger[];
+}>();
+
+const emit = defineEmits<{
+  (e: 'update:triggers', value: Trigger[]): void;
+}>();
+
+const triggers = useVModel(props, 'triggers', emit);
+
+/** 获取触发器标签类型（用于 el-tag 的 type 属性） */
+function getTriggerTagType(
+  type: number,
+): 'danger' | 'info' | 'primary' | 'success' | 'warning' {
+  if (type === IotRuleSceneTriggerTypeEnum.TIMER) {
+    return 'warning';
+  }
+  return isDeviceTrigger(type) ? 'success' : 'info';
+}
+
+/** 添加触发器 */
+function addTrigger() {
+  const newTrigger: Trigger = {
+    type: IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE.toString(),
+    productId: undefined,
+    deviceId: undefined,
+    identifier: undefined,
+    operator: undefined,
+    value: undefined,
+    cronExpression: undefined,
+    conditionGroups: [], // 空的条件组数组
+  };
+  triggers.value.push(newTrigger);
+}
+
+/**
+ * 删除触发器
+ * @param index 触发器索引
+ */
+function removeTrigger(index: number) {
+  if (triggers.value.length > 1) {
+    triggers.value.splice(index, 1);
+  }
+}
+
+/**
+ * 更新触发器类型
+ * @param index 触发器索引
+ * @param type 触发器类型
+ */
+function updateTriggerType(index: number, type: number) {
+  triggers.value[index].type = type;
+  onTriggerTypeChange(index, type);
+}
+
+/**
+ * 更新触发器设备配置
+ * @param index 触发器索引
+ * @param newTrigger 新的触发器对象
+ */
+function updateTriggerDeviceConfig(index: number, newTrigger: Trigger) {
+  triggers.value[index] = newTrigger;
+}
+
+/**
+ * 更新触发器 CRON 配置
+ * @param index 触发器索引
+ * @param cronExpression CRON 表达式
+ */
+function updateTriggerCronConfig(index: number, cronExpression?: string) {
+  triggers.value[index].cronExpression = cronExpression;
+}
+
+/**
+ * 处理触发器类型变化事件
+ * @param index 触发器索引
+ * @param _ 触发器类型（未使用）
+ */
+function onTriggerTypeChange(index: number, _: number) {
+  const triggerItem = triggers.value[index];
+  triggerItem.productId = undefined;
+  triggerItem.deviceId = undefined;
+  triggerItem.identifier = undefined;
+  triggerItem.operator = undefined;
+  triggerItem.value = undefined;
+  triggerItem.cronExpression = undefined;
+  triggerItem.conditionGroups = [];
+}
+
+/** 初始化：确保至少有一个触发器 */
+onMounted(() => {
+  if (triggers.value.length === 0) {
+    addTrigger();
+  }
+});
+</script>
+
 <template>
-  <el-card class="border border-[var(--el-border-color-light)] rounded-8px mb-10px" shadow="never">
-    <template #header>
+  <Card class="rounded-8px mb-10px border-primary border" shadow="never">
+    <template #title>
       <div class="flex items-center justify-between">
-        <div class="flex items-center gap-8px">
-          <Icon icon="ep:lightning" class="text-[var(--el-color-primary)] text-18px" />
-          <span class="text-16px font-600 text-[var(--el-text-color-primary)]">触发器配置</span>
-          <el-tag size="small" type="info">{{ triggers.length }} 个触发器</el-tag>
+        <div class="gap-8px flex items-center">
+          <IconifyIcon icon="ep:lightning" class="text-18px text-primary" />
+          <span class="text-16px font-600 text-primary">触发器配置</span>
+          <Tag size="small" type="info"> {{ triggers.length }} 个触发器 </Tag>
         </div>
-        <el-button type="primary" size="small" @click="addTrigger">
-          <Icon icon="ep:plus" />
+        <Button type="primary" size="small" @click="addTrigger">
+          <IconifyIcon icon="ep:plus" />
           添加触发器
-        </el-button>
+        </Button>
       </div>
     </template>
 
@@ -20,37 +139,43 @@
         <div
           v-for="(triggerItem, index) in triggers"
           :key="`trigger-${index}`"
-          class="border-2 border-green-200 rounded-8px bg-green-50 shadow-sm hover:shadow-md transition-shadow"
+          class="rounded-8px border-2 border-green-200 bg-green-50 shadow-sm transition-shadow hover:shadow-md"
         >
           <!-- 触发器头部 - 绿色主题 -->
           <div
-            class="flex items-center justify-between p-16px bg-gradient-to-r from-green-50 to-emerald-50 border-b border-green-200 rounded-t-6px"
+            class="p-16px rounded-t-6px flex items-center justify-between border-b border-green-200 bg-gradient-to-r from-green-50 to-emerald-50"
           >
-            <div class="flex items-center gap-12px">
-              <div class="flex items-center gap-8px text-16px font-600 text-green-700">
+            <div class="gap-12px flex items-center">
+              <div
+                class="gap-8px text-16px font-600 flex items-center text-green-700"
+              >
                 <div
-                  class="w-24px h-24px bg-green-500 text-white rounded-full flex items-center justify-center text-12px font-bold"
+                  class="w-24px h-24px text-12px flex items-center justify-center rounded-full bg-green-500 font-bold text-white"
                 >
                   {{ index + 1 }}
                 </div>
                 <span>触发器 {{ index + 1 }}</span>
               </div>
-              <el-tag size="small" :type="getTriggerTagType(triggerItem.type)" class="font-500">
-                {{ getTriggerTypeLabel(triggerItem.type) }}
-              </el-tag>
+              <Tag
+                size="small"
+                :type="getTriggerTagType(triggerItem.type as any)"
+                class="font-500"
+              >
+                {{ getTriggerTypeLabel(triggerItem.type as any) }}
+              </Tag>
             </div>
-            <div class="flex items-center gap-8px">
-              <el-button
+            <div class="gap-8px flex items-center">
+              <Button
                 v-if="triggers.length > 1"
-                type="danger"
+                danger
                 size="small"
                 text
                 @click="removeTrigger(index)"
                 class="hover:bg-red-50"
               >
-                <Icon icon="ep:delete" />
+                <IconifyIcon icon="ep:delete" />
                 删除
-              </el-button>
+              </Button>
             </div>
           </div>
 
@@ -58,37 +183,44 @@
           <div class="p-16px space-y-16px">
             <!-- 设备触发配置 -->
             <DeviceTriggerConfig
-              v-if="isDeviceTrigger(triggerItem.type)"
+              v-if="isDeviceTrigger(triggerItem.type as any)"
               :model-value="triggerItem"
               :index="index"
-              @update:model-value="(value) => updateTriggerDeviceConfig(index, value)"
+              @update:model-value="
+                (value) => updateTriggerDeviceConfig(index, value)
+              "
               @trigger-type-change="(type) => updateTriggerType(index, type)"
             />
 
             <!-- 定时触发配置 -->
             <div
-              v-else-if="triggerItem.type === IotRuleSceneTriggerTypeEnum.TIMER"
-              class="flex flex-col gap-16px"
+              v-else-if="
+                triggerItem.type ===
+                IotRuleSceneTriggerTypeEnum.TIMER.toString()
+              "
+              class="gap-16px flex flex-col"
             >
               <div
-                class="flex items-center gap-8px p-12px px-16px bg-[var(--el-fill-color-light)] rounded-6px border border-[var(--el-border-color-lighter)]"
+                class="gap-8px p-12px px-16px rounded-6px border-primary bg-background flex items-center border"
               >
-                <Icon icon="ep:timer" class="text-[var(--el-color-danger)] text-18px" />
-                <span class="text-14px font-500 text-[var(--el-text-color-primary)]"
-                  >定时触发配置</span
-                >
+                <IconifyIcon icon="ep:timer" class="text-18px text-danger" />
+                <span class="text-14px font-500 text-primary">
+                  定时触发配置
+                </span>
               </div>
 
               <!-- CRON 表达式配置 -->
               <div
-                class="p-16px border border-[var(--el-border-color-lighter)] rounded-6px bg-[var(--el-fill-color-blank)]"
+                class="p-16px rounded-6px border-primary bg-background border"
               >
-                <el-form-item label="CRON表达式" required>
-                  <Crontab
+                <Form.Item label="CRON表达式" required>
+                  <CronTab
                     :model-value="triggerItem.cronExpression || '0 0 12 * * ?'"
-                    @update:model-value="(value) => updateTriggerCronConfig(index, value)"
+                    @update:model-value="
+                      (value) => updateTriggerCronConfig(index, value)
+                    "
                   />
-                </el-form-item>
+                </Form.Item>
               </div>
             </div>
           </div>
@@ -97,126 +229,17 @@
 
       <!-- 空状态 -->
       <div v-else class="py-40px text-center">
-        <el-empty description="暂无触发器">
+        <Empty description="暂无触发器">
           <template #description>
             <div class="space-y-8px">
-              <p class="text-[var(--el-text-color-secondary)]">暂无触发器配置</p>
-              <p class="text-12px text-[var(--el-text-color-placeholder)]">
+              <p class="text-secondary">暂无触发器配置</p>
+              <p class="text-12px text-primary">
                 请使用上方的"添加触发器"按钮来设置触发规则
               </p>
             </div>
           </template>
-        </el-empty>
+        </Empty>
       </div>
     </div>
-  </el-card>
+  </Card>
 </template>
-
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import DeviceTriggerConfig from '../configs/DeviceTriggerConfig.vue'
-import { Crontab } from '@/components/Crontab'
-import type { Trigger } from '#/api/iot/rule/scene'
-import {
-  getTriggerTypeLabel,
-  IotRuleSceneTriggerTypeEnum,
-  isDeviceTrigger
-} from '#/views/iot/utils/constants'
-
-/** 触发器配置组件 */
-defineOptions({ name: 'TriggerSection' })
-
-const props = defineProps<{
-  triggers: Trigger[]
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:triggers', value: Trigger[]): void
-}>()
-
-const triggers = useVModel(props, 'triggers', emit)
-
-/** 获取触发器标签类型（用于 el-tag 的 type 属性） */
-const getTriggerTagType = (type: number): 'primary' | 'success' | 'info' | 'warning' | 'danger' => {
-  if (type === IotRuleSceneTriggerTypeEnum.TIMER) {
-    return 'warning'
-  }
-  return isDeviceTrigger(type) ? 'success' : 'info'
-}
-
-/** 添加触发器 */
-const addTrigger = () => {
-  const newTrigger: Trigger = {
-    type: IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE,
-    productId: undefined,
-    deviceId: undefined,
-    identifier: undefined,
-    operator: undefined,
-    value: undefined,
-    cronExpression: undefined,
-    conditionGroups: [] // 空的条件组数组
-  }
-  triggers.value.push(newTrigger)
-}
-
-/**
- * 删除触发器
- * @param index 触发器索引
- */
-const removeTrigger = (index: number) => {
-  if (triggers.value.length > 1) {
-    triggers.value.splice(index, 1)
-  }
-}
-
-/**
- * 更新触发器类型
- * @param index 触发器索引
- * @param type 触发器类型
- */
-const updateTriggerType = (index: number, type: number) => {
-  triggers.value[index].type = type
-  onTriggerTypeChange(index, type)
-}
-
-/**
- * 更新触发器设备配置
- * @param index 触发器索引
- * @param newTrigger 新的触发器对象
- */
-const updateTriggerDeviceConfig = (index: number, newTrigger: Trigger) => {
-  triggers.value[index] = newTrigger
-}
-
-/**
- * 更新触发器 CRON 配置
- * @param index 触发器索引
- * @param cronExpression CRON 表达式
- */
-const updateTriggerCronConfig = (index: number, cronExpression?: string) => {
-  triggers.value[index].cronExpression = cronExpression
-}
-
-/**
- * 处理触发器类型变化事件
- * @param index 触发器索引
- * @param _ 触发器类型（未使用）
- */
-const onTriggerTypeChange = (index: number, _: number) => {
-  const triggerItem = triggers.value[index]
-  triggerItem.productId = undefined
-  triggerItem.deviceId = undefined
-  triggerItem.identifier = undefined
-  triggerItem.operator = undefined
-  triggerItem.value = undefined
-  triggerItem.cronExpression = undefined
-  triggerItem.conditionGroups = []
-}
-
-/** 初始化：确保至少有一个触发器 */
-onMounted(() => {
-  if (triggers.value.length === 0) {
-    addTrigger()
-  }
-})
-</script>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/DeviceSelector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/DeviceSelector.vue
index bdaa1aff4728943a09367ca4861d27270df3a726..303eade75b55a22a2819caa00240371309655258 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/DeviceSelector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/DeviceSelector.vue
@@ -1,85 +1,59 @@
 <!-- 设备选择器组件 -->
-<template>
-  <el-select
-    :model-value="modelValue"
-    @update:model-value="handleChange"
-    placeholder="请选择设备"
-    filterable
-    clearable
-    class="w-full"
-    :loading="deviceLoading"
-    :disabled="!productId"
-  >
-    <el-option
-      v-for="device in deviceList"
-      :key="device.id"
-      :label="device.deviceName"
-      :value="device.id"
-    >
-      <div class="flex items-center justify-between w-full py-4px">
-        <div class="flex-1">
-          <div class="text-14px font-500 text-[var(--el-text-color-primary)] mb-2px">
-            {{ device.deviceName }}
-          </div>
-          <div class="text-12px text-[var(--el-text-color-secondary)]">{{ device.deviceKey }}</div>
-        </div>
-        <div class="flex items-center gap-4px" v-if="device.id > 0">
-          <dict-tag :type="DICT_TYPE.IOT_DEVICE_STATE" :value="device.state" />
-        </div>
-      </div>
-    </el-option>
-  </el-select>
-</template>
-
 <script setup lang="ts">
-import { DeviceApi } from '#/api/iot/device/device'
-import { DEVICE_SELECTOR_OPTIONS } from '#/views/iot/utils/constants'
-import { DICT_TYPE } from '@vben/constants'
+import { ref, watch } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Select } from 'ant-design-vue';
+
+import { getDeviceListByProductId } from '#/api/iot/device/device';
+import { DictTag } from '#/components/dict-tag';
+import { DEVICE_SELECTOR_OPTIONS } from '#/views/iot/utils/constants';
 
 /** 设备选择器组件 */
-defineOptions({ name: 'DeviceSelector' })
+defineOptions({ name: 'DeviceSelector' });
 
 const props = defineProps<{
-  modelValue?: number
-  productId?: number
-}>()
+  modelValue?: number;
+  productId?: number;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value?: number): void
-  (e: 'change', value?: number): void
-}>()
+  (e: 'update:modelValue', value?: number): void;
+  (e: 'change', value?: number): void;
+}>();
 
-const deviceLoading = ref(false) // 设备加载状态
-const deviceList = ref<any[]>([]) // 设备列表
+const deviceLoading = ref(false); // 设备加载状态
+const deviceList = ref<any[]>([]); // 设备列表
 
 /**
  * 处理选择变化事件
  * @param value 选中的设备ID
  */
-const handleChange = (value?: number) => {
-  emit('update:modelValue', value)
-  emit('change', value)
+function handleChange(value?: number) {
+  emit('update:modelValue', value);
+  emit('change', value);
 }
 
 /**
  * 获取设备列表
  */
-const getDeviceList = async () => {
+async function getDeviceList() {
   if (!props.productId) {
-    deviceList.value = []
-    return
+    deviceList.value = [];
+    return;
   }
 
   try {
-    deviceLoading.value = true
-    const res = await DeviceApi.getDeviceListByProductId(props.productId)
-    deviceList.value = res || []
+    deviceLoading.value = true;
+    const res = await getDeviceListByProductId(props.productId);
+    deviceList.value = res || [];
   } catch (error) {
-    console.error('获取设备列表失败:', error)
-    deviceList.value = []
+    console.error('获取设备列表失败:', error);
+    deviceList.value = [];
   } finally {
-    deviceList.value.unshift(DEVICE_SELECTOR_OPTIONS.ALL_DEVICES)
-    deviceLoading.value = false
+    deviceList.value.unshift(DEVICE_SELECTOR_OPTIONS.ALL_DEVICES);
+    deviceLoading.value = false;
   }
 }
 
@@ -88,16 +62,50 @@ watch(
   () => props.productId,
   (newProductId) => {
     if (newProductId) {
-      getDeviceList()
+      getDeviceList();
     } else {
-      deviceList.value = []
+      deviceList.value = [];
       // 清空当前选择的设备
       if (props.modelValue) {
-        emit('update:modelValue', undefined)
-        emit('change', undefined)
+        emit('update:modelValue', undefined);
+        emit('change', undefined);
       }
     }
   },
-  { immediate: true }
-)
+  { immediate: true },
+);
 </script>
+
+<template>
+  <Select
+    :model-value="modelValue"
+    @update:model-value="handleChange"
+    placeholder="请选择设备"
+    filterable
+    clearable
+    class="w-full"
+    :loading="deviceLoading"
+    :disabled="!productId"
+  >
+    <Select.Option
+      v-for="device in deviceList"
+      :key="device.id"
+      :label="device.deviceName"
+      :value="device.id"
+    >
+      <div class="py-4px flex w-full items-center justify-between">
+        <div class="flex-1">
+          <div class="text-14px font-500 mb-2px text-primary">
+            {{ device.deviceName }}
+          </div>
+          <div class="text-12px text-primary">
+            {{ device.deviceKey }}
+          </div>
+        </div>
+        <div class="gap-4px flex items-center" v-if="device.id > 0">
+          <DictTag :type="DICT_TYPE.IOT_DEVICE_STATE" :value="device.state" />
+        </div>
+      </div>
+    </Select.Option>
+  </Select>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
index 41957fa1027adf854db4aea85794804a0ede1c09..c9e9d3aacd943d2d278ca7d36bd9ee603d0af985 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/OperatorSelector.vue
@@ -1,59 +1,29 @@
 <!-- 操作符选择器组件 -->
-<template>
-  <div class="w-full">
-    <el-select
-      v-model="localValue"
-      placeholder="请选择操作符"
-      @change="handleChange"
-      class="w-full"
-    >
-      <el-option
-        v-for="operator in availableOperators"
-        :key="operator.value"
-        :label="operator.label"
-        :value="operator.value"
-      >
-        <div class="flex items-center justify-between w-full py-4px">
-          <div class="flex items-center gap-8px">
-            <div class="text-14px font-500 text-[var(--el-text-color-primary)]">
-              {{ operator.label }}
-            </div>
-            <div
-              class="text-12px text-[var(--el-color-primary)] bg-[var(--el-color-primary-light-9)] px-6px py-2px rounded-4px font-mono"
-            >
-              {{ operator.symbol }}
-            </div>
-          </div>
-          <div class="text-12px text-[var(--el-text-color-secondary)]">
-            {{ operator.description }}
-          </div>
-        </div>
-      </el-option>
-    </el-select>
-  </div>
-</template>
-
 <script setup lang="ts">
-import { useVModel } from '@vueuse/core'
+import { computed, watch } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { Select } from 'ant-design-vue';
+
 import {
+  IoTDataSpecsDataTypeEnum,
   IotRuleSceneTriggerConditionParameterOperatorEnum,
-  IoTDataSpecsDataTypeEnum
-} from '#/views/iot/utils/constants'
+} from '#/views/iot/utils/constants';
 
 /** 操作符选择器组件 */
-defineOptions({ name: 'OperatorSelector' })
+defineOptions({ name: 'OperatorSelector' });
 
 const props = defineProps<{
-  modelValue?: string
-  propertyType?: string
-}>()
+  modelValue?: string;
+  propertyType?: string;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: string): void
-  (e: 'change', value: string): void
-}>()
+  (e: 'update:modelValue', value: string): void;
+  (e: 'change', value: string): void;
+}>();
 
-const localValue = useVModel(props, 'modelValue', emit)
+const localValue = useVModel(props, 'modelValue', emit);
 
 // 基于枚举的操作符定义
 const allOperators = [
@@ -69,8 +39,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.DOUBLE,
       IoTDataSpecsDataTypeEnum.TEXT,
       IoTDataSpecsDataTypeEnum.BOOL,
-      IoTDataSpecsDataTypeEnum.ENUM
-    ]
+      IoTDataSpecsDataTypeEnum.ENUM,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_EQUALS.value,
@@ -84,8 +54,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.DOUBLE,
       IoTDataSpecsDataTypeEnum.TEXT,
       IoTDataSpecsDataTypeEnum.BOOL,
-      IoTDataSpecsDataTypeEnum.ENUM
-    ]
+      IoTDataSpecsDataTypeEnum.ENUM,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN.value,
@@ -97,12 +67,16 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
-    value: IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS.value,
-    label: IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS.name,
+    value:
+      IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS
+        .value,
+    label:
+      IotRuleSceneTriggerConditionParameterOperatorEnum.GREATER_THAN_OR_EQUALS
+        .name,
     symbol: '≥',
     description: '值大于或等于指定值时触发',
     example: 'humidity >= 80',
@@ -110,8 +84,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN.value,
@@ -123,12 +97,16 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
-    value: IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS.value,
-    label: IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS.name,
+    value:
+      IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS
+        .value,
+    label:
+      IotRuleSceneTriggerConditionParameterOperatorEnum.LESS_THAN_OR_EQUALS
+        .name,
     symbol: '≤',
     description: '值小于或等于指定值时触发',
     example: 'battery <= 20',
@@ -136,8 +114,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.IN.value,
@@ -149,8 +127,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.TEXT,
-      IoTDataSpecsDataTypeEnum.ENUM
-    ]
+      IoTDataSpecsDataTypeEnum.ENUM,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_IN.value,
@@ -162,8 +140,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.TEXT,
-      IoTDataSpecsDataTypeEnum.ENUM
-    ]
+      IoTDataSpecsDataTypeEnum.ENUM,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.BETWEEN.value,
@@ -175,8 +153,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_BETWEEN.value,
@@ -188,8 +166,8 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.INT,
       IoTDataSpecsDataTypeEnum.FLOAT,
       IoTDataSpecsDataTypeEnum.DOUBLE,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.LIKE.value,
@@ -197,7 +175,7 @@ const allOperators = [
     symbol: '≈',
     description: '字符串匹配指定模式时触发',
     example: 'message like "%error%"',
-    supportedTypes: [IoTDataSpecsDataTypeEnum.TEXT]
+    supportedTypes: [IoTDataSpecsDataTypeEnum.TEXT],
   },
   {
     value: IotRuleSceneTriggerConditionParameterOperatorEnum.NOT_NULL.value,
@@ -212,32 +190,32 @@ const allOperators = [
       IoTDataSpecsDataTypeEnum.TEXT,
       IoTDataSpecsDataTypeEnum.BOOL,
       IoTDataSpecsDataTypeEnum.ENUM,
-      IoTDataSpecsDataTypeEnum.DATE
-    ]
-  }
-]
+      IoTDataSpecsDataTypeEnum.DATE,
+    ],
+  },
+];
 
 // 计算属性：可用的操作符
 const availableOperators = computed(() => {
   if (!props.propertyType) {
-    return allOperators
+    return allOperators;
   }
   return allOperators.filter((op) =>
-    (op.supportedTypes as any[]).includes(props.propertyType || '')
-  )
-})
+    (op.supportedTypes as any[]).includes(props.propertyType || ''),
+  );
+});
 
 // 计算属性：当前选中的操作符
 const selectedOperator = computed(() => {
-  return allOperators.find((op) => op.value === localValue.value)
-})
+  return allOperators.find((op) => op.value === localValue.value);
+});
 
 /**
  * 处理选择变化事件
  * @param value 选中的操作符值
  */
-const handleChange = (value: string) => {
-  emit('change', value)
+function handleChange(value: any) {
+  emit('change', value);
 }
 
 /** 监听属性类型变化 */
@@ -248,14 +226,50 @@ watch(
     if (
       localValue.value &&
       selectedOperator.value &&
-      !(selectedOperator.value.supportedTypes as any[]).includes(props.propertyType || '')
+      !(selectedOperator.value.supportedTypes as any[]).includes(
+        props.propertyType || '',
+      )
     ) {
-      localValue.value = ''
+      localValue.value = '';
     }
-  }
-)
+  },
+);
 </script>
 
+<template>
+  <div class="w-full">
+    <Select
+      v-model="localValue"
+      placeholder="请选择操作符"
+      @change="handleChange"
+      class="w-full"
+    >
+      <Select.Option
+        v-for="operator in availableOperators"
+        :key="operator.value"
+        :label="operator.label"
+        :value="operator.value"
+      >
+        <div class="py-4px flex w-full items-center justify-between">
+          <div class="gap-8px flex items-center">
+            <div class="text-14px font-500 text-primary">
+              {{ operator.label }}
+            </div>
+            <div
+              class="text-12px px-6px py-2px rounded-4px bg-primary-light-9 text-primary font-mono"
+            >
+              {{ operator.symbol }}
+            </div>
+          </div>
+          <div class="text-12px text-secondary">
+            {{ operator.description }}
+          </div>
+        </div>
+      </Select.Option>
+    </Select>
+  </div>
+</template>
+
 <style scoped>
 :deep(.el-select-dropdown__item) {
   height: auto;
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/ProductSelector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/ProductSelector.vue
index c54872701d23edbd8be3430889dfdb3cde11f768..f07952e277a3edfb990f7c8b489faa95c4e39fad 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/ProductSelector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/ProductSelector.vue
@@ -1,79 +1,84 @@
 <!-- 产品选择器组件 -->
-<template>
-  <el-select
-    :model-value="modelValue"
-    @update:model-value="handleChange"
-    placeholder="请选择产品"
-    filterable
-    clearable
-    class="w-full"
-    :loading="productLoading"
-  >
-    <el-option
-      v-for="product in productList"
-      :key="product.id"
-      :label="product.name"
-      :value="product.id"
-    >
-      <div class="flex items-center justify-between w-full py-4px">
-        <div class="flex-1">
-          <div class="text-14px font-500 text-[var(--el-text-color-primary)] mb-2px">
-            {{ product.name }}
-          </div>
-          <div class="text-12px text-[var(--el-text-color-secondary)]">
-            {{ product.productKey }}
-          </div>
-        </div>
-        <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="product.status" />
-      </div>
-    </el-option>
-  </el-select>
-</template>
-
 <script setup lang="ts">
-import { ProductApi } from '#/api/iot/product/product'
-import { DICT_TYPE } from '@vben/constants'
+import { onMounted, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+
+import { Select } from 'ant-design-vue';
+
+import { getSimpleProductList } from '#/api/iot/product/product';
 
 /** 产品选择器组件 */
-defineOptions({ name: 'ProductSelector' })
+defineOptions({ name: 'ProductSelector' });
 
 defineProps<{
-  modelValue?: number
-}>()
+  modelValue?: number;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value?: number): void
-  (e: 'change', value?: number): void
-}>()
+  (e: 'update:modelValue', value?: number): void;
+  (e: 'change', value?: number): void;
+}>();
 
-const productLoading = ref(false) // 产品加载状态
-const productList = ref<any[]>([]) // 产品列表
+const productLoading = ref(false); // 产品加载状态
+const productList = ref<any[]>([]); // 产品列表
 
 /**
  * 处理选择变化事件
  * @param value 选中的产品 ID
  */
-const handleChange = (value?: number) => {
-  emit('update:modelValue', value)
-  emit('change', value)
+function handleChange(value?: number) {
+  emit('update:modelValue', value);
+  emit('change', value);
 }
 
 /** 获取产品列表 */
-const getProductList = async () => {
+async function getProductList() {
   try {
-    productLoading.value = true
-    const res = await ProductApi.getSimpleProductList()
-    productList.value = res || []
+    productLoading.value = true;
+    const res = await getSimpleProductList();
+    productList.value = res || [];
   } catch (error) {
-    console.error('获取产品列表失败:', error)
-    productList.value = []
+    console.error('获取产品列表失败:', error);
+    productList.value = [];
   } finally {
-    productLoading.value = false
+    productLoading.value = false;
   }
 }
 
 // 组件挂载时获取产品列表
 onMounted(() => {
-  getProductList()
-})
+  getProductList();
+});
 </script>
+
+<template>
+  <Select
+    :model-value="modelValue"
+    @update:model-value="handleChange"
+    placeholder="请选择产品"
+    filterable
+    clearable
+    class="w-full"
+    :loading="productLoading"
+  >
+    <Select.Option
+      v-for="product in productList"
+      :key="product.id"
+      :label="product.name"
+      :value="product.id"
+    >
+      <div class="py-4px flex w-full items-center justify-between">
+        <div class="flex-1">
+          <div class="text-14px font-500 mb-2px text-primary">
+            {{ product.name }}
+          </div>
+          <div class="text-12px text-secondary">
+            {{ product.productKey }}
+          </div>
+        </div>
+        <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="product.status" />
+      </div>
+    </Select.Option>
+  </Select>
+</template>
diff --git a/apps/web-antd/src/views/iot/rule/scene/form/selectors/PropertySelector.vue b/apps/web-antd/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
index 43abb6ba1137608ec129edf6b79bc54eb1e93d2e..e425621ebf771da3a201c5110459b213d62c6549 100644
--- a/apps/web-antd/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/form/selectors/PropertySelector.vue
@@ -1,304 +1,162 @@
 <!-- 属性选择器组件 -->
-<template>
-  <div class="flex items-center gap-8px">
-    <el-select
-      v-model="localValue"
-      placeholder="请选择监控项"
-      filterable
-      clearable
-      @change="handleChange"
-      class="!w-150px"
-      :loading="loading"
-    >
-      <el-option-group v-for="group in propertyGroups" :key="group.label" :label="group.label">
-        <el-option
-          v-for="property in group.options"
-          :key="property.identifier"
-          :label="property.name"
-          :value="property.identifier"
-        >
-          <div class="flex items-center justify-between w-full py-2px">
-            <span class="text-14px font-500 text-[var(--el-text-color-primary)] flex-1 truncate">
-              {{ property.name }}
-            </span>
-            <el-tag
-              :type="getDataTypeTagType(property.dataType)"
-              size="small"
-              class="ml-8px flex-shrink-0"
-            >
-              {{ property.identifier }}
-            </el-tag>
-          </div>
-        </el-option>
-      </el-option-group>
-    </el-select>
-
-    <!-- 属性详情弹出层 -->
-    <el-popover
-      v-if="selectedProperty"
-      placement="right-start"
-      :width="350"
-      trigger="click"
-      :show-arrow="true"
-      :offset="8"
-      popper-class="property-detail-popover"
-    >
-      <template #reference>
-        <el-button
-          type="info"
-          :icon="InfoFilled"
-          circle
-          size="small"
-          class="flex-shrink-0"
-          title="查看属性详情"
-        />
-      </template>
-
-      <!-- 弹出层内容 -->
-      <div class="property-detail-content">
-        <div class="flex items-center gap-8px mb-12px">
-          <Icon icon="ep:info-filled" class="text-[var(--el-color-info)] text-16px" />
-          <span class="text-14px font-500 text-[var(--el-text-color-primary)]">
-            {{ selectedProperty.name }}
-          </span>
-          <el-tag :type="getDataTypeTagType(selectedProperty.dataType)" size="small">
-            {{ getDataTypeName(selectedProperty.dataType) }}
-          </el-tag>
-        </div>
-
-        <div class="space-y-8px ml-24px">
-          <div class="flex items-start gap-8px">
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              标识符：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ selectedProperty.identifier }}
-            </span>
-          </div>
-
-          <div v-if="selectedProperty.description" class="flex items-start gap-8px">
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              描述：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ selectedProperty.description }}
-            </span>
-          </div>
-
-          <div v-if="selectedProperty.unit" class="flex items-start gap-8px">
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              单位：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ selectedProperty.unit }}
-            </span>
-          </div>
-
-          <div v-if="selectedProperty.range" class="flex items-start gap-8px">
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              取值范围：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ selectedProperty.range }}
-            </span>
-          </div>
+<script setup lang="ts">
+import type {
+  ThingModelApi,
+  ThingModelEvent,
+  ThingModelProperty,
+  ThingModelService,
+} from '#/api/iot/thingmodel';
 
-          <!-- 根据属性类型显示额外信息 -->
-          <div
-            v-if="
-              selectedProperty.type === IoTThingModelTypeEnum.PROPERTY &&
-              selectedProperty.accessMode
-            "
-            class="flex items-start gap-8px"
-          >
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              访问模式：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ getAccessModeLabel(selectedProperty.accessMode) }}
-            </span>
-          </div>
+import { computed, ref, watch } from 'vue';
 
-          <div
-            v-if="
-              selectedProperty.type === IoTThingModelTypeEnum.EVENT && selectedProperty.eventType
-            "
-            class="flex items-start gap-8px"
-          >
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              事件类型：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ getEventTypeLabel(selectedProperty.eventType) }}
-            </span>
-          </div>
+import { IconifyIcon } from '@vben/icons';
 
-          <div
-            v-if="
-              selectedProperty.type === IoTThingModelTypeEnum.SERVICE && selectedProperty.callType
-            "
-            class="flex items-start gap-8px"
-          >
-            <span class="text-12px text-[var(--el-text-color-secondary)] min-w-60px flex-shrink-0">
-              调用类型：
-            </span>
-            <span class="text-12px text-[var(--el-text-color-primary)] flex-1">
-              {{ getThingModelServiceCallTypeLabel(selectedProperty.callType) }}
-            </span>
-          </div>
-        </div>
-      </div>
-    </el-popover>
-  </div>
-</template>
+import { useVModel } from '@vueuse/core';
+import { Button, Popover, Select, Tag } from 'ant-design-vue';
 
-<script setup lang="ts">
-import { useVModel } from '@vueuse/core'
-import { InfoFilled } from '@element-plus/icons-vue'
+import { getThingModelListByProductId } from '#/api/iot/thingmodel';
 import {
-  IotRuleSceneTriggerTypeEnum,
-  IoTThingModelTypeEnum,
   getAccessModeLabel,
-  getEventTypeLabel,
-  getThingModelServiceCallTypeLabel,
   getDataTypeName,
   getDataTypeTagType,
-  THING_MODEL_GROUP_LABELS
-} from '#/views/iot/utils/constants'
-import type {
-  IotThingModelTSLResp,
-  ThingModelEvent,
-  ThingModelParam,
-  ThingModelProperty,
-  ThingModelService
-} from '#/api/iot/thingmodel'
-import { ThingModelApi } from '#/api/iot/thingmodel'
+  getEventTypeLabel,
+  getThingModelServiceCallTypeLabel,
+  IotRuleSceneTriggerTypeEnum,
+  IoTThingModelTypeEnum,
+  THING_MODEL_GROUP_LABELS,
+} from '#/views/iot/utils/constants';
 
 /** 属性选择器组件 */
-defineOptions({ name: 'PropertySelector' })
-
-/** 属性选择器内部使用的统一数据结构 */
-interface PropertySelectorItem {
-  identifier: string
-  name: string
-  description?: string
-  dataType: string
-  type: number // IoTThingModelTypeEnum
-  accessMode?: string
-  required?: boolean
-  unit?: string
-  range?: string
-  eventType?: string
-  callType?: string
-  inputParams?: ThingModelParam[]
-  outputParams?: ThingModelParam[]
-  property?: ThingModelProperty
-  event?: ThingModelEvent
-  service?: ThingModelService
-}
+defineOptions({ name: 'PropertySelector' });
 
 const props = defineProps<{
-  modelValue?: string
-  triggerType: number
-  productId?: number
-  deviceId?: number
-}>()
+  deviceId?: number;
+  modelValue?: string;
+  productId?: number;
+  triggerType: number;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:modelValue', value: string): void
-  (e: 'change', value: { type: string; config: any }): void
-}>()
+  (e: 'update:modelValue', value: string): void;
+  (e: 'change', value: { config: any; type: string }): void;
+}>();
+
+/** 属性选择器内部使用的统一数据结构 */
+interface PropertySelectorItem {
+  identifier: string;
+  name: string;
+  description?: string;
+  dataType: string;
+  type: number; // IoTThingModelTypeEnum
+  accessMode?: string;
+  required?: boolean;
+  unit?: string;
+  range?: string;
+  eventType?: string;
+  callType?: string;
+  inputParams?: ThingModelParam[];
+  outputParams?: ThingModelParam[];
+  property?: ThingModelProperty;
+  event?: ThingModelEvent;
+  service?: ThingModelService;
+}
 
-const localValue = useVModel(props, 'modelValue', emit)
+const localValue = useVModel(props, 'modelValue', emit);
 
-const loading = ref(false) // 加载状态
-const propertyList = ref<PropertySelectorItem[]>([]) // 属性列表
-const thingModelTSL = ref<IotThingModelTSLResp | null>(null) // 物模型TSL数据
+const loading = ref(false); // 加载状态
+const propertyList = ref<ThingModelApi.Property[]>([]); // 属性列表
+const thingModelTSL = ref<null | ThingModelApi.ThingModel>(null); // 物模型TSL数据
 
 // 计算属性：属性分组
 const propertyGroups = computed(() => {
-  const groups: { label: string; options: any[] }[] = []
+  const groups: { label: string; options: any[] }[] = [];
 
   if (props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST) {
     groups.push({
       label: THING_MODEL_GROUP_LABELS.PROPERTY,
-      options: propertyList.value.filter((p) => p.type === IoTThingModelTypeEnum.PROPERTY)
-    })
+      options: propertyList.value.filter(
+        (p) => p.type === IoTThingModelTypeEnum.PROPERTY,
+      ),
+    });
   }
 
   if (props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST) {
     groups.push({
       label: THING_MODEL_GROUP_LABELS.EVENT,
-      options: propertyList.value.filter((p) => p.type === IoTThingModelTypeEnum.EVENT)
-    })
+      options: propertyList.value.filter(
+        (p) => p.type === IoTThingModelTypeEnum.EVENT,
+      ),
+    });
   }
 
   if (props.triggerType === IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE) {
     groups.push({
       label: THING_MODEL_GROUP_LABELS.SERVICE,
-      options: propertyList.value.filter((p) => p.type === IoTThingModelTypeEnum.SERVICE)
-    })
+      options: propertyList.value.filter(
+        (p) => p.type === IoTThingModelTypeEnum.SERVICE,
+      ),
+    });
   }
 
-  return groups.filter((group) => group.options.length > 0)
-})
+  return groups.filter((group) => group.options.length > 0);
+});
 
 // 计算属性：当前选中的属性
 const selectedProperty = computed(() => {
-  return propertyList.value.find((p) => p.identifier === localValue.value)
-})
+  return propertyList.value.find((p) => p.identifier === localValue.value);
+});
 
 /**
  * 处理选择变化事件
  * @param value 选中的属性标识符
  */
-const handleChange = (value: string) => {
-  const property = propertyList.value.find((p) => p.identifier === value)
+function handleChange(value: any) {
+  const property = propertyList.value.find((p) => p.identifier === value);
   if (property) {
     emit('change', {
       type: property.dataType,
-      config: property
-    })
+      config: property,
+    });
   }
 }
 
 /**
  * 获取物模型TSL数据
  */
-const getThingModelTSL = async () => {
+async function getThingModelTSL() {
   if (!props.productId) {
-    thingModelTSL.value = null
-    propertyList.value = []
-    return
+    thingModelTSL.value = null;
+    propertyList.value = [];
+    return;
   }
 
-  loading.value = true
+  loading.value = true;
   try {
-    const tslData = await ThingModelApi.getThingModelTSLByProductId(props.productId)
+    const tslData = await getThingModelListByProductId(props.productId);
 
     if (tslData) {
-      thingModelTSL.value = tslData
-      parseThingModelData()
+      thingModelTSL.value = tslData;
+      parseThingModelData();
     } else {
-      console.error('获取物模型TSL失败: 返回数据为空')
-      propertyList.value = []
+      console.error('获取物模型TSL失败: 返回数据为空');
+      propertyList.value = [];
     }
   } catch (error) {
-    console.error('获取物模型TSL失败:', error)
-    propertyList.value = []
+    console.error('获取物模型TSL失败:', error);
+    propertyList.value = [];
   } finally {
-    loading.value = false
+    loading.value = false;
   }
 }
 
 /** 解析物模型 TSL 数据 */
-const parseThingModelData = () => {
-  const tsl = thingModelTSL.value
-  const properties: PropertySelectorItem[] = []
+function parseThingModelData() {
+  const tsl = thingModelTSL.value;
+  const properties: PropertySelectorItem[] = [];
 
   if (!tsl) {
-    propertyList.value = properties
-    return
+    propertyList.value = properties;
+    return;
   }
   // 解析属性
   if (tsl.properties && Array.isArray(tsl.properties)) {
@@ -313,9 +171,9 @@ const parseThingModelData = () => {
         required: prop.required,
         unit: getPropertyUnit(prop),
         range: getPropertyRange(prop),
-        property: prop
-      })
-    })
+        property: prop,
+      });
+    });
   }
 
   // 解析事件
@@ -330,9 +188,9 @@ const parseThingModelData = () => {
         eventType: event.type,
         required: event.required,
         outputParams: event.outputParams,
-        event: event
-      })
-    })
+        event,
+      });
+    });
   }
 
   // 解析服务
@@ -348,11 +206,11 @@ const parseThingModelData = () => {
         required: service.required,
         inputParams: service.inputParams,
         outputParams: service.outputParams,
-        service: service
-      })
-    })
+        service,
+      });
+    });
   }
-  propertyList.value = properties
+  propertyList.value = properties;
 }
 
 /**
@@ -360,15 +218,15 @@ const parseThingModelData = () => {
  * @param property 属性对象
  * @returns 属性单位
  */
-const getPropertyUnit = (property: any) => {
-  if (!property) return undefined
+function getPropertyUnit(property: any) {
+  if (!property) return undefined;
 
   // 数值型数据的单位
   if (property.dataSpecs && property.dataSpecs.unit) {
-    return property.dataSpecs.unit
+    return property.dataSpecs.unit;
   }
 
-  return undefined
+  return undefined;
 }
 
 /**
@@ -376,43 +234,212 @@ const getPropertyUnit = (property: any) => {
  * @param property 属性对象
  * @returns 属性范围描述
  */
-const getPropertyRange = (property: any) => {
-  if (!property) return undefined
+function getPropertyRange(property: any) {
+  if (!property) return undefined;
 
   // 数值型数据的范围
   if (property.dataSpecs) {
-    const specs = property.dataSpecs
+    const specs = property.dataSpecs;
     if (specs.min !== undefined && specs.max !== undefined) {
-      return `${specs.min}~${specs.max}`
+      return `${specs.min}~${specs.max}`;
     }
   }
 
   // 枚举型和布尔型数据的选项
   if (property.dataSpecsList && Array.isArray(property.dataSpecsList)) {
-    return property.dataSpecsList.map((item: any) => `${item.name}(${item.value})`).join(', ')
+    return property.dataSpecsList
+      .map((item: any) => `${item.name}(${item.value})`)
+      .join(', ');
   }
 
-  return undefined
+  return undefined;
 }
 
 /** 监听产品变化 */
 watch(
   () => props.productId,
   () => {
-    getThingModelTSL()
+    getThingModelTSL();
   },
-  { immediate: true }
-)
+  { immediate: true },
+);
 
 /** 监听触发类型变化 */
 watch(
   () => props.triggerType,
   () => {
-    localValue.value = ''
-  }
-)
+    localValue.value = '';
+  },
+);
 </script>
 
+<template>
+  <div class="gap-8px flex items-center">
+    <Select
+      v-model="localValue"
+      placeholder="请选择监控项"
+      filterable
+      clearable
+      @change="handleChange"
+      class="!w-150px"
+      :loading="loading"
+    >
+      <Select.OptionGroup
+        v-for="group in propertyGroups"
+        :key="group.label"
+        :label="group.label"
+      >
+        <Select.Option
+          v-for="property in group.options"
+          :key="property.identifier"
+          :label="property.name"
+          :value="property.identifier"
+        >
+          <div class="py-2px flex w-full items-center justify-between">
+            <span class="text-14px font-500 text-primary flex-1 truncate">
+              {{ property.name }}
+            </span>
+            <Tag
+              :type="getDataTypeTagType(property.dataType)"
+              size="small"
+              class="ml-8px flex-shrink-0"
+            >
+              {{ property.identifier }}
+            </Tag>
+          </div>
+        </Select.Option>
+      </Select.OptionGroup>
+    </Select>
+
+    <!-- 属性详情弹出层 -->
+    <Popover
+      v-if="selectedProperty"
+      placement="rightTop"
+      :width="350"
+      trigger="click"
+      :show-arrow="true"
+      :offset="8"
+      popper-class="property-detail-popover"
+    >
+      <template #reference>
+        <Button
+          type="primary"
+          text
+          circle
+          size="small"
+          class="flex-shrink-0"
+          title="查看属性详情"
+        >
+          <IconifyIcon icon="ep:info-filled" />
+        </Button>
+      </template>
+
+      <!-- 弹出层内容 -->
+      <div class="property-detail-content">
+        <div class="gap-8px mb-12px flex items-center">
+          <IconifyIcon icon="ep:info-filled" class="text-16px text-info" />
+          <span class="text-14px font-500 text-primary">
+            {{ selectedProperty.name }}
+          </span>
+          <Tag
+            :type="getDataTypeTagType(selectedProperty.dataType)"
+            size="small"
+          >
+            {{ getDataTypeName(selectedProperty.dataType) }}
+          </Tag>
+        </div>
+
+        <div class="space-y-8px ml-24px">
+          <div class="gap-8px flex items-start">
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              标识符：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ selectedProperty.identifier }}
+            </span>
+          </div>
+
+          <div
+            v-if="selectedProperty.description"
+            class="gap-8px flex items-start"
+          >
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              描述：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ selectedProperty.description }}
+            </span>
+          </div>
+
+          <div v-if="selectedProperty.unit" class="gap-8px flex items-start">
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              单位：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ selectedProperty.unit }}
+            </span>
+          </div>
+
+          <div v-if="selectedProperty.range" class="gap-8px flex items-start">
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              取值范围：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ selectedProperty.range }}
+            </span>
+          </div>
+
+          <!-- 根据属性类型显示额外信息 -->
+          <div
+            v-if="
+              selectedProperty.type === IoTThingModelTypeEnum.PROPERTY &&
+              selectedProperty.accessMode
+            "
+            class="gap-8px flex items-start"
+          >
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              访问模式：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ getAccessModeLabel(selectedProperty.accessMode) }}
+            </span>
+          </div>
+
+          <div
+            v-if="
+              selectedProperty.type === IoTThingModelTypeEnum.EVENT &&
+              selectedProperty.eventType
+            "
+            class="gap-8px flex items-start"
+          >
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              事件类型：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ getEventTypeLabel(selectedProperty.eventType) }}
+            </span>
+          </div>
+
+          <div
+            v-if="
+              selectedProperty.type === IoTThingModelTypeEnum.SERVICE &&
+              selectedProperty.callType
+            "
+            class="gap-8px flex items-start"
+          >
+            <span class="text-12px min-w-60px text-secondary flex-shrink-0">
+              调用类型：
+            </span>
+            <span class="text-12px text-primary flex-1">
+              {{ getThingModelServiceCallTypeLabel(selectedProperty.callType) }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </Popover>
+  </div>
+</template>
+
 <style scoped>
 /* 下拉选项样式 */
 :deep(.el-select-dropdown__item) {
diff --git a/apps/web-antd/src/views/iot/rule/scene/index.vue b/apps/web-antd/src/views/iot/rule/scene/index.vue
index 6e424e38926abdec83c72fabc87ccab14e570b92..752784b2df54d3e8dba07352f7b5e2003d525a31 100644
--- a/apps/web-antd/src/views/iot/rule/scene/index.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/index.vue
@@ -9,7 +9,7 @@ import { message } from 'ant-design-vue';
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
   deleteSceneRule,
-  getRuleScenePage,
+  getSceneRulePage,
   updateSceneRuleStatus,
 } from '#/api/iot/rule/scene';
 import { $t } from '#/locales';
@@ -85,7 +85,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          return await getRuleScenePage({
+          return await getSceneRulePage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
             ...formValues,
@@ -129,7 +129,10 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: row.status === 0 ? '停用' : '启用',
               type: 'link',
-              icon: row.status === 0 ? 'ant-design:stop-outlined' : 'ant-design:check-circle-outlined',
+              icon:
+                row.status === 0
+                  ? 'ant-design:stop-outlined'
+                  : 'ant-design:check-circle-outlined',
               onClick: handleToggleStatus.bind(null, row),
             },
             {
diff --git a/apps/web-antd/src/views/iot/rule/scene/modules/form.vue b/apps/web-antd/src/views/iot/rule/scene/modules/form.vue
index a40cfcf8d53e65dd3b9acde015c5253982f22bd7..7a2de11bf6c660f33ad9268e65208ccf08a14557 100644
--- a/apps/web-antd/src/views/iot/rule/scene/modules/form.vue
+++ b/apps/web-antd/src/views/iot/rule/scene/modules/form.vue
@@ -47,7 +47,9 @@ const [Modal, modalApi] = useVbenModal({
     // 提交表单
     const data = (await formApi.getValues()) as RuleSceneApi.SceneRule;
     try {
-      await (formData.value?.id ? updateSceneRule(data) : createSceneRule(data));
+      await (formData.value?.id
+        ? updateSceneRule(data)
+        : createSceneRule(data));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -83,4 +85,3 @@ const [Modal, modalApi] = useVbenModal({
     <Form class="mx-4" />
   </Modal>
 </template>
-
diff --git a/apps/web-antd/src/views/iot/thingmodel/index.vue b/apps/web-antd/src/views/iot/thingmodel/index.vue
index b941996d0e540d96812bba3e6bc54fe84aa4a053..facdafe66092bb63b37a14dd658906b89f639341 100644
--- a/apps/web-antd/src/views/iot/thingmodel/index.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/index.vue
@@ -1,14 +1,17 @@
 <script setup lang="ts">
-import type { VxeGridInstance } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { ThingModelApi } from '#/api/iot/thingmodel';
 
-import { message } from 'ant-design-vue';
 import { Page } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
+
+import { Button, message } from 'ant-design-vue';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteThingModel, getThingModelPage } from '#/api/iot/thingmodel';
 
-import { useGridColumns, useGridFormSchema } from './data';
 import { getDataTypeOptionsLabel } from '../utils/constants';
+import { useGridColumns, useGridFormSchema } from './data';
 
 defineOptions({ name: 'IoTThingModel' });
 
@@ -19,6 +22,8 @@ const props = defineProps<{
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     columns: useGridColumns(),
+    height: 'auto',
+    keepSource: true,
     proxyConfig: {
       ajax: {
         query: async ({ page, form }) => {
@@ -31,26 +36,30 @@ const [Grid, gridApi] = useVbenVxeGrid({
         },
       },
     },
-  },
+    rowConfig: {
+      keyField: 'id',
+      isHover: true,
+    },
+    toolbarConfig: {
+      refresh: true,
+      search: true,
+    },
+  } as VxeTableGridOptions<ThingModelApi.ThingModel>,
   formOptions: {
     schema: useGridFormSchema(),
   },
 });
 
-const xGrid = shallowRef<VxeGridInstance>();
-const formRef = ref();
-const tslRef = ref();
-
 // 新增功能
 const handleCreate = () => {
   // TODO: 打开物模型表单
-  console.log('新增功能');
+  console.error('新增功能');
 };
 
 // 编辑功能
 const handleEdit = (row: any) => {
   // TODO: 打开物模型表单
-  console.log('编辑功能:', row);
+  console.error('编辑功能:', row);
 };
 
 // 删除功能
@@ -67,7 +76,7 @@ const handleDelete = async (row: any) => {
 // 打开 TSL
 const handleOpenTSL = () => {
   // TODO: 打开 TSL 弹窗
-  console.log('打开 TSL');
+  console.error('打开 TSL');
 };
 
 // 获取数据类型标签
@@ -81,15 +90,13 @@ const getDataTypeLabel = (row: any) => {
     description="管理产品的物模型定义，包括属性、服务和事件"
     title="物模型管理"
   >
-    <Grid ref="xGrid">
+    <Grid>
       <template #toolbar-tools>
-        <VbenButton @click="handleCreate">
-          <Icon icon="ant-design:plus-outlined" class="mr-1" />
+        <Button @click="handleCreate">
+          <IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
           添加功能
-        </VbenButton>
-        <VbenButton type="success" @click="handleOpenTSL">
-          TSL
-        </VbenButton>
+        </Button>
+        <Button type="primary" @click="handleOpenTSL"> TSL </Button>
       </template>
 
       <!-- 数据类型列 -->
@@ -100,17 +107,15 @@ const getDataTypeLabel = (row: any) => {
       <!-- 数据定义列 -->
       <template #dataDefinition="{ row }">
         <!-- TODO: 实现数据定义组件 -->
-        <span class="text-gray-400">-</span>
+        <span class="text-gray-400">{{ row }}</span>
       </template>
 
       <!-- 操作列 -->
       <template #actions="{ row }">
-        <VbenButton size="small" type="primary" @click="handleEdit(row)">
+        <Button size="small" type="primary" @click="handleEdit(row)">
           编辑
-        </VbenButton>
-        <VbenButton size="small" type="danger" @click="handleDelete(row)">
-          删除
-        </VbenButton>
+        </Button>
+        <Button size="small" danger @click="handleDelete(row)"> 删除 </Button>
       </template>
     </Grid>
   </Page>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelEvent.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelEvent.vue
index d7ed21543d22ba3e8b7b08a3b252aa2339709f61..75ac3e5714d4641e604b21887c1e0d57e1fb9f65 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelEvent.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelEvent.vue
@@ -1,57 +1,71 @@
 <!-- 产品的物模型表单（event 项） -->
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import type { ThingModelEvent } from '#/api/iot/thingmodel';
+
+import { watch } from 'vue';
+
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Form, Radio } from 'ant-design-vue';
+
+import {
+  IoTThingModelEventTypeEnum,
+  IoTThingModelParamDirectionEnum,
+} from '#/views/iot/utils/constants';
+
+import ThingModelInputOutputParam from './ThingModelInputOutputParam.vue';
+
+/** IoT 物模型事件 */
+defineOptions({ name: 'ThingModelEvent' });
+
+const props = defineProps<{ isStructDataSpecs?: boolean; modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const thingModelEvent = useVModel(
+  props,
+  'modelValue',
+  emits,
+) as Ref<ThingModelEvent>;
+
+// 默认选中，INFO 信息
+watch(
+  () => thingModelEvent.value.type,
+  (val: string | undefined) =>
+    isEmpty(val) &&
+    (thingModelEvent.value.type = IoTThingModelEventTypeEnum.INFO.value),
+  { immediate: true },
+);
+</script>
+
 <template>
-  <el-form-item
+  <Form.Item
     :rules="[{ required: true, message: '请选择事件类型', trigger: 'change' }]"
     label="事件类型"
     prop="event.type"
   >
-    <el-radio-group v-model="thingModelEvent.type">
-      <el-radio
+    <Radio.Group v-model="thingModelEvent.type">
+      <Radio
         v-for="eventType in Object.values(IoTThingModelEventTypeEnum)"
         :key="eventType.value"
         :value="eventType.value"
       >
         {{ eventType.label }}
-      </el-radio>
-    </el-radio-group>
-  </el-form-item>
-  <el-form-item label="输出参数">
+      </Radio>
+    </Radio.Group>
+  </Form.Item>
+  <Form.Item label="输出参数">
     <ThingModelInputOutputParam
-      v-model="thingModelEvent.outputParams"
+      v-model="thingModelEvent.outputData"
       :direction="IoTThingModelParamDirectionEnum.OUTPUT"
     />
-  </el-form-item>
+  </Form.Item>
 </template>
 
-<script lang="ts" setup>
-import ThingModelInputOutputParam from './ThingModelInputOutputParam.vue'
-import { useVModel } from '@vueuse/core'
-import { ThingModelEvent } from '#/api/iot/thingmodel'
-import { isEmpty } from '@vben/utils'
-import {
-  IoTThingModelEventTypeEnum,
-  IoTThingModelParamDirectionEnum
-} from '#/views/iot/utils/constants'
-
-/** IoT 物模型事件 */
-defineOptions({ name: 'ThingModelEvent' })
-
-const props = defineProps<{ modelValue: any; isStructDataSpecs?: boolean }>()
-const emits = defineEmits(['update:modelValue'])
-const thingModelEvent = useVModel(props, 'modelValue', emits) as Ref<ThingModelEvent>
-
-// 默认选中，INFO 信息
-watch(
-  () => thingModelEvent.value.type,
-  (val: string) =>
-    isEmpty(val) && (thingModelEvent.value.type = IoTThingModelEventTypeEnum.INFO.value),
-  { immediate: true }
-)
-</script>
-
 <style lang="scss" scoped>
-:deep(.el-form-item) {
-  .el-form-item {
+:deep(.ant-form-item) {
+  .ant-form-item {
     margin-bottom: 0;
   }
 }
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelForm.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelForm.vue
index 28779025e8bf21cda9dadd6f5613f16c63c6e81b..4165813a107f007e6d3ebd02252ad267fe4a50d1 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelForm.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelForm.vue
@@ -1,223 +1,243 @@
 <!-- 产品的物模型表单 -->
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <a-form
-      ref="formRef"
-      :loading="formLoading"
-      :model="formData"
-      :rules="ThingModelFormRules"
-      :label-col="{ span: 6 }"
-      :wrapper-col="{ span: 18 }"
-    >
-      <a-form-item label="功能类型" name="type">
-        <a-radio-group v-model:value="formData.type">
-          <a-radio-button
-            v-for="dict in getIntDictOptions(DICT_TYPE.IOT_THING_MODEL_TYPE)"
-            :key="dict.value"
-            :value="dict.value"
-          >
-            {{ dict.label }}
-          </a-radio-button>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="功能名称" name="name">
-        <a-input v-model:value="formData.name" placeholder="请输入功能名称" />
-      </a-form-item>
-      <a-form-item label="标识符" name="identifier">
-        <a-input v-model:value="formData.identifier" placeholder="请输入标识符" />
-      </a-form-item>
-      <!-- 属性配置 -->
-      <ThingModelProperty
-        v-if="formData.type === IoTThingModelTypeEnum.PROPERTY"
-        v-model="formData.property"
-      />
-      <!-- 服务配置 -->
-      <ThingModelService
-        v-if="formData.type === IoTThingModelTypeEnum.SERVICE"
-        v-model="formData.service"
-      />
-      <!-- 事件配置 -->
-      <ThingModelEvent
-        v-if="formData.type === IoTThingModelTypeEnum.EVENT"
-        v-model="formData.event"
-      />
-      <a-form-item label="描述" name="description">
-        <a-textarea
-          v-model:value="formData.description"
-          :maxlength="200"
-          :rows="3"
-          placeholder="请输入属性描述"
-        />
-      </a-form-item>
-    </a-form>
+<script lang="ts" setup>
+import type { Ref } from 'vue';
 
-    <template #footer>
-      <a-button :disabled="formLoading" type="primary" @click="submitForm">确 定</a-button>
-      <a-button @click="dialogVisible = false">取 消</a-button>
-    </template>
-  </Dialog>
-</template>
+import type { IotProductApi } from '#/api/iot/product/product';
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import { inject, ref } from 'vue';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { $t } from '@vben/locales';
+import { cloneDeep } from '@vben/utils';
+
+import { Button, Form, Input, message, Radio } from 'ant-design-vue';
 
-<script lang="ts" setup>
-import { ref, inject, type Ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { message } from 'ant-design-vue'
-import type { ProductVO } from '#/api/iot/product/product'
-import ThingModelProperty from './ThingModelProperty.vue'
-import ThingModelService from './ThingModelService.vue'
-import ThingModelEvent from './ThingModelEvent.vue'
-import { ThingModelApi, ThingModelFormRules } from '#/api/iot/thingmodel'
-import type { ThingModelData } from '#/api/iot/thingmodel'
+import {
+  createThingModel,
+  getThingModel,
+  updateThingModel,
+} from '#/api/iot/thingmodel';
 import {
   IOT_PROVIDE_KEY,
   IoTDataSpecsDataTypeEnum,
-  IoTThingModelTypeEnum
-} from '#/views/iot/utils/constants'
-import { cloneDeep } from 'lodash-es'
-import { DICT_TYPE, getIntDictOptions } from '@vben/constants'
+  IoTThingModelTypeEnum,
+} from '#/views/iot/utils/constants';
 
-/** IoT 物模型数据表单 */
-defineOptions({ name: 'IoTThingModelForm' })
+import ThingModelEvent from './ThingModelEvent.vue';
+import ThingModelProperty from './ThingModelProperty.vue';
+import ThingModelService from './ThingModelService.vue';
 
-const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
+/** IoT 物模型数据表单 */
+defineOptions({ name: 'IoTThingModelForm' });
 
-const { t } = useI18n() // 国际化
+/** 提交表单 */
+const emit = defineEmits(['success']);
+const product = inject<Ref<IotProductApi.Product>>(IOT_PROVIDE_KEY.PRODUCT); // 注入产品信息
 
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const dialogVisible = ref(false); // 弹窗的是否展示
+const dialogTitle = ref(''); // 弹窗的标题
+const formLoading = ref(false); // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref(''); // 表单的类型：create - 新增；update - 修改
 const formData = ref<ThingModelData>({
-  type: IoTThingModelTypeEnum.PROPERTY,
+  type: IoTThingModelTypeEnum.PROPERTY.toString(),
   dataType: IoTDataSpecsDataTypeEnum.INT,
   property: {
     dataType: IoTDataSpecsDataTypeEnum.INT,
     dataSpecs: {
-      dataType: IoTDataSpecsDataTypeEnum.INT
-    }
+      dataType: IoTDataSpecsDataTypeEnum.INT,
+    },
   },
   service: {},
-  event: {}
-} as ThingModelData)
+  event: {},
+});
 
-const formRef = ref() // 表单 Ref
+const formRef = ref(); // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-  dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
+  dialogVisible.value = true;
+  dialogTitle.value = $t(`action.${type}`);
+  formType.value = type;
+  resetForm();
   if (id) {
-    formLoading.value = true
+    formLoading.value = true;
     try {
-      formData.value = await ThingModelApi.getThingModel(id)
+      formData.value = await getThingModel(id);
       // 情况一：属性初始化
-      if (!formData.value.property || Object.keys(formData.value.property).length === 0) {
-        formData.value.dataType = IoTDataSpecsDataTypeEnum.INT
+      if (
+        !formData.value.property ||
+        Object.keys(formData.value.property).length === 0
+      ) {
+        formData.value.dataType = IoTDataSpecsDataTypeEnum.INT;
         formData.value.property = {
           dataType: IoTDataSpecsDataTypeEnum.INT,
           dataSpecs: {
-            dataType: IoTDataSpecsDataTypeEnum.INT
-          }
-        }
+            dataType: IoTDataSpecsDataTypeEnum.INT,
+          },
+        };
       }
       // 情况二：服务初始化
-      if (!formData.value.service || Object.keys(formData.value.service).length === 0) {
-        formData.value.service = {}
+      if (
+        !formData.value.service ||
+        Object.keys(formData.value.service).length === 0
+      ) {
+        formData.value.service = {};
       }
       // 情况三：事件初始化
-      if (!formData.value.event || Object.keys(formData.value.event).length === 0) {
-        formData.value.event = {}
+      if (
+        !formData.value.event ||
+        Object.keys(formData.value.event).length === 0
+      ) {
+        formData.value.event = {};
       }
     } finally {
-      formLoading.value = false
+      formLoading.value = false;
     }
   }
-}
-defineExpose({ open, close: () => (dialogVisible.value = false) })
+};
+defineExpose({ open, close: () => (dialogVisible.value = false) });
 
-/** 提交表单 */
-const emit = defineEmits(['success'])
-const submitForm = async () => {
-  await formRef.value.validate()
-  formLoading.value = true
+async function submitForm() {
+  await formRef.value.validate();
+  formLoading.value = true;
   try {
-    const data = cloneDeep(formData.value) as ThingModelData
+    const data = cloneDeep(formData.value) as ThingModelData;
     // 信息补全
-    data.productId = product!.value.id
-    data.productKey = product!.value.productKey
-    fillExtraAttributes(data)
-    if (formType.value === 'create') {
-      await ThingModelApi.createThingModel(data)
-      message.success({ content: t('common.createSuccess') })
-    } else {
-      await ThingModelApi.updateThingModel(data)
-      message.success({ content: t('common.updateSuccess') })
-    }
+    data.productId = product!.value.id;
+    data.productKey = product!.value.productKey;
+    fillExtraAttributes(data);
+    await (formType.value === 'create'
+      ? createThingModel(data)
+      : updateThingModel(data));
+    message.success($t('ui.actionMessage.operationSuccess'));
     // 关闭弹窗
-    dialogVisible.value = false
-    emit('success')
+    dialogVisible.value = false;
+    emit('success');
   } finally {
-    formLoading.value = false
+    formLoading.value = false;
   }
 }
 
 /** 填写额外的属性（处理不同类型的情况） */
-const fillExtraAttributes = (data: any) => {
+function fillExtraAttributes(data: any) {
   // 属性
   if (data.type === IoTThingModelTypeEnum.PROPERTY) {
-    removeDataSpecs(data.property)
-    data.dataType = data.property.dataType
-    data.property.identifier = data.identifier
-    data.property.name = data.name
-    delete data.service
-    delete data.event
+    removeDataSpecs(data.property);
+    data.dataType = data.property.dataType;
+    data.property.identifier = data.identifier;
+    data.property.name = data.name;
+    delete data.service;
+    delete data.event;
   }
   // 服务
   if (data.type === IoTThingModelTypeEnum.SERVICE) {
-    removeDataSpecs(data.service)
-    data.dataType = data.service.dataType
-    data.service.identifier = data.identifier
-    data.service.name = data.name
-    delete data.property
-    delete data.event
+    removeDataSpecs(data.service);
+    data.dataType = data.service.dataType;
+    data.service.identifier = data.identifier;
+    data.service.name = data.name;
+    delete data.property;
+    delete data.event;
   }
   // 事件
   if (data.type === IoTThingModelTypeEnum.EVENT) {
-    removeDataSpecs(data.event)
-    data.dataType = data.event.dataType
-    data.event.identifier = data.identifier
-    data.event.name = data.name
-    delete data.property
-    delete data.service
+    removeDataSpecs(data.event);
+    data.dataType = data.event.dataType;
+    data.event.identifier = data.identifier;
+    data.event.name = data.name;
+    delete data.property;
+    delete data.service;
   }
 }
 
 /** 处理 dataSpecs 为空的情况 */
-const removeDataSpecs = (val: any) => {
+function removeDataSpecs(val: any) {
   if (!val.dataSpecs || Object.keys(val.dataSpecs).length === 0) {
-    delete val.dataSpecs
+    delete val.dataSpecs;
   }
   if (!val.dataSpecsList || val.dataSpecsList.length === 0) {
-    delete val.dataSpecsList
+    delete val.dataSpecsList;
   }
 }
 
 /** 重置表单 */
-const resetForm = () => {
+function resetForm() {
   formData.value = {
-    type: IoTThingModelTypeEnum.PROPERTY,
+    type: IoTThingModelTypeEnum.PROPERTY.toString(),
     dataType: IoTDataSpecsDataTypeEnum.INT,
     property: {
       dataType: IoTDataSpecsDataTypeEnum.INT,
       dataSpecs: {
-        dataType: IoTDataSpecsDataTypeEnum.INT
-      }
+        dataType: IoTDataSpecsDataTypeEnum.INT,
+      },
     },
     service: {},
-    event: {}
-  } as ThingModelData
-  formRef.value?.resetFields()
+    event: {},
+  };
+  formRef.value?.resetFields();
 }
 </script>
+
+<template>
+  <Modal v-model="dialogVisible" :title="dialogTitle">
+    <Form
+      ref="formRef"
+      :loading="formLoading"
+      :model="formData"
+      :label-col="{ span: 6 }"
+      :wrapper-col="{ span: 18 }"
+    >
+      <Form.Item label="功能类型" name="type">
+        <Radio.Group v-model:value="formData.type">
+          <Radio.Button
+            v-for="(dict, index) in getDictOptions(
+              DICT_TYPE.IOT_THING_MODEL_TYPE,
+              'number',
+            )"
+            :key="index"
+            :value="dict.value"
+          >
+            {{ dict.label }}
+          </Radio.Button>
+        </Radio.Group>
+      </Form.Item>
+      <Form.Item label="功能名称" name="name">
+        <Input v-model:value="formData.name" placeholder="请输入功能名称" />
+      </Form.Item>
+      <Form.Item label="标识符" name="identifier">
+        <Input v-model:value="formData.identifier" placeholder="请输入标识符" />
+      </Form.Item>
+      <!-- 属性配置 -->
+      <ThingModelProperty
+        v-if="formData.type === IoTThingModelTypeEnum.PROPERTY.toString()"
+        v-model="formData.property"
+      />
+      <!-- 服务配置 -->
+      <ThingModelService
+        v-if="formData.type === IoTThingModelTypeEnum.SERVICE.toString()"
+        v-model="formData.service"
+      />
+      <!-- 事件配置 -->
+      <ThingModelEvent
+        v-if="formData.type === IoTThingModelTypeEnum.EVENT.toString()"
+        v-model="formData.event"
+      />
+      <Form.Item label="描述" name="desc">
+        <Input.TextArea
+          v-model:value="formData.desc"
+          :maxlength="200"
+          :rows="3"
+          placeholder="请输入属性描述"
+        />
+      </Form.Item>
+    </Form>
+
+    <template #footer>
+      <Button :disabled="formLoading" type="primary" @click="submitForm">
+        确 定
+      </Button>
+      <Button @click="dialogVisible = false">取 消</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelInputOutputParam.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelInputOutputParam.vue
index 922625f598d1898330d62876e12562e065c6e9f3..4c10b0d9bee35116a8f7cc7d56d21ecb2e5233cb 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelInputOutputParam.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelInputOutputParam.vue
@@ -1,76 +1,43 @@
 <!-- 产品的物模型表单（event、service 项里的参数） -->
-<template>
-  <div
-    v-for="(item, index) in thingModelParams"
-    :key="index"
-    class="w-1/1 param-item flex justify-between px-10px mb-10px"
-  >
-    <span>参数名称：{{ item.name }}</span>
-    <div class="btn">
-      <el-button link type="primary" @click="openParamForm(item)">编辑</el-button>
-      <el-divider direction="vertical" />
-      <el-button link type="danger" @click="deleteParamItem(index)">删除</el-button>
-    </div>
-  </div>
-  <el-button link type="primary" @click="openParamForm(null)">+新增参数</el-button>
+<script lang="ts" setup>
+import type { Ref } from 'vue';
 
-  <!-- param 表单 -->
-  <Dialog v-model="dialogVisible" title="新增参数" append-to-body>
-    <el-form
-      ref="paramFormRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="ThingModelFormRules"
-      label-width="100px"
-    >
-      <el-form-item label="参数名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入功能名称" />
-      </el-form-item>
-      <el-form-item label="标识符" prop="identifier">
-        <el-input v-model="formData.identifier" placeholder="请输入标识符" />
-      </el-form-item>
-      <!-- 属性配置 -->
-      <ThingModelProperty v-model="formData.property" is-params />
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
+import { ref, unref } from 'vue';
 
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import ThingModelProperty from './ThingModelProperty.vue'
-import { isEmpty } from '@vben/utils'
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants'
-import { ThingModelFormRules } from '#/api/iot/thingmodel'
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Divider, Form, Input, Modal } from 'ant-design-vue';
+
+import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
+
+import ThingModelProperty from './ThingModelProperty.vue';
 
 /** 输入输出参数配置组件 */
-defineOptions({ name: 'ThingModelInputOutputParam' })
+defineOptions({ name: 'ThingModelInputOutputParam' });
 
-const props = defineProps<{ modelValue: any; direction: string }>()
-const emits = defineEmits(['update:modelValue'])
-const thingModelParams = useVModel(props, 'modelValue', emits) as Ref<any[]>
-const dialogVisible = ref(false) // 弹窗的是否展示
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const paramFormRef = ref() // 表单 ref
+const props = defineProps<{ direction: string; modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const thingModelParams = useVModel(props, 'modelValue', emits) as Ref<any[]>;
+const dialogVisible = ref(false); // 弹窗的是否展示
+const formLoading = ref(false); // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const paramFormRef = ref(); // 表单 ref
 const formData = ref<any>({
   dataType: IoTDataSpecsDataTypeEnum.INT,
   property: {
     dataType: IoTDataSpecsDataTypeEnum.INT,
     dataSpecs: {
-      dataType: IoTDataSpecsDataTypeEnum.INT
-    }
-  }
-})
+      dataType: IoTDataSpecsDataTypeEnum.INT,
+    },
+  },
+});
 
 /** 打开 param 表单 */
-const openParamForm = (val: any) => {
-  dialogVisible.value = true
-  resetForm()
+function openParamForm(val: any) {
+  dialogVisible.value = true;
+  resetForm();
   if (isEmpty(val)) {
-    return
+    return;
   }
   // 编辑时回显数据
   formData.value = {
@@ -80,27 +47,27 @@ const openParamForm = (val: any) => {
     property: {
       dataType: val.dataType,
       dataSpecs: val.dataSpecs,
-      dataSpecsList: val.dataSpecsList
-    }
-  }
+      dataSpecsList: val.dataSpecsList,
+    },
+  };
 }
 
 /** 删除 param 项 */
-const deleteParamItem = (index: number) => {
-  thingModelParams.value.splice(index, 1)
+function deleteParamItem(index: number) {
+  thingModelParams.value.splice(index, 1);
 }
 
 /** 添加参数 */
-const submitForm = async () => {
+async function submitForm() {
   // 初始化参数列表
   if (isEmpty(thingModelParams.value)) {
-    thingModelParams.value = []
+    thingModelParams.value = [];
   }
   // 校验参数
-  await paramFormRef.value.validate()
+  await paramFormRef.value.validate();
   try {
     // 构建数据对象
-    const data = unref(formData)
+    const data = unref(formData);
     const item = {
       identifier: data.identifier,
       name: data.name,
@@ -109,43 +76,81 @@ const submitForm = async () => {
       paraOrder: 0, // TODO @puhui999: 先写死默认看看后续
       direction: props.direction,
       dataSpecs:
-        !!data.property.dataSpecs && Object.keys(data.property.dataSpecs).length > 1
+        !!data.property.dataSpecs &&
+        Object.keys(data.property.dataSpecs).length > 1
           ? data.property.dataSpecs
           : undefined,
-      dataSpecsList: isEmpty(data.property.dataSpecsList) ? undefined : data.property.dataSpecsList
-    }
+      dataSpecsList: isEmpty(data.property.dataSpecsList)
+        ? undefined
+        : data.property.dataSpecsList,
+    };
 
     // 新增或修改同 identifier 的参数
     const existingIndex = thingModelParams.value.findIndex(
-      (spec) => spec.identifier === data.identifier
-    )
-    if (existingIndex > -1) {
-      thingModelParams.value[existingIndex] = item
+      (spec) => spec.identifier === data.identifier,
+    );
+    if (existingIndex === -1) {
+      thingModelParams.value.push(item);
     } else {
-      thingModelParams.value.push(item)
+      thingModelParams.value[existingIndex] = item;
     }
   } finally {
-    dialogVisible.value = false
+    dialogVisible.value = false;
   }
 }
 
 /** 重置表单 */
-const resetForm = () => {
+function resetForm() {
   formData.value = {
     dataType: IoTDataSpecsDataTypeEnum.INT,
     property: {
       dataType: IoTDataSpecsDataTypeEnum.INT,
       dataSpecs: {
-        dataType: IoTDataSpecsDataTypeEnum.INT
-      }
-    }
-  }
-  paramFormRef.value?.resetFields()
+        dataType: IoTDataSpecsDataTypeEnum.INT,
+      },
+    },
+  };
+  paramFormRef.value?.resetFields();
 }
 </script>
 
-<style lang="scss" scoped>
-.param-item {
-  background-color: #e4f2fd;
-}
-</style>
+<template>
+  <div
+    v-for="(item, index) in thingModelParams"
+    :key="index"
+    class="w-1/1 px-10px mb-10px flex justify-between bg-gray-100"
+  >
+    <span>参数名称：{{ item.name }}</span>
+    <div class="btn">
+      <Button link type="primary" @click="openParamForm(item)"> 编辑 </Button>
+      <Divider direction="vertical" />
+      <Button link danger @click="deleteParamItem(index)"> 删除 </Button>
+    </div>
+  </div>
+  <Button link type="primary" @click="openParamForm(null)"> +新增参数 </Button>
+
+  <!-- param 表单 -->
+  <Modal v-model="dialogVisible" title="新增参数" append-to-body>
+    <Form
+      ref="paramFormRef"
+      v-loading="formLoading"
+      :model="formData"
+      label-width="100px"
+    >
+      <Form.Item label="参数名称" prop="name">
+        <Input v-model="formData.name" placeholder="请输入功能名称" />
+      </Form.Item>
+      <Form.Item label="标识符" prop="identifier">
+        <Input v-model="formData.identifier" placeholder="请输入标识符" />
+      </Form.Item>
+      <!-- 属性配置 -->
+      <ThingModelProperty v-model="formData.property" is-params />
+    </Form>
+    <template #footer>
+      <Button :disabled="formLoading" type="primary" @click="submitForm">
+        确 定
+      </Button>
+      <Button @click="dialogVisible = false">取 消</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelProperty.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelProperty.vue
index 8c25f8425c8626b8b635f00843fb84f9f2e3b802..6f9f869e0c60499b3644911ffbce5db3e1c513ee 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelProperty.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelProperty.vue
@@ -1,27 +1,131 @@
 <!-- 产品的物模型表单（property 项） -->
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import type { ThingModelProperty } from '#/api/iot/thingmodel';
+
+import { computed, watch } from 'vue';
+
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Form, Input, Radio, Select } from 'ant-design-vue';
+
+import { validateBoolName } from '#/api/iot/thingmodel';
+import {
+  getDataTypeOptions,
+  IoTDataSpecsDataTypeEnum,
+  IoTThingModelAccessModeEnum,
+} from '#/views/iot/utils/constants';
+
+import {
+  ThingModelArrayDataSpecs,
+  ThingModelEnumDataSpecs,
+  ThingModelNumberDataSpecs,
+  ThingModelStructDataSpecs,
+} from './dataSpecs';
+
+/** IoT 物模型属性 */
+defineOptions({ name: 'ThingModelProperty' });
+
+const props = defineProps<{
+  isParams?: boolean;
+  isStructDataSpecs?: boolean;
+  modelValue: any;
+}>();
+const emits = defineEmits(['update:modelValue']);
+const property = useVModel(
+  props,
+  'modelValue',
+  emits,
+) as Ref<ThingModelProperty>;
+const getDataTypeOptions2 = computed(() => {
+  if (!props.isStructDataSpecs) {
+    return getDataTypeOptions();
+  }
+  const excludedTypes = new Set([
+    IoTDataSpecsDataTypeEnum.ARRAY,
+    IoTDataSpecsDataTypeEnum.STRUCT,
+  ]);
+  return getDataTypeOptions().filter(
+    (item: any) => !excludedTypes.has(item.value),
+  );
+}); // 获得数据类型列表
+
+/** 属性值的数据类型切换时初始化相关数据 */
+function handleChange(dataType: any) {
+  property.value.dataSpecs = {};
+  property.value.dataSpecsList = [];
+  // 不是列表型数据才设置 dataSpecs.dataType
+  ![
+    IoTDataSpecsDataTypeEnum.BOOL,
+    IoTDataSpecsDataTypeEnum.ENUM,
+    IoTDataSpecsDataTypeEnum.STRUCT,
+  ].includes(dataType) && (property.value.dataSpecs.dataType = dataType);
+  switch (dataType) {
+    case IoTDataSpecsDataTypeEnum.BOOL: {
+      for (let i = 0; i < 2; i++) {
+        property.value.dataSpecsList.push({
+          dataType: IoTDataSpecsDataTypeEnum.BOOL,
+          name: '', // 布尔值的名称
+          value: i, // 布尔值
+        });
+      }
+      break;
+    }
+    case IoTDataSpecsDataTypeEnum.ENUM: {
+      property.value.dataSpecsList.push({
+        dataType: IoTDataSpecsDataTypeEnum.ENUM,
+        name: '', // 枚举项的名称
+        value: undefined, // 枚举值
+      });
+      break;
+    }
+  }
+}
+
+/** 默认选中读写 */
+watch(
+  () => property.value.accessMode,
+  (val: string | undefined) => {
+    if (props.isStructDataSpecs || props.isParams) {
+      return;
+    }
+    isEmpty(val) &&
+      (property.value.accessMode =
+        IoTThingModelAccessModeEnum.READ_WRITE.value);
+  },
+  { immediate: true },
+);
+</script>
+
 <template>
-  <el-form-item
+  <Form.Item
     :rules="[{ required: true, message: '请选择数据类型', trigger: 'change' }]"
     label="数据类型"
     prop="property.dataType"
   >
-    <el-select v-model="property.dataType" placeholder="请选择数据类型" @change="handleChange">
+    <Select
+      v-model="property.dataType"
+      placeholder="请选择数据类型"
+      @change="handleChange"
+    >
       <!-- ARRAY 和 STRUCT 类型数据相互嵌套时，最多支持递归嵌套 2 层（父和子） -->
-      <el-option
+      <Select.Option
         v-for="option in getDataTypeOptions2"
         :key="option.value"
         :label="`${option.value}(${option.label})`"
         :value="option.value"
       />
-    </el-select>
-  </el-form-item>
+    </Select>
+  </Form.Item>
   <!-- 数值型配置 -->
   <ThingModelNumberDataSpecs
     v-if="
       [
         IoTDataSpecsDataTypeEnum.INT,
         IoTDataSpecsDataTypeEnum.DOUBLE,
-        IoTDataSpecsDataTypeEnum.FLOAT
+        IoTDataSpecsDataTypeEnum.FLOAT,
       ].includes(property.dataType || '')
     "
     v-model="property.dataSpecs"
@@ -32,46 +136,57 @@
     v-model="property.dataSpecsList"
   />
   <!-- 布尔型配置 -->
-  <el-form-item v-if="property.dataType === IoTDataSpecsDataTypeEnum.BOOL" label="布尔值">
+  <Form.Item
+    v-if="property.dataType === IoTDataSpecsDataTypeEnum.BOOL"
+    label="布尔值"
+  >
     <template v-for="(item, index) in property.dataSpecsList" :key="item.value">
-      <div class="flex items-center justify-start w-1/1 mb-5px">
+      <div class="w-1/1 mb-5px flex items-center justify-start">
         <span>{{ item.value }}</span>
         <span class="mx-2">-</span>
-        <el-form-item
+        <Form.Item
           :prop="`property.dataSpecsList[${index}].name`"
           :rules="[
             { required: true, message: '枚举描述不能为空' },
-            { validator: validateBoolName, trigger: 'blur' }
+            { validator: validateBoolName, trigger: 'blur' },
           ]"
-          class="flex-1 mb-0"
+          class="mb-0 flex-1"
         >
-          <el-input
+          <Input
             v-model="item.name"
             :placeholder="`如：${item.value === 0 ? '关' : '开'}`"
             class="w-255px!"
           />
-        </el-form-item>
+        </Form.Item>
       </div>
     </template>
-  </el-form-item>
+  </Form.Item>
   <!-- 文本型配置 -->
-  <el-form-item
+  <Form.Item
     v-if="property.dataType === IoTDataSpecsDataTypeEnum.TEXT"
     label="数据长度"
     prop="property.dataSpecs.length"
   >
-    <el-input v-model="property.dataSpecs.length" class="w-255px!" placeholder="请输入文本字节长度">
+    <Input
+      v-model="property.dataSpecs.length"
+      class="w-255px!"
+      placeholder="请输入文本字节长度"
+    >
       <template #append>字节</template>
-    </el-input>
-  </el-form-item>
+    </Input>
+  </Form.Item>
   <!-- 时间型配置 -->
-  <el-form-item
+  <Form.Item
     v-if="property.dataType === IoTDataSpecsDataTypeEnum.DATE"
     label="时间格式"
     prop="date"
   >
-    <el-input class="w-255px!" disabled placeholder="String 类型的 UTC 时间戳（毫秒）" />
-  </el-form-item>
+    <Input
+      class="w-255px!"
+      disabled
+      placeholder="String 类型的 UTC 时间戳（毫秒）"
+    />
+  </Form.Item>
   <!-- 数组型配置-->
   <ThingModelArrayDataSpecs
     v-if="property.dataType === IoTDataSpecsDataTypeEnum.ARRAY"
@@ -82,95 +197,26 @@
     v-if="property.dataType === IoTDataSpecsDataTypeEnum.STRUCT"
     v-model="property.dataSpecsList"
   />
-  <el-form-item v-if="!isStructDataSpecs && !isParams" label="读写类型" prop="property.accessMode">
-    <el-radio-group v-model="property.accessMode">
-      <el-radio
+  <Form.Item
+    v-if="!isStructDataSpecs && !isParams"
+    label="读写类型"
+    prop="property.accessMode"
+  >
+    <Radio.Group v-model="property.accessMode">
+      <Radio
         v-for="accessMode in Object.values(IoTThingModelAccessModeEnum)"
         :key="accessMode.value"
         :label="accessMode.value"
       >
         {{ accessMode.label }}
-      </el-radio>
-    </el-radio-group>
-  </el-form-item>
+      </Radio>
+    </Radio.Group>
+  </Form.Item>
 </template>
 
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import {
-  ThingModelArrayDataSpecs,
-  ThingModelEnumDataSpecs,
-  ThingModelNumberDataSpecs,
-  ThingModelStructDataSpecs
-} from './dataSpecs'
-import { ThingModelProperty, validateBoolName } from '#/api/iot/thingmodel'
-import { isEmpty } from '@vben/utils'
-import {
-  getDataTypeOptions,
-  IoTDataSpecsDataTypeEnum,
-  IoTThingModelAccessModeEnum
-} from '#/views/iot/utils/constants'
-
-/** IoT 物模型属性 */
-defineOptions({ name: 'ThingModelProperty' })
-
-const props = defineProps<{ modelValue: any; isStructDataSpecs?: boolean; isParams?: boolean }>()
-const emits = defineEmits(['update:modelValue'])
-const property = useVModel(props, 'modelValue', emits) as Ref<ThingModelProperty>
-const getDataTypeOptions2 = computed(() => {
-  if (!props.isStructDataSpecs) {
-    return getDataTypeOptions()
-  }
-  const excludedTypes = [IoTDataSpecsDataTypeEnum.STRUCT, IoTDataSpecsDataTypeEnum.ARRAY]
-  return getDataTypeOptions().filter((item: any) => !excludedTypes.includes(item.value))
-}) // 获得数据类型列表
-
-/** 属性值的数据类型切换时初始化相关数据 */
-const handleChange = (dataType: any) => {
-  property.value.dataSpecs = {}
-  property.value.dataSpecsList = []
-  // 不是列表型数据才设置 dataSpecs.dataType
-  ![
-    IoTDataSpecsDataTypeEnum.ENUM,
-    IoTDataSpecsDataTypeEnum.BOOL,
-    IoTDataSpecsDataTypeEnum.STRUCT
-  ].includes(dataType) && (property.value.dataSpecs.dataType = dataType)
-  switch (dataType) {
-    case IoTDataSpecsDataTypeEnum.ENUM:
-      property.value.dataSpecsList.push({
-        dataType: IoTDataSpecsDataTypeEnum.ENUM,
-        name: '', // 枚举项的名称
-        value: undefined // 枚举值
-      })
-      break
-    case IoTDataSpecsDataTypeEnum.BOOL:
-      for (let i = 0; i < 2; i++) {
-        property.value.dataSpecsList.push({
-          dataType: IoTDataSpecsDataTypeEnum.BOOL,
-          name: '', // 布尔值的名称
-          value: i // 布尔值
-        })
-      }
-      break
-  }
-}
-
-/** 默认选中读写 */
-watch(
-  () => property.value.accessMode,
-  (val: string) => {
-    if (props.isStructDataSpecs || props.isParams) {
-      return
-    }
-    isEmpty(val) && (property.value.accessMode = IoTThingModelAccessModeEnum.READ_WRITE.value)
-  },
-  { immediate: true }
-)
-</script>
-
 <style lang="scss" scoped>
-:deep(.el-form-item) {
-  .el-form-item {
+:deep(.ant-form-item) {
+  .ant-form-item {
     margin-bottom: 0;
   }
 }
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelService.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelService.vue
index 303e9e620a7acc4f672809398633eba75cd9ce4b..2b5611bc5d09ff80bbb702eb8bf2b3264bccf39d 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelService.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelService.vue
@@ -1,63 +1,73 @@
 <!-- 产品的物模型表单（service 项） -->
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import type { ThingModelService } from '#/api/iot/thingmodel';
+
+import { watch } from 'vue';
+
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Form, Radio } from 'ant-design-vue';
+
+import {
+  IoTThingModelParamDirectionEnum,
+  IoTThingModelServiceCallTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import ThingModelInputOutputParam from './ThingModelInputOutputParam.vue';
+
+/** IoT 物模型服务 */
+defineOptions({ name: 'ThingModelService' });
+
+const props = defineProps<{ isStructDataSpecs?: boolean; modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const service = useVModel(props, 'modelValue', emits) as Ref<ThingModelService>;
+
+/** 默认选中，ASYNC 异步 */
+watch(
+  () => service.value.callType,
+  (val: string | undefined) =>
+    isEmpty(val) &&
+    (service.value.callType = IoTThingModelServiceCallTypeEnum.ASYNC.value),
+  { immediate: true },
+);
+</script>
+
 <template>
-  <el-form-item
+  <Form.Item
     :rules="[{ required: true, message: '请选择调用方式', trigger: 'change' }]"
     label="调用方式"
     prop="service.callType"
   >
-    <el-radio-group v-model="service.callType">
-      <el-radio
+    <Radio.Group v-model="service.callType">
+      <Radio
         v-for="callType in Object.values(IoTThingModelServiceCallTypeEnum)"
         :key="callType.value"
         :value="callType.value"
       >
         {{ callType.label }}
-      </el-radio>
-    </el-radio-group>
-  </el-form-item>
-  <el-form-item label="输入参数">
+      </Radio>
+    </Radio.Group>
+  </Form.Item>
+  <Form.Item label="输入参数">
     <ThingModelInputOutputParam
-      v-model="service.inputParams"
+      v-model="service.inputData"
       :direction="IoTThingModelParamDirectionEnum.INPUT"
     />
-  </el-form-item>
-  <el-form-item label="输出参数">
+  </Form.Item>
+  <Form.Item label="输出参数">
     <ThingModelInputOutputParam
-      v-model="service.outputParams"
+      v-model="service.outputData"
       :direction="IoTThingModelParamDirectionEnum.OUTPUT"
     />
-  </el-form-item>
+  </Form.Item>
 </template>
 
-<script lang="ts" setup>
-import ThingModelInputOutputParam from './ThingModelInputOutputParam.vue'
-import { useVModel } from '@vueuse/core'
-import { ThingModelService } from '#/api/iot/thingmodel'
-import { isEmpty } from '@vben/utils'
-import {
-  IoTThingModelParamDirectionEnum,
-  IoTThingModelServiceCallTypeEnum
-} from '#/views/iot/utils/constants'
-
-/** IoT 物模型服务 */
-defineOptions({ name: 'ThingModelService' })
-
-const props = defineProps<{ modelValue: any; isStructDataSpecs?: boolean }>()
-const emits = defineEmits(['update:modelValue'])
-const service = useVModel(props, 'modelValue', emits) as Ref<ThingModelService>
-
-/** 默认选中，ASYNC 异步 */
-watch(
-  () => service.value.callType,
-  (val: string) =>
-    isEmpty(val) && (service.value.callType = IoTThingModelServiceCallTypeEnum.ASYNC.value),
-  { immediate: true }
-)
-</script>
-
 <style lang="scss" scoped>
-:deep(.el-form-item) {
-  .el-form-item {
+:deep(.ant-form-item) {
+  .ant-form-item {
     margin-bottom: 0;
   }
 }
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelTSL.vue b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelTSL.vue
index cba5c035ecd35f2bd6b29591a826adcbfcea7b91..8a3d4d69496f89d51509550fdbfd35bb6392937c 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelTSL.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/ThingModelTSL.vue
@@ -1,50 +1,60 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <JsonEditor
-      v-model="thingModelTSL"
-      :mode="viewMode === 'editor' ? 'code' : 'view'"
-      height="600px"
-    />
-    <template #footer>
-      <el-radio-group v-model="viewMode" size="small">
-        <el-radio-button label="code">代码视图</el-radio-button>
-        <el-radio-button label="editor">编辑器视图</el-radio-button>
-      </el-radio-group>
-    </template>
-  </Dialog>
-</template>
-
 <script setup lang="ts">
-import hljs from 'highlight.js' // 导入代码高亮文件
-import 'highlight.js/styles/github.css' // 导入代码高亮样式
-import json from 'highlight.js/lib/languages/json'
-import { ThingModelApi } from '#/api/iot/thingmodel'
-import { ProductVO } from '#/api/iot/product/product'
-import { IOT_PROVIDE_KEY } from '#/views/iot/utils/constants'
+import type { Ref } from 'vue';
+
+import type { IotProductApi } from '#/api/iot/product/product';
+
+import { inject, onMounted, ref } from 'vue';
+
+import { Modal, Radio } from 'ant-design-vue';
+import hljs from 'highlight.js'; // 导入代码高亮文件
+import json from 'highlight.js/lib/languages/json';
 
-defineOptions({ name: 'ThingModelTSL' })
+import { getThingModelListByProductId } from '#/api/iot/thingmodel';
+import { IOT_PROVIDE_KEY } from '#/views/iot/utils/constants';
 
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('物模型 TSL') // 弹窗的标题
-const product = inject<Ref<ProductVO>>(IOT_PROVIDE_KEY.PRODUCT) // 注入产品信息
-const viewMode = ref('code') // 查看模式：code-代码视图，editor-编辑器视图
+import 'highlight.js/styles/github.css'; // 导入代码高亮样式
+
+defineOptions({ name: 'ThingModelTSL' });
+
+const dialogVisible = ref(false); // 弹窗的是否展示
+const dialogTitle = ref('物模型 TSL'); // 弹窗的标题
+const product = inject<Ref<IotProductApi.Product>>(IOT_PROVIDE_KEY.PRODUCT); // 注入产品信息
+const viewMode = ref('code'); // 查看模式：code-代码视图，editor-编辑器视图
 
 /** 打开弹窗 */
-const open = () => {
-  dialogVisible.value = true
+function open() {
+  dialogVisible.value = true;
 }
-defineExpose({ open })
+defineExpose({ open });
 
 /** 获取 TSL */
-const thingModelTSL = ref({})
-const getTsl = async () => {
-  thingModelTSL.value = await ThingModelApi.getThingModelTSLByProductId(product?.value?.id || 0)
+const thingModelTSL = ref({});
+async function getTsl() {
+  thingModelTSL.value = await getThingModelListByProductId(
+    product?.value?.id || 0,
+  );
 }
 
-/** 初始化 **/
+/** 初始化 */
 onMounted(async () => {
   // 注册代码高亮的各种语言
-  hljs.registerLanguage('json', json)
-  await getTsl()
-})
+  hljs.registerLanguage('json', json);
+  await getTsl();
+});
 </script>
+
+<template>
+  <Modal v-model="dialogVisible" :title="dialogTitle">
+    <JsonEditor
+      v-model="thingModelTSL"
+      :mode="viewMode === 'editor' ? 'code' : 'view'"
+      height="600px"
+    />
+    <template #footer>
+      <Radio.Group v-model="viewMode" size="small">
+        <Radio.Button label="code">代码视图</Radio.Button>
+        <Radio.Button label="editor">编辑器视图</Radio.Button>
+      </Radio.Group>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/components/DataDefinition.vue b/apps/web-antd/src/views/iot/thingmodel/modules/components/DataDefinition.vue
index 516cdb9fbb99ea8eb78e2f148359393a115f46b6..d600daf4fe48657f49301e7abc808239831d10da 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/components/DataDefinition.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/components/DataDefinition.vue
@@ -1,21 +1,39 @@
+<script lang="ts" setup>
+import type { ThingModelData } from '#/api/iot/thingmodel';
+
+import {
+  getEventTypeLabel,
+  getThingModelServiceCallTypeLabel,
+  IoTDataSpecsDataTypeEnum,
+  IoTThingModelTypeEnum,
+} from '#/views/iot/utils/constants';
+
+/** 数据定义展示组件 */
+defineOptions({ name: 'DataDefinition' });
+
+defineProps<{ data: ThingModelData }>();
+</script>
+
 <template>
   <!-- 属性 -->
-  <template v-if="data.type === IoTThingModelTypeEnum.PROPERTY">
+  <template v-if="data.type === IoTThingModelTypeEnum.PROPERTY.toString()">
     <!-- 非列表型：数值 -->
     <div
       v-if="
         [
           IoTDataSpecsDataTypeEnum.INT,
           IoTDataSpecsDataTypeEnum.DOUBLE,
-          IoTDataSpecsDataTypeEnum.FLOAT
-        ].includes(data.property.dataType)
+          IoTDataSpecsDataTypeEnum.FLOAT,
+        ].includes(data.property?.dataType as any)
       "
     >
-      取值范围：{{ `${data.property.dataSpecs.min}~${data.property.dataSpecs.max}` }}
+      取值范围：{{
+        `${data.property?.dataSpecs.min}~${data.property?.dataSpecs.max}`
+      }}
     </div>
     <!-- 非列表型：文本 -->
-    <div v-if="IoTDataSpecsDataTypeEnum.TEXT === data.property.dataType">
-      数据长度：{{ data.property.dataSpecs.length }}
+    <div v-if="IoTDataSpecsDataTypeEnum.TEXT === data.property?.dataType">
+      数据长度：{{ data.property?.dataSpecs.length }}
     </div>
     <!-- 列表型: 数组、结构、时间（特殊） -->
     <div
@@ -23,8 +41,8 @@
         [
           IoTDataSpecsDataTypeEnum.ARRAY,
           IoTDataSpecsDataTypeEnum.STRUCT,
-          IoTDataSpecsDataTypeEnum.DATE
-        ].includes(data.property.dataType)
+          IoTDataSpecsDataTypeEnum.DATE,
+        ].includes(data.property?.dataType as any)
       "
     >
       -
@@ -33,41 +51,32 @@
     <div
       v-if="
         [IoTDataSpecsDataTypeEnum.BOOL, IoTDataSpecsDataTypeEnum.ENUM].includes(
-          data.property.dataType
+          data.property?.dataType as any,
         )
       "
     >
       <div>
-        {{ IoTDataSpecsDataTypeEnum.BOOL === data.property.dataType ? '布尔值' : '枚举值' }}：
+        {{
+          IoTDataSpecsDataTypeEnum.BOOL === data.property?.dataType
+            ? '布尔值'
+            : '枚举值'
+        }}：
       </div>
-      <div v-for="item in data.property.dataSpecsList" :key="item.value">
+      <div v-for="item in data.property?.dataSpecsList" :key="item.value">
         {{ `${item.name}-${item.value}` }}
       </div>
     </div>
   </template>
   <!-- 服务 -->
-  <div v-if="data.type === IoTThingModelTypeEnum.SERVICE">
-    调用方式：{{ getThingModelServiceCallTypeLabel(data.service!.callType) }}
+  <div v-if="data.type === IoTThingModelTypeEnum.SERVICE.toString()">
+    调用方式：{{
+      getThingModelServiceCallTypeLabel(data.service?.callType as any)
+    }}
   </div>
   <!-- 事件 -->
-  <div v-if="data.type === IoTThingModelTypeEnum.EVENT">
-    事件类型：{{ getEventTypeLabel(data.event!.type) }}
+  <div v-if="data.type === IoTThingModelTypeEnum.EVENT.toString()">
+    事件类型：{{ getEventTypeLabel(data.event?.type as any) }}
   </div>
 </template>
 
-<script lang="ts" setup>
-import { ThingModelData } from '#/api/iot/thingmodel'
-import {
-  getEventTypeLabel,
-  getThingModelServiceCallTypeLabel,
-  IoTDataSpecsDataTypeEnum,
-  IoTThingModelTypeEnum
-} from '#/views/iot/utils/constants'
-
-/** 数据定义展示组件 */
-defineOptions({ name: 'DataDefinition' })
-
-defineProps<{ data: ThingModelData }>()
-</script>
-
 <style lang="scss" scoped></style>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/components/index.ts b/apps/web-antd/src/views/iot/thingmodel/modules/components/index.ts
index 66c692bacdf09d1ae5f3bc203416c64ca5141851..9ff75ed1aeeb80780e82ed986baf31b0c5aef974 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/components/index.ts
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/components/index.ts
@@ -1,3 +1 @@
-import DataDefinition from './DataDefinition.vue'
-
-export { DataDefinition }
+export { default as DataDefinition } from './DataDefinition.vue';
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelArrayDataSpecs.vue b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelArrayDataSpecs.vue
index 76dfdd4e4d3bc764d55cef85c5532d678df458b0..29bbf29b3ad450eec7569662b8875d7ab9bf377b 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelArrayDataSpecs.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelArrayDataSpecs.vue
@@ -1,15 +1,44 @@
 <!-- dataType：array 数组类型 -->
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import { useVModel } from '@vueuse/core';
+import { Form, Input, Radio } from 'ant-design-vue';
+
+import {
+  getDataTypeOptions,
+  IoTDataSpecsDataTypeEnum,
+} from '#/views/iot/utils/constants';
+
+import ThingModelStructDataSpecs from './ThingModelStructDataSpecs.vue';
+
+/** 数组型的 dataSpecs 配置组件 */
+defineOptions({ name: 'ThingModelArrayDataSpecs' });
+
+const props = defineProps<{ modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<any>;
+
+/** 元素类型改变时间。当值为 struct 时，对 dataSpecs 中的 dataSpecsList 进行初始化 */
+function handleChange(val: any) {
+  if (val !== IoTDataSpecsDataTypeEnum.STRUCT) {
+    return;
+  }
+  dataSpecs.value.dataSpecsList = [];
+}
+</script>
+
 <template>
-  <el-form-item label="元素类型" prop="property.dataSpecs.childDataType">
-    <el-radio-group v-model="dataSpecs.childDataType" @change="handleChange">
+  <Form.Item label="元素类型" prop="property.dataSpecs.childDataType">
+    <Radio.Group v-model="dataSpecs.childDataType" @change="handleChange">
       <template v-for="item in getDataTypeOptions()" :key="item.value">
-        <el-radio
+        <Radio
           v-if="
             !(
               [
                 IoTDataSpecsDataTypeEnum.ENUM,
                 IoTDataSpecsDataTypeEnum.ARRAY,
-                IoTDataSpecsDataTypeEnum.DATE
+                IoTDataSpecsDataTypeEnum.DATE,
               ] as any[]
             ).includes(item.value)
           "
@@ -17,40 +46,16 @@
           class="w-1/3"
         >
           {{ `${item.value}(${item.label})` }}
-        </el-radio>
+        </Radio>
       </template>
-    </el-radio-group>
-  </el-form-item>
-  <el-form-item label="元素个数" prop="property.dataSpecs.size">
-    <el-input v-model="dataSpecs.size" placeholder="请输入数组中的元素个数" />
-  </el-form-item>
+    </Radio.Group>
+  </Form.Item>
+  <Form.Item label="元素个数" prop="property.dataSpecs.size">
+    <Input v-model="dataSpecs.size" placeholder="请输入数组中的元素个数" />
+  </Form.Item>
   <!-- Struct 型配置-->
   <ThingModelStructDataSpecs
     v-if="dataSpecs.childDataType === IoTDataSpecsDataTypeEnum.STRUCT"
     v-model="dataSpecs.dataSpecsList"
   />
 </template>
-
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import ThingModelStructDataSpecs from './ThingModelStructDataSpecs.vue'
-import { getDataTypeOptions, IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants'
-
-/** 数组型的 dataSpecs 配置组件 */
-defineOptions({ name: 'ThingModelArrayDataSpecs' })
-
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue'])
-const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<any>
-
-/** 元素类型改变时间。当值为 struct 时，对 dataSpecs 中的 dataSpecsList 进行初始化 */
-const handleChange = (val: string) => {
-  if (val !== IoTDataSpecsDataTypeEnum.STRUCT) {
-    return
-  }
-
-  dataSpecs.value.dataSpecsList = []
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelEnumDataSpecs.vue b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelEnumDataSpecs.vue
index e4b6d69f0e7c8ecf7717d48a1bbc94a0bd8d4e6c..13bb95315125ea0eae006e796ffa3f6ed8ed267b 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelEnumDataSpecs.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelEnumDataSpecs.vue
@@ -1,156 +1,169 @@
 <!-- dataType：enum 数组类型 -->
-<template>
-  <el-form-item
-    :rules="[{ required: true, validator: validateEnumList, trigger: 'change' }]"
-    label="枚举项"
-  >
-    <div class="flex flex-col">
-      <div class="flex items-center">
-        <span class="flex-1"> 参数值 </span>
-        <span class="flex-1"> 参数描述 </span>
-      </div>
-      <div
-        v-for="(item, index) in dataSpecsList"
-        :key="index"
-        class="flex items-center justify-between mb-5px"
-      >
-        <el-form-item
-          :prop="`property.dataSpecsList[${index}].value`"
-          :rules="[
-            { required: true, message: '枚举值不能为空' },
-            { validator: validateEnumValue, trigger: 'blur' }
-          ]"
-          class="flex-1 mb-0"
-        >
-          <el-input v-model="item.value" placeholder="请输入枚举值,如'0'" />
-        </el-form-item>
-        <span class="mx-2">~</span>
-        <el-form-item
-          :prop="`property.dataSpecsList[${index}].name`"
-          :rules="[
-            { required: true, message: '枚举描述不能为空' },
-            { validator: validateEnumName, trigger: 'blur' }
-          ]"
-          class="flex-1 mb-0"
-        >
-          <el-input v-model="item.name" placeholder="对该枚举项的描述" />
-        </el-form-item>
-        <el-button class="ml-10px" link type="primary" @click="deleteEnum(index)">删除</el-button>
-      </div>
-      <el-button link type="primary" @click="addEnum">+添加枚举项</el-button>
-    </div>
-  </el-form-item>
-</template>
-
 <script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import { isEmpty } from '@vben/utils'
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants'
-import { DataSpecsEnumOrBoolData } from '#/api/iot/thingmodel'
+import type { Ref } from 'vue';
 
-/** 枚举型的 dataSpecs 配置组件 */
-defineOptions({ name: 'ThingModelEnumDataSpecs' })
+import type { DataSpecsEnumOrBoolData } from '#/api/iot/thingmodel';
+
+import { isEmpty } from '@vben/utils';
 
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue'])
-const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<DataSpecsEnumOrBoolData[]>
+import { useVModel } from '@vueuse/core';
+import { Button, Form, Input, message } from 'ant-design-vue';
 
+import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
+
+/** 枚举型的 dataSpecs 配置组件 */
+defineOptions({ name: 'ThingModelEnumDataSpecs' });
+
+const props = defineProps<{ modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<
+  DataSpecsEnumOrBoolData[]
+>;
 
 /** 添加枚举项 */
-const addEnum = () => {
+function addEnum() {
   dataSpecsList.value.push({
     dataType: IoTDataSpecsDataTypeEnum.ENUM,
     name: '', // 枚举项的名称
-    value: undefined // 枚举值
-  })
+    value: '', // 枚举值
+  });
 }
 
 /** 删除枚举项 */
-const deleteEnum = (index: number) => {
+function deleteEnum(index: number) {
   if (dataSpecsList.value.length === 1) {
-    message.warning('至少需要一个枚举项')
-    return
+    message.warning('至少需要一个枚举项');
+    return;
   }
-  dataSpecsList.value.splice(index, 1)
+  dataSpecsList.value.splice(index, 1);
 }
 
 /** 校验枚举值 */
-const validateEnumValue = (_: any, value: any, callback: any) => {
+function validateEnumValue(_: any, value: any, callback: any) {
   if (isEmpty(value)) {
-    callback(new Error('枚举值不能为空'))
-    return
+    callback(new Error('枚举值不能为空'));
+    return;
   }
-  if (isNaN(Number(value))) {
-    callback(new Error('枚举值必须是数字'))
-    return
+  if (Number.isNaN(Number(value))) {
+    callback(new Error('枚举值必须是数字'));
+    return;
   }
   // 检查枚举值是否重复
-  const values = dataSpecsList.value.map((item) => item.value)
+  const values = dataSpecsList.value.map((item) => item.value);
   if (values.filter((v) => v === value).length > 1) {
-    callback(new Error('枚举值不能重复'))
-    return
+    callback(new Error('枚举值不能重复'));
+    return;
   }
-  callback()
+  callback();
 }
 
 /** 校验枚举描述 */
-const validateEnumName = (_: any, value: string, callback: any) => {
+function validateEnumName(_: any, value: string, callback: any) {
   if (isEmpty(value)) {
-    callback(new Error('枚举描述不能为空'))
-    return
+    callback(new Error('枚举描述不能为空'));
+    return;
   }
   // 检查开头字符
-  if (!/^[\u4e00-\u9fa5a-zA-Z0-9]/.test(value)) {
-    callback(new Error('枚举描述必须以中文、英文字母或数字开头'))
-    return
+  if (!/^[\u4E00-\u9FA5a-z0-9]/i.test(value)) {
+    callback(new Error('枚举描述必须以中文、英文字母或数字开头'));
+    return;
   }
   // 检查整体格式
-  if (!/^[\u4e00-\u9fa5a-zA-Z0-9][a-zA-Z0-9\u4e00-\u9fa5_-]*$/.test(value)) {
-    callback(new Error('枚举描述只能包含中文、英文字母、数字、下划线和短划线'))
-    return
+  if (!/^[\u4E00-\u9FA5a-z0-9][\w\u4E00-\u9FA5-]*$/i.test(value)) {
+    callback(new Error('枚举描述只能包含中文、英文字母、数字、下划线和短划线'));
+    return;
   }
   // 检查长度（一个中文算一个字符）
   if (value.length > 20) {
-    callback(new Error('枚举描述长度不能超过20个字符'))
-    return
+    callback(new Error('枚举描述长度不能超过20个字符'));
+    return;
   }
-  callback()
+  callback();
 }
 
 /** 校验整个枚举列表 */
-const validateEnumList = (_: any, __: any, callback: any) => {
+function validateEnumList(_: any, __: any, callback: any) {
   if (isEmpty(dataSpecsList.value)) {
-    callback(new Error('请至少添加一个枚举项'))
-    return
+    callback(new Error('请至少添加一个枚举项'));
+    return;
   }
 
   // 检查是否存在空值
   const hasEmptyValue = dataSpecsList.value.some(
-    (item) => isEmpty(item.value) || isEmpty(item.name)
-  )
+    (item) => isEmpty(item.value) || isEmpty(item.name),
+  );
   if (hasEmptyValue) {
-    callback(new Error('存在未填写的枚举值或描述'))
-    return
+    callback(new Error('存在未填写的枚举值或描述'));
+    return;
   }
 
   // 检查枚举值是否都是数字
-  const hasInvalidNumber = dataSpecsList.value.some((item) => isNaN(Number(item.value)))
+  const hasInvalidNumber = dataSpecsList.value.some((item) =>
+    Number.isNaN(Number(item.value)),
+  );
   if (hasInvalidNumber) {
-    callback(new Error('存在非数字的枚举值'))
-    return
+    callback(new Error('存在非数字的枚举值'));
+    return;
   }
 
   // 检查是否有重复的枚举值
-  const values = dataSpecsList.value.map((item) => item.value)
-  const uniqueValues = new Set(values)
+  const values = dataSpecsList.value.map((item) => item.value);
+  const uniqueValues = new Set(values);
   if (values.length !== uniqueValues.size) {
-    callback(new Error('存在重复的枚举值'))
-    return
+    callback(new Error('存在重复的枚举值'));
+    return;
   }
-  callback()
+  callback();
 }
 </script>
 
+<template>
+  <Form.Item
+    :rules="[
+      { required: true, validator: validateEnumList, trigger: 'change' },
+    ]"
+    label="枚举项"
+  >
+    <div class="flex flex-col">
+      <div class="flex items-center">
+        <span class="flex-1"> 参数值 </span>
+        <span class="flex-1"> 参数描述 </span>
+      </div>
+      <div
+        v-for="(item, index) in dataSpecsList"
+        :key="index"
+        class="mb-5px flex items-center justify-between"
+      >
+        <Form.Item
+          :prop="`property.dataSpecsList[${index}].value`"
+          :rules="[
+            { required: true, message: '枚举值不能为空' },
+            { validator: validateEnumValue, trigger: 'blur' },
+          ]"
+          class="mb-0 flex-1"
+        >
+          <Input v-model="item.value" placeholder="请输入枚举值,如'0'" />
+        </Form.Item>
+        <span class="mx-2">~</span>
+        <Form.Item
+          :prop="`property.dataSpecsList[${index}].name`"
+          :rules="[
+            { required: true, message: '枚举描述不能为空' },
+            { validator: validateEnumName, trigger: 'blur' },
+          ]"
+          class="mb-0 flex-1"
+        >
+          <Input v-model="item.name" placeholder="对该枚举项的描述" />
+        </Form.Item>
+        <Button class="ml-10px" link type="primary" @click="deleteEnum(index)">
+          删除
+        </Button>
+      </div>
+      <Button link type="primary" @click="addEnum">+添加枚举项</Button>
+    </div>
+  </Form.Item>
+</template>
+
 <style lang="scss" scoped>
 :deep(.el-form-item) {
   .el-form-item {
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelNumberDataSpecs.vue b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelNumberDataSpecs.vue
index 8f658b50393259705d2072d0ef0b64b0452fa716..0b08c9c8437c547c0168e773be045fdd83de1f74 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelNumberDataSpecs.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelNumberDataSpecs.vue
@@ -1,11 +1,93 @@
 <!-- dataType：number 数组类型 -->
+<script lang="ts" setup>
+import type { Ref } from 'vue';
+
+import type { DataSpecsNumberData } from '#/api/iot/thingmodel';
+
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+
+import { useVModel } from '@vueuse/core';
+
+/** 数值型的 dataSpecs 配置组件 */
+defineOptions({ name: 'ThingModelNumberDataSpecs' });
+
+const props = defineProps<{ modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const dataSpecs = useVModel(
+  props,
+  'modelValue',
+  emits,
+) as Ref<DataSpecsNumberData>;
+
+/** 单位发生变化时触发 */
+const unitChange = (UnitSpecs: string) => {
+  const [unitName, unit] = UnitSpecs.split('-');
+  dataSpecs.value.unitName = unitName;
+  dataSpecs.value.unit = unit;
+};
+
+/** 校验最小值 */
+const validateMin = (_: any, __: any, callback: any) => {
+  const min = Number(dataSpecs.value.min);
+  const max = Number(dataSpecs.value.max);
+  if (Number.isNaN(min)) {
+    callback(new Error('请输入有效的数值'));
+    return;
+  }
+  if (max !== undefined && !Number.isNaN(max) && min >= max) {
+    callback(new Error('最小值必须小于最大值'));
+    return;
+  }
+
+  callback();
+};
+
+/** 校验最大值 */
+const validateMax = (_: any, __: any, callback: any) => {
+  const min = Number(dataSpecs.value.min);
+  const max = Number(dataSpecs.value.max);
+  if (Number.isNaN(max)) {
+    callback(new Error('请输入有效的数值'));
+    return;
+  }
+  if (min !== undefined && !Number.isNaN(min) && max <= min) {
+    callback(new Error('最大值必须大于最小值'));
+    return;
+  }
+
+  callback();
+};
+
+/** 校验步长 */
+const validateStep = (_: any, __: any, callback: any) => {
+  const step = Number(dataSpecs.value.step);
+  if (Number.isNaN(step)) {
+    callback(new Error('请输入有效的数值'));
+    return;
+  }
+  if (step <= 0) {
+    callback(new Error('步长必须大于0'));
+    return;
+  }
+  const min = Number(dataSpecs.value.min);
+  const max = Number(dataSpecs.value.max);
+  if (!Number.isNaN(min) && !Number.isNaN(max) && step > max - min) {
+    callback(new Error('步长不能大于最大值和最小值的差值'));
+    return;
+  }
+
+  callback();
+};
+</script>
+
 <template>
   <el-form-item label="取值范围">
     <div class="flex items-center justify-between">
       <el-form-item
         :rules="[
           { required: true, message: '最小值不能为空' },
-          { validator: validateMin, trigger: 'blur' }
+          { validator: validateMin, trigger: 'blur' },
         ]"
         class="mb-0"
         prop="property.dataSpecs.min"
@@ -16,7 +98,7 @@
       <el-form-item
         :rules="[
           { required: true, message: '最大值不能为空' },
-          { validator: validateMax, trigger: 'blur' }
+          { validator: validateMax, trigger: 'blur' },
         ]"
         class="mb-0"
         prop="property.dataSpecs.max"
@@ -28,7 +110,7 @@
   <el-form-item
     :rules="[
       { required: true, message: '步长不能为空' },
-      { validator: validateStep, trigger: 'blur' }
+      { validator: validateStep, trigger: 'blur' },
     ]"
     label="步长"
     prop="property.dataSpecs.step"
@@ -41,95 +123,27 @@
     prop="property.dataSpecs.unit"
   >
     <el-select
-      :model-value="dataSpecs.unit ? dataSpecs.unitName + '-' + dataSpecs.unit : ''"
+      :model-value="
+        dataSpecs.unit ? `${dataSpecs.unitName}-${dataSpecs.unit}` : ''
+      "
       filterable
       placeholder="请选择单位"
       class="w-1/1"
       @change="unitChange"
     >
       <el-option
-        v-for="(item, index) in getStrDictOptions(DICT_TYPE.IOT_THING_MODEL_UNIT)"
+        v-for="(item, index) in getDictOptions(
+          DICT_TYPE.IOT_THING_MODEL_UNIT,
+          'string',
+        )"
         :key="index"
-        :label="item.label + '-' + item.value"
-        :value="item.label + '-' + item.value"
+        :label="`${item.label}-${item.value}`"
+        :value="`${item.label}-${item.value}`"
       />
     </el-select>
   </el-form-item>
 </template>
 
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import { DICT_TYPE, getStrDictOptions } from '@vben/constants'
-import { DataSpecsNumberData } from '#/api/iot/thingmodel'
-
-/** 数值型的 dataSpecs 配置组件 */
-defineOptions({ name: 'ThingModelNumberDataSpecs' })
-
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue'])
-const dataSpecs = useVModel(props, 'modelValue', emits) as Ref<DataSpecsNumberData>
-
-/** 单位发生变化时触发 */
-const unitChange = (UnitSpecs: string) => {
-  const [unitName, unit] = UnitSpecs.split('-')
-  dataSpecs.value.unitName = unitName
-  dataSpecs.value.unit = unit
-}
-
-/** 校验最小值 */
-const validateMin = (_: any, __: any, callback: any) => {
-  const min = Number(dataSpecs.value.min)
-  const max = Number(dataSpecs.value.max)
-  if (isNaN(min)) {
-    callback(new Error('请输入有效的数值'))
-    return
-  }
-  if (max !== undefined && !isNaN(max) && min >= max) {
-    callback(new Error('最小值必须小于最大值'))
-    return
-  }
-
-  callback()
-}
-
-/** 校验最大值 */
-const validateMax = (_: any, __: any, callback: any) => {
-  const min = Number(dataSpecs.value.min)
-  const max = Number(dataSpecs.value.max)
-  if (isNaN(max)) {
-    callback(new Error('请输入有效的数值'))
-    return
-  }
-  if (min !== undefined && !isNaN(min) && max <= min) {
-    callback(new Error('最大值必须大于最小值'))
-    return
-  }
-
-  callback()
-}
-
-/** 校验步长 */
-const validateStep = (_: any, __: any, callback: any) => {
-  const step = Number(dataSpecs.value.step)
-  if (isNaN(step)) {
-    callback(new Error('请输入有效的数值'))
-    return
-  }
-  if (step <= 0) {
-    callback(new Error('步长必须大于0'))
-    return
-  }
-  const min = Number(dataSpecs.value.min)
-  const max = Number(dataSpecs.value.max)
-  if (!isNaN(min) && !isNaN(max) && step > max - min) {
-    callback(new Error('步长不能大于最大值和最小值的差值'))
-    return
-  }
-
-  callback()
-}
-</script>
-
 <style lang="scss" scoped>
 :deep(.el-form-item) {
   .el-form-item {
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelStructDataSpecs.vue b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelStructDataSpecs.vue
index ee19a9b6394ab0e0c71e3208260a5d30f937e53d..34d52a12c6cea9b56a6a83af53af586779190a38 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelStructDataSpecs.vue
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/ThingModelStructDataSpecs.vue
@@ -1,82 +1,43 @@
 <!-- dataType：struct 数组类型 -->
-<template>
-  <!-- struct 数据展示 -->
-  <el-form-item
-    :rules="[{ required: true, validator: validateList, trigger: 'change' }]"
-    label="JSON 对象"
-  >
-    <div
-      v-for="(item, index) in dataSpecsList"
-      :key="index"
-      class="w-1/1 struct-item flex justify-between px-10px mb-10px"
-    >
-      <span>参数名称：{{ item.name }}</span>
-      <div class="btn">
-        <el-button link type="primary" @click="openStructForm(item)">编辑</el-button>
-        <el-divider direction="vertical" />
-        <el-button link type="danger" @click="deleteStructItem(index)">删除</el-button>
-      </div>
-    </div>
-    <el-button link type="primary" @click="openStructForm(null)">+新增参数</el-button>
-  </el-form-item>
+<script lang="ts" setup>
+import type { Ref } from 'vue';
 
-  <!-- struct 表单 -->
-  <Dialog v-model="dialogVisible" :title="dialogTitle" append-to-body>
-    <el-form
-      ref="structFormRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="ThingModelFormRules"
-      label-width="100px"
-    >
-      <el-form-item label="参数名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入功能名称" />
-      </el-form-item>
-      <el-form-item label="标识符" prop="identifier">
-        <el-input v-model="formData.identifier" placeholder="请输入标识符" />
-      </el-form-item>
-      <!-- 属性配置 -->
-      <ThingModelProperty v-model="formData.property" is-struct-data-specs />
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
+import { nextTick, onMounted, ref, unref } from 'vue';
 
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import ThingModelProperty from '../ThingModelProperty.vue'
-import { isEmpty } from '@vben/utils'
-import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants'
-import { ThingModelFormRules } from '#/api/iot/thingmodel'
+import { isEmpty } from '@vben/utils';
+
+import { useVModel } from '@vueuse/core';
+import { Button, Divider, Form, Input, Modal } from 'ant-design-vue';
+
+import { IoTDataSpecsDataTypeEnum } from '#/views/iot/utils/constants';
+
+import ThingModelProperty from '../ThingModelProperty.vue';
 
 /** Struct 型的 dataSpecs 配置组件 */
-defineOptions({ name: 'ThingModelStructDataSpecs' })
-
-const props = defineProps<{ modelValue: any }>()
-const emits = defineEmits(['update:modelValue'])
-const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<any[]>
-const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('新增参数') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const structFormRef = ref() // 表单 ref
+defineOptions({ name: 'ThingModelStructDataSpecs' });
+
+const props = defineProps<{ modelValue: any }>();
+const emits = defineEmits(['update:modelValue']);
+const dataSpecsList = useVModel(props, 'modelValue', emits) as Ref<any[]>;
+const dialogVisible = ref(false); // 弹窗的是否展示
+const dialogTitle = ref('新增参数'); // 弹窗的标题
+const formLoading = ref(false); // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const structFormRef = ref(); // 表单 ref
 const formData = ref<any>({
   property: {
     dataType: IoTDataSpecsDataTypeEnum.INT,
     dataSpecs: {
-      dataType: IoTDataSpecsDataTypeEnum.INT
-    }
-  }
-})
+      dataType: IoTDataSpecsDataTypeEnum.INT,
+    },
+  },
+});
 
 /** 打开 struct 表单 */
-const openStructForm = (val: any) => {
-  dialogVisible.value = true
-  resetForm()
+function openStructForm(val: any) {
+  dialogVisible.value = true;
+  resetForm();
   if (isEmpty(val)) {
-    return
+    return;
   }
   // 编辑时回显数据
   formData.value = {
@@ -86,22 +47,22 @@ const openStructForm = (val: any) => {
     property: {
       dataType: val.childDataType,
       dataSpecs: val.dataSpecs,
-      dataSpecsList: val.dataSpecsList
-    }
-  }
+      dataSpecsList: val.dataSpecsList,
+    },
+  };
 }
 
 /** 删除 struct 项 */
-const deleteStructItem = (index: number) => {
-  dataSpecsList.value.splice(index, 1)
+function deleteStructItem(index: number) {
+  dataSpecsList.value.splice(index, 1);
 }
 
 /** 添加参数 */
-const submitForm = async () => {
-  await structFormRef.value.validate()
+async function submitForm() {
+  await structFormRef.value.validate();
 
   try {
-    const data = unref(formData)
+    const data = unref(formData);
     // 构建数据对象
     const item = {
       identifier: data.identifier,
@@ -110,58 +71,106 @@ const submitForm = async () => {
       dataType: IoTDataSpecsDataTypeEnum.STRUCT,
       childDataType: data.property.dataType,
       dataSpecs:
-        !!data.property.dataSpecs && Object.keys(data.property.dataSpecs).length > 1
+        !!data.property.dataSpecs &&
+        Object.keys(data.property.dataSpecs).length > 1
           ? data.property.dataSpecs
           : undefined,
-      dataSpecsList: isEmpty(data.property.dataSpecsList) ? undefined : data.property.dataSpecsList
-    }
+      dataSpecsList: isEmpty(data.property.dataSpecsList)
+        ? undefined
+        : data.property.dataSpecsList,
+    };
 
     // 新增或修改同 identifier 的参数
     const existingIndex = dataSpecsList.value.findIndex(
-      (spec) => spec.identifier === data.identifier
-    )
-    if (existingIndex > -1) {
-      dataSpecsList.value[existingIndex] = item
+      (spec) => spec.identifier === data.identifier,
+    );
+    if (existingIndex === -1) {
+      dataSpecsList.value.push(item);
     } else {
-      dataSpecsList.value.push(item)
+      dataSpecsList.value[existingIndex] = item;
     }
   } finally {
-    dialogVisible.value = false
+    dialogVisible.value = false;
   }
 }
 
 /** 重置表单 */
-const resetForm = () => {
+function resetForm() {
   formData.value = {
     property: {
       dataType: IoTDataSpecsDataTypeEnum.INT,
       dataSpecs: {
-        dataType: IoTDataSpecsDataTypeEnum.INT
-      }
-    }
-  }
-  structFormRef.value?.resetFields()
+        dataType: IoTDataSpecsDataTypeEnum.INT,
+      },
+    },
+  };
+  structFormRef.value?.resetFields();
 }
 
 /** 校验 struct 不能为空 */
-const validateList = (_: any, __: any, callback: any) => {
+function validateList(_: any, __: any, callback: any) {
   if (isEmpty(dataSpecsList.value)) {
-    callback(new Error('struct 不能为空'))
-    return
+    callback(new Error('struct 不能为空'));
+    return;
   }
-  callback()
+  callback();
 }
 
 /** 组件初始化 */
 onMounted(async () => {
-  await nextTick()
+  await nextTick();
   // 预防 dataSpecsList 空指针
-  isEmpty(dataSpecsList.value) && (dataSpecsList.value = [])
-})
+  isEmpty(dataSpecsList.value) && (dataSpecsList.value = []);
+});
 </script>
 
-<style lang="scss" scoped>
-.struct-item {
-  background-color: #e4f2fd;
-}
-</style>
+<template>
+  <!-- struct 数据展示 -->
+  <Form.Item
+    :rules="[{ required: true, validator: validateList, trigger: 'change' }]"
+    label="JSON 对象"
+  >
+    <div
+      v-for="(item, index) in dataSpecsList"
+      :key="index"
+      class="px-10px mb-10px flex w-full justify-between bg-gray-100"
+    >
+      <span>参数名称：{{ item.name }}</span>
+      <div class="btn">
+        <Button link type="primary" @click="openStructForm(item)">
+          编辑
+        </Button>
+        <Divider direction="vertical" />
+        <Button link danger @click="deleteStructItem(index)"> 删除 </Button>
+      </div>
+    </div>
+    <Button link type="primary" @click="openStructForm(null)">
+      +新增参数
+    </Button>
+  </Form.Item>
+
+  <!-- struct 表单 -->
+  <Modal v-model="dialogVisible" :title="dialogTitle" append-to-body>
+    <Form
+      ref="structFormRef"
+      v-loading="formLoading"
+      :model="formData"
+      label-width="100px"
+    >
+      <Form.Item label="参数名称" prop="name">
+        <Input v-model="formData.name" placeholder="请输入功能名称" />
+      </Form.Item>
+      <Form.Item label="标识符" prop="identifier">
+        <Input v-model="formData.identifier" placeholder="请输入标识符" />
+      </Form.Item>
+      <!-- 属性配置 -->
+      <ThingModelProperty v-model="formData.property" is-struct-data-specs />
+    </Form>
+    <template #footer>
+      <Button :disabled="formLoading" type="primary" @click="submitForm">
+        确 定
+      </Button>
+      <Button @click="dialogVisible = false">取 消</Button>
+    </template>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
index 30151aea62ba1d0fc2d98f370418fada1d504fd7..9f9e527f69767fca5983d627e96489b8463cc1f9 100644
--- a/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
+++ b/apps/web-antd/src/views/iot/thingmodel/modules/dataSpecs/index.ts
@@ -1,11 +1,4 @@
-import ThingModelEnumDataSpecs from './ThingModelEnumDataSpecs.vue'
-import ThingModelNumberDataSpecs from './ThingModelNumberDataSpecs.vue'
-import ThingModelArrayDataSpecs from './ThingModelArrayDataSpecs.vue'
-import ThingModelStructDataSpecs from './ThingModelStructDataSpecs.vue'
-
-export {
-  ThingModelEnumDataSpecs,
-  ThingModelNumberDataSpecs,
-  ThingModelArrayDataSpecs,
-  ThingModelStructDataSpecs
-}
+export { default as ThingModelArrayDataSpecs } from './ThingModelArrayDataSpecs.vue';
+export { default as ThingModelEnumDataSpecs } from './ThingModelEnumDataSpecs.vue';
+export { default as ThingModelNumberDataSpecs } from './ThingModelNumberDataSpecs.vue';
+export { default as ThingModelStructDataSpecs } from './ThingModelStructDataSpecs.vue';
diff --git a/apps/web-antd/src/views/iot/utils/constants.ts b/apps/web-antd/src/views/iot/utils/constants.ts
index c5cdad803377b19900e3177e652f50b44868954d..33d8a51bb9e974f90e99222a7bfc83b9cfc24330 100644
--- a/apps/web-antd/src/views/iot/utils/constants.ts
+++ b/apps/web-antd/src/views/iot/utils/constants.ts
@@ -5,15 +5,15 @@ const isEmpty = (value: any): boolean => {
 
 /** IoT 依赖注入 KEY */
 export const IOT_PROVIDE_KEY = {
-  PRODUCT: 'IOT_PRODUCT'
-}
+  PRODUCT: 'IOT_PRODUCT',
+};
 
 /** IoT 产品物模型类型枚举类 */
 export const IoTThingModelTypeEnum = {
   PROPERTY: 1, // 属性
   SERVICE: 2, // 服务
-  EVENT: 3 // 事件
-} as const
+  EVENT: 3, // 事件
+};
 
 /** IoT 设备消息的方法枚举 */
 export const IotDeviceMessageMethodEnum = {
@@ -21,102 +21,109 @@ export const IotDeviceMessageMethodEnum = {
   STATE_UPDATE: {
     method: 'thing.state.update',
     name: '设备状态变更',
-    upstream: true
+    upstream: true,
   },
 
   // ========== 设备属性 ==========
   PROPERTY_POST: {
     method: 'thing.property.post',
     name: '属性上报',
-    upstream: true
+    upstream: true,
   },
   PROPERTY_SET: {
     method: 'thing.property.set',
     name: '属性设置',
-    upstream: false
+    upstream: false,
   },
 
   // ========== 设备事件 ==========
   EVENT_POST: {
     method: 'thing.event.post',
     name: '事件上报',
-    upstream: true
+    upstream: true,
   },
 
   // ========== 服务调用 ==========
   SERVICE_INVOKE: {
     method: 'thing.service.invoke',
     name: '服务调用',
-    upstream: false
+    upstream: false,
   },
 
   // ========== 设备配置 ==========
   CONFIG_PUSH: {
     method: 'thing.config.push',
     name: '配置推送',
-    upstream: false
-  }
-}
+    upstream: false,
+  },
+};
 
 // IoT 产品物模型服务调用方式枚举
 export const IoTThingModelServiceCallTypeEnum = {
   ASYNC: {
     label: '异步',
-    value: 'async'
+    value: 'async',
   },
   SYNC: {
     label: '同步',
-    value: 'sync'
-  }
-} as const
-export const getThingModelServiceCallTypeLabel = (value: string): string | undefined =>
-  Object.values(IoTThingModelServiceCallTypeEnum).find((type) => type.value === value)?.label
+    value: 'sync',
+  },
+};
+export const getThingModelServiceCallTypeLabel = (
+  value: string,
+): string | undefined =>
+  Object.values(IoTThingModelServiceCallTypeEnum).find(
+    (type) => type.value === value,
+  )?.label;
 
 // IoT 产品物模型事件类型枚举
 export const IoTThingModelEventTypeEnum = {
   INFO: {
     label: '信息',
-    value: 'info'
+    value: 'info',
   },
   ALERT: {
     label: '告警',
-    value: 'alert'
+    value: 'alert',
   },
   ERROR: {
     label: '故障',
-    value: 'error'
-  }
-} as const
+    value: 'error',
+  },
+};
 export const getEventTypeLabel = (value: string): string | undefined =>
-  Object.values(IoTThingModelEventTypeEnum).find((type) => type.value === value)?.label
+  Object.values(IoTThingModelEventTypeEnum).find((type) => type.value === value)
+    ?.label;
 
 // IoT 产品物模型参数是输入参数还是输出参数
 export const IoTThingModelParamDirectionEnum = {
   INPUT: 'input', // 输入参数
-  OUTPUT: 'output' // 输出参数
-} as const
+  OUTPUT: 'output', // 输出参数
+};
 
 // IoT 产品物模型访问模式枚举类
 export const IoTThingModelAccessModeEnum = {
   READ_WRITE: {
     label: '读写',
-    value: 'rw'
+    value: 'rw',
   },
   READ_ONLY: {
     label: '只读',
-    value: 'r'
+    value: 'r',
   },
   WRITE_ONLY: {
     label: '只写',
-    value: 'w'
-  }
-} as const
+    value: 'w',
+  },
+};
 
 /** 获取访问模式标签 */
 export const getAccessModeLabel = (value: string): string => {
-  const mode = Object.values(IoTThingModelAccessModeEnum).find((mode) => mode.value === value)
-  return mode?.label || value
-}
+  const mode = Object.values(IoTThingModelAccessModeEnum).find(
+    (mode) => mode.value === value,
+  );
+  return mode?.label || value;
+};
 
 /** 属性值的数据类型 */
 export const IoTDataSpecsDataTypeEnum = {
@@ -128,8 +135,8 @@ export const IoTDataSpecsDataTypeEnum = {
   TEXT: 'text',
   DATE: 'date',
   STRUCT: 'struct',
-  ARRAY: 'array'
-} as const
+  ARRAY: 'array',
+};
 
 export const getDataTypeOptions = () => {
   return [
@@ -141,22 +148,24 @@ export const getDataTypeOptions = () => {
     { value: IoTDataSpecsDataTypeEnum.TEXT, label: '文本型' },
     { value: IoTDataSpecsDataTypeEnum.DATE, label: '时间型' },
     { value: IoTDataSpecsDataTypeEnum.STRUCT, label: '结构体' },
-    { value: IoTDataSpecsDataTypeEnum.ARRAY, label: '数组' }
-  ]
-}
+    { value: IoTDataSpecsDataTypeEnum.ARRAY, label: '数组' },
+  ];
+};
 
 /** 获得物体模型数据类型配置项名称 */
 export const getDataTypeOptionsLabel = (value: string) => {
   if (isEmpty(value)) {
-    return value
+    return value;
   }
-  const dataType = getDataTypeOptions().find((option) => option.value === value)
-  return dataType && `${dataType.value}(${dataType.label})`
-}
+  const dataType = getDataTypeOptions().find(
+    (option) => option.value === value,
+  );
+  return dataType && `${dataType.value}(${dataType.label})`;
+};
 
 /** 获取数据类型显示名称（用于属性选择器） */
 export const getDataTypeName = (dataType: string): string => {
-  const typeMap = {
+  const typeMap: Record<string, string> = {
     [IoTDataSpecsDataTypeEnum.INT]: '整数',
     [IoTDataSpecsDataTypeEnum.FLOAT]: '浮点数',
     [IoTDataSpecsDataTypeEnum.DOUBLE]: '双精度',
@@ -165,16 +174,19 @@ export const getDataTypeName = (dataType: string): string => {
     [IoTDataSpecsDataTypeEnum.ENUM]: '枚举',
     [IoTDataSpecsDataTypeEnum.DATE]: '日期',
     [IoTDataSpecsDataTypeEnum.STRUCT]: '结构体',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: '数组'
-  }
-  return typeMap[dataType] || dataType
-}
+    [IoTDataSpecsDataTypeEnum.ARRAY]: '数组',
+  };
+  return typeMap[dataType] || dataType;
+};
 
-/** 获取数据类型标签类型（用于 el-tag 的 type 属性） */
+/** 获取数据类型标签类型（用于 tag 的 type 属性） */
 export const getDataTypeTagType = (
-  dataType: string
-): 'primary' | 'success' | 'info' | 'warning' | 'danger' => {
-  const tagMap = {
+  dataType: string,
+): 'danger' | 'info' | 'primary' | 'success' | 'warning' => {
+  const tagMap: Record<
+    string,
+    'danger' | 'info' | 'primary' | 'success' | 'warning'
+  > = {
     [IoTDataSpecsDataTypeEnum.INT]: 'primary',
     [IoTDataSpecsDataTypeEnum.FLOAT]: 'success',
     [IoTDataSpecsDataTypeEnum.DOUBLE]: 'success',
@@ -183,73 +195,73 @@ export const getDataTypeTagType = (
     [IoTDataSpecsDataTypeEnum.ENUM]: 'danger',
     [IoTDataSpecsDataTypeEnum.DATE]: 'primary',
     [IoTDataSpecsDataTypeEnum.STRUCT]: 'info',
-    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning'
-  } as const
-  return tagMap[dataType] || 'info'
-}
+    [IoTDataSpecsDataTypeEnum.ARRAY]: 'warning',
+  };
+  return tagMap[dataType] || 'info';
+};
 
 /** 物模型组标签常量 */
 export const THING_MODEL_GROUP_LABELS = {
   PROPERTY: '设备属性',
   EVENT: '设备事件',
-  SERVICE: '设备服务'
-} as const
+  SERVICE: '设备服务',
+};
 
 // IoT OTA 任务设备范围枚举
 export const IoTOtaTaskDeviceScopeEnum = {
   ALL: {
     label: '全部设备',
-    value: 1
+    value: 1,
   },
   SELECT: {
     label: '指定设备',
-    value: 2
-  }
-} as const
+    value: 2,
+  },
+};
 
 // IoT OTA 任务状态枚举
 export const IoTOtaTaskStatusEnum = {
   IN_PROGRESS: {
     label: '进行中',
-    value: 10
+    value: 10,
   },
   END: {
     label: '已结束',
-    value: 20
+    value: 20,
   },
   CANCELED: {
     label: '已取消',
-    value: 30
-  }
-} as const
+    value: 30,
+  },
+};
 
 // IoT OTA 升级记录状态枚举
 export const IoTOtaTaskRecordStatusEnum = {
   PENDING: {
     label: '待推送',
-    value: 0
+    value: 0,
   },
   PUSHED: {
     label: '已推送',
-    value: 10
+    value: 10,
   },
   UPGRADING: {
     label: '升级中',
-    value: 20
+    value: 20,
   },
   SUCCESS: {
     label: '升级成功',
-    value: 30
+    value: 30,
   },
   FAILURE: {
     label: '升级失败',
-    value: 40
+    value: 40,
   },
   CANCELED: {
     label: '升级取消',
-    value: 50
-  }
-} as const
+    value: 50,
+  },
+};
 
 // ========== 场景联动规则相关常量 ==========
 
@@ -259,42 +271,42 @@ export const IotRuleSceneTriggerTypeEnum = {
   DEVICE_PROPERTY_POST: 2, // 物模型属性上报
   DEVICE_EVENT_POST: 3, // 设备事件上报
   DEVICE_SERVICE_INVOKE: 4, // 设备服务调用
-  TIMER: 100 // 定时触发
-} as const
+  TIMER: 100, // 定时触发
+};
 
 /** 触发器类型选项配置 */
 export const triggerTypeOptions = [
   {
     value: IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE,
-    label: '设备状态变更'
+    label: '设备状态变更',
   },
   {
     value: IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST,
-    label: '设备属性上报'
+    label: '设备属性上报',
   },
   {
     value: IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
-    label: '设备事件上报'
+    label: '设备事件上报',
   },
   {
     value: IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
-    label: '设备服务调用'
+    label: '设备服务调用',
   },
   {
     value: IotRuleSceneTriggerTypeEnum.TIMER,
-    label: '定时触发'
-  }
-]
+    label: '定时触发',
+  },
+];
 
 /** 判断是否为设备触发器类型 */
-export const isDeviceTrigger = (type: number): boolean => {
+export function isDeviceTrigger(type: number): boolean {
   const deviceTriggerTypes = [
     IotRuleSceneTriggerTypeEnum.DEVICE_STATE_UPDATE,
     IotRuleSceneTriggerTypeEnum.DEVICE_PROPERTY_POST,
     IotRuleSceneTriggerTypeEnum.DEVICE_EVENT_POST,
-    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE
-  ] as number[]
-  return deviceTriggerTypes.includes(type)
+    IotRuleSceneTriggerTypeEnum.DEVICE_SERVICE_INVOKE,
+  ] as number[];
+  return deviceTriggerTypes.includes(type);
 }
 
 // ========== 场景联动规则执行器相关常量 ==========
@@ -304,34 +316,34 @@ export const IotRuleSceneActionTypeEnum = {
   DEVICE_PROPERTY_SET: 1, // 设备属性设置
   DEVICE_SERVICE_INVOKE: 2, // 设备服务调用
   ALERT_TRIGGER: 100, // 告警触发
-  ALERT_RECOVER: 101 // 告警恢复
-} as const
+  ALERT_RECOVER: 101, // 告警恢复
+};
 
 /** 执行器类型选项配置 */
 export const getActionTypeOptions = () => [
   {
     value: IotRuleSceneActionTypeEnum.DEVICE_PROPERTY_SET,
-    label: '设备属性设置'
+    label: '设备属性设置',
   },
   {
     value: IotRuleSceneActionTypeEnum.DEVICE_SERVICE_INVOKE,
-    label: '设备服务调用'
+    label: '设备服务调用',
   },
   {
     value: IotRuleSceneActionTypeEnum.ALERT_TRIGGER,
-    label: '触发告警'
+    label: '触发告警',
   },
   {
     value: IotRuleSceneActionTypeEnum.ALERT_RECOVER,
-    label: '恢复告警'
-  }
-]
+    label: '恢复告警',
+  },
+];
 
 /** 获取执行器类型标签 */
 export const getActionTypeLabel = (type: number): string => {
-  const option = getActionTypeOptions().find((opt) => opt.value === type)
-  return option?.label || '未知类型'
-}
+  const option = getActionTypeOptions().find((opt) => opt.value === type);
+  return option?.label || '未知类型';
+};
 
 /** IoT 场景联动触发条件参数操作符枚举 */
 export const IotRuleSceneTriggerConditionParameterOperatorEnum = {
@@ -346,31 +358,31 @@ export const IotRuleSceneTriggerConditionParameterOperatorEnum = {
   BETWEEN: { name: '在...之间', value: 'between' }, // 在...之间
   NOT_BETWEEN: { name: '不在...之间', value: 'not between' }, // 不在...之间
   LIKE: { name: '字符串匹配', value: 'like' }, // 字符串匹配
-  NOT_NULL: { name: '非空', value: 'not null' } // 非空
-} as const
+  NOT_NULL: { name: '非空', value: 'not null' }, // 非空
+};
 
 /** IoT 场景联动触发条件类型枚举 */
 export const IotRuleSceneTriggerConditionTypeEnum = {
   DEVICE_STATUS: 1, // 设备状态
   DEVICE_PROPERTY: 2, // 设备属性
-  CURRENT_TIME: 3 // 当前时间
-} as const
+  CURRENT_TIME: 3, // 当前时间
+};
 
 /** 获取条件类型选项 */
 export const getConditionTypeOptions = () => [
   {
     value: IotRuleSceneTriggerConditionTypeEnum.DEVICE_STATUS,
-    label: '设备状态'
+    label: '设备状态',
   },
   {
     value: IotRuleSceneTriggerConditionTypeEnum.DEVICE_PROPERTY,
-    label: '设备属性'
+    label: '设备属性',
   },
   {
     value: IotRuleSceneTriggerConditionTypeEnum.CURRENT_TIME,
-    label: '当前时间'
-  }
-]
+    label: '当前时间',
+  },
+];
 
 /** 设备状态枚举 - 统一的设备状态管理 */
 export const IoTDeviceStatusEnum = {
@@ -378,46 +390,46 @@ export const IoTDeviceStatusEnum = {
   ONLINE: {
     label: '在线',
     value: 'online',
-    tagType: 'success'
+    tagType: 'success',
   },
   OFFLINE: {
     label: '离线',
     value: 'offline',
-    tagType: 'danger'
+    tagType: 'danger',
   },
   // 启用状态
   ENABLED: {
     label: '正常',
     value: 0,
     value2: 'enabled',
-    tagType: 'success'
+    tagType: 'success',
   },
   DISABLED: {
     label: '禁用',
     value: 1,
     value2: 'disabled',
-    tagType: 'danger'
+    tagType: 'danger',
   },
   // 激活状态
   ACTIVATED: {
     label: '已激活',
     value2: 'activated',
-    tagType: 'success'
+    tagType: 'success',
   },
   NOT_ACTIVATED: {
     label: '未激活',
     value2: 'not_activated',
-    tagType: 'info'
-  }
-} as const
+    tagType: 'info',
+  },
+};
 
 /** 设备选择器特殊选项 */
 export const DEVICE_SELECTOR_OPTIONS = {
   ALL_DEVICES: {
     id: 0,
-    deviceName: '全部设备'
-  }
-} as const
+    deviceName: '全部设备',
+  },
+};
 
 /** IoT 场景联动触发时间操作符枚举 */
 export const IotRuleSceneTriggerTimeOperatorEnum = {
@@ -427,14 +439,14 @@ export const IotRuleSceneTriggerTimeOperatorEnum = {
   AT_TIME: { name: '在指定时间', value: 'at_time' }, // 在指定时间
   BEFORE_TODAY: { name: '在今日之前', value: 'before_today' }, // 在今日之前
   AFTER_TODAY: { name: '在今日之后', value: 'after_today' }, // 在今日之后
-  TODAY: { name: '在今日之间', value: 'today' } // 在今日之间
-} as const
+  TODAY: { name: '在今日之间', value: 'today' }, // 在今日之间
+};
 
 /** 获取触发器类型标签 */
 export const getTriggerTypeLabel = (type: number): string => {
-  const option = triggerTypeOptions.find((item) => item.value === type)
-  return option?.label || '未知类型'
-}
+  const option = triggerTypeOptions.find((item) => item.value === type);
+  return option?.label || '未知类型';
+};
 
 // ========== JSON 参数输入组件相关常量 ==========
 
@@ -443,12 +455,12 @@ export const JsonParamsInputTypeEnum = {
   SERVICE: 'service',
   EVENT: 'event',
   PROPERTY: 'property',
-  CUSTOM: 'custom'
-} as const
+  CUSTOM: 'custom',
+};
 
 /** JSON 参数输入组件类型 */
 export type JsonParamsInputType =
-  (typeof JsonParamsInputTypeEnum)[keyof typeof JsonParamsInputTypeEnum]
+  (typeof JsonParamsInputTypeEnum)[keyof typeof JsonParamsInputTypeEnum];
 
 /** JSON 参数输入组件文本常量 */
 export const JSON_PARAMS_INPUT_CONSTANTS = {
@@ -474,7 +486,7 @@ export const JSON_PARAMS_INPUT_CONSTANTS = {
     EVENT: (name?: string) => `${name || '事件'} - 输出参数示例`,
     PROPERTY: '属性设置 - 参数示例',
     CUSTOM: (name?: string) => `${name || '自定义'} - 参数示例`,
-    DEFAULT: '参数示例'
+    DEFAULT: '参数示例',
   },
 
   // 参数标签
@@ -483,7 +495,7 @@ export const JSON_PARAMS_INPUT_CONSTANTS = {
     EVENT: '输出参数',
     PROPERTY: '属性参数',
     CUSTOM: '参数列表',
-    DEFAULT: '参数'
+    DEFAULT: '参数',
   },
 
   // 空状态消息
@@ -492,7 +504,7 @@ export const JSON_PARAMS_INPUT_CONSTANTS = {
     EVENT: '此事件无输出参数',
     PROPERTY: '无可设置的属性',
     CUSTOM: '无参数配置',
-    DEFAULT: '无参数'
+    DEFAULT: '无参数',
   },
 
   // 无配置消息
@@ -501,9 +513,9 @@ export const JSON_PARAMS_INPUT_CONSTANTS = {
     EVENT: '请先选择事件',
     PROPERTY: '请先选择产品',
     CUSTOM: '请先进行配置',
-    DEFAULT: '请先进行配置'
-  }
-} as const
+    DEFAULT: '请先进行配置',
+  },
+};
 
 /** JSON 参数输入组件图标常量 */
 export const JSON_PARAMS_INPUT_ICONS = {
@@ -513,7 +525,7 @@ export const JSON_PARAMS_INPUT_ICONS = {
     EVENT: 'ep:bell',
     PROPERTY: 'ep:edit',
     CUSTOM: 'ep:document',
-    DEFAULT: 'ep:document'
+    DEFAULT: 'ep:document',
   },
 
   // 参数图标
@@ -522,18 +534,18 @@ export const JSON_PARAMS_INPUT_ICONS = {
     EVENT: 'ep:upload',
     PROPERTY: 'ep:setting',
     CUSTOM: 'ep:list',
-    DEFAULT: 'ep:edit'
+    DEFAULT: 'ep:edit',
   },
 
   // 状态图标
   STATUS_ICONS: {
     ERROR: 'ep:warning',
-    SUCCESS: 'ep:circle-check'
-  }
-} as const
+    SUCCESS: 'ep:circle-check',
+  },
+};
 
 /** JSON 参数输入组件示例值常量 */
-export const JSON_PARAMS_EXAMPLE_VALUES = {
+export const JSON_PARAMS_EXAMPLE_VALUES: Record<string, any> = {
   [IoTDataSpecsDataTypeEnum.INT]: { display: '25', value: 25 },
   [IoTDataSpecsDataTypeEnum.FLOAT]: { display: '25.5', value: 25.5 },
   [IoTDataSpecsDataTypeEnum.DOUBLE]: { display: '25.5', value: 25.5 },
@@ -542,5 +554,5 @@ export const JSON_PARAMS_EXAMPLE_VALUES = {
   [IoTDataSpecsDataTypeEnum.ENUM]: { display: '"option1"', value: 'option1' },
   [IoTDataSpecsDataTypeEnum.STRUCT]: { display: '{}', value: {} },
   [IoTDataSpecsDataTypeEnum.ARRAY]: { display: '[]', value: [] },
-  DEFAULT: { display: '""', value: '' }
-} as const
+  DEFAULT: { display: '""', value: '' },
+};
diff --git a/apps/web-antd/src/views/mall/product/brand/data.ts b/apps/web-antd/src/views/mall/product/brand/data.ts
index 2a40f8d7f7964f17fbff91934a4d9ff4bdc01313..f9cfa10c00850376e9c05538b2ecfe8172193272 100644
--- a/apps/web-antd/src/views/mall/product/brand/data.ts
+++ b/apps/web-antd/src/views/mall/product/brand/data.ts
@@ -1,5 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -22,12 +22,18 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '品牌名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入品牌名称',
+      },
       rules: 'required',
     },
     {
       fieldName: 'picUrl',
       label: '品牌图片',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传品牌图片',
+      },
       rules: 'required',
     },
     {
@@ -38,7 +44,7 @@ export function useFormSchema(): VbenFormSchema[] {
         min: 0,
         placeholder: '请输入品牌排序',
       },
-      rules: z.number().min(0).default(1),
+      rules: 'required',
     },
     {
       fieldName: 'status',
@@ -55,6 +61,9 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'description',
       label: '品牌描述',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入品牌描述',
+      },
     },
   ];
 }
@@ -66,6 +75,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '品牌名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入品牌名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'status',
@@ -73,6 +86,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择品牌状态',
+        allowClear: true,
       },
     },
     {
@@ -88,16 +103,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns(): VxeGridPropTypes.Columns {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'name',
-      title: '分类名称',
-      fixed: 'left',
+      title: '品牌名称',
+      minWidth: 180,
     },
     {
       field: 'picUrl',
       title: '品牌图片',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
       },
@@ -105,10 +121,12 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
     {
       field: 'sort',
       title: '品牌排序',
+      minWidth: 100,
     },
     {
       field: 'status',
-      title: '开启状态',
+      title: '品牌状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -117,6 +135,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/mall/product/brand/index.vue b/apps/web-antd/src/views/mall/product/brand/index.vue
index ba9c72ac4cd44a411bf457594b6963a24bb0d70d..453bc44b1b701c53cc4387d2781794e77022d7e8 100644
--- a/apps/web-antd/src/views/mall/product/brand/index.vue
+++ b/apps/web-antd/src/views/mall/product/brand/index.vue
@@ -19,7 +19,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -40,11 +40,9 @@ async function handleDelete(row: MallBrandApi.Brand) {
     duration: 0,
   });
   try {
-    await deleteBrand(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteBrand(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -71,6 +69,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -82,7 +81,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="品牌列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/mall/product/brand/modules/form.vue b/apps/web-antd/src/views/mall/product/brand/modules/form.vue
index 079371d7a0b34fed0b218b058b3df73f363597f4..25fd13c972363d92a48e93456a361c818c8d2684 100644
--- a/apps/web-antd/src/views/mall/product/brand/modules/form.vue
+++ b/apps/web-antd/src/views/mall/product/brand/modules/form.vue
@@ -18,8 +18,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallBrandApi.Brand>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['品牌'])
-    : $t('ui.actionTitle.create', ['品牌']);
+    ? $t('ui.actionTitle.edit', ['商品品牌'])
+    : $t('ui.actionTitle.create', ['商品品牌']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -28,7 +28,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 80,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/product/category/data.ts b/apps/web-antd/src/views/mall/product/category/data.ts
index 7d41a44cfb1d26367c60e57426e1ea7443ecbd9e..6e1e1de3b660eab782c6242b46370ab099615098 100644
--- a/apps/web-antd/src/views/mall/product/category/data.ts
+++ b/apps/web-antd/src/views/mall/product/category/data.ts
@@ -31,10 +31,7 @@ export function useFormSchema(): VbenFormSchema[] {
           data.unshift({
             id: 0,
             name: '顶级分类',
-            picUrl: '',
-            sort: 0,
-            status: 0,
-          });
+          } as MallCategoryApi.Category);
           return handleTree(data);
         },
         labelField: 'name',
@@ -58,6 +55,9 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'picUrl',
       label: '移动端分类图',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传移动端分类图',
+      },
       rules: 'required',
     },
     {
@@ -68,7 +68,7 @@ export function useFormSchema(): VbenFormSchema[] {
         min: 0,
         placeholder: '请输入分类排序',
       },
-      rules: z.number().min(0).default(1),
+      rules: 'required',
     },
     {
       fieldName: 'status',
@@ -91,6 +91,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '分类名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入分类名称',
+        allowClear: true,
+      },
     },
   ];
 }
@@ -101,6 +105,7 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'name',
       title: '分类名称',
+      minWidth: 200,
       align: 'left',
       fixed: 'left',
       treeNode: true,
@@ -108,6 +113,7 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'picUrl',
       title: '移动端分类图',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
       },
@@ -115,10 +121,12 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'sort',
       title: '分类排序',
+      minWidth: 100,
     },
     {
       field: 'status',
-      title: '开启状态',
+      title: '分类状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -127,11 +135,12 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 300,
+      width: 240,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/mall/product/category/index.vue b/apps/web-antd/src/views/mall/product/category/index.vue
index 6e375dc188134337afed4ed9f1bccf5234408fd5..7733ceb0e11e4f137324a32770b477b944447bfd 100644
--- a/apps/web-antd/src/views/mall/product/category/index.vue
+++ b/apps/web-antd/src/views/mall/product/category/index.vue
@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -41,15 +41,6 @@ function handleEdit(row: MallCategoryApi.Category) {
   formModalApi.setData(row).open();
 }
 
-/** 查看商品操作 */
-const router = useRouter(); // 路由
-function handleViewSpu(id: number) {
-  router.push({
-    name: 'ProductSpu',
-    query: { categoryId: id },
-  });
-}
-
 /** 删除分类 */
 async function handleDelete(row: MallCategoryApi.Category) {
   const hideLoading = message.loading({
@@ -57,11 +48,9 @@ async function handleDelete(row: MallCategoryApi.Category) {
     duration: 0,
   });
   try {
-    await deleteCategory(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteCategory(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -69,11 +58,20 @@ async function handleDelete(row: MallCategoryApi.Category) {
 
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(false);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
+/** 查看商品操作 */
+const router = useRouter(); // 路由
+function handleViewSpu(id: number) {
+  router.push({
+    path: '/mall/product/spu',
+    query: { categoryId: id },
+  });
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -94,9 +92,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
+      search: true,
     },
     treeConfig: {
       parentField: 'parentId',
@@ -117,8 +117,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
-    <Grid>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="商品分类列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
@@ -132,16 +132,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: isExpanded ? '收缩' : '展开',
               type: 'primary',
-              onClick: toggleExpand,
+              onClick: handleExpand,
             },
           ]"
         />
       </template>
-      <template #name="{ row }">
-        <div class="flex w-full items-center gap-1">
-          <span class="flex-auto">{{ row.name }}</span>
-        </div>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-antd/src/views/mall/product/category/modules/form.vue b/apps/web-antd/src/views/mall/product/category/modules/form.vue
index b1d4877b7deb785c553ac00a80201f052b45e28d..1b0a9376d76bb84991c3665caf9cbc1cf95cd71b 100644
--- a/apps/web-antd/src/views/mall/product/category/modules/form.vue
+++ b/apps/web-antd/src/views/mall/product/category/modules/form.vue
@@ -21,8 +21,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallCategoryApi.Category>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['产品分类'])
-    : $t('ui.actionTitle.create', ['产品分类']);
+    ? $t('ui.actionTitle.edit', ['商品分类'])
+    : $t('ui.actionTitle.create', ['商品分类']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 100,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/product/comment/data.ts b/apps/web-antd/src/views/mall/product/comment/data.ts
index 9502d9b4763b83026dc9d6f9d5416c587b1263c4..b2a23a17f5ecdfca6dd19dc764a1dfab9ea883ca 100644
--- a/apps/web-antd/src/views/mall/product/comment/data.ts
+++ b/apps/web-antd/src/views/mall/product/comment/data.ts
@@ -1,7 +1,8 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallCommentApi } from '#/api/mall/product/comment';
 
+import { z } from '#/adapter/form';
 import { getSpuSimpleList } from '#/api/mall/product/spu';
 import { getRangePickerDefaultProps } from '#/utils';
 
@@ -16,6 +17,7 @@ export function useFormSchema(): VbenFormSchema[] {
         show: () => false,
       },
     },
+    // TODO @puhui999：商品的选择
     {
       fieldName: 'spuId',
       label: '商品',
@@ -24,6 +26,20 @@ export function useFormSchema(): VbenFormSchema[] {
         api: getSpuSimpleList,
         labelField: 'name',
         valueField: 'id',
+        placeholder: '请选择商品',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'skuId',
+      label: '商品规格',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请选择商品规格',
+      },
+      dependencies: {
+        triggerFields: ['spuId'],
+        show: (values) => !!values.spuId,
       },
       rules: 'required',
     },
@@ -31,31 +47,40 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'userAvatar',
       label: '用户头像',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传用户头像',
+      },
       rules: 'required',
     },
     {
       fieldName: 'userNickname',
       label: '用户名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户名称',
+      },
       rules: 'required',
     },
     {
       fieldName: 'content',
       label: '评论内容',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入评论内容',
+      },
       rules: 'required',
     },
     {
       fieldName: 'descriptionScores',
       label: '描述星级',
       component: 'Rate',
-      rules: 'required',
+      rules: z.number().min(1).max(5).default(5),
     },
     {
       fieldName: 'benefitScores',
       label: '服务星级',
       component: 'Rate',
-      rules: 'required',
+      rules: z.number().min(1).max(5).default(5),
     },
     {
       fieldName: 'picUrls',
@@ -63,6 +88,7 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'ImageUpload',
       componentProps: {
         maxNumber: 9,
+        placeholder: '请上传评论图片',
       },
       rules: 'required',
     },
@@ -81,22 +107,36 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '已回复', value: true },
           { label: '未回复', value: false },
         ],
+        placeholder: '请选择回复状态',
+        allowClear: true,
       },
     },
     {
       fieldName: 'spuName',
       label: '商品名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入商品名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'userNickname',
       label: '用户名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'orderId',
       label: '订单编号',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入订单编号',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'createTime',
@@ -110,23 +150,24 @@ export function useGridFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 表格列配置 */
-// TODO @xingyu：列表的宽度需要优化下，样式~
-export function useGridColumns<T = MallCommentApi.Comment>(
+/** 列表的字段 */
+export function useGridColumns(
   onStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: MallCommentApi.Comment,
   ) => PromiseLike<boolean | undefined>,
-): VxeGridPropTypes.Columns {
+): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
       title: '评论编号',
       fixed: 'left',
+      minWidth: 80,
     },
     {
       field: 'skuPicUrl',
       title: '商品图片',
+      minWidth: 100,
       cellRender: {
         name: 'CellImage',
       },
@@ -134,7 +175,7 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'spuName',
       title: '商品名称',
-      minWidth: 200,
+      minWidth: 250,
     },
     {
       field: 'skuProperties',
@@ -151,22 +192,33 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'userNickname',
       title: '用户名称',
+      minWidth: 100,
     },
     {
       field: 'descriptionScores',
       title: '商品评分',
+      minWidth: 150,
+      slots: {
+        default: 'descriptionScores',
+      },
     },
     {
       field: 'benefitScores',
       title: '服务评分',
+      minWidth: 150,
+      slots: {
+        default: 'benefitScores',
+      },
     },
     {
       field: 'content',
       title: '评论内容',
+      minWidth: 210,
     },
     {
       field: 'picUrls',
       title: '评论图片',
+      minWidth: 120,
       cellRender: {
         name: 'CellImages',
       },
@@ -174,15 +226,18 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'replyContent',
       title: '回复内容',
+      minWidth: 250,
     },
     {
       field: 'createTime',
       title: '评论时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'visible',
       title: '是否展示',
+      minWidth: 110,
       align: 'center',
       cellRender: {
         attrs: { beforeChange: onStatusChange },
diff --git a/apps/web-antd/src/views/mall/product/comment/index.vue b/apps/web-antd/src/views/mall/product/comment/index.vue
index 66f750a84988679a747d49409838a2a638bb261f..cbae411d406226ccaf859d1eab64a45fa6b600c5 100644
--- a/apps/web-antd/src/views/mall/product/comment/index.vue
+++ b/apps/web-antd/src/views/mall/product/comment/index.vue
@@ -6,7 +6,7 @@ import { h } from 'vue';
 
 import { confirm, DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui';
 
-import { message, Textarea } from 'ant-design-vue';
+import { message, Rate, Textarea } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -38,7 +38,9 @@ function handleCreate() {
 function handleReply(row: MallCommentApi.Comment) {
   prompt({
     component: () => {
-      return h(Textarea, {});
+      return h(Textarea, {
+        placeholder: '请输入回复内容',
+      });
     },
     content: row.content
       ? `用户评论：${row.content}\n请输入回复内容：`
@@ -48,10 +50,10 @@ function handleReply(row: MallCommentApi.Comment) {
   }).then(async (val) => {
     if (val) {
       await replyComment({
-        id: row.id as number,
+        id: row.id!,
         replyContent: val,
       });
-      onRefresh();
+      handleRefresh();
     }
   });
 }
@@ -64,12 +66,12 @@ async function handleStatusChange(
   return new Promise((resolve, reject) => {
     const text = newStatus ? '展示' : '隐藏';
     confirm({
-      content: `确认要${text + row.id}评论吗?`,
+      content: `确认要${text}该评论吗？`,
     })
       .then(async () => {
         // 更新状态
         const res = await updateCommentVisible({
-          id: row.id as number,
+          id: row.id!,
           visible: newStatus,
         });
         if (res) {
@@ -107,6 +109,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -124,8 +127,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/mall/product-comment/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="评论列表">
+      <template #descriptionScores="{ row }">
+        <Rate v-model:value="row.descriptionScores" :disabled="true" />
+      </template>
+      <template #benefitScores="{ row }">
+        <Rate v-model:value="row.benefitScores" :disabled="true" />
+      </template>
       <template #toolbar-tools>
         <TableAction
           :actions="[
diff --git a/apps/web-antd/src/views/mall/product/comment/modules/form.vue b/apps/web-antd/src/views/mall/product/comment/modules/form.vue
index 327ee15d4e5a522bf285bf8635bf9ab50d4e0a56..e0098368924e48dca78bae0bfa594190c2bb4a8f 100644
--- a/apps/web-antd/src/views/mall/product/comment/modules/form.vue
+++ b/apps/web-antd/src/views/mall/product/comment/modules/form.vue
@@ -18,8 +18,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallCommentApi.Comment>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['品牌'])
-    : $t('ui.actionTitle.create', ['品牌']);
+    ? $t('ui.actionTitle.edit', ['虚拟评论'])
+    : $t('ui.actionTitle.create', ['虚拟评论']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-antd/src/views/mall/product/property/data.ts b/apps/web-antd/src/views/mall/product/property/data.ts
index d24e62e45f0fb20cc080f741e83eaad2c62fc85c..e8c3b20805bbfe408d2904638fd60ea253b74a90 100644
--- a/apps/web-antd/src/views/mall/product/property/data.ts
+++ b/apps/web-antd/src/views/mall/product/property/data.ts
@@ -2,10 +2,11 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { getPropertySimpleList } from '#/api/mall/product/property';
+import { getRangePickerDefaultProps } from '#/utils';
 
 // ============================== 属性 ==============================
 
-/** 类型新增/修改的表单 */
+/** 属性新增/修改的表单 */
 export function usePropertyFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -18,10 +19,10 @@ export function usePropertyFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性名称',
       },
       rules: 'required',
     },
@@ -36,53 +37,66 @@ export function usePropertyFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 类型列表的搜索表单 */
+/** 属性列表的搜索表单 */
 export function usePropertyGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性名称',
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
         allowClear: true,
       },
     },
   ];
 }
 
-/** 类型列表的字段 */
+/** 属性列表的字段 */
 export function usePropertyGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '属性编号',
+      minWidth: 100,
     },
     {
       field: 'name',
-      title: '名称',
+      title: '属性名称',
+      minWidth: 200,
     },
     {
       field: 'remark',
       title: '备注',
+      minWidth: 180,
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 160,
+      minWidth: 120,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-// ============================== 值数据 ==============================
+// ============================== 属性值 ==============================
 
-/** 数据新增/修改的表单 */
+/** 属性值新增/修改的表单 */
 export function useValueFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -95,11 +109,12 @@ export function useValueFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'propertyId',
-      label: '属性编号',
+      label: '属性',
       component: 'ApiSelect',
       componentProps: (values) => {
         return {
           api: getPropertySimpleList,
+          placeholder: '请选择属性',
           labelField: 'name',
           valueField: 'id',
           disabled: !!values.id,
@@ -112,10 +127,10 @@ export function useValueFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性值名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性值名称',
       },
       rules: 'required',
     },
@@ -130,45 +145,61 @@ export function useValueFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 字典数据列表搜索表单 */
+/** 属性值列表搜索表单 */
 export function useValueGridFormSchema(): VbenFormSchema[] {
   return [
+    {
+      fieldName: 'propertyId',
+      label: '属性项',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getPropertySimpleList,
+        placeholder: '请选择属性项',
+        labelField: 'name',
+        valueField: 'id',
+        disabled: true,
+        allowClear: false,
+      },
+    },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性值名称',
       component: 'Input',
       componentProps: {
+        placeholder: '请输入属性值名称',
         allowClear: true,
       },
     },
   ];
 }
 
-/**
- * 字典数据表格列
- */
+/** 属性值表格列 */
 export function useValueGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '属性值编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '属性值名称',
+      minWidth: 180,
     },
     {
       field: 'remark',
       title: '备注',
+      minWidth: 180,
     },
     {
       title: '创建时间',
       field: 'createTime',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 160,
+      minWidth: 120,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/mall/product/property/index.vue b/apps/web-antd/src/views/mall/product/property/index.vue
index 97036c490e405fe576ce7e5d18ad80c086c7f8f3..302b0a3205bffaf024fe06a4cce4b722cf6f091a 100644
--- a/apps/web-antd/src/views/mall/product/property/index.vue
+++ b/apps/web-antd/src/views/mall/product/property/index.vue
@@ -6,7 +6,7 @@ import { DocAlert, Page } from '@vben/common-ui';
 import PropertyGrid from './modules/property-grid.vue';
 import ValueGrid from './modules/value-grid.vue';
 
-const searchPropertyId = ref<number>(); // 搜索的属性ID
+const searchPropertyId = ref<number>(); // 搜索的属性 ID
 
 function handlePropertyIdSelect(propertyId: number) {
   searchPropertyId.value = propertyId;
diff --git a/apps/web-antd/src/views/mall/product/property/modules/property-grid.vue b/apps/web-antd/src/views/mall/product/property/modules/property-grid.vue
index 8c2347e2f2a3e319b27c609e020febdfa14e829f..73aa359b6314dffa1896fef01bbc8e9051440095 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/property-grid.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/property-grid.vue
@@ -1,8 +1,5 @@
 <script lang="ts" setup>
-import type {
-  VxeGridListeners,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallPropertyApi } from '#/api/mall/product/property';
 
 import { useVbenModal } from '@vben/common-ui';
@@ -24,7 +21,7 @@ const [PropertyFormModal, propertyFormModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -34,7 +31,7 @@ function handleCreate() {
 }
 
 /** 编辑属性 */
-function handleEdit(row: any) {
+function handleEdit(row: MallPropertyApi.Property) {
   propertyFormModalApi.setData(row).open();
 }
 
@@ -45,23 +42,14 @@ async function handleDelete(row: MallPropertyApi.Property) {
     duration: 0,
   });
   try {
-    await deleteProperty(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteProperty(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 表格事件 */
-const gridEvents: VxeGridListeners<MallPropertyApi.Property> = {
-  cellClick: ({ row }) => {
-    emit('select', row.id);
-  },
-};
-
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: usePropertyGridFormSchema(),
@@ -84,20 +72,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
     rowConfig: {
       keyField: 'id',
       isCurrent: true,
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
   } as VxeTableGridOptions<MallPropertyApi.Property>,
-  gridEvents,
+  gridEvents: {
+    cellClick: ({ row }: { row: MallPropertyApi.Property }) => {
+      emit('select', row.id);
+    },
+  },
 });
 </script>
 
 <template>
   <div class="h-full">
-    <PropertyFormModal @success="onRefresh" />
-
+    <PropertyFormModal @success="handleRefresh" />
     <Grid table-title="属性列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
index 1d4e4eef24d3c4cce242f4a5dbea6b71a92b3d6c..6c01434b35b52f4c2982599ebbd948ebe289aa0c 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/value-form.vue
@@ -67,25 +67,19 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<
-      MallPropertyApi.PropertyValue | { propertyId?: string }
-    >();
-
-    // 如果有ID，表示是编辑
-    if (data && 'id' in data && data.id) {
-      modalApi.lock();
-      try {
-        formData.value = await getPropertyValue(data.id);
-        // 设置到 values
-        await formApi.setValues(formData.value);
-      } finally {
-        modalApi.unlock();
-      }
-    } else if (data && 'propertyId' in data && data.propertyId) {
-      // 新增时，如果传入了propertyId，则需要设置
-      await formApi.setValues({
-        propertyId: data.propertyId,
-      });
+    const data = modalApi.getData<MallPropertyApi.PropertyValue>();
+    if (!data || !data.id) {
+      // 设置 propertyId
+      await formApi.setValues(data);
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getPropertyValue(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-antd/src/views/mall/product/property/modules/value-grid.vue b/apps/web-antd/src/views/mall/product/property/modules/value-grid.vue
index 5dfc451fda4b2b6058b6c6e895abad5562213c75..c95d29cfcab365318a891a6a6cba3f0b5bd362e2 100644
--- a/apps/web-antd/src/views/mall/product/property/modules/value-grid.vue
+++ b/apps/web-antd/src/views/mall/product/property/modules/value-grid.vue
@@ -31,32 +31,30 @@ const [ValueFormModal, valueFormModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 创建字典数据 */
+/** 创建属性值 */
 function handleCreate() {
   valueFormModalApi.setData({ propertyId: props.propertyId }).open();
 }
 
-/** 编辑字典数据 */
+/** 编辑属性值 */
 function handleEdit(row: MallPropertyApi.PropertyValue) {
   valueFormModalApi.setData(row).open();
 }
 
-/** 删除字典数据 */
+/** 删除属性值 */
 async function handleDelete(row: MallPropertyApi.PropertyValue) {
   const hideLoading = message.loading({
     content: $t('ui.actionMessage.deleting', [row.name]),
     duration: 0,
   });
   try {
-    await deletePropertyValue(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deletePropertyValue(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -84,6 +82,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -92,20 +91,23 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MallPropertyApi.PropertyValue>,
 });
 
-/** 监听 dictType 变化，重新查询 */
+/** 监听 propertyId 变化，重新查询 */
 watch(
   () => props.propertyId,
-  () => {
-    if (props.propertyId) {
-      onRefresh();
+  (newPropertyId) => {
+    if (newPropertyId) {
+      // 设置搜索表单中的 propertyId
+      gridApi.formApi.setValues({ propertyId: newPropertyId });
+      handleRefresh();
     }
   },
+  { immediate: true },
 );
 </script>
 
 <template>
   <div class="flex h-full flex-col">
-    <ValueFormModal @success="onRefresh" />
+    <ValueFormModal @success="handleRefresh" />
 
     <Grid table-title="属性值列表">
       <template #toolbar-tools>
diff --git a/apps/web-antd/src/views/mall/product/spu/data.ts b/apps/web-antd/src/views/mall/product/spu/data.ts
index 6ceb265ea3d7d6c1d00a561d5a892c81f2c3e98a..138a2b53c9d118437936af5f90637ef6ef3447dc 100644
--- a/apps/web-antd/src/views/mall/product/spu/data.ts
+++ b/apps/web-antd/src/views/mall/product/spu/data.ts
@@ -40,10 +40,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallSpuApi.Spu>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSpuApi.Spu,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts
index bce62ae0d2f4ddebd0d0ef9e5d20bca9202fddc8..cd9ffa8b3d85b94bbb7cd2552714d6ac1b8ae681 100644
--- a/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts
+++ b/apps/web-antd/src/views/mall/promotion/seckill/config/data.ts
@@ -91,10 +91,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns<T = MallSeckillConfigApi.SeckillConfig>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSeckillConfigApi.SeckillConfig,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts
index 460d9d5865eabf70012bd70f6a5169ba5bf00271..a4b82497b8ffa7d03ac9b295efccae45b65f4e3f 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts
+++ b/apps/web-antd/src/views/mall/trade/brokerage/record/data.ts
@@ -1,10 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { fenToYuan } from '@vben/utils';
-
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { fenToYuan } from '@vben/utils';
 
 import { getRangePickerDefaultProps } from '#/utils';
 
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue
index 17a2ad3963ae9d27e1631b299cb966c2188262d8..a9596487424fe8f5d98bda075f70c2914c31931e 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/record/index.vue
@@ -19,7 +19,6 @@ const [Grid] = useVbenVxeGrid({
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
index 72c89bc7d24117cae95018710946136352743131..bf7a66a72c7774aa2ffcf0e85ede7caaad13ddea 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/data.ts
@@ -1,6 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 import { fenToYuan } from '@vben/utils';
 
 import { getRangePickerDefaultProps } from '#/utils';
@@ -29,6 +32,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '无', value: false },
         ],
       },
+      defaultValue: true,
     },
     {
       fieldName: 'createTime',
@@ -43,7 +47,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns(
+  onBrokerageEnabledChange?: (
+    newEnabled: boolean,
+    row: MallBrokerageUserApi.BrokerageUser,
+  ) => PromiseLike<boolean | undefined>,
+): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
@@ -56,11 +65,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 70,
       cellRender: {
         name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-          shape: 'circle',
-        },
       },
     },
     {
@@ -111,7 +115,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'brokerageEnabled',
       title: '推广资格',
       minWidth: 80,
-      slots: { default: 'brokerageEnabled' },
+      align: 'center',
+      cellRender: {
+        attrs: { beforeChange: onBrokerageEnabledChange },
+        name: 'CellSwitch',
+        props: {
+          checkedValue: true,
+          uncheckedValue: false,
+          checkedChildren: '有',
+          unCheckedChildren: '无',
+        },
+      },
     },
     {
       field: 'brokerageTime',
@@ -138,3 +152,207 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
+
+/** 创建分销员表单配置 */
+export function useCreateFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'userId',
+      label: '分销员编号',
+      component: 'InputSearch',
+      rules: 'required',
+    },
+    {
+      fieldName: 'bindUserId',
+      label: '上级推广员编号',
+      component: 'InputSearch',
+      rules: 'required',
+    },
+  ];
+}
+
+/** 修改分销用户表单配置 */
+export function useUpdateFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'bindUserId',
+      label: '上级推广员编号',
+      component: 'InputSearch',
+      rules: 'required',
+    },
+  ];
+}
+
+/** 用户列表弹窗搜索表单配置 */
+export function useUserListFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'level',
+      label: '用户类型',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '全部', value: undefined },
+          { label: '一级推广人', value: '1' },
+          { label: '二级推广人', value: '2' },
+        ],
+        allowClear: true,
+      },
+    },
+    {
+      fieldName: 'bindUserTime',
+      label: '绑定时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 用户列表弹窗表格列配置 */
+export function useUserListColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '用户编号',
+      minWidth: 80,
+    },
+    {
+      field: 'avatar',
+      title: '头像',
+      minWidth: 70,
+      cellRender: {
+        name: 'CellImage',
+        props: {
+          width: 24,
+          height: 24,
+          shape: 'circle',
+        },
+      },
+    },
+    {
+      field: 'nickname',
+      title: '昵称',
+      minWidth: 80,
+    },
+    {
+      field: 'brokerageUserCount',
+      title: '推广人数',
+      minWidth: 80,
+    },
+    {
+      field: 'brokerageOrderCount',
+      title: '推广订单数量',
+      minWidth: 110,
+    },
+    {
+      field: 'brokerageEnabled',
+      title: '推广资格',
+      minWidth: 80,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'bindUserTime',
+      title: '绑定时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
+
+/** 推广订单列表弹窗搜索表单配置 */
+export function useOrderListFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sourceUserLevel',
+      label: '用户类型',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '全部', value: 0 },
+          { label: '一级推广人', value: 1 },
+          { label: '二级推广人', value: 2 },
+        ],
+      },
+      defaultValue: 0,
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        placeholder: '请选择状态',
+        allowClear: true,
+        options: getDictOptions(DICT_TYPE.BROKERAGE_RECORD_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        allowClear: true,
+      },
+    },
+  ];
+}
+
+/** 推广订单列表弹窗表格列配置 */
+export function useOrderListColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'bizId',
+      title: '订单编号',
+      minWidth: 80,
+    },
+    {
+      field: 'sourceUserId',
+      title: '用户编号',
+      minWidth: 80,
+    },
+    {
+      field: 'sourceUserAvatar',
+      title: '头像',
+      minWidth: 70,
+      cellRender: {
+        name: 'CellImage',
+        props: {
+          width: 24,
+          height: 24,
+        },
+      },
+    },
+    {
+      field: 'sourceUserNickname',
+      title: '昵称',
+      minWidth: 80,
+    },
+    {
+      field: 'price',
+      title: '佣金',
+      minWidth: 100,
+      formatter: ({ row }) => `￥${fenToYuan(row.price)}`,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 85,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.BROKERAGE_RECORD_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
index 3d6276e9fc4f24a4c98b9a7940d5ec91d1677203..b0e4217ed0687e573be7494621a0dd627c483686 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/index.vue
@@ -2,11 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { useAccess } from '@vben/access';
-import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
+import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
-import { message, Switch } from 'ant-design-vue';
+import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -16,99 +15,102 @@ import {
 } from '#/api/mall/trade/brokerage/user';
 
 import { useGridColumns, useGridFormSchema } from './data';
+import CreateForm from './modules/create-form.vue';
 import BrokerageOrderListModal from './modules/order-list-modal.vue';
-import BrokerageUserCreateForm from './modules/user-create-form.vue';
+import UpdateForm from './modules/update-form.vue';
 import BrokerageUserListModal from './modules/user-list-modal.vue';
-import BrokerageUserUpdateForm from './modules/user-update-form.vue';
 
 defineOptions({ name: 'TradeBrokerageUser' });
 
-const { hasAccessByCodes } = useAccess();
-
-/** 刷新表格 */
-function onRefresh() {
-  gridApi.query();
-}
+const [CreateFormModal, createFormModalApi] = useVbenModal({
+  connectedComponent: CreateForm,
+  destroyOnClose: true,
+});
 
-const [OrderListModal, OrderListModalApi] = useVbenModal({
-  connectedComponent: BrokerageOrderListModal,
+const [UpdateFormModal, updateModalApi] = useVbenModal({
+  connectedComponent: UpdateForm,
+  destroyOnClose: true,
 });
 
-const [UserCreateModal, UserCreateModalApi] = useVbenModal({
-  connectedComponent: BrokerageUserCreateForm,
+const [OrderListModal, orderListModalApi] = useVbenModal({
+  connectedComponent: BrokerageOrderListModal,
+  destroyOnClose: true,
 });
 
-const [UserListModal, UserListModalApi] = useVbenModal({
+const [UserListModal, userListModalApi] = useVbenModal({
   connectedComponent: BrokerageUserListModal,
+  destroyOnClose: true,
 });
 
-const [UserUpdateModal, UserUpdateModalApi] = useVbenModal({
-  connectedComponent: BrokerageUserUpdateForm,
-});
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
 
-/** 打开推广人列表 */
-function openBrokerageUserTable(row: MallBrokerageUserApi.BrokerageUser) {
-  UserListModalApi.setData(row).open();
+/** 创建分销员 */
+function handleCreate() {
+  createFormModalApi.open();
 }
 
-/** 打开推广订单列表 */
-function openBrokerageOrderTable(row: MallBrokerageUserApi.BrokerageUser) {
-  OrderListModalApi.setData(row).open();
+/** 修改分销员 */
+function handleUpdateForm(row: MallBrokerageUserApi.BrokerageUser) {
+  updateModalApi.setData(row).open();
 }
 
-/** 打开表单：修改上级推广人 */
-function openUpdateBindUserForm(row: MallBrokerageUserApi.BrokerageUser) {
-  UserUpdateModalApi.setData(row).open();
+/** 打开推广人列表 */
+function handleOpenUserList(row: MallBrokerageUserApi.BrokerageUser) {
+  userListModalApi.setData(row).open();
 }
 
-/** 创建分销员 */
-function openCreateUserForm() {
-  UserCreateModalApi.open();
+/** 打开推广订单列表 */
+function handleOpenOrderList(row: MallBrokerageUserApi.BrokerageUser) {
+  orderListModalApi.setData(row).open();
 }
 
 /** 清除上级推广人 */
 async function handleClearBindUser(row: MallBrokerageUserApi.BrokerageUser) {
   const hideLoading = message.loading({
-    content: `正在清除"${row.nickname}"的上级推广人...`,
-    key: 'clear_bind_user_msg',
+    content: $t('ui.actionMessage.deleting', [row.nickname]),
+    duration: 0,
   });
   try {
-    await clearBindUser({ id: row.id as number });
-    message.success({
-      content: '清除成功',
-      key: 'clear_bind_user_msg',
-    });
-    onRefresh();
+    await clearBindUser({ id: row.id! });
+    message.success($t('ui.actionMessage.deleteSuccess', [row.nickname]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
 }
 
-/** 推广资格：开通/关闭 */
+/** 更新推广资格 */
 async function handleBrokerageEnabledChange(
+  newEnabled: boolean,
   row: MallBrokerageUserApi.BrokerageUser,
-) {
-  const text = row.brokerageEnabled ? '开通' : '关闭';
-  const hideLoading = message.loading({
-    content: `正在${text}"${row.nickname}"的推广资格...`,
-    key: 'brokerage_enabled_msg',
+): Promise<boolean | undefined> {
+  return new Promise((resolve, reject) => {
+    const text = newEnabled ? '开通' : '关闭';
+    confirm({
+      content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
+    })
+      .then(async () => {
+        // 更新推广资格
+        const res = await updateBrokerageEnabled({
+          id: row.id!,
+          enabled: newEnabled,
+        });
+        if (res) {
+          // 提示并返回成功
+          message.success($t('ui.actionMessage.operationSuccess'));
+          handleRefresh();
+          resolve(true);
+        } else {
+          reject(new Error('更新失败'));
+        }
+      })
+      .catch(() => {
+        reject(new Error('取消操作'));
+      });
   });
-  try {
-    await updateBrokerageEnabled({
-      id: row.id as number,
-      enabled: row.brokerageEnabled as boolean,
-    });
-    message.success({
-      content: `${text}成功`,
-      key: 'brokerage_enabled_msg',
-    });
-    onRefresh();
-  } catch {
-    // 异常时，需要重置回之前的值
-    row.brokerageEnabled = !row.brokerageEnabled;
-  } finally {
-    hideLoading();
-  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -116,10 +118,9 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(),
+    columns: useGridColumns(handleBrokerageEnabledChange),
     height: 'auto',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -152,6 +153,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
+    <!-- 创建分销员 -->
+    <CreateFormModal @success="handleRefresh" />
+    <!-- 修改分销员 -->
+    <UpdateFormModal @success="handleRefresh" />
+    <!-- 推广人列表 -->
+    <UserListModal />
+    <!-- 推广订单列表 -->
+    <OrderListModal />
     <Grid table-title="分销用户列表">
       <template #toolbar-tools>
         <TableAction
@@ -161,24 +170,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['trade:brokerage-user:create'],
-              onClick: openCreateUserForm,
+              onClick: handleCreate,
             },
           ]"
         />
       </template>
-
-      <template #brokerageEnabled="{ row }">
-        <Switch
-          v-model:checked="row.brokerageEnabled"
-          :disabled="
-            !hasAccessByCodes(['trade:brokerage-user:update-bind-user'])
-          "
-          checked-children="有"
-          un-checked-children="无"
-          @change="handleBrokerageEnabledChange(row)"
-        />
-      </template>
-
       <template #actions="{ row }">
         <TableAction
           :drop-down-actions="[
@@ -186,38 +182,30 @@ const [Grid, gridApi] = useVbenVxeGrid({
               label: '推广人',
               type: 'link',
               auth: ['trade:brokerage-user:user-query'],
-              onClick: openBrokerageUserTable.bind(null, row),
+              onClick: handleOpenUserList.bind(null, row),
             },
             {
               label: '推广订单',
               type: 'link',
               auth: ['trade:brokerage-user:order-query'],
-              onClick: openBrokerageOrderTable.bind(null, row),
+              onClick: handleOpenOrderList.bind(null, row),
             },
             {
               label: '修改上级推广人',
               type: 'link',
               auth: ['trade:brokerage-user:update-bind-user'],
-              onClick: openUpdateBindUserForm.bind(null, row),
+              onClick: handleUpdateForm.bind(null, row),
             },
             {
               label: '清除上级推广人',
               type: 'link',
               auth: ['trade:brokerage-user:clear-bind-user'],
+              ifShow: !!row.bindUserId,
               onClick: handleClearBindUser.bind(null, row),
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 修改上级推广人表单 -->
-    <UserUpdateModal @success="onRefresh" />
-    <!-- 推广人列表 -->
-    <UserListModal />
-    <!-- 推广订单列表 -->
-    <OrderListModal />
-    <!-- 创建分销员 -->
-    <UserCreateModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/create-form.vue
similarity index 33%
rename from apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
rename to apps/web-antd/src/views/mall/trade/brokerage/user/modules/create-form.vue
index 0f13afc966dcacb88109818b832e9fc02ac160a7..501883f623e1058c87445a309bbad6053edf49b2 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/create-form.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
 import { $t } from '@vben/locales';
 import { formatDate, isEmpty } from '@vben/utils';
 
@@ -11,16 +12,20 @@ import {
   Avatar,
   Descriptions,
   DescriptionsItem,
+  Divider,
   InputSearch,
   message,
-  Tag,
 } from 'ant-design-vue';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   createBrokerageUser,
   getBrokerageUser,
 } from '#/api/mall/trade/brokerage/user';
 import { getUser } from '#/api/member/user';
+import { DictTag } from '#/components/dict-tag';
+
+import { useCreateFormSchema } from '../data';
 
 defineOptions({ name: 'BrokerageUserCreateForm' });
 
@@ -31,9 +36,24 @@ const formData = ref<any>({
   bindUserId: undefined,
 });
 
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useCreateFormSchema(),
+  showDefaultActions: false,
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (!formData.value) {
+    await formApi.setValues(formData.value);
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
@@ -52,116 +72,97 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 重置表单
     formData.value = {
       userId: undefined,
       bindUserId: undefined,
     };
+    await formApi.setValues(formData.value);
+    // 重置用户信息
+    user.value = undefined;
+    bindUser.value = undefined;
   },
 });
 
 /** 用户信息 */
-const userInfo = reactive<{
-  bindUser: MallBrokerageUserApi.BrokerageUser | undefined;
-  user: MallBrokerageUserApi.BrokerageUser | undefined;
-}>({
-  bindUser: undefined,
-  user: undefined,
-});
+const user = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
+const bindUser = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
 
-/** 查询推广员和分销员 */
-async function handleGetUser(id: any, userType: string) {
+/** 查询分销员和分销员 */
+async function handleSearchUser(id: number, userType: string) {
   if (isEmpty(id)) {
     message.warning(`请先输入${userType}编号后重试！！！`);
     return;
   }
   if (
-    userType === '推广员' &&
+    userType === '分销员' &&
     formData.value?.bindUserId === formData.value?.userId
   ) {
-    message.error('不能绑定自己为推广人');
+    message.error('不能绑定自己为推广员');
     return;
   }
 
-  try {
-    const user =
-      userType === '推广员' ? await getBrokerageUser(id) : await getUser(id);
-    if (userType === '推广员') {
-      userInfo.bindUser = user as MallBrokerageUserApi.BrokerageUser;
-    } else {
-      userInfo.user = user as MallBrokerageUserApi.BrokerageUser;
-    }
-
-    if (!user) {
-      message.warning(`${userType}不存在`);
-    }
-  } catch {
+  const userData =
+    userType === '分销员' ? await getUser(id) : await getBrokerageUser(id);
+  if (!userData) {
     message.warning(`${userType}不存在`);
+    return;
+  }
+  if (userType === '分销员') {
+    user.value = userData as MallBrokerageUserApi.BrokerageUser;
+  } else {
+    bindUser.value = userData as MallBrokerageUserApi.BrokerageUser;
   }
 }
 </script>
 
 <template>
-  <Modal title="创建分销员" class="w-2/5">
-    <!-- TODO @霖：宽度不够，label 会折行 -->
-    <div class="mr-2 flex items-center">
-      分销员编号：
-      <InputSearch
-        v-model:value="formData.userId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser(formData?.userId, '分销员')"
-      />
-      上级推广人编号：
-      <InputSearch
-        v-model:value="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser(formData?.bindUserId, '推广员')"
-      />
-    </div>
+  <Modal title="创建分销员" class="w-1/3">
+    <Form>
+      <template #userId>
+        <InputSearch
+          v-model:value="formData.userId"
+          placeholder="请输入分销员编号"
+          @search="handleSearchUser(formData.userId, '分销员')"
+        />
+      </template>
+      <template #bindUserId>
+        <InputSearch
+          v-model:value="formData.bindUserId"
+          placeholder="请输入上级分销员编号"
+          @search="handleSearchUser(formData.bindUserId, '上级分销员')"
+        />
+      </template>
+    </Form>
 
-    <div class="mt-4">
-      <!-- 展示分销员的信息 -->
-      <Descriptions
-        title="分销员信息"
-        class="mt-4"
-        v-if="userInfo.user"
-        :column="1"
-        bordered
-      >
-        <DescriptionsItem label="头像">
-          <Avatar :src="userInfo.user?.avatar" />
-        </DescriptionsItem>
-        <DescriptionsItem label="昵称">
-          {{ userInfo.user?.nickname }}
-        </DescriptionsItem>
-      </Descriptions>
-      <!-- 展示上级推广人的信息 -->
-      <Descriptions
-        title="上级推广人信息"
-        class="mt-4"
-        v-if="userInfo.bindUser"
-        :column="1"
-        bordered
-      >
-        <DescriptionsItem label="头像">
-          <Avatar :src="userInfo.bindUser?.avatar" />
-        </DescriptionsItem>
-        <DescriptionsItem label="昵称">
-          {{ userInfo.bindUser?.nickname }}
-        </DescriptionsItem>
-        <DescriptionsItem label="推广资格">
-          <Tag v-if="userInfo.bindUser?.brokerageEnabled" color="success">
-            有
-          </Tag>
-          <Tag v-else>无</Tag>
-        </DescriptionsItem>
-        <DescriptionsItem label="成为推广员的时间">
-          {{ formatDate(userInfo.bindUser?.brokerageTime) }}
-        </DescriptionsItem>
-      </Descriptions>
-    </div>
+    <!-- 分销员信息展示 -->
+    <Divider v-if="user" />
+    <Descriptions v-if="user" title="分销员信息" :column="1" bordered>
+      <DescriptionsItem label="头像">
+        <Avatar :src="user?.avatar" />
+      </DescriptionsItem>
+      <DescriptionsItem label="昵称">
+        {{ user?.nickname }}
+      </DescriptionsItem>
+    </Descriptions>
+    <!-- 上级推广员信息展示 -->
+    <Divider v-if="bindUser" />
+    <Descriptions v-if="bindUser" title="上级推广员信息" :column="1" bordered>
+      <DescriptionsItem label="头像">
+        <Avatar :src="bindUser?.avatar" />
+      </DescriptionsItem>
+      <DescriptionsItem label="昵称">
+        {{ bindUser?.nickname }}
+      </DescriptionsItem>
+      <DescriptionsItem label="分销资格">
+        <DictTag
+          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :value="bindUser?.brokerageEnabled"
+        />
+      </DescriptionsItem>
+      <DescriptionsItem label="成为分销员的时间">
+        {{ formatDate(bindUser?.brokerageTime) }}
+      </DescriptionsItem>
+    </Descriptions>
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
index c9742b6ae31cb663199930c27505b6de981da466..7e9520fe5d10f06e1b25d2f2943deaff6d5cb685 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
@@ -1,158 +1,35 @@
 <script lang="ts" setup>
-import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageRecordApi } from '#/api/mall/trade/brokerage/record';
-import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
-
-import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { BrokerageRecordBizTypeEnum, DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-import { fenToYuan } from '@vben/utils';
+import { BrokerageRecordBizTypeEnum } from '@vben/constants';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';
-import { getRangePickerDefaultProps } from '#/utils';
+
+import { useOrderListColumns, useOrderListFormSchema } from '../data';
 
 /** 推广订单列表 */
 defineOptions({ name: 'BrokerageOrderListModal' });
 
-const userId = ref<number>();
-
-const [Modal, modalApi] = useVbenModal({
-  async onOpenChange(isOpen: boolean) {
-    if (!isOpen) {
-      userId.value = undefined;
-      return;
-    }
-    // 加载数据
-    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
-    if (!data || !data.id) {
-      return;
-    }
-    modalApi.lock();
-    try {
-      userId.value = data.id;
-      // 等待弹窗打开后再查询
-      setTimeout(() => {
-        gridApi.query();
-      }, 100);
-    } finally {
-      modalApi.unlock();
-    }
-  },
-});
-
-/** 搜索表单配置 */
-function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'sourceUserLevel',
-      label: '用户类型',
-      component: 'Select',
-      componentProps: {
-        options: [
-          { label: '全部', value: 0 },
-          { label: '一级推广人', value: 1 },
-          { label: '二级推广人', value: 2 },
-        ],
-      },
-      defaultValue: 0,
-    },
-    {
-      fieldName: 'status',
-      label: '状态',
-      component: 'Select',
-      componentProps: {
-        placeholder: '请选择状态',
-        allowClear: true,
-        options: getDictOptions(DICT_TYPE.BROKERAGE_RECORD_STATUS, 'number'),
-      },
-    },
-    {
-      fieldName: 'createTime',
-      label: '创建时间',
-      component: 'RangePicker',
-      componentProps: {
-        ...getRangePickerDefaultProps(),
-        allowClear: true,
-      },
-    },
-  ];
-}
-
-/** 表格列配置 */
-function useColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'bizId',
-      title: '订单编号',
-      minWidth: 80,
-    },
-    {
-      field: 'sourceUserId',
-      title: '用户编号',
-      minWidth: 80,
-    },
-    {
-      field: 'sourceUserAvatar',
-      title: '头像',
-      minWidth: 70,
-      cellRender: {
-        name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-        },
-      },
-    },
-    {
-      field: 'sourceUserNickname',
-      title: '昵称',
-      minWidth: 80,
-    },
-    {
-      field: 'price',
-      title: '佣金',
-      minWidth: 100,
-      formatter: ({ row }) => `￥${fenToYuan(row.price)}`,
-    },
-    {
-      field: 'status',
-      title: '状态',
-      minWidth: 85,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.BROKERAGE_RECORD_STATUS },
-      },
-    },
-    {
-      field: 'createTime',
-      title: '创建时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
+const [Modal, modalApi] = useVbenModal({});
 
-const [Grid, gridApi] = useVbenVxeGrid({
+const [Grid] = useVbenVxeGrid({
   formOptions: {
-    schema: useFormSchema(),
+    schema: useOrderListFormSchema(),
   },
   gridOptions: {
-    columns: useColumns(),
+    columns: useOrderListColumns(),
     height: '600',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          // 处理全部的情况
           const params = {
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            userId: userId.value,
+            userId: modalApi.getData()?.id,
             bizType: BrokerageRecordBizTypeEnum.ORDER.type,
             sourceUserLevel:
               formValues.sourceUserLevel === 0
@@ -179,6 +56,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Modal title="推广订单列表" class="w-3/5">
-    <Grid table-title="推广订单列表" />
+    <Grid />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
similarity index 42%
rename from apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
rename to apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
index 4f2fe59e886024d1f2ace5db30f2cada4233a0eb..cdb9695f241303140df5dc277ee2a60812aa19d6 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/update-form.vue
@@ -4,38 +4,55 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
 import { $t } from '@vben/locales';
-import { formatDate } from '@vben/utils';
+import { formatDate, isEmpty } from '@vben/utils';
 
 import {
   Avatar,
   Descriptions,
   DescriptionsItem,
+  Divider,
   InputSearch,
   message,
-  Tag,
 } from 'ant-design-vue';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   getBrokerageUser,
   updateBindUser,
 } from '#/api/mall/trade/brokerage/user';
+import { DictTag } from '#/components/dict-tag';
+
+import { useUpdateFormSchema } from '../data';
 
-/** 修改分销用户 */
 defineOptions({ name: 'BrokerageUserUpdateForm' });
 
 const emit = defineEmits(['success']);
 
-const formData = ref<any>();
+const formData = ref<any>({
+  id: undefined,
+  bindUserId: undefined,
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useUpdateFormSchema(),
+  showDefaultActions: false,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (!formData.value) {
-      return;
-    }
-    // 未查找到合适的上级
-    if (!bindUser.value) {
-      message.error('请先查询并确认推广人');
+    await formApi.setValues(formData.value);
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
@@ -51,10 +68,6 @@ const [Modal, modalApi] = useVbenModal({
   },
   onOpenChange: async (isOpen: boolean) => {
     if (!isOpen) {
-      formData.value = {
-        id: 0,
-        bindUserId: 0,
-      };
       return;
     }
     const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
@@ -67,8 +80,9 @@ const [Modal, modalApi] = useVbenModal({
         id: data.id,
         bindUserId: data.bindUserId,
       };
+      await formApi.setValues(formData.value);
       if (data.bindUserId) {
-        await handleGetUser();
+        await handleSearchUser(data.bindUserId, '上级分销员');
       }
     } finally {
       modalApi.unlock();
@@ -76,55 +90,58 @@ const [Modal, modalApi] = useVbenModal({
   },
 });
 
-const bindUser = ref<MallBrokerageUserApi.BrokerageUser>();
+/** 绑定用户信息 */
+const bindUser = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
 
-/** 查询推广员 */
-async function handleGetUser() {
-  if (!formData.value) {
+/** 查询分销员 */
+async function handleSearchUser(id: number, userType: string) {
+  if (isEmpty(id)) {
+    message.warning(`请先输入${userType}编号后重试！！！`);
     return;
   }
-  if (formData.value.bindUserId === formData.value.id) {
+  if (formData.value?.bindUserId === formData.value?.id) {
     message.error('不能绑定自己为推广人');
     return;
   }
-  try {
-    bindUser.value = await getBrokerageUser(formData.value.bindUserId);
-    if (!bindUser.value) {
-      message.warning('推广员不存在');
-    }
-  } catch {
-    message.warning('推广员不存在');
+
+  const userData = await getBrokerageUser(id);
+  if (!userData) {
+    message.warning(`${userType}不存在`);
+    return;
   }
+  bindUser.value = userData as MallBrokerageUserApi.BrokerageUser;
 }
 </script>
 
 <template>
-  <Modal title="修改上级推广人" class="w-2/5">
-    <div class="mr-2 flex items-center">
-      推广员编号：
-      <InputSearch
-        v-model:value="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        enter-button
-        class="mx-2 w-52"
-        @search="handleGetUser"
-      />
-    </div>
+  <Modal title="修改上级推广人" class="w-1/3">
+    <Form>
+      <template #bindUserId>
+        <InputSearch
+          v-model:value="formData.bindUserId"
+          placeholder="请输入上级分销员编号"
+          @search="handleSearchUser(formData.bindUserId, '上级分销员')"
+        />
+      </template>
+    </Form>
 
-    <!-- 展示上级推广人的信息 -->
-    <Descriptions class="mt-4" v-if="bindUser" :column="1" bordered>
+    <!-- 上级推广员信息展示 -->
+    <Divider v-if="bindUser" />
+    <Descriptions v-if="bindUser" title="上级推广员信息" :column="1" bordered>
       <DescriptionsItem label="头像">
-        <Avatar :src="bindUser.avatar" />
+        <Avatar :src="bindUser?.avatar" />
       </DescriptionsItem>
       <DescriptionsItem label="昵称">
-        {{ bindUser.nickname }}
+        {{ bindUser?.nickname }}
       </DescriptionsItem>
-      <DescriptionsItem label="推广资格">
-        <Tag v-if="bindUser.brokerageEnabled" color="success">有</Tag>
-        <Tag v-else>无</Tag>
+      <DescriptionsItem label="分销资格">
+        <DictTag
+          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :value="bindUser?.brokerageEnabled"
+        />
       </DescriptionsItem>
-      <DescriptionsItem label="成为推广员的时间">
-        {{ formatDate(bindUser.brokerageTime) }}
+      <DescriptionsItem label="成为分销员的时间">
+        {{ formatDate(bindUser?.brokerageTime) }}
       </DescriptionsItem>
     </Descriptions>
   </Modal>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
index aa664046185a9732832bad0e1b6d4879b375aa7e..40667488d954a73219bd8263ab027e46bb42576a 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
@@ -1,134 +1,33 @@
 <script lang="ts" setup>
-import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 
-import { Tag } from 'ant-design-vue';
-
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getBrokerageUserPage } from '#/api/mall/trade/brokerage/user';
-import { getRangePickerDefaultProps } from '#/utils';
-
-defineOptions({ name: 'BrokerageUserListModal' });
 
-const bindUserId = ref<number>();
+import { useUserListColumns, useUserListFormSchema } from '../data';
 
-const [Modal, modalApi] = useVbenModal({
-  onOpenChange: async (isOpen: boolean) => {
-    if (!isOpen) {
-      bindUserId.value = undefined;
-      return;
-    }
-    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
-    if (!data || !data.id) {
-      return;
-    }
-    bindUserId.value = data.id;
-    // 等待弹窗打开后再查询
-    setTimeout(() => {
-      gridApi.query();
-    }, 100);
-  },
-});
-
-/** 搜索表单配置 */
-function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'level',
-      label: '用户类型',
-      component: 'Select',
-      componentProps: {
-        options: [
-          { label: '全部', value: undefined },
-          { label: '一级推广人', value: '1' },
-          { label: '二级推广人', value: '2' },
-        ],
-      },
-    },
-    {
-      fieldName: 'bindUserTime',
-      label: '绑定时间',
-      component: 'RangePicker',
-      componentProps: {
-        ...getRangePickerDefaultProps(),
-        allowClear: true,
-      },
-    },
-  ];
-}
+defineOptions({ name: 'BrokerageUserListModal' });
 
-/** 表格列配置 */
-function useColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'id',
-      title: '用户编号',
-      minWidth: 80,
-    },
-    {
-      field: 'avatar',
-      title: '头像',
-      minWidth: 70,
-      cellRender: {
-        name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-          shape: 'circle',
-        },
-      },
-    },
-    {
-      field: 'nickname',
-      title: '昵称',
-      minWidth: 80,
-    },
-    {
-      field: 'brokerageUserCount',
-      title: '推广人数',
-      minWidth: 80,
-    },
-    {
-      field: 'brokerageOrderCount',
-      title: '推广订单数量',
-      minWidth: 110,
-    },
-    {
-      field: 'brokerageEnabled',
-      title: '推广资格',
-      minWidth: 80,
-      slots: { default: 'brokerageEnabled' },
-    },
-    {
-      field: 'bindUserTime',
-      title: '绑定时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
+const [Modal, modalApi] = useVbenModal({});
 
-const [Grid, gridApi] = useVbenVxeGrid({
+const [Grid] = useVbenVxeGrid({
   formOptions: {
-    schema: useFormSchema(),
+    schema: useUserListFormSchema(),
   },
   gridOptions: {
-    columns: useColumns(),
+    columns: useUserListColumns(),
     height: '600',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
           return await getBrokerageUserPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            bindUserId: bindUserId.value,
+            bindUserId: modalApi.getData().id,
             ...formValues,
           });
         },
@@ -148,11 +47,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Modal title="推广人列表" class="w-3/5">
-    <Grid table-title="推广人列表">
-      <template #brokerageEnabled="{ row }">
-        <Tag v-if="row.brokerageEnabled" color="success">有</Tag>
-        <Tag v-else>无</Tag>
-      </template>
-    </Grid>
+    <Grid />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts
index 6747202693aa1688bff54800b51b126690b5b489..86452dd8e83cfb6e008c91d61e1b59971d4f829e 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts
+++ b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/data.ts
@@ -39,10 +39,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'userName',
-      label: '真实名字',
+      label: '真实姓名',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入真实名字',
+        placeholder: '请输入真实姓名',
         allowClear: true,
       },
     },
@@ -88,12 +88,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'userId',
-      title: '用户编号：',
+      title: '用户编号',
       minWidth: 80,
     },
     {
       field: 'userNickname',
-      title: '用户昵称：',
+      title: '用户昵称',
       minWidth: 80,
     },
     {
diff --git a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/index.vue b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/index.vue
index 40e62bad856c74d4504eca8460823f9c37426f43..1c635a4894b8d2d6a5514258ac698f988769f06f 100644
--- a/apps/web-antd/src/views/mall/trade/brokerage/withdraw/index.vue
+++ b/apps/web-antd/src/views/mall/trade/brokerage/withdraw/index.vue
@@ -29,19 +29,23 @@ import { useGridColumns, useGridFormSchema } from './data';
 defineOptions({ name: 'BrokerageWithdraw' });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 /** 审核通过 */
 async function handleApprove(row: MallBrokerageWithdrawApi.BrokerageWithdraw) {
+  await confirm('确定要审核通过吗？');
+  const hideLoading = message.loading({
+    content: '审核通过中 ...',
+    duration: 0,
+  });
   try {
-    await confirm('确定要审核通过吗？');
     await approveBrokerageWithdraw(row.id);
     message.success($t('ui.actionMessage.operationSuccess'));
-    onRefresh();
-  } catch (error) {
-    console.error('审核失败:', error);
+    handleRefresh();
+  } finally {
+    hideLoading();
   }
 }
 
@@ -61,10 +65,10 @@ function handleReject(row: MallBrokerageWithdrawApi.BrokerageWithdraw) {
   }).then(async (val) => {
     if (val) {
       await rejectBrokerageWithdraw({
-        id: row.id as number,
+        id: row.id!,
         auditReason: val,
       });
-      onRefresh();
+      handleRefresh();
     }
   });
 }
@@ -73,13 +77,17 @@ function handleReject(row: MallBrokerageWithdrawApi.BrokerageWithdraw) {
 async function handleRetryTransfer(
   row: MallBrokerageWithdrawApi.BrokerageWithdraw,
 ) {
+  await confirm('确定要重新转账吗？');
+  const hideLoading = message.loading({
+    content: '审核通过中 ...',
+    duration: 0,
+  });
   try {
-    await confirm('确定要重新转账吗？');
     await approveBrokerageWithdraw(row.id);
     message.success($t('ui.actionMessage.operationSuccess'));
-    onRefresh();
-  } catch (error) {
-    console.error('重新转账失败:', error);
+    handleRefresh();
+  } finally {
+    hideLoading();
   }
 }
 
@@ -92,7 +100,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     height: 'auto',
     keepSource: true,
     cellConfig: {
-      height: 80,
+      height: 90,
     },
     proxyConfig: {
       ajax: {
@@ -107,6 +115,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -120,46 +129,67 @@ const [Grid, gridApi] = useVbenVxeGrid({
   <Page auto-content-height>
     <Grid table-title="佣金提现列表">
       <template #withdraw-info="{ row }">
-        <div v-if="row.type === BrokerageWithdrawTypeEnum.WALLET.type">-</div>
-        <div v-else>
-          <div v-if="row.userAccount">账号：{{ row.userAccount }}</div>
-          <div v-if="row.userName">真实姓名：{{ row.userName }}</div>
+        <div
+          v-if="row.type === BrokerageWithdrawTypeEnum.WALLET.type"
+          class="text-left"
+        >
+          -
+        </div>
+        <div v-else class="text-left">
+          <div v-if="row.userAccount" class="text-left">
+            账号：{{ row.userAccount }}
+          </div>
+          <div v-if="row.userName" class="text-left">
+            真实姓名：{{ row.userName }}
+          </div>
           <template v-if="row.type === BrokerageWithdrawTypeEnum.BANK.type">
-            <div v-if="row.bankName">银行名称：{{ row.bankName }}</div>
-            <div v-if="row.bankAddress">开户地址：{{ row.bankAddress }}</div>
+            <div v-if="row.bankName" class="text-left">
+              银行名称：{{ row.bankName }}
+            </div>
+            <div v-if="row.bankAddress" class="text-left">
+              开户地址：{{ row.bankAddress }}
+            </div>
           </template>
-          <div v-if="row.qrCodeUrl" class="mt-2">
-            <div>收款码：</div>
-            <img :src="row.qrCodeUrl" class="mt-1 h-10 w-10" />
+          <div v-if="row.qrCodeUrl" class="mt-2 text-left">
+            <div class="flex items-start gap-2">
+              <span class="flex-shrink-0">收款码：</span>
+              <img :src="row.qrCodeUrl" class="h-10 w-10 flex-shrink-0" />
+            </div>
           </div>
         </div>
       </template>
-
       <template #status-info="{ row }">
-        <div>
+        <div class="text-left">
           <DictTag
             :value="row.status"
             :type="DICT_TYPE.BROKERAGE_WITHDRAW_STATUS"
           />
-          <div v-if="row.auditTime" class="mt-1 text-xs text-gray-500">
+          <div
+            v-if="row.auditTime"
+            class="mt-1 text-left text-xs text-gray-500"
+          >
             时间：{{ formatDateTime(row.auditTime) }}
           </div>
-          <div v-if="row.auditReason" class="mt-1 text-xs text-gray-500">
+          <div
+            v-if="row.auditReason"
+            class="mt-1 text-left text-xs text-gray-500"
+          >
             审核原因：{{ row.auditReason }}
           </div>
-          <div v-if="row.transferErrorMsg" class="mt-1 text-xs text-red-500">
+          <div
+            v-if="row.transferErrorMsg"
+            class="mt-1 text-left text-xs text-red-500"
+          >
             转账失败原因：{{ row.transferErrorMsg }}
           </div>
         </div>
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
-            // 审核中状态且没有支付转账编号，显示通过和驳回按钮
             {
               label: '通过',
-              type: 'link' as const,
+              type: 'link',
               icon: ACTION_ICON.EDIT,
               auth: ['trade:brokerage-withdraw:audit'],
               ifShow:
@@ -169,7 +199,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             },
             {
               label: '驳回',
-              type: 'link' as const,
+              type: 'link',
               danger: true,
               icon: ACTION_ICON.DELETE,
               auth: ['trade:brokerage-withdraw:audit'],
@@ -180,7 +210,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             },
             {
               label: '重新转账',
-              type: 'link' as const,
+              type: 'link',
               icon: ACTION_ICON.REFRESH,
               auth: ['trade:brokerage-withdraw:audit'],
               ifShow:
diff --git a/apps/web-antd/src/views/mall/trade/config/data.ts b/apps/web-antd/src/views/mall/trade/config/data.ts
index c9125673be8ced54ac817c9eb81c3cdbd71ca608..564f9722c5e2896b81dbb3a388f29137c906b483 100644
--- a/apps/web-antd/src/views/mall/trade/config/data.ts
+++ b/apps/web-antd/src/views/mall/trade/config/data.ts
@@ -3,242 +3,240 @@ import type { VbenFormSchema } from '#/adapter/form';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-/** 售后表单 */
-export function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      component: 'Input',
-      fieldName: 'id',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      component: 'Input',
-      fieldName: 'type',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      fieldName: 'afterSaleRefundReasons',
-      label: '退款理由',
-      component: 'Select',
-      componentProps: {
-        mode: 'tags',
-        placeholder: '请直接输入退款理由',
-        class: 'w-full',
-      },
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'afterSale',
-      },
-    },
-    {
-      fieldName: 'afterSaleReturnReasons',
-      label: '退货理由',
-      component: 'Select',
-      componentProps: {
-        mode: 'tags',
-        placeholder: '请直接输入退货理由',
-        class: 'w-full',
-      },
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'afterSale',
-      },
-    },
-    {
-      fieldName: 'deliveryExpressFreeEnabled',
-      label: '启用包邮',
-      component: 'Switch',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-      description: '商城是否启用全场包邮',
-    },
-    {
-      fieldName: 'deliveryExpressFreePrice',
-      label: '满额包邮',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 2,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-      description: '商城商品满多少金额即可包邮，单位：元',
-    },
-    {
-      fieldName: 'deliveryPickUpEnabled',
-      label: '启用门店自提',
-      component: 'Switch',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-    },
-    {
-      fieldName: 'brokerageEnabled',
-      label: '启用分佣',
-      component: 'Switch',
-      description: '商城是否开启分销模式',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-    },
-    {
-      fieldName: 'brokerageEnabledCondition',
-      label: '分佣模式',
-      component: 'RadioGroup',
-      componentProps: {
-        options: getDictOptions(
-          DICT_TYPE.BROKERAGE_ENABLED_CONDITION,
-          'number',
-        ),
-        buttonStyle: 'solid',
-        optionType: 'button',
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '人人分销：每个用户都可以成为推广员 \n 单级分销：每个用户只能有一个上级推广员',
-    },
-    {
-      fieldName: 'brokerageBindMode',
-      label: '分销关系绑定',
-      component: 'RadioGroup',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '首次绑定：只要用户没有推广人，随时都可以绑定推广关系 \n 注册绑定：只有新用户注册时或首次进入系统时才可以绑定推广关系',
-    },
-    {
-      fieldName: 'brokeragePosterUrls',
-      label: '分销海报图',
-      component: 'ImageUpload',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '个人中心分销海报图片，建议尺寸 600x1000',
-    },
-    {
-      fieldName: 'brokerageFirstPercent',
-      label: '一级返佣比例',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '订单交易成功后给推广人返佣的百分比',
-    },
-    {
-      fieldName: 'brokerageSecondPercent',
-      label: '二级返佣比例',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '订单交易成功后给推广人的推荐人返佣的百分比',
-    },
-    {
-      fieldName: 'brokerageFrozenDays',
-      label: '佣金冻结天数',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天',
-    },
-    {
-      fieldName: 'brokerageWithdrawMinPrice',
-      label: '提现最低金额',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 2,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '用户提现最低金额限制，单位：元',
-    },
-    {
-      fieldName: 'brokerageWithdrawFeePercent',
-      label: '提现手续费',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '提现手续费百分比，范围 0-100，0 为无提现手续费。例：设置 10，即收取 10% 手续费，提现10 元，到账 9 元，1 元手续费',
-    },
-    {
-      fieldName: 'brokerageWithdrawTypes',
-      label: '提现方式',
-      component: 'CheckboxGroup',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, 'number'),
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '商城开通提现的付款方式',
-    },
-  ];
-}
+export const schema: VbenFormSchema[] = [
+  {
+    component: 'Input',
+    fieldName: 'id',
+    dependencies: {
+      triggerFields: [''],
+      show: () => false,
+    },
+  },
+  {
+    component: 'Input',
+    fieldName: 'type',
+    dependencies: {
+      triggerFields: [''],
+      show: () => false,
+    },
+  },
+  {
+    fieldName: 'afterSaleRefundReasons',
+    label: '退款理由',
+    component: 'Select',
+    componentProps: {
+      mode: 'tags',
+      placeholder: '请直接输入退款理由',
+      class: 'w-full',
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'afterSale',
+    },
+  },
+  {
+    fieldName: 'afterSaleReturnReasons',
+    label: '退货理由',
+    component: 'Select',
+    componentProps: {
+      mode: 'tags',
+      placeholder: '请直接输入退货理由',
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'afterSale',
+    },
+  },
+  {
+    fieldName: 'deliveryExpressFreeEnabled',
+    label: '启用包邮',
+    component: 'Switch',
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+    help: '商城是否启用全场包邮',
+  },
+  {
+    fieldName: 'deliveryExpressFreePrice',
+    label: '满额包邮',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      precision: 2,
+      placeholder: '请输入满额包邮金额',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+    help: '商城商品满多少金额即可包邮，单位：元',
+  },
+  {
+    fieldName: 'deliveryPickUpEnabled',
+    label: '启用门店自提',
+    component: 'Switch',
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+  },
+  {
+    fieldName: 'brokerageEnabled',
+    label: '启用分佣',
+    component: 'Switch',
+    help: '商城是否开启分销模式',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+  },
+  {
+    fieldName: 'brokerageEnabledCondition',
+    label: '分佣模式',
+    component: 'RadioGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION, 'number'),
+      buttonStyle: 'solid',
+      optionType: 'button',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '人人分销：每个用户都可以成为推广员 \n 指定分销：仅可在后台手动设置推广员',
+  },
+  {
+    fieldName: 'brokerageBindMode',
+    label: '分销关系绑定',
+    component: 'RadioGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE, 'number'),
+      buttonStyle: 'solid',
+      optionType: 'button',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '首次绑定：只要用户没有推广人，随时都可以绑定推广关系 \n 注册绑定：只有新用户注册时或首次进入系统时才可以绑定推广关系',
+  },
+  {
+    fieldName: 'brokeragePosterUrls',
+    label: '分销海报图',
+    component: 'ImageUpload',
+    componentProps: {
+      maxNumber: 9,
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '个人中心分销海报图片，建议尺寸 600x1000',
+  },
+  {
+    fieldName: 'brokerageFirstPercent',
+    label: '一级返佣比例（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      placeholder: '请输入一级返佣比例',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '订单交易成功后给推广人返佣的百分比',
+  },
+  {
+    fieldName: 'brokerageSecondPercent',
+    label: '二级返佣比例（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      placeholder: '请输入二级返佣比例',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '订单交易成功后给推广人的推荐人返佣的百分比',
+  },
+  {
+    fieldName: 'brokerageFrozenDays',
+    label: '佣金冻结天数',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      placeholder: '请输入佣金冻结天数',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天',
+  },
+  {
+    fieldName: 'brokerageWithdrawMinPrice',
+    label: '提现最低金额（元）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      precision: 2,
+      placeholder: '请输入提现最低金额',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '用户提现最低金额限制，单位：元',
+  },
+  {
+    fieldName: 'brokerageWithdrawFeePercent',
+    label: '提现手续费（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      precision: 2,
+      placeholder: '请输入提现手续费百分比',
+      class: 'w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '提现手续费百分比，范围 0-100，0 为无提现手续费。例：设置 10，即收取 10% 手续费，提现10 元，到账 9 元，1 元手续费',
+  },
+  {
+    fieldName: 'brokerageWithdrawTypes',
+    label: '提现方式',
+    component: 'CheckboxGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, 'number'),
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '商城开通提现的付款方式',
+  },
+];
diff --git a/apps/web-antd/src/views/mall/trade/config/index.vue b/apps/web-antd/src/views/mall/trade/config/index.vue
index e683fe21bd70582f4a22f6ca5894c1efbd3ccfeb..d1c5dedef1c4925bfc73efc3bc06f9e424eca336 100644
--- a/apps/web-antd/src/views/mall/trade/config/index.vue
+++ b/apps/web-antd/src/views/mall/trade/config/index.vue
@@ -4,6 +4,7 @@ import type { MallTradeConfigApi } from '#/api/mall/trade/config';
 import { onMounted, ref } from 'vue';
 
 import { DocAlert, Page } from '@vben/common-ui';
+import { fenToYuan, yuanToFen } from '@vben/utils';
 
 import { Card, message, Tabs } from 'ant-design-vue';
 
@@ -11,65 +12,66 @@ import { useVbenForm } from '#/adapter/form';
 import { getTradeConfig, saveTradeConfig } from '#/api/mall/trade/config';
 import { $t } from '#/locales';
 
-import { useFormSchema } from './data';
+import { schema } from './data';
 
 const activeKey = ref('afterSale');
 const formData = ref<MallTradeConfigApi.Config & { type?: string }>();
 
+/** 获取配置 */
+async function getConfigInfo() {
+  const res = await getTradeConfig();
+  if (!res) {
+    return;
+  }
+  formData.value = res;
+  // 转换金额单位
+  formData.value.deliveryExpressFreePrice = Number.parseFloat(
+    fenToYuan(formData.value.deliveryExpressFreePrice!),
+  );
+  formData.value.brokerageWithdrawMinPrice = Number.parseFloat(
+    fenToYuan(formData.value.brokerageWithdrawMinPrice!),
+  );
+  formData.value!.type = activeKey.value;
+  formApi.updateSchema(schema);
+  // 设置到 values
+  await formApi.setValues(formData.value);
+}
+
+/** 切换 Tab */
 function handleTabChange(key: any) {
   activeKey.value = key;
   formData.value!.type = activeKey.value;
   formApi.setValues(formData.value!);
-  formApi.updateSchema(useFormSchema());
-}
-
-async function loadConfig() {
-  const res = await getTradeConfig();
-  if (res) {
-    formData.value = res;
-    // 金额缩小
-    formData.value.deliveryExpressFreePrice =
-      formData.value.deliveryExpressFreePrice! / 100 || 0;
-    formData.value.brokerageWithdrawMinPrice =
-      formData.value.brokerageWithdrawMinPrice! / 100 || 0;
-    formData.value!.type = activeKey.value;
-    formApi.updateSchema(useFormSchema());
-    await formApi.setValues(formData.value);
-  }
+  formApi.updateSchema(schema);
 }
 
-async function onSubmit() {
+/** 提交表单 */
+async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
     return;
   }
   // 提交表单
   const data = (await formApi.getValues()) as MallTradeConfigApi.Config;
-  formApi.setState({ commonConfig: { disabled: true } });
-  try {
-    await saveTradeConfig(data);
-    message.success($t('ui.actionMessage.operationSuccess'));
-  } finally {
-    formApi.setState({ commonConfig: { disabled: false } });
-  }
+  // 转换金额单位
+  data.deliveryExpressFreePrice = yuanToFen(data.deliveryExpressFreePrice!);
+  data.brokerageWithdrawMinPrice = yuanToFen(data.brokerageWithdrawMinPrice!);
+  await saveTradeConfig(data);
+  message.success($t('ui.actionMessage.operationSuccess'));
 }
 
-onMounted(() => {
-  loadConfig();
-});
-
 const [Form, formApi] = useVbenForm({
   commonConfig: {
-    // 所有表单项
-    labelClass: 'w-2/6',
+    labelWidth: 150,
   },
-  wrapperClass: 'grid-cols-1',
-  handleSubmit: onSubmit,
   layout: 'horizontal',
-  resetButtonOptions: {
-    show: false,
-  },
-  schema: useFormSchema(),
+  handleSubmit,
+  schema,
+});
+
+/** 初始化 */
+onMounted(() => {
+  getConfigInfo();
 });
 </script>
 
@@ -89,10 +91,9 @@ const [Form, formApi] = useVbenForm({
       <Tabs :active-key="activeKey" @change="handleTabChange">
         <Tabs.TabPane tab="售后" key="afterSale" :force-render="true" />
         <Tabs.TabPane tab="配送" key="delivery" :force-render="true" />
-        <!-- TODO @xingyu：tooltip 有点丑；要不要左对齐？（貌似都行） -->
         <Tabs.TabPane tab="分销" key="brokerage" :force-render="true" />
       </Tabs>
-      <Form class="w-3/5" />
+      <Form class="w-2/5" />
     </Card>
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts
index 28db3aaa5419afcb2bff06c6b697d26e7c151416..7b3fe051274c0e48b9adcba0747baac873480751 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/express/data.ts
+++ b/apps/web-antd/src/views/mall/trade/delivery/express/data.ts
@@ -21,12 +21,18 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Input',
       fieldName: 'code',
       label: '公司编码',
+      componentProps: {
+        placeholder: '请输入快递编码',
+      },
       rules: 'required',
     },
     {
       component: 'Input',
       fieldName: 'name',
       label: '公司名称',
+      componentProps: {
+        placeholder: '请输入快递名称',
+      },
       rules: 'required',
     },
     {
@@ -34,6 +40,7 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'logo',
       label: '公司 logo',
       rules: 'required',
+      help: '推荐 180x180 图片分辨率',
     },
     {
       fieldName: 'sort',
@@ -41,6 +48,7 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         min: 0,
+        placeholder: '请输入显示顺序',
       },
       rules: 'required',
     },
@@ -65,17 +73,26 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '快递公司名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入快递公司名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'code',
       label: '快递公司编号',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入快递公司编号',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'status',
       label: '状态',
       component: 'Select',
       componentProps: {
+        placeholder: '请选择状态',
         allowClear: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
       },
@@ -89,18 +106,22 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
+      minWidth: 100,
     },
     {
       field: 'code',
       title: '公司编码',
+      minWidth: 120,
     },
     {
       field: 'name',
       title: '公司名称',
+      minWidth: 150,
     },
     {
       field: 'logo',
       title: '公司 logo',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
       },
@@ -108,10 +129,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'sort',
       title: '显示顺序',
+      minWidth: 100,
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -120,6 +143,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/index.vue b/apps/web-antd/src/views/mall/trade/delivery/express/index.vue
index c2fcc7c28bd10e51e6f56617609695a8a3e74dae..ea1df37e6c53bf8c9eb663b82122806f6de811b5 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/express/index.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/express/index.vue
@@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -51,11 +51,9 @@ async function handleDelete(row: MallDeliveryExpressApi.DeliveryExpress) {
     duration: 0,
   });
   try {
-    await deleteDeliveryExpress(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    await deleteDeliveryExpress(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -82,6 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -93,7 +92,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="快递公司列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue
index e21a427c24550acfb459eaa16d644e4185af21b8..16325507f60863c16639e8298d7a8e9afb0309aa 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/express/modules/form.vue
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts
index 048b68aab6eefe59b347f43d9b961295d85ad4bf..0a63d725c30998643768f3695927324af6867397 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts
+++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/data.ts
@@ -1,11 +1,109 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
 
+/** 计费方式列标题映射 */
+export const CHARGE_MODE_TITLE_MAP: Record<
+  number,
+  {
+    extraCountTitle: string;
+    startCountTitle: string;
+  }
+> = {
+  1: { startCountTitle: '首件', extraCountTitle: '续件' },
+  2: { startCountTitle: '首件重量(kg)', extraCountTitle: '续件重量(kg)' },
+  3: { startCountTitle: '首件体积(m³)', extraCountTitle: '续件体积(m³)' },
+};
+
+/** 包邮方式列标题映射 */
+export const FREE_MODE_TITLE_MAP: Record<number, { freeCountTitle: string }> = {
+  1: { freeCountTitle: '包邮件数' },
+  2: { freeCountTitle: '包邮重量(kg)' },
+  3: { freeCountTitle: '包邮体积(m³)' },
+};
+
+/** 运费设置表格列 */
+export function useChargesColumns(
+  chargeMode = 1,
+): VxeTableGridOptions['columns'] {
+  const chargeTitleMap = CHARGE_MODE_TITLE_MAP[chargeMode];
+  return [
+    {
+      field: 'areaIds',
+      title: '区域',
+      minWidth: 300,
+      slots: { default: 'areaIds' },
+    },
+    {
+      field: 'startCount',
+      title: chargeTitleMap?.startCountTitle,
+      width: 120,
+      slots: { default: 'startCount' },
+    },
+    {
+      field: 'startPrice',
+      title: '运费(元)',
+      width: 120,
+      slots: { default: 'startPrice' },
+    },
+    {
+      field: 'extraCount',
+      title: chargeTitleMap?.extraCountTitle,
+      width: 120,
+      slots: { default: 'extraCount' },
+    },
+    {
+      field: 'extraPrice',
+      title: '续费(元)',
+      width: 120,
+      slots: { default: 'extraPrice' },
+    },
+    {
+      title: '操作',
+      width: 80,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 包邮设置表格列 */
+export function useFreesColumns(
+  chargeMode = 1,
+): VxeTableGridOptions['columns'] {
+  const freeTitleMap = FREE_MODE_TITLE_MAP[chargeMode];
+  return [
+    {
+      field: 'areaIds',
+      title: '区域',
+      minWidth: 300,
+      slots: { default: 'areaIds' },
+    },
+    {
+      field: 'freeCount',
+      title: freeTitleMap?.freeCountTitle,
+      width: 120,
+      slots: { default: 'freeCount' },
+    },
+    {
+      field: 'freePrice',
+      title: '包邮金额(元)',
+      width: 120,
+      slots: { default: 'freePrice' },
+    },
+    {
+      title: '操作',
+      width: 80,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -21,6 +119,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Input',
       fieldName: 'name',
       label: '模板名称',
+      componentProps: {
+        placeholder: '请输入模板名称',
+      },
       rules: 'required',
     },
     {
@@ -32,17 +133,30 @@ export function useFormSchema(): VbenFormSchema[] {
         buttonStyle: 'solid',
         optionType: 'button',
       },
-      rules: z.number().default(CommonStatusEnum.ENABLE),
+      rules: z.number().default(1),
     },
     {
       fieldName: 'sort',
       label: '显示顺序',
       component: 'InputNumber',
       componentProps: {
+        placeholder: '请输入显示顺序',
         min: 0,
       },
       rules: 'required',
     },
+    {
+      fieldName: 'charges',
+      label: '运费设置',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'frees',
+      label: '包邮设置',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
   ];
 }
 
@@ -53,12 +167,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '模板名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入模板名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'chargeMode',
       label: '计费方式',
       component: 'Select',
       componentProps: {
+        placeholder: '请选择计费方式',
         allowClear: true,
         options: getDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE, 'number'),
       },
@@ -72,14 +191,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '模板名称',
+      minWidth: 200,
     },
     {
       field: 'chargeMode',
       title: '计费方式',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.EXPRESS_CHARGE_MODE },
@@ -88,10 +210,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'sort',
       title: '显示顺序',
+      minWidth: 100,
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/index.vue b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/index.vue
index 5355825c2b8c47db10d81dcb160e63acc4171218..0c6a96fb60afc0cd2e62a39a9c5669a65ea8c948 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/index.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/index.vue
@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -46,10 +46,8 @@ async function handleDelete(
   });
   try {
     await deleteDeliveryExpressTemplate(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -76,6 +74,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -87,7 +86,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="快递模板列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..2f8f65e50bc78933cd4783a5f7e6542087b44de7
--- /dev/null
+++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
@@ -0,0 +1,220 @@
+<script lang="ts" setup>
+import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { InputNumber, TreeSelect } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { CHARGE_MODE_TITLE_MAP, useChargesColumns } from '../data';
+
+interface Props {
+  items?: MallDeliveryExpressTemplateApi.TemplateCharge[];
+  chargeMode?: number;
+  areaTree?: SystemAreaApi.Area[];
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  chargeMode: 1,
+  areaTree: () => [],
+});
+
+const emit = defineEmits(['update:items']);
+
+const tableData = ref<any[]>([]);
+const columnTitle = computed(() => CHARGE_MODE_TITLE_MAP[props.chargeMode]);
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useChargesColumns(props.chargeMode),
+    data: tableData.value,
+    minHeight: 200,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick();
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 监听计费方式变化 */
+watch(
+  () => props.chargeMode,
+  () => {
+    const columns = useChargesColumns(props.chargeMode);
+    if (gridApi.grid && columns) {
+      gridApi.grid.reloadColumn(columns);
+    }
+  },
+);
+
+/** 处理新增 */
+function handleAdd() {
+  const newRow = {
+    areaIds: [],
+    startCount: undefined,
+    startPrice: undefined,
+    extraCount: undefined,
+    extraPrice: undefined,
+  };
+  tableData.value.push(newRow);
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理删除 */
+function handleDelete(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.areaIds || item.areaIds.length === 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：区域不能为空`);
+    }
+    if (!item.startCount || item.startCount <= 0) {
+      throw new Error(
+        `运费设置第 ${i + 1} 行：${columnTitle.value?.startCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.startPrice || item.startPrice <= 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：运费必须大于0`);
+    }
+    if (!item.extraCount || item.extraCount <= 0) {
+      throw new Error(
+        `运费设置第 ${i + 1} 行：${columnTitle.value?.extraCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.extraPrice || item.extraPrice <= 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：续费必须大于 0`);
+    }
+  }
+}
+
+defineExpose({
+  validate,
+});
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #areaIds="{ row }">
+      <!-- TODO 芋艿：可优化，使用 Cascade。不过貌似 antd 在 multiple 貌似有 bug！ -->
+      <TreeSelect
+        v-model:value="row.areaIds"
+        :tree-data="areaTree"
+        :field-names="{
+          label: 'name',
+          value: 'id',
+          children: 'children',
+        }"
+        placeholder="请选择地区"
+        class="w-full"
+        multiple
+        tree-checkable
+        :max-tag-count="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #startCount="{ row }">
+      <InputNumber
+        v-model:value="row.startCount"
+        :min="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #startPrice="{ row }">
+      <InputNumber
+        v-model:value="row.startPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #extraCount="{ row }">
+      <InputNumber
+        v-model:value="row.extraCount"
+        :min="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #extraPrice="{ row }">
+      <InputNumber
+        v-model:value="row.extraPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该区域吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+    <template #bottom>
+      <TableAction
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加计费区域',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
index d80c5f7f96d49a7f0c6493b3479f450f2ef9ae0e..fd40482082a221128d3842136c730b5bead1104f 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
 
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { cloneDeep, fenToYuan, yuanToFen } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -13,12 +15,19 @@ import {
   getDeliveryExpressTemplate,
   updateDeliveryExpressTemplate,
 } from '#/api/mall/trade/delivery/expressTemplate';
+import { getAreaTree } from '#/api/system/area';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
+import ChargeItemForm from './charge-item-form.vue';
+import FreeItemForm from './free-item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+const chargeItemFormRef = ref<InstanceType<typeof ChargeItemForm>>();
+const freeItemFormRef = ref<InstanceType<typeof FreeItemForm>>();
+const areaTree = ref<SystemAreaApi.Area[]>([]);
+
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['快递模板'])
@@ -30,26 +39,83 @@ const [Form, formApi] = useVbenForm({
     componentProps: {
       class: 'w-full',
     },
-    formItemClass: 'col-span-2',
     labelWidth: 120,
   },
-  layout: 'horizontal',
+  wrapperClass: 'grid-cols-3',
+  layout: 'vertical',
   schema: useFormSchema(),
   showDefaultActions: false,
+  handleValuesChange: (values, changedFields) => {
+    // 目的：触发子表单的 columns 变化
+    if (changedFields.includes('chargeMode')) {
+      formData.value!.chargeMode = values.chargeMode;
+    }
+  },
 });
 
-// TODO @xingyu：城市处理；
+/** 更新运费设置 */
+const handleUpdateCharges = async (
+  charges: MallDeliveryExpressTemplateApi.TemplateCharge[],
+) => {
+  formData.value =
+    await formApi.getValues<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+  formData.value.charges = charges;
+  await formApi.setValues({
+    charges,
+  });
+};
+
+/** 更新包邮设置 */
+const handleUpdateFrees = async (
+  frees: MallDeliveryExpressTemplateApi.TemplateFree[],
+) => {
+  formData.value =
+    await formApi.getValues<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+  formData.value.frees = frees;
+  await formApi.setValues({
+    frees,
+  });
+};
+
+/** 创建或更新快递模板 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
+    const chargeFormInstance = Array.isArray(chargeItemFormRef.value)
+      ? chargeItemFormRef.value[0]
+      : chargeItemFormRef.value;
+    const freeFormInstance = Array.isArray(freeItemFormRef.value)
+      ? freeItemFormRef.value[0]
+      : freeItemFormRef.value;
+    try {
+      chargeFormInstance.validate();
+      freeFormInstance.validate();
+    } catch (error: any) {
+      message.error(error.message || '子表单验证失败');
+      return;
+    }
+
     modalApi.lock();
     // 提交表单
-    const data =
-      (await formApi.getValues()) as MallDeliveryExpressTemplateApi.ExpressTemplate;
+    const data = cloneDeep(
+      await formApi.getValues(),
+    ) as MallDeliveryExpressTemplateApi.ExpressTemplate;
     try {
+      // 转换金额单位
+      data.charges?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateCharge) => {
+          item.startPrice = yuanToFen(item.startPrice);
+          item.extraPrice = yuanToFen(item.extraPrice);
+        },
+      );
+      data.frees?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateFree) => {
+          item.freePrice = yuanToFen(item.freePrice);
+        },
+      );
       await (formData.value?.id
         ? updateDeliveryExpressTemplate(data)
         : createDeliveryExpressTemplate(data));
@@ -75,6 +141,18 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getDeliveryExpressTemplate(data.id);
+      // 转换金额单位
+      formData.value.charges?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateCharge) => {
+          item.startPrice = Number.parseFloat(fenToYuan(item.startPrice));
+          item.extraPrice = Number.parseFloat(fenToYuan(item.extraPrice));
+        },
+      );
+      formData.value.frees?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateFree) => {
+          item.freePrice = Number.parseFloat(fenToYuan(item.freePrice));
+        },
+      );
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
@@ -82,10 +160,34 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
+
+/** 初始化 */
+onMounted(async () => {
+  areaTree.value = await getAreaTree();
+});
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
-    <Form class="mx-4" />
+  <Modal class="w-1/2" :title="getTitle">
+    <Form class="mx-3">
+      <template #charges>
+        <ChargeItemForm
+          ref="chargeItemFormRef"
+          :items="formData?.charges"
+          :charge-mode="formData?.chargeMode"
+          :area-tree="areaTree"
+          @update:items="handleUpdateCharges"
+        />
+      </template>
+      <template #frees>
+        <FreeItemForm
+          ref="freeItemFormRef"
+          :items="formData?.frees"
+          :charge-mode="formData?.chargeMode"
+          :area-tree="areaTree"
+          @update:items="handleUpdateFrees"
+        />
+      </template>
+    </Form>
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d75cced20255c8bd9ba321948a68755334ea605d
--- /dev/null
+++ b/apps/web-antd/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
@@ -0,0 +1,195 @@
+<script lang="ts" setup>
+import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { InputNumber, TreeSelect } from 'ant-design-vue';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { FREE_MODE_TITLE_MAP, useFreesColumns } from '../data';
+
+interface Props {
+  items?: MallDeliveryExpressTemplateApi.TemplateFree[];
+  chargeMode?: number;
+  areaTree?: SystemAreaApi.Area[];
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  chargeMode: 1,
+  areaTree: () => [],
+});
+
+const emit = defineEmits(['update:items']);
+
+const tableData = ref<any[]>([]);
+const columnTitle = computed(() => FREE_MODE_TITLE_MAP[props.chargeMode]);
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useFreesColumns(props.chargeMode),
+    data: tableData.value,
+    minHeight: 200,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick();
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 监听计费方式变化 */
+watch(
+  () => props.chargeMode,
+  () => {
+    const columns = useFreesColumns(props.chargeMode);
+    if (gridApi.grid && columns) {
+      gridApi.grid.reloadColumn(columns);
+    }
+  },
+);
+
+/** 处理新增 */
+function handleAdd() {
+  const newRow = {
+    areaIds: [],
+    freeCount: undefined,
+    freePrice: undefined,
+  };
+  tableData.value.push(newRow);
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理删除 */
+function handleDelete(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.areaIds || item.areaIds.length === 0) {
+      throw new Error(`包邮设置第 ${i + 1} 行：区域不能为空`);
+    }
+    if (!item.freeCount || item.freeCount <= 0) {
+      throw new Error(
+        `包邮设置第 ${i + 1} 行：${columnTitle.value?.freeCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.freePrice || item.freePrice <= 0) {
+      throw new Error(`包邮设置第 ${i + 1} 行：包邮金额必须大于 0`);
+    }
+  }
+}
+
+defineExpose({
+  validate,
+});
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #areaIds="{ row }">
+      <!-- TODO 芋艿：可优化，使用 Cascade。不过貌似 antd 在 multiple 貌似有 bug！ -->
+      <TreeSelect
+        v-model:value="row.areaIds"
+        :tree-data="areaTree"
+        :field-names="{
+          label: 'name',
+          value: 'id',
+          children: 'children',
+        }"
+        placeholder="请选择地区"
+        class="w-full"
+        multiple
+        tree-checkable
+        :max-tag-count="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #freeCount="{ row }">
+      <InputNumber
+        v-model:value="row.freeCount"
+        :min="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #freePrice="{ row }">
+      <InputNumber
+        v-model:value="row.freePrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: '删除',
+            type: 'link',
+            danger: true,
+            popConfirm: {
+              title: '确认删除该区域吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+    <template #bottom>
+      <TableAction
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加包邮区域',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
index 2777af28ad86d4ad328fef9772b5f677180d7d81..e69a6538973a3e45cd7ac21d3908fb3d6b330b18 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -175,8 +175,7 @@ onMounted(() => {
 
 <template>
   <Page auto-content-height>
-    <!-- TODO @xingyu：高度不对 -->
-    <Card class="mb-4 h-[10%]">
+    <Card class="m-4">
       <div class="flex flex-row gap-4">
         <SummaryCard
           class="flex flex-1"
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
index 3f4b86015c06343dec8be7c344e8a431f75b0de4..612d9aaefb1a7206259939c9d39753265e789fe9 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/data.ts
@@ -20,43 +20,64 @@ export function useFormSchema(): VbenFormSchema[] {
         show: () => false,
       },
     },
-    {
-      component: 'ImageUpload',
-      fieldName: 'logo',
-      label: '门店logo',
-      rules: 'required',
-    },
     {
       component: 'Input',
       fieldName: 'name',
       label: '门店名称',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入门店名称',
+      },
     },
     {
       component: 'Input',
       fieldName: 'phone',
       label: '门店手机',
       rules: 'mobileRequired',
+      componentProps: {
+        placeholder: '请输入门店手机',
+      },
+    },
+    {
+      component: 'ImageUpload',
+      fieldName: 'logo',
+      label: '门店 logo',
+      rules: 'required',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请上传门店 logo',
+      },
+      help: '推荐 180x180 图片分辨率',
     },
     {
       component: 'Textarea',
       fieldName: 'introduction',
       label: '门店简介',
+      formItemClass: 'col-span-2',
+      componentProps: {
+        placeholder: '请输入门店简介',
+        rows: 4,
+      },
     },
     {
       fieldName: 'areaId',
-      label: '地址',
+      label: '门店所在地区',
       component: 'ApiTreeSelect',
+      rules: 'required',
       componentProps: {
         api: () => getAreaTree(),
         fieldNames: { label: 'name', value: 'id', children: 'children' },
+        placeholder: '请选择省市区',
       },
     },
     {
       component: 'Input',
       fieldName: 'detailAddress',
-      label: '详细地址',
+      label: '门店详细地址',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入门店详细地址',
+      },
     },
     {
       component: 'TimeRangePicker',
@@ -66,43 +87,37 @@ export function useFormSchema(): VbenFormSchema[] {
       componentProps: {
         format: 'HH:mm',
         minuteStep: 15,
-        disabledTime: () => {
-          return {
-            disabledHours: () => {
-              return [0, 1, 2, 3, 4, 5, 6, 7];
-            },
-          };
-        },
+        placeholder: ['开始时间', '结束时间'],
+      },
+    },
+    {
+      fieldName: 'status',
+      label: '门店状态',
+      component: 'RadioGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        buttonStyle: 'solid',
+        optionType: 'button',
       },
+      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
     {
       component: 'Input',
       fieldName: 'longitude',
       label: '经度',
       rules: 'required',
+      componentProps: {
+        placeholder: '请输入门店经度',
+      },
     },
     {
       component: 'Input',
       fieldName: 'latitude',
       label: '纬度',
       rules: 'required',
-    },
-    // TODO @xingyu：缺少地图
-    {
-      component: 'Input',
-      fieldName: 'getGeo',
-      label: '获取经纬度',
-    },
-    {
-      fieldName: 'status',
-      label: '门店状态',
-      component: 'RadioGroup',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
+        placeholder: '请输入门店纬度',
       },
-      rules: z.number().default(CommonStatusEnum.ENABLE),
     },
   ];
 }
@@ -137,23 +152,7 @@ export function useBindFormSchema(): VbenFormSchema[] {
         fieldNames: { label: 'nickname', value: 'id' },
         mode: 'tags',
         allowClear: true,
-      },
-    },
-    {
-      component: 'Select',
-      fieldName: 'verifyUsers',
-      label: '店员列表',
-      rules: 'required',
-      componentProps: {
-        options: [],
-        mode: 'tags',
-      },
-      dependencies: {
-        triggerFields: ['verifyUserIds'],
-        trigger(values, form) {
-          form.setFieldValue('verifyUsers', values.verifyUserIds);
-        },
-        disabled: true,
+        placeholder: '请选择门店店员',
       },
     },
   ];
@@ -166,11 +165,19 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'phone',
       label: '门店手机',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入门店手机',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'name',
       label: '门店名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入门店名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'status',
@@ -179,6 +186,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         allowClear: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择门店状态',
       },
     },
     {
@@ -188,6 +196,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         ...getRangePickerDefaultProps(),
         allowClear: true,
+        placeholder: ['开始时间', '结束时间'],
       },
     },
   ];
@@ -199,10 +208,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
+      minWidth: 80,
     },
     {
       field: 'logo',
-      title: '门店logo',
+      title: '门店 logo',
+      minWidth: 100,
       cellRender: {
         name: 'CellImage',
       },
@@ -210,18 +221,22 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'name',
       title: '门店名称',
+      minWidth: 150,
     },
     {
       field: 'phone',
       title: '门店手机',
+      minWidth: 120,
     },
     {
       field: 'detailAddress',
       title: '地址',
+      minWidth: 200,
     },
     {
       field: 'openingTime',
       title: '营业时间',
+      minWidth: 160,
       formatter: ({ row }) => {
         return `${row.openingTime} ~ ${row.closingTime}`;
       },
@@ -229,6 +244,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'status',
       title: '开启状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -237,11 +253,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 160,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 200,
+      width: 220,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/index.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/index.vue
index af96f9489da96150be9bd45f129f8e87c40e7e39..e4a724e0c594d6ba5f2b5520b724c0f1a3d6ea88 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/index.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/index.vue
@@ -3,6 +3,7 @@ import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
 
 import { Page, useVbenModal } from '@vben/common-ui';
+import { isEmpty } from '@vben/utils';
 
 import { message } from 'ant-design-vue';
 
@@ -28,7 +29,7 @@ const [BindFormModal, bindFormModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -55,10 +56,8 @@ async function handleDelete(row: MallDeliveryPickUpStoreApi.PickUpStore) {
   });
   try {
     await deleteDeliveryPickUpStore(row.id as number);
-    message.success({
-      content: $t('ui.actionMessage.deleteSuccess', [row.name]),
-    });
-    onRefresh();
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     hideLoading();
   }
@@ -85,6 +84,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -96,7 +96,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <BindFormModal />
     <Grid table-title="门店列表">
       <template #toolbar-tools>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
index 4b2a6e79dbd0ed9ad2170de17e20f46be0c4d352..379b0561a2bf90ae8a778cd172a3926bdcc15a64 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/bind-form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { MallDeliveryPickUpStoreApi } from '#/api/mall/trade/delivery/pickUpStore';
 
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -9,7 +9,7 @@ import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import {
-  bindStoreStaffId,
+  bindDeliveryPickUpStore,
   getDeliveryPickUpStore,
 } from '#/api/mall/trade/delivery/pickUpStore';
 import { $t } from '#/locales';
@@ -18,11 +18,6 @@ import { useBindFormSchema } from '../data';
 
 const emit = defineEmits(['success']);
 const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>();
-const getTitle = computed(() => {
-  return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['绑定店员'])
-    : $t('ui.actionTitle.create', ['绑定店员']);
-});
 
 const [Form, formApi] = useVbenForm({
   commonConfig: {
@@ -46,9 +41,9 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data =
-      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.BindStaffRequest;
+      (await formApi.getValues()) as MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO;
     try {
-      await bindStoreStaffId(data);
+      await bindDeliveryPickUpStore(data);
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -64,7 +59,7 @@ const [Modal, modalApi] = useVbenModal({
     }
     // 加载数据
     const data =
-      modalApi.getData<MallDeliveryPickUpStoreApi.BindStaffRequest>();
+      modalApi.getData<MallDeliveryPickUpStoreApi.DeliveryPickUpBindReqVO>();
     if (!data || !data.id) {
       return;
     }
@@ -72,6 +67,9 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getDeliveryPickUpStore(data.id);
       // 设置到 values
+      formData.value.verifyUserIds = formData.value.verifyUsers?.map(
+        (item: any) => item.id,
+      );
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
@@ -81,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal title="绑定店员" class="w-2/5">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
index 99636a2fb014ab55718a590629436e59d6f7583b..79d7ea8b3cbca5d6e01d42ef070d388d7f16c7ec 100644
--- a/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
+++ b/apps/web-antd/src/views/mall/trade/delivery/pickUpStore/modules/form.vue
@@ -5,10 +5,11 @@ import { computed, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
-import { message } from 'ant-design-vue';
+import { Button, message } from 'ant-design-vue';
 import dayjs from 'dayjs';
 
 import { useVbenForm } from '#/adapter/form';
+import { getTradeConfig } from '#/api/mall/trade/config';
 import {
   createDeliveryPickUpStore,
   getDeliveryPickUpStore,
@@ -22,19 +23,63 @@ const emit = defineEmits(['success']);
 const formData = ref<MallDeliveryPickUpStoreApi.PickUpStore>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['自提订单'])
-    : $t('ui.actionTitle.create', ['自提订单']);
+    ? $t('ui.actionTitle.edit', ['门店'])
+    : $t('ui.actionTitle.create', ['门店']);
 });
 
+const mapVisible = ref(false); // 是否显示地图弹窗
+const tencentLbsUrl = ref(''); // 腾讯位置服务 url
+
+/** 获取经纬度相关方法 */
+function selectAddress(loc: any) {
+  if (loc.latlng?.lat) {
+    formApi.setFieldValue('latitude', loc.latlng.lat);
+  }
+  if (loc.latlng?.lng) {
+    formApi.setFieldValue('longitude', loc.latlng.lng);
+  }
+  mapVisible.value = false;
+}
+
+/** 初始化腾讯地图 */
+async function initTencentLbsMap() {
+  // 从配置中获取腾讯地图的 key
+  const data = await getTradeConfig();
+  const key = data.tencentLbsKey;
+  if (!key) {
+    message.warning('请先配置腾讯位置服务的 key');
+    return;
+  }
+
+  // 设置 url
+  if (!window) {
+    return;
+  }
+  (window as any).selectAddress = selectAddress;
+  window.addEventListener(
+    'message',
+    (event) => {
+      // 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+      const loc = event.data;
+      if (loc && loc.module === 'locationPicker') {
+        // 防止其他应用也会向该页面 post 信息，需判断 module 是否为 'locationPicker'
+        (window.parent as any).selectAddress(loc);
+      }
+    },
+    false,
+  );
+  tencentLbsUrl.value = `https://apis.map.qq.com/tools/locpicker?type=1&key=${key}&referer=myapp`;
+}
+
 const [Form, formApi] = useVbenForm({
   commonConfig: {
     componentProps: {
       class: 'w-full',
     },
-    formItemClass: 'col-span-2',
     labelWidth: 120,
   },
   fieldMappingTime: [['rangeTime', ['openingTime', 'closingTime'], 'HH:mm']],
+  wrapperClass: 'grid-cols-2',
   layout: 'horizontal',
   schema: useFormSchema(),
   showDefaultActions: false,
@@ -70,6 +115,8 @@ const [Modal, modalApi] = useVbenModal({
     // 加载数据
     const data = modalApi.getData<MallDeliveryPickUpStoreApi.PickUpStore>();
     if (!data || !data.id) {
+      // 初始化地图
+      await initTencentLbsMap();
       return;
     }
     modalApi.lock();
@@ -83,13 +130,32 @@ const [Modal, modalApi] = useVbenModal({
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
+      // 初始化地图
+      await initTencentLbsMap();
     }
   },
 });
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-4" />
+    <template #prepend-footer>
+      <Button @click="mapVisible = true"> 获取经纬度 </Button>
+    </template>
   </Modal>
+
+  <!-- 地图弹窗 -->
+  <a-modal
+    v-model:open="mapVisible"
+    title="获取经纬度"
+    :width="800"
+    :footer="null"
+  >
+    <iframe
+      v-if="mapVisible && tencentLbsUrl"
+      :src="tencentLbsUrl"
+      class="h-[600px] w-full border-0"
+    ></iframe>
+  </a-modal>
 </template>
diff --git a/apps/web-antd/src/views/pay/app/data.ts b/apps/web-antd/src/views/pay/app/data.ts
index 451faa62b39c1988401ba9110d64d3839c70ba6b..2de2057f2cd6e935de8dab70dc49587bdcbe8def 100644
--- a/apps/web-antd/src/views/pay/app/data.ts
+++ b/apps/web-antd/src/views/pay/app/data.ts
@@ -46,10 +46,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = PayAppApi.App>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: PayAppApi.App,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/pay/demo/order/data.ts b/apps/web-antd/src/views/pay/demo/order/data.ts
index 9f4b30aa7045ccdec5b08b9eb3c01f2212c176cf..429e5a2b0ecefbd16f09c70ac5b93310dc1ecdae 100644
--- a/apps/web-antd/src/views/pay/demo/order/data.ts
+++ b/apps/web-antd/src/views/pay/demo/order/data.ts
@@ -97,7 +97,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 180,
       formatter: ({ cellValue, row }) => {
         if (cellValue) {
-          return formatDateTime(cellValue);
+          return formatDateTime(cellValue) as string;
         }
         if (row.payRefundId) {
           return '退款中，等待退款结果';
diff --git a/apps/web-antd/src/views/system/dept/data.ts b/apps/web-antd/src/views/system/dept/data.ts
index 4a995e666883241259e3139139e1051d9603151c..dd30cb29affa09b8b44f31f975c62545b9188761 100644
--- a/apps/web-antd/src/views/system/dept/data.ts
+++ b/apps/web-antd/src/views/system/dept/data.ts
@@ -1,6 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -10,6 +11,13 @@ import { z } from '#/adapter/form';
 import { getDeptList } from '#/api/system/dept';
 import { getSimpleUserList } from '#/api/system/user';
 
+let userList: SystemUserApi.User[] = [];
+async function getUserData() {
+  userList = await getSimpleUserList();
+}
+
+getUserData();
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -109,9 +117,7 @@ export function useFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(
-  getLeaderName?: (userId: number) => string | undefined,
-): VxeTableGridOptions<SystemDeptApi.Dept>['columns'] {
+export function useGridColumns(): VxeTableGridOptions<SystemDeptApi.Dept>['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
@@ -126,7 +132,8 @@ export function useGridColumns(
       field: 'leaderUserId',
       title: '负责人',
       minWidth: 150,
-      formatter: ({ cellValue }) => getLeaderName?.(cellValue) || '-',
+      formatter: ({ cellValue }) =>
+        userList.find((user) => user.id === cellValue)?.nickname || '-',
     },
     {
       field: 'sort',
diff --git a/apps/web-antd/src/views/system/dept/index.vue b/apps/web-antd/src/views/system/dept/index.vue
index eb8c552a2d6d2155d02d5c7d46a06ae9496316d5..e85b290c294ceb01cae0e6b6c26e5cb95254386d 100644
--- a/apps/web-antd/src/views/system/dept/index.vue
+++ b/apps/web-antd/src/views/system/dept/index.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
-import type { SystemUserApi } from '#/api/system/user';
 
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 
 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { isEmpty } from '@vben/utils';
@@ -12,7 +11,6 @@ import { message } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteDept, deleteDeptList, getDeptList } from '#/api/system/dept';
-import { getSimpleUserList } from '#/api/system/user';
 import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
@@ -23,12 +21,6 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 获取负责人名称 */
-const userList = ref<SystemUserApi.User[]>([]);
-function getLeaderName(userId: number) {
-  return userList.value.find((user) => user.id === userId)?.nickname;
-}
-
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
 function handleExpand() {
@@ -99,7 +91,7 @@ function handleRowCheckboxChange({
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: useGridColumns(getLeaderName),
+    columns: useGridColumns(),
     height: 'auto',
     pagerConfig: {
       enabled: false,
@@ -132,11 +124,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     checkboxChange: handleRowCheckboxChange,
   },
 });
-
-/** 初始化 */
-onMounted(async () => {
-  userList.value = await getSimpleUserList();
-});
 </script>
 
 <template>
diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
index 681f9df4c453b7cb2386c39ce9edf42760f3a2d1..c453246b25037cdfca9b76fa0cfd46f43dfdf173 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
@@ -8,7 +8,7 @@ import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemDataScopeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
-import { Checkbox, message } from 'ant-design-vue';
+import { Checkbox, message, Spin } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getDeptList } from '#/api/system/dept';
@@ -134,18 +134,18 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal title="数据权限" class="w-2/5">
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
-        <Tree
-          :tree-data="deptTree"
-          multiple
-          bordered
-          :spinning="deptLoading"
-          :expanded="expandedKeys"
-          v-bind="slotProps"
-          value-field="id"
-          label-field="name"
-          :auto-check-parent="false"
-          :check-strictly="!isCheckStrictly"
-        />
+        <Spin :spinning="deptLoading" wrapper-class-name="w-full">
+          <Tree
+            :tree-data="deptTree"
+            multiple
+            bordered
+            :default-expanded-keys="expandedKeys"
+            v-bind="slotProps"
+            :check-strictly="!isCheckStrictly"
+            value-field="id"
+            label-field="name"
+          />
+        </Spin>
       </template>
     </Form>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index 35195cca083999e73b349bd8f569ac430d42dc01..de7b51cc7cc7f17a9a52447f05c19ce863163e46 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -10,7 +10,7 @@ import { Tree, useVbenModal } from '@vben/common-ui';
 import { SystemMenuTypeEnum } from '@vben/constants';
 import { handleTree } from '@vben/utils';
 
-import { Checkbox, message } from 'ant-design-vue';
+import { Checkbox, message, Spin } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getSimpleMenusList } from '#/api/system/menu';
@@ -142,17 +142,18 @@ function getNodeClass(node: Recordable<any>) {
   <Modal title="菜单权限" class="w-2/5">
     <Form class="mx-4">
       <template #menuIds="slotProps">
-        <Tree
-          :spinning="menuLoading"
-          :tree-data="menuTree"
-          multiple
-          bordered
-          :expanded="expandedKeys"
-          :get-node-class="getNodeClass"
-          v-bind="slotProps"
-          value-field="id"
-          label-field="name"
-        />
+        <Spin :spinning="menuLoading" wrapper-class-name="w-full">
+          <Tree
+            :tree-data="menuTree"
+            multiple
+            bordered
+            :default-expanded-keys="expandedKeys"
+            :get-node-class="getNodeClass"
+            v-bind="slotProps"
+            value-field="id"
+            label-field="name"
+          />
+        </Spin>
       </template>
     </Form>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/system/tenant/data.ts b/apps/web-antd/src/views/system/tenant/data.ts
index 2ef061026d1cf92b7c699cc1d157b4b71fe7b0f9..df1499f5cd8c0d22b501fd8717dc59a594da67cb 100644
--- a/apps/web-antd/src/views/system/tenant/data.ts
+++ b/apps/web-antd/src/views/system/tenant/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -8,6 +9,14 @@ import { z } from '#/adapter/form';
 import { getTenantPackageList } from '#/api/system/tenant-package';
 import { getRangePickerDefaultProps } from '#/utils';
 
+let tenantPackageList: SystemTenantPackageApi.TenantPackage[] = [];
+
+async function getTenantPackageData() {
+  tenantPackageList = await getTenantPackageList();
+}
+
+getTenantPackageData();
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -163,9 +172,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(
-  getPackageName?: (packageId: number) => string | undefined,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
@@ -182,8 +189,10 @@ export function useGridColumns(
       field: 'packageId',
       title: '租户套餐',
       minWidth: 180,
-      formatter: (row: { cellValue: number }) => {
-        return getPackageName?.(row.cellValue) || '-';
+      formatter: ({ cellValue }) => {
+        return cellValue === 0
+          ? '系统租户'
+          : tenantPackageList.find((pkg) => pkg.id === cellValue)?.name || '-';
       },
     },
     {
diff --git a/apps/web-antd/src/views/system/tenant/index.vue b/apps/web-antd/src/views/system/tenant/index.vue
index 8e4ec4cc556e623fbd96c8dd0939df8abeb6334a..ba35ef620a6913b0d99ad7d81bc1b6cf6acf8722 100644
--- a/apps/web-antd/src/views/system/tenant/index.vue
+++ b/apps/web-antd/src/views/system/tenant/index.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemTenantApi } from '#/api/system/tenant';
-import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
@@ -17,22 +16,11 @@ import {
   exportTenant,
   getTenantPage,
 } from '#/api/system/tenant';
-import { getTenantPackageList } from '#/api/system/tenant-package';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
-const tenantPackageList = ref<SystemTenantPackageApi.TenantPackage[]>([]);
-
-/** 获取套餐名称 */
-const getPackageName = (packageId: number) => {
-  if (packageId === 0) {
-    return '系统租户';
-  }
-  return tenantPackageList.value.find((pkg) => pkg.id === packageId)?.name;
-};
-
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -105,7 +93,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(getPackageName),
+    columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -133,11 +121,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     checkboxChange: handleRowCheckboxChange,
   },
 });
-
-/** 初始化 */
-onMounted(async () => {
-  tenantPackageList.value = await getTenantPackageList();
-});
 </script>
 <template>
   <Page auto-content-height>
diff --git a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
index 716da19422907abeb32e6558648fdea394231010..19702165b08f3ec1e700921cb2a054b5a40e4f39 100644
--- a/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-antd/src/views/system/tenantPackage/modules/form.vue
@@ -7,7 +7,7 @@ import { computed, ref } from 'vue';
 import { Tree, useVbenModal } from '@vben/common-ui';
 import { handleTree } from '@vben/utils';
 
-import { Checkbox, message } from 'ant-design-vue';
+import { Checkbox, message, Spin } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { getMenuList } from '#/api/system/menu';
@@ -134,17 +134,18 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
   <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-6">
       <template #menuIds="slotProps">
-        <Tree
-          class="max-h-96 overflow-y-auto"
-          :loading="menuLoading"
-          :tree-data="menuTree"
-          multiple
-          bordered
-          :expanded="expandedKeys"
-          v-bind="slotProps"
-          value-field="id"
-          label-field="name"
-        />
+        <Spin :spinning="menuLoading" wrapper-class-name="w-full">
+          <Tree
+            class="max-h-96 overflow-y-auto"
+            :tree-data="menuTree"
+            multiple
+            bordered
+            :default-expanded-keys="expandedKeys"
+            v-bind="slotProps"
+            value-field="id"
+            label-field="name"
+          />
+        </Spin>
       </template>
     </Form>
     <template #prepend-footer>
diff --git a/apps/web-antd/src/views/system/user/data.ts b/apps/web-antd/src/views/system/user/data.ts
index a568e23bf3d62cbde3f5535a1532dfd294b53953..fca5ddefd5420611440258687d840ee1fa955704 100644
--- a/apps/web-antd/src/views/system/user/data.ts
+++ b/apps/web-antd/src/views/system/user/data.ts
@@ -281,10 +281,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = SystemUserApi.User>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: SystemUserApi.User,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-antd/src/views/system/user/modules/dept-tree.vue b/apps/web-antd/src/views/system/user/modules/dept-tree.vue
index 9b86c08203d54b1ce8af1faa3cba715831afe64a..a65624c7586f5f4f188907df2e0cc997b8f9bd6d 100644
--- a/apps/web-antd/src/views/system/user/modules/dept-tree.vue
+++ b/apps/web-antd/src/views/system/user/modules/dept-tree.vue
@@ -6,7 +6,7 @@ import { onMounted, ref } from 'vue';
 import { Search } from '@vben/icons';
 import { handleTree } from '@vben/utils';
 
-import { Input, Tree } from 'ant-design-vue';
+import { Input, Spin, Tree } from 'ant-design-vue';
 
 import { getSimpleDeptList } from '#/api/system/dept';
 
@@ -64,17 +64,18 @@ onMounted(async () => {
         <Search class="size-4" />
       </template>
     </Input>
-    <Tree
-      :spinning="loading"
-      class="pt-2"
-      v-if="deptTree.length > 0"
-      :tree-data="deptTree"
-      :field-names="{ title: 'name', key: 'id', children: 'children' }"
-      @select="handleSelect"
-      :default-expand-all="true"
-    />
-    <div v-else-if="!loading" class="py-4 text-center text-gray-500">
-      暂无数据
-    </div>
+    <Spin :spinning="loading" wrapper-class-name="w-full">
+      <Tree
+        @select="handleSelect"
+        v-if="deptTree.length > 0"
+        class="pt-2"
+        :tree-data="deptTree"
+        :default-expand-all="true"
+        :field-names="{ title: 'name', key: 'id', children: 'children' }"
+      />
+      <div v-else-if="!loading" class="py-4 text-center text-gray-500">
+        暂无数据
+      </div>
+    </Spin>
   </div>
 </template>
diff --git a/apps/web-ele/src/api/mall/trade/brokerage/record/index.ts b/apps/web-ele/src/api/mall/trade/brokerage/record/index.ts
index 86ce41bafd8374e5bc5665a1d29eb2daa8f581d2..1b6e8b3a41d792d4d2d806650b10aa8d92b46b85 100644
--- a/apps/web-ele/src/api/mall/trade/brokerage/record/index.ts
+++ b/apps/web-ele/src/api/mall/trade/brokerage/record/index.ts
@@ -5,28 +5,17 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageRecordApi {
   /** 佣金记录 */
   export interface BrokerageRecord {
-    /** 编号 */
-    id: number;
-    /** 用户编号 */
-    userId: number;
-    /** 用户昵称 */
-    userNickname: string;
-    /** 用户头像 */
-    userAvatar: string;
-    /** 佣金金额，单位：分 */
-    price: number;
-    /** 佣金类型 */
-    type: number;
-    /** 关联订单编号 */
-    orderId: number;
-    /** 关联订单号 */
-    orderNo: string;
-    /** 创建时间 */
-    createTime: Date;
-    /** 状态 */
-    status: number;
-    /** 结算时间 */
-    settlementTime: Date;
+    id: number; // 编号
+    userId: number; // 用户编号
+    userNickname: string; // 用户昵称
+    userAvatar: string; // 用户头像
+    price: number; // 佣金金额，单位：分
+    type: number; // 佣金类型
+    orderId: number; // 关联订单编号
+    orderNo: string; // 关联订单号
+    createTime: Date; // 创建时间
+    status: number; // 状态
+    settlementTime: Date; // 结算时间
   }
 }
 
diff --git a/apps/web-ele/src/api/mall/trade/brokerage/user/index.ts b/apps/web-ele/src/api/mall/trade/brokerage/user/index.ts
index 51c24f25afa1e7c4786b48cefb0d80d9239be5c6..4ef235af89c4d46e7d5302146f62c16854d142eb 100644
--- a/apps/web-ele/src/api/mall/trade/brokerage/user/index.ts
+++ b/apps/web-ele/src/api/mall/trade/brokerage/user/index.ts
@@ -5,59 +5,45 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageUserApi {
   /** 分销用户 */
   export interface BrokerageUser {
-    /** 编号 */
-    id: number;
-    /** 推广员编号 */
-    bindUserId: number;
-    /** 推广员绑定时间 */
-    bindUserTime: Date;
-    /** 是否启用分销 */
-    brokerageEnabled: boolean;
-    /** 分销资格时间 */
-    brokerageTime: Date;
-    /** 可提现金额，单位：分 */
-    price: number;
-    /** 冻结金额，单位：分 */
-    frozenPrice: number;
-    /** 用户昵称 */
-    nickname: string;
-    /** 用户头像 */
-    avatar: string;
+    id: number; // 编号
+    bindUserId: number; // 推广员编号
+    bindUserTime: Date; // 推广员绑定时间
+    brokerageEnabled: boolean; // 是否启用分销
+    brokerageTime: Date; // 分销资格时间
+    price: number; // 可提现金额，单位：分
+    frozenPrice: number; // 冻结金额，单位：分
+    nickname: string; // 用户昵称
+    avatar: string; // 用户头像
   }
 
   /** 创建分销用户请求 */
-  export interface CreateRequest {
-    /** 用户编号 */
-    userId: number;
-    /** 推广员编号 */
-    bindUserId: number;
+  export interface BrokerageUserCreateReqVO {
+    userId: number; // 用户编号
+    bindUserId: number; // 推广员编号
   }
 
   /** 修改推广员请求 */
-  export interface UpdateBindUserRequest {
-    /** 用户编号 */
-    id: number;
-    /** 推广员编号 */
-    bindUserId: number;
+  export interface BrokerageUserUpdateReqVO {
+    id: number; // 用户编号
+    bindUserId: number; // 推广员编号
   }
 
   /** 清除推广员请求 */
-  export interface ClearBindUserRequest {
-    /** 用户编号 */
-    id: number;
+  export interface BrokerageUserClearBrokerageUserReqVO {
+    id: number; // 用户编号
   }
 
   /** 修改推广资格请求 */
-  export interface UpdateBrokerageEnabledRequest {
-    /** 用户编号 */
-    id: number;
-    /** 是否启用分销 */
-    enabled: boolean;
+  export interface BrokerageUserUpdateBrokerageEnabledReqVO {
+    id: number; // 用户编号
+    enabled: boolean; // 是否启用分销
   }
 }
 
 /** 创建分销用户 */
-export function createBrokerageUser(data: MallBrokerageUserApi.CreateRequest) {
+export function createBrokerageUser(
+  data: MallBrokerageUserApi.BrokerageUserCreateReqVO,
+) {
   return requestClient.post('/trade/brokerage-user/create', data);
 }
 
@@ -78,19 +64,21 @@ export function getBrokerageUser(id: number) {
 
 /** 修改推广员 */
 export function updateBindUser(
-  data: MallBrokerageUserApi.UpdateBindUserRequest,
+  data: MallBrokerageUserApi.BrokerageUserUpdateReqVO,
 ) {
   return requestClient.put('/trade/brokerage-user/update-bind-user', data);
 }
 
 /** 清除推广员 */
-export function clearBindUser(data: MallBrokerageUserApi.ClearBindUserRequest) {
+export function clearBindUser(
+  data: MallBrokerageUserApi.BrokerageUserClearBrokerageUserReqVO,
+) {
   return requestClient.put('/trade/brokerage-user/clear-bind-user', data);
 }
 
 /** 修改推广资格 */
 export function updateBrokerageEnabled(
-  data: MallBrokerageUserApi.UpdateBrokerageEnabledRequest,
+  data: MallBrokerageUserApi.BrokerageUserUpdateBrokerageEnabledReqVO,
 ) {
   return requestClient.put(
     '/trade/brokerage-user/update-brokerage-enable',
diff --git a/apps/web-ele/src/api/mall/trade/brokerage/withdraw/index.ts b/apps/web-ele/src/api/mall/trade/brokerage/withdraw/index.ts
index 08acdb4fc47380ff26500141cf95949cd2970e63..12af60518bbae19819a099d6f018f5514f316d78 100644
--- a/apps/web-ele/src/api/mall/trade/brokerage/withdraw/index.ts
+++ b/apps/web-ele/src/api/mall/trade/brokerage/withdraw/index.ts
@@ -5,52 +5,31 @@ import { requestClient } from '#/api/request';
 export namespace MallBrokerageWithdrawApi {
   /** 佣金提现 */
   export interface BrokerageWithdraw {
-    /** 编号 */
-    id: number;
-    /** 用户编号 */
-    userId: number;
-    /** 提现金额，单位：分 */
-    price: number;
-    /** 手续费，单位：分 */
-    feePrice: number;
-    /** 总金额，单位：分 */
-    totalPrice: number;
-    /** 提现类型 */
-    type: number;
-    /** 用户名称 */
-    userName: string;
-    /** 用户账号 */
-    userAccount: string;
-    /** 银行名称 */
-    bankName: string;
-    /** 银行地址 */
-    bankAddress: string;
-    /** 收款码地址 */
-    qrCodeUrl: string;
-    /** 状态 */
-    status: number;
-    /** 审核备注 */
-    auditReason: string;
-    /** 审核时间 */
-    auditTime: Date;
-    /** 备注 */
-    remark: string;
-    /** 支付转账编号 */
-    payTransferId?: number;
-    /** 转账渠道编码 */
-    transferChannelCode?: string;
-    /** 转账时间 */
-    transferTime?: Date;
-    /** 转账错误信息 */
-    transferErrorMsg?: string;
+    id: number; // 编号
+    userId: number; // 用户编号
+    price: number; // 提现金额，单位：分
+    feePrice: number; // 手续费，单位：分
+    totalPrice: number; // 总金额，单位：分
+    type: number; // 提现类型
+    userName: string; // 用户名称
+    userAccount: string; // 用户账号
+    bankName: string; // 银行名称
+    bankAddress: string; // 银行地址
+    qrCodeUrl: string; // 收款码地址
+    status: number; // 状态
+    auditReason: string; // 审核备注
+    auditTime: Date; // 审核时间
+    remark: string; // 备注
+    payTransferId?: number; // 支付转账编号
+    transferChannelCode?: string; // 转账渠道编码
+    transferTime?: Date; // 转账时间
+    transferErrorMsg?: string; // 转账错误信息
   }
 
   /** 驳回申请请求 */
   export interface RejectRequest {
-    /** 编号 */
-    id: number;
-    /** 驳回原因 */
-    auditReason: string;
+    id: number; // 编号
+    auditReason: string; // 驳回原因
   }
 }
 
diff --git a/apps/web-ele/src/api/mall/trade/delivery/expressTemplate/index.ts b/apps/web-ele/src/api/mall/trade/delivery/expressTemplate/index.ts
index fa81b169bab6619dbb705ec1666d30bfae6ee58c..be6a38a6da2de0faed4a21973ba3ffa9c3aa351d 100644
--- a/apps/web-ele/src/api/mall/trade/delivery/expressTemplate/index.ts
+++ b/apps/web-ele/src/api/mall/trade/delivery/expressTemplate/index.ts
@@ -38,9 +38,9 @@ export namespace MallDeliveryExpressTemplateApi {
     /** 排序 */
     sort: number;
     /** 计费区域列表 */
-    templateCharge: TemplateCharge[];
+    charges: TemplateCharge[];
     /** 包邮区域列表 */
-    templateFree: TemplateFree[];
+    frees: TemplateFree[];
   }
 
   /** 运费模板精简信息 */
diff --git a/apps/web-ele/src/api/system/dict/data/index.ts b/apps/web-ele/src/api/system/dict/data/index.ts
index 674eb01e4a5f14a590075397fde8f1ea57f4180f..28f94d504ea4da01fa1b68eb66c5f46cc1f71c58 100644
--- a/apps/web-ele/src/api/system/dict/data/index.ts
+++ b/apps/web-ele/src/api/system/dict/data/index.ts
@@ -1,4 +1,4 @@
-import type { PageParam } from '@vben/request';
+import type { PageParam, PageResult } from '@vben/request';
 
 import { requestClient } from '#/api/request';
 
@@ -20,17 +20,24 @@ export namespace SystemDictDataApi {
 
 // 查询字典数据（精简)列表
 export function getSimpleDictDataList() {
-  return requestClient.get('/system/dict-data/simple-list');
+  return requestClient.get<SystemDictDataApi.DictData[]>(
+    '/system/dict-data/simple-list',
+  );
 }
 
 // 查询字典数据列表
 export function getDictDataPage(params: PageParam) {
-  return requestClient.get('/system/dict-data/page', { params });
+  return requestClient.get<PageResult<SystemDictDataApi.DictData>>(
+    '/system/dict-data/page',
+    { params },
+  );
 }
 
 // 查询字典数据详情
 export function getDictData(id: number) {
-  return requestClient.get(`/system/dict-data/get?id=${id}`);
+  return requestClient.get<SystemDictDataApi.DictData>(
+    `/system/dict-data/get?id=${id}`,
+  );
 }
 
 // 新增字典数据
diff --git a/apps/web-ele/src/api/system/dict/type/index.ts b/apps/web-ele/src/api/system/dict/type/index.ts
index eb2f9c9d4847278e6b1a3643d8d322363664efe8..7fb426337803ce4ef39e5b88d15559cb92a41a79 100644
--- a/apps/web-ele/src/api/system/dict/type/index.ts
+++ b/apps/web-ele/src/api/system/dict/type/index.ts
@@ -1,3 +1,5 @@
+import type { PageParam, PageResult } from '@vben/request';
+
 import { requestClient } from '#/api/request';
 
 export namespace SystemDictTypeApi {
@@ -14,17 +16,24 @@ export namespace SystemDictTypeApi {
 
 // 查询字典（精简)列表
 export function getSimpleDictTypeList() {
-  return requestClient.get('/system/dict-type/list-all-simple');
+  return requestClient.get<SystemDictTypeApi.DictType[]>(
+    '/system/dict-type/list-all-simple',
+  );
 }
 
 // 查询字典列表
-export function getDictTypePage(params: any) {
-  return requestClient.get('/system/dict-type/page', { params });
+export function getDictTypePage(params: PageParam) {
+  return requestClient.get<PageResult<SystemDictTypeApi.DictType>>(
+    '/system/dict-type/page',
+    { params },
+  );
 }
 
 // 查询字典详情
 export function getDictType(id: number) {
-  return requestClient.get(`/system/dict-type/get?id=${id}`);
+  return requestClient.get<SystemDictTypeApi.DictType>(
+    `/system/dict-type/get?id=${id}`,
+  );
 }
 
 // 新增字典
diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-combination/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-combination/property.vue
index 410b5a91b10149940508f8a712b16818c46fe669..dcccd7e6d488366457640d83d1bb4aa482544d2c 100644
--- a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-combination/property.vue
+++ b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-combination/property.vue
@@ -68,7 +68,7 @@ onMounted(async () => {
             </ElTooltip>
             <!--<el-tooltip class="item" content="三列" placement="bottom">
               <el-radio-button value="threeCol">
-                <Icon icon="fluent:text-column-three-24-filled" />
+                <IconifyIcon icon="fluent:text-column-three-24-filled" />
               </ElRadioButton>
             </ElTooltip>-->
           </ElRadioGroup>
diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-point/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-point/property.vue
index c028feacd42e05a3cd12d6cd65c6eec098e37b0b..adc87710d6fcbb615e458a4fc0773a82f8f6827c 100644
--- a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-point/property.vue
+++ b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-point/property.vue
@@ -53,7 +53,7 @@ const formData = useVModel(props, 'modelValue', emit);
             </ElTooltip>
             <!--<el-tooltip class="item" content="三列" placement="bottom">
               <el-radio-button value="threeCol">
-                <Icon icon="fluent:text-column-three-24-filled" />
+                <IconifyIcon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </el-tooltip>-->
           </ElRadioGroup>
diff --git a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-seckill/property.vue b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-seckill/property.vue
index 79a2ba6e99259ba324dc0bcd860f18e3621a4a6a..b97b1d9e102443f4ad9a686294a58b04f3518c07 100644
--- a/apps/web-ele/src/components/diy-editor/components/mobile/promotion-seckill/property.vue
+++ b/apps/web-ele/src/components/diy-editor/components/mobile/promotion-seckill/property.vue
@@ -70,7 +70,7 @@ onMounted(async () => {
             </ElTooltip>
             <!--<el-tooltip class="item" content="三列" placement="bottom">
               <el-radio-button value="threeCol">
-                <Icon icon="fluent:text-column-three-24-filled" />
+                <IconifyIcon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
             </ElTooltip>-->
           </ElRadioGroup>
diff --git a/apps/web-ele/src/components/magic-cube-editor/index.vue b/apps/web-ele/src/components/magic-cube-editor/index.vue
index d834e80dac733c0c34b1ec66ad6939edde019e7a..809991d95776eaec5c9fbd854555df617fb4eb62 100644
--- a/apps/web-ele/src/components/magic-cube-editor/index.vue
+++ b/apps/web-ele/src/components/magic-cube-editor/index.vue
@@ -218,7 +218,7 @@ const eachCube = (callback: (x: number, y: number, cube: Cube) => void) => {
             @click="handleCubeClick(row, col)"
             @mouseenter="handleCellHover(row, col)"
           >
-            <Icon icon="ep-plus" />
+            <IconifyIcon icon="ep-plus" />
           </td>
         </tr>
       </tbody>
diff --git a/apps/web-ele/src/components/upload/image-upload.vue b/apps/web-ele/src/components/upload/image-upload.vue
index f57775656c478425fc632f90dde747815b3607c0..e8cc6a8897a20826d5256de76bc02114567ce2ac 100644
--- a/apps/web-ele/src/components/upload/image-upload.vue
+++ b/apps/web-ele/src/components/upload/image-upload.vue
@@ -13,7 +13,7 @@ import type { AxiosProgressEvent } from '#/api/infra/file';
 
 import { nextTick, ref, toRefs, watch } from 'vue';
 
-import { Plus } from '@vben/icons';
+import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { isFunction, isObject, isString } from '@vben/utils';
 
@@ -274,11 +274,11 @@ const triggerEdit = () => {
         <img :src="fileList[0].url" class="upload-image" />
         <div class="upload-handle">
           <div class="handle-icon" @click="handlePreview(fileList[0]!)">
-            <i class="el-icon el-icon-zoom-in"></i>
+            <IconifyIcon icon="lucide:circle-plus" />
             <span>详情</span>
           </div>
           <div v-if="!disabled" class="handle-icon" @click="triggerEdit">
-            <i class="el-icon el-icon-edit"></i>
+            <IconifyIcon icon="lucide:edit" />
             <span>编辑</span>
           </div>
           <div
@@ -286,7 +286,7 @@ const triggerEdit = () => {
             class="handle-icon"
             @click="handleRemove(fileList[0]!)"
           >
-            <i class="el-icon el-icon-delete"></i>
+            <IconifyIcon icon="lucide:trash" />
             <span>删除</span>
           </div>
         </div>
@@ -313,7 +313,7 @@ const triggerEdit = () => {
         }"
       >
         <div class="upload-content flex flex-col items-center justify-center">
-          <Plus />
+          <IconifyIcon icon="lucide:plus" />
         </div>
       </ElUpload>
     </template>
diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue
index fc8cf4c69c626a57abc48652c57cab048c9b2f35..51ecc387c4f8d1422fb54af5419df43a793ed90c 100644
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -13,7 +13,7 @@ import {
   AntdProfileOutlined,
   BookOpenText,
   CircleHelp,
-  MdiGithub,
+  SvgGithubIcon,
 } from '@vben/icons';
 import {
   BasicLayout,
@@ -79,7 +79,7 @@ const menus = computed(() => [
         target: '_blank',
       });
     },
-    icon: MdiGithub,
+    icon: SvgGithubIcon,
     text: 'GitHub',
   },
   {
@@ -202,11 +202,16 @@ onMounted(() => {
 });
 
 watch(
-  () => preferences.app.watermark,
-  async (enable) => {
+  () => ({
+    enable: preferences.app.watermark,
+    content: preferences.app.watermarkContent,
+  }),
+  async ({ enable, content }) => {
     if (enable) {
       await updateWatermark({
-        content: `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
+        content:
+          content ||
+          `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
       });
     } else {
       destroyWatermark();
diff --git a/apps/web-ele/src/views/infra/fileConfig/data.ts b/apps/web-ele/src/views/infra/fileConfig/data.ts
index ec13e43372634082d189ba026b43f0112be6cddb..c882e3accf911e07288f15095f97bfb4f3bb165f 100644
--- a/apps/web-ele/src/views/infra/fileConfig/data.ts
+++ b/apps/web-ele/src/views/infra/fileConfig/data.ts
@@ -37,7 +37,7 @@ export function useFormSchema(): VbenFormSchema[] {
       rules: 'required',
       dependencies: {
         triggerFields: ['id'],
-        show: (formValues) => !formValues.id,
+        disabled: (formValues) => formValues.id,
       },
     },
     {
@@ -257,7 +257,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入配置名',
-        allowClear: true,
+        clearable: true,
       },
     },
     {
@@ -267,7 +267,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         options: getDictOptions(DICT_TYPE.INFRA_FILE_STORAGE, 'number'),
         placeholder: '请选择存储器',
-        allowClear: true,
+        clearable: true,
       },
     },
     {
@@ -276,7 +276,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         ...getRangePickerDefaultProps(),
-        allowClear: true,
+        clearable: true,
       },
     },
   ];
diff --git a/apps/web-ele/src/views/mall/product/brand/data.ts b/apps/web-ele/src/views/mall/product/brand/data.ts
index 9bb6937cfc0b7320147c62daabc02025e4bb9f22..ff800271894f5bc29d7aa6a9f77e5d24e7c28cfa 100644
--- a/apps/web-ele/src/views/mall/product/brand/data.ts
+++ b/apps/web-ele/src/views/mall/product/brand/data.ts
@@ -1,5 +1,5 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -22,12 +22,18 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '品牌名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入品牌名称',
+      },
       rules: 'required',
     },
     {
       fieldName: 'picUrl',
       label: '品牌图片',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传品牌图片',
+      },
       rules: 'required',
     },
     {
@@ -36,10 +42,11 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        controlsPosition: 'right',
         placeholder: '请输入品牌排序',
+        controlsPosition: 'right',
+        class: '!w-full',
       },
-      rules: z.number().min(0).default(1),
+      rules: 'required',
     },
     {
       fieldName: 'status',
@@ -56,6 +63,9 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'description',
       label: '品牌描述',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入品牌描述',
+      },
     },
   ];
 }
@@ -67,6 +77,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '品牌名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入品牌名称',
+        clearable: true,
+      },
     },
     {
       fieldName: 'status',
@@ -74,6 +88,8 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        placeholder: '请选择品牌状态',
+        clearable: true,
       },
     },
     {
@@ -89,30 +105,30 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns(): VxeGridPropTypes.Columns {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'name',
-      title: '分类名称',
-      fixed: 'left',
+      title: '品牌名称',
+      minWidth: 180,
     },
     {
       field: 'picUrl',
       title: '品牌图片',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
-        props: {
-          class: 'w-10 h-10',
-        },
       },
     },
     {
       field: 'sort',
       title: '品牌排序',
+      minWidth: 100,
     },
     {
       field: 'status',
-      title: '开启状态',
+      title: '品牌状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -121,6 +137,7 @@ export function useGridColumns(): VxeGridPropTypes.Columns {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-ele/src/views/mall/product/brand/index.vue b/apps/web-ele/src/views/mall/product/brand/index.vue
index 0a93cefc6ce776f33bdaa5bff5b16e89eeb563f1..664c0c072e4540b160e2a23e89d08a4505b0f2d2 100644
--- a/apps/web-ele/src/views/mall/product/brand/index.vue
+++ b/apps/web-ele/src/views/mall/product/brand/index.vue
@@ -19,7 +19,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -39,9 +39,9 @@ async function handleDelete(row: MallBrandApi.Brand) {
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deleteBrand(row.id as number);
-    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    await deleteBrand(row.id!);
+    message.success($t('ui.actionMessage.deleteSuccess', [row.name]));
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -68,6 +68,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -79,7 +80,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="品牌列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-ele/src/views/mall/product/brand/modules/form.vue b/apps/web-ele/src/views/mall/product/brand/modules/form.vue
index 76103ce390681bf51520702811da4d55e6873140..4166564e77de1839b6571488470c5700790b46f1 100644
--- a/apps/web-ele/src/views/mall/product/brand/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/brand/modules/form.vue
@@ -18,8 +18,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallBrandApi.Brand>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['品牌'])
-    : $t('ui.actionTitle.create', ['品牌']);
+    ? $t('ui.actionTitle.edit', ['商品品牌'])
+    : $t('ui.actionTitle.create', ['商品品牌']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -28,7 +28,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 80,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -77,7 +77,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/product/category/data.ts b/apps/web-ele/src/views/mall/product/category/data.ts
index e88b558fc8e2976842f3d6f1ca5f4e7f93fd0aec..8dd27d68828e11352a668ae3d5565cee99c1370f 100644
--- a/apps/web-ele/src/views/mall/product/category/data.ts
+++ b/apps/web-ele/src/views/mall/product/category/data.ts
@@ -31,10 +31,7 @@ export function useFormSchema(): VbenFormSchema[] {
           data.unshift({
             id: 0,
             name: '顶级分类',
-            picUrl: '',
-            sort: 0,
-            status: 0,
-          });
+          } as MallCategoryApi.Category);
           return handleTree(data);
         },
         labelField: 'name',
@@ -58,6 +55,9 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'picUrl',
       label: '移动端分类图',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传移动端分类图',
+      },
       rules: 'required',
     },
     {
@@ -66,10 +66,11 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        controlsPosition: 'right',
         placeholder: '请输入分类排序',
+        controlsPosition: 'right',
+        class: '!w-full',
       },
-      rules: z.number().min(0).default(1),
+      rules: 'required',
     },
     {
       fieldName: 'status',
@@ -92,6 +93,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '分类名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入分类名称',
+        clearable: true,
+      },
     },
   ];
 }
@@ -102,6 +107,7 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'name',
       title: '分类名称',
+      minWidth: 200,
       align: 'left',
       fixed: 'left',
       treeNode: true,
@@ -109,6 +115,7 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'picUrl',
       title: '移动端分类图',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
       },
@@ -116,10 +123,12 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'sort',
       title: '分类排序',
+      minWidth: 100,
     },
     {
       field: 'status',
-      title: '开启状态',
+      title: '分类状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -128,11 +137,12 @@ export function useGridColumns(): VxeTableGridOptions<MallCategoryApi.Category>[
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 300,
+      width: 240,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-ele/src/views/mall/product/category/index.vue b/apps/web-ele/src/views/mall/product/category/index.vue
index 61ca069181fc67c0e3a4f5c8773add24317eda76..9b785ed443dfd0262078375750801f64048d3534 100644
--- a/apps/web-ele/src/views/mall/product/category/index.vue
+++ b/apps/web-ele/src/views/mall/product/category/index.vue
@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -41,24 +41,15 @@ function handleEdit(row: MallCategoryApi.Category) {
   formModalApi.setData(row).open();
 }
 
-/** 查看商品操作 */
-const router = useRouter(); // 路由
-const handleViewSpu = (id: number) => {
-  router.push({
-    name: 'ProductSpu',
-    query: { categoryId: id },
-  });
-};
-
 /** 删除分类 */
 async function handleDelete(row: MallCategoryApi.Category) {
   const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deleteCategory(row.id as number);
+    await deleteCategory(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -66,11 +57,20 @@ async function handleDelete(row: MallCategoryApi.Category) {
 
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(false);
-function toggleExpand() {
+function handleExpand() {
   isExpanded.value = !isExpanded.value;
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
+/** 查看商品操作 */
+const router = useRouter(); // 路由
+function handleViewSpu(id: number) {
+  router.push({
+    path: '/mall/product/spu',
+    query: { categoryId: id },
+  });
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -91,9 +91,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
+      search: true,
     },
     treeConfig: {
       parentField: 'parentId',
@@ -114,8 +116,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
-    <FormModal @success="onRefresh" />
-    <Grid>
+    <FormModal @success="handleRefresh" />
+    <Grid table-title="商品分类列表">
       <template #toolbar-tools>
         <TableAction
           :actions="[
@@ -129,16 +131,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
             {
               label: isExpanded ? '收缩' : '展开',
               type: 'primary',
-              onClick: toggleExpand,
+              onClick: handleExpand,
             },
           ]"
         />
       </template>
-      <template #name="{ row }">
-        <div class="flex w-full items-center gap-1">
-          <span class="flex-auto">{{ row.name }}</span>
-        </div>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
diff --git a/apps/web-ele/src/views/mall/product/category/modules/form.vue b/apps/web-ele/src/views/mall/product/category/modules/form.vue
index fdaea3c78f373ef0840889836cdd1804cc7d1bb2..1bb5e774d349ac11397dc9491d9ff4a69df46b24 100644
--- a/apps/web-ele/src/views/mall/product/category/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/category/modules/form.vue
@@ -21,8 +21,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallCategoryApi.Category>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['产品分类'])
-    : $t('ui.actionTitle.create', ['产品分类']);
+    ? $t('ui.actionTitle.edit', ['商品分类'])
+    : $t('ui.actionTitle.create', ['商品分类']);
 });
 
 const [Form, formApi] = useVbenForm({
@@ -31,7 +31,7 @@ const [Form, formApi] = useVbenForm({
       class: 'w-full',
     },
     formItemClass: 'col-span-2',
-    labelWidth: 120,
+    labelWidth: 100,
   },
   layout: 'horizontal',
   schema: useFormSchema(),
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-1/4">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/product/comment/data.ts b/apps/web-ele/src/views/mall/product/comment/data.ts
index 51b4a3543afd81e253aa6bf94a67b8077ff20427..2b412546d474bee9551ffcf2a2aff58066ce6869 100644
--- a/apps/web-ele/src/views/mall/product/comment/data.ts
+++ b/apps/web-ele/src/views/mall/product/comment/data.ts
@@ -1,7 +1,9 @@
+import type { VxeTableGridOptions } from '@vben/plugins/vxe-table';
+
 import type { VbenFormSchema } from '#/adapter/form';
-import type { VxeGridPropTypes } from '#/adapter/vxe-table';
 import type { MallCommentApi } from '#/api/mall/product/comment';
 
+import { z } from '#/adapter/form';
 import { getSpuSimpleList } from '#/api/mall/product/spu';
 import { getRangePickerDefaultProps } from '#/utils';
 
@@ -16,6 +18,7 @@ export function useFormSchema(): VbenFormSchema[] {
         show: () => false,
       },
     },
+    // TODO @puhui999：商品的选择
     {
       fieldName: 'spuId',
       label: '商品',
@@ -24,48 +27,57 @@ export function useFormSchema(): VbenFormSchema[] {
         api: getSpuSimpleList,
         labelField: 'name',
         valueField: 'id',
+        placeholder: '请选择商品',
       },
       rules: 'required',
     },
-    // TODO @霖：用户头像，有点丑，多了一层
     {
       fieldName: 'userAvatar',
       label: '用户头像',
       component: 'ImageUpload',
+      componentProps: {
+        placeholder: '请上传用户头像',
+      },
       rules: 'required',
     },
     {
       fieldName: 'userNickname',
       label: '用户名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户名称',
+      },
       rules: 'required',
     },
     {
       fieldName: 'content',
       label: '评论内容',
       component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入评论内容',
+      },
       rules: 'required',
     },
-    // TODO @霖：星级缺了；
+    // TODO @xingyu：ele 版本，rate 会无法使用。
     {
       fieldName: 'descriptionScores',
       label: '描述星级',
       component: 'Rate',
-      rules: 'required',
+      rules: z.number().min(1).max(5).default(5),
     },
     {
       fieldName: 'benefitScores',
       label: '服务星级',
       component: 'Rate',
-      rules: 'required',
+      rules: z.number().min(1).max(5).default(5),
     },
-    // TODO @霖：评价图片，有点丑，多了一层
     {
       fieldName: 'picUrls',
       label: '评论图片',
       component: 'ImageUpload',
       componentProps: {
         maxNumber: 9,
+        placeholder: '请上传评论图片',
       },
       rules: 'required',
     },
@@ -84,22 +96,36 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '已回复', value: true },
           { label: '未回复', value: false },
         ],
+        placeholder: '请选择回复状态',
+        clearable: true,
       },
     },
     {
       fieldName: 'spuName',
       label: '商品名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入商品名称',
+        clearable: true,
+      },
     },
     {
       fieldName: 'userNickname',
       label: '用户名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入用户名称',
+        clearable: true,
+      },
     },
     {
       fieldName: 'orderId',
       label: '订单编号',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入订单编号',
+        clearable: true,
+      },
     },
     {
       fieldName: 'createTime',
@@ -113,23 +139,24 @@ export function useGridFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 表格列配置 */
-// TODO @霖：列表的宽度需要优化下，样式~
-export function useGridColumns<T = MallCommentApi.Comment>(
+/** 列表的字段 */
+export function useGridColumns(
   onStatusChange?: (
     newStatus: boolean,
-    row: T,
+    row: MallCommentApi.Comment,
   ) => PromiseLike<boolean | undefined>,
-): VxeGridPropTypes.Columns {
+): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
       title: '评论编号',
       fixed: 'left',
+      minWidth: 80,
     },
     {
       field: 'skuPicUrl',
       title: '商品图片',
+      minWidth: 100,
       cellRender: {
         name: 'CellImage',
       },
@@ -137,7 +164,7 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'spuName',
       title: '商品名称',
-      minWidth: 200,
+      minWidth: 250,
     },
     {
       field: 'skuProperties',
@@ -154,22 +181,33 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'userNickname',
       title: '用户名称',
+      minWidth: 100,
     },
     {
       field: 'descriptionScores',
       title: '商品评分',
+      minWidth: 150,
+      slots: {
+        default: 'descriptionScores',
+      },
     },
     {
       field: 'benefitScores',
       title: '服务评分',
+      minWidth: 150,
+      slots: {
+        default: 'benefitScores',
+      },
     },
     {
       field: 'content',
       title: '评论内容',
+      minWidth: 210,
     },
     {
       field: 'picUrls',
       title: '评论图片',
+      minWidth: 120,
       cellRender: {
         name: 'CellImages',
       },
@@ -177,15 +215,18 @@ export function useGridColumns<T = MallCommentApi.Comment>(
     {
       field: 'replyContent',
       title: '回复内容',
+      minWidth: 250,
     },
     {
       field: 'createTime',
       title: '评论时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'visible',
       title: '是否展示',
+      minWidth: 110,
       align: 'center',
       cellRender: {
         attrs: { beforeChange: onStatusChange },
diff --git a/apps/web-ele/src/views/mall/product/comment/index.vue b/apps/web-ele/src/views/mall/product/comment/index.vue
index d93a4bf6b528cdaf2d3f91aed25f386fab6acb4c..cf1d142d7f4ab2172458bb788a5760a4a1a1a182 100644
--- a/apps/web-ele/src/views/mall/product/comment/index.vue
+++ b/apps/web-ele/src/views/mall/product/comment/index.vue
@@ -6,7 +6,7 @@ import { h } from 'vue';
 
 import { confirm, DocAlert, Page, prompt, useVbenModal } from '@vben/common-ui';
 
-import { ElInput, ElMessage } from 'element-plus';
+import { ElInput, ElMessage, ElRate } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -25,7 +25,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -40,6 +40,7 @@ function handleReply(row: MallCommentApi.Comment) {
     component: () => {
       return h(ElInput, {
         type: 'textarea',
+        placeholder: '请输入回复内容',
       });
     },
     content: row.content
@@ -50,16 +51,15 @@ function handleReply(row: MallCommentApi.Comment) {
   }).then(async (val) => {
     if (val) {
       await replyComment({
-        id: row.id as number,
+        id: row.id!,
         replyContent: val,
       });
-      onRefresh();
+      handleRefresh();
     }
   });
 }
 
 /** 更新状态 */
-// TODO @霖：貌似刷新后，就会触发
 async function handleStatusChange(
   newStatus: boolean,
   row: MallCommentApi.Comment,
@@ -67,12 +67,12 @@ async function handleStatusChange(
   return new Promise((resolve, reject) => {
     const text = newStatus ? '展示' : '隐藏';
     confirm({
-      content: `确认要${text + row.id}评论吗?`,
+      content: `确认要${text}该评论吗？`,
     })
       .then(async () => {
         // 更新状态
         const res = await updateCommentVisible({
-          id: row.id as number,
+          id: row.id!,
           visible: newStatus,
         });
         if (res) {
@@ -110,6 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -127,8 +128,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
         url="https://doc.iocoder.cn/mall/product-comment/"
       />
     </template>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="评论列表">
+      <template #descriptionScores="{ row }">
+        <ElRate v-model:value="row.descriptionScores" :disabled="true" />
+      </template>
+      <template #benefitScores="{ row }">
+        <ElRate v-model:value="row.benefitScores" :disabled="true" />
+      </template>
       <template #toolbar-tools>
         <TableAction
           :actions="[
diff --git a/apps/web-ele/src/views/mall/product/comment/modules/form.vue b/apps/web-ele/src/views/mall/product/comment/modules/form.vue
index a24d011ac8db16bb0d2cce2efb2415fe78094fcf..e3648c6b810f9641a6da92c52d3efd08307864ea 100644
--- a/apps/web-ele/src/views/mall/product/comment/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/comment/modules/form.vue
@@ -18,8 +18,8 @@ const emit = defineEmits(['success']);
 const formData = ref<MallCommentApi.Comment>();
 const getTitle = computed(() => {
   return formData.value?.id
-    ? $t('ui.actionTitle.edit', ['品牌'])
-    : $t('ui.actionTitle.create', ['品牌']);
+    ? $t('ui.actionTitle.edit', ['虚拟评论'])
+    : $t('ui.actionTitle.create', ['虚拟评论']);
 });
 
 const [Form, formApi] = useVbenForm({
diff --git a/apps/web-ele/src/views/mall/product/property/data.ts b/apps/web-ele/src/views/mall/product/property/data.ts
index 733c8fdcb08ea4b022523d52e35d72c3e74e2022..1fd2f2e8703b321accb8271d2094e059a8badbb7 100644
--- a/apps/web-ele/src/views/mall/product/property/data.ts
+++ b/apps/web-ele/src/views/mall/product/property/data.ts
@@ -2,10 +2,11 @@ import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { getPropertySimpleList } from '#/api/mall/product/property';
+import { getRangePickerDefaultProps } from '#/utils';
 
 // ============================== 属性 ==============================
 
-/** 类型新增/修改的表单 */
+/** 属性新增/修改的表单 */
 export function usePropertyFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -18,10 +19,10 @@ export function usePropertyFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性名称',
       },
       rules: 'required',
     },
@@ -36,53 +37,66 @@ export function usePropertyFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 类型列表的搜索表单 */
+/** 属性列表的搜索表单 */
 export function usePropertyGridFormSchema(): VbenFormSchema[] {
   return [
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性名称',
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
         clearable: true,
       },
     },
   ];
 }
 
-/** 类型列表的字段 */
+/** 属性列表的字段 */
 export function usePropertyGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '属性编号',
+      minWidth: 100,
     },
     {
       field: 'name',
-      title: '名称',
+      title: '属性名称',
+      minWidth: 200,
     },
     {
       field: 'remark',
       title: '备注',
+      minWidth: 180,
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 160,
+      minWidth: 120,
       fixed: 'right',
       slots: { default: 'actions' },
     },
   ];
 }
 
-// ============================== 值数据 ==============================
+// ============================== 属性值 ==============================
 
-/** 数据新增/修改的表单 */
+/** 属性值新增/修改的表单 */
 export function useValueFormSchema(): VbenFormSchema[] {
   return [
     {
@@ -95,11 +109,12 @@ export function useValueFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'propertyId',
-      label: '属性编号',
+      label: '属性',
       component: 'ApiSelect',
       componentProps: (values) => {
         return {
           api: getPropertySimpleList,
+          placeholder: '请选择属性',
           labelField: 'name',
           valueField: 'id',
           disabled: !!values.id,
@@ -112,10 +127,10 @@ export function useValueFormSchema(): VbenFormSchema[] {
     },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性值名称',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入名称',
+        placeholder: '请输入属性值名称',
       },
       rules: 'required',
     },
@@ -130,45 +145,61 @@ export function useValueFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 字典数据列表搜索表单 */
+/** 属性值列表搜索表单 */
 export function useValueGridFormSchema(): VbenFormSchema[] {
   return [
+    {
+      fieldName: 'propertyId',
+      label: '属性项',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getPropertySimpleList,
+        placeholder: '请选择属性项',
+        labelField: 'name',
+        valueField: 'id',
+        disabled: true,
+        clearable: false,
+      },
+    },
     {
       fieldName: 'name',
-      label: '名称',
+      label: '属性值名称',
       component: 'Input',
       componentProps: {
+        placeholder: '请输入属性值名称',
         clearable: true,
       },
     },
   ];
 }
 
-/**
- * 字典数据表格列
- */
+/** 属性值表格列 */
 export function useValueGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
-      title: '编号',
+      title: '属性值编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '属性值名称',
+      minWidth: 180,
     },
     {
       field: 'remark',
       title: '备注',
+      minWidth: 180,
     },
     {
       title: '创建时间',
       field: 'createTime',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       title: '操作',
-      width: 160,
+      minWidth: 120,
       fixed: 'right',
       slots: { default: 'actions' },
     },
diff --git a/apps/web-ele/src/views/mall/product/property/index.vue b/apps/web-ele/src/views/mall/product/property/index.vue
index 97036c490e405fe576ce7e5d18ad80c086c7f8f3..302b0a3205bffaf024fe06a4cce4b722cf6f091a 100644
--- a/apps/web-ele/src/views/mall/product/property/index.vue
+++ b/apps/web-ele/src/views/mall/product/property/index.vue
@@ -6,7 +6,7 @@ import { DocAlert, Page } from '@vben/common-ui';
 import PropertyGrid from './modules/property-grid.vue';
 import ValueGrid from './modules/value-grid.vue';
 
-const searchPropertyId = ref<number>(); // 搜索的属性ID
+const searchPropertyId = ref<number>(); // 搜索的属性 ID
 
 function handlePropertyIdSelect(propertyId: number) {
   searchPropertyId.value = propertyId;
diff --git a/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue b/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue
index 196843e53e64a50577ca2694ac919ca802da203a..f38757215ffc52ae44958524f2fd41cea6268f2c 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/property-grid.vue
@@ -1,8 +1,5 @@
 <script lang="ts" setup>
-import type {
-  VxeGridListeners,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallPropertyApi } from '#/api/mall/product/property';
 
 import { useVbenModal } from '@vben/common-ui';
@@ -24,7 +21,7 @@ const [PropertyFormModal, propertyFormModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -34,7 +31,7 @@ function handleCreate() {
 }
 
 /** 编辑属性 */
-function handleEdit(row: any) {
+function handleEdit(row: MallPropertyApi.Property) {
   propertyFormModalApi.setData(row).open();
 }
 
@@ -44,21 +41,14 @@ async function handleDelete(row: MallPropertyApi.Property) {
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deleteProperty(row.id as number);
+    await deleteProperty(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
 }
 
-/** 表格事件 */
-const gridEvents: VxeGridListeners<MallPropertyApi.Property> = {
-  cellClick: ({ row }) => {
-    emit('select', row.id);
-  },
-};
-
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: usePropertyGridFormSchema(),
@@ -81,20 +71,24 @@ const [Grid, gridApi] = useVbenVxeGrid({
     rowConfig: {
       keyField: 'id',
       isCurrent: true,
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
       search: true,
     },
   } as VxeTableGridOptions<MallPropertyApi.Property>,
-  gridEvents,
+  gridEvents: {
+    cellClick: ({ row }: { row: MallPropertyApi.Property }) => {
+      emit('select', row.id);
+    },
+  },
 });
 </script>
 
 <template>
   <div class="h-full">
-    <PropertyFormModal @success="onRefresh" />
-
+    <PropertyFormModal @success="handleRefresh" />
     <Grid table-title="属性列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
index 1be3dcf864052ad84fa394415c82d8c1bf66edd1..c54e6b3075088194a62db4dd7db38c3ab52c4ae0 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-form.vue
@@ -67,25 +67,19 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     // 加载数据
-    const data = modalApi.getData<
-      MallPropertyApi.PropertyValue | { propertyId?: string }
-    >();
-
-    // 如果有ID，表示是编辑
-    if (data && 'id' in data && data.id) {
-      modalApi.lock();
-      try {
-        formData.value = await getPropertyValue(data.id);
-        // 设置到 values
-        await formApi.setValues(formData.value);
-      } finally {
-        modalApi.unlock();
-      }
-    } else if (data && 'propertyId' in data && data.propertyId) {
-      // 新增时，如果传入了propertyId，则需要设置
-      await formApi.setValues({
-        propertyId: data.propertyId,
-      });
+    const data = modalApi.getData<MallPropertyApi.PropertyValue>();
+    if (!data || !data.id) {
+      // 设置 propertyId
+      await formApi.setValues(data);
+      return;
+    }
+    modalApi.lock();
+    try {
+      formData.value = await getPropertyValue(data.id);
+      // 设置到 values
+      await formApi.setValues(formData.value);
+    } finally {
+      modalApi.unlock();
     }
   },
 });
diff --git a/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue b/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue
index 8ac978fa875555a061d05cfc3bacc8509fab4342..f47358f3a95ae2a05ee75fbb04d7364ebf507bd2 100644
--- a/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue
+++ b/apps/web-ele/src/views/mall/product/property/modules/value-grid.vue
@@ -31,29 +31,29 @@ const [ValueFormModal, valueFormModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
-/** 创建字典数据 */
+/** 创建属性值 */
 function handleCreate() {
   valueFormModalApi.setData({ propertyId: props.propertyId }).open();
 }
 
-/** 编辑字典数据 */
+/** 编辑属性值 */
 function handleEdit(row: MallPropertyApi.PropertyValue) {
   valueFormModalApi.setData(row).open();
 }
 
-/** 删除字典数据 */
+/** 删除属性值 */
 async function handleDelete(row: MallPropertyApi.PropertyValue) {
   const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deletePropertyValue(row.id as number);
+    await deletePropertyValue(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -81,6 +81,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -89,20 +90,23 @@ const [Grid, gridApi] = useVbenVxeGrid({
   } as VxeTableGridOptions<MallPropertyApi.PropertyValue>,
 });
 
-/** 监听 dictType 变化，重新查询 */
+/** 监听 propertyId 变化，重新查询 */
 watch(
   () => props.propertyId,
-  () => {
-    if (props.propertyId) {
-      onRefresh();
+  (newPropertyId) => {
+    if (newPropertyId) {
+      // 设置搜索表单中的 propertyId
+      gridApi.formApi.setValues({ propertyId: newPropertyId });
+      handleRefresh();
     }
   },
+  { immediate: true },
 );
 </script>
 
 <template>
   <div class="flex h-full flex-col">
-    <ValueFormModal @success="onRefresh" />
+    <ValueFormModal @success="handleRefresh" />
 
     <Grid table-title="属性值列表">
       <template #toolbar-tools>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/data.ts b/apps/web-ele/src/views/mall/product/spu/components/data.ts
deleted file mode 100644
index ded4e766685289087641beb3a0d3702fd610fe36..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/data.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import type { PropertyAndValues } from './model';
-
-import type { MallSpuApi } from '#/api/mall/product/spu';
-
-/**
- * 获得商品的规格列表 - 商品相关的公共函数
- *
- * @param spu
- * @return PropertyAndValues 规格列表
- */
-const getPropertyList = (spu: MallSpuApi.Spu): PropertyAndValues[] => {
-  //  直接拿返回的 skus 属性逆向生成出 propertyList
-  const properties: PropertyAndValues[] = [];
-  // 只有是多规格才处理
-  if (spu.specType) {
-    spu.skus?.forEach((sku) => {
-      sku.properties?.forEach(
-        ({ propertyId, propertyName, valueId, valueName }) => {
-          // 添加属性
-          if (!properties?.some((item) => item.id === propertyId)) {
-            properties.push({
-              id: propertyId!,
-              name: propertyName!,
-              values: [],
-            });
-          }
-          // 添加属性值
-          const index = properties?.findIndex((item) => item.id === propertyId);
-          if (
-            index !== undefined &&
-            index >= 0 &&
-            !properties[index]!.values?.some((value) => value.id === valueId)
-          ) {
-            properties[index]!.values?.push({ id: valueId!, name: valueName! });
-          }
-        },
-      );
-    });
-  }
-  return properties;
-};
-
-export { getPropertyList };
diff --git a/apps/web-ele/src/views/mall/product/spu/components/delivery-form.vue b/apps/web-ele/src/views/mall/product/spu/components/delivery-form.vue
deleted file mode 100644
index 208a673042c4d5c640bc4fdb93e8f8d6ff37c303..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/delivery-form.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<script lang="ts" setup>
-import { watch } from 'vue';
-
-import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-
-import { ElMessage } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-import * as ExpressTemplateApi from '#/api/mall/trade/delivery/expressTemplate';
-
-const props = defineProps<{
-  propFormData: Object;
-}>();
-
-const emit = defineEmits(['update:activeName']);
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    formApi.setValues(data);
-  },
-);
-
-const validate = async () => {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  try {
-    // 校验通过更新数据
-    Object.assign(props.propFormData, formApi.getValues());
-  } catch (error) {
-    ElMessage.error('【物流设置】不完善，请填写相关信息');
-    emit('update:activeName', 'delivery');
-    throw error; // 目的截断之后的校验
-  }
-};
-defineExpose({ validate });
-
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: '!w-1/6',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'deliveryTypes',
-      label: '配送方式',
-      component: 'CheckboxGroup',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.TRADE_DELIVERY_TYPE, 'number'),
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'deliveryTemplateId',
-      label: '运费模板',
-      component: 'ApiSelect',
-      componentProps: {
-        api: ExpressTemplateApi.getSimpleTemplateList,
-        labelField: 'name',
-        valueField: 'id',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['deliveryTypes'],
-        show: (values) =>
-          values.deliveryTypes.includes(DeliveryTypeEnum.EXPRESS.type),
-      },
-    },
-  ],
-  showDefaultActions: false,
-});
-</script>
-<template>
-  <Form />
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/description-form.vue b/apps/web-ele/src/views/mall/product/spu/components/description-form.vue
deleted file mode 100644
index 139b8ead6f47f00df4994fe125a3291ca7692721..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/description-form.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<script lang="ts" setup>
-import { watch } from 'vue';
-
-import { ElMessage } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-
-const props = defineProps<{
-  propFormData: Object;
-}>();
-
-const emit = defineEmits(['update:activeName']);
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    formApi.setValues(data);
-  },
-);
-
-const validate = async () => {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  try {
-    // 校验通过更新数据
-    Object.assign(props.propFormData, formApi.getValues());
-  } catch (error) {
-    ElMessage.error('【商品详情】不完善，请填写相关信息');
-    emit('update:activeName', 'description');
-    throw error; // 目的截断之后的校验
-  }
-};
-defineExpose({ validate });
-
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: '!w-1/6',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'description',
-      label: '商品详情',
-      component: 'RichTextarea',
-      componentProps: {
-        placeholder: '请输入商品详情',
-        height: 1000,
-      },
-      rules: 'required',
-    },
-  ],
-  showDefaultActions: false,
-});
-</script>
-<template>
-  <Form />
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/info-form.vue b/apps/web-ele/src/views/mall/product/spu/components/info-form.vue
deleted file mode 100644
index 95d9cd413aa0e8f93f45dc6baabca53bfe10f71c..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/info-form.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<script lang="ts" setup>
-import { watch } from 'vue';
-
-import { handleTree } from '@vben/utils';
-
-import { ElMessage } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-import * as ProductBrandApi from '#/api/mall/product/brand';
-import * as ProductCategoryApi from '#/api/mall/product/category';
-
-const props = defineProps<{
-  propFormData: Object;
-}>();
-
-const emit = defineEmits(['update:activeName']);
-
-const getCategoryList = async () => {
-  const data = await ProductCategoryApi.getCategorySimpleList();
-  return handleTree(data, 'id');
-};
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    formApi.setValues(data);
-  },
-);
-
-const validate = async () => {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  try {
-    // 校验通过更新数据
-    Object.assign(props.propFormData, formApi.getValues());
-  } catch (error) {
-    ElMessage.error('【基础设置】不完善，请填写相关信息');
-    emit('update:activeName', 'info');
-    throw error; // 目的截断之后的校验
-  }
-};
-defineExpose({ validate });
-
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: '!w-1/6',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'name',
-      label: '商品名称',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入商品名称',
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'categoryId',
-      label: '商品分类',
-      component: 'ApiCascader',
-      componentProps: {
-        api: getCategoryList,
-        labelField: 'name',
-        valueField: 'id',
-        childrenField: 'children',
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'brandId',
-      label: '商品品牌',
-      component: 'ApiSelect',
-      componentProps: {
-        api: ProductBrandApi.getSimpleBrandList,
-        labelField: 'name',
-        valueField: 'id',
-      },
-    },
-    {
-      fieldName: 'keyword',
-      label: '商品关键字',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入商品关键字',
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'introduction',
-      label: '商品简介',
-      component: 'Input',
-      componentProps: {
-        type: 'textarea',
-        placeholder: '请输入商品简介',
-        maxlength: 128,
-        showWordLimit: true,
-        autosize: {
-          minRows: 4,
-          maxRows: 4,
-        },
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'picUrl',
-      label: '商品封面图',
-      component: 'ImageUpload',
-      componentProps: {
-        max: 1,
-        class: 'w-full',
-      },
-    },
-    {
-      fieldName: 'sliderPicUrls',
-      label: '商品轮播图',
-      component: 'ImageUpload',
-      componentProps: {
-        max: 10,
-        class: 'w-full',
-      },
-    },
-  ],
-  showDefaultActions: false,
-});
-</script>
-<template>
-  <Form />
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/model.d.ts b/apps/web-ele/src/views/mall/product/spu/components/model.d.ts
deleted file mode 100644
index cc0ac05416c4420a9761a7d68678510742e6d58f..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/model.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-interface PropertyAndValues {
-  id: number;
-  name: string;
-  values?: PropertyAndValues[];
-}
-
-interface RuleConfig {
-  // 需要校验的字段
-  // 例：name: 'name' 则表示校验 sku.name 的值
-  // 例：name: 'productConfig.stock' 则表示校验 sku.productConfig.name 的值,此处 productConfig 表示我在 Sku 上扩展的属性
-  name: string;
-  // 校验规格为一个毁掉函数，其中 arg 为需要校验的字段的值。
-  // 例：需要校验价格必须大于0.01
-  // {
-  //  name:'price',
-  //  rule:(arg: number) => arg > 0.01
-  // }
-  rule: (arg: any) => boolean;
-  // 校验不通过时的消息提示
-  message: string;
-}
-
-export { getPropertyList, PropertyAndValues, RuleConfig };
-
-export { default as SkuList } from './SkuList.vue';
diff --git a/apps/web-ele/src/views/mall/product/spu/components/other-form.vue b/apps/web-ele/src/views/mall/product/spu/components/other-form.vue
deleted file mode 100644
index 02c4c6301b95eb539062e898ab1a2312d0469cf9..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/other-form.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<script lang="ts" setup>
-import { watch } from 'vue';
-
-import { ElMessage } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-
-const props = defineProps<{
-  propFormData: Object;
-}>();
-
-const emit = defineEmits(['update:activeName']);
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    formApi.setValues(data);
-  },
-);
-
-const validate = async () => {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  try {
-    // 校验通过更新数据
-    Object.assign(props.propFormData, formApi.getValues());
-  } catch (error) {
-    ElMessage.error('【其它设置】不完善，请填写相关信息');
-    emit('update:activeName', 'other');
-    throw error; // 目的截断之后的校验
-  }
-};
-defineExpose({ validate });
-
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: '!w-1/6',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'sort',
-      label: '商品排序',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        step: 1,
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'giveIntegral',
-      label: '赠送积分',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        step: 1,
-      },
-      rules: 'required',
-    },
-    {
-      fieldName: 'virtualSalesCount',
-      label: '虚拟销量',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        step: 1,
-      },
-      rules: 'required',
-    },
-  ],
-  showDefaultActions: false,
-});
-</script>
-<template>
-  <Form />
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/product-attributes.vue b/apps/web-ele/src/views/mall/product/spu/components/product-attributes.vue
deleted file mode 100644
index 135fd5f43905139a58f86f6378aa96f938018d3b..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/product-attributes.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-<!-- 商品发布 - 库存价格 - 属性列表 -->
-<script lang="ts" setup>
-import type { PropType } from 'vue';
-
-import type { PropertyAndValues } from './model';
-
-import type { MallPropertyApi } from '#/api/mall/product/property';
-
-import { computed, ref, watch } from 'vue';
-
-import {
-  ElButton,
-  ElCol,
-  ElDivider,
-  ElMessage,
-  ElSpace,
-  ElTag,
-  ElText,
-} from 'element-plus';
-
-import * as PropertyApi from '#/api/mall/product/property';
-import { $t } from '#/locales';
-
-defineOptions({ name: 'ProductAttributes' });
-
-// 商品属性名称下拉框
-const props = defineProps({
-  propertyList: {
-    type: Array as PropType<PropertyAndValues[]>,
-    default: () => [],
-  },
-}); /** 输入框失去焦点或点击回车时触发 */
-const emit = defineEmits(['success']);
-const inputValue = ref(''); // 输入框值
-const attributeIndex = ref<null | number>(null); // 获取焦点时记录当前属性项的index
-// 输入框显隐控制
-const inputVisible = computed(() => (index: number) => {
-  if (attributeIndex.value === null) return false;
-  if (attributeIndex.value === index) return true;
-});
-const inputRef = ref<any[]>([]); // 标签输入框Ref
-/** 解决 ref 在 v-for 中的获取问题*/
-const setInputRef = (el: any) => {
-  if (el === null || el === undefined) return;
-  // 如果不存在 id 相同的元素才添加
-  if (
-    !inputRef.value.some(
-      (item) => item.inputRef?.attributes.id === el.inputRef?.attributes.id,
-    )
-  ) {
-    inputRef.value.push(el);
-  }
-};
-const attributeList = ref<PropertyAndValues[]>([]); // 商品属性列表
-const attributeOptions = ref([] as MallPropertyApi.PropertyValue[]);
-watch(
-  () => props.propertyList,
-  (data) => {
-    if (!data) return;
-    attributeList.value = data as any;
-  },
-  {
-    deep: true,
-    immediate: true,
-  },
-);
-
-/** 删除属性值*/
-const handleCloseValue = (index: number, valueIndex: number) => {
-  if (index < attributeList.value.length) {
-    const values = attributeList.value[index]!.values as any[];
-    values.splice(valueIndex, 1);
-  }
-};
-
-/** 删除属性*/
-const handleCloseProperty = (index: number) => {
-  if (index < attributeList.value.length) {
-    attributeList.value.splice(index, 1);
-    emit('success', attributeList.value);
-  }
-};
-
-/** 显示输入框并获取焦点 */
-const showInput = async (index: number) => {
-  if (index < attributeList.value.length) {
-    attributeIndex.value = index;
-    inputRef.value[index].focus();
-    // 获取属性下拉选项
-    await getAttributeOptions(attributeList.value[index]!.id);
-  }
-};
-
-// 定义 success 事件，用于操作成功后的回调
-const handleInputConfirm = async (index: number, propertyId: number) => {
-  if (inputValue.value && index < attributeList.value.length) {
-    // 1. 重复添加校验
-    const values = attributeList.value[index]!.values as any[];
-    if (values.find((item) => item.name === inputValue.value)) {
-      ElMessage.warning('已存在相同属性值，请重试');
-      attributeIndex.value = null;
-      inputValue.value = '';
-      return;
-    }
-
-    // 2.1 情况一：属性值已存在，则直接使用并结束
-    const existValue = attributeOptions.value.find(
-      (item) => item.name === inputValue.value,
-    );
-    if (existValue) {
-      attributeIndex.value = null;
-      inputValue.value = '';
-      const values = attributeList.value[index]!.values as any[];
-      values.push({
-        id: existValue.id!,
-        name: existValue.name,
-      });
-      emit('success', attributeList.value);
-      return;
-    }
-
-    // 2.2 情况二：新属性值，则进行保存
-    try {
-      const id = await PropertyApi.createPropertyValue({
-        propertyId,
-        name: inputValue.value,
-      });
-      const values = attributeList.value[index]!.values as any[];
-      values.push({ id, name: inputValue.value });
-      ElMessage.success($t('common.createSuccess'));
-      emit('success', attributeList.value);
-    } catch {
-      ElMessage.error('添加失败，请重试');
-    }
-  }
-  attributeIndex.value = null;
-  inputValue.value = '';
-};
-
-/** 获取商品属性下拉选项 */
-const getAttributeOptions = async (propertyId: number) => {
-  attributeOptions.value =
-    await PropertyApi.getPropertyValueSimpleList(propertyId);
-};
-</script>
-
-<template>
-  <ElCol v-for="(item, index) in attributeList" :key="index">
-    <div>
-      <ElText class="mx-1">属性名：</ElText>
-      <ElTag class="mx-1" type="success" @close="handleCloseProperty(index)">
-        {{ item.name }}
-      </ElTag>
-    </div>
-    <div>
-      <ElSpace :size="1">
-        <ElText class="mx-1">属性值：</ElText>
-        <ElTag
-          v-for="(value, valueIndex) in item.values"
-          :key="value.id"
-          class="mx-1"
-          @close="handleCloseValue(index, valueIndex)"
-        >
-          {{ value.name }}
-        </ElTag>
-        <ElSelect
-          v-show="inputVisible(index)"
-          :id="`input${index}`"
-          :ref="setInputRef"
-          v-model="inputValue"
-          :reserve-keyword="false"
-          allow-create
-          class="!w-30"
-          default-first-option
-          filterable
-          size="small"
-          @blur="handleInputConfirm(index, item.id)"
-          @change="handleInputConfirm(index, item.id)"
-          @keyup.enter="handleInputConfirm(index, item.id)"
-        >
-          <el-option
-            v-for="item2 in attributeOptions"
-            :key="item2.id"
-            :label="item2.name"
-            :value="item2.name"
-          />
-        </ElSelect>
-        <ElButton
-          v-show="!inputVisible(index)"
-          class="button-new-tag ml-1"
-          size="small"
-          @click="showInput(index)"
-        >
-          + 添加
-        </ElButton>
-      </ElSpace>
-    </div>
-    <ElDivider class="my-10px" />
-  </ElCol>
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/product-property-add-form.vue b/apps/web-ele/src/views/mall/product/spu/components/product-property-add-form.vue
deleted file mode 100644
index 48189d5c38bee4758e3a1821d1ee270aedd2de7f..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/product-property-add-form.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<script lang="ts" setup>
-import type { PropType } from 'vue';
-
-import type { MallPropertyApi } from '#/api/mall/product/property';
-
-import { ref, watch } from 'vue';
-
-import { useVbenModal } from '@vben/common-ui';
-
-import { ElMessage } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-import { getPropertySimpleList } from '#/api/mall/product/property';
-import * as PropertyApi from '#/api/mall/product/property';
-import { $t } from '#/locales';
-
-// 扩展Property接口，添加values属性
-interface ExtendedProperty extends MallPropertyApi.Property {
-  values?: any[];
-}
-
-// 商品属性名称下拉框
-
-const props = defineProps({
-  propertyList: {
-    type: Array as PropType<ExtendedProperty[]>,
-    default: () => [],
-  },
-});
-
-const emit = defineEmits(['success']);
-
-const attributeList = ref<ExtendedProperty[]>([]); // 商品属性列表
-const attributeOptions = ref([] as MallPropertyApi.Property[]);
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: 'w-full',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'name',
-      label: '属性名称',
-      component: 'ApiSelect',
-      componentProps: {
-        api: getPropertySimpleList,
-        labelField: 'name',
-        valueField: 'id',
-        defaultFirstOption: true,
-        filterable: true,
-        allowCreate: true,
-        placeholder: '请选择属性名称。如果不存在，可手动输入选择',
-      },
-    },
-  ],
-  showDefaultActions: false,
-});
-
-const [Modal, modalApi] = useVbenModal({
-  async onConfirm() {
-    modalApi.lock();
-    const { name } = await formApi.getValues();
-    // 1.1 重复添加校验
-    for (const attrItem of attributeList.value) {
-      if (attrItem.name === name) {
-        return ElMessage.error('该属性已存在，请勿重复添加');
-      }
-    }
-    // 1.2 校验表单
-    const { valid } = await formApi.validate();
-    if (!valid) {
-      return;
-    }
-
-    // 2.1 情况一：属性名已存在，则直接使用并结束
-    const existProperty = attributeOptions.value.find(
-      (item) => item.name === name,
-    );
-    if (existProperty) {
-      // 添加到属性列表
-      attributeList.value.push({
-        id: existProperty.id,
-        ...(await formApi.getValues()),
-        values: [],
-      });
-      // 关闭弹窗
-      modalApi.close();
-      return;
-    }
-
-    // 2.2 情况二：如果是不存在的属性，则需要执行新增
-    // 提交请求
-    modalApi.lock();
-    try {
-      const data = (await formApi.getValues()) as MallPropertyApi.Property;
-      const propertyId = await PropertyApi.createProperty(data);
-      // 添加到属性列表
-      attributeList.value.push({
-        id: propertyId,
-        ...(await formApi.getValues()),
-        values: [],
-      });
-      // 关闭弹窗
-      ElMessage.success($t('common.createSuccess'));
-      modalApi.close();
-    } finally {
-      modalApi.unlock();
-    }
-  },
-});
-
-watch(
-  () => props.propertyList, // 解决 props 无法直接修改父组件的问题
-  (data) => {
-    if (!data) return;
-    attributeList.value = data;
-  },
-  {
-    deep: true,
-    immediate: true,
-  },
-);
-</script>
-
-<template>
-  <Modal class="w-2/5" title="添加商品属性">
-    <Form class="mx-4" />
-  </Modal>
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/sku-form.vue b/apps/web-ele/src/views/mall/product/spu/components/sku-form.vue
deleted file mode 100644
index d1ef88718000b2409029c53300f5a4c4046d2a46..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/sku-form.vue
+++ /dev/null
@@ -1,248 +0,0 @@
-<script lang="ts" setup>
-import { ref, watch } from 'vue';
-
-import { Page, useVbenModal } from '@vben/common-ui';
-
-import { ElMessage, ElSpace } from 'element-plus';
-
-import { useVbenForm } from '#/adapter/form';
-
-import { getPropertyList } from './data';
-import ProductAttributes from './product-attributes.vue';
-import ProductPropertyAddForm from './product-property-add-form.vue';
-import SkuList from './sku-list.vue';
-
-const props = defineProps<{
-  propFormData: Object;
-}>();
-
-const emit = defineEmits(['update:activeName']);
-
-interface PropertyAndValues {
-  id: number;
-  name: string;
-  values?: PropertyAndValues[];
-}
-
-interface RuleConfig {
-  // 需要校验的字段
-  // 例：name: 'name' 则表示校验 sku.name 的值
-  // 例：name: 'productConfig.stock' 则表示校验 sku.productConfig.name 的值,此处 productConfig 表示我在 Sku 上扩展的属性
-  name: string;
-  // 校验规格为一个毁掉函数，其中 arg 为需要校验的字段的值。
-  // 例：需要校验价格必须大于0.01
-  // {
-  //  name:'price',
-  //  rule:(arg: number) => arg > 0.01
-  // }
-  rule: (arg: any) => boolean;
-  // 校验不通过时的消息提示
-  message: string;
-}
-
-const propertyList = ref<PropertyAndValues[]>([]); // 商品属性列表
-
-// sku 相关属性校验规则
-const ruleConfig: RuleConfig[] = [
-  {
-    name: 'stock',
-    rule: (arg) => arg >= 0,
-    message: '商品库存必须大于等于 1 ！！！',
-  },
-  {
-    name: 'price',
-    rule: (arg) => arg >= 0.01,
-    message: '商品销售价格必须大于等于 0.01 元！！！',
-  },
-  {
-    name: 'marketPrice',
-    rule: (arg) => arg >= 0.01,
-    message: '商品市场价格必须大于等于 0.01 元！！！',
-  },
-  {
-    name: 'costPrice',
-    rule: (arg) => arg >= 0.01,
-    message: '商品成本价格必须大于等于 0.00 元！！！',
-  },
-];
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    formApi.setValues(data);
-  },
-);
-
-const validate = async () => {
-  const { valid } = await formApi.validate();
-  if (!valid) {
-    return;
-  }
-  try {
-    // 校验通过更新数据
-    Object.assign(props.propFormData, formApi.getValues());
-  } catch (error) {
-    ElMessage.error('【库存价格】不完善，请填写相关信息');
-    emit('update:activeName', 'sku');
-    throw error; // 目的截断之后的校验
-  }
-};
-defineExpose({ validate });
-
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: '!w-1/6',
-    },
-    formItemClass: 'col-span-2',
-    labelWidth: 120,
-  },
-  layout: 'horizontal',
-  schema: [
-    {
-      fieldName: 'subCommissionType',
-      label: '分销类型',
-      component: 'RadioGroup',
-      componentProps: {
-        options: [
-          {
-            label: '默认设置',
-            value: false,
-          },
-          {
-            label: '单独设置',
-            value: true,
-          },
-        ],
-      },
-      defaultValue: false,
-      rules: 'required',
-    },
-    {
-      fieldName: 'specType',
-      label: '商品规格',
-      component: 'RadioGroup',
-      componentProps: {
-        options: [
-          {
-            label: '单规格',
-            value: false,
-          },
-          {
-            label: '多规格',
-            value: true,
-          },
-        ],
-      },
-      defaultValue: false,
-      rules: 'required',
-    },
-    {
-      fieldName: 'skuList',
-      component: 'Input',
-      dependencies: {
-        triggerFields: ['specType'],
-        show: (values) => !values.specType,
-      },
-    },
-    {
-      fieldName: 'specTypeItem',
-      label: '商品属性',
-      component: 'Input',
-      dependencies: {
-        triggerFields: ['specType'],
-        show: (values) => values.specType,
-      },
-    },
-    {
-      fieldName: 'batchSettings',
-      label: '批量设置',
-      component: 'Input',
-      dependencies: {
-        triggerFields: ['specType'],
-        show: (values) => values.specType && propertyList.value.length > 0,
-      },
-    },
-    {
-      fieldName: 'specTypeItemList',
-      label: '规格列表',
-      component: 'Input',
-      dependencies: {
-        triggerFields: ['specType'],
-        show: (values) => values.specType && propertyList.value.length > 0,
-      },
-    },
-  ],
-  showDefaultActions: false,
-});
-
-const [ProductPropertyAddFormModal, productPropertyAddFormApi] = useVbenModal({
-  connectedComponent: ProductPropertyAddForm,
-  destroyOnClose: true,
-});
-
-/** 调用 SkuList generateTableData 方法*/
-const skuListRef = ref();
-const generateSkus = (propertyList: any[]) => {
-  skuListRef.value.generateTableData(propertyList);
-};
-
-/** 将传进来的值赋值给 formData */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) {
-      return;
-    }
-    // 将 SKU 的属性，整理成 PropertyAndValues 数组
-    propertyList.value = getPropertyList(data);
-  },
-  {
-    immediate: true,
-  },
-);
-</script>
-<template>
-  <Page :auto-content-height="true">
-    <Form>
-      <template #skuList>
-        <SkuList
-          ref="skuListRef"
-          :prop-form-data="props.propFormData"
-          :property-list="propertyList"
-          :rule-config="ruleConfig"
-        />
-      </template>
-      <template #specTypeItem>
-        <ElSpace direction="vertical" alignment="flex-start">
-          <ElButton type="primary" @click="productPropertyAddFormApi.open()">
-            添加属性
-          </ElButton>
-          <ProductAttributes
-            :property-list="propertyList"
-            @success="generateSkus"
-          />
-        </ElSpace>
-      </template>
-      <template #batchSettings>
-        <SkuList
-          :is-batch="true"
-          :prop-form-data="props.propFormData"
-          :property-list="propertyList"
-        />
-      </template>
-      <template #specTypeItemList>
-        <SkuList
-          :prop-form-data="props.propFormData"
-          :property-list="propertyList"
-          :rule-config="ruleConfig"
-        />
-      </template>
-    </Form>
-    <ProductPropertyAddFormModal :property-list="propertyList" />
-  </Page>
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue b/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue
deleted file mode 100644
index 49f788027174d06465d8951a344d4aa4c467adb5..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/sku-list.vue
+++ /dev/null
@@ -1,533 +0,0 @@
-<script lang="ts" setup>
-import type { PropType } from 'vue';
-
-import type { PropertyAndValues, RuleConfig } from './model';
-
-import type { MallSpuApi } from '#/api/mall/product/spu';
-
-import { ref, watch } from 'vue';
-
-import { formatToFraction, isEmpty } from '@vben/utils';
-
-import { ElInput, ElMessage, ElTable } from 'element-plus';
-
-import UploadImg from '#/components/upload/image-upload.vue';
-import { copyValueToTarget } from '#/utils';
-
-defineOptions({ name: 'SkuList' });
-
-const props = defineProps({
-  propFormData: {
-    type: Object as PropType<MallSpuApi.Spu>,
-    default: () => ({}),
-  },
-  propertyList: {
-    type: Array as PropType<PropertyAndValues[]>,
-    default: () => [],
-  },
-  ruleConfig: {
-    type: Array as PropType<RuleConfig[]>,
-    default: () => [],
-  },
-  isBatch: {
-    type: Boolean,
-    default: false,
-  }, // 是否作为批量操作组件
-  isComponent: {
-    type: Boolean,
-    default: false,
-  }, // 是否作为组件
-  isActivityComponent: {
-    type: Boolean,
-    default: false,
-  }, // 是否作为活动组件
-});
-
-const emit = defineEmits<{
-  (e: 'selectionChange', value: MallSpuApi.Sku[]): void;
-}>();
-const formData = ref<MallSpuApi.Spu>(); // 表单数据
-const skuList = ref<MallSpuApi.Sku[]>([
-  {
-    price: 0, // 商品价格
-    marketPrice: 0, // 市场价
-    costPrice: 0, // 成本价
-    barCode: '', // 商品条码
-    picUrl: '', // 图片地址
-    stock: 0, // 库存
-    weight: 0, // 商品重量
-    volume: 0, // 商品体积
-    firstBrokeragePrice: 0, // 一级分销的佣金
-    secondBrokeragePrice: 0, // 二级分销的佣金
-  },
-]); // 批量添加时的临时数据
-
-/** 批量添加 */
-const batchAdd = () => {
-  validateProperty();
-  formData.value!.skus!.forEach((item: MallSpuApi.Sku) => {
-    copyValueToTarget(item, skuList.value[0]);
-  });
-};
-/** 校验商品属性属性值 */
-const validateProperty = () => {
-  // 校验商品属性属性值是否为空，有一个为空都不给过
-  const warningInfo = '存在属性属性值为空，请先检查完善属性值后重试！！！';
-  for (const item of props.propertyList) {
-    if (!item.values || isEmpty(item.values)) {
-      ElMessage.warning(warningInfo);
-      throw new Error(warningInfo);
-    }
-  }
-};
-/** 删除 sku */
-const deleteSku = (row: MallSpuApi.Sku) => {
-  const index = formData.value!.skus!.findIndex(
-    // 直接把列表转成字符串比较
-    (sku: MallSpuApi.Sku) =>
-      JSON.stringify(sku.properties) === JSON.stringify(row.properties),
-  );
-  formData.value!.skus!.splice(index, 1);
-};
-const tableHeaders = ref<{ label: string; prop: string }[]>([]); // 多属性表头
-/**
- * 保存时，每个商品规格的表单要校验下。例如说，销售金额最低是 0.01 这种。
- */
-const validateSku = () => {
-  validateProperty();
-  let warningInfo = '请检查商品各行相关属性配置，';
-  let validate = true; // 默认通过
-  for (const sku of formData.value!.skus!) {
-    // 作为活动组件的校验
-    for (const rule of props?.ruleConfig) {
-      const arg = getValue(sku, rule.name);
-      if (!rule.rule(arg)) {
-        validate = false; // 只要有一个不通过则直接不通过
-        warningInfo += rule.message;
-        break;
-      }
-    }
-    // 只要有一个不通过则结束后续的校验
-    if (!validate) {
-      ElMessage.warning(warningInfo);
-      throw new Error(warningInfo);
-    }
-  }
-};
-const getValue = (obj: any, arg: string) => {
-  const keys = arg.split('.');
-  let value = obj;
-  for (const key of keys) {
-    if (value && typeof value === 'object' && key in value) {
-      value = value[key];
-    } else {
-      value = undefined;
-      break;
-    }
-  }
-  return value;
-};
-
-/**
- * 选择时触发
- * @param Sku 传递过来的选中的 sku 是一个数组
- */
-const handleSelectionChange = (val: MallSpuApi.Sku[]) => {
-  emit('selectionChange', val);
-};
-
-/**
- * 将传进来的值赋值给 skuList
- */
-watch(
-  () => props.propFormData,
-  (data) => {
-    if (!data) return;
-    formData.value = data;
-  },
-  {
-    deep: true,
-    immediate: true,
-  },
-);
-
-/** 生成表数据 */
-const generateTableData = (propertyList: any[]) => {
-  // 构建数据结构
-  const propertyValues = propertyList.map((item) =>
-    item.values.map((v: any) => ({
-      propertyId: item.id,
-      propertyName: item.name,
-      valueId: v.id,
-      valueName: v.name,
-    })),
-  );
-  const buildSkuList = build(propertyValues);
-  // 如果回显的 sku 属性和添加的属性不一致则重置 skus 列表
-  if (!validateData(propertyList)) {
-    // 如果不一致则重置表数据，默认添加新的属性重新生成 sku 列表
-    formData.value!.skus = [];
-  }
-  if (buildSkuList && buildSkuList.length > 0) {
-    for (const item of buildSkuList) {
-      const row = {
-        properties: Array.isArray(item) ? item : [item], // 如果只有一个属性的话返回的是一个 property 对象
-        price: 0,
-        marketPrice: 0,
-        costPrice: 0,
-        barCode: '',
-        picUrl: '',
-        stock: 0,
-        weight: 0,
-        volume: 0,
-        firstBrokeragePrice: 0,
-        secondBrokeragePrice: 0,
-      };
-      // 如果存在属性相同的 sku 则不做处理
-      const index = formData.value!.skus!.findIndex(
-        (sku: MallSpuApi.Sku) =>
-          JSON.stringify(sku.properties) === JSON.stringify(row.properties),
-      );
-      if (index !== -1) {
-        continue;
-      }
-      formData.value!.skus!.push(row);
-    }
-  }
-};
-
-/**
- * 生成 skus 前置校验
- */
-const validateData = (propertyList: any[]) => {
-  const skuPropertyIds: number[] = [];
-  formData.value!.skus!.forEach((sku: MallSpuApi.Sku) =>
-    sku.properties
-      ?.map((property: any) => property.propertyId)
-      ?.forEach((propertyId: number) => {
-        if (!skuPropertyIds.includes(propertyId!)) {
-          skuPropertyIds.push(propertyId!);
-        }
-      }),
-  );
-  const propertyIds = propertyList.map((item) => item.id);
-  return skuPropertyIds.length === propertyIds.length;
-};
-
-/** 构建所有排列组合 */
-const build = (
-  propertyValuesList: MallSpuApi.Property[][],
-): MallSpuApi.Property[] | MallSpuApi.Property[][] => {
-  if (!propertyValuesList || propertyValuesList.length === 0) {
-    return [];
-  } else if (propertyValuesList.length === 1) {
-    return propertyValuesList[0] || [];
-  } else {
-    const result: MallSpuApi.Property[][] = [];
-    const rest = build(propertyValuesList.slice(1));
-    if (propertyValuesList[0] && Array.isArray(rest)) {
-      for (let i = 0; i < propertyValuesList[0].length; i++) {
-        for (const restItem of rest) {
-          const currentItem = propertyValuesList[0][i];
-          // 第一次不是数组结构，后面的都是数组结构
-          if (Array.isArray(restItem)) {
-            result.push([currentItem!, ...restItem]);
-          } else if (restItem) {
-            // 确保restItem不是undefined，并进行类型断言
-            result.push([currentItem!, restItem as MallSpuApi.Property]);
-          }
-        }
-      }
-    }
-    return result;
-  }
-};
-
-/** 监听属性列表，生成相关参数和表头 */
-watch(
-  () => props.propertyList,
-  (propertyList: PropertyAndValues[]) => {
-    // 如果不是多规格则结束
-    if (!formData.value!.specType) {
-      return;
-    }
-    // 如果当前组件作为批量添加数据使用，则重置表数据
-    if (props.isBatch) {
-      skuList.value = [
-        {
-          price: 0,
-          marketPrice: 0,
-          costPrice: 0,
-          barCode: '',
-          picUrl: '',
-          stock: 0,
-          weight: 0,
-          volume: 0,
-          firstBrokeragePrice: 0,
-          secondBrokeragePrice: 0,
-        },
-      ];
-    }
-
-    // 判断代理对象是否为空
-    if (JSON.stringify(propertyList) === '[]') {
-      return;
-    }
-    // 重置表头
-    tableHeaders.value = [];
-    // 生成表头
-    propertyList.forEach((item, index) => {
-      // name加属性项index区分属性值
-      tableHeaders.value.push({ prop: `name${index}`, label: item.name });
-    });
-    // 如果回显的 sku 属性和添加的属性一致则不处理
-    if (validateData(propertyList)) {
-      return;
-    }
-    // 添加新属性没有属性值也不做处理
-    if (propertyList.some((item) => !item.values || isEmpty(item.values))) {
-      return;
-    }
-    // 生成 table 数据，即 sku 列表
-    generateTableData(propertyList);
-  },
-  {
-    deep: true,
-    immediate: true,
-  },
-);
-const activitySkuListRef = ref<InstanceType<typeof ElTable>>();
-
-const getSkuTableRef = () => {
-  return activitySkuListRef.value;
-};
-// 暴露出生成 sku 方法，给添加属性成功时调用
-defineExpose({ generateTableData, validateSku, getSkuTableRef });
-</script>
-<template>
-  <!-- 情况一：添加/修改 -->
-  <ElTable
-    v-if="!isActivityComponent"
-    :data="isBatch ? skuList : formData!.skus!"
-    border
-    class="tabNumWidth"
-    max-height="500"
-    size="small"
-  >
-    <el-table-column align="center" label="图片" min-width="120">
-      <template #default="{ row }">
-        <UploadImg
-          v-model="row.picUrl"
-          height="50px"
-          width="50px"
-          :show-description="false"
-        />
-      </template>
-    </el-table-column>
-    <template v-if="formData!.specType && !isBatch">
-      <!--  根据商品属性动态添加 -->
-      <el-table-column
-        v-for="(item, index) in tableHeaders"
-        :key="index"
-        :label="item.label"
-        align="center"
-        min-width="120"
-      >
-        <template #default="{ row }">
-          <span style="font-weight: bold; color: #40aaff">
-            {{ row.properties?.[index]?.valueName }}
-          </span>
-        </template>
-      </el-table-column>
-    </template>
-    <el-table-column align="center" label="商品条码" min-width="168">
-      <template #default="{ row }">
-        <ElInput v-model="row.barCode" class="w-100%" />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="销售价" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.price"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="市场价" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.marketPrice"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="成本价" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.costPrice"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="库存" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.stock"
-          :min="0"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="重量(kg)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.weight"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="体积(m^3)" min-width="168">
-      <template #default="{ row }">
-        <el-input-number
-          v-model="row.volume"
-          :min="0"
-          :precision="2"
-          :step="0.1"
-          class="w-100%"
-          controls-position="right"
-        />
-      </template>
-    </el-table-column>
-    <template v-if="formData!.subCommissionType">
-      <el-table-column align="center" label="一级返佣(元)" min-width="168">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.firstBrokeragePrice"
-            :min="0"
-            :precision="2"
-            :step="0.1"
-            class="w-100%"
-            controls-position="right"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column align="center" label="二级返佣(元)" min-width="168">
-        <template #default="{ row }">
-          <el-input-number
-            v-model="row.secondBrokeragePrice"
-            :min="0"
-            :precision="2"
-            :step="0.1"
-            class="w-100%"
-            controls-position="right"
-          />
-        </template>
-      </el-table-column>
-    </template>
-    <el-table-column
-      v-if="formData?.specType"
-      align="center"
-      fixed="right"
-      label="操作"
-      width="80"
-    >
-      <template #default="{ row }">
-        <el-button
-          v-if="isBatch"
-          link
-          size="small"
-          type="primary"
-          @click="batchAdd"
-        >
-          批量添加
-        </el-button>
-        <el-button
-          v-else
-          link
-          size="small"
-          type="primary"
-          @click="deleteSku(row)"
-        >
-          删除
-        </el-button>
-      </template>
-    </el-table-column>
-  </ElTable>
-
-  <!-- 情况二：作为活动组件 -->
-  <ElTable
-    v-if="isActivityComponent"
-    :data="formData!.skus!"
-    border
-    max-height="500"
-    size="small"
-    style="width: 99%"
-  >
-    <el-table-column v-if="isComponent" type="selection" width="45" />
-    <el-table-column align="center" label="图片" min-width="80">
-      <template #default="{ row }">
-        <el-image :src="row.picUrl" class="h-60px w-60px" />
-      </template>
-    </el-table-column>
-    <template v-if="formData!.specType">
-      <!--  根据商品属性动态添加 -->
-      <el-table-column
-        v-for="(item, index) in tableHeaders"
-        :key="index"
-        :label="item.label"
-        align="center"
-        min-width="80"
-      >
-        <template #default="{ row }">
-          <span style="font-weight: bold; color: #40aaff">
-            {{ row.properties?.[index]?.valueName }}
-          </span>
-        </template>
-      </el-table-column>
-    </template>
-    <el-table-column align="center" label="商品条码" min-width="100">
-      <template #default="{ row }">
-        {{ row.barCode }}
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="销售价(元)" min-width="80">
-      <template #default="{ row }">
-        {{ formatToFraction(row.price) }}
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="市场价(元)" min-width="80">
-      <template #default="{ row }">
-        {{ formatToFraction(row.marketPrice) }}
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="成本价(元)" min-width="80">
-      <template #default="{ row }">
-        {{ formatToFraction(row.costPrice) }}
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="库存" min-width="80">
-      <template #default="{ row }">
-        {{ row.stock }}
-      </template>
-    </el-table-column>
-    <!--  方便扩展每个活动配置的属性不一样  -->
-    <slot name="extension"></slot>
-  </ElTable>
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/spu-showcase.vue b/apps/web-ele/src/views/mall/product/spu/components/spu-showcase.vue
deleted file mode 100644
index 661136a519a40f65fe2cbf7d8c7592ec161b40a2..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/spu-showcase.vue
+++ /dev/null
@@ -1,166 +0,0 @@
-<script lang="ts" setup>
-import type { MallSpuApi } from '#/api/mall/product/spu';
-
-import { computed, ref, watch } from 'vue';
-
-import { IconifyIcon } from '@vben/icons';
-
-import { ElImage, ElTooltip } from 'element-plus';
-
-import * as ProductSpuApi from '#/api/mall/product/spu';
-import SpuTableSelect from '#/views/mall/product/spu/components/spu-table-select.vue';
-
-// 商品橱窗，一般用于与商品建立关系时使用
-// 提供功能：展示商品列表、添加商品、移除商品
-defineOptions({ name: 'SpuShowcase' });
-
-const props = defineProps({
-  modelValue: {
-    type: [Number, Array],
-    required: true,
-  },
-  // 限制数量：默认不限制
-  limit: {
-    type: Number,
-    default: Number.MAX_VALUE,
-  },
-  disabled: Boolean,
-});
-
-const emit = defineEmits(['update:modelValue', 'change']);
-
-// 计算是否可以添加
-const canAdd = computed(() => {
-  // 情况一：禁用时不可以添加
-  if (props.disabled) return false;
-  // 情况二：未指定限制数量时，可以添加
-  if (!props.limit) return true;
-  // 情况三：检查已添加数量是否小于限制数量
-  return productSpus.value.length < props.limit;
-});
-
-// 商品列表
-const productSpus = ref<MallSpuApi.Spu[]>([]);
-
-watch(
-  () => props.modelValue,
-  async () => {
-    let ids: number[] = [];
-    if (Array.isArray(props.modelValue)) {
-      ids = props.modelValue as number[];
-    } else {
-      ids = props.modelValue ? [props.modelValue] : [];
-    }
-    // 不需要返显
-    if (ids.length === 0) {
-      productSpus.value = [];
-      return;
-    }
-    // 只有商品发生变化之后，才去查询商品
-    if (
-      productSpus.value.length === 0 ||
-      productSpus.value.some((spu) => !ids.includes(spu.id!))
-    ) {
-      productSpus.value = await ProductSpuApi.getSpuDetailList(ids);
-    }
-  },
-  { immediate: true },
-);
-
-/** 商品表格选择对话框 */
-const spuTableSelectRef = ref();
-// 打开对话框
-const openSpuTableSelect = () => {
-  spuTableSelectRef.value.open(productSpus.value);
-};
-
-/**
- * 选择商品后触发
- *
- * @param spus 选中的商品列表
- */
-const handleSpuSelected = (spus: MallSpuApi.Spu | MallSpuApi.Spu[]) => {
-  productSpus.value = Array.isArray(spus) ? spus : [spus];
-  emitSpuChange();
-};
-
-/**
- * 删除商品
- *
- * @param index 商品索引
- */
-const handleRemoveSpu = (index: number) => {
-  productSpus.value.splice(index, 1);
-  emitSpuChange();
-};
-const emitSpuChange = () => {
-  if (props.limit === 1) {
-    const spu = productSpus.value.length > 0 ? productSpus.value[0] : null;
-    emit('update:modelValue', spu?.id || 0);
-    emit('change', spu);
-  } else {
-    emit(
-      'update:modelValue',
-      productSpus.value.map((spu) => spu.id),
-    );
-    emit('change', productSpus.value);
-  }
-};
-</script>
-<template>
-  <div class="gap-8px flex flex-wrap items-center">
-    <div
-      v-for="(spu, index) in productSpus"
-      :key="spu.id"
-      class="select-box spu-pic"
-    >
-      <ElTooltip :content="spu.name">
-        <div class="relative h-full w-full">
-          <ElImage :src="spu.picUrl" class="h-full w-full" />
-          <IconifyIcon
-            v-show="!disabled"
-            class="del-icon"
-            icon="ep:circle-close-filled"
-            @click="handleRemoveSpu(index)"
-          />
-        </div>
-      </ElTooltip>
-    </div>
-    <ElTooltip content="选择商品" v-if="canAdd">
-      <div class="select-box" @click="openSpuTableSelect">
-        <IconifyIcon icon="ep:plus" />
-      </div>
-    </ElTooltip>
-  </div>
-  <!-- 商品选择对话框（表格形式） -->
-  <SpuTableSelect
-    ref="spuTableSelectRef"
-    :multiple="limit !== 1"
-    @change="handleSpuSelected"
-  />
-</template>
-
-<style lang="scss" scoped>
-.select-box {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 60px;
-  height: 60px;
-  border: 1px dashed var(--el-border-color-darker);
-  border-radius: 8px;
-}
-
-.spu-pic {
-  position: relative;
-}
-
-.del-icon {
-  position: absolute;
-  top: -10px;
-  right: -10px;
-  z-index: 1;
-  width: 20px !important;
-  height: 20px !important;
-}
-</style>
diff --git a/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue b/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue
deleted file mode 100644
index 960302c1e366fb38de3fa564597550d4a275bb48..0000000000000000000000000000000000000000
--- a/apps/web-ele/src/views/mall/product/spu/components/spu-table-select.vue
+++ /dev/null
@@ -1,359 +0,0 @@
-<script lang="ts" setup>
-import type { MallCategoryApi } from '#/api/mall/product/category';
-import type { MallSpuApi } from '#/api/mall/product/spu';
-
-import { onMounted, ref } from 'vue';
-
-import { ContentWrap } from '@vben/common-ui';
-import { handleTree } from '@vben/utils';
-
-import {
-  CHANGE_EVENT,
-  ElButton,
-  ElCheckbox,
-  ElDatePicker,
-  ElDialog,
-  ElForm,
-  ElFormItem,
-  ElImage,
-  ElInput,
-  ElRadio,
-  ElTable,
-  ElTableColumn,
-  ElTreeSelect,
-} from 'element-plus';
-
-import * as ProductCategoryApi from '#/api/mall/product/category';
-import * as ProductSpuApi from '#/api/mall/product/spu';
-/**
- * 商品表格选择对话框
- * 1. 单选模式：
- *    1.1 点击表格左侧的单选框时，结束选择，并关闭对话框
- *    1.2 再次打开时，保持选中状态
- * 2. 多选模式：
- *    2.1 点击表格左侧的多选框时，记录选中的商品
- *    2.2 切换分页时，保持商品的选中的状态
- *    2.3 点击右下角的确定按钮时，结束选择，关闭对话框
- *    2.4 再次打开时，保持选中状态
- */
-defineOptions({ name: 'SpuTableSelect' });
-
-defineProps({
-  // 多选模式
-  multiple: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-/** 确认选择时的触发事件 */
-const emits = defineEmits<{
-  change: [spu: any | MallSpuApi.Spu | MallSpuApi.Spu[]];
-}>();
-// 列表的总页数
-const total = ref(0);
-// 列表的数据
-const list = ref<MallSpuApi.Spu[]>([]);
-// 列表的加载中
-const loading = ref(false);
-// 弹窗的是否展示
-const dialogVisible = ref(false);
-// 查询参数
-const queryParams = ref({
-  pageNo: 1,
-  pageSize: 10,
-  // 默认获取上架的商品
-  tabType: 0,
-  name: '',
-  categoryId: null,
-  createTime: [],
-});
-
-/** 打开弹窗 */
-const open = (spuList?: MallSpuApi.Spu[]) => {
-  // 重置
-  checkedSpus.value = [];
-  checkedStatus.value = {};
-  isCheckAll.value = false;
-  isIndeterminate.value = false;
-
-  // 处理已选中
-  if (spuList && spuList.length > 0) {
-    checkedSpus.value = [...spuList];
-    checkedStatus.value = Object.fromEntries(
-      spuList.map((spu) => [spu.id, true]),
-    );
-  }
-
-  dialogVisible.value = true;
-  resetQuery();
-};
-// 提供 open 方法，用于打开弹窗
-defineExpose({ open });
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true;
-  try {
-    const data = await ProductSpuApi.getSpuPage(queryParams.value);
-    list.value = data.list;
-    total.value = data.total;
-    // checkbox绑定undefined会有问题，需要给一个bool值
-    list.value.forEach(
-      (spu) =>
-        (checkedStatus.value[spu.id || 0] =
-          checkedStatus.value[spu.id || 0] || false),
-    );
-    // 计算全选框状态
-    calculateIsCheckAll();
-  } finally {
-    loading.value = false;
-  }
-};
-
-/** 搜索按钮操作 */
-const handleQuery = () => {
-  queryParams.value.pageNo = 1;
-  getList();
-};
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryParams.value = {
-    pageNo: 1,
-    pageSize: 10,
-    // 默认获取上架的商品
-    tabType: 0,
-    name: '',
-    categoryId: null,
-    createTime: [],
-  };
-  getList();
-};
-
-// 是否全选
-const isCheckAll = ref(false);
-// 全选框是否处于中间状态：不是全部选中 && 任意一个选中
-const isIndeterminate = ref(false);
-// 选中的商品
-const checkedSpus = ref<MallSpuApi.Spu[]>([]);
-// 选中状态：key为商品ID，value为是否选中
-const checkedStatus = ref<Record<string, boolean>>({});
-
-// 选中的商品 spuId
-const selectedSpuId = ref();
-/** 单选中时触发 */
-const handleSingleSelected = (spu: MallSpuApi.Spu) => {
-  emits(CHANGE_EVENT, spu);
-  // 关闭弹窗
-  dialogVisible.value = false;
-  // 记住上次选择的ID
-  selectedSpuId.value = spu.id;
-};
-
-/** 多选完成 */
-const handleEmitChange = () => {
-  // 关闭弹窗
-  dialogVisible.value = false;
-  emits(CHANGE_EVENT, [...checkedSpus.value]);
-};
-
-/** 全选/全不选 */
-const handleCheckAll = (checked: boolean) => {
-  isCheckAll.value = checked;
-  isIndeterminate.value = false;
-
-  list.value.forEach((spu) => handleCheckOne(checked, spu, false));
-};
-
-/**
- * 选中一行
- * @param checked 是否选中
- * @param spu 商品
- * @param isCalcCheckAll 是否计算全选
- */
-const handleCheckOne = (
-  checked: boolean,
-  spu: MallSpuApi.Spu,
-  isCalcCheckAll: boolean,
-) => {
-  if (checked) {
-    checkedSpus.value.push(spu);
-    checkedStatus.value[spu.id || 0] = true;
-  } else {
-    const index = findCheckedIndex(spu);
-    if (index > -1) {
-      checkedSpus.value.splice(index, 1);
-      checkedStatus.value[spu.id || 0] = false;
-      isCheckAll.value = false;
-    }
-  }
-
-  // 计算全选框状态
-  if (isCalcCheckAll) {
-    calculateIsCheckAll();
-  }
-};
-
-// 查找商品在已选中商品列表中的索引
-const findCheckedIndex = (spu: MallSpuApi.Spu) =>
-  checkedSpus.value.findIndex((item) => item.id === spu.id);
-
-// 计算全选框状态
-const calculateIsCheckAll = () => {
-  isCheckAll.value = list.value.every(
-    (spu) => checkedStatus.value[spu.id || 0],
-  );
-  // 计算中间状态：不是全部选中 && 任意一个选中
-  isIndeterminate.value =
-    !isCheckAll.value &&
-    list.value.some((spu) => checkedStatus.value[spu.id || 0]);
-};
-
-// 分类列表
-const categoryList = ref<MallCategoryApi.Category[]>();
-// 分类树
-const categoryTreeList = ref();
-/** 初始化 */
-onMounted(async () => {
-  await getList();
-  // 获得分类树
-  categoryList.value = await ProductCategoryApi.getCategoryList({});
-  categoryTreeList.value = handleTree(categoryList.value, 'id', 'parentId');
-});
-</script>
-
-<template>
-  <ElDialog
-    v-model="dialogVisible"
-    :append-to-body="true"
-    title="选择商品"
-    width="70%"
-  >
-    <ContentWrap>
-      <ElForm
-        :inline="true"
-        :model="queryParams"
-        class="-mb-15px"
-        label-width="68px"
-      >
-        <ElFormItem label="商品名称" prop="name">
-          <ElInput
-            v-model="queryParams.name"
-            class="!w-240px"
-            clearable
-            placeholder="请输入商品名称"
-            @keyup.enter="handleQuery"
-          />
-        </ElFormItem>
-        <ElFormItem label="商品分类" prop="categoryId">
-          <ElTreeSelect
-            v-model="queryParams.categoryId"
-            :data="categoryTreeList"
-            :props="{
-              children: 'children',
-              label: 'name',
-              value: 'id',
-              isLeaf: 'leaf',
-              emitPath: false,
-            }"
-            check-strictly
-            class="!w-240px"
-            node-key="id"
-            placeholder="请选择商品分类"
-          />
-        </ElFormItem>
-        <ElFormItem label="创建时间" prop="createTime">
-          <ElDatePicker
-            v-model="queryParams.createTime"
-            :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-            class="!w-240px"
-            end-placeholder="结束日期"
-            start-placeholder="开始日期"
-            type="daterange"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
-        </ElFormItem>
-        <ElFormItem>
-          <ElButton @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
-            搜索
-          </ElButton>
-          <ElButton @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
-            重置
-          </ElButton>
-        </ElFormItem>
-      </ElForm>
-      <ElTable v-loading="loading" :data="list" show-overflow-tooltip>
-        <!-- 1. 多选模式（不能使用type="selection"，Element会忽略Header插槽） -->
-        <ElTableColumn width="55" v-if="multiple">
-          <template #header>
-            <ElCheckbox
-              v-model="isCheckAll"
-              :indeterminate="isIndeterminate"
-              @change="handleCheckAll"
-            />
-          </template>
-          <template #default="{ row }">
-            <ElCheckbox
-              v-model="checkedStatus[row.id]"
-              @change="(checked: boolean) => handleCheckOne(checked, row, true)"
-            />
-          </template>
-        </ElTableColumn>
-        <!-- 2. 单选模式 -->
-        <ElTableColumn label="#" width="55" v-else>
-          <template #default="{ row }">
-            <ElRadio
-              :value="row.id"
-              v-model="selectedSpuId"
-              @change="handleSingleSelected(row)"
-            >
-              <!-- 空格不能省略，是为了让单选框不显示label，如果不指定label不会有选中的效果 -->
-              &nbsp;
-            </ElRadio>
-          </template>
-        </ElTableColumn>
-        <ElTableColumn
-          key="id"
-          align="center"
-          label="商品编号"
-          prop="id"
-          min-width="60"
-        />
-        <ElTableColumn label="商品图" min-width="80">
-          <template #default="{ row }">
-            <ElImage
-              :src="row.picUrl"
-              class="h-30px w-30px"
-              :preview-src-list="[row.picUrl]"
-              preview-teleported
-            />
-          </template>
-        </ElTableColumn>
-        <ElTableColumn label="商品名称" min-width="200" prop="name" />
-        <ElTableColumn label="商品分类" min-width="100" prop="categoryId">
-          <template #default="{ row }">
-            <span>{{
-              categoryList?.find(
-                (c: MallCategoryApi.Category) => c.id === row.categoryId,
-              )?.name
-            }}</span>
-          </template>
-        </ElTableColumn>
-      </ElTable>
-      <!-- 分页 -->
-      <Pagination
-        v-model:limit="queryParams.pageSize"
-        v-model:page="queryParams.pageNo"
-        :total="total"
-        @pagination="getList"
-      />
-    </ContentWrap>
-    <template #footer v-if="multiple">
-      <ElButton type="primary" @click="handleEmitChange">确 定</ElButton>
-      <ElButton @click="dialogVisible = false">取 消</ElButton>
-    </template>
-  </ElDialog>
-</template>
diff --git a/apps/web-ele/src/views/mall/product/spu/data.ts b/apps/web-ele/src/views/mall/product/spu/data.ts
index 534dee2b79bd8944594716685f554a76250ee583..1037fa4f382778d2c5f047362012825ad84f50c1 100644
--- a/apps/web-ele/src/views/mall/product/spu/data.ts
+++ b/apps/web-ele/src/views/mall/product/spu/data.ts
@@ -44,10 +44,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = MallSpuApi.Spu>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSpuApi.Spu,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/mall/product/spu/index.vue b/apps/web-ele/src/views/mall/product/spu/index.vue
index 95abca42e9bd9242806a34b7e47d358118138485..24577ff406b3b6a0477dc72c59964191a3a0063b 100644
--- a/apps/web-ele/src/views/mall/product/spu/index.vue
+++ b/apps/web-ele/src/views/mall/product/spu/index.vue
@@ -98,7 +98,7 @@ function handleEdit(row: MallSpuApi.Spu) {
 
 /** 删除商品 */
 async function handleDelete(row: MallSpuApi.Spu) {
-  const hideLoading = ElLoading.service({
+  const loadingInstance = ElLoading.service({
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
@@ -106,7 +106,7 @@ async function handleDelete(row: MallSpuApi.Spu) {
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
     await onRefresh();
   } finally {
-    hideLoading.close();
+    loadingInstance.close();
   }
 }
 
diff --git a/apps/web-ele/src/views/mall/product/spu/modules/form-data.ts b/apps/web-ele/src/views/mall/product/spu/modules/form-data.ts
new file mode 100644
index 0000000000000000000000000000000000000000..c29094025825a0f62850d9ebf613f4a5a8760c18
--- /dev/null
+++ b/apps/web-ele/src/views/mall/product/spu/modules/form-data.ts
@@ -0,0 +1,262 @@
+import type { VbenFormSchema } from '#/adapter/form';
+
+import { DeliveryTypeEnum, DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
+import { handleTree } from '@vben/utils';
+
+import { z } from '#/adapter/form';
+import { getSimpleBrandList } from '#/api/mall/product/brand';
+import { getCategoryList } from '#/api/mall/product/category';
+import { getSimpleTemplateList } from '#/api/mall/trade/delivery/expressTemplate';
+
+/** 基础设置的表单 */
+export function useInfoFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'name',
+      label: '商品名称',
+      component: 'Input',
+      componentProps: {
+        allowClear: true,
+        placeholder: '请输入商品名称',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'categoryId',
+      label: '分类名称',
+      // component: 'ApiCascader',
+      component: 'ApiTreeSelect',
+      componentProps: {
+        api: async () => {
+          const data = await getCategoryList({});
+          return handleTree(data);
+        },
+        fieldNames: { label: 'name', value: 'id', children: 'children' },
+        placeholder: '请选择商品分类',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'brandId',
+      label: '商品品牌',
+      component: 'ApiSelect',
+      componentProps: {
+        api: () => getSimpleBrandList(),
+        labelField: 'name',
+        valueField: 'id',
+        allowClear: true,
+        placeholder: '请选择商品品牌',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'keyword',
+      label: '商品关键字',
+      component: 'Input',
+      componentProps: {
+        placeholder: '请输入商品关键字',
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'introduction',
+      label: '商品简介',
+      component: 'Textarea',
+      componentProps: {
+        placeholder: '请输入商品简介',
+        autoSize: { minRows: 2, maxRows: 2 },
+        showCount: true,
+        maxlength: 128,
+        allowClear: true,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'picUrl',
+      label: '商品封面图',
+      component: 'ImageUpload',
+      componentProps: {
+        maxSize: 30,
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'sliderPicUrls',
+      label: '商品轮播图',
+      component: 'ImageUpload',
+      componentProps: {
+        maxNumber: 10,
+        multiple: true,
+        maxSize: 30,
+      },
+      rules: 'required',
+    },
+  ];
+}
+
+/** 价格库存的表单 */
+export function useSkuFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'subCommissionType',
+      label: '分销类型',
+      component: 'RadioGroup',
+      componentProps: {
+        allowClear: true,
+        options: [
+          {
+            label: '默认设置',
+            value: false,
+          },
+          {
+            label: '单独设置',
+            value: true,
+          },
+        ],
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'specType',
+      label: '商品规格',
+      component: 'RadioGroup',
+      componentProps: {
+        allowClear: true,
+        options: [
+          {
+            label: '单规格',
+            value: false,
+          },
+          {
+            label: '多规格',
+            value: true,
+          },
+        ],
+      },
+      rules: 'required',
+    },
+    // TODO @xingyu：待补充商品属性
+  ];
+}
+
+/** 物流设置的表单 */
+export function useDeliveryFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'deliveryTypes',
+      label: '配送方式',
+      component: 'CheckboxGroup',
+      componentProps: {
+        options: getDictOptions(DICT_TYPE.TRADE_DELIVERY_TYPE, 'number'),
+      },
+      rules: 'required',
+    },
+    {
+      fieldName: 'deliveryTemplateId',
+      label: '运费模板',
+      component: 'ApiSelect',
+      componentProps: {
+        api: getSimpleTemplateList,
+        labelField: 'name',
+        valueField: 'id',
+      },
+      dependencies: {
+        triggerFields: ['deliveryTypes'],
+        show: (values) =>
+          !!values.deliveryTypes &&
+          values.deliveryTypes.includes(DeliveryTypeEnum.EXPRESS.type),
+      },
+      rules: 'required',
+    },
+  ];
+}
+
+/** 商品详情的表单 */
+export function useDescriptionFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'description',
+      label: '商品详情',
+      component: 'RichTextarea',
+      componentProps: {
+        placeholder: '请输入商品详情',
+        height: 1000,
+      },
+      rules: 'required',
+    },
+  ];
+}
+
+/** 其它设置的表单 */
+export function useOtherFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'id',
+      component: 'Input',
+      dependencies: {
+        triggerFields: [''],
+        show: () => false,
+      },
+    },
+    {
+      fieldName: 'sort',
+      label: '商品排序',
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+      },
+      rules: z.number().min(0).optional().default(0),
+    },
+    {
+      fieldName: 'giveIntegral',
+      label: '赠送积分',
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+      },
+      rules: z.number().min(0).optional().default(0),
+    },
+    {
+      fieldName: 'virtualSalesCount',
+      label: '虚拟销量',
+      component: 'InputNumber',
+      componentProps: {
+        min: 0,
+      },
+      rules: z.number().min(0).optional().default(0),
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mall/product/spu/modules/form.vue b/apps/web-ele/src/views/mall/product/spu/modules/form.vue
index c771aff9323f298cdf86384d0af5eed90ee53bd0..adcad4c02427b082bf271411e8c41a5175a6886e 100644
--- a/apps/web-ele/src/views/mall/product/spu/modules/form.vue
+++ b/apps/web-ele/src/views/mall/product/spu/modules/form.vue
@@ -1,104 +1,105 @@
 <script lang="ts" setup>
 import type { MallSpuApi } from '#/api/mall/product/spu';
 
-import { onMounted, ref, unref } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { onMounted, ref } from 'vue';
+import { useRoute } from 'vue-router';
 
-import { Page } from '@vben/common-ui';
-import { cloneDeep, convertToInteger, formatToFraction } from '@vben/utils';
+import { ContentWrap, Page } from '@vben/common-ui';
+import { convertToInteger, formatToFraction } from '@vben/utils';
 
-import { ElMessage } from 'element-plus';
+import { ElButton, ElTabs } from 'element-plus';
 
-import * as ProductSpuApi from '#/api/mall/product/spu';
+import { useVbenForm } from '#/adapter/form';
+import { createSpu, getSpu, updateSpu } from '#/api/mall/product/spu';
 
-import DeliveryForm from '../components/delivery-form.vue';
-import DescriptionForm from '../components/description-form.vue';
-import InfoForm from '../components/info-form.vue';
-import OtherForm from '../components/other-form.vue';
-import SkuForm from '../components/sku-form.vue';
+import {
+  useDeliveryFormSchema,
+  useDescriptionFormSchema,
+  useInfoFormSchema,
+  useOtherFormSchema,
+  useSkuFormSchema,
+} from './form-data';
+
+const spuId = ref<number>();
+const { params } = useRoute();
 
 const activeTab = ref('info');
-const activeName = ref('info'); // Tag 激活的窗口
-
-// SPU 表单数据
-const formData = ref<MallSpuApi.Spu>({
-  name: '', // 商品名称
-  categoryId: undefined, // 商品分类
-  keyword: '', // 关键字
-  picUrl: '', // 商品封面图
-  sliderPicUrls: [], // 商品轮播图
-  introduction: '', // 商品简介
-  deliveryTypes: [], // 配送方式数组
-  deliveryTemplateId: undefined, // 运费模版
-  brandId: undefined, // 商品品牌
-  specType: false, // 商品规格
-  subCommissionType: false, // 分销类型
-  skus: [
-    {
-      price: 0, // 商品价格
-      marketPrice: 0, // 市场价
-      costPrice: 0, // 成本价
-      barCode: '', // 商品条码
-      picUrl: '', // 图片地址
-      stock: 0, // 库存
-      weight: 0, // 商品重量
-      volume: 0, // 商品体积
-      firstBrokeragePrice: 0, // 一级分销的佣金
-      secondBrokeragePrice: 0, // 二级分销的佣金
+
+const [InfoForm, infoFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
     },
-  ],
-  description: '', // 商品详情
-  sort: 0, // 商品排序
-  giveIntegral: 0, // 赠送积分
-  virtualSalesCount: 0, // 虚拟销量
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useInfoFormSchema(),
+  showDefaultActions: false,
 });
 
-const formLoading = ref(false); // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const { push } = useRouter(); // 路由
-const { params } = useRoute(); // 查询参数
-/** 获得详情 */
-const getDetail = async () => {
-  const id = params.id as unknown as number;
-  if (id) {
-    formLoading.value = true;
-    try {
-      const res = (await ProductSpuApi.getSpu(id)) as MallSpuApi.Spu;
-      res.skus?.forEach((item: MallSpuApi.Sku) => {
-        // 回显价格分转元
-        item.price = formatToFraction(item.price);
-        item.marketPrice = formatToFraction(item.marketPrice);
-        item.costPrice = formatToFraction(item.costPrice);
-        item.firstBrokeragePrice = formatToFraction(item.firstBrokeragePrice);
-        item.secondBrokeragePrice = formatToFraction(item.secondBrokeragePrice);
-      });
-      formData.value = res;
-    } finally {
-      formLoading.value = false;
-    }
-  }
-};
-
-/** 提交按钮 */
-const infoRef = ref<InstanceType<typeof InfoForm>>();
-const skuRef = ref<InstanceType<typeof SkuForm>>();
-const deliveryRef = ref<InstanceType<typeof DeliveryForm>>();
-const descriptionRef = ref<InstanceType<typeof DescriptionForm>>();
-const otherRef = ref<InstanceType<typeof OtherForm>>();
-const submitForm = async () => {
-  // 提交请求
-  formLoading.value = true;
-  try {
-    // 校验各表单
-    await unref(infoRef)?.validate();
-    await unref(skuRef)?.validate();
-    await unref(deliveryRef)?.validate();
-    await unref(descriptionRef)?.validate();
-    await unref(otherRef)?.validate();
-    // 深拷贝一份, 这样最终 server 端不满足，不需要影响原始数据
-    const deepCopyFormData = cloneDeep(unref(formData.value)) as MallSpuApi.Spu;
-    deepCopyFormData.skus!.forEach((item) => {
-      // 给sku name赋值
-      item.name = deepCopyFormData.name;
+const [SkuForm, skuFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useSkuFormSchema(),
+  showDefaultActions: false,
+});
+
+const [DeliveryForm, deliveryFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useDeliveryFormSchema(),
+  showDefaultActions: false,
+});
+
+const [DescriptionForm, descriptionFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'vertical',
+  schema: useDescriptionFormSchema(),
+  showDefaultActions: false,
+});
+
+const [OtherForm, otherFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useOtherFormSchema(),
+  showDefaultActions: false,
+});
+
+async function onSubmit() {
+  const values: MallSpuApi.Spu = await infoFormApi
+    .merge(skuFormApi)
+    .merge(deliveryFormApi)
+    .merge(descriptionFormApi)
+    .merge(otherFormApi)
+    .submitAllForm(true);
+
+  if (values.skus) {
+    values.skus.forEach((item) => {
       // sku相关价格元转分
       item.price = convertToInteger(item.price);
       item.marketPrice = convertToInteger(item.marketPrice);
@@ -106,85 +107,71 @@ const submitForm = async () => {
       item.firstBrokeragePrice = convertToInteger(item.firstBrokeragePrice);
       item.secondBrokeragePrice = convertToInteger(item.secondBrokeragePrice);
     });
-    // 处理轮播图列表
-    const newSliderPicUrls: any[] = [];
-    deepCopyFormData.sliderPicUrls!.forEach((item: any) => {
-      // 如果是前端选的图
-      typeof item === 'object'
-        ? newSliderPicUrls.push(item.url)
-        : newSliderPicUrls.push(item);
-    });
-    deepCopyFormData.sliderPicUrls = newSliderPicUrls;
-    // 校验都通过后提交表单
-    const data = deepCopyFormData as MallSpuApi.Spu;
-    const id = params.id as unknown as number;
-    if (id) {
-      await ProductSpuApi.updateSpu(data);
-      ElMessage.success('更新成功');
-    } else {
-      await ProductSpuApi.createSpu(data);
-      ElMessage.success('创建成功');
-    }
-    close();
-  } finally {
-    formLoading.value = false;
   }
-};
+  // 处理轮播图列表
+  const newSliderPicUrls: any[] = [];
+  values.sliderPicUrls!.forEach((item: any) => {
+    // 如果是前端选的图
+    typeof item === 'object'
+      ? newSliderPicUrls.push(item.url)
+      : newSliderPicUrls.push(item);
+  });
+  values.sliderPicUrls = newSliderPicUrls;
+
+  await (spuId.value ? updateSpu(values) : createSpu(values));
+}
 
-/** 关闭按钮 */
-const close = () => {
-  push({ name: 'ProductSpu' });
-};
+async function initDate() {
+  spuId.value = params.id as unknown as number;
+  if (!spuId.value) {
+    return;
+  }
+  const res = await getSpu(spuId.value);
+  if (res.skus) {
+    res.skus.forEach((item) => {
+      // 回显价格分转元
+      item.price = formatToFraction(item.price);
+      item.marketPrice = formatToFraction(item.marketPrice);
+      item.costPrice = formatToFraction(item.costPrice);
+      item.firstBrokeragePrice = formatToFraction(item.firstBrokeragePrice);
+      item.secondBrokeragePrice = formatToFraction(item.secondBrokeragePrice);
+    });
+  }
+  infoFormApi.setValues(res);
+  skuFormApi.setValues(res);
+  deliveryFormApi.setValues(res);
+  descriptionFormApi.setValues(res);
+  otherFormApi.setValues(res);
+}
 
-/** 初始化 */
 onMounted(async () => {
-  await getDetail();
+  await initDate();
 });
 </script>
 
 <template>
-  <!-- TODO @霖：样式有点丑，要不照 vue3 + element-plus 在优化下？ -->
-  <Page :auto-content-height="true">
-    <ElTabs v-model="activeTab">
-      <ElTabPane label="基础设置" name="info">
-        <InfoForm
-          :prop-form-data="formData"
-          v-model:active-name="activeName"
-          ref="infoRef"
-        />
-      </ElTabPane>
-      <ElTabPane label="价格库存" name="sku">
-        <SkuForm
-          :prop-form-data="formData"
-          v-model:active-name="activeName"
-          ref="skuRef"
-        />
-      </ElTabPane>
-      <ElTabPane label="物流设置" name="delivery">
-        <DeliveryForm
-          :prop-form-data="formData"
-          v-model:active-name="activeName"
-          ref="deliveryRef"
-        />
-      </ElTabPane>
-      <ElTabPane label="商品详情" name="description">
-        <DescriptionForm
-          :prop-form-data="formData"
-          v-model:active-name="activeName"
-          ref="descriptionRef"
-        />
-      </ElTabPane>
-      <ElTabPane label="其它设置" name="other">
-        <OtherForm
-          :prop-form-data="formData"
-          v-model:active-name="activeName"
-          ref="otherRef"
-        />
-      </ElTabPane>
-    </ElTabs>
-    <ElButton type="primary" :loading="formLoading" @click="submitForm">
-      保存
-    </ElButton>
-    <ElButton @click="close">返回</ElButton>
+  <Page auto-content-height>
+    <ContentWrap class="h-full w-full pb-8">
+      <template #extra>
+        <ElButton type="primary" @click="onSubmit"> 保存 </ElButton>
+      </template>
+      <ElTabs v-model="activeTab">
+        <ElTabs.TabPane label="基础设置" name="info">
+          <InfoForm class="w-3/5" />
+        </ElTabs.TabPane>
+        <ElTabs.TabPane label="价格库存" name="sku">
+          <SkuForm class="w-3/5" />
+        </ElTabs.TabPane>
+        <ElTabs.TabPane label="物流设置" name="delivery">
+          <DeliveryForm class="w-3/5" />
+        </ElTabs.TabPane>
+        <ElTabs.TabPane label="商品详情" name="description">
+          <DescriptionForm class="w-3/5" />
+        </ElTabs.TabPane>
+        <ElTabs.TabPane label="其它设置" name="other">
+          <OtherForm class="w-3/5" />
+        </ElTabs.TabPane>
+      </ElTabs>
+    </ContentWrap>
   </Page>
 </template>
diff --git a/apps/web-ele/src/views/mall/promotion/combination/components/combination-showcase.vue b/apps/web-ele/src/views/mall/promotion/combination/components/combination-showcase.vue
index 0ff411717550a8aefac5855812b7a768a086af9f..2a3d74e1d7a0707893a05dac04f3b346d836d4ff 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/components/combination-showcase.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/components/combination-showcase.vue
@@ -3,6 +3,8 @@ import type { MallCombinationActivityApi } from '#/api/mall/promotion/combinatio
 
 import { computed, ref, watch } from 'vue';
 
+import { IconifyIcon } from '@vben/icons';
+
 import * as CombinationActivityApi from '#/api/mall/promotion/combination/combinationActivity';
 import CombinationTableSelect from '#/views/mall/promotion/combination/components/combination-table-select.vue';
 
@@ -125,7 +127,7 @@ const emitActivityChange = () => {
       <el-tooltip :content="combinationActivity.name">
         <div class="relative h-full w-full">
           <el-image :src="combinationActivity.picUrl" class="h-full w-full" />
-          <Icon
+          <IconifyIcon
             v-show="!disabled"
             class="del-icon"
             icon="ep:circle-close-filled"
@@ -136,7 +138,7 @@ const emitActivityChange = () => {
     </div>
     <el-tooltip content="选择活动" v-if="canAdd">
       <div class="select-box" @click="openCombinationActivityTableSelect">
-        <Icon icon="ep:plus" />
+        <IconifyIcon icon="ep:plus" />
       </div>
     </el-tooltip>
   </div>
diff --git a/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue b/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
index 84db075b038a1affe97163457b77772c6b8c9242..fde43f2ecf31bd5dcfb12de6801fe634be857d51 100644
--- a/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/combination/components/combination-table-select.vue
@@ -6,6 +6,7 @@ import { onMounted, ref } from 'vue';
 import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
 import {
   dateFormatter,
   fenToYuan,
@@ -281,11 +282,11 @@ onMounted(async () => {
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
+            <IconifyIcon class="mr-5px" icon="ep:search" />
             搜索
           </el-button>
           <el-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
+            <IconifyIcon class="mr-5px" icon="ep:refresh" />
             重置
           </el-button>
         </el-form-item>
diff --git a/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue b/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
index b29626d823e2c48496524d6ed017bc0e84b4d5a5..8784224f3134147053dc734062a10af4cb91f96c 100644
--- a/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/coupon/components/coupon-select.vue
@@ -6,6 +6,7 @@ import { reactive, ref } from 'vue';
 import { ContentWrap } from '@vben/common-ui';
 import { CouponTemplateTakeTypeEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
 
 import * as CouponTemplateApi from '#/api/mall/promotion/coupon/couponTemplate';
 import {
@@ -130,11 +131,11 @@ const submitForm = () => {
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
+            <IconifyIcon class="mr-5px" icon="ep:search" />
             搜索
           </el-button>
           <el-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
+            <IconifyIcon class="mr-5px" icon="ep:refresh" />
             重置
           </el-button>
         </el-form-item>
diff --git a/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue b/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
index 69e5ebf7d01d2af9bbbb2a781300d038bb7be3fc..e850d8eb37f6fe23dc8285d87ba05180f8cbf618 100644
--- a/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/point/components/point-table-select.vue
@@ -6,6 +6,7 @@ import { computed, ref } from 'vue';
 import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
 import { dateFormatter, fenToYuanFormat } from '@vben/utils';
 
 import { CHANGE_EVENT } from 'element-plus';
@@ -236,11 +237,11 @@ const calculateIsCheckAll = () => {
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
+            <IconifyIcon class="mr-5px" icon="ep:search" />
             搜索
           </el-button>
           <el-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
+            <IconifyIcon class="mr-5px" icon="ep:refresh" />
             重置
           </el-button>
         </el-form-item>
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue b/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
index 6014338fa16996d09d380d0be57493cfbdd4dfe7..d188f315a9cef62de2f9ea152846cfcb247d95f7 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/seckill/components/seckill-table-select.vue
@@ -6,6 +6,7 @@ import { onMounted, ref } from 'vue';
 import { ContentWrap } from '@vben/common-ui';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { IconifyIcon } from '@vben/icons';
 import {
   dateFormatter,
   fenToYuan,
@@ -274,11 +275,11 @@ onMounted(async () => {
         </el-form-item>
         <el-form-item>
           <el-button @click="handleQuery">
-            <Icon class="mr-5px" icon="ep:search" />
+            <IconifyIcon class="mr-5px" icon="ep:search" />
             搜索
           </el-button>
           <el-button @click="resetQuery">
-            <Icon class="mr-5px" icon="ep:refresh" />
+            <IconifyIcon class="mr-5px" icon="ep:refresh" />
             重置
           </el-button>
         </el-form-item>
diff --git a/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts b/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
index bce62ae0d2f4ddebd0d0ef9e5d20bca9202fddc8..cd9ffa8b3d85b94bbb7cd2552714d6ac1b8ae681 100644
--- a/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
+++ b/apps/web-ele/src/views/mall/promotion/seckill/config/data.ts
@@ -91,10 +91,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 表格列配置 */
-export function useGridColumns<T = MallSeckillConfigApi.SeckillConfig>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: MallSeckillConfigApi.SeckillConfig,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/mall/statistics/product/components/product-summary.vue b/apps/web-ele/src/views/mall/statistics/product/components/product-summary.vue
index 41e7a94a1a75362d6ebab97136b501118cfc2461..c7ec77f7f5b809dcb6bdc5bedeade8bce1527e7f 100644
--- a/apps/web-ele/src/views/mall/statistics/product/components/product-summary.vue
+++ b/apps/web-ele/src/views/mall/statistics/product/components/product-summary.vue
@@ -8,6 +8,7 @@ import type { AnalysisOverviewIconItem } from '#/views/mall/home/components/data
 import { reactive, ref } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import {
   calculateRelativeRate,
@@ -310,9 +311,9 @@ const loadOverview = () => {
           class="ml-4"
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['statistics:product:export']"
+          v-access:code="['statistics:product:export']"
         >
-          <Icon icon="ep:download" class="mr-1" />导出
+          <IconifyIcon icon="ep:download" class="mr-1" />导出
         </el-button>
       </ShortcutDateRangePicker>
     </template>
diff --git a/apps/web-ele/src/views/mall/statistics/trade/components/trade-transaction-card.vue b/apps/web-ele/src/views/mall/statistics/trade/components/trade-transaction-card.vue
index 2676dc5888cb43996378847350ed41b623e6a1b7..ec630b99d2ca94509a23be28fc32558496c4387b 100644
--- a/apps/web-ele/src/views/mall/statistics/trade/components/trade-transaction-card.vue
+++ b/apps/web-ele/src/views/mall/statistics/trade/components/trade-transaction-card.vue
@@ -8,6 +8,7 @@ import type { AnalysisOverviewIconItem } from '#/views/mall/home/components/data
 import { reactive, ref } from 'vue';
 
 import { confirm } from '@vben/common-ui';
+import { IconifyIcon } from '@vben/icons';
 import { EchartsUI, useEcharts } from '@vben/plugins/echarts';
 import {
   calculateRelativeRate,
@@ -268,9 +269,9 @@ const lineChartOptions = reactive({
           class="ml-4"
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['statistics:trade:export']"
+          v-access:code="['statistics:trade:export']"
         >
-          <Icon icon="ep:download" class="mr-1" />导出
+          <IconifyIcon icon="ep:download" class="mr-1" />导出
         </el-button>
       </ShortcutDateRangePicker>
     </template>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts b/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts
index f2ebf2712c202a39fe8f49c953c4fa73306c948d..a6ed265ac7b27f3df95b6fa1bd664a78e91ec991 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts
+++ b/apps/web-ele/src/views/mall/trade/brokerage/record/data.ts
@@ -1,10 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { fenToYuan } from '@vben/utils';
-
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
+import { fenToYuan } from '@vben/utils';
 
 import { getRangePickerDefaultProps } from '#/utils';
 
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/record/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/record/index.vue
index 17a2ad3963ae9d27e1631b299cb966c2188262d8..a9596487424fe8f5d98bda075f70c2914c31931e 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/record/index.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/record/index.vue
@@ -19,7 +19,6 @@ const [Grid] = useVbenVxeGrid({
     columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/data.ts b/apps/web-ele/src/views/mall/trade/brokerage/user/data.ts
index 8de25b5bfce83298b8bd6946db71f809fdb9b194..12d01cc0a197687badf4ff42e0f87afe1bee5d03 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/data.ts
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/data.ts
@@ -1,6 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
+import { DICT_TYPE } from '@vben/constants';
+import { getDictOptions } from '@vben/hooks';
 import { fenToYuan } from '@vben/utils';
 
 import { getRangePickerDefaultProps } from '#/utils';
@@ -29,6 +32,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
           { label: '无', value: false },
         ],
       },
+      defaultValue: true,
     },
     {
       fieldName: 'createTime',
@@ -43,7 +47,12 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(): VxeTableGridOptions['columns'] {
+export function useGridColumns(
+  onBrokerageEnabledChange?: (
+    newEnabled: boolean,
+    row: MallBrokerageUserApi.BrokerageUser,
+  ) => PromiseLike<boolean | undefined>,
+): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
@@ -56,11 +65,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 70,
       cellRender: {
         name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-          shape: 'circle',
-        },
       },
     },
     {
@@ -111,7 +115,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'brokerageEnabled',
       title: '推广资格',
       minWidth: 80,
-      slots: { default: 'brokerageEnabled' },
+      align: 'center',
+      cellRender: {
+        attrs: { beforeChange: onBrokerageEnabledChange },
+        name: 'CellSwitch',
+        props: {
+          activeValue: true,
+          inactiveValue: false,
+          activeText: '有',
+          inactiveText: '无',
+        },
+      },
     },
     {
       field: 'brokerageTime',
@@ -138,3 +152,207 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
   ];
 }
+
+/** 创建分销员表单配置 */
+export function useCreateFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'userId',
+      label: '分销员编号',
+      component: 'Input',
+      rules: 'required',
+    },
+    {
+      fieldName: 'bindUserId',
+      label: '上级推广员编号',
+      component: 'Input',
+      rules: 'required',
+    },
+  ];
+}
+
+/** 修改分销用户表单配置 */
+export function useUpdateFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'bindUserId',
+      label: '上级推广员编号',
+      component: 'Input',
+      rules: 'required',
+    },
+  ];
+}
+
+/** 用户列表弹窗搜索表单配置 */
+export function useUserListFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'level',
+      label: '用户类型',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '全部', value: undefined },
+          { label: '一级推广人', value: '1' },
+          { label: '二级推广人', value: '2' },
+        ],
+        clearable: true,
+      },
+    },
+    {
+      fieldName: 'bindUserTime',
+      label: '绑定时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 用户列表弹窗表格列配置 */
+export function useUserListColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'id',
+      title: '用户编号',
+      minWidth: 80,
+    },
+    {
+      field: 'avatar',
+      title: '头像',
+      minWidth: 70,
+      cellRender: {
+        name: 'CellImage',
+        props: {
+          width: 24,
+          height: 24,
+          shape: 'circle',
+        },
+      },
+    },
+    {
+      field: 'nickname',
+      title: '昵称',
+      minWidth: 80,
+    },
+    {
+      field: 'brokerageUserCount',
+      title: '推广人数',
+      minWidth: 80,
+    },
+    {
+      field: 'brokerageOrderCount',
+      title: '推广订单数量',
+      minWidth: 110,
+    },
+    {
+      field: 'brokerageEnabled',
+      title: '推广资格',
+      minWidth: 80,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+      },
+    },
+    {
+      field: 'bindUserTime',
+      title: '绑定时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
+
+/** 推广订单列表弹窗搜索表单配置 */
+export function useOrderListFormSchema(): VbenFormSchema[] {
+  return [
+    {
+      fieldName: 'sourceUserLevel',
+      label: '用户类型',
+      component: 'Select',
+      componentProps: {
+        options: [
+          { label: '全部', value: 0 },
+          { label: '一级推广人', value: 1 },
+          { label: '二级推广人', value: 2 },
+        ],
+      },
+      defaultValue: 0,
+    },
+    {
+      fieldName: 'status',
+      label: '状态',
+      component: 'Select',
+      componentProps: {
+        placeholder: '请选择状态',
+        clearable: true,
+        options: getDictOptions(DICT_TYPE.BROKERAGE_RECORD_STATUS, 'number'),
+      },
+    },
+    {
+      fieldName: 'createTime',
+      label: '创建时间',
+      component: 'RangePicker',
+      componentProps: {
+        ...getRangePickerDefaultProps(),
+        clearable: true,
+      },
+    },
+  ];
+}
+
+/** 推广订单列表弹窗表格列配置 */
+export function useOrderListColumns(): VxeTableGridOptions['columns'] {
+  return [
+    {
+      field: 'bizId',
+      title: '订单编号',
+      minWidth: 80,
+    },
+    {
+      field: 'sourceUserId',
+      title: '用户编号',
+      minWidth: 80,
+    },
+    {
+      field: 'sourceUserAvatar',
+      title: '头像',
+      minWidth: 70,
+      cellRender: {
+        name: 'CellImage',
+        props: {
+          width: 24,
+          height: 24,
+        },
+      },
+    },
+    {
+      field: 'sourceUserNickname',
+      title: '昵称',
+      minWidth: 80,
+    },
+    {
+      field: 'price',
+      title: '佣金',
+      minWidth: 100,
+      formatter: ({ row }) => `￥${fenToYuan(row.price)}`,
+    },
+    {
+      field: 'status',
+      title: '状态',
+      minWidth: 85,
+      cellRender: {
+        name: 'CellDict',
+        props: { type: DICT_TYPE.BROKERAGE_RECORD_STATUS },
+      },
+    },
+    {
+      field: 'createTime',
+      title: '创建时间',
+      width: 180,
+      formatter: 'formatDateTime',
+    },
+  ];
+}
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
index 9554f2613aab35080798391d343ed1e8c245aa87..d66be3c566b2d22bc4904609db7d545958b0178e 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/index.vue
@@ -2,11 +2,10 @@
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { useAccess } from '@vben/access';
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 
-import { ElLoading, ElMessage, ElSwitch } from 'element-plus';
+import { ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -16,96 +15,111 @@ import {
 } from '#/api/mall/trade/brokerage/user';
 
 import { useGridColumns, useGridFormSchema } from './data';
+import CreateForm from './modules/create-form.vue';
 import BrokerageOrderListModal from './modules/order-list-modal.vue';
-import BrokerageUserCreateForm from './modules/user-create-form.vue';
+import UpdateForm from './modules/update-form.vue';
 import BrokerageUserListModal from './modules/user-list-modal.vue';
-import BrokerageUserUpdateForm from './modules/user-update-form.vue';
 
 defineOptions({ name: 'TradeBrokerageUser' });
 
-const { hasAccessByCodes } = useAccess();
-
-/** 刷新表格 */
-function onRefresh() {
-  gridApi.query();
-}
+const [CreateFormModal, createFormModalApi] = useVbenModal({
+  connectedComponent: CreateForm,
+  destroyOnClose: true,
+});
 
-const [OrderListModal, OrderListModalApi] = useVbenModal({
-  connectedComponent: BrokerageOrderListModal,
+const [UpdateFormModal, updateModalApi] = useVbenModal({
+  connectedComponent: UpdateForm,
+  destroyOnClose: true,
 });
 
-const [UserCreateModal, UserCreateModalApi] = useVbenModal({
-  connectedComponent: BrokerageUserCreateForm,
+const [OrderListModal, orderListModalApi] = useVbenModal({
+  connectedComponent: BrokerageOrderListModal,
+  destroyOnClose: true,
 });
 
-const [UserListModal, UserListModalApi] = useVbenModal({
+const [UserListModal, userListModalApi] = useVbenModal({
   connectedComponent: BrokerageUserListModal,
+  destroyOnClose: true,
 });
 
-const [UserUpdateModal, UserUpdateModalApi] = useVbenModal({
-  connectedComponent: BrokerageUserUpdateForm,
-});
+/** 刷新表格 */
+function handleRefresh() {
+  gridApi.query();
+}
 
-/** 打开推广人列表 */
-function openBrokerageUserTable(row: MallBrokerageUserApi.BrokerageUser) {
-  UserListModalApi.setData(row).open();
+/** 创建分销员 */
+function handleCreate() {
+  createFormModalApi.open();
 }
 
-/** 打开推广订单列表 */
-function openBrokerageOrderTable(row: MallBrokerageUserApi.BrokerageUser) {
-  OrderListModalApi.setData(row).open();
+/** 修改分销员 */
+function handleUpdateForm(row: MallBrokerageUserApi.BrokerageUser) {
+  updateModalApi.setData(row).open();
 }
 
-/** 打开表单：修改上级推广人 */
-function openUpdateBindUserForm(row: MallBrokerageUserApi.BrokerageUser) {
-  UserUpdateModalApi.setData(row).open();
+/** 打开推广人列表 */
+function handleOpenUserList(row: MallBrokerageUserApi.BrokerageUser) {
+  userListModalApi.setData(row).open();
 }
 
-/** 创建分销员 */
-function openCreateUserForm() {
-  UserCreateModalApi.open();
+/** 打开推广订单列表 */
+function handleOpenOrderList(row: MallBrokerageUserApi.BrokerageUser) {
+  orderListModalApi.setData(row).open();
 }
 
 /** 清除上级推广人 */
 async function handleClearBindUser(row: MallBrokerageUserApi.BrokerageUser) {
-  await confirm(`确定清除"${row.nickname}"的上级推广人吗？`);
-  await clearBindUser({ id: row.id as number });
-  ElMessage.success('清除成功');
-  onRefresh();
-}
-
-/** 推广资格：开通/关闭 */
-async function handleBrokerageEnabledChange(
-  row: MallBrokerageUserApi.BrokerageUser,
-) {
-  const text = row.brokerageEnabled ? '开通' : '关闭';
   const loadingInstance = ElLoading.service({
-    text: `正在${text}"${row.nickname}"的推广资格...`,
+    text: $t('ui.actionMessage.deleting', [row.nickname]),
   });
   try {
-    await updateBrokerageEnabled({
-      id: row.id as number,
-      enabled: row.brokerageEnabled as boolean,
-    });
-    ElMessage.success(`${text}成功`);
-    onRefresh();
-  } catch {
-    // 异常时，需要重置回之前的值
-    row.brokerageEnabled = !row.brokerageEnabled;
+    await clearBindUser({ id: row.id! });
+    ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.nickname]));
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
 }
 
+/** 更新推广资格 */
+async function handleBrokerageEnabledChange(
+  newEnabled: boolean,
+  row: MallBrokerageUserApi.BrokerageUser,
+): Promise<boolean | undefined> {
+  return new Promise((resolve, reject) => {
+    const text = newEnabled ? '开通' : '关闭';
+    confirm({
+      content: `你要将${row.nickname}的推广资格切换为【${text}】吗？`,
+    })
+      .then(async () => {
+        // 更新推广资格
+        const res = await updateBrokerageEnabled({
+          id: row.id!,
+          enabled: newEnabled,
+        });
+        if (res) {
+          // 提示并返回成功
+          ElMessage.success($t('ui.actionMessage.operationSuccess'));
+          handleRefresh();
+          resolve(true);
+        } else {
+          reject(new Error('更新失败'));
+        }
+      })
+      .catch(() => {
+        reject(new Error('取消操作'));
+      });
+  });
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(),
+    columns: useGridColumns(handleBrokerageEnabledChange),
     height: 'auto',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
@@ -138,6 +152,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
       />
     </template>
 
+    <!-- 创建分销员 -->
+    <CreateFormModal @success="handleRefresh" />
+    <!-- 修改分销员 -->
+    <UpdateFormModal @success="handleRefresh" />
+    <!-- 推广人列表 -->
+    <UserListModal />
+    <!-- 推广订单列表 -->
+    <OrderListModal />
     <Grid table-title="分销用户列表">
       <template #toolbar-tools>
         <TableAction
@@ -147,24 +169,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'primary',
               icon: ACTION_ICON.ADD,
               auth: ['trade:brokerage-user:create'],
-              onClick: openCreateUserForm,
+              onClick: handleCreate,
             },
           ]"
         />
       </template>
-
-      <template #brokerageEnabled="{ row }">
-        <ElSwitch
-          v-model:checked="row.brokerageEnabled"
-          :disabled="
-            !hasAccessByCodes(['trade:brokerage-user:update-bind-user'])
-          "
-          checked-children="有"
-          un-checked-children="无"
-          @change="handleBrokerageEnabledChange(row)"
-        />
-      </template>
-
       <template #actions="{ row }">
         <TableAction
           :drop-down-actions="[
@@ -173,41 +182,33 @@ const [Grid, gridApi] = useVbenVxeGrid({
               type: 'primary',
               link: true,
               auth: ['trade:brokerage-user:user-query'],
-              onClick: openBrokerageUserTable.bind(null, row),
+              onClick: handleOpenUserList.bind(null, row),
             },
             {
               label: '推广订单',
               type: 'primary',
               link: true,
               auth: ['trade:brokerage-user:order-query'],
-              onClick: openBrokerageOrderTable.bind(null, row),
+              onClick: handleOpenOrderList.bind(null, row),
             },
             {
               label: '修改上级推广人',
               type: 'primary',
               link: true,
               auth: ['trade:brokerage-user:update-bind-user'],
-              onClick: openUpdateBindUserForm.bind(null, row),
+              onClick: handleUpdateForm.bind(null, row),
             },
             {
               label: '清除上级推广人',
               type: 'primary',
               link: true,
               auth: ['trade:brokerage-user:clear-bind-user'],
+              ifShow: row.bindUserId > 0,
               onClick: handleClearBindUser.bind(null, row),
             },
           ]"
         />
       </template>
     </Grid>
-
-    <!-- 修改上级推广人表单 -->
-    <UserUpdateModal @success="onRefresh" />
-    <!-- 推广人列表 -->
-    <UserListModal />
-    <!-- 推广订单列表 -->
-    <OrderListModal />
-    <!-- 创建分销员 -->
-    <UserCreateModal @success="onRefresh" />
   </Page>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-create-form.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
similarity index 30%
rename from apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
rename to apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
index cb2830ed0d1327392459bfb68062dc93a1293b58..0ceb8bc98ee945942b48de7fab7950fc56dc8f73 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-create-form.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/create-form.vue
@@ -1,9 +1,10 @@
 <script lang="ts" setup>
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 import { formatDate, isEmpty } from '@vben/utils';
@@ -12,16 +13,20 @@ import {
   ElAvatar,
   ElDescriptions,
   ElDescriptionsItem,
+  ElDivider,
   ElInput,
   ElMessage,
-  ElTag,
 } from 'element-plus';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   createBrokerageUser,
   getBrokerageUser,
 } from '#/api/mall/trade/brokerage/user';
 import { getUser } from '#/api/member/user';
+import { DictTag } from '#/components/dict-tag';
+
+import { useCreateFormSchema } from '../data';
 
 defineOptions({ name: 'BrokerageUserCreateForm' });
 
@@ -32,9 +37,24 @@ const formData = ref<any>({
   bindUserId: undefined,
 });
 
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useCreateFormSchema(),
+  showDefaultActions: false,
+});
+
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (!formData.value) {
+    await formApi.setValues(formData.value);
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
@@ -53,130 +73,119 @@ const [Modal, modalApi] = useVbenModal({
     if (!isOpen) {
       return;
     }
+    // 重置表单
     formData.value = {
       userId: undefined,
       bindUserId: undefined,
     };
+    await formApi.setValues(formData.value);
+    // 重置用户信息
+    user.value = undefined;
+    bindUser.value = undefined;
   },
 });
 
 /** 用户信息 */
-const userInfo = reactive<{
-  bindUser: MallBrokerageUserApi.BrokerageUser | undefined;
-  user: MallBrokerageUserApi.BrokerageUser | undefined;
-}>({
-  bindUser: undefined,
-  user: undefined,
-});
+const user = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
+const bindUser = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
 
-/** 查询推广员和分销员 */
-async function handleGetUser(id: any, userType: string) {
+/** 查询分销员和分销员 */
+async function handleSearchUser(id: number, userType: string) {
   if (isEmpty(id)) {
     ElMessage.warning(`请先输入${userType}编号后重试！！！`);
     return;
   }
   if (
-    userType === '推广员' &&
+    userType === '分销员' &&
     formData.value?.bindUserId === formData.value?.userId
   ) {
-    ElMessage.error('不能绑定自己为推广人');
+    ElMessage.error('不能绑定自己为推广员');
     return;
   }
 
-  try {
-    const user =
-      userType === '推广员' ? await getBrokerageUser(id) : await getUser(id);
-    if (userType === '推广员') {
-      userInfo.bindUser = user as MallBrokerageUserApi.BrokerageUser;
-    } else {
-      userInfo.user = user as MallBrokerageUserApi.BrokerageUser;
-    }
-
-    if (!user) {
-      ElMessage.warning(`${userType}不存在`);
-    }
-  } catch {
+  const userData =
+    userType === '分销员' ? await getUser(id) : await getBrokerageUser(id);
+  if (!userData) {
     ElMessage.warning(`${userType}不存在`);
+    return;
+  }
+  if (userType === '分销员') {
+    user.value = userData as MallBrokerageUserApi.BrokerageUser;
+  } else {
+    bindUser.value = userData as MallBrokerageUserApi.BrokerageUser;
   }
 }
 </script>
 
 <template>
-  <Modal title="创建分销员" class="w-2/5">
-    <!-- TODO @霖：宽度不够，label 会折行 -->
-    <div class="mr-2 flex items-center">
-      分销员编号：
-      <ElInput
-        v-model="formData.userId"
-        placeholder="请输入推广员编号"
-        class="mx-2 !w-52"
-      >
-        <template #append>
-          <ElButton
-            type="primary"
-            @click="handleGetUser(formData?.userId, '分销员')"
+  <Modal title="创建分销员" class="w-1/3">
+    <Form>
+      <template #userId>
+        <div class="flex items-center gap-2">
+          <ElInput
+            v-model="formData.userId"
+            placeholder="请输入分销员编号"
+            class="flex-1"
           >
-            <IconifyIcon icon="lucide:search" :size="15" />
-          </ElButton>
-        </template>
-      </ElInput>
-      上级推广人编号：
-      <ElInput
-        v-model="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        class="mx-2 !w-52"
-      >
-        <template #append>
-          <ElButton
-            type="primary"
-            @click="handleGetUser(formData?.bindUserId, '推广员')"
+            <template #append>
+              <ElButton
+                type="primary"
+                @click="handleSearchUser(formData.userId, '分销员')"
+              >
+                <IconifyIcon icon="lucide:search" :size="15" />
+              </ElButton>
+            </template>
+          </ElInput>
+        </div>
+      </template>
+      <template #bindUserId>
+        <div class="flex items-center gap-2">
+          <ElInput
+            v-model="formData.bindUserId"
+            placeholder="请输入上级分销员编号"
+            class="flex-1"
           >
-            <IconifyIcon icon="lucide:search" :size="15" />
-          </ElButton>
-        </template>
-      </ElInput>
-    </div>
+            <template #append>
+              <ElButton
+                type="primary"
+                @click="handleSearchUser(formData.bindUserId, '上级分销员')"
+              >
+                <IconifyIcon icon="lucide:search" :size="15" />
+              </ElButton>
+            </template>
+          </ElInput>
+        </div>
+      </template>
+    </Form>
 
-    <div class="mt-4">
-      <!-- 展示分销员的信息 -->
-      <ElDescriptions
-        title="分销员信息"
-        class="mt-4"
-        v-if="userInfo.user"
-        :column="1"
-        bordered
-      >
-        <ElDescriptionsItem label="头像">
-          <ElAvatar :src="userInfo.user?.avatar" />
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="昵称">
-          {{ userInfo.user?.nickname }}
-        </ElDescriptionsItem>
-      </ElDescriptions>
-      <!-- 展示上级推广人的信息 -->
-      <ElDescriptions
-        title="上级推广人信息"
-        class="mt-4"
-        v-if="userInfo.bindUser"
-        :column="1"
-        bordered
-      >
-        <ElDescriptionsItem label="头像">
-          <ElAvatar :src="userInfo.bindUser?.avatar" />
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="昵称">
-          {{ userInfo.bindUser?.nickname }}
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="推广资格">
-          <ElTag v-if="userInfo.bindUser?.brokerageEnabled" color="success">
-            有
-          </ElTag>
-          <ElTag v-else>无</ElTag>
-        </ElDescriptionsItem>
-        <ElDescriptionsItem label="成为推广员的时间">
-          {{ formatDate(userInfo.bindUser?.brokerageTime) }}
-        </ElDescriptionsItem>
-      </ElDescriptions>
-    </div>
+    <!-- 分销员信息展示 -->
+    <ElDivider v-if="user" />
+    <ElDescriptions v-if="user" title="分销员信息" :column="1" border>
+      <ElDescriptionsItem label="头像">
+        <ElAvatar :src="user?.avatar" />
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="昵称">
+        {{ user?.nickname }}
+      </ElDescriptionsItem>
+    </ElDescriptions>
+    <!-- 上级推广员信息展示 -->
+    <ElDivider v-if="bindUser" />
+    <ElDescriptions v-if="bindUser" title="上级推广员信息" :column="1" border>
+      <ElDescriptionsItem label="头像">
+        <ElAvatar :src="bindUser?.avatar" />
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="昵称">
+        {{ bindUser?.nickname }}
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="分销资格">
+        <DictTag
+          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :value="bindUser?.brokerageEnabled"
+        />
+      </ElDescriptionsItem>
+      <ElDescriptionsItem label="成为分销员的时间">
+        {{ formatDate(bindUser?.brokerageTime) }}
+      </ElDescriptionsItem>
+    </ElDescriptions>
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
index c9dec9c622d8897d5d1c32d9146f7cbea14f333e..7e9520fe5d10f06e1b25d2f2943deaff6d5cb685 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/order-list-modal.vue
@@ -1,158 +1,35 @@
 <script lang="ts" setup>
-import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageRecordApi } from '#/api/mall/trade/brokerage/record';
-import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
-
-import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
-import { BrokerageRecordBizTypeEnum, DICT_TYPE } from '@vben/constants';
-import { getDictOptions } from '@vben/hooks';
-import { fenToYuan } from '@vben/utils';
+import { BrokerageRecordBizTypeEnum } from '@vben/constants';
 
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getBrokerageRecordPage } from '#/api/mall/trade/brokerage/record';
-import { getRangePickerDefaultProps } from '#/utils';
+
+import { useOrderListColumns, useOrderListFormSchema } from '../data';
 
 /** 推广订单列表 */
 defineOptions({ name: 'BrokerageOrderListModal' });
 
-const userId = ref<number>();
-
-const [Modal, modalApi] = useVbenModal({
-  async onOpenChange(isOpen: boolean) {
-    if (!isOpen) {
-      userId.value = undefined;
-      return;
-    }
-    // 加载数据
-    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
-    if (!data || !data.id) {
-      return;
-    }
-    modalApi.lock();
-    try {
-      userId.value = data.id;
-      // 等待弹窗打开后再查询
-      setTimeout(() => {
-        gridApi.query();
-      }, 100);
-    } finally {
-      modalApi.unlock();
-    }
-  },
-});
-
-/** 搜索表单配置 */
-function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'sourceUserLevel',
-      label: '用户类型',
-      component: 'Select',
-      componentProps: {
-        options: [
-          { label: '全部', value: 0 },
-          { label: '一级推广人', value: 1 },
-          { label: '二级推广人', value: 2 },
-        ],
-      },
-      defaultValue: 0,
-    },
-    {
-      fieldName: 'status',
-      label: '状态',
-      component: 'Select',
-      componentProps: {
-        placeholder: '请选择状态',
-        clearable: true,
-        options: getDictOptions(DICT_TYPE.BROKERAGE_RECORD_STATUS, 'number'),
-      },
-    },
-    {
-      fieldName: 'createTime',
-      label: '创建时间',
-      component: 'RangePicker',
-      componentProps: {
-        ...getRangePickerDefaultProps(),
-        clearable: true,
-      },
-    },
-  ];
-}
-
-/** 表格列配置 */
-function useColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'bizId',
-      title: '订单编号',
-      minWidth: 80,
-    },
-    {
-      field: 'sourceUserId',
-      title: '用户编号',
-      minWidth: 80,
-    },
-    {
-      field: 'sourceUserAvatar',
-      title: '头像',
-      minWidth: 70,
-      cellRender: {
-        name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-        },
-      },
-    },
-    {
-      field: 'sourceUserNickname',
-      title: '昵称',
-      minWidth: 80,
-    },
-    {
-      field: 'price',
-      title: '佣金',
-      minWidth: 100,
-      formatter: ({ row }) => `￥${fenToYuan(row.price)}`,
-    },
-    {
-      field: 'status',
-      title: '状态',
-      minWidth: 85,
-      cellRender: {
-        name: 'CellDict',
-        props: { type: DICT_TYPE.BROKERAGE_RECORD_STATUS },
-      },
-    },
-    {
-      field: 'createTime',
-      title: '创建时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
+const [Modal, modalApi] = useVbenModal({});
 
-const [Grid, gridApi] = useVbenVxeGrid({
+const [Grid] = useVbenVxeGrid({
   formOptions: {
-    schema: useFormSchema(),
+    schema: useOrderListFormSchema(),
   },
   gridOptions: {
-    columns: useColumns(),
+    columns: useOrderListColumns(),
     height: '600',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
-          // 处理全部的情况
           const params = {
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            userId: userId.value,
+            userId: modalApi.getData()?.id,
             bizType: BrokerageRecordBizTypeEnum.ORDER.type,
             sourceUserLevel:
               formValues.sourceUserLevel === 0
@@ -179,6 +56,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Modal title="推广订单列表" class="w-3/5">
-    <Grid table-title="推广订单列表" />
+    <Grid />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-update-form.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
similarity index 40%
rename from apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
rename to apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
index 8e850c625232757cdab520239c5e7a284c9778f3..f89a7e1c4ecc56e33430e905d997f32e1e973e62 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-update-form.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/update-form.vue
@@ -4,39 +4,57 @@ import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 import { ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { DICT_TYPE } from '@vben/constants';
 import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
-import { formatDate } from '@vben/utils';
+import { formatDate, isEmpty } from '@vben/utils';
 
 import {
   ElAvatar,
   ElDescriptions,
   ElDescriptionsItem,
+  ElDivider,
   ElInput,
   ElMessage,
-  ElTag,
 } from 'element-plus';
 
+import { useVbenForm } from '#/adapter/form';
 import {
   getBrokerageUser,
   updateBindUser,
 } from '#/api/mall/trade/brokerage/user';
+import { DictTag } from '#/components/dict-tag';
+
+import { useUpdateFormSchema } from '../data';
 
 /** 修改分销用户 */
 defineOptions({ name: 'BrokerageUserUpdateForm' });
 
 const emit = defineEmits(['success']);
 
-const formData = ref<any>();
+const formData = ref<any>({
+  id: undefined,
+  bindUserId: undefined,
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: {
+      class: 'w-full',
+    },
+    formItemClass: 'col-span-2',
+    labelWidth: 120,
+  },
+  layout: 'horizontal',
+  schema: useUpdateFormSchema(),
+  showDefaultActions: false,
+});
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
-    if (!formData.value) {
-      return;
-    }
-    // 未查找到合适的上级
-    if (!bindUser.value) {
-      ElMessage.error('请先查询并确认推广人');
+    await formApi.setValues(formData.value);
+    const { valid } = await formApi.validate();
+    if (!valid) {
       return;
     }
     modalApi.lock();
@@ -52,10 +70,6 @@ const [Modal, modalApi] = useVbenModal({
   },
   onOpenChange: async (isOpen: boolean) => {
     if (!isOpen) {
-      formData.value = {
-        id: 0,
-        bindUserId: 0,
-      };
       return;
     }
     const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
@@ -68,8 +82,9 @@ const [Modal, modalApi] = useVbenModal({
         id: data.id,
         bindUserId: data.bindUserId,
       };
+      await formApi.setValues(formData.value);
       if (data.bindUserId) {
-        await handleGetUser();
+        await handleSearchUser(data.bindUserId, '上级分销员');
       }
     } finally {
       modalApi.unlock();
@@ -77,59 +92,69 @@ const [Modal, modalApi] = useVbenModal({
   },
 });
 
-const bindUser = ref<MallBrokerageUserApi.BrokerageUser>();
+/** 绑定用户信息 */
+const bindUser = ref<MallBrokerageUserApi.BrokerageUser | undefined>();
 
-/** 查询推广员 */
-async function handleGetUser() {
-  if (!formData.value) {
+/** 查询分销员 */
+async function handleSearchUser(id: number, userType: string) {
+  if (isEmpty(id)) {
+    ElMessage.warning(`请先输入${userType}编号后重试！！！`);
     return;
   }
-  if (formData.value.bindUserId === formData.value.id) {
+  if (formData.value?.bindUserId === formData.value?.id) {
     ElMessage.error('不能绑定自己为推广人');
     return;
   }
-  try {
-    bindUser.value = await getBrokerageUser(formData.value.bindUserId);
-    if (!bindUser.value) {
-      ElMessage.warning('推广员不存在');
-    }
-  } catch {
-    ElMessage.warning('推广员不存在');
+
+  const userData = await getBrokerageUser(id);
+  if (!userData) {
+    ElMessage.warning(`${userType}不存在`);
+    return;
   }
+  bindUser.value = userData as MallBrokerageUserApi.BrokerageUser;
 }
 </script>
 
 <template>
-  <Modal title="修改上级推广人" class="w-2/5">
-    <div class="mr-2 flex items-center">
-      推广员编号：
-      <ElInput
-        v-model="formData.bindUserId"
-        placeholder="请输入推广员编号"
-        class="mx-2 !w-52"
-      >
-        <template #append>
-          <ElButton type="primary" @click="handleGetUser">
-            <IconifyIcon icon="lucide:search" :size="15" />
-          </ElButton>
-        </template>
-      </ElInput>
-    </div>
+  <Modal title="修改上级推广人" class="w-1/3">
+    <Form>
+      <template #bindUserId>
+        <div class="flex items-center gap-2">
+          <ElInput
+            v-model="formData.bindUserId"
+            placeholder="请输入上级推广员编号"
+            class="flex-1"
+          >
+            <template #append>
+              <ElButton
+                type="primary"
+                @click="handleSearchUser(formData.bindUserId, '上级推广员')"
+              >
+                <IconifyIcon icon="lucide:search" :size="15" />
+              </ElButton>
+            </template>
+          </ElInput>
+        </div>
+      </template>
+    </Form>
 
-    <!-- 展示上级推广人的信息 -->
-    <ElDescriptions class="mt-4" v-if="bindUser" :column="1" bordered>
+    <!-- 上级推广员信息展示 -->
+    <ElDivider v-if="bindUser" />
+    <ElDescriptions v-if="bindUser" title="上级推广员信息" :column="1" border>
       <ElDescriptionsItem label="头像">
-        <ElAvatar :src="bindUser.avatar" />
+        <ElAvatar :src="bindUser?.avatar" />
       </ElDescriptionsItem>
       <ElDescriptionsItem label="昵称">
-        {{ bindUser.nickname }}
+        {{ bindUser?.nickname }}
       </ElDescriptionsItem>
-      <ElDescriptionsItem label="推广资格">
-        <ElTag v-if="bindUser.brokerageEnabled" color="success">有</ElTag>
-        <ElTag v-else>无</ElTag>
+      <ElDescriptionsItem label="分销资格">
+        <DictTag
+          :type="DICT_TYPE.INFRA_BOOLEAN_STRING"
+          :value="bindUser?.brokerageEnabled"
+        />
       </ElDescriptionsItem>
-      <ElDescriptionsItem label="成为推广员的时间">
-        {{ formatDate(bindUser.brokerageTime) }}
+      <ElDescriptionsItem label="成为分销员的时间">
+        {{ formatDate(bindUser?.brokerageTime) }}
       </ElDescriptionsItem>
     </ElDescriptions>
   </Modal>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
index 6b4d614b34838776cc466af6184a83a40b85a05d..40667488d954a73219bd8263ab027e46bb42576a 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/user/modules/user-list-modal.vue
@@ -1,137 +1,33 @@
 <script lang="ts" setup>
-import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { MallBrokerageUserApi } from '#/api/mall/trade/brokerage/user';
 
-import { ref } from 'vue';
-
 import { useVbenModal } from '@vben/common-ui';
 
-import { ElTag } from 'element-plus';
-
 import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getBrokerageUserPage } from '#/api/mall/trade/brokerage/user';
-import { getRangePickerDefaultProps } from '#/utils';
-
-defineOptions({ name: 'BrokerageUserListModal' });
 
-const bindUserId = ref<number>();
+import { useUserListColumns, useUserListFormSchema } from '../data';
 
-const [Modal, modalApi] = useVbenModal({
-  onOpenChange: async (isOpen: boolean) => {
-    if (!isOpen) {
-      bindUserId.value = undefined;
-      return;
-    }
-    const data = modalApi.getData<MallBrokerageUserApi.BrokerageUser>();
-    if (!data || !data.id) {
-      return;
-    }
-    bindUserId.value = data.id;
-    // 等待弹窗打开后再查询
-    setTimeout(() => {
-      gridApi.query();
-    }, 100);
-  },
-});
-
-/** 搜索表单配置 */
-function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'level',
-      label: '用户类型',
-      component: 'RadioGroup',
-      // TODO @霖：这里会折行
-      componentProps: {
-        options: [
-          { label: '全部', value: undefined },
-          { label: '一级推广人', value: '1' },
-          { label: '二级推广人', value: '2' },
-        ],
-        buttonStyle: 'solid',
-        optionType: 'button',
-      },
-    },
-    {
-      fieldName: 'bindUserTime',
-      label: '绑定时间',
-      component: 'RangePicker',
-      componentProps: {
-        ...getRangePickerDefaultProps(),
-        clearable: true,
-      },
-    },
-  ];
-}
+defineOptions({ name: 'BrokerageUserListModal' });
 
-/** 表格列配置 */
-function useColumns(): VxeTableGridOptions['columns'] {
-  return [
-    {
-      field: 'id',
-      title: '用户编号',
-      minWidth: 80,
-    },
-    {
-      field: 'avatar',
-      title: '头像',
-      minWidth: 70,
-      cellRender: {
-        name: 'CellImage',
-        props: {
-          width: 24,
-          height: 24,
-          shape: 'circle',
-        },
-      },
-    },
-    {
-      field: 'nickname',
-      title: '昵称',
-      minWidth: 80,
-    },
-    {
-      field: 'brokerageUserCount',
-      title: '推广人数',
-      minWidth: 80,
-    },
-    {
-      field: 'brokerageOrderCount',
-      title: '推广订单数量',
-      minWidth: 110,
-    },
-    {
-      field: 'brokerageEnabled',
-      title: '推广资格',
-      minWidth: 80,
-      slots: { default: 'brokerageEnabled' },
-    },
-    {
-      field: 'bindUserTime',
-      title: '绑定时间',
-      width: 180,
-      formatter: 'formatDateTime',
-    },
-  ];
-}
+const [Modal, modalApi] = useVbenModal({});
 
-const [Grid, gridApi] = useVbenVxeGrid({
+const [Grid] = useVbenVxeGrid({
   formOptions: {
-    schema: useFormSchema(),
+    schema: useUserListFormSchema(),
   },
   gridOptions: {
-    columns: useColumns(),
+    columns: useUserListColumns(),
     height: '600',
     keepSource: true,
-    showOverflow: 'tooltip',
     proxyConfig: {
       ajax: {
         query: async ({ page }, formValues) => {
           return await getBrokerageUserPage({
             pageNo: page.currentPage,
             pageSize: page.pageSize,
-            bindUserId: bindUserId.value,
+            bindUserId: modalApi.getData().id,
             ...formValues,
           });
         },
@@ -151,11 +47,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Modal title="推广人列表" class="w-3/5">
-    <Grid table-title="推广人列表">
-      <template #brokerageEnabled="{ row }">
-        <ElTag v-if="row.brokerageEnabled" color="success">有</ElTag>
-        <ElTag v-else>无</ElTag>
-      </template>
-    </Grid>
+    <Grid />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts
index dbf6d094d91e40b8263a1d59a103ba20f0057478..86452dd8e83cfb6e008c91d61e1b59971d4f829e 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts
+++ b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/data.ts
@@ -15,7 +15,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入用户编号',
-        clearable: true,
+        allowClear: true,
       },
     },
     {
@@ -24,7 +24,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请选择提现类型',
-        clearable: true,
+        allowClear: true,
         options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, 'number'),
       },
     },
@@ -34,16 +34,16 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入账号',
-        clearable: true,
+        allowClear: true,
       },
     },
     {
       fieldName: 'userName',
-      label: '真实名字',
+      label: '真实姓名',
       component: 'Input',
       componentProps: {
-        placeholder: '请输入真实名字',
-        clearable: true,
+        placeholder: '请输入真实姓名',
+        allowClear: true,
       },
     },
     {
@@ -52,7 +52,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请选择提现银行',
-        clearable: true,
+        allowClear: true,
         options: getDictOptions(DICT_TYPE.BROKERAGE_BANK_NAME, 'string'),
       },
     },
@@ -62,7 +62,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Select',
       componentProps: {
         placeholder: '请选择状态',
-        clearable: true,
+        allowClear: true,
         options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_STATUS, 'number'),
       },
     },
@@ -72,7 +72,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         ...getRangePickerDefaultProps(),
-        clearable: true,
+        allowClear: true,
       },
     },
   ];
@@ -88,25 +88,25 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'userId',
-      title: '用户编号：',
+      title: '用户编号',
       minWidth: 80,
     },
     {
       field: 'userNickname',
-      title: '用户昵称：',
+      title: '用户昵称',
       minWidth: 80,
     },
     {
       field: 'price',
       title: '提现金额',
       minWidth: 80,
-      formatter: 'formatFenToYuanAmount',
+      formatter: 'formatAmount2',
     },
     {
       field: 'feePrice',
       title: '提现手续费',
       minWidth: 80,
-      formatter: 'formatFenToYuanAmount',
+      formatter: 'formatAmount2',
     },
     {
       field: 'type',
diff --git a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/index.vue b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/index.vue
index 0924a9da9b38c2a879dd41b2a86702404ecd945b..633f9af569ee6d1e6ad0a52d69f41adb9c3d17c5 100644
--- a/apps/web-ele/src/views/mall/trade/brokerage/withdraw/index.vue
+++ b/apps/web-ele/src/views/mall/trade/brokerage/withdraw/index.vue
@@ -12,7 +12,7 @@ import {
 } from '@vben/constants';
 import { formatDateTime } from '@vben/utils';
 
-import { ElInput, ElMessage } from 'element-plus';
+import { ElInput, ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -29,16 +29,23 @@ import { useGridColumns, useGridFormSchema } from './data';
 defineOptions({ name: 'BrokerageWithdraw' });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 /** 审核通过 */
 async function handleApprove(row: MallBrokerageWithdrawApi.BrokerageWithdraw) {
   await confirm('确定要审核通过吗？');
-  await approveBrokerageWithdraw(row.id);
-  ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  onRefresh();
+  const loadingInstance = ElLoading.service({
+    text: '审核通过中...',
+  });
+  try {
+    await approveBrokerageWithdraw(row.id);
+    ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
 }
 
 /** 审核驳回 */
@@ -56,11 +63,19 @@ function handleReject(row: MallBrokerageWithdrawApi.BrokerageWithdraw) {
     modelPropName: 'value',
   }).then(async (val) => {
     if (val) {
-      await rejectBrokerageWithdraw({
-        id: row.id as number,
-        auditReason: val,
+      const loadingInstance = ElLoading.service({
+        text: '审核驳回中...',
       });
-      onRefresh();
+      try {
+        await rejectBrokerageWithdraw({
+          id: row.id!,
+          auditReason: val,
+        });
+        ElMessage.success($t('ui.actionMessage.operationSuccess'));
+        handleRefresh();
+      } finally {
+        loadingInstance.close();
+      }
     }
   });
 }
@@ -70,9 +85,16 @@ async function handleRetryTransfer(
   row: MallBrokerageWithdrawApi.BrokerageWithdraw,
 ) {
   await confirm('确定要重新转账吗？');
-  await approveBrokerageWithdraw(row.id);
-  ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  onRefresh();
+  const loadingInstance = ElLoading.service({
+    text: '重新转账中...',
+  });
+  try {
+    await approveBrokerageWithdraw(row.id);
+    ElMessage.success($t('ui.actionMessage.operationSuccess'));
+    handleRefresh();
+  } finally {
+    loadingInstance.close();
+  }
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -84,7 +106,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     height: 'auto',
     keepSource: true,
     cellConfig: {
-      height: 80,
+      height: 90,
     },
     proxyConfig: {
       ajax: {
@@ -99,6 +121,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -112,45 +135,67 @@ const [Grid, gridApi] = useVbenVxeGrid({
   <Page auto-content-height>
     <Grid table-title="佣金提现列表">
       <template #withdraw-info="{ row }">
-        <div v-if="row.type === BrokerageWithdrawTypeEnum.WALLET.type">-</div>
-        <div v-else>
-          <div v-if="row.userAccount">账号：{{ row.userAccount }}</div>
-          <div v-if="row.userName">真实姓名：{{ row.userName }}</div>
+        <div
+          v-if="row.type === BrokerageWithdrawTypeEnum.WALLET.type"
+          class="text-left"
+        >
+          -
+        </div>
+        <div v-else class="text-left">
+          <div v-if="row.userAccount" class="text-left">
+            账号：{{ row.userAccount }}
+          </div>
+          <div v-if="row.userName" class="text-left">
+            真实姓名：{{ row.userName }}
+          </div>
           <template v-if="row.type === BrokerageWithdrawTypeEnum.BANK.type">
-            <div v-if="row.bankName">银行名称：{{ row.bankName }}</div>
-            <div v-if="row.bankAddress">开户地址：{{ row.bankAddress }}</div>
+            <div v-if="row.bankName" class="text-left">
+              银行名称：{{ row.bankName }}
+            </div>
+            <div v-if="row.bankAddress" class="text-left">
+              开户地址：{{ row.bankAddress }}
+            </div>
           </template>
-          <div v-if="row.qrCodeUrl" class="mt-2">
-            <div>收款码：</div>
-            <img :src="row.qrCodeUrl" class="mt-1 h-10 w-10" />
+          <div v-if="row.qrCodeUrl" class="mt-2 text-left">
+            <div class="flex items-start gap-2">
+              <span class="flex-shrink-0">收款码：</span>
+              <img :src="row.qrCodeUrl" class="h-10 w-10 flex-shrink-0" />
+            </div>
           </div>
         </div>
       </template>
-
       <template #status-info="{ row }">
-        <div>
+        <div class="text-left">
           <DictTag
             :value="row.status"
             :type="DICT_TYPE.BROKERAGE_WITHDRAW_STATUS"
           />
-          <div v-if="row.auditTime" class="mt-1 text-xs text-gray-500">
+          <div
+            v-if="row.auditTime"
+            class="mt-1 text-left text-xs text-gray-500"
+          >
             时间：{{ formatDateTime(row.auditTime) }}
           </div>
-          <div v-if="row.auditReason" class="mt-1 text-xs text-gray-500">
+          <div
+            v-if="row.auditReason"
+            class="mt-1 text-left text-xs text-gray-500"
+          >
             审核原因：{{ row.auditReason }}
           </div>
-          <div v-if="row.transferErrorMsg" class="mt-1 text-xs text-red-500">
+          <div
+            v-if="row.transferErrorMsg"
+            class="mt-1 text-left text-xs text-red-500"
+          >
             转账失败原因：{{ row.transferErrorMsg }}
           </div>
         </div>
       </template>
-
       <template #actions="{ row }">
         <TableAction
           :actions="[
-            // 审核中状态且没有支付转账编号，显示通过和驳回按钮
             {
               label: '通过',
+              type: 'primary',
               link: true,
               icon: ACTION_ICON.EDIT,
               auth: ['trade:brokerage-withdraw:audit'],
@@ -172,6 +217,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
             },
             {
               label: '重新转账',
+              type: 'primary',
               link: true,
               icon: ACTION_ICON.REFRESH,
               auth: ['trade:brokerage-withdraw:audit'],
diff --git a/apps/web-ele/src/views/mall/trade/config/data.ts b/apps/web-ele/src/views/mall/trade/config/data.ts
index 756861f4198dac67e27750806c37851fb0d7a1b8..f933704cc97d06de8d0e61c313ad7ba04fee0a5f 100644
--- a/apps/web-ele/src/views/mall/trade/config/data.ts
+++ b/apps/web-ele/src/views/mall/trade/config/data.ts
@@ -3,250 +3,254 @@ import type { VbenFormSchema } from '#/adapter/form';
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
-/** 售后表单 */
-export function useFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      component: 'Input',
-      fieldName: 'id',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      component: 'Input',
-      fieldName: 'type',
-      dependencies: {
-        triggerFields: [''],
-        show: () => false,
-      },
-    },
-    {
-      fieldName: 'afterSaleRefundReasons',
-      label: '退款理由',
-      component: 'Select',
-      componentProps: {
-        placeholder: '请直接输入退款理由',
-        multiple: true,
-        options: [],
-        class: 'w-full',
-        allowCreate: true,
-        filterable: true,
-        reserveKeyword: false,
-      },
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'afterSale',
-      },
-    },
-    {
-      fieldName: 'afterSaleReturnReasons',
-      label: '退货理由',
-      component: 'Select',
-      componentProps: {
-        placeholder: '请直接输入退货理由',
-        multiple: true,
-        options: [],
-        class: 'w-full',
-        allowCreate: true,
-        filterable: true,
-        reserveKeyword: false,
-      },
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'afterSale',
-      },
-    },
-    {
-      fieldName: 'deliveryExpressFreeEnabled',
-      label: '启用包邮',
-      component: 'Switch',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-      description: '商城是否启用全场包邮',
-    },
-    {
-      fieldName: 'deliveryExpressFreePrice',
-      label: '满额包邮',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 2,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-      description: '商城商品满多少金额即可包邮，单位：元',
-    },
-    {
-      fieldName: 'deliveryPickUpEnabled',
-      label: '启用门店自提',
-      component: 'Switch',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'delivery',
-      },
-    },
-    {
-      fieldName: 'brokerageEnabled',
-      label: '启用分佣',
-      component: 'Switch',
-      description: '商城是否开启分销模式',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-    },
-    {
-      fieldName: 'brokerageEnabledCondition',
-      label: '分佣模式',
-      component: 'RadioGroup',
-      componentProps: {
-        options: getDictOptions(
-          DICT_TYPE.BROKERAGE_ENABLED_CONDITION,
-          'number',
-        ),
-        buttonStyle: 'solid',
-        optionType: 'button',
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '人人分销：每个用户都可以成为推广员 \n 单级分销：每个用户只能有一个上级推广员',
-    },
-    {
-      fieldName: 'brokerageBindMode',
-      label: '分销关系绑定',
-      component: 'RadioGroup',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE, 'number'),
-        buttonStyle: 'solid',
-        optionType: 'button',
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '首次绑定：只要用户没有推广人，随时都可以绑定推广关系 \n 注册绑定：只有新用户注册时或首次进入系统时才可以绑定推广关系',
-    },
-    {
-      fieldName: 'brokeragePosterUrls',
-      label: '分销海报图',
-      component: 'ImageUpload',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '个人中心分销海报图片，建议尺寸 600x1000',
-    },
-    {
-      fieldName: 'brokerageFirstPercent',
-      label: '一级返佣比例',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '订单交易成功后给推广人返佣的百分比',
-    },
-    {
-      fieldName: 'brokerageSecondPercent',
-      label: '二级返佣比例',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '订单交易成功后给推广人的推荐人返佣的百分比',
-    },
-    {
-      fieldName: 'brokerageFrozenDays',
-      label: '佣金冻结天数',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天',
-    },
-    {
-      fieldName: 'brokerageWithdrawMinPrice',
-      label: '提现最低金额',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        precision: 2,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '用户提现最低金额限制，单位：元',
-    },
-    {
-      fieldName: 'brokerageWithdrawFeePercent',
-      label: '提现手续费',
-      component: 'InputNumber',
-      componentProps: {
-        min: 0,
-        max: 100,
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description:
-        '提现手续费百分比，范围 0-100，0 为无提现手续费。例：设置 10，即收取 10% 手续费，提现10 元，到账 9 元，1 元手续费',
-    },
-    {
-      fieldName: 'brokerageWithdrawTypes',
-      label: '提现方式',
-      component: 'CheckboxGroup',
-      componentProps: {
-        options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, 'number'),
-        class: 'w-full',
-      },
-      rules: 'required',
-      dependencies: {
-        triggerFields: ['type'],
-        show: (values) => values.type === 'brokerage',
-      },
-      description: '商城开通提现的付款方式',
-    },
-  ];
-}
+export const schema: VbenFormSchema[] = [
+  {
+    component: 'Input',
+    fieldName: 'id',
+    dependencies: {
+      triggerFields: [''],
+      show: () => false,
+    },
+  },
+  {
+    component: 'Input',
+    fieldName: 'type',
+    dependencies: {
+      triggerFields: [''],
+      show: () => false,
+    },
+  },
+  {
+    fieldName: 'afterSaleRefundReasons',
+    label: '退款理由',
+    component: 'Select',
+    componentProps: {
+      placeholder: '请直接输入退款理由',
+      multiple: true,
+      options: [],
+      class: 'w-full',
+      allowCreate: true,
+      filterable: true,
+      reserveKeyword: false,
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'afterSale',
+    },
+  },
+  {
+    fieldName: 'afterSaleReturnReasons',
+    label: '退货理由',
+    component: 'Select',
+    componentProps: {
+      placeholder: '请直接输入退货理由',
+      multiple: true,
+      options: [],
+      class: 'w-full',
+      allowCreate: true,
+      filterable: true,
+      reserveKeyword: false,
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'afterSale',
+    },
+  },
+  // TODO @xingyu：【缺陷】貌似 switch 在 schema 里报错了。直接。。。
+  {
+    fieldName: 'deliveryExpressFreeEnabled',
+    label: '启用包邮',
+    component: 'Switch',
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+    help: '商城是否启用全场包邮',
+  },
+  {
+    fieldName: 'deliveryExpressFreePrice',
+    label: '满额包邮',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      precision: 2,
+      placeholder: '请输入满额包邮金额',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+    help: '商城商品满多少金额即可包邮，单位：元',
+  },
+  {
+    fieldName: 'deliveryPickUpEnabled',
+    label: '启用门店自提',
+    component: 'Switch',
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'delivery',
+    },
+  },
+  {
+    fieldName: 'brokerageEnabled',
+    label: '启用分佣',
+    component: 'Switch',
+    help: '商城是否开启分销模式',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+  },
+  {
+    fieldName: 'brokerageEnabledCondition',
+    label: '分佣模式',
+    component: 'RadioGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_ENABLED_CONDITION, 'number'),
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '人人分销：每个用户都可以成为推广员 \n 指定分销：仅可在后台手动设置推广员',
+  },
+  {
+    fieldName: 'brokerageBindMode',
+    label: '分销关系绑定',
+    component: 'RadioGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_BIND_MODE, 'number'),
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '首次绑定：只要用户没有推广人，随时都可以绑定推广关系 \n 注册绑定：只有新用户注册时或首次进入系统时才可以绑定推广关系',
+  },
+  {
+    fieldName: 'brokeragePosterUrls',
+    label: '分销海报图',
+    component: 'ImageUpload',
+    componentProps: {
+      maxNumber: 9,
+    },
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '个人中心分销海报图片，建议尺寸 600x1000',
+  },
+  {
+    fieldName: 'brokerageFirstPercent',
+    label: '一级返佣比例（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      placeholder: '请输入一级返佣比例',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '订单交易成功后给推广人返佣的百分比',
+  },
+  {
+    fieldName: 'brokerageSecondPercent',
+    label: '二级返佣比例（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      placeholder: '请输入二级返佣比例',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '订单交易成功后给推广人的推荐人返佣的百分比',
+  },
+  {
+    fieldName: 'brokerageFrozenDays',
+    label: '佣金冻结天数',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      placeholder: '请输入佣金冻结天数',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '防止用户退款，佣金被提现了，所以需要设置佣金冻结时间，单位：天',
+  },
+  {
+    fieldName: 'brokerageWithdrawMinPrice',
+    label: '提现最低金额（元）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      precision: 2,
+      placeholder: '请输入提现最低金额',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '用户提现最低金额限制，单位：元',
+  },
+  {
+    fieldName: 'brokerageWithdrawFeePercent',
+    label: '提现手续费（%）',
+    component: 'InputNumber',
+    componentProps: {
+      min: 0,
+      max: 100,
+      precision: 2,
+      placeholder: '请输入提现手续费百分比',
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '提现手续费百分比，范围 0-100，0 为无提现手续费。例：设置 10，即收取 10% 手续费，提现10 元，到账 9 元，1 元手续费',
+  },
+  {
+    fieldName: 'brokerageWithdrawTypes',
+    label: '提现方式',
+    component: 'CheckboxGroup',
+    componentProps: {
+      options: getDictOptions(DICT_TYPE.BROKERAGE_WITHDRAW_TYPE, 'number'),
+      controlsPosition: 'right',
+      class: '!w-full',
+    },
+    rules: 'required',
+    dependencies: {
+      triggerFields: ['type'],
+      show: (values) => values.type === 'brokerage',
+    },
+    help: '商城开通提现的付款方式',
+  },
+];
diff --git a/apps/web-ele/src/views/mall/trade/config/index.vue b/apps/web-ele/src/views/mall/trade/config/index.vue
index f276321958781e59a78ee56bd42a50911d8fb86e..39745b806dd9b37902bd39f41044023e0a713169 100644
--- a/apps/web-ele/src/views/mall/trade/config/index.vue
+++ b/apps/web-ele/src/views/mall/trade/config/index.vue
@@ -4,6 +4,7 @@ import type { MallTradeConfigApi } from '#/api/mall/trade/config';
 import { onMounted, ref } from 'vue';
 
 import { DocAlert, Page } from '@vben/common-ui';
+import { fenToYuan, yuanToFen } from '@vben/utils';
 
 import { ElCard, ElMessage, ElTabPane, ElTabs } from 'element-plus';
 
@@ -11,66 +12,71 @@ import { useVbenForm } from '#/adapter/form';
 import { getTradeConfig, saveTradeConfig } from '#/api/mall/trade/config';
 import { $t } from '#/locales';
 
-import { useFormSchema } from './data';
+import { schema } from './data';
 
 const activeKey = ref('afterSale');
 const formData = ref<MallTradeConfigApi.Config & { type?: string }>();
 
+/** 获取配置 */
+async function getConfigInfo() {
+  const res = await getTradeConfig();
+  if (!res) {
+    return;
+  }
+  formData.value = res;
+  // 转换金额单位
+  formData.value.deliveryExpressFreePrice = Number.parseFloat(
+    fenToYuan(formData.value.deliveryExpressFreePrice!),
+  );
+  formData.value.brokerageWithdrawMinPrice = Number.parseFloat(
+    fenToYuan(formData.value.brokerageWithdrawMinPrice!),
+  );
+  formData.value!.type = activeKey.value;
+  formApi.updateSchema(schema);
+  // 设置到 values
+  await formApi.setValues(formData.value);
+}
+
+/** 切换 Tab */
 function handleTabChange(key: any) {
   activeKey.value = key;
   formData.value!.type = activeKey.value;
   formApi.setValues(formData.value!);
-  formApi.updateSchema(useFormSchema());
-}
-
-async function loadConfig() {
-  const res = await getTradeConfig();
-  if (res) {
-    formData.value = res;
-    // 金额缩小
-    formData.value.deliveryExpressFreePrice =
-      formData.value.deliveryExpressFreePrice! / 100 || 0;
-    formData.value.brokerageWithdrawMinPrice =
-      formData.value.brokerageWithdrawMinPrice! / 100 || 0;
-    formData.value!.type = activeKey.value;
-    formApi.updateSchema(useFormSchema());
-    await formApi.setValues(formData.value);
-  }
+  formApi.updateSchema(schema);
 }
 
-async function onSubmit() {
+/** 提交表单 */
+async function handleSubmit() {
   const { valid } = await formApi.validate();
   if (!valid) {
     return;
   }
   // 提交表单
   const data = (await formApi.getValues()) as MallTradeConfigApi.Config;
-  formApi.setState({ commonConfig: { disabled: true } });
-  try {
-    await saveTradeConfig(data);
-    ElMessage.success($t('ui.actionMessage.operationSuccess'));
-  } finally {
-    formApi.setState({ commonConfig: { disabled: false } });
-  }
+  // 转换金额单位
+  data.deliveryExpressFreePrice = yuanToFen(data.deliveryExpressFreePrice!);
+  data.brokerageWithdrawMinPrice = yuanToFen(data.brokerageWithdrawMinPrice!);
+  await saveTradeConfig(data);
+  ElMessage.success($t('ui.actionMessage.operationSuccess'));
 }
 
-onMounted(() => {
-  loadConfig();
-});
-
 const [Form, formApi] = useVbenForm({
-  wrapperClass: 'grid-cols-1',
-  handleSubmit: onSubmit,
-  layout: 'horizontal',
-  resetButtonOptions: {
-    show: false,
+  commonConfig: {
+    labelWidth: 150,
   },
-  schema: useFormSchema(),
+  layout: 'horizontal',
+  handleSubmit,
+  schema,
+});
+
+/** 初始化 */
+onMounted(() => {
+  getConfigInfo();
 });
 </script>
 
 <template>
-  <Page auto-content-height>
+  <Page>
     <template #doc>
       <DocAlert
         title="【交易】交易订单"
@@ -81,14 +87,13 @@ const [Form, formApi] = useVbenForm({
         url="https://doc.iocoder.cn/mall/trade-cart/"
       />
     </template>
-    <ElCard class="h-full">
-      <ElTabs v-model="activeKey" @tab-change="handleTabChange">
+    <ElCard>
+      <ElTabs :model-value="activeKey" @tab-change="handleTabChange">
         <ElTabPane label="售后" name="afterSale" :force-render="true" />
         <ElTabPane label="配送" name="delivery" :force-render="true" />
-        <!-- TODO @霖：tooltip 有点丑； -->
         <ElTabPane label="分销" name="brokerage" :force-render="true" />
       </ElTabs>
-      <Form class="w-3/5" />
+      <Form class="w-2/5" />
     </ElCard>
   </Page>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/delivery/express/data.ts b/apps/web-ele/src/views/mall/trade/delivery/express/data.ts
index 4da4fbda6559272802a1cbd5acf1060924df22c0..dbf1f4ffeaaa021a1426786448e54f99b9ee5d55 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/express/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/express/data.ts
@@ -21,12 +21,18 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Input',
       fieldName: 'code',
       label: '公司编码',
+      componentProps: {
+        placeholder: '请输入快递编码',
+      },
       rules: 'required',
     },
     {
       component: 'Input',
       fieldName: 'name',
       label: '公司名称',
+      componentProps: {
+        placeholder: '请输入快递名称',
+      },
       rules: 'required',
     },
     {
@@ -34,6 +40,7 @@ export function useFormSchema(): VbenFormSchema[] {
       fieldName: 'logo',
       label: '公司 logo',
       rules: 'required',
+      help: '推荐 180x180 图片分辨率',
     },
     {
       fieldName: 'sort',
@@ -41,6 +48,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'InputNumber',
       componentProps: {
         min: 0,
+        placeholder: '请输入显示顺序',
+        controlsPosition: 'right',
+        class: '!w-full',
       },
       rules: 'required',
     },
@@ -65,18 +75,27 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '快递公司名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入快递公司名称',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'code',
       label: '快递公司编号',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入快递公司编号',
+        allowClear: true,
+      },
     },
     {
       fieldName: 'status',
       label: '状态',
       component: 'Select',
       componentProps: {
-        clearable: true,
+        placeholder: '请选择状态',
+        allowClear: true,
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
       },
     },
@@ -89,18 +108,22 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
+      minWidth: 100,
     },
     {
       field: 'code',
       title: '公司编码',
+      minWidth: 120,
     },
     {
       field: 'name',
       title: '公司名称',
+      minWidth: 150,
     },
     {
       field: 'logo',
       title: '公司 logo',
+      minWidth: 120,
       cellRender: {
         name: 'CellImage',
       },
@@ -108,10 +131,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'sort',
       title: '显示顺序',
+      minWidth: 100,
     },
     {
       field: 'status',
       title: '状态',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.COMMON_STATUS },
@@ -120,6 +145,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-ele/src/views/mall/trade/delivery/express/index.vue b/apps/web-ele/src/views/mall/trade/delivery/express/index.vue
index c39bd7ad0be09e9d155c6e86bb52a2c8c824b47a..06cb74333078bc71c08a0875847c602e57b1de52 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/express/index.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/express/index.vue
@@ -24,7 +24,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -50,9 +50,9 @@ async function handleDelete(row: MallDeliveryExpressApi.DeliveryExpress) {
     text: $t('ui.actionMessage.deleting', [row.name]),
   });
   try {
-    await deleteDeliveryExpress(row.id as number);
+    await deleteDeliveryExpress(row.id!);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -79,6 +79,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -90,7 +91,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="快递公司列表">
       <template #toolbar-tools>
         <TableAction
@@ -117,6 +118,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               label: $t('common.edit'),
+              type: 'primary',
               link: true,
               icon: ACTION_ICON.EDIT,
               auth: ['trade:delivery:express:update'],
@@ -124,8 +126,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
             },
             {
               label: $t('common.delete'),
-              link: true,
               type: 'danger',
+              link: true,
               icon: ACTION_ICON.DELETE,
               auth: ['trade:delivery:express:delete'],
               popConfirm: {
diff --git a/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue b/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue
index aa671db7618016fe445b4e3a4cee1ebf33df8dbe..5db07b902e1d3724ead60b00a5599af2019b00f6 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/express/modules/form.vue
@@ -83,7 +83,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
+  <Modal :title="getTitle" class="w-2/5">
     <Form class="mx-4" />
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts
index 2513bba0efd2e660d1ab33280144b5d13912a3d7..5905345eea6038462298a77aee2cd1bd53f64ccc 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/data.ts
@@ -1,11 +1,109 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
-import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
+import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
 
 import { z } from '#/adapter/form';
 
+/** 计费方式列标题映射 */
+export const CHARGE_MODE_TITLE_MAP: Record<
+  number,
+  {
+    extraCountTitle: string;
+    startCountTitle: string;
+  }
+> = {
+  1: { startCountTitle: '首件', extraCountTitle: '续件' },
+  2: { startCountTitle: '首件重量(kg)', extraCountTitle: '续件重量(kg)' },
+  3: { startCountTitle: '首件体积(m³)', extraCountTitle: '续件体积(m³)' },
+};
+
+/** 包邮方式列标题映射 */
+export const FREE_MODE_TITLE_MAP: Record<number, { freeCountTitle: string }> = {
+  1: { freeCountTitle: '包邮件数' },
+  2: { freeCountTitle: '包邮重量(kg)' },
+  3: { freeCountTitle: '包邮体积(m³)' },
+};
+
+/** 运费设置表格列 */
+export function useChargesColumns(
+  chargeMode = 1,
+): VxeTableGridOptions['columns'] {
+  const chargeTitleMap = CHARGE_MODE_TITLE_MAP[chargeMode];
+  return [
+    {
+      field: 'areaIds',
+      title: '区域',
+      minWidth: 300,
+      slots: { default: 'areaIds' },
+    },
+    {
+      field: 'startCount',
+      title: chargeTitleMap?.startCountTitle,
+      width: 120,
+      slots: { default: 'startCount' },
+    },
+    {
+      field: 'startPrice',
+      title: '运费(元)',
+      width: 120,
+      slots: { default: 'startPrice' },
+    },
+    {
+      field: 'extraCount',
+      title: chargeTitleMap?.extraCountTitle,
+      width: 120,
+      slots: { default: 'extraCount' },
+    },
+    {
+      field: 'extraPrice',
+      title: '续费(元)',
+      width: 120,
+      slots: { default: 'extraPrice' },
+    },
+    {
+      title: '操作',
+      width: 80,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
+/** 包邮设置表格列 */
+export function useFreesColumns(
+  chargeMode = 1,
+): VxeTableGridOptions['columns'] {
+  const freeTitleMap = FREE_MODE_TITLE_MAP[chargeMode];
+  return [
+    {
+      field: 'areaIds',
+      title: '区域',
+      minWidth: 300,
+      slots: { default: 'areaIds' },
+    },
+    {
+      field: 'freeCount',
+      title: freeTitleMap?.freeCountTitle,
+      width: 120,
+      slots: { default: 'freeCount' },
+    },
+    {
+      field: 'freePrice',
+      title: '包邮金额(元)',
+      width: 120,
+      slots: { default: 'freePrice' },
+    },
+    {
+      title: '操作',
+      width: 80,
+      fixed: 'right',
+      slots: { default: 'actions' },
+    },
+  ];
+}
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -21,6 +119,9 @@ export function useFormSchema(): VbenFormSchema[] {
       component: 'Input',
       fieldName: 'name',
       label: '模板名称',
+      componentProps: {
+        placeholder: '请输入模板名称',
+      },
       rules: 'required',
     },
     {
@@ -32,17 +133,32 @@ export function useFormSchema(): VbenFormSchema[] {
         buttonStyle: 'solid',
         optionType: 'button',
       },
-      rules: z.number().default(CommonStatusEnum.ENABLE),
+      rules: z.number().default(1),
     },
     {
       fieldName: 'sort',
       label: '显示顺序',
       component: 'InputNumber',
       componentProps: {
+        placeholder: '请输入显示顺序',
         min: 0,
+        controlsPosition: 'right',
+        class: '!w-full',
       },
       rules: 'required',
     },
+    {
+      fieldName: 'charges',
+      label: '运费设置',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
+    {
+      fieldName: 'frees',
+      label: '包邮设置',
+      component: 'Input',
+      formItemClass: 'col-span-3',
+    },
   ];
 }
 
@@ -53,12 +169,17 @@ export function useGridFormSchema(): VbenFormSchema[] {
       fieldName: 'name',
       label: '模板名称',
       component: 'Input',
+      componentProps: {
+        placeholder: '请输入模板名称',
+        clearable: true,
+      },
     },
     {
       fieldName: 'chargeMode',
       label: '计费方式',
       component: 'Select',
       componentProps: {
+        placeholder: '请选择计费方式',
         clearable: true,
         options: getDictOptions(DICT_TYPE.EXPRESS_CHARGE_MODE, 'number'),
       },
@@ -72,14 +193,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '编号',
+      minWidth: 100,
     },
     {
       field: 'name',
       title: '模板名称',
+      minWidth: 200,
     },
     {
       field: 'chargeMode',
       title: '计费方式',
+      minWidth: 100,
       cellRender: {
         name: 'CellDict',
         props: { type: DICT_TYPE.EXPRESS_CHARGE_MODE },
@@ -88,10 +212,12 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'sort',
       title: '显示顺序',
+      minWidth: 100,
     },
     {
       field: 'createTime',
       title: '创建时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue
index 1d2ced7c894e6ef1f4809750e4ade93470d1e04a..b9c1cc0b50e409766621ef504d60bd2a693d34f2 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/index.vue
@@ -22,7 +22,7 @@ const [FormModal, formModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -46,7 +46,7 @@ async function handleDelete(
   try {
     await deleteDeliveryExpressTemplate(row.id as number);
     ElMessage.success($t('ui.actionMessage.deleteSuccess', [row.name]));
-    onRefresh();
+    handleRefresh();
   } finally {
     loadingInstance.close();
   }
@@ -73,6 +73,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -84,7 +85,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
 <template>
   <Page auto-content-height>
-    <FormModal @success="onRefresh" />
+    <FormModal @success="handleRefresh" />
     <Grid table-title="快递模板列表">
       <template #toolbar-tools>
         <TableAction
@@ -104,6 +105,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               label: $t('common.edit'),
+              type: 'primary',
               link: true,
               icon: ACTION_ICON.EDIT,
               auth: ['trade:delivery:express-template:update'],
@@ -111,8 +113,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
             },
             {
               label: $t('common.delete'),
-              link: true,
               type: 'danger',
+              link: true,
               icon: ACTION_ICON.DELETE,
               auth: ['trade:delivery:express-template:delete'],
               popConfirm: {
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ffb9d6a868ceca015a1d4249c0b62fd4a0854704
--- /dev/null
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/charge-item-form.vue
@@ -0,0 +1,231 @@
+<script lang="ts" setup>
+import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { ElInputNumber, ElTreeSelect } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { CHARGE_MODE_TITLE_MAP, useChargesColumns } from '../data';
+
+interface Props {
+  items?: MallDeliveryExpressTemplateApi.TemplateCharge[];
+  chargeMode?: number;
+  areaTree?: SystemAreaApi.Area[];
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  chargeMode: 1,
+  areaTree: () => [],
+});
+
+const emit = defineEmits(['update:items']);
+
+const tableData = ref<any[]>([]);
+const columnTitle = computed(() => CHARGE_MODE_TITLE_MAP[props.chargeMode]);
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useChargesColumns(props.chargeMode),
+    data: tableData.value,
+    minHeight: 200,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick();
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 监听计费方式变化 */
+watch(
+  () => props.chargeMode,
+  () => {
+    const columns = useChargesColumns(props.chargeMode);
+    if (gridApi.grid && columns) {
+      gridApi.grid.reloadColumn(columns);
+    }
+  },
+);
+
+/** 处理新增 */
+function handleAdd() {
+  const newRow = {
+    areaIds: [],
+    startCount: undefined,
+    startPrice: undefined,
+    extraCount: undefined,
+    extraPrice: undefined,
+  };
+  tableData.value.push(newRow);
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理删除 */
+function handleDelete(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.areaIds || item.areaIds.length === 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：区域不能为空`);
+    }
+    if (!item.startCount || item.startCount <= 0) {
+      throw new Error(
+        `运费设置第 ${i + 1} 行：${columnTitle.value?.startCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.startPrice || item.startPrice <= 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：运费必须大于0`);
+    }
+    if (!item.extraCount || item.extraCount <= 0) {
+      throw new Error(
+        `运费设置第 ${i + 1} 行：${columnTitle.value?.extraCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.extraPrice || item.extraPrice <= 0) {
+      throw new Error(`运费设置第 ${i + 1} 行：续费必须大于 0`);
+    }
+  }
+}
+
+defineExpose({
+  validate,
+});
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #areaIds="{ row }">
+      <!-- TODO 芋艿：可优化，使用 Cascade。不过貌似 ele 在 multiple 貌似有 bug！ -->
+      <ElTreeSelect
+        v-model="row.areaIds"
+        :data="areaTree"
+        node-key="id"
+        :props="{
+          label: 'name',
+          value: 'id',
+          children: 'children',
+        }"
+        placeholder="请选择地区"
+        class="w-full"
+        multiple
+        show-checkbox
+        collapse-tags
+        collapse-tags-tooltip
+        :max-collapse-tags="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #startCount="{ row }">
+      <ElInputNumber
+        v-model="row.startCount"
+        :min="1"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #startPrice="{ row }">
+      <ElInputNumber
+        v-model="row.startPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #extraCount="{ row }">
+      <ElInputNumber
+        v-model="row.extraCount"
+        :min="1"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #extraPrice="{ row }">
+      <ElInputNumber
+        v-model="row.extraPrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: '删除',
+            type: 'danger',
+            link: true,
+            popConfirm: {
+              title: '确认删除该区域吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+    <template #bottom>
+      <TableAction
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加计费区域',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
\ No newline at end of file
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
index b7e3f8c81f9d65f59ebe7b53bc942a8f386b9e38..cc331ad21733e5e665ba9381fdd84febca515f93 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/form.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
 
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
+import { cloneDeep, fenToYuan, yuanToFen } from '@vben/utils';
 
 import { ElMessage } from 'element-plus';
 
@@ -13,12 +15,19 @@ import {
   getDeliveryExpressTemplate,
   updateDeliveryExpressTemplate,
 } from '#/api/mall/trade/delivery/expressTemplate';
+import { getAreaTree } from '#/api/system/area';
 import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
+import ChargeItemForm from './charge-item-form.vue';
+import FreeItemForm from './free-item-form.vue';
 
 const emit = defineEmits(['success']);
 const formData = ref<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+const chargeItemFormRef = ref<InstanceType<typeof ChargeItemForm>>();
+const freeItemFormRef = ref<InstanceType<typeof FreeItemForm>>();
+const areaTree = ref<SystemAreaApi.Area[]>([]);
+
 const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['快递模板'])
@@ -30,26 +39,83 @@ const [Form, formApi] = useVbenForm({
     componentProps: {
       class: 'w-full',
     },
-    formItemClass: 'col-span-2',
     labelWidth: 120,
   },
-  layout: 'horizontal',
+  wrapperClass: 'grid-cols-3',
+  layout: 'vertical',
   schema: useFormSchema(),
   showDefaultActions: false,
+  handleValuesChange: (values, changedFields) => {
+    // 目的：触发子表单的 columns 变化
+    if (changedFields.includes('chargeMode')) {
+      formData.value!.chargeMode = values.chargeMode;
+    }
+  },
 });
 
-// TODO @xingyu：城市处理；
+/** 更新运费设置 */
+const handleUpdateCharges = async (
+  charges: MallDeliveryExpressTemplateApi.TemplateCharge[],
+) => {
+  formData.value =
+    await formApi.getValues<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+  formData.value.charges = charges;
+  await formApi.setValues({
+    charges,
+  });
+};
+
+/** 更新包邮设置 */
+const handleUpdateFrees = async (
+  frees: MallDeliveryExpressTemplateApi.TemplateFree[],
+) => {
+  formData.value =
+    await formApi.getValues<MallDeliveryExpressTemplateApi.ExpressTemplate>();
+  formData.value.frees = frees;
+  await formApi.setValues({
+    frees,
+  });
+};
+
+/** 创建或更新快递模板 */
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
     if (!valid) {
       return;
     }
+    const chargeFormInstance = Array.isArray(chargeItemFormRef.value)
+      ? chargeItemFormRef.value[0]
+      : chargeItemFormRef.value;
+    const freeFormInstance = Array.isArray(freeItemFormRef.value)
+      ? freeItemFormRef.value[0]
+      : freeItemFormRef.value;
+    try {
+      chargeFormInstance.validate();
+      freeFormInstance.validate();
+    } catch (error: any) {
+      ElMessage.error(error.message || '子表单验证失败');
+      return;
+    }
+
     modalApi.lock();
     // 提交表单
-    const data =
-      (await formApi.getValues()) as MallDeliveryExpressTemplateApi.ExpressTemplate;
+    const data = cloneDeep(
+      await formApi.getValues(),
+    ) as MallDeliveryExpressTemplateApi.ExpressTemplate;
     try {
+      // 转换金额单位
+      data.charges?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateCharge) => {
+          item.startPrice = yuanToFen(item.startPrice);
+          item.extraPrice = yuanToFen(item.extraPrice);
+        },
+      );
+      data.frees?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateFree) => {
+          item.freePrice = yuanToFen(item.freePrice);
+        },
+      );
       await (formData.value?.id
         ? updateDeliveryExpressTemplate(data)
         : createDeliveryExpressTemplate(data));
@@ -75,6 +141,18 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     try {
       formData.value = await getDeliveryExpressTemplate(data.id);
+      // 转换金额单位
+      formData.value.charges?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateCharge) => {
+          item.startPrice = Number.parseFloat(fenToYuan(item.startPrice));
+          item.extraPrice = Number.parseFloat(fenToYuan(item.extraPrice));
+        },
+      );
+      formData.value.frees?.forEach(
+        (item: MallDeliveryExpressTemplateApi.TemplateFree) => {
+          item.freePrice = Number.parseFloat(fenToYuan(item.freePrice));
+        },
+      );
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
@@ -82,10 +160,34 @@ const [Modal, modalApi] = useVbenModal({
     }
   },
 });
+
+/** 初始化 */
+onMounted(async () => {
+  areaTree.value = await getAreaTree();
+});
 </script>
 
 <template>
-  <Modal class="w-2/5" :title="getTitle">
-    <Form class="mx-4" />
+  <Modal class="w-1/2" :title="getTitle">
+    <Form class="mx-3">
+      <template #charges>
+        <ChargeItemForm
+          ref="chargeItemFormRef"
+          :items="formData?.charges"
+          :charge-mode="formData?.chargeMode"
+          :area-tree="areaTree"
+          @update:items="handleUpdateCharges"
+        />
+      </template>
+      <template #frees>
+        <FreeItemForm
+          ref="freeItemFormRef"
+          :items="formData?.frees"
+          :charge-mode="formData?.chargeMode"
+          :area-tree="areaTree"
+          @update:items="handleUpdateFrees"
+        />
+      </template>
+    </Form>
   </Modal>
 </template>
diff --git a/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
new file mode 100644
index 0000000000000000000000000000000000000000..37c4cb39cfcecb1d05e6bad2de8b6ce974f809a2
--- /dev/null
+++ b/apps/web-ele/src/views/mall/trade/delivery/expressTemplate/modules/free-item-form.vue
@@ -0,0 +1,202 @@
+<script lang="ts" setup>
+import type { MallDeliveryExpressTemplateApi } from '#/api/mall/trade/delivery/expressTemplate';
+import type { SystemAreaApi } from '#/api/system/area';
+
+import { computed, nextTick, ref, watch } from 'vue';
+
+import { ElInputNumber, ElTreeSelect } from 'element-plus';
+
+import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
+
+import { FREE_MODE_TITLE_MAP, useFreesColumns } from '../data';
+
+interface Props {
+  items?: MallDeliveryExpressTemplateApi.TemplateFree[];
+  chargeMode?: number;
+  areaTree?: SystemAreaApi.Area[];
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  items: () => [],
+  chargeMode: 1,
+  areaTree: () => [],
+});
+
+const emit = defineEmits(['update:items']);
+
+const tableData = ref<any[]>([]);
+const columnTitle = computed(() => FREE_MODE_TITLE_MAP[props.chargeMode]);
+
+/** 表格配置 */
+const [Grid, gridApi] = useVbenVxeGrid({
+  gridOptions: {
+    columns: useFreesColumns(props.chargeMode),
+    data: tableData.value,
+    minHeight: 200,
+    autoResize: true,
+    border: true,
+    rowConfig: {
+      keyField: 'seq',
+      isHover: true,
+    },
+    pagerConfig: {
+      enabled: false,
+    },
+    toolbarConfig: {
+      enabled: false,
+    },
+  },
+});
+
+/** 监听外部传入的数据 */
+watch(
+  () => props.items,
+  async (items) => {
+    if (!items) {
+      return;
+    }
+    tableData.value = [...items];
+    await nextTick();
+    await gridApi.grid.reloadData(tableData.value);
+  },
+  {
+    immediate: true,
+  },
+);
+
+/** 监听计费方式变化 */
+watch(
+  () => props.chargeMode,
+  () => {
+    const columns = useFreesColumns(props.chargeMode);
+    if (gridApi.grid && columns) {
+      gridApi.grid.reloadColumn(columns);
+    }
+  },
+);
+
+/** 处理新增 */
+function handleAdd() {
+  const newRow = {
+    areaIds: [],
+    freeCount: undefined,
+    freePrice: undefined,
+  };
+  tableData.value.push(newRow);
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理删除 */
+function handleDelete(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index !== -1) {
+    tableData.value.splice(index, 1);
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 处理行数据变更 */
+function handleRowChange(row: any) {
+  const index = tableData.value.findIndex((item) => item.seq === row.seq);
+  if (index === -1) {
+    tableData.value.push(row);
+  } else {
+    tableData.value[index] = row;
+  }
+  emit('update:items', [...tableData.value]);
+}
+
+/** 表单校验 */
+function validate() {
+  for (let i = 0; i < tableData.value.length; i++) {
+    const item = tableData.value[i];
+    if (!item.areaIds || item.areaIds.length === 0) {
+      throw new Error(`包邮设置第 ${i + 1} 行：区域不能为空`);
+    }
+    if (!item.freeCount || item.freeCount <= 0) {
+      throw new Error(
+        `包邮设置第 ${i + 1} 行：${columnTitle.value?.freeCountTitle}必须大于 0`,
+      );
+    }
+    if (!item.freePrice || item.freePrice <= 0) {
+      throw new Error(`包邮设置第 ${i + 1} 行：包邮金额必须大于 0`);
+    }
+  }
+}
+
+defineExpose({
+  validate,
+});
+</script>
+
+<template>
+  <Grid class="w-full">
+    <template #areaIds="{ row }">
+      <!-- TODO 芋艿：可优化，使用 Cascade。不过貌似 ele 在 multiple 貌似有 bug！ -->
+      <ElTreeSelect
+        v-model="row.areaIds"
+        :data="areaTree"
+        node-key="id"
+        :props="{
+          label: 'name',
+          value: 'id',
+          children: 'children',
+        }"
+        placeholder="请选择地区"
+        class="w-full"
+        multiple
+        show-checkbox
+        collapse-tags
+        collapse-tags-tooltip
+        :max-collapse-tags="1"
+        @change="handleRowChange(row)"
+      />
+    </template>
+    <template #freeCount="{ row }">
+      <ElInputNumber
+        v-model="row.freeCount"
+        :min="1"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #freePrice="{ row }">
+      <ElInputNumber
+        v-model="row.freePrice"
+        :min="0"
+        :precision="2"
+        @change="handleRowChange(row)"
+        controls-position="right"
+        class="!w-full"
+      />
+    </template>
+    <template #actions="{ row }">
+      <TableAction
+        :actions="[
+          {
+            label: '删除',
+            type: 'danger',
+            link: true,
+            popConfirm: {
+              title: '确认删除该区域吗？',
+              confirm: handleDelete.bind(null, row),
+            },
+          },
+        ]"
+      />
+    </template>
+    <template #bottom>
+      <TableAction
+        class="mt-2 flex justify-center"
+        :actions="[
+          {
+            label: '添加包邮区域',
+            type: 'default',
+            onClick: handleAdd,
+          },
+        ]"
+      />
+    </template>
+  </Grid>
+</template>
\ No newline at end of file
diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
index b5384b48cc354f17ce478370d2ffb17199bfa0f9..fe23b0968237b6ef2cf69c1f7ea0f3a5dd447288 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpOrder/index.vue
@@ -175,8 +175,7 @@ onMounted(() => {
 
 <template>
   <Page auto-content-height>
-    <ElCard class="mb-4 h-[10%]">
-      <!-- TODO @霖：高度不对 -->
+    <ElCard class="m-4">
       <div class="flex flex-row gap-4">
         <SummaryCard
           class="flex flex-1"
diff --git a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts
index f151de6c04e2d6dc615fec998bc86698395e3127..fa445f7a4b23403761f1274866a10d622c49709a 100644
--- a/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts
+++ b/apps/web-ele/src/views/mall/trade/delivery/pickUpStore/data.ts
@@ -23,7 +23,7 @@ export function useFormSchema(): VbenFormSchema[] {
     {
       component: 'ImageUpload',
       fieldName: 'logo',
-      label: '门店logo',
+      label: '门店 logo',
       rules: 'required',
     },
     {
@@ -201,7 +201,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     },
     {
       field: 'logo',
-      title: '门店logo',
+      title: '门店 logo',
       cellRender: {
         name: 'CellImage',
       },
diff --git a/apps/web-ele/src/views/mall/trade/order/modules/detail.vue b/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
index 5ddad3887946d10d76ffec71c3d48bcd7afd1f16..5c6e531b768b04ca71270e7603bebe83382f3713 100644
--- a/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
+++ b/apps/web-ele/src/views/mall/trade/order/modules/detail.vue
@@ -220,7 +220,7 @@ onMounted(async () => {
           />
         </ElDescriptionsItem>
         <ElDescriptionsItem
-          v-hasPermi="['trade:order:update']"
+          v-access:code="['trade:order:update']"
           label-class-name="no-colon"
         >
           <el-button
diff --git a/apps/web-ele/src/views/member/group/data.ts b/apps/web-ele/src/views/member/group/data.ts
index 7f8c1afcde200051d793591edd8e9dfbddf6ed63..d9a80b079febb2ff4fc25fcfa84ba3b0f2f4c02d 100644
--- a/apps/web-ele/src/views/member/group/data.ts
+++ b/apps/web-ele/src/views/member/group/data.ts
@@ -54,7 +54,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'Input',
       componentProps: {
         placeholder: '请输入分组名称',
-        allowClear: true,
+        clearable: true,
       },
     },
     {
@@ -64,7 +64,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       componentProps: {
         options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         placeholder: '请选择状态',
-        allowClear: true,
+        clearable: true,
       },
     },
     {
@@ -73,7 +73,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         placeholder: ['开始日期', '结束日期'],
-        allowClear: true,
+        clearable: true,
       },
     },
   ];
diff --git a/apps/web-ele/src/views/member/level/data.ts b/apps/web-ele/src/views/member/level/data.ts
index 0d72df1152d9a12963e907436a6fc6c7025f1ad4..918051429d7eb7f80e0086886cf5352f4e415a46 100644
--- a/apps/web-ele/src/views/member/level/data.ts
+++ b/apps/web-ele/src/views/member/level/data.ts
@@ -119,7 +119,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       component: 'RangePicker',
       componentProps: {
         ...getRangePickerDefaultProps(),
-        allowClear: true,
+        clearable: true,
       },
     },
   ];
diff --git a/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue b/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue
index a83c1e410f885478956148fffc318412c1eba32d..8d644e7f4804febe059593bb0c3b999f9b69d6b0 100644
--- a/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue
+++ b/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue
@@ -25,7 +25,7 @@ const activeStatus = ref<number | string>('all');
 
 /** 删除按钮操作 */
 const handleDelete = async (row: MallCouponApi.Coupon) => {
-  const hideLoading = ElLoading.service({
+  const loadingInstance = ElLoading.service({
     text: '回收将会收回会员领取的待使用的优惠券，已使用的将无法回收，确定要回收所选优惠券吗？',
   });
   try {
@@ -34,7 +34,7 @@ const handleDelete = async (row: MallCouponApi.Coupon) => {
     // 重新加载列表
     gridApi.query();
   } finally {
-    hideLoading.close();
+    loadingInstance.close();
   }
 };
 
diff --git a/apps/web-ele/src/views/pay/app/data.ts b/apps/web-ele/src/views/pay/app/data.ts
index b56df2b8b2235a8906f353a25cbd0253bb4a45d7..063cd42efe5bf258880643d268a546a95890b66e 100644
--- a/apps/web-ele/src/views/pay/app/data.ts
+++ b/apps/web-ele/src/views/pay/app/data.ts
@@ -46,10 +46,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = PayAppApi.App>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: PayAppApi.App,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-ele/src/views/pay/demo/order/data.ts b/apps/web-ele/src/views/pay/demo/order/data.ts
index 9f4b30aa7045ccdec5b08b9eb3c01f2212c176cf..b88fba3439bd1c26fc1fec0cecc239f0bdcda591 100644
--- a/apps/web-ele/src/views/pay/demo/order/data.ts
+++ b/apps/web-ele/src/views/pay/demo/order/data.ts
@@ -28,7 +28,7 @@ export function useFormSchema(): VbenFormSchema[] {
           { label: '蔚来汽车 --- 200000.00元', value: 5 },
         ],
         placeholder: '请选择下单商品',
-        allowClear: true,
+        clearable: true,
       },
       rules: 'required',
     },
@@ -97,7 +97,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       minWidth: 180,
       formatter: ({ cellValue, row }) => {
         if (cellValue) {
-          return formatDateTime(cellValue);
+          return formatDateTime(cellValue) as string;
         }
         if (row.payRefundId) {
           return '退款中，等待退款结果';
diff --git a/apps/web-ele/src/views/system/dept/data.ts b/apps/web-ele/src/views/system/dept/data.ts
index 530f309a6ac582541f27d70d6688cff60b8670cf..dac73473b7ac74b9986d2b942ee46ea965e58e66 100644
--- a/apps/web-ele/src/views/system/dept/data.ts
+++ b/apps/web-ele/src/views/system/dept/data.ts
@@ -1,6 +1,7 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
+import type { SystemUserApi } from '#/api/system/user';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -10,6 +11,13 @@ import { z } from '#/adapter/form';
 import { getDeptList } from '#/api/system/dept';
 import { getSimpleUserList } from '#/api/system/user';
 
+let userList: SystemUserApi.User[] = [];
+async function getUserData() {
+  userList = await getSimpleUserList();
+}
+
+getUserData();
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -111,9 +119,7 @@ export function useFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(
-  getLeaderName?: (userId: number) => string | undefined,
-): VxeTableGridOptions<SystemDeptApi.Dept>['columns'] {
+export function useGridColumns(): VxeTableGridOptions<SystemDeptApi.Dept>['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
@@ -128,7 +134,8 @@ export function useGridColumns(
       field: 'leaderUserId',
       title: '负责人',
       minWidth: 150,
-      formatter: ({ cellValue }) => getLeaderName?.(cellValue) || '-',
+      formatter: ({ cellValue }) =>
+        userList.find((user) => user.id === cellValue)?.nickname || '-',
     },
     {
       field: 'sort',
diff --git a/apps/web-ele/src/views/system/dept/index.vue b/apps/web-ele/src/views/system/dept/index.vue
index fe286b08dbb17ae25cbc6ba0b94c25540e1a09e0..0d3e39c877c4970c154ac045df089c4981cd9143 100644
--- a/apps/web-ele/src/views/system/dept/index.vue
+++ b/apps/web-ele/src/views/system/dept/index.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemDeptApi } from '#/api/system/dept';
-import type { SystemUserApi } from '#/api/system/user';
 
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 
 import { confirm, Page, useVbenModal } from '@vben/common-ui';
 import { isEmpty } from '@vben/utils';
@@ -12,7 +11,6 @@ import { ElLoading, ElMessage } from 'element-plus';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { deleteDept, deleteDeptList, getDeptList } from '#/api/system/dept';
-import { getSimpleUserList } from '#/api/system/user';
 import { $t } from '#/locales';
 
 import { useGridColumns } from './data';
@@ -23,12 +21,6 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 获取负责人名称 */
-const userList = ref<SystemUserApi.User[]>([]);
-function getLeaderName(userId: number) {
-  return userList.value.find((user) => user.id === userId)?.nickname;
-}
-
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
 function handleExpand() {
@@ -97,7 +89,7 @@ function handleRowCheckboxChange({
 
 const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
-    columns: useGridColumns(getLeaderName),
+    columns: useGridColumns(),
     height: 'auto',
     pagerConfig: {
       enabled: false,
@@ -130,11 +122,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     checkboxChange: handleRowCheckboxChange,
   },
 });
-
-/** 初始化 */
-onMounted(async () => {
-  userList.value = await getSimpleUserList();
-});
 </script>
 
 <template>
diff --git a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
index eff05d32e924b975a48f33bef40734807d74bdd5..c78f904b069d6da29bb967a30fc069e925b59dcf 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
@@ -135,16 +135,15 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
     <Form class="mx-4">
       <template #dataScopeDeptIds="slotProps">
         <Tree
+          v-loading="deptLoading"
           :tree-data="deptTree"
           multiple
           bordered
-          :spinning="deptLoading"
-          :expanded="expandedKeys"
+          :default-expanded-keys="expandedKeys"
           v-bind="slotProps"
+          :check-strictly="!isCheckStrictly"
           value-field="id"
           label-field="name"
-          :auto-check-parent="false"
-          :check-strictly="!isCheckStrictly"
         />
       </template>
     </Form>
diff --git a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
index dedd853ec71f7b4dc893f5c33105071adc7381bb..463a16a305a73b29a389665737bcd8119b0ead70 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
@@ -143,11 +143,11 @@ function getNodeClass(node: Recordable<any>) {
     <Form class="mx-4">
       <template #menuIds="slotProps">
         <Tree
-          :spinning="menuLoading"
+          v-loading="menuLoading"
           :tree-data="menuTree"
           multiple
           bordered
-          :expanded="expandedKeys"
+          :default-expanded-keys="expandedKeys"
           :get-node-class="getNodeClass"
           v-bind="slotProps"
           value-field="id"
diff --git a/apps/web-ele/src/views/system/tenant/data.ts b/apps/web-ele/src/views/system/tenant/data.ts
index 060932c6e1af2c57ae5ef6eeb4f7b912da296f6a..5aef1699fb45488c78dc156cec5db19a73081614 100644
--- a/apps/web-ele/src/views/system/tenant/data.ts
+++ b/apps/web-ele/src/views/system/tenant/data.ts
@@ -1,5 +1,6 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
 import { CommonStatusEnum, DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -8,6 +9,14 @@ import { z } from '#/adapter/form';
 import { getTenantPackageList } from '#/api/system/tenant-package';
 import { getRangePickerDefaultProps } from '#/utils';
 
+let tenantPackageList: SystemTenantPackageApi.TenantPackage[] = [];
+
+async function getTenantPackageData() {
+  tenantPackageList = await getTenantPackageList();
+}
+
+getTenantPackageData();
+
 /** 新增/修改的表单 */
 export function useFormSchema(): VbenFormSchema[] {
   return [
@@ -164,9 +173,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns(
-  getPackageName?: (packageId: number) => string | undefined,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     { type: 'checkbox', width: 40 },
     {
@@ -183,8 +190,10 @@ export function useGridColumns(
       field: 'packageId',
       title: '租户套餐',
       minWidth: 180,
-      formatter: (row: { cellValue: number }) => {
-        return getPackageName?.(row.cellValue) || '-';
+      formatter: ({ cellValue }) => {
+        return cellValue === 0
+          ? '系统租户'
+          : tenantPackageList.find((pkg) => pkg.id === cellValue)?.name || '-';
       },
     },
     {
diff --git a/apps/web-ele/src/views/system/tenant/index.vue b/apps/web-ele/src/views/system/tenant/index.vue
index 3c439b7251969bb019c72752e657638be189c0bb..25a1be37c0a76b8154307146153177b1df8eda10 100644
--- a/apps/web-ele/src/views/system/tenant/index.vue
+++ b/apps/web-ele/src/views/system/tenant/index.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemTenantApi } from '#/api/system/tenant';
-import type { SystemTenantPackageApi } from '#/api/system/tenant-package';
 
-import { onMounted, ref } from 'vue';
+import { ref } from 'vue';
 
 import { confirm, DocAlert, Page, useVbenModal } from '@vben/common-ui';
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
@@ -17,22 +16,11 @@ import {
   exportTenant,
   getTenantPage,
 } from '#/api/system/tenant';
-import { getTenantPackageList } from '#/api/system/tenant-package';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
 
-const tenantPackageList = ref<SystemTenantPackageApi.TenantPackage[]>([]);
-
-/** 获取套餐名称 */
-const getPackageName = (packageId: number) => {
-  if (packageId === 0) {
-    return '系统租户';
-  }
-  return tenantPackageList.value.find((pkg) => pkg.id === packageId)?.name;
-};
-
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -103,7 +91,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(getPackageName),
+    columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -131,11 +119,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
     checkboxChange: handleRowCheckboxChange,
   },
 });
-
-/** 初始化 */
-onMounted(async () => {
-  tenantPackageList.value = await getTenantPackageList();
-});
 </script>
 <template>
   <Page auto-content-height>
diff --git a/apps/web-ele/src/views/system/tenantPackage/modules/form.vue b/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
index b54d0a2109d8a83ad1e67ed26f8f4db9f7792698..c789d64178affd881e34f415e8593262b4889ed6 100644
--- a/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
+++ b/apps/web-ele/src/views/system/tenantPackage/modules/form.vue
@@ -135,12 +135,12 @@ function getAllNodeIds(nodes: any[], ids: number[] = []): number[] {
     <Form class="mx-6">
       <template #menuIds="slotProps">
         <Tree
+          v-loading="menuLoading"
           class="max-h-96 overflow-y-auto"
-          :loading="menuLoading"
           :tree-data="menuTree"
           multiple
           bordered
-          :expanded="expandedKeys"
+          :default-expanded-keys="expandedKeys"
           v-bind="slotProps"
           value-field="id"
           label-field="name"
diff --git a/apps/web-ele/src/views/system/user/data.ts b/apps/web-ele/src/views/system/user/data.ts
index c1283b47bd805608b0849b13601d5cbfee4cce44..d1e66935442054bbd076813c307fa225d75e19fd 100644
--- a/apps/web-ele/src/views/system/user/data.ts
+++ b/apps/web-ele/src/views/system/user/data.ts
@@ -284,10 +284,10 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = SystemUserApi.User>(
+export function useGridColumns(
   onStatusChange?: (
     newStatus: number,
-    row: T,
+    row: SystemUserApi.User,
   ) => PromiseLike<boolean | undefined>,
 ): VxeTableGridOptions['columns'] {
   return [
diff --git a/apps/web-naive/src/layouts/basic.vue b/apps/web-naive/src/layouts/basic.vue
index d612aacbd3a40187f4bd254432ae8234fca47000..d3ae06308846eb955a971f266835e8c2095b1176 100644
--- a/apps/web-naive/src/layouts/basic.vue
+++ b/apps/web-naive/src/layouts/basic.vue
@@ -13,7 +13,7 @@ import {
   AntdProfileOutlined,
   BookOpenText,
   CircleHelp,
-  MdiGithub,
+  SvgGithubIcon,
 } from '@vben/icons';
 import {
   BasicLayout,
@@ -78,7 +78,7 @@ const menus = computed(() => [
         target: '_blank',
       });
     },
-    icon: MdiGithub,
+    icon: SvgGithubIcon,
     text: 'GitHub',
   },
   {
@@ -200,11 +200,16 @@ onMounted(() => {
 });
 
 watch(
-  () => preferences.app.watermark,
-  async (enable) => {
+  () => ({
+    enable: preferences.app.watermark,
+    content: preferences.app.watermarkContent,
+  }),
+  async ({ enable, content }) => {
     if (enable) {
       await updateWatermark({
-        content: `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
+        content:
+          content ||
+          `${userStore.userInfo?.id} - ${userStore.userInfo?.nickname}`,
       });
     } else {
       destroyWatermark();
diff --git a/packages/@core/base/design/src/css/ui.css b/packages/@core/base/design/src/css/ui.css
index f7119c8ba548e8a8d3cc7a18062282750e83b005..0cf842a07864cee15a0df06fc9eae00c6be7d936 100644
--- a/packages/@core/base/design/src/css/ui.css
+++ b/packages/@core/base/design/src/css/ui.css
@@ -85,3 +85,17 @@
 .z-popup {
   z-index: var(--popup-z-index);
 }
+
+@keyframes shrink {
+  0% {
+    transform: scale(1);
+  }
+
+  50% {
+    transform: scale(0.9);
+  }
+
+  100% {
+    transform: scale(1);
+  }
+}
diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts
index 835eed5570f3970cd3819c2686a2c293d893fe00..c5631af8fa33e51fa78664f2cd6a64821d991f2d 100644
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -29,6 +29,7 @@ const defaultPreferences: Preferences = {
     name: 'Vben Admin',
     preferencesButtonPosition: 'auto',
     watermark: false,
+    watermarkContent: '',
     zIndex: 200,
   },
   breadcrumb: {
diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts
index e640edb5cf0516133c8770f8603ceb7555117c8d..e5495c48f5f751e20d759cc2dc04e5f8220c4600 100644
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -75,6 +75,10 @@ interface AppPreferences {
    * @zh_CN 是否开启水印
    */
   watermark: boolean;
+  /**
+   * @zh_CN 水印文案
+   */
+  watermarkContent: string;
   /** z-index */
   zIndex: number;
 }
diff --git a/packages/@core/ui-kit/form-ui/src/form-api.ts b/packages/@core/ui-kit/form-ui/src/form-api.ts
index 4b51404c52ec0f9eaae47641f2485505907ffd7a..f7f01be8fa616cd682e0d8f802880d0b60ac88b3 100644
--- a/packages/@core/ui-kit/form-ui/src/form-api.ts
+++ b/packages/@core/ui-kit/form-ui/src/form-api.ts
@@ -366,7 +366,7 @@ export class FormApi {
           isObject(obj[key]) &&
           !isDayjsObject(obj[key]) &&
           !isDate(obj[key])
-            ? fieldMergeFn(obj[key], value)
+            ? fieldMergeFn(value, obj[key])
             : value;
       }
       return true;
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/full-screen/full-screen.vue b/packages/@core/ui-kit/shadcn-ui/src/components/full-screen/full-screen.vue
index 59f28978c1af71b6e35b17de935b14e19125652c..80e469d335ae01424be56d81ebfd09aec670dfd7 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/full-screen/full-screen.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/full-screen/full-screen.vue
@@ -21,7 +21,10 @@ isFullscreen.value = !!(
 );
 </script>
 <template>
-  <VbenIconButton @click="toggle">
+  <VbenIconButton
+    class="hover:animate-[shrink_0.3s_ease-in-out]"
+    @click="toggle"
+  >
     <Minimize v-if="isFullscreen" class="text-foreground size-4" />
     <Maximize v-else class="text-foreground size-4" />
   </VbenIconButton>
diff --git a/packages/constants/src/dict-enum.ts b/packages/constants/src/dict-enum.ts
index 74e46e56ae98f93ab7e8e222122f5d8e449102e0..d78db6d15938243f037485930d56343090e31786 100644
--- a/packages/constants/src/dict-enum.ts
+++ b/packages/constants/src/dict-enum.ts
@@ -11,8 +11,9 @@ enum DICT_TYPE {
   AI_WRITE_LENGTH = 'ai_write_length', // AI 写作长度
   AI_WRITE_TONE = 'ai_write_tone', // AI 写作语气
   AI_WRITE_TYPE = 'ai_write_type', // AI 写作类型
-  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
   // ========== BPM 模块 ==========
+  BPM_MODEL_FORM_TYPE = 'bpm_model_form_type',
+
   BPM_MODEL_TYPE = 'bpm_model_type',
   BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type',
   BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status',
@@ -49,8 +50,10 @@ enum DICT_TYPE {
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
   // ========== MALL - 交易模块 ==========
   EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode', // 快递的计费方式
-  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
+
   // ========== INFRA 模块 ==========
+  INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status',
+
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
   INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type',
   INFRA_CODEGEN_SCENE = 'infra_codegen_scene',
@@ -64,24 +67,42 @@ enum DICT_TYPE {
   INFRA_JOB_STATUS = 'infra_job_status',
 
   INFRA_OPERATE_TYPE = 'infra_operate_type',
+
+  // ========== IOT - 物联网模块  ==========
+  IOT_ALERT_LEVEL = 'iot_alert_level', // IoT 告警级别
+  IOT_ALERT_RECEIVE_TYPE = 'iot_alert_receive_type', // IoT 告警接收类型
+  IOT_CODEC_TYPE = 'iot_codec_type', // IOT 数据格式（编解码器类型）
   IOT_DATA_FORMAT = 'iot_data_format', // IOT 数据格式
+  // TODO @芋艿：貌似这几个多了 _enum 后缀
+  IOT_DATA_SINK_TYPE_ENUM = 'iot_data_sink_type_enum', // IoT 数据流转目的类型
   IOT_DATA_TYPE = 'iot_data_type', // IOT 数据类型
+  IOT_DEVICE_STATE = 'iot_device_state', // IOT 设备状态
   IOT_DEVICE_STATUS = 'iot_device_status', // IOT 设备状态
-  // ========== IOT - 物联网模块  ==========
+  IOT_LOCATION_TYPE = 'iot_location_type', // IOT 定位类型
+
   IOT_NET_TYPE = 'iot_net_type', // IOT 联网方式
+  IOT_OTA_TASK_DEVICE_SCOPE = 'iot_ota_task_device_scope', // IoT OTA任务设备范围
+  IOT_OTA_TASK_RECORD_STATUS = 'iot_ota_task_record_status', // IoT OTA 记录状态
+  IOT_OTA_TASK_STATUS = 'iot_ota_task_status', // IoT OTA 任务状态
+
   IOT_PRODUCT_DEVICE_TYPE = 'iot_product_device_type', // IOT 产品设备类型
   IOT_PRODUCT_FUNCTION_TYPE = 'iot_product_function_type', // IOT 产品功能类型
   IOT_PRODUCT_STATUS = 'iot_product_status', // IOT 产品状态
   IOT_PROTOCOL_TYPE = 'iot_protocol_type', // IOT 接入网关协议
+  IOT_RULE_SCENE_ACTION_TYPE_ENUM = 'iot_rule_scene_action_type_enum', // IoT 规则场景的触发类型枚举
+  IOT_RULE_SCENE_TRIGGER_TYPE_ENUM = 'iot_rule_scene_trigger_type_enum', // IoT 场景流转的触发类型枚举
   IOT_RW_TYPE = 'iot_rw_type', // IOT 读写类型
+
+  IOT_THING_MODEL_TYPE = 'iot_thing_model_type', // IOT 产品功能类型
+  IOT_THING_MODEL_UNIT = 'iot_thing_model_unit', // IOT 物模型单位
   IOT_UNIT_TYPE = 'iot_unit_type', // IOT 单位类型
   IOT_VALIDATE_TYPE = 'iot_validate_type', // IOT 数据校验级别
-  MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
+
   // ========== Member 会员模块 ==========
+  MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type', // 会员经验业务类型
   MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type', // 积分的业务类型
   // ========== MP 模块 ==========
   MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
-
   MP_MESSAGE_TYPE = 'mp_message_type', // 消息类型
   // ========== PAY 模块 ==========
   PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
@@ -93,7 +114,7 @@ enum DICT_TYPE {
   PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
   // ========== MALL - 商品模块 ==========
   PRODUCT_SPU_STATUS = 'product_spu_status', // 商品状态
-
+  // ========== MALL - 营销模块 ==========
   PROMOTION_BANNER_POSITION = 'promotion_banner_position', // banner 定位
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
   PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
@@ -101,27 +122,26 @@ enum DICT_TYPE {
   PROMOTION_COUPON_STATUS = 'promotion_coupon_status', // 优惠劵的状态
   PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type', // 优惠劵的领取方式
   PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type', // 优惠劵模板的有限期类型
-  // ========== MALL - 营销模块 ==========
   PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type', // 优惠类型
   PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope', // 营销的商品范围
+
+  // ========== SYSTEM 模块 ==========
   SYSTEM_DATA_SCOPE = 'system_data_scope',
   SYSTEM_LOGIN_RESULT = 'system_login_result',
-
   SYSTEM_LOGIN_TYPE = 'system_login_type',
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
-
   SYSTEM_MENU_TYPE = 'system_menu_type',
   SYSTEM_NOTICE_TYPE = 'system_notice_type',
   SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
+
   SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
   SYSTEM_ROLE_TYPE = 'system_role_type',
   SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code',
   SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status',
   SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status',
   SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type',
-
   SYSTEM_SOCIAL_TYPE = 'system_social_type',
-  // ========== SYSTEM 模块 ==========
+
   SYSTEM_USER_SEX = 'system_user_sex',
   TERMINAL = 'terminal', // 终端
   TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status', // 售后 - 状态
diff --git a/packages/effects/common-ui/src/components/captcha/verification/index.vue b/packages/effects/common-ui/src/components/captcha/verification/index.vue
index 49520e82199259db6613787f7ba2f926bf8cba27..c6ed003200e930aeb32cc741a7b9a9d86577c1dd 100644
--- a/packages/effects/common-ui/src/components/captcha/verification/index.vue
+++ b/packages/effects/common-ui/src/components/captcha/verification/index.vue
@@ -7,6 +7,8 @@ import type { VerificationProps } from './typing';
 
 import { defineAsyncComponent, markRaw, ref, toRefs, watchEffect } from 'vue';
 
+import { IconifyIcon } from '@vben/icons';
+
 import './verify.css';
 
 defineOptions({
@@ -112,7 +114,7 @@ defineExpose({
       <div v-if="mode === 'pop'" class="verifybox-top">
         {{ $t('ui.captcha.title') }}
         <span class="verifybox-close" @click="onClose">
-          <i class="iconfont icon-close"></i>
+          <IconifyIcon icon="lucide:x" class="size-5" />
         </span>
       </div>
       <div
diff --git a/packages/effects/common-ui/src/components/captcha/verification/verify-points.vue b/packages/effects/common-ui/src/components/captcha/verification/verify-points.vue
index 8d882bc5ed206a1d4ca7d9e4fffc47b0423c6a84..d28953e3fd9420cc1edc4c269d0b9c61a1b74419 100644
--- a/packages/effects/common-ui/src/components/captcha/verification/verify-points.vue
+++ b/packages/effects/common-ui/src/components/captcha/verification/verify-points.vue
@@ -12,6 +12,7 @@ import {
   toRefs,
 } from 'vue';
 
+import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
 import { AES } from '@vben-core/shared/utils';
@@ -221,7 +222,7 @@ defineExpose({
           style="z-index: 3"
           @click="refresh"
         >
-          <i class="iconfont icon-refresh"></i>
+          <IconifyIcon icon="lucide:refresh-ccw" class="mr-2 size-5" />
         </div>
         <img
           ref="canvas"
diff --git a/packages/effects/common-ui/src/components/captcha/verification/verify-slide.vue b/packages/effects/common-ui/src/components/captcha/verification/verify-slide.vue
index feba583ba11be3d14c3ee67eca60cb22d25ddbda..fca869922b942d8ec3371be6464aed4a1fe0b896 100644
--- a/packages/effects/common-ui/src/components/captcha/verification/verify-slide.vue
+++ b/packages/effects/common-ui/src/components/captcha/verification/verify-slide.vue
@@ -15,6 +15,7 @@ import {
   toRefs,
 } from 'vue';
 
+import { IconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
 import { AES } from '@vben-core/shared/utils';
@@ -299,7 +300,7 @@ defineExpose({
           style="display: block; width: 100%; height: 100%"
         />
         <div v-show="showRefresh" class="verify-refresh" @click="refresh">
-          <i class="iconfont icon-refresh"></i>
+          <IconifyIcon icon="lucide:refresh-ccw" class="mr-2 size-5" />
         </div>
         <transition name="tips">
           <span
diff --git a/packages/effects/common-ui/src/components/content-wrap/content-wrap.vue b/packages/effects/common-ui/src/components/content-wrap/content-wrap.vue
index 4bc153a32aba35f4e91dbf0c7f381295b98daa89..24e980cd5b7ed14eaa0642e19b3e2f74b6a6463a 100644
--- a/packages/effects/common-ui/src/components/content-wrap/content-wrap.vue
+++ b/packages/effects/common-ui/src/components/content-wrap/content-wrap.vue
@@ -74,6 +74,9 @@ onMounted(() => {
           <div v-if="title" class="mb-2 flex text-lg font-semibold">
             {{ title }}
           </div>
+          <div v-if="$slots.extra" class="flex justify-end">
+            <slot name="extra"></slot>
+          </div>
         </slot>
 
         <slot name="description">
@@ -82,10 +85,6 @@ onMounted(() => {
           </p>
         </slot>
       </div>
-
-      <div v-if="$slots.extra">
-        <slot name="extra"></slot>
-      </div>
     </div>
 
     <div :class="cn('h-full p-4', contentClass)" :style="contentStyle">
diff --git a/packages/effects/common-ui/src/ui/authentication/dingding-login.vue b/packages/effects/common-ui/src/ui/authentication/dingding-login.vue
index 4c63301ee80763eb6c65ba8390c6528d53fcb199..80b123c1b4354e437f8989b432d995ea56f470c6 100644
--- a/packages/effects/common-ui/src/ui/authentication/dingding-login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/dingding-login.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useRoute } from 'vue-router';
 
-import { RiDingding } from '@vben/icons';
+import { SvgDingDingIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
 
 import { alert, useVbenModal } from '@vben-core/popup-ui';
@@ -96,7 +96,7 @@ const handleLogin = () => {
       :tooltip="$t('authentication.dingdingLogin')"
       tooltip-side="top"
     >
-      <RiDingding />
+      <SvgDingDingIcon />
     </VbenIconButton>
     <Modal>
       <div id="dingding_qrcode_login_element"></div>
diff --git a/packages/effects/common-ui/src/ui/authentication/third-party-login.vue b/packages/effects/common-ui/src/ui/authentication/third-party-login.vue
index d922049d08edd60c91bb882e8a32d96f31715178..fc36ce90df592202f83ee5941814d84906ec8430 100644
--- a/packages/effects/common-ui/src/ui/authentication/third-party-login.vue
+++ b/packages/effects/common-ui/src/ui/authentication/third-party-login.vue
@@ -1,5 +1,10 @@
 <script setup lang="ts">
-import { MdiGithub, MdiQqchat, MdiWechat, RiDingding } from '@vben/icons';
+import {
+  SvgDingDingIcon,
+  SvgGithubIcon,
+  SvgQQChatIcon,
+  SvgWeChatIcon,
+} from '@vben/icons';
 import { $t } from '@vben/locales';
 
 import { VbenIconButton } from '@vben-core/shadcn-ui';
@@ -34,16 +39,16 @@ function handleThirdLogin(type: number) {
 
     <div class="mt-4 flex flex-wrap justify-center">
       <VbenIconButton class="mb-3" @click="handleThirdLogin(30)">
-        <MdiWechat />
+        <SvgWeChatIcon />
       </VbenIconButton>
       <VbenIconButton class="mb-3" @click="handleThirdLogin(20)">
-        <RiDingding />
+        <SvgDingDingIcon />
       </VbenIconButton>
       <VbenIconButton class="mb-3" @click="handleThirdLogin(0)">
-        <MdiQqchat />
+        <SvgQQChatIcon />
       </VbenIconButton>
       <VbenIconButton class="mb-3" @click="handleThirdLogin(0)">
-        <MdiGithub />
+        <SvgGithubIcon />
       </VbenIconButton>
     </div>
   </div>
diff --git a/packages/effects/layouts/src/widgets/language-toggle.vue b/packages/effects/layouts/src/widgets/language-toggle.vue
index 728fca04fd05ca20b1afd011e7f3ab8dd8d3ceb0..f92432f9b460c8936afd5d98dc1c6fcee75d009e 100644
--- a/packages/effects/layouts/src/widgets/language-toggle.vue
+++ b/packages/effects/layouts/src/widgets/language-toggle.vue
@@ -31,7 +31,7 @@ async function handleUpdate(value: string | undefined) {
       :model-value="preferences.app.locale"
       @update:model-value="handleUpdate"
     >
-      <VbenIconButton>
+      <VbenIconButton class="hover:animate-[shrink_0.3s_ease-in-out]">
         <Languages class="text-foreground size-4" />
       </VbenIconButton>
     </VbenDropdownRadioMenu>
diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/general/general.vue b/packages/effects/layouts/src/widgets/preferences/blocks/general/general.vue
index 630882f4ab16afc73c686c2587d3f07a2323caf9..c69cd3aa9f73ce7e2882679ad27c069ac76b6a93 100644
--- a/packages/effects/layouts/src/widgets/preferences/blocks/general/general.vue
+++ b/packages/effects/layouts/src/widgets/preferences/blocks/general/general.vue
@@ -2,6 +2,7 @@
 import { SUPPORT_LANGUAGES } from '@vben/constants';
 import { $t } from '@vben/locales';
 
+import InputItem from '../input-item.vue';
 import SelectItem from '../select-item.vue';
 import SwitchItem from '../switch-item.vue';
 
@@ -12,6 +13,7 @@ defineOptions({
 const appLocale = defineModel<string>('appLocale');
 const appDynamicTitle = defineModel<boolean>('appDynamicTitle');
 const appWatermark = defineModel<boolean>('appWatermark');
+const appWatermarkContent = defineModel<string>('appWatermarkContent');
 const appEnableCheckUpdates = defineModel<boolean>('appEnableCheckUpdates');
 </script>
 
@@ -22,9 +24,23 @@ const appEnableCheckUpdates = defineModel<boolean>('appEnableCheckUpdates');
   <SwitchItem v-model="appDynamicTitle">
     {{ $t('preferences.dynamicTitle') }}
   </SwitchItem>
-  <SwitchItem v-model="appWatermark">
+  <SwitchItem
+    v-model="appWatermark"
+    @update:model-value="
+      (val) => {
+        if (!val) appWatermarkContent = '';
+      }
+    "
+  >
     {{ $t('preferences.watermark') }}
   </SwitchItem>
+  <InputItem
+    v-if="appWatermark"
+    v-model="appWatermarkContent"
+    :placeholder="$t('preferences.watermarkContent')"
+  >
+    {{ $t('preferences.watermarkContent') }}
+  </InputItem>
   <SwitchItem v-model="appEnableCheckUpdates">
     {{ $t('preferences.checkUpdates') }}
   </SwitchItem>
diff --git a/packages/effects/layouts/src/widgets/preferences/blocks/input-item.vue b/packages/effects/layouts/src/widgets/preferences/blocks/input-item.vue
index 2bf8660c23da0a8e9777042b95e6af5204c5b493..8e9f09e7a34eedcb629cdb8c9c5ff7706cf304de 100644
--- a/packages/effects/layouts/src/widgets/preferences/blocks/input-item.vue
+++ b/packages/effects/layouts/src/widgets/preferences/blocks/input-item.vue
@@ -3,7 +3,7 @@ import type { SelectOption } from '@vben/types';
 
 import { useSlots } from 'vue';
 
-import { CircleHelp } from '@vben/icons';
+import { CircleHelp, CircleX } from '@vben/icons';
 
 import { Input, VbenTooltip } from '@vben-core/shadcn-ui';
 
@@ -47,6 +47,17 @@ const slots = useSlots();
         <slot name="tip"></slot>
       </VbenTooltip>
     </span>
-    <Input v-model="inputValue" class="h-8 w-[165px]" />
+    <div class="relative">
+      <Input
+        v-model="inputValue"
+        class="h-8 w-[165px]"
+        :placeholder="placeholder"
+      />
+      <CircleX
+        v-if="inputValue"
+        class="hover:text-foreground text-foreground/60 absolute right-2 top-1/2 size-3 -translate-y-1/2 transform cursor-pointer"
+        @click="() => (inputValue = '')"
+      />
+    </div>
   </div>
 </template>
diff --git a/packages/effects/layouts/src/widgets/preferences/preferences-button.vue b/packages/effects/layouts/src/widgets/preferences/preferences-button.vue
index 125ab81634a916e2c71a865e30644b3bc632c019..8598bb270afbff1806d238d1a131f341e6de3ed1 100644
--- a/packages/effects/layouts/src/widgets/preferences/preferences-button.vue
+++ b/packages/effects/layouts/src/widgets/preferences/preferences-button.vue
@@ -13,7 +13,7 @@ function clearPreferencesAndLogout() {
 </script>
 <template>
   <Preferences @clear-preferences-and-logout="clearPreferencesAndLogout">
-    <VbenIconButton>
+    <VbenIconButton class="hover:animate-[shrink_0.3s_ease-in-out]">
       <Settings class="text-foreground size-4" />
     </VbenIconButton>
   </Preferences>
diff --git a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue
index 7d62d4e0c73bf67507fbff1ae7dcc3bc26a50355..0a326f20d3b1b3e6abf0f680d8bf61025e10a8af 100644
--- a/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue
+++ b/packages/effects/layouts/src/widgets/preferences/preferences-drawer.vue
@@ -67,6 +67,7 @@ const appColorGrayMode = defineModel<boolean>('appColorGrayMode');
 const appColorWeakMode = defineModel<boolean>('appColorWeakMode');
 const appContentCompact = defineModel<ContentCompactType>('appContentCompact');
 const appWatermark = defineModel<boolean>('appWatermark');
+const appWatermarkContent = defineModel<string>('appWatermarkContent');
 const appEnableCheckUpdates = defineModel<boolean>('appEnableCheckUpdates');
 const appPreferencesButtonPosition = defineModel<PreferencesButtonPositionType>(
   'appPreferencesButtonPosition',
@@ -267,6 +268,7 @@ async function handleReset() {
                 v-model:app-enable-check-updates="appEnableCheckUpdates"
                 v-model:app-locale="appLocale"
                 v-model:app-watermark="appWatermark"
+                v-model:app-watermark-content="appWatermarkContent"
               />
             </Block>
 
diff --git a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue
index 9ee4bceb503ad18e330f4fe09778c8dc44a16a23..7d9ff660caeb1c681e2123ac6a4a838871f62fd0 100644
--- a/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue
+++ b/packages/effects/layouts/src/widgets/theme-toggle/theme-button.vue
@@ -64,7 +64,7 @@ function toggleTheme(event: MouseEvent) {
       `circle(0px at ${x}px ${y}px)`,
       `circle(${endRadius}px at ${x}px ${y}px)`,
     ];
-    document.documentElement.animate(
+    const animate = document.documentElement.animate(
       {
         clipPath: isDark.value ? [...clipPath].reverse() : clipPath,
       },
@@ -76,6 +76,9 @@ function toggleTheme(event: MouseEvent) {
           : '::view-transition-new(root)',
       },
     );
+    animate.onfinish = () => {
+      transition.skipTransition();
+    };
   });
 }
 </script>
@@ -85,7 +88,7 @@ function toggleTheme(event: MouseEvent) {
     :aria-label="theme"
     :class="[`is-${theme}`]"
     aria-live="polite"
-    class="theme-toggle cursor-pointer border-none bg-none"
+    class="theme-toggle cursor-pointer border-none bg-none hover:animate-[shrink_0.3s_ease-in-out]"
     v-bind="bindProps"
     @click.stop="toggleTheme"
   >
diff --git a/packages/effects/plugins/src/echarts/use-echarts.ts b/packages/effects/plugins/src/echarts/use-echarts.ts
index 1125c428acf5e49e69e65e30d36cbb294488c6a2..652aba4a54fec2ba02141814eba680ae422b1071 100644
--- a/packages/effects/plugins/src/echarts/use-echarts.ts
+++ b/packages/effects/plugins/src/echarts/use-echarts.ts
@@ -46,6 +46,21 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
     },
   });
 
+  const getChartEl = (): HTMLElement | null => {
+    const refValue = chartRef?.value as unknown;
+    if (!refValue) return null;
+    if (refValue instanceof HTMLElement) {
+      return refValue;
+    }
+    const maybeComponent = refValue as { $el?: HTMLElement };
+    return maybeComponent.$el ?? null;
+  };
+
+  const isElHidden = (el: HTMLElement | null): boolean => {
+    if (!el) return true;
+    return el.offsetHeight === 0 || el.offsetWidth === 0;
+  };
+
   const getOptions = computed((): EChartsOption => {
     if (!isDark.value) {
       return {};
@@ -83,6 +98,13 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
         return;
       }
       nextTick(() => {
+        const el = getChartEl();
+        if (isElHidden(el)) {
+          useTimeoutFn(async () => {
+            resolve(await renderEcharts(currentOptions));
+          }, 30);
+          return;
+        }
         useTimeoutFn(() => {
           if (!chartInstance) {
             const instance = initCharts();
@@ -97,6 +119,10 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
   };
 
   function resize() {
+    const el = getChartEl();
+    if (isElHidden(el)) {
+      return;
+    }
     chartInstance?.resize({
       animation: {
         duration: 300,
diff --git a/packages/icons/src/svg/icons/dingding.svg b/packages/icons/src/svg/icons/dingding.svg
new file mode 100644
index 0000000000000000000000000000000000000000..c2fc786b705cc897e847485b8c593525ea16639f
--- /dev/null
+++ b/packages/icons/src/svg/icons/dingding.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="200" height="200"><path d="M512 2C230.2 2 2 230.2 2 512s228.2 510 510 510 510-228.2 510-510S793.3 2 512 2z m235.9 442c-1 4.6-3.6 10.8-7.2 19.1l-0.5 0.5c-21.6 45.8-77.3 135.5-77.3 135.5l-0.5-0.5-16.5 28.3h78.8L574.3 826.8l34-136h-61.8l21.6-90.2c-17.5 4.1-38.1 9.8-62.3 18 0 0-33 19.1-94.8-37.1 0 0-41.7-37.1-17.5-45.8 10.3-4.1 50-8.8 81.4-12.9 42.2-5.7 68.5-8.8 68.5-8.8s-130.3 2.1-161.2-3.1c-30.9-4.6-70.1-56.7-78.3-102 0 0-12.9-24.7 27.8-12.9 40.2 11.8 209.2 45.8 209.2 45.8S321.4 375 307 358.5c-14.4-16.5-42.8-89.6-39.2-134.5 0 0 1.5-11.3 12.9-8.2 0 0 161.8 74.2 272.5 114.4C664.5 371.4 760.8 392 747.9 444z" fill="#3296FA"/></svg>
diff --git a/packages/icons/src/svg/icons/github.svg b/packages/icons/src/svg/icons/github.svg
new file mode 100644
index 0000000000000000000000000000000000000000..39d092d9fe026b664e869e9a06e3799400f3f824
--- /dev/null
+++ b/packages/icons/src/svg/icons/github.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="200" height="200"><path d="M517.30912244 23.0407001c-277.94803947-0.11230224-503.114027 225.0536853-503.11402702 503.00172479 0 219.66317786 140.82700667 406.42179996 337.01901675 475.03846748 26.39102597 6.73813429 22.34814539-12.24094396 22.3481454-25.04339914v-87.14653682c-152.61874168 17.9683581-158.68306256-83.10365624-169.01486845-99.94899196-20.77591406-35.37520501-69.62738767-44.35938408-55.0280967-61.20471981 34.81369383-17.9683581 70.18889885 4.49208953 111.17921577 65.13529813 29.76009311 43.91017513 87.48344355 36.49822743 116.90662996 29.19858195 6.40122758-26.39102597 20.21440287-49.97449598 38.96887665-68.39206307-157.89694687-28.07555954-223.93066292-124.65548435-223.93066294-239.42837176 0-55.5896079 18.30526482-106.7994285 54.35428331-148.01434994-22.90965658-68.16745859 2.13374251-126.34001793 5.50280964-134.98729027 65.3599026-5.95201861 133.07815223 46.71773107 138.46865968 50.87291388 37.17204084-9.99489919 79.50998463-15.38540662 126.90152914-15.38540659 47.72845123 0 90.29099949 5.50280967 127.57534256 15.61001106 12.69015291-9.65799248 75.69170854-54.80349223 136.33491714-49.30068255 3.25676491 8.64727234 27.73865283 65.47220485 6.1766231 132.74124553 36.49822743 41.32722364 54.91579446 92.87395098 54.91579447 148.80046559 0 114.99749189-66.25832052 211.57741672-224.82908082 239.54067401 26.5033282 26.05411926 42.89945497 62.32774217 42.89945498 102.41964122v126.45232019c0.89841792 9.99489919 0 20.21440287 16.95763795 20.21440287 199.22417052-67.26904065 342.52182644-255.3752896 342.52182644-477.05990776 0-277.94803947-225.27828977-503.114027-503.11402701-503.11402703z" fill="currentColor"/></svg>
diff --git a/packages/icons/src/svg/icons/google.svg b/packages/icons/src/svg/icons/google.svg
new file mode 100644
index 0000000000000000000000000000000000000000..f2ad0a403f18e181b33155ae57c935e84b5f3fb8
--- /dev/null
+++ b/packages/icons/src/svg/icons/google.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="200" height="200"><path d="M213.573746 512.08574a296.892457 296.892457 0 0 1 15.663636-94.698456L53.712514 286.089155a504.154105 504.154105 0 0 0 0 451.737229l175.422492-131.502883a296.022255 296.022255 0 0 1-15.356507-94.288949" fill="#FBBC05"/><path d="M521.881206 208.845928a305.696854 305.696854 0 0 1 192.007518 67.210309l151.773472-148.446228A527.547183 527.547183 0 0 0 53.763703 284.195186l175.422491 131.349318a306.771809 306.771809 0 0 1 292.541447-206.698576" fill="#EA4335"/><path d="M521.881206 815.325553a307.130128 307.130128 0 0 1-292.643824-206.698576l-175.524868 131.29813A521.148639 521.148639 0 0 0 521.881206 1023.969287a503.130338 503.130338 0 0 0 339.839486-127.100685l-166.771659-126.128105a327.861412 327.861412 0 0 1-173.221392 44.585056" fill="#34A853"/><path d="M1023.475893 513.774956a415.64944 415.64944 0 0 0-11.875698-92.70211h-486.289369v197.023977h279.744358a229.528582 229.528582 0 0 1-106.522966 152.43892l166.618094 126.128106a502.004194 502.004194 0 0 0 158.069639-382.888893" fill="#4285F4"/></svg>
diff --git a/packages/icons/src/svg/icons/qqchat.svg b/packages/icons/src/svg/icons/qqchat.svg
new file mode 100644
index 0000000000000000000000000000000000000000..ac9a7f03028cf98f94b3dd2a8e3705d8b0715ec2
--- /dev/null
+++ b/packages/icons/src/svg/icons/qqchat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="200" height="200"><path d="M511.09761 957.257c-80.159 0-153.737-25.019-201.11-62.386-24.057 6.702-54.831 17.489-74.252 30.864-16.617 11.439-14.546 23.106-11.55 27.816 13.15 20.689 225.583 13.211 286.912 6.767v-3.061z" fill="#FAAD08"/><path d="M496.65061 957.257c80.157 0 153.737-25.019 201.11-62.386 24.057 6.702 54.83 17.489 74.253 30.864 16.616 11.439 14.543 23.106 11.55 27.816-13.15 20.689-225.584 13.211-286.914 6.767v-3.061z" fill="#FAAD08"/><path d="M497.12861 474.524c131.934-0.876 237.669-25.783 273.497-35.34 8.541-2.28 13.11-6.364 13.11-6.364 0.03-1.172 0.542-20.952 0.542-31.155C784.27761 229.833 701.12561 57.173 496.64061 57.162 292.15661 57.173 209.00061 229.832 209.00061 401.665c0 10.203 0.516 29.983 0.547 31.155 0 0 3.717 3.821 10.529 5.67 33.078 8.98 140.803 35.139 276.08 36.034h0.972z" fill="#000000"/><path d="M860.28261 619.782c-8.12-26.086-19.204-56.506-30.427-85.72 0 0-6.456-0.795-9.718 0.148-100.71 29.205-222.773 47.818-315.792 46.695h-0.962C410.88561 582.017 289.65061 563.617 189.27961 534.698 185.44461 533.595 177.87261 534.063 177.87261 534.063 166.64961 563.276 155.56661 593.696 147.44761 619.782 108.72961 744.168 121.27261 795.644 130.82461 796.798c20.496 2.474 79.78-93.637 79.78-93.637 0 97.66 88.324 247.617 290.576 248.996a718.01 718.01 0 0 1 5.367 0C708.80161 950.778 797.12261 800.822 797.12261 703.162c0 0 59.284 96.111 79.783 93.637 9.55-1.154 22.093-52.63-16.623-177.017" fill="#000000"/><path d="M434.38261 316.917c-27.9 1.24-51.745-30.106-53.24-69.956-1.518-39.877 19.858-73.207 47.764-74.454 27.875-1.224 51.703 30.109 53.218 69.974 1.527 39.877-19.853 73.2-47.742 74.436m206.67-69.956c-1.494 39.85-25.34 71.194-53.24 69.956-27.888-1.238-49.269-34.559-47.742-74.435 1.513-39.868 25.341-71.201 53.216-69.974 27.909 1.247 49.285 34.576 47.767 74.453" fill="#FFFFFF"/><path d="M683.94261 368.627c-7.323-17.609-81.062-37.227-172.353-37.227h-0.98c-91.29 0-165.031 19.618-172.352 37.227a6.244 6.244 0 0 0-0.535 2.505c0 1.269 0.393 2.414 1.006 3.386 6.168 9.765 88.054 58.018 171.882 58.018h0.98c83.827 0 165.71-48.25 171.881-58.016a6.352 6.352 0 0 0 1.002-3.395c0-0.897-0.2-1.736-0.531-2.498" fill="#FAAD08"/><path d="M467.63161 256.377c1.26 15.886-7.377 30-19.266 31.542-11.907 1.544-22.569-10.083-23.836-25.978-1.243-15.895 7.381-30.008 19.25-31.538 11.927-1.549 22.607 10.088 23.852 25.974m73.097 7.935c2.533-4.118 19.827-25.77 55.62-17.886 9.401 2.07 13.75 5.116 14.668 6.316 1.355 1.77 1.726 4.29 0.352 7.684-2.722 6.725-8.338 6.542-11.454 5.226-2.01-0.85-26.94-15.889-49.905 6.553-1.579 1.545-4.405 2.074-7.085 0.242-2.678-1.834-3.786-5.553-2.196-8.135" fill="#000000"/><path d="M504.33261 584.495h-0.967c-63.568 0.752-140.646-7.504-215.286-21.92-6.391 36.262-10.25 81.838-6.936 136.196 8.37 137.384 91.62 223.736 220.118 224.996H506.48461c128.498-1.26 211.748-87.612 220.12-224.996 3.314-54.362-0.547-99.938-6.94-136.203-74.654 14.423-151.745 22.684-215.332 21.927" fill="#FFFFFF"/><path d="M323.27461 577.016v137.468s64.957 12.705 130.031 3.91V591.59c-41.225-2.262-85.688-7.304-130.031-14.574" fill="#EB1C26"/><path d="M788.09761 432.536s-121.98 40.387-283.743 41.539h-0.962c-161.497-1.147-283.328-41.401-283.744-41.539l-40.854 106.952c102.186 32.31 228.837 53.135 324.598 51.926l0.96-0.002c95.768 1.216 222.4-19.61 324.6-51.924l-40.855-106.952z" fill="#EB1C26"/></svg>
diff --git a/packages/icons/src/svg/icons/wechat.svg b/packages/icons/src/svg/icons/wechat.svg
new file mode 100644
index 0000000000000000000000000000000000000000..346b0379a0e41159a461587e904fed8ae10e8675
--- /dev/null
+++ b/packages/icons/src/svg/icons/wechat.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="200" height="200"><path d="M712.149333 352.234667c5.184 0 10.282667 0.064 15.381334 0.341333-26.944-146.837333-178.602667-259.2-361.642667-259.2-202.090667 0-365.888 137.002667-365.888 306.005333 0 99.093333 56.298667 187.178667 143.637333 243.093334l3.349334 2.133333-35.349334 110.72 132.266667-67.370667 6.229333 1.792a431.296 431.296 0 0 0 140.330667 14.848 237.141333 237.141333 0 0 1-11.626667-73.002666c0.021333-154.282667 149.290667-279.36 333.312-279.36z m-218.901333-107.968c28.373333 0 51.349333 22.250667 51.349333 49.728 0 27.456-22.976 49.770667-51.349333 49.770666-28.416 0-51.370667-22.293333-51.370667-49.770666-0.021333-27.498667 22.954667-49.728 51.370667-49.728z m-254.677333 99.477333c-28.394667 0-51.370667-22.293333-51.370667-49.770667 0-27.477333 22.997333-49.728 51.370667-49.728 28.394667 0 51.434667 22.250667 51.434666 49.728s-23.04 49.770667-51.434666 49.770667z" fill="#46AF35"/><path d="M405.76 633.408c0 142.805333 138.453333 258.56 309.162667 258.56a363.392 363.392 0 0 0 103.04-14.762667l111.701333 56.96-29.866667-93.589333 2.816-1.792c73.770667-47.232 121.344-121.621333 121.344-205.397333 0-142.741333-138.389333-258.496-309.056-258.496-170.688 0.042667-309.141333 115.776-309.141333 258.517333z m373.312-89.045333c0-23.168 19.413333-41.962667 43.370667-41.962667 24.021333 0 43.413333 18.816 43.413333 41.962667 0 23.253333-19.413333 42.090667-43.413333 42.090666-23.957333 0-43.370667-18.858667-43.370667-42.090666z m-215.146667 0c0-23.168 19.456-41.962667 43.413334-41.962667 23.978667 0 43.413333 18.816 43.413333 41.962667 0 23.253333-19.434667 42.090667-43.413333 42.090666-23.957333 0-43.413333-18.858667-43.413334-42.090666z" fill="#46AF35"/></svg>
diff --git a/packages/icons/src/svg/index.ts b/packages/icons/src/svg/index.ts
index c9cd13bc15b466a5d835adba73030ab2a59cc14d..0da85d1fde7a2ce9e11fca15d5c33b924cef33ab 100644
--- a/packages/icons/src/svg/index.ts
+++ b/packages/icons/src/svg/index.ts
@@ -11,6 +11,11 @@ const SvgCardIcon = createIconifyIcon('svg:card');
 const SvgBellIcon = createIconifyIcon('svg:bell');
 const SvgCakeIcon = createIconifyIcon('svg:cake');
 const SvgAntdvLogoIcon = createIconifyIcon('svg:antdv-logo');
+const SvgGithubIcon = createIconifyIcon('svg:github');
+const SvgGoogleIcon = createIconifyIcon('svg:google');
+const SvgQQChatIcon = createIconifyIcon('svg:qqchat');
+const SvgWeChatIcon = createIconifyIcon('svg:wechat');
+const SvgDingDingIcon = createIconifyIcon('svg:dingding');
 
 /** AI */
 const SvgGptIcon = createIconifyIcon('svg:gpt');
@@ -43,10 +48,15 @@ export {
   SvgBellIcon,
   SvgCakeIcon,
   SvgCardIcon,
+  SvgDingDingIcon,
   SvgDownloadIcon,
+  SvgGithubIcon,
+  SvgGoogleIcon,
   SvgGptIcon,
   SvgMockIcon,
+  SvgQQChatIcon,
   SvgWalletIcon,
+  SvgWeChatIcon,
   SvgWxAppIcon,
   SvgWxBarIcon,
   SvgWxLiteIcon,
diff --git a/packages/locales/src/langs/en-US/authentication.json b/packages/locales/src/langs/en-US/authentication.json
index d5ea890b2a841425410e486fa7045255d9a32874..d1fd9b77d8e3599676bfee14975dbcc85870a21d 100644
--- a/packages/locales/src/langs/en-US/authentication.json
+++ b/packages/locales/src/langs/en-US/authentication.json
@@ -56,6 +56,10 @@
   "sendCode": "Get Security code",
   "sendText": "Resend in {0}s",
   "thirdPartyLogin": "Or continue with",
+  "weChat": "WeChat",
+  "qq": "QQ",
+  "gitHub": "GitHub",
+  "google": "Google",
   "loginAgainTitle": "Please Log In Again",
   "loginAgainSubTitle": "Your login session has expired. Please log in again to continue.",
   "layout": {
diff --git a/packages/locales/src/langs/en-US/preferences.json b/packages/locales/src/langs/en-US/preferences.json
index cda24a4cb901426bc9f54eda3b4d86fda70131f6..b2f461ee2beecf3a4716203003a504c70db55626 100644
--- a/packages/locales/src/langs/en-US/preferences.json
+++ b/packages/locales/src/langs/en-US/preferences.json
@@ -37,6 +37,7 @@
   "language": "Language",
   "dynamicTitle": "Dynamic Title",
   "watermark": "Watermark",
+  "watermarkContent": "Please input Watermark content",
   "checkUpdates": "Periodic update check",
   "position": {
     "title": "Preferences Postion",
diff --git a/packages/locales/src/langs/zh-CN/authentication.json b/packages/locales/src/langs/zh-CN/authentication.json
index 9f96dbdd4fc1860511ff5487b3bb3e77baac74cc..1eb61aed6473c9ccbfbed79020fa15cca05dfbbe 100644
--- a/packages/locales/src/langs/zh-CN/authentication.json
+++ b/packages/locales/src/langs/zh-CN/authentication.json
@@ -56,6 +56,10 @@
   "sendCode": "获取验证码",
   "sendText": "{0}秒后重新获取",
   "thirdPartyLogin": "其他登录方式",
+  "weChat": "微信",
+  "qq": "QQ",
+  "gitHub": "GitHub",
+  "google": "Google",
   "loginAgainTitle": "重新登录",
   "loginAgainSubTitle": "您的登录状态已过期，请重新登录以继续。",
   "layout": {
diff --git a/packages/locales/src/langs/zh-CN/preferences.json b/packages/locales/src/langs/zh-CN/preferences.json
index cd9e15bed4f48f946dd5a0aee00f1f759b1d2730..2f6f7f4f5d2a3e922e0486367b3bc109da8863a9 100644
--- a/packages/locales/src/langs/zh-CN/preferences.json
+++ b/packages/locales/src/langs/zh-CN/preferences.json
@@ -37,6 +37,7 @@
   "language": "语言",
   "dynamicTitle": "动态标题",
   "watermark": "水印",
+  "watermarkContent": "请输入水印文案",
   "checkUpdates": "定时检查更新",
   "position": {
     "title": "偏好设置位置",
diff --git a/playground/src/layouts/basic.vue b/playground/src/layouts/basic.vue
index 227ce955d6e6b7b15fc2c4e800e2557489761184..0578765106fc1572f8b019cf64ea8be635260466 100644
--- a/playground/src/layouts/basic.vue
+++ b/playground/src/layouts/basic.vue
@@ -6,7 +6,7 @@ import { computed, onBeforeMount, ref, watch } from 'vue';
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
 import { useWatermark } from '@vben/hooks';
-import { BookOpenText, CircleHelp, MdiGithub } from '@vben/icons';
+import { BookOpenText, CircleHelp, SvgGithubIcon } from '@vben/icons';
 import {
   BasicLayout,
   LockScreen,
@@ -89,7 +89,7 @@ const menus = computed(() => [
         target: '_blank',
       });
     },
-    icon: MdiGithub,
+    icon: SvgGithubIcon,
     text: 'GitHub',
   },
   {
@@ -122,11 +122,16 @@ function handleMakeAll() {
 function handleClickLogo() {}
 
 watch(
-  () => preferences.app.watermark,
-  async (enable) => {
+  () => ({
+    enable: preferences.app.watermark,
+    content: preferences.app.watermarkContent,
+  }),
+  async ({ enable, content }) => {
     if (enable) {
       await updateWatermark({
-        content: `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`,
+        content:
+          content ||
+          `${userStore.userInfo?.username} - ${userStore.userInfo?.realName}`,
       });
     } else {
       destroyWatermark();
diff --git a/playground/src/views/demos/features/icons/index.vue b/playground/src/views/demos/features/icons/index.vue
index 590ff3053056bc0724e157f712ecfb3e94655a84..994c995523a355a22affbcf3bab28e52e608a2f6 100644
--- a/playground/src/views/demos/features/icons/index.vue
+++ b/playground/src/views/demos/features/icons/index.vue
@@ -3,11 +3,7 @@ import { h, ref } from 'vue';
 
 import { IconPicker, Page } from '@vben/common-ui';
 import {
-  MdiGithub,
-  MdiGoogle,
   MdiKeyboardEsc,
-  MdiQqchat,
-  MdiWechat,
   SvgAvatar1Icon,
   SvgAvatar2Icon,
   SvgAvatar3Icon,
@@ -16,6 +12,10 @@ import {
   SvgCakeIcon,
   SvgCardIcon,
   SvgDownloadIcon,
+  SvgGithubIcon,
+  SvgGoogleIcon,
+  SvgQQChatIcon,
+  SvgWeChatIcon,
 } from '@vben/icons';
 
 import { Card, Input } from 'ant-design-vue';
@@ -46,10 +46,10 @@ const inputComponent = h(Input);
 
     <Card class="mb-5" title="Iconify">
       <div class="flex items-center gap-5">
-        <MdiGithub class="size-8" />
-        <MdiGoogle class="size-8 text-red-500" />
-        <MdiQqchat class="size-8 text-green-500" />
-        <MdiWechat class="size-8" />
+        <SvgGithubIcon class="size-8" />
+        <SvgGoogleIcon class="size-8" />
+        <SvgQQChatIcon class="size-8" />
+        <SvgWeChatIcon class="size-8" />
         <MdiKeyboardEsc class="size-8" />
       </div>
     </Card>
diff --git a/playground/src/views/demos/features/watermark/index.vue b/playground/src/views/demos/features/watermark/index.vue
index 77b3f1799705e2482ea83dc9dec4d74dfd79075b..27875fcc2f0abe48db8a098673e1da8b463e51a9 100644
--- a/playground/src/views/demos/features/watermark/index.vue
+++ b/playground/src/views/demos/features/watermark/index.vue
@@ -8,7 +8,7 @@ const { destroyWatermark, updateWatermark, watermark } = useWatermark();
 
 async function recreateWaterMark() {
   destroyWatermark();
-  await updateWatermark({});
+  await createWaterMark();
 }
 
 async function createWaterMark() {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9749837f6701e8e03236d837ed5037006a51b1c2..7d8d5c9622b6fa500bdf12446ddd44d5e28f78a8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,7 +26,7 @@ catalogs:
       version: 19.8.1
     '@eslint/js':
       specifier: ^9.30.1
-      version: 9.35.0
+      version: 9.37.0
     '@faker-js/faker':
       specifier: ^9.9.0
       version: 9.9.0
@@ -35,7 +35,7 @@ catalogs:
       version: 3.2.31
     '@form-create/antd-designer':
       specifier: ^3.3.0
-      version: 3.3.1
+      version: 3.3.2
     '@form-create/designer':
       specifier: ^3.3.0
       version: 3.3.1
@@ -47,7 +47,7 @@ catalogs:
       version: 3.2.31
     '@iconify/json':
       specifier: ^2.2.354
-      version: 2.2.385
+      version: 2.2.394
     '@iconify/tailwind':
       specifier: ^1.2.0
       version: 1.2.0
@@ -62,7 +62,7 @@ catalogs:
       version: 6.0.8
     '@jspm/generator':
       specifier: ^2.6.2
-      version: 2.7.0
+      version: 2.7.2
     '@manypkg/get-packages':
       specifier: ^3.0.0
       version: 3.1.0
@@ -74,7 +74,7 @@ catalogs:
       version: 2.18.2
     '@playwright/test':
       specifier: ^1.53.2
-      version: 1.55.0
+      version: 1.56.0
     '@pnpm/workspace.read-manifest':
       specifier: ^1000.2.0
       version: 1000.2.4
@@ -86,16 +86,16 @@ catalogs:
       version: 0.0.0-insiders.565cd3e
     '@tailwindcss/typography':
       specifier: ^0.5.16
-      version: 0.5.16
+      version: 0.5.19
     '@tanstack/vue-query':
       specifier: ^5.81.5
-      version: 5.89.0
+      version: 5.90.2
     '@tanstack/vue-store':
       specifier: ^0.7.1
-      version: 0.7.5
+      version: 0.7.7
     '@tinyflow-ai/vue':
       specifier: ^1.1.1
-      version: 1.1.3
+      version: 1.1.5
     '@tinymce/tinymce-vue':
       specifier: ^6.1.0
       version: 6.3.0
@@ -134,7 +134,7 @@ catalogs:
       version: 14.1.2
     '@types/node':
       specifier: ^22.16.0
-      version: 22.18.6
+      version: 22.18.9
     '@types/nprogress':
       specifier: ^0.2.3
       version: 0.2.3
@@ -152,10 +152,10 @@ catalogs:
       version: 1.15.8
     '@typescript-eslint/eslint-plugin':
       specifier: ^8.35.1
-      version: 8.44.0
+      version: 8.46.0
     '@typescript-eslint/parser':
       specifier: ^8.35.1
-      version: 8.44.0
+      version: 8.46.0
     '@vee-validate/zod':
       specifier: ^4.15.1
       version: 4.15.1
@@ -170,7 +170,7 @@ catalogs:
       version: 5.1.1
     '@vue/shared':
       specifier: ^3.5.17
-      version: 3.5.21
+      version: 3.5.22
     '@vue/test-utils':
       specifier: ^2.4.6
       version: 2.4.6
@@ -227,7 +227,7 @@ catalogs:
       version: 0.7.1
     commitlint-plugin-function-rules:
       specifier: ^4.0.2
-      version: 4.0.2
+      version: 4.1.0
     consola:
       specifier: ^3.4.2
       version: 3.4.2
@@ -272,13 +272,13 @@ catalogs:
       version: 5.6.0
     element-plus:
       specifier: ^2.10.2
-      version: 2.11.2
+      version: 2.11.4
     eslint:
       specifier: ^9.30.1
-      version: 9.35.0
+      version: 9.37.0
     eslint-config-turbo:
       specifier: ^2.5.4
-      version: 2.5.6
+      version: 2.5.8
     eslint-plugin-command:
       specifier: ^3.3.1
       version: 3.3.1
@@ -293,16 +293,16 @@ catalogs:
       version: 50.8.0
     eslint-plugin-jsonc:
       specifier: ^2.20.1
-      version: 2.20.1
+      version: 2.21.0
     eslint-plugin-n:
       specifier: ^17.20.0
-      version: 17.23.0
+      version: 17.23.1
     eslint-plugin-no-only-tests:
       specifier: ^3.3.0
       version: 3.3.0
     eslint-plugin-perfectionist:
       specifier: ^4.15.0
-      version: 4.15.0
+      version: 4.15.1
     eslint-plugin-prettier:
       specifier: ^5.5.1
       version: 5.5.4
@@ -320,7 +320,7 @@ catalogs:
       version: 0.5.4
     eslint-plugin-vue:
       specifier: ^10.2.0
-      version: 10.4.0
+      version: 10.5.0
     execa:
       specifier: ^9.6.0
       version: 9.6.0
@@ -359,13 +359,13 @@ catalogs:
       version: 1.0.0
     jsonc-eslint-parser:
       specifier: ^2.4.0
-      version: 2.4.0
+      version: 2.4.1
     jsonwebtoken:
       specifier: ^9.0.2
       version: 9.0.2
     lefthook:
       specifier: ^1.11.14
-      version: 1.13.1
+      version: 1.13.6
     lodash.clonedeep:
       specifier: ^4.5.0
       version: 4.5.0
@@ -407,7 +407,7 @@ catalogs:
       version: 2.43.1
     nitropack:
       specifier: ^2.11.13
-      version: 2.12.6
+      version: 2.12.7
     nprogress:
       specifier: ^0.2.0
       version: 0.2.0
@@ -422,7 +422,7 @@ catalogs:
       version: 2.3.0
     playwright:
       specifier: ^1.53.2
-      version: 1.55.0
+      version: 1.56.0
     postcss:
       specifier: ^8.5.6
       version: 8.5.6
@@ -437,7 +437,7 @@ catalogs:
       version: 16.1.1
     postcss-preset-env:
       specifier: ^10.2.4
-      version: 10.3.1
+      version: 10.4.0
     postcss-scss:
       specifier: ^4.0.9
       version: 4.0.9
@@ -449,7 +449,7 @@ catalogs:
       version: 0.6.14
     publint:
       specifier: ^0.3.12
-      version: 0.3.13
+      version: 0.3.14
     qrcode:
       specifier: ^1.5.4
       version: 1.5.4
@@ -467,13 +467,13 @@ catalogs:
       version: 6.0.1
     rollup:
       specifier: ^4.44.1
-      version: 4.50.2
+      version: 4.52.4
     rollup-plugin-visualizer:
       specifier: ^5.14.0
       version: 5.14.0
     sass:
       specifier: ^1.89.2
-      version: 1.92.1
+      version: 1.93.2
     secure-ls:
       specifier: ^2.0.0
       version: 2.0.0
@@ -485,7 +485,7 @@ catalogs:
       version: 0.1.0
     stylelint:
       specifier: ^16.21.0
-      version: 16.24.0
+      version: 16.25.0
     stylelint-config-recess-order:
       specifier: ^6.1.0
       version: 6.1.0
@@ -515,7 +515,7 @@ catalogs:
       version: 2.6.0
     tailwindcss:
       specifier: ^3.4.17
-      version: 3.4.17
+      version: 3.4.18
     tailwindcss-animate:
       specifier: ^1.0.7
       version: 1.0.7
@@ -530,10 +530,10 @@ catalogs:
       version: 6.3.7
     turbo:
       specifier: ^2.5.4
-      version: 2.5.6
+      version: 2.5.8
     typescript:
       specifier: ^5.8.3
-      version: 5.9.2
+      version: 5.9.3
     unbuild:
       specifier: ^3.6.1
       version: 3.6.1
@@ -544,8 +544,8 @@ catalogs:
       specifier: ^4.15.1
       version: 4.15.1
     vite:
-      specifier: ^5.4.10
-      version: 5.4.20
+      specifier: ^7.1.2
+      version: 7.1.9
     vite-plugin-compression:
       specifier: ^0.5.1
       version: 0.5.1
@@ -602,10 +602,10 @@ catalogs:
       version: 4.1.0
     vxe-pc-ui:
       specifier: ^4.9.29
-      version: 4.9.32
+      version: 4.9.42
     vxe-table:
       specifier: ^4.16.11
-      version: 4.16.14
+      version: 4.16.21
     watermark-js-plus:
       specifier: ^1.6.2
       version: 1.6.3
@@ -630,16 +630,16 @@ importers:
     devDependencies:
       '@changesets/changelog-github':
         specifier: 'catalog:'
-        version: 0.5.1(encoding@0.1.13)
+        version: 0.5.1
       '@changesets/cli':
         specifier: 'catalog:'
-        version: 2.29.7(@types/node@22.18.6)
+        version: 2.29.7(@types/node@22.18.9)
       '@playwright/test':
         specifier: 'catalog:'
-        version: 1.55.0
+        version: 1.56.0
       '@types/node':
         specifier: 'catalog:'
-        version: 22.18.6
+        version: 22.18.9
       '@vben/commitlint-config':
         specifier: workspace:*
         version: link:internal/lint-configs/commitlint-config
@@ -669,10 +669,10 @@ importers:
         version: link:scripts/vsh
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.1(vite@5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 6.0.1(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
       '@vitejs/plugin-vue-jsx':
         specifier: 'catalog:'
-        version: 5.1.1(vite@5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.1(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
       '@vue/test-utils':
         specifier: 'catalog:'
         version: 2.4.6
@@ -693,37 +693,37 @@ importers:
         version: 4.1.0
       lefthook:
         specifier: 'catalog:'
-        version: 1.13.1
+        version: 1.13.6
       playwright:
         specifier: 'catalog:'
-        version: 1.55.0
+        version: 1.56.0
       rimraf:
         specifier: 'catalog:'
         version: 6.0.1
       tailwindcss:
         specifier: 'catalog:'
-        version: 3.4.17
+        version: 3.4.18(yaml@2.8.1)
       turbo:
         specifier: 'catalog:'
-        version: 2.5.6
+        version: 2.5.8
       typescript:
         specifier: 'catalog:'
-        version: 5.9.2
+        version: 5.9.3
       unbuild:
         specifier: 'catalog:'
-        version: 3.6.1(sass@1.92.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))
+        version: 3.6.1(sass@1.93.2)(typescript@5.9.3)(vue-tsc@2.2.10(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))
       vite:
         specifier: 'catalog:'
-        version: 5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+        version: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       vitest:
         specifier: 'catalog:'
-        version: 3.2.4(@types/node@22.18.6)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+        version: 3.2.4(@types/node@22.18.9)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-tsc:
         specifier: 'catalog:'
-        version: 2.2.10(typescript@5.9.2)
+        version: 2.2.10(typescript@5.9.3)
 
   apps/backend-mock:
     dependencies:
@@ -735,7 +735,7 @@ importers:
         version: 9.0.2
       nitropack:
         specifier: 'catalog:'
-        version: 2.12.6(encoding@0.1.13)
+        version: 2.12.7
     devDependencies:
       '@types/jsonwebtoken':
         specifier: 'catalog:'
@@ -748,13 +748,13 @@ importers:
     dependencies:
       '@form-create/ant-design-vue':
         specifier: 'catalog:'
-        version: 3.2.31(vue@3.5.21(typescript@5.9.2))
+        version: 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/antd-designer':
         specifier: 'catalog:'
-        version: 3.3.1(vue@3.5.21(typescript@5.9.2))
+        version: 3.3.2(vue@3.5.22(typescript@5.9.3))
       '@tinymce/tinymce-vue':
         specifier: 'catalog:'
-        version: 6.3.0(tinymce@7.9.1)(vue@3.5.21(typescript@5.9.2))
+        version: 6.3.0(tinymce@7.9.1)(vue@3.5.22(typescript@5.9.3))
       '@vben/access':
         specifier: workspace:*
         version: link:../../packages/effects/access
@@ -799,13 +799,13 @@ importers:
         version: link:../../packages/utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       '@vueuse/integrations':
         specifier: 'catalog:'
-        version: 13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.22(typescript@5.9.3))
       ant-design-vue:
         specifier: 'catalog:'
-        version: 4.2.6(vue@3.5.21(typescript@5.9.2))
+        version: 4.2.6(vue@3.5.22(typescript@5.9.3))
       bpmn-js:
         specifier: 'catalog:'
         version: 17.11.1
@@ -838,7 +838,7 @@ importers:
         version: 4.2.3
       pinia:
         specifier: ^3.0.3
-        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
       steady-xml:
         specifier: 'catalog:'
         version: 0.1.0
@@ -847,28 +847,28 @@ importers:
         version: 7.9.1
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-dompurify-html:
         specifier: 'catalog:'
-        version: 5.3.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.3.0(vue@3.5.22(typescript@5.9.3))
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
       vue3-signature:
         specifier: 'catalog:'
-        version: 0.2.4(vue@3.5.21(typescript@5.9.2))
+        version: 0.2.4(vue@3.5.22(typescript@5.9.3))
 
   apps/web-ele:
     dependencies:
       '@form-create/designer':
         specifier: 'catalog:'
-        version: 3.3.1(vue@3.5.21(typescript@5.9.2))
+        version: 3.3.1(vue@3.5.22(typescript@5.9.3))
       '@form-create/element-ui':
         specifier: 'catalog:'
-        version: 3.2.31(vue@3.5.21(typescript@5.9.2))
+        version: 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@tinymce/tinymce-vue':
         specifier: 'catalog:'
-        version: 6.3.0(tinymce@7.9.1)(vue@3.5.21(typescript@5.9.2))
+        version: 6.3.0(tinymce@7.9.1)(vue@3.5.22(typescript@5.9.3))
       '@vben/access':
         specifier: workspace:*
         version: link:../../packages/effects/access
@@ -913,7 +913,7 @@ importers:
         version: link:../../packages/utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       cropperjs:
         specifier: 'catalog:'
         version: 1.6.2
@@ -922,28 +922,28 @@ importers:
         version: 1.11.18
       element-plus:
         specifier: 'catalog:'
-        version: 2.11.2(vue@3.5.21(typescript@5.9.2))
+        version: 2.11.4(vue@3.5.22(typescript@5.9.3))
       highlight.js:
         specifier: 'catalog:'
         version: 11.11.1
       pinia:
         specifier: ^3.0.3
-        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
       tinymce:
         specifier: 'catalog:'
         version: 7.9.1
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-dompurify-html:
         specifier: 'catalog:'
-        version: 5.3.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.3.0(vue@3.5.22(typescript@5.9.3))
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
       vuedraggable:
         specifier: 'catalog:'
-        version: 4.1.0(vue@3.5.21(typescript@5.9.2))
+        version: 4.1.0(vue@3.5.22(typescript@5.9.3))
     devDependencies:
       unplugin-element-plus:
         specifier: 'catalog:'
@@ -953,10 +953,10 @@ importers:
     dependencies:
       '@form-create/antd-designer':
         specifier: 'catalog:'
-        version: 3.3.1(vue@3.5.21(typescript@5.9.2))
+        version: 3.3.2(vue@3.5.22(typescript@5.9.3))
       '@form-create/naive-ui':
         specifier: 'catalog:'
-        version: 3.2.31(vue@3.5.21(typescript@5.9.2))
+        version: 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@vben/access':
         specifier: workspace:*
         version: link:../../packages/effects/access
@@ -1001,7 +1001,7 @@ importers:
         version: link:../../packages/utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       cropperjs:
         specifier: 'catalog:'
         version: 1.6.2
@@ -1013,16 +1013,16 @@ importers:
         version: 11.11.1
       naive-ui:
         specifier: 'catalog:'
-        version: 2.43.1(vue@3.5.21(typescript@5.9.2))
+        version: 2.43.1(vue@3.5.22(typescript@5.9.3))
       pinia:
         specifier: ^3.0.3
-        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   docs:
     dependencies:
@@ -1043,41 +1043,41 @@ importers:
         version: link:../packages/styles
       ant-design-vue:
         specifier: 'catalog:'
-        version: 4.2.6(vue@3.5.21(typescript@5.9.2))
+        version: 4.2.6(vue@3.5.22(typescript@5.9.3))
       lucide-vue-next:
         specifier: 'catalog:'
-        version: 0.507.0(vue@3.5.21(typescript@5.9.2))
+        version: 0.507.0(vue@3.5.22(typescript@5.9.3))
       medium-zoom:
         specifier: 'catalog:'
         version: 1.1.0
       radix-vue:
         specifier: 'catalog:'
-        version: 1.9.17(vue@3.5.21(typescript@5.9.2))
+        version: 1.9.17(vue@3.5.22(typescript@5.9.3))
       vitepress-plugin-group-icons:
         specifier: 'catalog:'
-        version: 1.6.3(markdown-it@14.1.0)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
+        version: 1.6.3(markdown-it@14.1.0)(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))
     devDependencies:
       '@nolebase/vitepress-plugin-git-changelog':
         specifier: 'catalog:'
-        version: 2.18.2(vitepress@1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))
+        version: 2.18.2(vitepress@1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))
       '@vben/vite-config':
         specifier: workspace:*
         version: link:../internal/vite-config
       '@vite-pwa/vitepress':
         specifier: 'catalog:'
-        version: 1.0.0(vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
+        version: 1.0.0(vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
       vitepress:
         specifier: 'catalog:'
-        version: 1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2)
+        version: 1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3)
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   internal/lint-configs/commitlint-config:
     dependencies:
       '@commitlint/cli':
         specifier: 'catalog:'
-        version: 19.8.1(@types/node@24.5.2)(typescript@5.9.2)
+        version: 19.8.1(@types/node@24.7.1)(typescript@5.9.3)
       '@commitlint/config-conventional':
         specifier: 'catalog:'
         version: 19.8.1
@@ -1086,7 +1086,7 @@ importers:
         version: link:../../node-utils
       commitlint-plugin-function-rules:
         specifier: 'catalog:'
-        version: 4.0.2(@commitlint/lint@19.8.1)
+        version: 4.1.0(@commitlint/lint@19.8.1)
       cz-git:
         specifier: 'catalog:'
         version: 1.12.0
@@ -1098,74 +1098,74 @@ importers:
     dependencies:
       eslint-config-turbo:
         specifier: 'catalog:'
-        version: 2.5.6(eslint@9.35.0(jiti@2.5.1))(turbo@2.5.6)
+        version: 2.5.8(eslint@9.37.0(jiti@2.6.1))(turbo@2.5.8)
       eslint-plugin-command:
         specifier: 'catalog:'
-        version: 3.3.1(eslint@9.35.0(jiti@2.5.1))
+        version: 3.3.1(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-import-x:
         specifier: 'catalog:'
-        version: 4.16.1(@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))
+        version: 4.16.1(@typescript-eslint/utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))
     devDependencies:
       '@eslint/js':
         specifier: 'catalog:'
-        version: 9.35.0
+        version: 9.37.0
       '@types/eslint':
         specifier: 'catalog:'
         version: 9.6.1
       '@typescript-eslint/eslint-plugin':
         specifier: 'catalog:'
-        version: 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+        version: 8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       '@typescript-eslint/parser':
         specifier: 'catalog:'
-        version: 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+        version: 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       eslint:
         specifier: 'catalog:'
-        version: 9.35.0(jiti@2.5.1)
+        version: 9.37.0(jiti@2.6.1)
       eslint-plugin-eslint-comments:
         specifier: 'catalog:'
-        version: 3.2.0(eslint@9.35.0(jiti@2.5.1))
+        version: 3.2.0(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-jsdoc:
         specifier: 'catalog:'
-        version: 50.8.0(eslint@9.35.0(jiti@2.5.1))
+        version: 50.8.0(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-jsonc:
         specifier: 'catalog:'
-        version: 2.20.1(eslint@9.35.0(jiti@2.5.1))
+        version: 2.21.0(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-n:
         specifier: 'catalog:'
-        version: 17.23.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+        version: 17.23.1(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       eslint-plugin-no-only-tests:
         specifier: 'catalog:'
         version: 3.3.0
       eslint-plugin-perfectionist:
         specifier: 'catalog:'
-        version: 4.15.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+        version: 4.15.1(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       eslint-plugin-prettier:
         specifier: 'catalog:'
-        version: 5.5.4(@types/eslint@9.6.1)(eslint@9.35.0(jiti@2.5.1))(prettier@3.6.2)
+        version: 5.5.4(@types/eslint@9.6.1)(eslint@9.37.0(jiti@2.6.1))(prettier@3.6.2)
       eslint-plugin-regexp:
         specifier: 'catalog:'
-        version: 2.10.0(eslint@9.35.0(jiti@2.5.1))
+        version: 2.10.0(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-unicorn:
         specifier: 'catalog:'
-        version: 59.0.1(eslint@9.35.0(jiti@2.5.1))
+        version: 59.0.1(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-unused-imports:
         specifier: 'catalog:'
-        version: 4.2.0(@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))
+        version: 4.2.0(@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))
       eslint-plugin-vitest:
         specifier: 'catalog:'
-        version: 0.5.4(@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)(vitest@3.2.4(@types/node@24.5.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1))
+        version: 0.5.4(@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.1)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       eslint-plugin-vue:
         specifier: 'catalog:'
-        version: 10.4.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(vue-eslint-parser@10.2.0(eslint@9.35.0(jiti@2.5.1)))
+        version: 10.5.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(vue-eslint-parser@10.2.0(eslint@9.37.0(jiti@2.6.1)))
       globals:
         specifier: 'catalog:'
         version: 16.4.0
       jsonc-eslint-parser:
         specifier: 'catalog:'
-        version: 2.4.0
+        version: 2.4.1
       vue-eslint-parser:
         specifier: 'catalog:'
-        version: 10.2.0(eslint@9.35.0(jiti@2.5.1))
+        version: 10.2.0(eslint@9.37.0(jiti@2.6.1))
 
   internal/lint-configs/prettier-config:
     dependencies:
@@ -1180,13 +1180,13 @@ importers:
     dependencies:
       '@stylistic/stylelint-plugin':
         specifier: 'catalog:'
-        version: 3.1.3(stylelint@16.24.0(typescript@5.9.2))
+        version: 3.1.3(stylelint@16.25.0(typescript@5.9.3))
       stylelint-config-recess-order:
         specifier: 'catalog:'
-        version: 6.1.0(stylelint@16.24.0(typescript@5.9.2))
+        version: 6.1.0(stylelint@16.25.0(typescript@5.9.3))
       stylelint-scss:
         specifier: 'catalog:'
-        version: 6.12.1(stylelint@16.24.0(typescript@5.9.2))
+        version: 6.12.1(stylelint@16.25.0(typescript@5.9.3))
     devDependencies:
       postcss:
         specifier: 'catalog:'
@@ -1202,25 +1202,25 @@ importers:
         version: 3.6.2
       stylelint:
         specifier: 'catalog:'
-        version: 16.24.0(typescript@5.9.2)
+        version: 16.25.0(typescript@5.9.3)
       stylelint-config-recommended:
         specifier: 'catalog:'
-        version: 16.0.0(stylelint@16.24.0(typescript@5.9.2))
+        version: 16.0.0(stylelint@16.25.0(typescript@5.9.3))
       stylelint-config-recommended-scss:
         specifier: 'catalog:'
-        version: 14.1.0(postcss@8.5.6)(stylelint@16.24.0(typescript@5.9.2))
+        version: 14.1.0(postcss@8.5.6)(stylelint@16.25.0(typescript@5.9.3))
       stylelint-config-recommended-vue:
         specifier: 'catalog:'
-        version: 1.6.1(postcss-html@1.8.0)(stylelint@16.24.0(typescript@5.9.2))
+        version: 1.6.1(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3))
       stylelint-config-standard:
         specifier: 'catalog:'
-        version: 38.0.0(stylelint@16.24.0(typescript@5.9.2))
+        version: 38.0.0(stylelint@16.25.0(typescript@5.9.3))
       stylelint-order:
         specifier: 'catalog:'
-        version: 7.0.0(stylelint@16.24.0(typescript@5.9.2))
+        version: 7.0.0(stylelint@16.25.0(typescript@5.9.3))
       stylelint-prettier:
         specifier: 'catalog:'
-        version: 5.0.3(prettier@3.6.2)(stylelint@16.24.0(typescript@5.9.2))
+        version: 5.0.3(prettier@3.6.2)(stylelint@16.25.0(typescript@5.9.3))
 
   internal/node-utils:
     dependencies:
@@ -1262,7 +1262,7 @@ importers:
     dependencies:
       '@iconify/json':
         specifier: 'catalog:'
-        version: 2.2.385
+        version: 2.2.394
       '@iconify/tailwind':
         specifier: 'catalog:'
         version: 1.2.0
@@ -1274,7 +1274,7 @@ importers:
         version: 0.0.0-insiders.565cd3e(postcss@8.5.6)
       '@tailwindcss/typography':
         specifier: 'catalog:'
-        version: 0.5.16(tailwindcss@3.4.17)
+        version: 0.5.19(tailwindcss@3.4.18(yaml@2.8.1))
       autoprefixer:
         specifier: 'catalog:'
         version: 10.4.21(postcss@8.5.6)
@@ -1292,13 +1292,13 @@ importers:
         version: 16.1.1(postcss@8.5.6)
       postcss-preset-env:
         specifier: 'catalog:'
-        version: 10.3.1(postcss@8.5.6)
+        version: 10.4.0(postcss@8.5.6)
       tailwindcss:
         specifier: 'catalog:'
-        version: 3.4.17
+        version: 3.4.18(yaml@2.8.1)
       tailwindcss-animate:
         specifier: 'catalog:'
-        version: 1.0.7(tailwindcss@3.4.17)
+        version: 1.0.7(tailwindcss@3.4.18(yaml@2.8.1))
     devDependencies:
       '@types/postcss-import':
         specifier: 'catalog:'
@@ -1311,16 +1311,16 @@ importers:
         version: link:../../packages/types
       vite:
         specifier: 'catalog:'
-        version: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+        version: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
 
   internal/vite-config:
     dependencies:
       '@intlify/unplugin-vue-i18n':
         specifier: 'catalog:'
-        version: 6.0.8(@vue/compiler-dom@3.5.21)(eslint@9.35.0(jiti@2.5.1))(rollup@4.50.2)(typescript@5.9.2)(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
+        version: 6.0.8(@vue/compiler-dom@3.5.22)(eslint@9.37.0(jiti@2.6.1))(rollup@4.52.4)(typescript@5.9.3)(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))
       '@jspm/generator':
         specifier: 'catalog:'
-        version: 2.7.0
+        version: 2.7.2
       archiver:
         specifier: 'catalog:'
         version: 7.0.1
@@ -1335,16 +1335,16 @@ importers:
         version: 7.2.0
       nitropack:
         specifier: 'catalog:'
-        version: 2.12.6(encoding@0.1.13)
+        version: 2.12.7
       resolve.exports:
         specifier: 'catalog:'
         version: 2.0.3
       vite-plugin-pwa:
         specifier: 'catalog:'
-        version: 1.0.3(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+        version: 1.0.3(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0)
       vite-plugin-vue-devtools:
         specifier: 'catalog:'
-        version: 7.7.7(rollup@4.50.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 7.7.7(rollup@4.52.4)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
     devDependencies:
       '@pnpm/workspace.read-manifest':
         specifier: 'catalog:'
@@ -1360,10 +1360,10 @@ importers:
         version: link:../node-utils
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 6.0.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
       '@vitejs/plugin-vue-jsx':
         specifier: 'catalog:'
-        version: 5.1.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+        version: 5.1.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
       dayjs:
         specifier: 'catalog:'
         version: 1.11.18
@@ -1372,25 +1372,25 @@ importers:
         version: 16.6.1
       rollup:
         specifier: 'catalog:'
-        version: 4.50.2
+        version: 4.52.4
       rollup-plugin-visualizer:
         specifier: 'catalog:'
-        version: 5.14.0(rollup@4.50.2)
+        version: 5.14.0(rollup@4.52.4)
       sass:
         specifier: 'catalog:'
-        version: 1.92.1
+        version: 1.93.2
       vite:
         specifier: 'catalog:'
-        version: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+        version: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       vite-plugin-compression:
         specifier: 'catalog:'
-        version: 0.5.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
+        version: 0.5.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       vite-plugin-dts:
         specifier: 'catalog:'
-        version: 4.5.4(@types/node@24.5.2)(rollup@4.50.2)(typescript@5.9.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
+        version: 4.5.4(@types/node@24.7.1)(rollup@4.52.4)(typescript@5.9.3)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       vite-plugin-html:
         specifier: 'catalog:'
-        version: 3.2.2(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
+        version: 3.2.2(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       vite-plugin-lazy-import:
         specifier: 'catalog:'
         version: 1.0.7
@@ -1401,13 +1401,13 @@ importers:
     dependencies:
       '@iconify/vue':
         specifier: 'catalog:'
-        version: 5.0.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.0.0(vue@3.5.22(typescript@5.9.3))
       lucide-vue-next:
         specifier: 'catalog:'
-        version: 0.507.0(vue@3.5.21(typescript@5.9.2))
+        version: 0.507.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/base/shared:
     dependencies:
@@ -1416,10 +1416,10 @@ importers:
         version: 4.2.0
       '@tanstack/vue-store':
         specifier: 'catalog:'
-        version: 0.7.5(vue@3.5.21(typescript@5.9.2))
+        version: 0.7.7(vue@3.5.22(typescript@5.9.3))
       '@vue/shared':
         specifier: 'catalog:'
-        version: 3.5.21
+        version: 3.5.22
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -1480,10 +1480,10 @@ importers:
     dependencies:
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   packages/@core/composables:
     dependencies:
@@ -1492,16 +1492,16 @@ importers:
         version: link:../base/shared
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       radix-vue:
         specifier: 'catalog:'
-        version: 1.9.17(vue@3.5.21(typescript@5.9.2))
+        version: 1.9.17(vue@3.5.22(typescript@5.9.3))
       sortablejs:
         specifier: 'catalog:'
         version: 1.15.6
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
     devDependencies:
       '@types/sortablejs':
         specifier: 'catalog:'
@@ -1517,10 +1517,10 @@ importers:
         version: link:../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/ui-kit/form-ui:
     dependencies:
@@ -1541,16 +1541,16 @@ importers:
         version: link:../../base/typings
       '@vee-validate/zod':
         specifier: 'catalog:'
-        version: 4.15.1(vue@3.5.21(typescript@5.9.2))(zod@3.25.76)
+        version: 4.15.1(vue@3.5.22(typescript@5.9.3))(zod@3.25.76)
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vee-validate:
         specifier: 'catalog:'
-        version: 4.15.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.15.1(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       zod:
         specifier: 'catalog:'
         version: 3.25.76
@@ -1577,10 +1577,10 @@ importers:
         version: link:../../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/ui-kit/menu-ui:
     dependencies:
@@ -1601,10 +1601,10 @@ importers:
         version: link:../../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/ui-kit/popup-ui:
     dependencies:
@@ -1625,10 +1625,10 @@ importers:
         version: link:../../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/ui-kit/shadcn-ui:
     dependencies:
@@ -1646,22 +1646,22 @@ importers:
         version: link:../../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       class-variance-authority:
         specifier: 'catalog:'
         version: 0.7.1
       lucide-vue-next:
         specifier: 'catalog:'
-        version: 0.507.0(vue@3.5.21(typescript@5.9.2))
+        version: 0.507.0(vue@3.5.22(typescript@5.9.3))
       radix-vue:
         specifier: 'catalog:'
-        version: 1.9.17(vue@3.5.21(typescript@5.9.2))
+        version: 1.9.17(vue@3.5.22(typescript@5.9.3))
       vee-validate:
         specifier: 'catalog:'
-        version: 4.15.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.15.1(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/@core/ui-kit/tabs-ui:
     dependencies:
@@ -1679,10 +1679,10 @@ importers:
         version: link:../../base/typings
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/constants:
     dependencies:
@@ -1706,7 +1706,7 @@ importers:
         version: link:../../utils
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
 
   packages/effects/common-ui:
     dependencies:
@@ -1742,10 +1742,10 @@ importers:
         version: link:../../types
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       '@vueuse/integrations':
         specifier: 'catalog:'
-        version: 13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.22(typescript@5.9.3))
       json-bigint:
         specifier: 'catalog:'
         version: 1.0.0
@@ -1757,16 +1757,16 @@ importers:
         version: 6.3.7
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-json-viewer:
         specifier: 'catalog:'
-        version: 3.0.4(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.4(vue@3.5.22(typescript@5.9.3))
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
       vue-tippy:
         specifier: 'catalog:'
-        version: 6.7.1(vue@3.5.21(typescript@5.9.2))
+        version: 6.7.1(vue@3.5.22(typescript@5.9.3))
     devDependencies:
       '@types/qrcode':
         specifier: 'catalog:'
@@ -1791,13 +1791,13 @@ importers:
         version: link:../../utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
       watermark-js-plus:
         specifier: 'catalog:'
         version: 1.6.3
@@ -1854,19 +1854,19 @@ importers:
         version: link:../../utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   packages/effects/plugins:
     dependencies:
       '@tinyflow-ai/vue':
         specifier: 'catalog:'
-        version: 1.1.3(svelte@5.39.2)(vue@3.5.21(typescript@5.9.2))
+        version: 1.1.5(svelte@5.39.11)(vue@3.5.22(typescript@5.9.3))
       '@vben-core/form-ui':
         specifier: workspace:*
         version: link:../../@core/ui-kit/form-ui
@@ -1896,10 +1896,10 @@ importers:
         version: link:../../utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       '@vueuse/motion':
         specifier: 'catalog:'
-        version: 3.0.3(magicast@0.3.5)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(magicast@0.3.5)(vue@3.5.22(typescript@5.9.3))
       echarts:
         specifier: 'catalog:'
         version: 5.6.0
@@ -1920,13 +1920,13 @@ importers:
         version: 0.16.0(markmap-common@0.16.0)
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vxe-pc-ui:
         specifier: 'catalog:'
-        version: 4.9.32(vue@3.5.21(typescript@5.9.2))
+        version: 4.9.42(vue@3.5.22(typescript@5.9.3))
       vxe-table:
         specifier: 'catalog:'
-        version: 4.16.14(vue@3.5.21(typescript@5.9.2))
+        version: 4.16.21(vue@3.5.22(typescript@5.9.3))
     devDependencies:
       '@types/markdown-it':
         specifier: 'catalog:'
@@ -1973,10 +1973,10 @@ importers:
         version: link:../@core/composables
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-i18n:
         specifier: 'catalog:'
-        version: 11.1.12(vue@3.5.21(typescript@5.9.2))
+        version: 11.1.12(vue@3.5.22(typescript@5.9.3))
 
   packages/preferences:
     dependencies:
@@ -2000,19 +2000,19 @@ importers:
         version: link:../@core/base/typings
       pinia:
         specifier: ^3.0.3
-        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
       pinia-plugin-persistedstate:
         specifier: 'catalog:'
-        version: 4.5.0(@nuxt/kit@3.19.2(magicast@0.3.5))(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)))
+        version: 4.5.0(@nuxt/kit@3.19.3(magicast@0.3.5))(pinia@3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3)))
       secure-ls:
         specifier: 'catalog:'
         version: 2.0.0
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   packages/styles:
     dependencies:
@@ -2027,10 +2027,10 @@ importers:
         version: link:../@core/base/typings
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   packages/utils:
     dependencies:
@@ -2042,13 +2042,13 @@ importers:
         version: link:../@core/base/typings
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
 
   playground:
     dependencies:
       '@tanstack/vue-query':
         specifier: 'catalog:'
-        version: 5.89.0(vue@3.5.21(typescript@5.9.2))
+        version: 5.90.2(vue@3.5.22(typescript@5.9.3))
       '@vben-core/menu-ui':
         specifier: workspace:*
         version: link:../packages/@core/ui-kit/menu-ui
@@ -2096,10 +2096,10 @@ importers:
         version: link:../packages/utils
       '@vueuse/core':
         specifier: 'catalog:'
-        version: 13.9.0(vue@3.5.21(typescript@5.9.2))
+        version: 13.9.0(vue@3.5.22(typescript@5.9.3))
       ant-design-vue:
         specifier: 'catalog:'
-        version: 4.2.6(vue@3.5.21(typescript@5.9.2))
+        version: 4.2.6(vue@3.5.22(typescript@5.9.3))
       dayjs:
         specifier: 'catalog:'
         version: 1.11.18
@@ -2108,13 +2108,13 @@ importers:
         version: 1.0.0
       pinia:
         specifier: ^3.0.3
-        version: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+        version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
       vue:
         specifier: ^3.5.17
-        version: 3.5.21(typescript@5.9.2)
+        version: 3.5.22(typescript@5.9.3)
       vue-router:
         specifier: 'catalog:'
-        version: 4.5.1(vue@3.5.21(typescript@5.9.2))
+        version: 4.5.1(vue@3.5.22(typescript@5.9.3))
     devDependencies:
       '@types/json-bigint':
         specifier: 'catalog:'
@@ -2148,12 +2148,12 @@ importers:
         version: 1.4.7
       publint:
         specifier: 'catalog:'
-        version: 0.3.13
+        version: 0.3.14
 
 packages:
 
-  '@algolia/abtesting@1.3.0':
-    resolution: {integrity: sha512-KqPVLdVNfoJzX5BKNGM9bsW8saHeyax8kmPFXul5gejrSPN3qss7PgsFH5mMem7oR8tvjvNkia97ljEYPYCN8Q==}
+  '@algolia/abtesting@1.6.0':
+    resolution: {integrity: sha512-c4M/Z/KWkEG+RHpZsWKDTTlApXu3fe4vlABNcpankWBhdMe4oPZ/r4JxEr2zKUP6K+BT66tnp8UbHmgOd/vvqQ==}
     engines: {node: '>= 14.0.0'}
 
   '@algolia/autocomplete-core@1.17.7':
@@ -2176,56 +2176,56 @@ packages:
       '@algolia/client-search': '>= 4.9.1 < 6'
       algoliasearch: '>= 4.9.1 < 6'
 
-  '@algolia/client-abtesting@5.37.0':
-    resolution: {integrity: sha512-Dp2Zq+x9qQFnuiQhVe91EeaaPxWBhzwQ6QnznZQnH9C1/ei3dvtmAFfFeaTxM6FzfJXDLvVnaQagTYFTQz3R5g==}
+  '@algolia/client-abtesting@5.40.0':
+    resolution: {integrity: sha512-qegVlgHtmiS8m9nEsuKUVhlw1FHsIshtt5nhNnA6EYz3g+tm9+xkVZZMzkrMLPP7kpoheHJZAwz2MYnHtwFa9A==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-analytics@5.37.0':
-    resolution: {integrity: sha512-wyXODDOluKogTuZxRII6mtqhAq4+qUR3zIUJEKTiHLe8HMZFxfUEI4NO2qSu04noXZHbv/sRVdQQqzKh12SZuQ==}
+  '@algolia/client-analytics@5.40.0':
+    resolution: {integrity: sha512-Dw2c+6KGkw7mucnnxPyyMsIGEY8+hqv6oB+viYB612OMM3l8aNaWToBZMnNvXsyP+fArwq7XGR+k3boPZyV53A==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-common@5.37.0':
-    resolution: {integrity: sha512-GylIFlPvLy9OMgFG8JkonIagv3zF+Dx3H401Uo2KpmfMVBBJiGfAb9oYfXtplpRMZnZPxF5FnkWaI/NpVJMC+g==}
+  '@algolia/client-common@5.40.0':
+    resolution: {integrity: sha512-dbE4+MJIDsTghG3hUYWBq7THhaAmqNqvW9g2vzwPf5edU4IRmuYpKtY3MMotes8/wdTasWG07XoaVhplJBlvdg==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-insights@5.37.0':
-    resolution: {integrity: sha512-T63afO2O69XHKw2+F7mfRoIbmXWGzgpZxgOFAdP3fR4laid7pWBt20P4eJ+Zn23wXS5kC9P2K7Bo3+rVjqnYiw==}
+  '@algolia/client-insights@5.40.0':
+    resolution: {integrity: sha512-SH6zlROyGUCDDWg71DlCnbbZ/zEHYPZC8k901EAaBVhvY43Ju8Wa6LAcMPC4tahcDBgkG2poBy8nJZXvwEWAlQ==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-personalization@5.37.0':
-    resolution: {integrity: sha512-1zOIXM98O9zD8bYDCJiUJRC/qNUydGHK/zRK+WbLXrW1SqLFRXECsKZa5KoG166+o5q5upk96qguOtE8FTXDWQ==}
+  '@algolia/client-personalization@5.40.0':
+    resolution: {integrity: sha512-EgHjJEEf7CbUL9gJHI1ULmAtAFeym2cFNSAi1uwHelWgLPcnLjYW2opruPxigOV7NcetkGu+t2pcWOWmZFuvKQ==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-query-suggestions@5.37.0':
-    resolution: {integrity: sha512-31Nr2xOLBCYVal+OMZn1rp1H4lPs1914Tfr3a34wU/nsWJ+TB3vWjfkUUuuYhWoWBEArwuRzt3YNLn0F/KRVkg==}
+  '@algolia/client-query-suggestions@5.40.0':
+    resolution: {integrity: sha512-HvE1jtCag95DR41tDh7cGwrMk4X0aQXPOBIhZRmsBPolMeqRJz0kvfVw8VCKvA1uuoAkjFfTG0X0IZED+rKXoA==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/client-search@5.37.0':
-    resolution: {integrity: sha512-DAFVUvEg+u7jUs6BZiVz9zdaUebYULPiQ4LM2R4n8Nujzyj7BZzGr2DCd85ip4p/cx7nAZWKM8pLcGtkTRTdsg==}
+  '@algolia/client-search@5.40.0':
+    resolution: {integrity: sha512-nlr/MMgoLNUHcfWC5Ns2ENrzKx9x51orPc6wJ8Ignv1DsrUmKm0LUih+Tj3J+kxYofzqQIQRU495d4xn3ozMbg==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/ingestion@1.37.0':
-    resolution: {integrity: sha512-pkCepBRRdcdd7dTLbFddnu886NyyxmhgqiRcHHaDunvX03Ij4WzvouWrQq7B7iYBjkMQrLS8wQqSP0REfA4W8g==}
+  '@algolia/ingestion@1.40.0':
+    resolution: {integrity: sha512-OfHnhE+P0f+p3i90Kmshf9Epgesw5oPV1IEUOY4Mq1HV7cQk16gvklVN1EaY/T9sVavl+Vc3g4ojlfpIwZFA4g==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/monitoring@1.37.0':
-    resolution: {integrity: sha512-fNw7pVdyZAAQQCJf1cc/ih4fwrRdQSgKwgor4gchsI/Q/ss9inmC6bl/69jvoRSzgZS9BX4elwHKdo0EfTli3w==}
+  '@algolia/monitoring@1.40.0':
+    resolution: {integrity: sha512-SWANV32PTKhBYvwKozeWP9HOnVabOixAuPdFFGoqtysTkkwutrtGI/rrh80tvG+BnQAmZX0vUmD/RqFZVfr/Yg==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/recommend@5.37.0':
-    resolution: {integrity: sha512-U+FL5gzN2ldx3TYfQO5OAta2TBuIdabEdFwD5UVfWPsZE5nvOKkc/6BBqP54Z/adW/34c5ZrvvZhlhNTZujJXQ==}
+  '@algolia/recommend@5.40.0':
+    resolution: {integrity: sha512-1Qxy9I5bSb3mrhPk809DllMa561zl5hLsMR6YhIqNkqQ0OyXXQokvJ2zApSxvd39veRZZnhN+oGe+XNoNwLgkw==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/requester-browser-xhr@5.37.0':
-    resolution: {integrity: sha512-Ao8GZo8WgWFABrU7iq+JAftXV0t+UcOtCDL4mzHHZ+rQeTTf1TZssr4d0vIuoqkVNnKt9iyZ7T4lQff4ydcTrw==}
+  '@algolia/requester-browser-xhr@5.40.0':
+    resolution: {integrity: sha512-MGt94rdHfkrVjfN/KwUfWcnaeohYbWGINrPs96f5J7ZyRYpVLF+VtPQ2FmcddFvK4gnKXSu8BAi81hiIhUpm3w==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/requester-fetch@5.37.0':
-    resolution: {integrity: sha512-H7OJOXrFg5dLcGJ22uxx8eiFId0aB9b0UBhoOi4SMSuDBe6vjJJ/LeZyY25zPaSvkXNBN3vAM+ad6M0h6ha3AA==}
+  '@algolia/requester-fetch@5.40.0':
+    resolution: {integrity: sha512-wXQ05JZZ10Dr642QVAkAZ4ZZlU+lh5r6dIBGmm9WElz+1EaQ6BNYtEOTV6pkXuFYsZpeJA89JpDOiwBOP9j24w==}
     engines: {node: '>= 14.0.0'}
 
-  '@algolia/requester-node-http@5.37.0':
-    resolution: {integrity: sha512-npZ9aeag4SGTx677eqPL3rkSPlQrnzx/8wNrl1P7GpWq9w/eTmRbOq+wKrJ2r78idlY0MMgmY/mld2tq6dc44g==}
+  '@algolia/requester-node-http@5.40.0':
+    resolution: {integrity: sha512-5qCRoySnzpbQVg2IPLGFCm4LF75pToxI5tdjOYgUMNL/um91aJ4dH3SVdBEuFlVsalxl8mh3bWPgkUmv6NpJiQ==}
     engines: {node: '>= 14.0.0'}
 
   '@alloc/quick-lru@5.2.0':
@@ -2249,8 +2249,8 @@ packages:
   '@antfu/utils@0.7.10':
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
 
-  '@antfu/utils@9.2.0':
-    resolution: {integrity: sha512-Oq1d9BGZakE/FyoEtcNeSwM7MpDO2vUBi11RWBZXf75zPsbUVWmUs03EqkRFrcgbXyKTas0BdZWC1wcuSoqSAw==}
+  '@antfu/utils@9.3.0':
+    resolution: {integrity: sha512-9hFT4RauhcUzqOE4f1+frMKLZrgNog5b06I7VmZQV1BkvwvqrbC8EBZf3L1eEL2AKb6rNKjER0sEvJiSP1FXEA==}
 
   '@apideck/better-ajv-errors@0.3.6':
     resolution: {integrity: sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==}
@@ -2888,14 +2888,14 @@ packages:
   '@bpmn-io/properties-panel@3.33.0':
     resolution: {integrity: sha512-I41JNpfX7zzKTOpmB84ETt8dnyE4OLDtzNmQBN6m3wEnfFw19VuBa7C0XXMtF/Us1zvy3yFx+dAH//Hgg9e0uQ==}
 
-  '@cacheable/memoize@2.0.1':
-    resolution: {integrity: sha512-WBLH37SynkCa39S6IrTSMQF3Wdv4/51WxuU5TuCNEqZcLgLGHme8NUxRTcDIO8ZZFXlslWbh9BD3DllixgPg6Q==}
+  '@cacheable/memoize@2.0.3':
+    resolution: {integrity: sha512-hl9wfQgpiydhQEIv7fkjEzTGE+tcosCXLKFDO707wYJ/78FVOlowb36djex5GdbSyeHnG62pomYLMuV/OT8Pbw==}
 
-  '@cacheable/memory@2.0.1':
-    resolution: {integrity: sha512-Ufc7iQnRKFC8gjZVGOTOsMwM/vZtmsw3LafvctVXPm835ElgK3DpMe1U5i9sd6OieSkyJhXbAT2Q2FosXBBbAQ==}
+  '@cacheable/memory@2.0.3':
+    resolution: {integrity: sha512-R3UKy/CKOyb1LZG/VRCTMcpiMDyLH7SH3JrraRdK6kf3GweWCOU3sgvE13W3TiDRbxnDKylzKJvhUAvWl9LQOA==}
 
-  '@cacheable/utils@2.0.1':
-    resolution: {integrity: sha512-sxHjO6wKn4/0wHCFYbh6tljj+ciP9BKgyBi09NLsor3sN+nu/Rt3FwLw6bYp7bp8usHpmcwUozrB/u4RuSw/eg==}
+  '@cacheable/utils@2.1.0':
+    resolution: {integrity: sha512-ZdxfOiaarMqMj+H7qwlt5EBKWaeGihSYVHdQv5lUsbn8MJJOTW82OIwirQ39U5tMZkNvy3bQE+ryzC+xTAb9/g==}
 
   '@camunda/feel-builtins@0.2.0':
     resolution: {integrity: sha512-Jusm8x3Onqze9E5Y0lGGdPj66bnFKLYNwDz+uG4otsEXgSL0FpF+koGHK48LkF9Jqo67KaP1y3zr2y/HIWRePw==}
@@ -2971,23 +2971,23 @@ packages:
     resolution: {integrity: sha512-+tv3z+SPp+gqTIcImN9o0hqE9xyfQjI1XD9pL6NuKjua9B1y7mNYv0S9cP+QEbA4ppVgGZEmKOvHX5G5Ei1CVA==}
     engines: {node: '>=18.0.0'}
 
-  '@codemirror/autocomplete@6.18.7':
-    resolution: {integrity: sha512-8EzdeIoWPJDsMBwz3zdzwXnUpCzMiCyz5/A3FIPpriaclFCGDkAzK13sMcnsu5rowqiyeQN2Vs2TsOcoDPZirQ==}
+  '@codemirror/autocomplete@6.19.0':
+    resolution: {integrity: sha512-61Hfv3cF07XvUxNeC3E7jhG8XNi1Yom1G0lRC936oLnlF+jrbrv8rc/J98XlYzcsAoTVupfsf5fLej1aI8kyIg==}
 
-  '@codemirror/commands@6.8.1':
-    resolution: {integrity: sha512-KlGVYufHMQzxbdQONiLyGQDUW0itrLZwq3CcY7xpv9ZLRHqzkBSoteocBHtMCoY7/Ci4xhzSrToIeLg7FxHuaw==}
+  '@codemirror/commands@6.9.0':
+    resolution: {integrity: sha512-454TVgjhO6cMufsyyGN70rGIfJxJEjcqjBG2x2Y03Y/+Fm99d3O/Kv1QDYWuG6hvxsgmjXmBuATikIIYvERX+w==}
 
   '@codemirror/language@6.11.3':
     resolution: {integrity: sha512-9HBM2XnwDj7fnu0551HkGdrUrrqmYq/WC5iv6nbY2WdicXdGbhR/gfbZOH73Aqj4351alY1+aoG9rCNfiwS1RA==}
 
-  '@codemirror/lint@6.8.5':
-    resolution: {integrity: sha512-s3n3KisH7dx3vsoeGMxsbRAgKe4O1vbrnKBClm99PU0fWxmxsx5rR2PfqQgIt+2MMJBHbiJ5rfIdLYfB9NNvsA==}
+  '@codemirror/lint@6.9.0':
+    resolution: {integrity: sha512-wZxW+9XDytH3SKvS8cQzMyQCaaazH8XL1EMHleHe00wVzsv7NBQKVW2yzEHrRhmM7ZOhVdItPbvlRBvMp9ej7A==}
 
   '@codemirror/state@6.5.2':
     resolution: {integrity: sha512-FVqsPqtPWKVVL3dPSxy8wEF/ymIEuVzF1PK3VbUgrxXpJUSHQWWZz4JMToquRxnkw+36LTamCZG2iua2Ptq0fA==}
 
-  '@codemirror/view@6.38.2':
-    resolution: {integrity: sha512-bTWAJxL6EOFLPzTx+O5P5xAO3gTqpatQ2b/ARQ8itfU/v2LlpS3pH2fkL0A3E/Fx8Y2St2KES7ZEV0sHTsSW/A==}
+  '@codemirror/view@6.38.5':
+    resolution: {integrity: sha512-SFVsNAgsAoou+BjRewMqN+m9jaztB9wCWN9RSRgePqUbq8UVlvJfku5zB2KVhLPgH/h0RLk38tvd4tGeAhygnw==}
 
   '@commitlint/cli@19.8.1':
     resolution: {integrity: sha512-LXUdNIkspyxrlV6VDHWBmCZRtkEVRpBKxi2Gtw3J54cGWhLCTouVD/Q6ZSaSvd2YaDObWK8mDjrz3TIKtaQMAA==}
@@ -3336,8 +3336,8 @@ packages:
       '@csstools/css-parser-algorithms': ^3.0.5
       '@csstools/css-tokenizer': ^3.0.4
 
-  '@csstools/postcss-alpha-function@1.0.0':
-    resolution: {integrity: sha512-r2L8KNg5Wriq5n8IUQcjzy2Rh37J5YjzP9iOyHZL5fxdWYHB08vqykHQa4wAzN/tXwDuCHnhQDGCtxfS76xn7g==}
+  '@csstools/postcss-alpha-function@1.0.1':
+    resolution: {integrity: sha512-isfLLwksH3yHkFXfCI2Gcaqg7wGGHZZwunoJzEZk0yKYIokgre6hYVFibKL3SYAoR1kBXova8LB+JoO5vZzi9w==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3348,32 +3348,38 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-color-function-display-p3-linear@1.0.0':
-    resolution: {integrity: sha512-7q+OuUqfowRrP84m/Jl0wv3pfCQyUTCW5MxDIux+/yty5IkUUHOTigCjrC0Fjy3OT0ncGLudHbfLWmP7E1arNA==}
+  '@csstools/postcss-color-function-display-p3-linear@1.0.1':
+    resolution: {integrity: sha512-E5qusdzhlmO1TztYzDIi8XPdPoYOjoTY6HBYBCYSj+Gn4gQRBlvjgPQXzfzuPQqt8EhkC/SzPKObg4Mbn8/xMg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      postcss: ^8.4
+
+  '@csstools/postcss-color-function@4.0.12':
+    resolution: {integrity: sha512-yx3cljQKRaSBc2hfh8rMZFZzChaFgwmO2JfFgFr1vMcF3C/uyy5I4RFIBOIWGq1D+XbKCG789CGkG6zzkLpagA==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-color-function@4.0.11':
-    resolution: {integrity: sha512-AtH22zLHTLm64HLdpv5EedT/zmYTm1MtdQbQhRZXxEB6iYtS6SrS1jLX3TcmUWMFzpumK/OVylCm3HcLms4slw==}
+  '@csstools/postcss-color-mix-function@3.0.12':
+    resolution: {integrity: sha512-4STERZfCP5Jcs13P1U5pTvI9SkgLgfMUMhdXW8IlJWkzOOOqhZIjcNhWtNJZes2nkBDsIKJ0CJtFtuaZ00moag==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-color-mix-function@3.0.11':
-    resolution: {integrity: sha512-cQpXBelpTx0YhScZM5Ve0jDCA4RzwFc7oNafzZOGgCHt/GQVYiU8Vevz9QJcwy/W0Pyi/BneY+KMjz23lI9r+Q==}
+  '@csstools/postcss-color-mix-variadic-function-arguments@1.0.2':
+    resolution: {integrity: sha512-rM67Gp9lRAkTo+X31DUqMEq+iK+EFqsidfecmhrteErxJZb6tUoJBVQca1Vn1GpDql1s1rD1pKcuYzMsg7Z1KQ==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-color-mix-variadic-function-arguments@1.0.1':
-    resolution: {integrity: sha512-c7hyBtbF+jlHIcUGVdWY06bHICgguV9ypfcELU3eU3W/9fiz2dxM8PqxQk2ndXYTzLnwPvNNqu1yCmQ++N6Dcg==}
+  '@csstools/postcss-content-alt-text@2.0.8':
+    resolution: {integrity: sha512-9SfEW9QCxEpTlNMnpSqFaHyzsiRpZ5J5+KqCu1u5/eEJAWsMhzT40qf0FIbeeglEvrGRMdDzAxMIz3wqoGSb+Q==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-content-alt-text@2.0.7':
-    resolution: {integrity: sha512-cq/zWaEkpcg3RttJ5+GdNwk26NwxY5KgqgtNL777Fdd28AVGHxuBvqmK4Jq4oKhW1NX4M2LbgYAVVN0NZ+/XYQ==}
+  '@csstools/postcss-contrast-color-function@2.0.12':
+    resolution: {integrity: sha512-YbwWckjK3qwKjeYz/CijgcS7WDUCtKTd8ShLztm3/i5dhh4NaqzsbYnhm4bjrpFpnLZ31jVcbK8YL77z3GBPzA==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3396,20 +3402,20 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-gradients-interpolation-method@5.0.11':
-    resolution: {integrity: sha512-8M3mcNTL3cGIJXDnvrJ2oWEcKi3zyw7NeYheFKePUlBmLYm1gkw9Rr/BA7lFONrOPeQA3yeMPldrrws6lqHrug==}
+  '@csstools/postcss-gradients-interpolation-method@5.0.12':
+    resolution: {integrity: sha512-jugzjwkUY0wtNrZlFeyXzimUL3hN4xMvoPnIXxoZqxDvjZRiSh+itgHcVUWzJ2VwD/VAMEgCLvtaJHX+4Vj3Ow==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-hwb-function@4.0.11':
-    resolution: {integrity: sha512-9meZbsVWTZkWsSBazQips3cHUOT29a/UAwFz0AMEXukvpIGGDR9+GMl3nIckWO5sPImsadu4F5Zy+zjt8QgCdA==}
+  '@csstools/postcss-hwb-function@4.0.12':
+    resolution: {integrity: sha512-mL/+88Z53KrE4JdePYFJAQWFrcADEqsLprExCM04GDNgHIztwFzj0Mbhd/yxMBngq0NIlz58VVxjt5abNs1VhA==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-ic-unit@4.0.3':
-    resolution: {integrity: sha512-RtYYm2qUIu9vAaHB0cC8rQGlOCQAUgEc2tMr7ewlGXYipBQKjoWmyVArqsk7SEr8N3tErq6P6UOJT3amaVof5Q==}
+  '@csstools/postcss-ic-unit@4.0.4':
+    resolution: {integrity: sha512-yQ4VmossuOAql65sCPppVO1yfb7hDscf4GseF0VCA/DTDaBc0Wtf8MTqVPfjGYlT5+2buokG0Gp7y0atYZpwjg==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3426,8 +3432,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-light-dark-function@2.0.10':
-    resolution: {integrity: sha512-g7Lwb294lSoNnyrwcqoooh9fTAp47rRNo+ILg7SLRSMU3K9ePIwRt566sNx+pehiCelv4E1ICaU1EwLQuyF2qw==}
+  '@csstools/postcss-light-dark-function@2.0.11':
+    resolution: {integrity: sha512-fNJcKXJdPM3Lyrbmgw2OBbaioU7yuKZtiXClf4sGdQttitijYlZMD5K7HrC/eF83VRWRrYq6OZ0Lx92leV2LFA==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3486,14 +3492,14 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-oklab-function@4.0.11':
-    resolution: {integrity: sha512-9f03ZGxZ2VmSCrM4SDXlAYP+Xpu4VFzemfQUQFL9OYxAbpvDy0FjDipZ0i8So1pgs8VIbQI0bNjFWgfdpGw8ig==}
+  '@csstools/postcss-oklab-function@4.0.12':
+    resolution: {integrity: sha512-HhlSmnE1NKBhXsTnNGjxvhryKtO7tJd1w42DKOGFD6jSHtYOrsJTQDKPMwvOfrzUAk8t7GcpIfRyM7ssqHpFjg==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-progressive-custom-properties@4.2.0':
-    resolution: {integrity: sha512-fWCXRasX17N1NCPTCuwC3FJDV+Wc031f16cFuuMEfIsYJ1q5ABCa59W0C6VeMGqjNv6ldf37vvwXXAeaZjD9PA==}
+  '@csstools/postcss-progressive-custom-properties@4.2.1':
+    resolution: {integrity: sha512-uPiiXf7IEKtUQXsxu6uWtOlRMXd2QWWy5fhxHDnPdXKCQckPP3E34ZgDoZ62r2iT+UOgWsSbM4NvHE5m3mAEdw==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3504,8 +3510,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  '@csstools/postcss-relative-color-syntax@3.0.11':
-    resolution: {integrity: sha512-oQ5fZvkcBrWR+k6arHXk0F8FlkmD4IxM+rcGDLWrF2f31tWyEM3lSraeWAV0f7BGH6LIrqmyU3+Qo/1acfoJng==}
+  '@csstools/postcss-relative-color-syntax@3.0.12':
+    resolution: {integrity: sha512-0RLIeONxu/mtxRtf3o41Lq2ghLimw0w9ByLWnnEVuy89exmEEq8bynveBxNW3nyHqLAFEeNtVEmC1QK9MZ8Huw==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -3785,24 +3791,24 @@ packages:
     resolution: {integrity: sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/config-helpers@0.3.1':
-    resolution: {integrity: sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==}
+  '@eslint/config-helpers@0.4.0':
+    resolution: {integrity: sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/core@0.13.0':
     resolution: {integrity: sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/core@0.15.2':
-    resolution: {integrity: sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==}
+  '@eslint/core@0.16.0':
+    resolution: {integrity: sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/eslintrc@3.3.1':
     resolution: {integrity: sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/js@9.35.0':
-    resolution: {integrity: sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw==}
+  '@eslint/js@9.37.0':
+    resolution: {integrity: sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/object-schema@2.1.6':
@@ -3813,8 +3819,8 @@ packages:
     resolution: {integrity: sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@eslint/plugin-kit@0.3.5':
-    resolution: {integrity: sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==}
+  '@eslint/plugin-kit@0.4.0':
+    resolution: {integrity: sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@faker-js/faker@9.9.0':
@@ -3838,8 +3844,8 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
-  '@form-create/antd-designer@3.3.1':
-    resolution: {integrity: sha512-H3/YKlLlF3mSZ4oQtAna2wO/mbVVu2frLVfxL6a+EKoyB5JrfglxSfoXG3VnLtfQYCBu0pw6/c1uHazX7KSirw==}
+  '@form-create/antd-designer@3.3.2':
+    resolution: {integrity: sha512-cwqN2H5sOq23Ud4EvIUoYrd6FhQjMpuRNPLU2Mia/vPkuVoEyPG7EPcvwHdSrYXebjlpj4oeZ+7Tfoi61iq/nQ==}
     peerDependencies:
       vue: ^3.5.17
 
@@ -3939,17 +3945,17 @@ packages:
   '@iconify-json/logos@1.2.9':
     resolution: {integrity: sha512-G6VCdFnwZcrT6Eveq3m43oJfLw/CX8plwFcE+2jgv3fiGB64pTmnU7Yd1MNZ/eA+/Re2iEDhuCfSNOWTHwwK8w==}
 
-  '@iconify-json/octicon@1.2.14':
-    resolution: {integrity: sha512-EVP0wcWrJW8L9jLm5JxUiNWAhjm+WeEVxR1/do9ChCx7QRBbNTdaV5u5d9l8H+u3liTgcIijPU8wpc9N7TQG1w==}
+  '@iconify-json/octicon@1.2.16':
+    resolution: {integrity: sha512-lVf3SbtRK0kNLAK7PxBoiyNGRZVdKpi+9y2/DXv8nWeFgBhU/ctK8D1s4wd0FNp1ZMyrh7K2MXmbnENcDOIUhA==}
 
-  '@iconify-json/simple-icons@1.2.52':
-    resolution: {integrity: sha512-c41YOMzBhl3hp58WJLxT+Qq3UhBd8GZAMkbS8ddlCuIGLW0COGe2YSfOA2+poA8/bxLhUQODRNjAy3KhiAOtzA==}
+  '@iconify-json/simple-icons@1.2.54':
+    resolution: {integrity: sha512-OQQYl8yC5j3QklZOYnK31QYe5h47IhyCoxSLd53f0e0nA4dgi8VOZS30SgSAbsecQ+S0xlGJMjXIHTIqZ+ML3w==}
 
-  '@iconify-json/vscode-icons@1.2.30':
-    resolution: {integrity: sha512-dlTOc8w4a8/QNumZzMve+APJa6xQVXPZwo8qBk/MaYfY42NPrQT83QXkbTWKDkuEu/xgHPXvKZZBL7Yy12vYQw==}
+  '@iconify-json/vscode-icons@1.2.31':
+    resolution: {integrity: sha512-lVb4R5CxosCsnGnQQ3NzrXWLgSeQoq+I2sYCowveVNHFwO2fGGbVmUTc6ApFkjxlqT1i43lNgM9zZuhnkL64hQ==}
 
-  '@iconify/json@2.2.385':
-    resolution: {integrity: sha512-IOUKB/gXgATc76rejBzy+ypG7alDhLxC2jL7unmi+nB4mmztRUTtfF3wsMv2b+j0Zk/qMTB7wlvAhvqKsvdWGA==}
+  '@iconify/json@2.2.394':
+    resolution: {integrity: sha512-XuI/rTjVO4rOAbRpb2DZSBzRJcWSTO8lhR0jGEzF28ROM8+vwWMpVaZVvZAeCo3Hc4BItxP+c1hOJMS1cRB5RA==}
 
   '@iconify/tailwind@1.2.0':
     resolution: {integrity: sha512-KgpIHWOTcRYw1XcoUqyNSrmYyfLLqZYu3AmP8zdfLk0F5TqRO8YerhlvlQmGfn7rJXgPeZN569xPAJnJ53zZxA==}
@@ -3974,8 +3980,8 @@ packages:
       '@types/node':
         optional: true
 
-  '@internationalized/date@3.9.0':
-    resolution: {integrity: sha512-yaN3brAnHRD+4KyyOsJyk49XUvj2wtbNACSqg0bz3u8t2VuzhC8Q5dfRnrSxjnnbDb+ienBnkn1TzQfE154vyg==}
+  '@internationalized/date@3.10.0':
+    resolution: {integrity: sha512-oxDR/NTEJ1k+UFVQElaNIk65E/Z83HK1z1WI3lQyhTtnNg4R5oVXaPzK3jcpKG8UHKDVuDQHzn+wsxSz8RP3aw==}
 
   '@internationalized/number@3.6.5':
     resolution: {integrity: sha512-6hY4Kl4HPBvtfS62asS/R22JzNNy8vi/Ssev7x6EobfCp+9QIB2hKvI2EtbdJ0VSQacxVNtqhE/NmF/NZ0gm6g==}
@@ -4073,8 +4079,8 @@ packages:
   '@jridgewell/trace-mapping@0.3.31':
     resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
-  '@jspm/generator@2.7.0':
-    resolution: {integrity: sha512-nQfnkDzIGLc9rve2+nZqNM1cjkg3pYNEkFyr4XoWZI9cUMM51UK0Zdd/PdASecqVA0ce87ajzj0cbvrPmnMCbQ==}
+  '@jspm/generator@2.7.2':
+    resolution: {integrity: sha512-D26MMF5RPC0OBxr/m3pMxW6yqoY7Urm1yXWCTZn1BdLEvNqg4TplZw2v7uzWbix0Z2IlLXvczYNHoCYGngaDfQ==}
 
   '@jspm/import-map@1.2.1':
     resolution: {integrity: sha512-R7NxtOzblCkZL9aAUZCrMij1jeynfMUFJswPR/x/RJNOJ4F7zwCh4XApnNKeB9MVfyk+hDC7GK5NahcG1xelxA==}
@@ -4082,9 +4088,9 @@ packages:
   '@juggle/resize-observer@3.4.0':
     resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
 
-  '@keyv/bigmap@1.0.1':
-    resolution: {integrity: sha512-dZ7TMshK6brpuGPPRoq4pHNzNH4KTWaxVPB7KEnPErlgJpc+jG1Oyx3sw6nBFiZ0OCKwC1zU6skMEG7H421f9g==}
-    engines: {node: '>= 20'}
+  '@keyv/bigmap@1.0.3':
+    resolution: {integrity: sha512-jUEkNlnE9tYzX2AIBeoSe1gVUvSOfIOQ5EFPL5Un8cFHGvjD9L/fxpxlS1tEivRLHgapO2RZJ3D93HYAa049pg==}
+    engines: {node: '>= 18'}
 
   '@keyv/serialize@1.1.1':
     resolution: {integrity: sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==}
@@ -4127,11 +4133,11 @@ packages:
   '@marijn/find-cluster-break@1.0.2':
     resolution: {integrity: sha512-l0h88YhZFyKdXIFNfSWpyjStDjGHwZ/U7iobcK1cQQD8sejsONdQtTVU+1wVN1PBw40PiiHB1vA5S7VTfQiP9g==}
 
-  '@microsoft/api-extractor-model@7.30.7':
-    resolution: {integrity: sha512-TBbmSI2/BHpfR9YhQA7nH0nqVmGgJ0xH0Ex4D99/qBDAUpnhA2oikGmdXanbw9AWWY/ExBYIpkmY8dBHdla3YQ==}
+  '@microsoft/api-extractor-model@7.31.1':
+    resolution: {integrity: sha512-Dhnip5OFKbl85rq/ICHBFGhV4RA5UQSl8AC/P/zoGvs+CBudPkatt5kIhMGiYgVPnUWmfR6fcp38+1AFLYNtUw==}
 
-  '@microsoft/api-extractor@7.52.13':
-    resolution: {integrity: sha512-K6/bBt8zZfn9yc06gNvA+/NlBGJC/iJlObpdufXHEJtqcD4Dln4ITCLZpwP3DNZ5NyBFeTkKdv596go3V72qlA==}
+  '@microsoft/api-extractor@7.53.1':
+    resolution: {integrity: sha512-bul5eTNxijLdDBqLye74u9494sRmf+9QULtec9Od0uHnifahGeNt8CC4/xCdn7mVyEBrXIQyQ5+sc4Uc0QfBSA==}
     hasBin: true
 
   '@microsoft/fetch-event-source@2.0.1':
@@ -4169,16 +4175,12 @@ packages:
     peerDependencies:
       vitepress: ^1.5.0 || ^2.0.0-alpha.1
 
-  '@npmcli/agent@3.0.0':
-    resolution: {integrity: sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   '@npmcli/fs@4.0.0':
     resolution: {integrity: sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==}
     engines: {node: ^18.17.0 || >=20.5.0}
 
-  '@nuxt/kit@3.19.2':
-    resolution: {integrity: sha512-+QiqO0WcIxsKLUqXdVn3m4rzTRm2fO9MZgd330utCAaagGmHsgiMJp67kE14boJEPutnikfz3qOmrzBnDIHUUg==}
+  '@nuxt/kit@3.19.3':
+    resolution: {integrity: sha512-ze46EW5xW+UxDvinvPkYt2MzR355Az1lA3bpX8KDialgnCwr+IbkBij/udbUEC6ZFbidPkfK1eKl4ESN7gMY+w==}
     engines: {node: '>=18.12.0'}
 
   '@one-ini/wasm@0.1.1':
@@ -4286,8 +4288,8 @@ packages:
     resolution: {integrity: sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
-  '@playwright/test@1.55.0':
-    resolution: {integrity: sha512-04IXzPwHrW69XusN/SIdDdKZBzMfOT9UNT/YiJit/xpy2VuAoB8NHc8Aplb96zsWDddLnbkPL3TsmrS04ZU2xQ==}
+  '@playwright/test@1.56.0':
+    resolution: {integrity: sha512-Tzh95Twig7hUwwNe381/K3PggZBZblKUe2wv25oIpzWLr6Z0m4KgV1ZVIjnR6GM9ANEqjZD7XsZEa6JL/7YEgg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -4341,8 +4343,8 @@ packages:
   '@rolldown/pluginutils@1.0.0-beta.29':
     resolution: {integrity: sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==}
 
-  '@rolldown/pluginutils@1.0.0-beta.38':
-    resolution: {integrity: sha512-N/ICGKleNhA5nc9XXQG/kkKHJ7S55u0x0XUJbbkmdCnFuoRkM1Il12q9q0eX19+M7KKUEPw/daUPIRnxhcxAIw==}
+  '@rolldown/pluginutils@1.0.0-beta.42':
+    resolution: {integrity: sha512-N7pQzk9CyE7q0bBN/q0J8s6Db279r5kUZc6d7/wWRe9/zXqC52HQovVyu6iXPIDY4BEzzgbVLhVFXrOuGJ22ZQ==}
 
   '@rollup/plugin-alias@5.1.1':
     resolution: {integrity: sha512-PR9zDb+rOzkRb2VD+EuKB7UC41vU5DIwZ5qqCpk0KJudcWAyi8rvYOhS7+L5aZCspw1stTViLgN5v6FF1p5cgQ==}
@@ -4400,8 +4402,8 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/plugin-node-resolve@16.0.1':
-    resolution: {integrity: sha512-tk5YCxJWIG81umIvNkSod2qK5KyQW19qcBF/B78n1bjtOON6gzKoVeSzAE8yHCZEDmqkHKkxplExA8KzdJLJpA==}
+  '@rollup/plugin-node-resolve@16.0.2':
+    resolution: {integrity: sha512-tCtHJ2BlhSoK4cCs25NMXfV7EALKr0jyasmqVCq3y9cBrKdmJhtsy1iTz36Xhk/O+pDJbzawxF4K6ZblqCnITQ==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^2.78.0||^3.0.0||^4.0.0
@@ -4451,143 +4453,156 @@ packages:
       rollup:
         optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.50.2':
-    resolution: {integrity: sha512-uLN8NAiFVIRKX9ZQha8wy6UUs06UNSZ32xj6giK/rmMXAgKahwExvK6SsmgU5/brh4w/nSgj8e0k3c1HBQpa0A==}
+  '@rollup/rollup-android-arm-eabi@4.52.4':
+    resolution: {integrity: sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==}
     cpu: [arm]
     os: [android]
 
-  '@rollup/rollup-android-arm64@4.50.2':
-    resolution: {integrity: sha512-oEouqQk2/zxxj22PNcGSskya+3kV0ZKH+nQxuCCOGJ4oTXBdNTbv+f/E3c74cNLeMO1S5wVWacSws10TTSB77g==}
+  '@rollup/rollup-android-arm64@4.52.4':
+    resolution: {integrity: sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==}
     cpu: [arm64]
     os: [android]
 
-  '@rollup/rollup-darwin-arm64@4.50.2':
-    resolution: {integrity: sha512-OZuTVTpj3CDSIxmPgGH8en/XtirV5nfljHZ3wrNwvgkT5DQLhIKAeuFSiwtbMto6oVexV0k1F1zqURPKf5rI1Q==}
+  '@rollup/rollup-darwin-arm64@4.52.4':
+    resolution: {integrity: sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==}
     cpu: [arm64]
     os: [darwin]
 
-  '@rollup/rollup-darwin-x64@4.50.2':
-    resolution: {integrity: sha512-Wa/Wn8RFkIkr1vy1k1PB//VYhLnlnn5eaJkfTQKivirOvzu5uVd2It01ukeQstMursuz7S1bU+8WW+1UPXpa8A==}
+  '@rollup/rollup-darwin-x64@4.52.4':
+    resolution: {integrity: sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==}
     cpu: [x64]
     os: [darwin]
 
-  '@rollup/rollup-freebsd-arm64@4.50.2':
-    resolution: {integrity: sha512-QkzxvH3kYN9J1w7D1A+yIMdI1pPekD+pWx7G5rXgnIlQ1TVYVC6hLl7SOV9pi5q9uIDF9AuIGkuzcbF7+fAhow==}
+  '@rollup/rollup-freebsd-arm64@4.52.4':
+    resolution: {integrity: sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==}
     cpu: [arm64]
     os: [freebsd]
 
-  '@rollup/rollup-freebsd-x64@4.50.2':
-    resolution: {integrity: sha512-dkYXB0c2XAS3a3jmyDkX4Jk0m7gWLFzq1C3qUnJJ38AyxIF5G/dyS4N9B30nvFseCfgtCEdbYFhk0ChoCGxPog==}
+  '@rollup/rollup-freebsd-x64@4.52.4':
+    resolution: {integrity: sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==}
     cpu: [x64]
     os: [freebsd]
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.2':
-    resolution: {integrity: sha512-9VlPY/BN3AgbukfVHAB8zNFWB/lKEuvzRo1NKev0Po8sYFKx0i+AQlCYftgEjcL43F2h9Ui1ZSdVBc4En/sP2w==}
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.4':
+    resolution: {integrity: sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm-musleabihf@4.50.2':
-    resolution: {integrity: sha512-+GdKWOvsifaYNlIVf07QYan1J5F141+vGm5/Y8b9uCZnG/nxoGqgCmR24mv0koIWWuqvFYnbURRqw1lv7IBINw==}
+  '@rollup/rollup-linux-arm-musleabihf@4.52.4':
+    resolution: {integrity: sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.2':
-    resolution: {integrity: sha512-df0Eou14ojtUdLQdPFnymEQteENwSJAdLf5KCDrmZNsy1c3YaCNaJvYsEUHnrg+/DLBH612/R0xd3dD03uz2dg==}
+  '@rollup/rollup-linux-arm64-gnu@4.52.4':
+    resolution: {integrity: sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-arm64-musl@4.50.2':
-    resolution: {integrity: sha512-iPeouV0UIDtz8j1YFR4OJ/zf7evjauqv7jQ/EFs0ClIyL+by++hiaDAfFipjOgyz6y6xbDvJuiU4HwpVMpRFDQ==}
+  '@rollup/rollup-linux-arm64-musl@4.52.4':
+    resolution: {integrity: sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-loong64-gnu@4.50.2':
-    resolution: {integrity: sha512-OL6KaNvBopLlj5fTa5D5bau4W82f+1TyTZRr2BdnfsrnQnmdxh4okMxR2DcDkJuh4KeoQZVuvHvzuD/lyLn2Kw==}
+  '@rollup/rollup-linux-loong64-gnu@4.52.4':
+    resolution: {integrity: sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==}
     cpu: [loong64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-ppc64-gnu@4.50.2':
-    resolution: {integrity: sha512-I21VJl1w6z/K5OTRl6aS9DDsqezEZ/yKpbqlvfHbW0CEF5IL8ATBMuUx6/mp683rKTK8thjs/0BaNrZLXetLag==}
+  '@rollup/rollup-linux-ppc64-gnu@4.52.4':
+    resolution: {integrity: sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.2':
-    resolution: {integrity: sha512-Hq6aQJT/qFFHrYMjS20nV+9SKrXL2lvFBENZoKfoTH2kKDOJqff5OSJr4x72ZaG/uUn+XmBnGhfr4lwMRrmqCQ==}
+  '@rollup/rollup-linux-riscv64-gnu@4.52.4':
+    resolution: {integrity: sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.2':
-    resolution: {integrity: sha512-82rBSEXRv5qtKyr0xZ/YMF531oj2AIpLZkeNYxmKNN6I2sVE9PGegN99tYDLK2fYHJITL1P2Lgb4ZXnv0PjQvw==}
+  '@rollup/rollup-linux-riscv64-musl@4.52.4':
+    resolution: {integrity: sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==}
     cpu: [riscv64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.2':
-    resolution: {integrity: sha512-4Q3S3Hy7pC6uaRo9gtXUTJ+EKo9AKs3BXKc2jYypEcMQ49gDPFU2P1ariX9SEtBzE5egIX6fSUmbmGazwBVF9w==}
+  '@rollup/rollup-linux-s390x-gnu@4.52.4':
+    resolution: {integrity: sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-gnu@4.50.2':
-    resolution: {integrity: sha512-9Jie/At6qk70dNIcopcL4p+1UirusEtznpNtcq/u/C5cC4HBX7qSGsYIcG6bdxj15EYWhHiu02YvmdPzylIZlA==}
+  '@rollup/rollup-linux-x64-gnu@4.52.4':
+    resolution: {integrity: sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
 
-  '@rollup/rollup-linux-x64-musl@4.50.2':
-    resolution: {integrity: sha512-HPNJwxPL3EmhzeAnsWQCM3DcoqOz3/IC6de9rWfGR8ZCuEHETi9km66bH/wG3YH0V3nyzyFEGUZeL5PKyy4xvw==}
+  '@rollup/rollup-linux-x64-musl@4.52.4':
+    resolution: {integrity: sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
 
-  '@rollup/rollup-openharmony-arm64@4.50.2':
-    resolution: {integrity: sha512-nMKvq6FRHSzYfKLHZ+cChowlEkR2lj/V0jYj9JnGUVPL2/mIeFGmVM2mLaFeNa5Jev7W7TovXqXIG2d39y1KYA==}
+  '@rollup/rollup-openharmony-arm64@4.52.4':
+    resolution: {integrity: sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==}
     cpu: [arm64]
     os: [openharmony]
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.2':
-    resolution: {integrity: sha512-eFUvvnTYEKeTyHEijQKz81bLrUQOXKZqECeiWH6tb8eXXbZk+CXSG2aFrig2BQ/pjiVRj36zysjgILkqarS2YA==}
+  '@rollup/rollup-win32-arm64-msvc@4.52.4':
+    resolution: {integrity: sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==}
     cpu: [arm64]
     os: [win32]
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.2':
-    resolution: {integrity: sha512-cBaWmXqyfRhH8zmUxK3d3sAhEWLrtMjWBRwdMMHJIXSjvjLKvv49adxiEz+FJ8AP90apSDDBx2Tyd/WylV6ikA==}
+  '@rollup/rollup-win32-ia32-msvc@4.52.4':
+    resolution: {integrity: sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==}
     cpu: [ia32]
     os: [win32]
 
-  '@rollup/rollup-win32-x64-msvc@4.50.2':
-    resolution: {integrity: sha512-APwKy6YUhvZaEoHyM+9xqmTpviEI+9eL7LoCH+aLcvWYHJ663qG5zx7WzWZY+a9qkg5JtzcMyJ9z0WtQBMDmgA==}
+  '@rollup/rollup-win32-x64-gnu@4.52.4':
+    resolution: {integrity: sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==}
     cpu: [x64]
     os: [win32]
 
-  '@rushstack/node-core-library@5.14.0':
-    resolution: {integrity: sha512-eRong84/rwQUlATGFW3TMTYVyqL1vfW9Lf10PH+mVGfIb9HzU3h5AASNIw+axnBLjnD0n3rT5uQBwu9fvzATrg==}
+  '@rollup/rollup-win32-x64-msvc@4.52.4':
+    resolution: {integrity: sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==}
+    cpu: [x64]
+    os: [win32]
+
+  '@rushstack/node-core-library@5.17.0':
+    resolution: {integrity: sha512-24vt1GbHN6kyIglRMTVpyEiNRRRJK8uZHc1XoGAhmnTDKnrWet8OmOpImMswJIe6gM78eV8cMg1HXwuUHkSSgg==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/rig-package@0.5.3':
-    resolution: {integrity: sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==}
+  '@rushstack/problem-matcher@0.1.1':
+    resolution: {integrity: sha512-Fm5XtS7+G8HLcJHCWpES5VmeMyjAKaWeyZU5qPzZC+22mPlJzAsOxymHiWIfuirtPckX3aptWws+K2d0BzniJA==}
+    peerDependencies:
+      '@types/node': '*'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
 
-  '@rushstack/terminal@0.16.0':
-    resolution: {integrity: sha512-WEvNuKkoR1PXorr9SxO0dqFdSp1BA+xzDrIm/Bwlc5YHg2FFg6oS+uCTYjerOhFuqCW+A3vKBm6EmKWSHfgx/A==}
+  '@rushstack/rig-package@0.6.0':
+    resolution: {integrity: sha512-ZQmfzsLE2+Y91GF15c65L/slMRVhF6Hycq04D4TwtdGaUAbIXXg9c5pKA5KFU7M4QMaihoobp9JJYpYcaY3zOw==}
+
+  '@rushstack/terminal@0.19.1':
+    resolution: {integrity: sha512-jsBuSad67IDVMO2yp0hDfs0OdE4z3mDIjIL2pclDT3aEJboeZXE85e1HjuD0F6JoW3XgHvDwoX+WOV+AVTDQeA==}
     peerDependencies:
       '@types/node': '*'
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@5.0.3':
-    resolution: {integrity: sha512-bgPhQEqLVv/2hwKLYv/XvsTWNZ9B/+X1zJ7WgQE9rO5oiLzrOZvkIW4pk13yOQBhHyjcND5qMOa6p83t+Z66iQ==}
+  '@rushstack/ts-command-line@5.1.1':
+    resolution: {integrity: sha512-HPzFsUcr+wZ3oQI08Ec/E6cuiAVHKzrXZGHhwiwIGygAFiqN5QzX+ff30n70NU2WyE26CykgMwBZZSSyHCJrzA==}
 
   '@sec-ant/readable-stream@0.4.1':
     resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==}
@@ -4648,8 +4663,8 @@ packages:
     peerDependencies:
       svelte: ^5.1.0
 
-  '@sveltejs/acorn-typescript@1.0.5':
-    resolution: {integrity: sha512-IwQk4yfwLdibDlrXVE04jTZYlLnwsTT2PIOQQGNLWfjavGifnk1JD1LcZjZaBTRcxZu2FfPfNLOE04DSu9lqtQ==}
+  '@sveltejs/acorn-typescript@1.0.6':
+    resolution: {integrity: sha512-4awhxtMh4cx9blePWl10HRHj8Iivtqj+2QdDCSMDzxG+XKa9+VCNupQuCuvzEhYPzZSrX+0gC+0lHA/0fFKKQQ==}
     peerDependencies:
       acorn: ^8.9.0
 
@@ -4664,8 +4679,8 @@ packages:
     peerDependencies:
       postcss: ^8.2.15
 
-  '@tailwindcss/typography@0.5.16':
-    resolution: {integrity: sha512-0wDLwCVF5V3x3b1SGXPCDcdsbDHMBe+lkFzBRaHeLvNi+nrrnZ1lA18u+OTWO8iSWU2GxUOCvlXtDuqftc1oiA==}
+  '@tailwindcss/typography@0.5.19':
+    resolution: {integrity: sha512-w31dd8HOx3k9vPtcQh5QHP9GwKcgbMp87j58qi6xgiBnFFtKEAgCWnDw4qUT8aHwkCp8bKvb/KGKWWHedP0AAg==}
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders || >=4.0.0-alpha.20 || >=4.0.0-beta.1'
 
@@ -4673,17 +4688,17 @@ packages:
     resolution: {integrity: sha512-Wo1iKt2b9OT7d+YGhvEPD3DXvPv2etTusIMhMUoG7fbhmxcXCtIjJDEygy91Y2JFlwGyjqiBPRozme7UD8hoqg==}
     engines: {node: '>=12'}
 
-  '@tanstack/query-core@5.89.0':
-    resolution: {integrity: sha512-joFV1MuPhSLsKfTzwjmPDrp8ENfZ9N23ymFu07nLfn3JCkSHy0CFgsyhHTJOmWaumC/WiNIKM0EJyduCF/Ih/Q==}
+  '@tanstack/query-core@5.90.2':
+    resolution: {integrity: sha512-k/TcR3YalnzibscALLwxeiLUub6jN5EDLwKDiO7q5f4ICEoptJ+n9+7vcEFy5/x/i6Q+Lb/tXrsKCggf5uQJXQ==}
 
-  '@tanstack/store@0.7.5':
-    resolution: {integrity: sha512-qd/OjkjaFRKqKU4Yjipaen/EOB9MyEg6Wr9fW103RBPACf1ZcKhbhcu2S5mj5IgdPib6xFIgCUti/mKVkl+fRw==}
+  '@tanstack/store@0.7.7':
+    resolution: {integrity: sha512-xa6pTan1bcaqYDS9BDpSiS63qa6EoDkPN9RsRaxHuDdVDNntzq3xNwR5YKTU/V3SkSyC9T4YVOPh2zRQN0nhIQ==}
 
   '@tanstack/virtual-core@3.13.12':
     resolution: {integrity: sha512-1YBOJfRHV4sXUmWsFSf5rQor4Ss82G8dQWLRbnk3GA4jeP8hQt1hxXh0tmflpC0dz3VgEv/1+qwPyLeWkQuPFA==}
 
-  '@tanstack/vue-query@5.89.0':
-    resolution: {integrity: sha512-VCzZLqT+psMKd2KVEtST1SOPqvCTMMTvWg3HsCfx/ZxzmdEwL5qZ3LISTQoeQ6dsoZ5b6EzqMG4AIcVI3w3YIA==}
+  '@tanstack/vue-query@5.90.2':
+    resolution: {integrity: sha512-DLLY/B5QCbpi6AM2aaCowukQx2rXsQ4mH8RuDd8wQz0/L2bZ9Z/GgXlV310ouo47pJBmeibMVTmuoWsleT8llg==}
     peerDependencies:
       '@vue/composition-api': ^1.1.2
       vue: ^3.5.17
@@ -4691,8 +4706,8 @@ packages:
       '@vue/composition-api':
         optional: true
 
-  '@tanstack/vue-store@0.7.5':
-    resolution: {integrity: sha512-LtvivLi2DI5xff76rBWAhd0KZHwCfgU/CbBWwN0m6gOCGCMVpjHQDFGbdMsWmy0FpnSJdk+xYvJyUG1mjW95Pw==}
+  '@tanstack/vue-store@0.7.7':
+    resolution: {integrity: sha512-6iv1Odmreff6TgEjQN11xoddsCnpn+/ul7MZ2DadHT3/RSY1YdoFafK8lCa889MEFi/5K0zAhf8psIkgTrRa9A==}
     peerDependencies:
       '@vue/composition-api': ^1.2.1
       vue: ^3.5.17
@@ -4705,11 +4720,11 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
-  '@tinyflow-ai/ui@1.1.3':
-    resolution: {integrity: sha512-N6AMXEloQzB41WJ3IUuox7HdaNESSviUbJjdrgf0me9TJv7HgjX57qrhL5eD8jdFLh8vPyXxkyPou7ALRYNF2g==}
+  '@tinyflow-ai/ui@1.1.5':
+    resolution: {integrity: sha512-RoWnoDBde6/h0YRDmMkfgRJHWPhptC4MWASVYwstAYWy55KX/3fdn8YdsG7YnB+zeCZ4W7Na7vOdnTK9NsFxLA==}
 
-  '@tinyflow-ai/vue@1.1.3':
-    resolution: {integrity: sha512-bt+8yeI8HiL4UEcIcrqI7b/lYgTHb2B5o50GTP6RMxOB5oS3B/sL8UosjITT21z4R7c9HEah5XJYHqFG387ShA==}
+  '@tinyflow-ai/vue@1.1.5':
+    resolution: {integrity: sha512-e7mqIY3v/B9RapTotE/mPSJNJxt254uTclqSxo0YvI1EDlFIKVF077Fr2bXgf8yk6OoQ2Iu81OLQzlwlhhTGfA==}
     peerDependencies:
       vue: ^3.5.17
 
@@ -4908,11 +4923,11 @@ packages:
   '@types/node@12.20.55':
     resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==}
 
-  '@types/node@22.18.6':
-    resolution: {integrity: sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==}
+  '@types/node@22.18.9':
+    resolution: {integrity: sha512-5yBtK0k/q8PjkMXbTfeIEP/XVYnz1R9qZJ3yUicdEW7ppdDJfe+MqXEhpqDL3mtn4Wvs1u0KLEG0RXzCgNpsSg==}
 
-  '@types/node@24.5.2':
-    resolution: {integrity: sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==}
+  '@types/node@24.7.1':
+    resolution: {integrity: sha512-CmyhGZanP88uuC5GpWU9q+fI61j2SkhO3UGMUdfYRE6Bcy0ccyzn1Rqj9YAB/ZY4kOXmNf0ocah5GtphmLMP6Q==}
 
   '@types/nprogress@0.2.3':
     resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==}
@@ -4953,23 +4968,23 @@ packages:
   '@types/web-bluetooth@0.0.21':
     resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
 
-  '@typescript-eslint/eslint-plugin@8.44.0':
-    resolution: {integrity: sha512-EGDAOGX+uwwekcS0iyxVDmRV9HX6FLSM5kzrAToLTsr9OWCIKG/y3lQheCq18yZ5Xh78rRKJiEpP0ZaCs4ryOQ==}
+  '@typescript-eslint/eslint-plugin@8.46.0':
+    resolution: {integrity: sha512-hA8gxBq4ukonVXPy0OKhiaUh/68D0E88GSmtC1iAEnGaieuDi38LhS7jdCHRLi6ErJBNDGCzvh5EnzdPwUc0DA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
-      '@typescript-eslint/parser': ^8.44.0
+      '@typescript-eslint/parser': ^8.46.0
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/parser@8.44.0':
-    resolution: {integrity: sha512-VGMpFQGUQWYT9LfnPcX8ouFojyrZ/2w3K5BucvxL/spdNehccKhB4jUyB1yBCXpr2XFm0jkECxgrpXBW2ipoAw==}
+  '@typescript-eslint/parser@8.46.0':
+    resolution: {integrity: sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/project-service@8.44.0':
-    resolution: {integrity: sha512-ZeaGNraRsq10GuEohKTo4295Z/SuGcSq2LzfGlqiuEvfArzo/VRrT0ZaJsVPuKZ55lVbNk8U6FcL+ZMH8CoyVA==}
+  '@typescript-eslint/project-service@8.46.0':
+    resolution: {integrity: sha512-OEhec0mH+U5Je2NZOeK1AbVCdm0ChyapAyTeXVIYTPXDJ3F07+cu87PPXcGoYqZ7M9YJVvFnfpGg1UmCIqM+QQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -4978,18 +4993,18 @@ packages:
     resolution: {integrity: sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/scope-manager@8.44.0':
-    resolution: {integrity: sha512-87Jv3E+al8wpD+rIdVJm/ItDBe/Im09zXIjFoipOjr5gHUhJmTzfFLuTJ/nPTMc2Srsroy4IBXwcTCHyRR7KzA==}
+  '@typescript-eslint/scope-manager@8.46.0':
+    resolution: {integrity: sha512-lWETPa9XGcBes4jqAMYD9fW0j4n6hrPtTJwWDmtqgFO/4HF4jmdH/Q6wggTw5qIT5TXjKzbt7GsZUBnWoO3dqw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  '@typescript-eslint/tsconfig-utils@8.44.0':
-    resolution: {integrity: sha512-x5Y0+AuEPqAInc6yd0n5DAcvtoQ/vyaGwuX5HE9n6qAefk1GaedqrLQF8kQGylLUb9pnZyLf+iEiL9fr8APDtQ==}
+  '@typescript-eslint/tsconfig-utils@8.46.0':
+    resolution: {integrity: sha512-WrYXKGAHY836/N7zoK/kzi6p8tXFhasHh8ocFL9VZSAkvH956gfeRfcnhs3xzRy8qQ/dq3q44v1jvQieMFg2cw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
-  '@typescript-eslint/type-utils@8.44.0':
-    resolution: {integrity: sha512-9cwsoSxJ8Sak67Be/hD2RNt/fsqmWnNE1iHohG8lxqLSNY8xNfyY7wloo5zpW3Nu9hxVgURevqfcH6vvKCt6yg==}
+  '@typescript-eslint/type-utils@8.46.0':
+    resolution: {integrity: sha512-hy+lvYV1lZpVs2jRaEYvgCblZxUoJiPyCemwbQZ+NGulWkQRy0HRPYAoef/CNSzaLt+MLvMptZsHXHlkEilaeg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -4999,8 +5014,8 @@ packages:
     resolution: {integrity: sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/types@8.44.0':
-    resolution: {integrity: sha512-ZSl2efn44VsYM0MfDQe68RKzBz75NPgLQXuGypmym6QVOWL5kegTZuZ02xRAT9T+onqvM6T8CdQk0OwYMB6ZvA==}
+  '@typescript-eslint/types@8.46.0':
+    resolution: {integrity: sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@7.18.0':
@@ -5012,8 +5027,8 @@ packages:
       typescript:
         optional: true
 
-  '@typescript-eslint/typescript-estree@8.44.0':
-    resolution: {integrity: sha512-lqNj6SgnGcQZwL4/SBJ3xdPEfcBuhCG8zdcwCPgYcmiPLgokiNDKlbPzCwEwu7m279J/lBYWtDYL+87OEfn8Jw==}
+  '@typescript-eslint/typescript-estree@8.46.0':
+    resolution: {integrity: sha512-ekDCUfVpAKWJbRfm8T1YRrCot1KFxZn21oV76v5Fj4tr7ELyk84OS+ouvYdcDAwZL89WpEkEj2DKQ+qg//+ucg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
@@ -5024,8 +5039,8 @@ packages:
     peerDependencies:
       eslint: ^8.56.0
 
-  '@typescript-eslint/utils@8.44.0':
-    resolution: {integrity: sha512-nktOlVcg3ALo0mYlV+L7sWUD58KG4CMj1rb2HUVOO4aL3K/6wcD+NERqd0rrA5Vg06b42YhF6cFxeixsp9Riqg==}
+  '@typescript-eslint/utils@8.46.0':
+    resolution: {integrity: sha512-nD6yGWPj1xiOm4Gk0k6hLSZz2XkNXhuYmyIrOWcHoPuAhjT9i5bAG+xbWPgFeNR8HPHHtpNKdYUXJl/D3x7f5g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -5035,8 +5050,8 @@ packages:
     resolution: {integrity: sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==}
     engines: {node: ^18.18.0 || >=20.0.0}
 
-  '@typescript-eslint/visitor-keys@8.44.0':
-    resolution: {integrity: sha512-zaz9u8EJ4GBmnehlrpoKvj/E3dNbuQ7q0ucyZImm3cLqJ8INTc970B1qEqDX/Rzq65r3TvVTN7kHWPBoyW7DWw==}
+  '@typescript-eslint/visitor-keys@8.46.0':
+    resolution: {integrity: sha512-FrvMpAK+hTbFy7vH5j1+tMYHMSKLE6RzluFJlkFNKD0p9YsUT75JlBSmr5so3QRzvMwU5/bIEdeNrxm8du8l3Q==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@ungap/structured-clone@1.3.0':
@@ -5150,8 +5165,8 @@ packages:
     peerDependencies:
       zod: ^3.24.0
 
-  '@vercel/nft@0.30.1':
-    resolution: {integrity: sha512-2mgJZv4AYBFkD/nJ4QmiX5Ymxi+AisPLPcS/KPXVqniyQNqKXX+wjieAbDXQP3HcogfEbpHoRMs49Cd4pfkk8g==}
+  '@vercel/nft@0.30.2':
+    resolution: {integrity: sha512-pquXF3XZFg/T3TBor08rUhIGgOhdSilbn7WQLVP/aVSSO+25Rs4H/m3nxNDQ2x3znX7Z3yYjryN8xaLwypcwQg==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -5239,17 +5254,17 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@vue/compiler-core@3.5.21':
-    resolution: {integrity: sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==}
+  '@vue/compiler-core@3.5.22':
+    resolution: {integrity: sha512-jQ0pFPmZwTEiRNSb+i9Ow/I/cHv2tXYqsnHKKyCQ08irI2kdF5qmYedmF8si8mA7zepUFmJ2hqzS8CQmNOWOkQ==}
 
-  '@vue/compiler-dom@3.5.21':
-    resolution: {integrity: sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==}
+  '@vue/compiler-dom@3.5.22':
+    resolution: {integrity: sha512-W8RknzUM1BLkypvdz10OVsGxnMAuSIZs9Wdx1vzA3mL5fNMN15rhrSCLiTm6blWeACwUwizzPVqGJgOGBEN/hA==}
 
-  '@vue/compiler-sfc@3.5.21':
-    resolution: {integrity: sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==}
+  '@vue/compiler-sfc@3.5.22':
+    resolution: {integrity: sha512-tbTR1zKGce4Lj+JLzFXDq36K4vcSZbJ1RBu8FxcDv1IGRz//Dh2EBqksyGVypz3kXpshIfWKGOCcqpSbyGWRJQ==}
 
-  '@vue/compiler-ssr@3.5.21':
-    resolution: {integrity: sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==}
+  '@vue/compiler-ssr@3.5.22':
+    resolution: {integrity: sha512-GdgyLvg4R+7T8Nk2Mlighx7XGxq/fJf9jaVofc3IL0EPesTE86cP/8DD1lT3h1JeZr2ySBvyqKQJgbS54IX1Ww==}
 
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -5287,22 +5302,22 @@ packages:
       typescript:
         optional: true
 
-  '@vue/reactivity@3.5.21':
-    resolution: {integrity: sha512-3ah7sa+Cwr9iiYEERt9JfZKPw4A2UlbY8RbbnH2mGCE8NwHkhmlZt2VsH0oDA3P08X3jJd29ohBDtX+TbD9AsA==}
+  '@vue/reactivity@3.5.22':
+    resolution: {integrity: sha512-f2Wux4v/Z2pqc9+4SmgZC1p73Z53fyD90NFWXiX9AKVnVBEvLFOWCEgJD3GdGnlxPZt01PSlfmLqbLYzY/Fw4A==}
 
-  '@vue/runtime-core@3.5.21':
-    resolution: {integrity: sha512-+DplQlRS4MXfIf9gfD1BOJpk5RSyGgGXD/R+cumhe8jdjUcq/qlxDawQlSI8hCKupBlvM+3eS1se5xW+SuNAwA==}
+  '@vue/runtime-core@3.5.22':
+    resolution: {integrity: sha512-EHo4W/eiYeAzRTN5PCextDUZ0dMs9I8mQ2Fy+OkzvRPUYQEyK9yAjbasrMCXbLNhF7P0OUyivLjIy0yc6VrLJQ==}
 
-  '@vue/runtime-dom@3.5.21':
-    resolution: {integrity: sha512-3M2DZsOFwM5qI15wrMmNF5RJe1+ARijt2HM3TbzBbPSuBHOQpoidE+Pa+XEaVN+czbHf81ETRoG1ltztP2em8w==}
+  '@vue/runtime-dom@3.5.22':
+    resolution: {integrity: sha512-Av60jsryAkI023PlN7LsqrfPvwfxOd2yAwtReCjeuugTJTkgrksYJJstg1e12qle0NarkfhfFu1ox2D+cQotww==}
 
-  '@vue/server-renderer@3.5.21':
-    resolution: {integrity: sha512-qr8AqgD3DJPJcGvLcJKQo2tAc8OnXRcfxhOJCPF+fcfn5bBGz7VCcO7t+qETOPxpWK1mgysXvVT/j+xWaHeMWA==}
+  '@vue/server-renderer@3.5.22':
+    resolution: {integrity: sha512-gXjo+ao0oHYTSswF+a3KRHZ1WszxIqO7u6XwNHqcqb9JfyIL/pbWrrh/xLv7jeDqla9u+LK7yfZKHih1e1RKAQ==}
     peerDependencies:
       vue: ^3.5.17
 
-  '@vue/shared@3.5.21':
-    resolution: {integrity: sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==}
+  '@vue/shared@3.5.22':
+    resolution: {integrity: sha512-F4yc6palwq3TT0u+FYf0Ns4Tfl9GRFURDN2gWG7L1ecIaS/4fCIuFOjMTnCyjsu/OK6vaDKLCrGAa+KvvH+h4w==}
 
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
@@ -5440,13 +5455,13 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
-  '@xyflow/svelte@1.3.0':
-    resolution: {integrity: sha512-WWFb8cCzFt1ZpUl8exEaG0uoKAr7Ib7I286vhoz/fKQx5idiHhOVOjhLUXKVo3XZBsR+SvHrBp30qBD2SBRmAQ==}
+  '@xyflow/svelte@1.3.1':
+    resolution: {integrity: sha512-aLr2v0/nr+zER5+dCzEmR5qCu9l7FCKZwYiRvCX15U2FVIdO2M522pyPEr7Siwq6EEx0QjECACeN+rLZCDSzeA==}
     peerDependencies:
       svelte: ^5.25.0
 
-  '@xyflow/system@0.0.69':
-    resolution: {integrity: sha512-+KYwHDnsapZQ1xSgsYwOKYN93fUR770LwfCT5qrvcmzoMaabO1rHa6twiEk7E5VUIceWciF8ukgfq9JC83B5jQ==}
+  '@xyflow/system@0.0.70':
+    resolution: {integrity: sha512-PpC//u9zxdjj0tfTSmZrg3+sRbTz6kop/Amky44U2Dl51sxzDTIUfXMwETOYpmr2dqICWXBIJwXL2a9QWtX2XA==}
 
   JSONStream@1.3.5:
     resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
@@ -5511,8 +5526,8 @@ packages:
   ajv@8.17.1:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
 
-  algoliasearch@5.37.0:
-    resolution: {integrity: sha512-y7gau/ZOQDqoInTQp0IwTOjkrHc4Aq4R8JgpmCleFwiLl+PbN2DMWoDUWZnrK8AhNJwT++dn28Bt4NZYNLAmuA==}
+  algoliasearch@5.40.0:
+    resolution: {integrity: sha512-a9aIL2E3Z7uYUPMCmjMFFd5MWhn+ccTubEvnMy7rOTZCB62dXBJtz0R5BZ/TPuX3R9ocBsgWuAbGWQ+Ph4Fmlg==}
     engines: {node: '>= 14.0.0'}
 
   alien-signals@0.4.14:
@@ -5528,8 +5543,8 @@ packages:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
 
-  ansi-escapes@7.1.0:
-    resolution: {integrity: sha512-YdhtCd19sKRKfAAUsrcC1wzm4JuzJoiX4pOJqIoW2qmKj5WzG/dL8uUJ0361zaXtHqK7gEhOwtAtz7t3Yq3X5g==}
+  ansi-escapes@7.1.1:
+    resolution: {integrity: sha512-Zhl0ErHcSRUaVfGUeUdDuLgpkEo8KIFjB4Y9uAc46ScOpdDiU1Dbyplh7qWJeJ/ZHpbyMSM26+X3BySgnIz40Q==}
     engines: {node: '>=18'}
 
   ansi-regex@5.0.1:
@@ -5680,8 +5695,8 @@ packages:
     resolution: {integrity: sha512-qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==}
     engines: {node: '>= 0.4'}
 
-  b4a@1.7.1:
-    resolution: {integrity: sha512-ZovbrBV0g6JxK5cGUF1Suby1vLfKjv4RWi8IxoaO/Mon8BDD9I21RxjHFtgQ+kskJqLAVyQZly3uMBui+vhc8Q==}
+  b4a@1.7.3:
+    resolution: {integrity: sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==}
     peerDependencies:
       react-native-b4a: '*'
     peerDependenciesMeta:
@@ -5709,14 +5724,19 @@ packages:
   balanced-match@2.0.0:
     resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
 
-  bare-events@2.7.0:
-    resolution: {integrity: sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==}
+  bare-events@2.8.0:
+    resolution: {integrity: sha512-AOhh6Bg5QmFIXdViHbMc2tLDsBIRxdkIaIddPslJF9Z5De3APBScuqGP2uThXnIpqFrgoxMNC6km7uXNIMLHXA==}
+    peerDependencies:
+      bare-abort-controller: '*'
+    peerDependenciesMeta:
+      bare-abort-controller:
+        optional: true
 
   base64-js@1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
-  baseline-browser-mapping@2.8.5:
-    resolution: {integrity: sha512-TiU4qUT9jdCuh4aVOG7H1QozyeI2sZRqoRPdqBIaslfNt4WUSanRBueAwl2x5jt4rXBMim3lIN2x6yT8PDi24Q==}
+  baseline-browser-mapping@2.8.16:
+    resolution: {integrity: sha512-OMu3BGQ4E7P1ErFsIPpbJh0qvDudM/UuJeHgkAvfWe+0HFJCXh+t/l8L6fVLR55RI/UbKrVLnAXZSVwd9ysWYw==}
     hasBin: true
 
   better-path-resolve@1.0.0:
@@ -5736,8 +5756,8 @@ packages:
   bintrees@1.0.2:
     resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
 
-  birpc@2.5.0:
-    resolution: {integrity: sha512-VSWO/W6nNQdyP520F1mhf+Lc2f8pjGQOtoHHm7Ze8Go1kX7akpVIrtTa0fn+HB0QJEDVacl6aO08YE0PgXfdnQ==}
+  birpc@2.6.1:
+    resolution: {integrity: sha512-LPnFhlDpdSH6FJhJyn4M0kFO7vtQ5iPw24FnG0y21q09xC7e8+1LeR31S1MAIrDAHp4m7aas4bEkTDTvMAtebQ==}
 
   boolbase@1.0.0:
     resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
@@ -5774,8 +5794,8 @@ packages:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
 
-  browserslist@4.26.2:
-    resolution: {integrity: sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==}
+  browserslist@4.26.3:
+    resolution: {integrity: sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
@@ -5816,8 +5836,8 @@ packages:
     resolution: {integrity: sha512-+7LYcYGBYoNqTp1Rv7Ny1YjUo5E0/ftkQtraH3vkfAGgVHc+ouWdC8okAwQgQR7EVIdW6JTzTmhKFwzb+4okAQ==}
     engines: {node: ^20.17.0 || >=22.9.0}
 
-  cacheable@2.0.1:
-    resolution: {integrity: sha512-MSKxcybpxB5kcWKpj+1tPBm2os4qKKGxDovsZmLhZmWIDYp8EgtC45C5zk1fLe1IC9PpI4ZE4eyryQH0N10PKA==}
+  cacheable@2.1.0:
+    resolution: {integrity: sha512-zzL1BxdnqwD69JRT0dihnawAcLkBMwAH+hZSKjUzeBbPedVhk3qYPjRw9VOMYWwt5xRih5xd8S+3kEdGohZm/g==}
 
   call-bind-apply-helpers@1.0.2:
     resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
@@ -5870,8 +5890,8 @@ packages:
   caniuse-api@3.0.0:
     resolution: {integrity: sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==}
 
-  caniuse-lite@1.0.30001743:
-    resolution: {integrity: sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==}
+  caniuse-lite@1.0.30001749:
+    resolution: {integrity: sha512-0rw2fJOmLfnzCRbkm8EyHL8SvI2Apu5UbnQuTsJ0ClgrH8hcwFooJ1s5R0EP8o8aVrFu8++ae29Kt9/gZAZp/Q==}
 
   ccount@2.0.1:
     resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -5932,8 +5952,8 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
-  ci-info@4.3.0:
-    resolution: {integrity: sha512-l+2bNRMiQgcfILUi33labAZYIWlH1kWDp+ecNo5iisRKrbm0xcRyCww71/YU0Fkw0mAFpz9bJayXPjey6vkmaQ==}
+  ci-info@4.3.1:
+    resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==}
     engines: {node: '>=8'}
 
   circular-dependency-scanner@2.3.0:
@@ -6057,19 +6077,19 @@ packages:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
 
-  comment-json@4.2.5:
-    resolution: {integrity: sha512-bKw/r35jR3HGt5PEPm1ljsQQGyCrR8sFGNiN5L+ykDHdpO8Smxkrkla9Yi6NkQyUrb8V54PGhfMs6NrIwtxtdw==}
+  comment-json@4.4.1:
+    resolution: {integrity: sha512-r1To31BQD5060QdkC+Iheai7gHwoSZobzunqkf2/kQ6xIAfJyrKNAFUwdKvkK7Qgu7pVTKQEa7ok7Ed3ycAJgg==}
     engines: {node: '>= 6'}
 
   comment-parser@1.4.1:
     resolution: {integrity: sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==}
     engines: {node: '>= 12.0.0'}
 
-  commitlint-plugin-function-rules@4.0.2:
-    resolution: {integrity: sha512-sNAGb10MxaTgB0GdASD7hWclcXMSkoRtegNyGvp3VN0ZqXm/7/5p4kNv4Ei3mjgaEwpGTLcqj0ka7MtolONG0Q==}
+  commitlint-plugin-function-rules@4.1.0:
+    resolution: {integrity: sha512-H4JTuIBA56eUgm4F4ifkataV9aVrEi1J0iwrrOSUti+6fbJ7JWZR6dcl9oiz/SbTzR9vVzq4Hk633CgcTiFTCA==}
     engines: {node: '>=20'}
     peerDependencies:
-      '@commitlint/lint': '>=19 <20'
+      '@commitlint/lint': '>=19 <21'
 
   common-tags@1.8.2:
     resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
@@ -6157,20 +6177,20 @@ packages:
     resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
     engines: {node: '>=12.13'}
 
-  core-js-compat@3.45.1:
-    resolution: {integrity: sha512-tqTt5T4PzsMIZ430XGviK4vzYSoeNJ6CXODi6c/voxOT6IZqBht5/EKaSNnYiEjjRYxjVz7DQIsOsY0XNi8PIA==}
+  core-js-compat@3.46.0:
+    resolution: {integrity: sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==}
 
-  core-js-pure@3.45.1:
-    resolution: {integrity: sha512-OHnWFKgTUshEU8MK+lOs1H8kC8GkTi9Z1tvNkxrCcw9wl3MJIO7q2ld77wjWn4/xuGrVu2X+nME1iIIPBSdyEQ==}
+  core-js-pure@3.46.0:
+    resolution: {integrity: sha512-NMCW30bHNofuhwLhYPt66OLOKTMbOhgTTatKVbaQC3KRHpTCiRIBYvtshr+NBYSnBxwAFhjW/RfJ0XbIjS16rw==}
 
-  core-js@3.45.1:
-    resolution: {integrity: sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==}
+  core-js@3.46.0:
+    resolution: {integrity: sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==}
 
   core-util-is@1.0.3:
     resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
 
-  cosmiconfig-typescript-loader@6.1.0:
-    resolution: {integrity: sha512-tJ1w35ZRUiM5FeTzT7DtYWAFFv37ZLqSRkGi2oeCK1gPhvaWjkAtfXvLmvE1pRfxxp9aQo6ba/Pvg1dKj05D4g==}
+  cosmiconfig-typescript-loader@6.2.0:
+    resolution: {integrity: sha512-GEN39v7TgdxgIoNcdkRE3uiAzQt3UXLyHbRHD6YoL048XAeOomyxaP+Hh/+2C6C2wYjxJ2onhJcsQp+L4YEkVQ==}
     engines: {node: '>=v18'}
     peerDependencies:
       '@types/node': '*'
@@ -6273,8 +6293,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  css-declaration-sorter@7.2.0:
-    resolution: {integrity: sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==}
+  css-declaration-sorter@7.3.0:
+    resolution: {integrity: sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==}
     engines: {node: ^14 || ^16 || >=18}
     peerDependencies:
       postcss: ^8.0.9
@@ -6316,8 +6336,8 @@ packages:
     resolution: {integrity: sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==}
     engines: {node: '>= 6'}
 
-  cssdb@8.4.0:
-    resolution: {integrity: sha512-lyATYGyvXwQ8h55WeQeEHXhI+47rl52pXSYkFK/ZrCbAJSgVIaPFjYc3RM8TpRHKk7W3wsAZImmLps+P5VyN9g==}
+  cssdb@8.4.2:
+    resolution: {integrity: sha512-PzjkRkRUS+IHDJohtxkIczlxPPZqRo0nXplsYXOMBRPjcVRjj1W4DfvRgshUYTVuUigU7ptVYkFJQ7abUB0nyg==}
 
   cssesc@3.0.0:
     resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
@@ -6498,6 +6518,10 @@ packages:
     resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
     engines: {node: '>=12'}
 
+  data-uri-to-buffer@4.0.1:
+    resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
+    engines: {node: '>= 12'}
+
   data-view-buffer@1.0.2:
     resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
     engines: {node: '>= 0.4'}
@@ -6527,8 +6551,8 @@ packages:
   dayjs@1.11.18:
     resolution: {integrity: sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==}
 
-  db0@0.3.2:
-    resolution: {integrity: sha512-xzWNQ6jk/+NtdfLyXEipbX55dmDSeteLFt/ayF+wZUU5bzKgmrDOxmInUTbyVRp46YwnJdkDA1KhB7WIXFofJw==}
+  db0@0.3.4:
+    resolution: {integrity: sha512-RiXXi4WaNzPTHEOu8UPQKMooIbqOEyqA1t7Z6MsdxSCeb8iUC9ko3LcmsLmeUt2SM5bctfArZKkRQggKZz7JNw==}
     peerDependencies:
       '@electric-sql/pglite': '*'
       '@libsql/client': '*'
@@ -6660,8 +6684,8 @@ packages:
     engines: {node: '>=0.10'}
     hasBin: true
 
-  detect-libc@2.1.0:
-    resolution: {integrity: sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==}
+  detect-libc@2.1.2:
+    resolution: {integrity: sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==}
     engines: {node: '>=8'}
 
   devlop@1.1.0:
@@ -6688,6 +6712,10 @@ packages:
   didyoumean@1.2.2:
     resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
+  diff-sequences@27.5.1:
+    resolution: {integrity: sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+
   dijkstrajs@1.0.3:
     resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
 
@@ -6743,6 +6771,10 @@ packages:
   dot-case@3.0.4:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
 
+  dot-prop@10.1.0:
+    resolution: {integrity: sha512-MVUtAugQMOff5RnBy2d9N31iG0lNwg1qAoAOn7pOK5wf94WIaE3My2p3uwTQuvS2AcqchkcR3bHByjaM0mmi7Q==}
+    engines: {node: '>=20'}
+
   dot-prop@5.3.0:
     resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
     engines: {node: '>=8'}
@@ -6763,8 +6795,8 @@ packages:
     resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
     engines: {node: '>=12'}
 
-  dotenv@17.2.2:
-    resolution: {integrity: sha512-Sf2LSQP+bOlhKWWyhFsn0UsfdK/kCWRv1iuA2gXAwt3dyNabr6QSj00I2V10pidqz69soatm9ZwZvpQMTIOd5Q==}
+  dotenv@17.2.3:
+    resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
     engines: {node: '>=12'}
 
   dotenv@8.6.0:
@@ -6800,11 +6832,11 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-to-chromium@1.5.221:
-    resolution: {integrity: sha512-/1hFJ39wkW01ogqSyYoA4goOXOtMRy6B+yvA1u42nnsEGtHzIzmk93aPISumVQeblj47JUHLC9coCjUxb1EvtQ==}
+  electron-to-chromium@1.5.234:
+    resolution: {integrity: sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==}
 
-  element-plus@2.11.2:
-    resolution: {integrity: sha512-sTMDXtgeqy17TUsBSH/DL3h1/5sqIOVUUgXFoVbdD8lWWYssKrDX50CEYy4k29tYJhPHKZyFSwcLJsIajr+dDA==}
+  element-plus@2.11.4:
+    resolution: {integrity: sha512-sLq+Ypd0cIVilv8wGGMEGvzRVBBsRpJjnAS5PsI/1JU1COZXqzH3N1UYMUc/HCdvdjf6dfrBy80Sj7KcACsT7w==}
     peerDependencies:
       vue: ^3.5.17
 
@@ -6827,9 +6859,6 @@ packages:
   encoding-sniffer@0.2.1:
     resolution: {integrity: sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==}
 
-  encoding@0.1.13:
-    resolution: {integrity: sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==}
-
   enhanced-resolve@5.18.3:
     resolution: {integrity: sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==}
     engines: {node: '>=10.13.0'}
@@ -6861,9 +6890,6 @@ packages:
     resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
     engines: {node: '>=18'}
 
-  err-code@2.0.3:
-    resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
-
   errno@0.1.8:
     resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
     hasBin: true
@@ -6907,8 +6933,8 @@ packages:
     resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
     engines: {node: '>= 0.4'}
 
-  es-toolkit@1.39.10:
-    resolution: {integrity: sha512-E0iGnTtbDhkeczB0T+mxmoVlT4YNweEKBLq7oaU4p11mecdsZpNWOglI4895Vh4usbQ+LsJiuLuI2L0Vdmfm2w==}
+  es-toolkit@1.40.0:
+    resolution: {integrity: sha512-8o6w0KFmU0CiIl0/Q/BCEOabF2IJaELM1T2PWj6e8KqzHv1gdx+7JtFnDwOx1kJH/isJ5NwlDG1nCr1HrRF94Q==}
 
   esbuild@0.25.3:
     resolution: {integrity: sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==}
@@ -6955,8 +6981,8 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
 
-  eslint-config-turbo@2.5.6:
-    resolution: {integrity: sha512-1EV/UqdKE75st9q6y0MCxz7qp2v7RyGvbQsMLSuCz+VH8ScnSfmhd8FcAbqx3BshCy5IluujzMB6T5iCgL3/sA==}
+  eslint-config-turbo@2.5.8:
+    resolution: {integrity: sha512-wzxmN7dJNFGDwOvR/4j8U2iaIH/ruYez8qg/sCKrezJ3+ljbFMvJLmgKKt/1mDuyU9wj5aZqO6VijP3QH169FA==}
     peerDependencies:
       eslint: '>6.6.0'
       turbo: '>2.0.0'
@@ -7017,14 +7043,14 @@ packages:
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
 
-  eslint-plugin-jsonc@2.20.1:
-    resolution: {integrity: sha512-gUzIwQHXx7ZPypUoadcyRi4WbHW2TPixDr0kqQ4miuJBU0emJmyGTlnaT3Og9X2a8R1CDayN9BFSq5weGWbTng==}
+  eslint-plugin-jsonc@2.21.0:
+    resolution: {integrity: sha512-HttlxdNG5ly3YjP1cFMP62R4qKLxJURfBZo2gnMY+yQojZxkLyOpY1H1KRTKBmvQeSG9pIpSGEhDjE17vvYosg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
 
-  eslint-plugin-n@17.23.0:
-    resolution: {integrity: sha512-aPePGxUr5LezcXmMRBF83eK1MmqUYY1NdLdHC+jdpfc5b98eL7yDXY20gXJ6DcTxrHBhrLsfYYqo7J+m0h9YXQ==}
+  eslint-plugin-n@17.23.1:
+    resolution: {integrity: sha512-68PealUpYoHOBh332JLLD9Sj7OQUDkFpmcfqt8R9sySfFSeuGJjMTJQvCRRB96zO3A/PELRLkPrzsHmzEFQQ5A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: '>=8.23.0'
@@ -7033,8 +7059,8 @@ packages:
     resolution: {integrity: sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==}
     engines: {node: '>=5.0.0'}
 
-  eslint-plugin-perfectionist@4.15.0:
-    resolution: {integrity: sha512-pC7PgoXyDnEXe14xvRUhBII8A3zRgggKqJFx2a82fjrItDs1BSI7zdZnQtM2yQvcyod6/ujmzb7ejKPx8lZTnw==}
+  eslint-plugin-perfectionist@4.15.1:
+    resolution: {integrity: sha512-MHF0cBoOG0XyBf7G0EAFCuJJu4I18wy0zAoT1OHfx2o6EOx1EFTIzr2HGeuZa1kDcusoX0xJ9V7oZmaeFd773Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       eslint: '>=8.45.0'
@@ -7059,8 +7085,8 @@ packages:
     peerDependencies:
       eslint: '>=8.44.0'
 
-  eslint-plugin-turbo@2.5.6:
-    resolution: {integrity: sha512-KUDE23aP2JV8zbfZ4TeM1HpAXzMM/AYG/bJam7P4AalUxas8Pd/lS/6R3p4uX91qJcH1LwL4h0ED48nDe8KorQ==}
+  eslint-plugin-turbo@2.5.8:
+    resolution: {integrity: sha512-bVjx4vTH0oTKIyQ7EGFAXnuhZMrKIfu17qlex/dps7eScPnGQLJ3r1/nFq80l8xA+8oYjsSirSQ2tXOKbz3kEw==}
     peerDependencies:
       eslint: '>6.6.0'
       turbo: '>2.0.0'
@@ -7093,14 +7119,17 @@ packages:
       vitest:
         optional: true
 
-  eslint-plugin-vue@10.4.0:
-    resolution: {integrity: sha512-K6tP0dW8FJVZLQxa2S7LcE1lLw3X8VvB3t887Q6CLrFVxHYBXGANbXvwNzYIu6Ughx1bSJ5BDT0YB3ybPT39lw==}
+  eslint-plugin-vue@10.5.0:
+    resolution: {integrity: sha512-7BZHsG3kC2vei8F2W8hnfDi9RK+cv5eKPMvzBdrl8Vuc0hR5odGQRli8VVzUkrmUHkxFEm4Iio1r5HOKslO0Aw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
+      '@stylistic/eslint-plugin': ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
       '@typescript-eslint/parser': ^7.0.0 || ^8.0.0
       eslint: ^8.57.0 || ^9.0.0
       vue-eslint-parser: ^10.0.0
     peerDependenciesMeta:
+      '@stylistic/eslint-plugin':
+        optional: true
       '@typescript-eslint/parser':
         optional: true
 
@@ -7116,8 +7145,8 @@ packages:
     resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
-  eslint@9.35.0:
-    resolution: {integrity: sha512-QePbBFMJFjgmlE+cXAlbHZbHpdFVS2E/6vzCy7aKlebddvl1vadiC4JFV5u/wqTkNUwEV8WrQi257jf5f06hrg==}
+  eslint@9.37.0:
+    resolution: {integrity: sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
     peerDependencies:
@@ -7181,6 +7210,9 @@ packages:
   eventemitter3@5.0.1:
     resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
 
+  events-universal@1.0.1:
+    resolution: {integrity: sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==}
+
   events@3.3.0:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
@@ -7220,8 +7252,8 @@ packages:
   fast-diff@1.3.0:
     resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
 
-  fast-equals@5.2.2:
-    resolution: {integrity: sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==}
+  fast-equals@5.3.2:
+    resolution: {integrity: sha512-6rxyATwPCkaFIL3JLqw8qXqMpIZ942pTX/tbQFkRsDGblS8tNGtlUauA/+mt6RUfqn/4MoEr+WDkYoIQbibWuQ==}
     engines: {node: '>=6.0.0'}
 
   fast-fifo@1.3.2:
@@ -7270,6 +7302,10 @@ packages:
   feelin@3.2.0:
     resolution: {integrity: sha512-GFDbHsTYk7YXO1tyw1dOjb7IODeAZvNIosdGZThUwPx5XcD/XhO0hnPZXsIbAzSsIdrgGlTEEdby9fZ2gixysA==}
 
+  fetch-blob@3.2.0:
+    resolution: {integrity: sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==}
+    engines: {node: ^12.20 || >= 14.13}
+
   figures@6.1.0:
     resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==}
     engines: {node: '>=18'}
@@ -7326,8 +7362,8 @@ packages:
     resolution: {integrity: sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==}
     engines: {node: '>=18'}
 
-  flat-cache@6.1.14:
-    resolution: {integrity: sha512-ExZSCSV9e7v/Zt7RzCbX57lY2dnPdxzU/h3UE6WJ6NtEMfwBd8jmi1n4otDEUfz+T/R+zxrFDpICFdjhD3H/zw==}
+  flat-cache@6.1.17:
+    resolution: {integrity: sha512-Jzse4YoiUJBVYTwz5Bwl4h/2VQM7e2KK3MVAMlXzX9uamIHAH/TXUlRKU1AQGQOryQhN0EsmufiiF40G057YXA==}
 
   flatted@3.3.3:
     resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
@@ -7356,6 +7392,14 @@ packages:
     resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
     engines: {node: '>= 6'}
 
+  formdata-node@6.0.3:
+    resolution: {integrity: sha512-8e1++BCiTzUno9v5IZ2J6bv4RU+3UKDmqWUQD0MIMVCd9AdhWkO1gw57oo1mNEX1dMq2EGI+FbWz4B92pscSQg==}
+    engines: {node: '>= 18'}
+
+  formdata-polyfill@4.0.10:
+    resolution: {integrity: sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==}
+    engines: {node: '>=12.20.0'}
+
   fraction.js@4.3.7:
     resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
 
@@ -7413,6 +7457,10 @@ packages:
   functions-have-names@1.2.3:
     resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
 
+  generator-function@2.0.1:
+    resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==}
+    engines: {node: '>= 0.4'}
+
   gensequence@7.0.0:
     resolution: {integrity: sha512-47Frx13aZh01afHJTB3zTtKIlFI6vWY+MYCN9Qpew6i52rfKjnhCF/l1YlC8UmEMvvntZZ6z4PiCcmyuedR2aQ==}
     engines: {node: '>=18'}
@@ -7459,8 +7507,8 @@ packages:
     resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
     engines: {node: '>= 0.4'}
 
-  get-tsconfig@4.10.1:
-    resolution: {integrity: sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==}
+  get-tsconfig@4.12.0:
+    resolution: {integrity: sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==}
 
   giget@2.0.0:
     resolution: {integrity: sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==}
@@ -7536,6 +7584,10 @@ packages:
     resolution: {integrity: sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==}
     engines: {node: '>=18'}
 
+  globby@15.0.0:
+    resolution: {integrity: sha512-oB4vkQGqlMl682wL1IlWd02tXCbquGWM4voPEI85QmNKCaw8zGTm1f1rubFgkg3Eli2PtKlFgrnmUqasbQWlkw==}
+    engines: {node: '>=20'}
+
   globjoin@0.1.4:
     resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
 
@@ -7589,10 +7641,6 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  has-own-prop@2.0.0:
-    resolution: {integrity: sha512-Pq0h+hvsVm6dDEa8x82GnLSYHOzNDt7f0ddFa3FqcQlgzEiptPqL+XrOJNavjOzSYiYWIrgeVYYgGlLmnxwilQ==}
-    engines: {node: '>=8'}
-
   has-property-descriptors@1.0.2:
     resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
 
@@ -7636,8 +7684,8 @@ packages:
   hookable@5.5.3:
     resolution: {integrity: sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==}
 
-  hookified@1.12.0:
-    resolution: {integrity: sha512-hMr1Y9TCLshScrBbV2QxJ9BROddxZ12MX9KsCtuGGy/3SmmN5H1PllKerrVlSotur9dlE8hmUKAOSa3WDzsZmQ==}
+  hookified@1.12.1:
+    resolution: {integrity: sha512-xnKGl+iMIlhrZmGHB729MqlmPoWBznctSQTYCpFKqNsCgimJQmithcW0xSQMMFzYnV2iKUh25alswn6epgxS0Q==}
 
   htm@3.1.1:
     resolution: {integrity: sha512-983Vyg8NwUE7JkZ6NmOqpCZ+sh1bKv2iYTlUkzlWmA5JD2acKoxd4KVxbMmxX/85mtfdnDmTFoNKcg5DGAvxNQ==}
@@ -7665,17 +7713,10 @@ packages:
   htmlparser2@8.0.2:
     resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
 
-  http-cache-semantics@4.2.0:
-    resolution: {integrity: sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==}
-
   http-errors@2.0.0:
     resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
     engines: {node: '>= 0.8'}
 
-  http-proxy-agent@7.0.2:
-    resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
-    engines: {node: '>= 14'}
-
   http-shutdown@1.2.2:
     resolution: {integrity: sha512-S9wWkJ/VSY9/k4qcjG318bqJNruzE4HySUhFYknwmu6LBP97KLLfwNf+n4V1BHurvFNkSKLFnK/RsuUnRTf9Vw==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
@@ -7687,8 +7728,8 @@ packages:
   httpxy@0.1.7:
     resolution: {integrity: sha512-pXNx8gnANKAndgga5ahefxc++tJvNL87CXoRwxn1cJE2ZkWEojF3tNfQIEhZX/vfpt+wzeAzpUI4qkediX1MLQ==}
 
-  human-id@4.1.1:
-    resolution: {integrity: sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==}
+  human-id@4.1.2:
+    resolution: {integrity: sha512-v/J+4Z/1eIJovEBdlV5TYj1IR+ZiohcYGRY+qN/oC9dAfKzVT023N/Bgw37hrKCoVRBvk3bqyzpr2PP5YeTMSg==}
     hasBin: true
 
   human-signals@5.0.0:
@@ -7776,14 +7817,10 @@ packages:
     resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
     engines: {node: '>=12'}
 
-  ioredis@5.7.0:
-    resolution: {integrity: sha512-NUcA93i1lukyXU+riqEyPtSEkyFq8tX90uL659J+qpCZ3rEdViB/APC58oAhIh3+bJln2hzdlZbBZsGNrlsR8g==}
+  ioredis@5.8.1:
+    resolution: {integrity: sha512-Qho8TgIamqEPdgiMadJwzRMW3TudIg6vpg4YONokGDudy4eqRIJtDbVX72pfLBcWxvbn3qm/40TyGUObdW4tLQ==}
     engines: {node: '>=12.22.0'}
 
-  ip-address@10.0.1:
-    resolution: {integrity: sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==}
-    engines: {node: '>= 12'}
-
   iron-webcrypto@1.2.1:
     resolution: {integrity: sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==}
 
@@ -7872,8 +7909,8 @@ packages:
     resolution: {integrity: sha512-5XHYaSyiqADb4RnZ1Bdad6cPp8Toise4TzEjcOYDHZkTCbKgiUl7WTUCpNWHuxmDt91wnsZBc9xinNzopv3JMQ==}
     engines: {node: '>=18'}
 
-  is-generator-function@1.1.0:
-    resolution: {integrity: sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==}
+  is-generator-function@1.1.2:
+    resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
     engines: {node: '>= 0.4'}
 
   is-glob@4.0.3:
@@ -8067,8 +8104,8 @@ packages:
     resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
     hasBin: true
 
-  jiti@2.5.1:
-    resolution: {integrity: sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==}
+  jiti@2.6.1:
+    resolution: {integrity: sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==}
     hasBin: true
 
   jju@1.4.0:
@@ -8144,8 +8181,8 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
-  jsonc-eslint-parser@2.4.0:
-    resolution: {integrity: sha512-WYDyuc/uFcGp6YtM2H0uKmUwieOuzeE/5YocFJLnLfclZ4inf3mRn8ZVy1s7Hxji7Jxm6Ss8gqpexD/GlKoGgg==}
+  jsonc-eslint-parser@2.4.1:
+    resolution: {integrity: sha512-uuPNLJkKN8NXAlZlQ6kmUF9qO+T6Kyd7oV4+/7yy8Jz6+MZNyhPq8EdLpdfnPVzUC8qSf1b4j1azKaGnFsjmsw==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   jsonfile@4.0.0:
@@ -8172,15 +8209,15 @@ packages:
   jws@3.2.2:
     resolution: {integrity: sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==}
 
-  katex@0.16.22:
-    resolution: {integrity: sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==}
+  katex@0.16.23:
+    resolution: {integrity: sha512-7VlC1hsEEolL9xNO05v9VjrvWZePkCVBJqj8ruICxYjZfHaHbaU53AlP+PODyFIXEnaEIEWi3wJy7FPZ95JAVg==}
     hasBin: true
 
   keyv@4.5.4:
     resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
-  keyv@5.5.2:
-    resolution: {integrity: sha512-TXcFHbmm/z7MGd1u9ASiCSfTS+ei6Z8B3a5JHzx3oPa/o7QzWVtPRpc4KGER5RR469IC+/nfg4U5YLIuDUua2g==}
+  keyv@5.5.3:
+    resolution: {integrity: sha512-h0Un1ieD+HUrzBH6dJXhod3ifSghk5Hw/2Y4/KHBziPlZecrFyE9YOTPU6eOs0V9pYl8gOs86fkr/KN8lUX39A==}
 
   kind-of@6.0.3:
     resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
@@ -8206,8 +8243,8 @@ packages:
   kolorist@1.8.0:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
 
-  ky@1.10.0:
-    resolution: {integrity: sha512-YRPCzHEWZffbfvmRrfwa+5nwBHwZuYiTrfDX0wuhGBPV0pA/zCqcOq93MDssON/baIkpYbvehIX5aLpMxrRhaA==}
+  ky@1.11.0:
+    resolution: {integrity: sha512-NEyo0ICpS0cqSuyoJFMCnHOZJILqXsKhIZlHJGDYaH8OB5IFrGzuBpEwyoMZG6gUKMPrazH30Ax5XKaujvD8ag==}
     engines: {node: '>=18'}
 
   latest-version@9.0.0:
@@ -8218,62 +8255,62 @@ packages:
     resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
     engines: {node: '>= 0.6.3'}
 
-  lefthook-darwin-arm64@1.13.1:
-    resolution: {integrity: sha512-bMD34zeaKTtA5DAAIs910bUN5agCsZbzIwPnqA5Zvbm9igvbCkRerc5bAOCYcMUzleXA54g5hdDnDNwSwAo+JQ==}
+  lefthook-darwin-arm64@1.13.6:
+    resolution: {integrity: sha512-m6Lb77VGc84/Qo21Lhq576pEvcgFCnvloEiP02HbAHcIXD0RTLy9u2yAInrixqZeaz13HYtdDaI7OBYAAdVt8A==}
     cpu: [arm64]
     os: [darwin]
 
-  lefthook-darwin-x64@1.13.1:
-    resolution: {integrity: sha512-eOv25Scxxu/dgWg/o0QkIMcYHmBrL6ffozeHRDHUC2N0n0eAvp9FpexoJ+Mm7+VQVPCnQumjIvyUNLRqlEAcyg==}
+  lefthook-darwin-x64@1.13.6:
+    resolution: {integrity: sha512-CoRpdzanu9RK3oXR1vbEJA5LN7iB+c7hP+sONeQJzoOXuq4PNKVtEaN84Gl1BrVtCNLHWFAvCQaZPPiiXSy8qg==}
     cpu: [x64]
     os: [darwin]
 
-  lefthook-freebsd-arm64@1.13.1:
-    resolution: {integrity: sha512-Hzw2E+zX1/GseCrJS1b1i9oj6JhM2+MFOysCUmMYl8x0yDphxepJXr3wH8bNXENtuVN0Om1IWdZC+6p6+ZY8zw==}
+  lefthook-freebsd-arm64@1.13.6:
+    resolution: {integrity: sha512-X4A7yfvAJ68CoHTqP+XvQzdKbyd935sYy0bQT6Ajz7FL1g7hFiro8dqHSdPdkwei9hs8hXeV7feyTXbYmfjKQQ==}
     cpu: [arm64]
     os: [freebsd]
 
-  lefthook-freebsd-x64@1.13.1:
-    resolution: {integrity: sha512-H1T4A6auTBEQY0uWh5E7LDTPa5I9ALfubNHVsiE3XzwRjwu3PazCY9zPCTbdI8ww9JOV6T9A7Mow2GewoHWBUQ==}
+  lefthook-freebsd-x64@1.13.6:
+    resolution: {integrity: sha512-ai2m+Sj2kGdY46USfBrCqLKe9GYhzeq01nuyDYCrdGISePeZ6udOlD1k3lQKJGQCHb0bRz4St0r5nKDSh1x/2A==}
     cpu: [x64]
     os: [freebsd]
 
-  lefthook-linux-arm64@1.13.1:
-    resolution: {integrity: sha512-3vNxmRma1ykaG+rpxjKytvxSj6Kl9f/W19Qjdi+BFVu2LueMY5AGPs1oXpDjled7Y7c3WL4XLtQ+xPFHl8z9Sw==}
+  lefthook-linux-arm64@1.13.6:
+    resolution: {integrity: sha512-cbo4Wtdq81GTABvikLORJsAWPKAJXE8Q5RXsICFUVznh5PHigS9dFW/4NXywo0+jfFPCT6SYds2zz4tCx6DA0Q==}
     cpu: [arm64]
     os: [linux]
 
-  lefthook-linux-x64@1.13.1:
-    resolution: {integrity: sha512-vitul4TY/4RCiH90XDcWZT/XItfHeCuzlt/Ex3dF2ZToEgXzQti8qWG1i9QhSaunu0X/7KIWLlHV9q5uymNBsQ==}
+  lefthook-linux-x64@1.13.6:
+    resolution: {integrity: sha512-uJl9vjCIIBTBvMZkemxCE+3zrZHlRO7Oc+nZJ+o9Oea3fu+W82jwX7a7clw8jqNfaeBS+8+ZEQgiMHWCloTsGw==}
     cpu: [x64]
     os: [linux]
 
-  lefthook-openbsd-arm64@1.13.1:
-    resolution: {integrity: sha512-3TDbaxWiqDuA6a+IuAOh64CiTsyVsnTgQDF8u+STH81RYs70a1g2XHKRGxPMhJMLigy7TEk5z3FUkiKw4pofWQ==}
+  lefthook-openbsd-arm64@1.13.6:
+    resolution: {integrity: sha512-7r153dxrNRQ9ytRs2PmGKKkYdvZYFPre7My7XToSTiRu5jNCq++++eAKVkoyWPduk97dGIA+YWiEr5Noe0TK2A==}
     cpu: [arm64]
     os: [openbsd]
 
-  lefthook-openbsd-x64@1.13.1:
-    resolution: {integrity: sha512-0mP/wtzdPliwRHQNPSCYbIc+6KCWLNWp/HHRCpurwrWJ6z4mab3ctemghhTkHj+0ZDSO0kM66Awygq86JnOwIA==}
+  lefthook-openbsd-x64@1.13.6:
+    resolution: {integrity: sha512-Z+UhLlcg1xrXOidK3aLLpgH7KrwNyWYE3yb7ITYnzJSEV8qXnePtVu8lvMBHs/myzemjBzeIr/U/+ipjclR06g==}
     cpu: [x64]
     os: [openbsd]
 
-  lefthook-windows-arm64@1.13.1:
-    resolution: {integrity: sha512-6wrUZOC1SGsp9riO3dILPzoMkjOSpYIyojbU+jUdlMwCfSMGR5jrFlzRTEyrEoawFhGk3+KnFPYbOdlp8LWPkw==}
+  lefthook-windows-arm64@1.13.6:
+    resolution: {integrity: sha512-Uxef6qoDxCmUNQwk8eBvddYJKSBFglfwAY9Y9+NnnmiHpWTjjYiObE9gT2mvGVpEgZRJVAatBXc+Ha5oDD/OgQ==}
     cpu: [arm64]
     os: [win32]
 
-  lefthook-windows-x64@1.13.1:
-    resolution: {integrity: sha512-K/abjvUqtazOjXtrqKz+O+J+D/lZqvrjuWO9gLCbDKbzV13IwqvE+eIJ7TXCAwqp3/MN2r2pwpL83t17fxshBA==}
+  lefthook-windows-x64@1.13.6:
+    resolution: {integrity: sha512-mOZoM3FQh3o08M8PQ/b3IYuL5oo36D9ehczIw1dAgp1Ly+Tr4fJ96A+4SEJrQuYeRD4mex9bR7Ps56I73sBSZA==}
     cpu: [x64]
     os: [win32]
 
-  lefthook@1.13.1:
-    resolution: {integrity: sha512-zPtBnDI86o2Xoe61tr+0r8ebLVek/aEKF77gA+V5C7zi4Of1CY6FFHx0Gzazzj9JfTCq9SWtUv1halWSWMPAQQ==}
+  lefthook@1.13.6:
+    resolution: {integrity: sha512-ojj4/4IJ29Xn4drd5emqVgilegAPN3Kf0FQM2p/9+lwSTpU+SZ1v4Ig++NF+9MOa99UKY8bElmVrLhnUUNFh5g==}
     hasBin: true
 
-  less@4.4.1:
-    resolution: {integrity: sha512-X9HKyiXPi0f/ed0XhgUlBeFfxrlDP3xR4M7768Zl+WXLUViuL9AOPPJP4nCV0tgRWvTYvpNmN0SFhZOQzy16PA==}
+  less@4.4.2:
+    resolution: {integrity: sha512-j1n1IuTX1VQjIy3tT7cyGbX7nvQOsFLoIqobZv4ttI5axP923gA44zUj6miiA6R5Aoms4sEGVIIcucXUbRI14g==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -8285,8 +8322,8 @@ packages:
     resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
     engines: {node: '>= 0.8.0'}
 
-  lezer-feel@1.8.1:
-    resolution: {integrity: sha512-g0eGi7/INNPtPbtcz5ubInc3rSvXuJI5NfmS1hVU1FkaKNdBpwWdxXzrUb4wxr8DNXhXnUs1/a9rO4HaDzII7Q==}
+  lezer-feel@1.9.0:
+    resolution: {integrity: sha512-x8z6pCih3I3BOq3kBbhw6VUOU9Sg61PBJ1nigTgDl1yM5f0OPzEjK7GRJXutrSJDiUK8zwgqBvUJFlSfGLNZUg==}
 
   lilconfig@3.1.3:
     resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
@@ -8325,6 +8362,9 @@ packages:
     resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
+  locko@1.1.0:
+    resolution: {integrity: sha512-pYB2dzRY93fJkg2RIl41AMNgTQftEjyTK9vlPrGOJvuGQsOjb267VJBw15BjiN3RBd1oBoKkOu9E2dRdFKIfAA==}
+
   lodash-es@4.17.21:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
 
@@ -8338,9 +8378,6 @@ packages:
   lodash.camelcase@4.3.0:
     resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
 
-  lodash.castarray@4.4.0:
-    resolution: {integrity: sha512-aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==}
-
   lodash.clonedeep@4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
 
@@ -8439,8 +8476,8 @@ packages:
   lru-cache@10.4.3:
     resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
-  lru-cache@11.2.1:
-    resolution: {integrity: sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ==}
+  lru-cache@11.2.2:
+    resolution: {integrity: sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==}
     engines: {node: 20 || >=22}
 
   lru-cache@5.1.1:
@@ -8476,10 +8513,6 @@ packages:
     resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==}
     engines: {node: '>=6'}
 
-  make-fetch-happen@15.0.1:
-    resolution: {integrity: sha512-9GjpQcaUXO2xmre8JfALl8Oji8Jpo+SyY2HpqFFPHVczOld/I+JFRx9FkP/uedZzkJlI9uM5t/j6dGJv4BScQw==}
-    engines: {node: ^20.17.0 || >=22.9.0}
-
   mark.js@8.11.1:
     resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==}
 
@@ -8650,10 +8683,6 @@ packages:
     resolution: {integrity: sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minipass-fetch@4.0.1:
-    resolution: {integrity: sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   minipass-flush@1.0.5:
     resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==}
     engines: {node: '>= 8'}
@@ -8662,10 +8691,6 @@ packages:
     resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
     engines: {node: '>=8'}
 
-  minipass-sized@1.0.3:
-    resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
-    engines: {node: '>=8'}
-
   minipass@3.3.6:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
@@ -8677,18 +8702,13 @@ packages:
   minisearch@7.2.0:
     resolution: {integrity: sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==}
 
-  minizlib@3.0.2:
-    resolution: {integrity: sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==}
+  minizlib@3.1.0:
+    resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
     engines: {node: '>= 18'}
 
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
-  mkdirp@3.0.1:
-    resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   mkdist@2.4.1:
     resolution: {integrity: sha512-Ezk0gi04GJBkqMfsksICU5Rjoemc4biIekwgrONWVPor2EO/N9nBgN6MZXAf7Yw4mDDhrNyKbdETaHNevfumKg==}
     hasBin: true
@@ -8750,16 +8770,16 @@ packages:
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
-  nanoid@5.1.5:
-    resolution: {integrity: sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==}
+  nanoid@5.1.6:
+    resolution: {integrity: sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==}
     engines: {node: ^18 || >=20}
     hasBin: true
 
   nanopop@2.4.2:
     resolution: {integrity: sha512-NzOgmMQ+elxxHeIha+OG/Pv3Oc3p4RU2aBhwWwAqDpXrdTbtRylbRLQztLy8dMMwfl6pclznBdfUhccEn9ZIzw==}
 
-  napi-postinstall@0.3.3:
-    resolution: {integrity: sha512-uTp172LLXSxuSYHv/kou+f6KW3SMppU9ivthaVTXian9sOt3XM/zHYHpRZiLgQoxeWfYUnslNWQHF1+G71xcow==}
+  napi-postinstall@0.3.4:
+    resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     hasBin: true
 
@@ -8775,12 +8795,8 @@ packages:
     engines: {node: '>= 4.4.x'}
     hasBin: true
 
-  negotiator@1.0.0:
-    resolution: {integrity: sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==}
-    engines: {node: '>= 0.6'}
-
-  nitropack@2.12.6:
-    resolution: {integrity: sha512-DEq31s0SP4/Z5DIoVBRo9DbWFPWwIoYD4cQMEz7eE+iJMiAP+1k9A3B9kcc6Ihc0jDJmfUcHYyh6h2XlynCx6g==}
+  nitropack@2.12.7:
+    resolution: {integrity: sha512-HWyzMBj2d8b14J6Cfnxv97ztnuHIgXNcrGiWCruLfb2ZfKsp6OCbZYJm5T9sv/ZKl8LedhatrMKG66HWJux9Rg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -8798,6 +8814,15 @@ packages:
   node-cleanup@2.1.2:
     resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
 
+  node-domexception@1.0.0:
+    resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
+    engines: {node: '>=10.5.0'}
+    deprecated: Use your platform's native DOMException instead
+
+  node-fetch-cache@5.1.0:
+    resolution: {integrity: sha512-4j3rRHNGIKGX7VzXSrBT0bh7+wFuyJv1DxCfCLDHsnDahJWoD9lXe3BzL3BJg/GEIJiM7KIvqVs3byW1GFtRsQ==}
+    engines: {node: '>=18.19.0'}
+
   node-fetch-native@1.6.7:
     resolution: {integrity: sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==}
 
@@ -8810,6 +8835,10 @@ packages:
       encoding:
         optional: true
 
+  node-fetch@3.3.2:
+    resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
   node-forge@1.3.1:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
     engines: {node: '>= 6.13.0'}
@@ -8824,8 +8853,8 @@ packages:
   node-mock-http@1.0.3:
     resolution: {integrity: sha512-jN8dK25fsfnMrVsEhluUTPkBFY+6ybu7jSB1n+ri/vOGjJxU8J9CZhpSGkHXSkFjtUhbmoncG/YG9ta5Ludqog==}
 
-  node-releases@2.0.21:
-    resolution: {integrity: sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==}
+  node-releases@2.0.23:
+    resolution: {integrity: sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==}
 
   nopt@7.2.1:
     resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==}
@@ -8993,8 +9022,8 @@ packages:
   package-manager-detector@0.2.11:
     resolution: {integrity: sha512-BEnLolu+yuz22S56CU1SUKq3XC3PkwD5wv4ikR4MfGvnRVcmzXR9DwSlW2fEamyTPyXHomBJRzgapeuBvRNzJQ==}
 
-  package-manager-detector@1.3.0:
-    resolution: {integrity: sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==}
+  package-manager-detector@1.4.0:
+    resolution: {integrity: sha512-rRZ+pR1Usc+ND9M2NkmCvE/LYJS+8ORVV9X0KuNSY/gFsp7RBHJM/ADh9LYq4Vvfq6QkKrW6/weuh8SMEtN5gw==}
 
   pako@2.1.0:
     resolution: {integrity: sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug==}
@@ -9168,13 +9197,13 @@ packages:
   pkg-types@2.3.0:
     resolution: {integrity: sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==}
 
-  playwright-core@1.55.0:
-    resolution: {integrity: sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==}
+  playwright-core@1.56.0:
+    resolution: {integrity: sha512-1SXl7pMfemAMSDn5rkPeZljxOCYAmQnYLBTExuh6E8USHXGSX3dx6lYZN/xPpTz1vimXmPA9CDnILvmJaB8aSQ==}
     engines: {node: '>=18'}
     hasBin: true
 
-  playwright@1.55.0:
-    resolution: {integrity: sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==}
+  playwright@1.56.0:
+    resolution: {integrity: sha512-X5Q1b8lOdWIE4KAoHpW3SE8HvUB+ZZsUoN64ZhjnN8dOb1UpujxBtENGiZFE+9F/yhzJwYa+ca3u43FeLbboHA==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -9219,8 +9248,8 @@ packages:
     peerDependencies:
       postcss: ^8.4.6
 
-  postcss-color-functional-notation@7.0.11:
-    resolution: {integrity: sha512-zfqoUSaHMko/k2PA9xnaydVTHqYv5vphq5Q2AHcG/dCdv/OkHYWcVWfVTBKZ526uzT8L7NghuvSw3C9PxlKnLg==}
+  postcss-color-functional-notation@7.0.12:
+    resolution: {integrity: sha512-TLCW9fN5kvO/u38/uesdpbx3e8AkTYhMvDZYa9JpmImWuTE99bDQ7GU7hdOADIZsiI9/zuxfAJxny/khknp1Zw==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -9297,8 +9326,8 @@ packages:
     peerDependencies:
       postcss: ^8.4.32
 
-  postcss-double-position-gradients@6.0.3:
-    resolution: {integrity: sha512-Dl0Z9sdbMwrPslgOaGBZRGo3TASmmgTcqcUODr82MTYyJk6devXZM6MlQjpQKMJqlLJ6oL1w78U7IXFdPA5+ug==}
+  postcss-double-position-gradients@6.0.4:
+    resolution: {integrity: sha512-m6IKmxo7FxSP5nF2l63QbCC3r+bWpFUWmZXZf096WxG0m7Vl1Q1+ruFOhpdDRmKrRS+S3Jtk+TVk/7z0+BVK6g==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -9354,22 +9383,28 @@ packages:
     peerDependencies:
       postcss: ^8.4.21
 
-  postcss-lab-function@7.0.11:
-    resolution: {integrity: sha512-BEA4jId8uQe1gyjZZ6Bunb6ZsH2izks+v25AxQJDBtigXCjTLmCPWECwQpLTtcxH589MVxhs/9TAmRC6lUEmXQ==}
+  postcss-lab-function@7.0.12:
+    resolution: {integrity: sha512-tUcyRk1ZTPec3OuKFsqtRzW2Go5lehW29XA21lZ65XmzQkz43VY2tyWEC202F7W3mILOjw0voOiuxRGTsN+J9w==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
 
-  postcss-load-config@4.0.2:
-    resolution: {integrity: sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==}
-    engines: {node: '>= 14'}
+  postcss-load-config@6.0.1:
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
     peerDependencies:
+      jiti: '>=1.21.0'
       postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
+      tsx: ^4.8.1
+      yaml: ^2.4.2
     peerDependenciesMeta:
+      jiti:
+        optional: true
       postcss:
         optional: true
-      ts-node:
+      tsx:
+        optional: true
+      yaml:
         optional: true
 
   postcss-logical@8.1.0:
@@ -9524,8 +9559,8 @@ packages:
     peerDependencies:
       postcss: ^8.4
 
-  postcss-preset-env@10.3.1:
-    resolution: {integrity: sha512-8ZOOWVwQ0iMpfEYkYo+U6W7fE2dJ/tP6dtEFwPJ66eB5JjnFupfYh+y6zo+vWDO72nGhKOVdxwhTjfzcSNRg4Q==}
+  postcss-preset-env@10.4.0:
+    resolution: {integrity: sha512-2kqpOthQ6JhxqQq1FSAAZGe9COQv75Aw8WbsOvQVNJ2nSevc9Yx/IKZGuZ7XJ+iOTtVon7LfO7ELRzg8AZ+sdw==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss: ^8.4
@@ -9711,8 +9746,8 @@ packages:
     resolution: {integrity: sha512-mQUvGU6aUFQ+rNvTIAcZuWGRT9a6f6Yrg9bHs4ImKF+HZCEK+plBvnAZYSIQztknZF2qnzNtr6F8s0+IuptdlQ==}
     engines: {node: ^14.13.1 || >=16.0.0}
 
-  pretty-bytes@7.0.1:
-    resolution: {integrity: sha512-285/jRCYIbMGDciDdrw0KPNC4LKEEwz/bwErcYNxSJOi4CpGUuLpb9gQpg3XJP0XYj9ldSRluXxih4lX2YN8Xw==}
+  pretty-bytes@7.1.0:
+    resolution: {integrity: sha512-nODzvTiYVRGRqAOvE84Vk5JDPyyxsVk0/fbA/bq7RqlnhksGpset09XTxbpvLTIjoaF7K8Z8DG8yHtKGTPSYRw==}
     engines: {node: '>=20'}
 
   pretty-ms@9.3.0:
@@ -9723,10 +9758,6 @@ packages:
     resolution: {integrity: sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==}
     engines: {node: '>=6'}
 
-  proc-log@5.0.0:
-    resolution: {integrity: sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==}
-    engines: {node: ^18.17.0 || >=20.5.0}
-
   process-nextick-args@2.0.1:
     resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
 
@@ -9734,10 +9765,6 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
-  promise-retry@2.0.1:
-    resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
-    engines: {node: '>=10'}
-
   property-information@7.1.0:
     resolution: {integrity: sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==}
 
@@ -9750,8 +9777,8 @@ packages:
   prr@1.0.1:
     resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
 
-  publint@0.3.13:
-    resolution: {integrity: sha512-NC+lph09+BRO9LJgKlIy3WQXyu6/6WDQ0dCA60KALUwdKVf3PfGuC6fY8I+oKB/5kEPh50aOSUz+6yWy1n4EfA==}
+  publint@0.3.14:
+    resolution: {integrity: sha512-14/VNBvWsrBeqWNDw8c/DK5ERcZBUwL1rnkVx18cQnF3zadr3GfoYtvD8mxi1dhkWpaPHp8kfi92MDbjMeW3qw==}
     engines: {node: '>=18'}
     hasBin: true
 
@@ -9767,6 +9794,10 @@ packages:
     resolution: {integrity: sha512-LjgDO2zPtoXP2wJpDjZrGdojii1uqO0cnwKoIoUzkfS98HDmbeiGmYiXo3lXeFlq2xvne1QFQhwYXSUCLKtEuA==}
     engines: {node: '>=12.20'}
 
+  qified@0.5.0:
+    resolution: {integrity: sha512-Zj6Q/Vc/SQ+Fzc87N90jJUzBzxD7MVQ2ZvGyMmYtnl2u1a07CejAhvtk4ZwASos+SiHKCAIylyGHJKIek75QBw==}
+    engines: {node: '>=20'}
+
   qrcode@1.5.4:
     resolution: {integrity: sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==}
     engines: {node: '>=10.13.0'}
@@ -9880,8 +9911,8 @@ packages:
     resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
     engines: {node: '>= 0.4'}
 
-  regexpu-core@6.3.1:
-    resolution: {integrity: sha512-DzcswPr252wEr7Qz8AyAVbfyBDKLoYp6eRA1We2Fa9qirRFSdtkP5sHr3yglDKy2BbA0fd2T+j/CUSKes3FeVQ==}
+  regexpu-core@6.4.0:
+    resolution: {integrity: sha512-0ghuzq67LI9bLXpOX/ISfve/Mq33a4aFRzoQYhnnok1JOFpmE/A2TBGkNVenOGEeSBCjIiWcc6MVOG5HEQv0sA==}
     engines: {node: '>=4'}
 
   registry-auth-token@5.1.0:
@@ -9899,6 +9930,10 @@ packages:
     resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
     hasBin: true
 
+  regjsparser@0.13.0:
+    resolution: {integrity: sha512-NZQZdC5wOE/H3UT28fVGL+ikOZcEzfMGk/c3iN9UGxzWHMa1op7274oyiUVrAG4B2EuFhus8SvkaYnhvW92p9Q==}
+    hasBin: true
+
   relateurl@0.2.7:
     resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==}
     engines: {node: '>= 0.10'}
@@ -9914,10 +9949,6 @@ packages:
   remove-accents@0.5.0:
     resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==}
 
-  repeat-string@1.6.1:
-    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: '>=0.10'}
-
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -9963,10 +9994,6 @@ packages:
     resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
     engines: {node: '>=18'}
 
-  retry@0.12.0:
-    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
-    engines: {node: '>= 4'}
-
   reusify@1.1.0:
     resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
     engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
@@ -10002,8 +10029,8 @@ packages:
       rollup:
         optional: true
 
-  rollup-plugin-visualizer@6.0.3:
-    resolution: {integrity: sha512-ZU41GwrkDcCpVoffviuM9Clwjy5fcUxlz0oMoTXTYsK+tcIFzbdacnrr2n8TXcHxbGKKXtOdjxM2HUS4HjkwIw==}
+  rollup-plugin-visualizer@6.0.4:
+    resolution: {integrity: sha512-q8Q7J/6YofkmaGW1sH/fPRAz37x/+pd7VBuaUU7lwvOS/YikuiiEU9jeb9PH8XHiq50XFrUsBbOxeAMYQ7KZkg==}
     engines: {node: '>=18'}
     hasBin: true
     peerDependencies:
@@ -10020,8 +10047,8 @@ packages:
     engines: {node: '>=10.0.0'}
     hasBin: true
 
-  rollup@4.50.2:
-    resolution: {integrity: sha512-BgLRGy7tNS9H66aIMASq1qSYbAAJV6Z6WR4QYTvj5FgF15rZ/ympT1uixHXwzbZUBDbkvqUI1KR0fH1FhMaQ9w==}
+  rollup@4.52.4:
+    resolution: {integrity: sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
@@ -10064,8 +10091,8 @@ packages:
   safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  sass@1.92.1:
-    resolution: {integrity: sha512-ffmsdbwqb3XeyR8jJR6KelIXARM9bFQe8A6Q3W4Klmwy5Ckd5gz7jgUNHo4UOqutU5Sk1DtKLbpDP0nLCg1xqQ==}
+  sass@1.93.2:
+    resolution: {integrity: sha512-t+YPtOQHpGW1QWsh1CHQ5cPIr9lbbGZLZnbihP/D/qZj/yuV68m8qarcV17nvkOX81BCrvzAlq2klCQFZghyTg==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
@@ -10118,8 +10145,8 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  semver@7.7.2:
-    resolution: {integrity: sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==}
+  semver@7.7.3:
+    resolution: {integrity: sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==}
     engines: {node: '>=10'}
     hasBin: true
 
@@ -10229,21 +10256,9 @@ packages:
     resolution: {integrity: sha512-iOBWFgUX7caIZiuutICxVgX1SdxwAVFFKwt1EvMYYec/NWO5meOJ6K5uQxhrYBdQJne4KxiqZc+KptFOWFSI9w==}
     engines: {node: '>=18'}
 
-  smart-buffer@4.2.0:
-    resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
-    engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
-
   smob@1.5.0:
     resolution: {integrity: sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==}
 
-  socks-proxy-agent@8.0.5:
-    resolution: {integrity: sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==}
-    engines: {node: '>= 14'}
-
-  socks@2.8.7:
-    resolution: {integrity: sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==}
-    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
-
   sortablejs@1.14.0:
     resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
 
@@ -10337,8 +10352,8 @@ packages:
     resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
     engines: {node: '>= 0.4'}
 
-  streamx@2.22.1:
-    resolution: {integrity: sha512-znKXEBxfatz2GBNK02kRnCXjV+AA4kjZIUxeWSr3UGirZMJfTE9uiwKHobnbgxWyL/JWro8tTq+vOqAK1/qbSA==}
+  streamx@2.23.0:
+    resolution: {integrity: sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==}
 
   string-argv@0.3.2:
     resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
@@ -10429,8 +10444,8 @@ packages:
     resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
     engines: {node: '>=8'}
 
-  strip-literal@3.0.0:
-    resolution: {integrity: sha512-TcccoMhJOM3OebGhSBEmp3UZ2SfDMZUEBdRA/9ynfLi8yYajyWX3JiXArcJt4Umh4vISpspkQIY8ZZoCqjbviA==}
+  strip-literal@3.1.0:
+    resolution: {integrity: sha512-8r3mkIM/2+PpjHoOtiAW8Rg3jJLHaV7xPwG+YRGrv6FP0wwk/toTpATxWYOW0BKdWwl82VT2tFYi5DlROa0Mxg==}
 
   strnum@1.1.2:
     resolution: {integrity: sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==}
@@ -10524,8 +10539,8 @@ packages:
     peerDependencies:
       stylelint: ^16.0.2
 
-  stylelint@16.24.0:
-    resolution: {integrity: sha512-7ksgz3zJaSbTUGr/ujMXvLVKdDhLbGl3R/3arNudH7z88+XZZGNLMTepsY28WlnvEFcuOmUe7fg40Q3lfhOfSQ==}
+  stylelint@16.25.0:
+    resolution: {integrity: sha512-Li0avYWV4nfv1zPbdnxLYBGq4z8DVZxbRgx4Kn6V+Uftz1rMoF1qiEI3oL4kgWqyYgCgs7gT5maHNZ82Gk03vQ==}
     engines: {node: '>=18.12.0'}
     hasBin: true
 
@@ -10561,8 +10576,8 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
-  svelte@5.39.2:
-    resolution: {integrity: sha512-x4Me4TgiNprpLugcXyKbcGQhHdjWpITZzSeegv3jjIyA4jObVKBhNchGGDv257Eeolg3vUUSa4n2HGFMYNaPvg==}
+  svelte@5.39.11:
+    resolution: {integrity: sha512-8MxWVm2+3YwrFbPaxOlT1bbMi6OTenrAgks6soZfiaS8Fptk4EVyRIFhJc3RpO264EeSNwgjWAdki0ufg4zkGw==}
     engines: {node: '>=18'}
 
   sver@1.8.4:
@@ -10591,6 +10606,10 @@ packages:
     resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==}
     engines: {node: '>=10.0.0'}
 
+  tagged-tag@1.0.0:
+    resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
+    engines: {node: '>=20'}
+
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
@@ -10599,20 +10618,20 @@ packages:
     peerDependencies:
       tailwindcss: '>=3.0.0 || insiders'
 
-  tailwindcss@3.4.17:
-    resolution: {integrity: sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==}
+  tailwindcss@3.4.18:
+    resolution: {integrity: sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
-  tapable@2.2.3:
-    resolution: {integrity: sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==}
+  tapable@2.3.0:
+    resolution: {integrity: sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==}
     engines: {node: '>=6'}
 
   tar-stream@3.1.7:
     resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
 
-  tar@7.4.3:
-    resolution: {integrity: sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==}
+  tar@7.5.1:
+    resolution: {integrity: sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==}
     engines: {node: '>=18'}
 
   temp-dir@2.0.0:
@@ -10686,8 +10705,8 @@ packages:
     resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
     engines: {node: '>=14.0.0'}
 
-  tinyspy@4.0.3:
-    resolution: {integrity: sha512-t2T/WLB2WRgZ9EpE4jgPJ9w+i66UZfDc8wHh0xrwiRNN+UwH98GIJkTeZqX9rg0i0ptwzqW+uYeIF0T4F8LR7A==}
+  tinyspy@4.0.4:
+    resolution: {integrity: sha512-azl+t0z7pw/z958Gy9svOTuzqIk6xq+NSheJzn5MMWtWTFywIacg2wUlzKFGtt3cthx0r2SxMK0yzJOR0IES7Q==}
     engines: {node: '>=14.0.0'}
 
   tippy.js@6.3.7:
@@ -10746,38 +10765,38 @@ packages:
   tslib@2.8.1:
     resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
-  turbo-darwin-64@2.5.6:
-    resolution: {integrity: sha512-3C1xEdo4aFwMJAPvtlPqz1Sw/+cddWIOmsalHFMrsqqydcptwBfu26WW2cDm3u93bUzMbBJ8k3zNKFqxJ9ei2A==}
+  turbo-darwin-64@2.5.8:
+    resolution: {integrity: sha512-Dh5bCACiHO8rUXZLpKw+m3FiHtAp2CkanSyJre+SInEvEr5kIxjGvCK/8MFX8SFRjQuhjtvpIvYYZJB4AGCxNQ==}
     cpu: [x64]
     os: [darwin]
 
-  turbo-darwin-arm64@2.5.6:
-    resolution: {integrity: sha512-LyiG+rD7JhMfYwLqB6k3LZQtYn8CQQUePbpA8mF/hMLPAekXdJo1g0bUPw8RZLwQXUIU/3BU7tXENvhSGz5DPA==}
+  turbo-darwin-arm64@2.5.8:
+    resolution: {integrity: sha512-f1H/tQC9px7+hmXn6Kx/w8Jd/FneIUnvLlcI/7RGHunxfOkKJKvsoiNzySkoHQ8uq1pJnhJ0xNGTlYM48ZaJOQ==}
     cpu: [arm64]
     os: [darwin]
 
-  turbo-linux-64@2.5.6:
-    resolution: {integrity: sha512-GOcUTT0xiT/pSnHL4YD6Yr3HreUhU8pUcGqcI2ksIF9b2/r/kRHwGFcsHgpG3+vtZF/kwsP0MV8FTlTObxsYIA==}
+  turbo-linux-64@2.5.8:
+    resolution: {integrity: sha512-hMyvc7w7yadBlZBGl/bnR6O+dJTx3XkTeyTTH4zEjERO6ChEs0SrN8jTFj1lueNXKIHh1SnALmy6VctKMGnWfw==}
     cpu: [x64]
     os: [linux]
 
-  turbo-linux-arm64@2.5.6:
-    resolution: {integrity: sha512-10Tm15bruJEA3m0V7iZcnQBpObGBcOgUcO+sY7/2vk1bweW34LMhkWi8svjV9iDF68+KJDThnYDlYE/bc7/zzQ==}
+  turbo-linux-arm64@2.5.8:
+    resolution: {integrity: sha512-LQELGa7bAqV2f+3rTMRPnj5G/OHAe2U+0N9BwsZvfMvHSUbsQ3bBMWdSQaYNicok7wOZcHjz2TkESn1hYK6xIQ==}
     cpu: [arm64]
     os: [linux]
 
-  turbo-windows-64@2.5.6:
-    resolution: {integrity: sha512-FyRsVpgaj76It0ludwZsNN40ytHN+17E4PFJyeliBEbxrGTc5BexlXVpufB7XlAaoaZVxbS6KT8RofLfDRyEPg==}
+  turbo-windows-64@2.5.8:
+    resolution: {integrity: sha512-3YdcaW34TrN1AWwqgYL9gUqmZsMT4T7g8Y5Azz+uwwEJW+4sgcJkIi9pYFyU4ZBSjBvkfuPZkGgfStir5BBDJQ==}
     cpu: [x64]
     os: [win32]
 
-  turbo-windows-arm64@2.5.6:
-    resolution: {integrity: sha512-j/tWu8cMeQ7HPpKri6jvKtyXg9K1gRyhdK4tKrrchH8GNHscPX/F71zax58yYtLRWTiK04zNzPcUJuoS0+v/+Q==}
+  turbo-windows-arm64@2.5.8:
+    resolution: {integrity: sha512-eFC5XzLmgXJfnAK3UMTmVECCwuBcORrWdewoiXBnUm934DY6QN8YowC/srhNnROMpaKaqNeRpoB5FxCww3eteQ==}
     cpu: [arm64]
     os: [win32]
 
-  turbo@2.5.6:
-    resolution: {integrity: sha512-gxToHmi9oTBNB05UjUsrWf0OyN5ZXtD0apOarC1KIx232Vp3WimRNy3810QzeNSgyD5rsaIDXlxlbnOzlouo+w==}
+  turbo@2.5.8:
+    resolution: {integrity: sha512-5c9Fdsr9qfpT3hA0EyYSFRZj1dVVsb6KIWubA9JBYZ/9ZEAijgUEae0BBR/Xl/wekt4w65/lYLTFaP3JmwSO8w==}
     hasBin: true
 
   type-check@0.4.0:
@@ -10792,6 +10811,10 @@ packages:
     resolution: {integrity: sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==}
     engines: {node: '>=16'}
 
+  type-fest@5.0.1:
+    resolution: {integrity: sha512-9MpwAI52m8H6ssA542UxSLnSiSD2dsC3/L85g6hVubLSXd82wdI80eZwTWhdOfN67NlA+D+oipAs1MlcTcu3KA==}
+    engines: {node: '>=20'}
+
   typed-array-buffer@1.0.3:
     resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
     engines: {node: '>= 0.4'}
@@ -10813,8 +10836,8 @@ packages:
     engines: {node: '>=14.17'}
     hasBin: true
 
-  typescript@5.9.2:
-    resolution: {integrity: sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==}
+  typescript@5.9.3:
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
     engines: {node: '>=14.17'}
     hasBin: true
 
@@ -10849,8 +10872,8 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
-  undici-types@7.12.0:
-    resolution: {integrity: sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==}
+  undici-types@7.14.0:
+    resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==}
 
   undici@7.16.0:
     resolution: {integrity: sha512-QEg3HPMll0o3t2ourKwOeUAZ159Kn9mx5pnzHRQO8+Wixmh88YdZRiIwat0iNzNNXn0yoEtXJqFpyW7eM8BV7g==}
@@ -10883,8 +10906,8 @@ packages:
     resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==}
     engines: {node: '>=18'}
 
-  unimport@5.2.0:
-    resolution: {integrity: sha512-bTuAMMOOqIAyjV4i4UH7P07pO+EsVxmhOzQ2YJ290J6mkLUdozNhb5I/YoOEheeNADC03ent3Qj07X0fWfUpmw==}
+  unimport@5.4.1:
+    resolution: {integrity: sha512-wMZ2JKUCleCK2zfRHeWcbrUHKXOC3SVBYkyn/wTGzh0THX6sT4hSjuKXxKANN4/WMbT6ZPM4JzcDcnhD2x9Bpg==}
     engines: {node: '>=18.12.0'}
 
   unique-filename@4.0.0:
@@ -10930,8 +10953,8 @@ packages:
     resolution: {integrity: sha512-gwXJnPRewT4rT7sBi/IvxKTjsms7jX7QIDLOClApuZwR49SXbrB1z2NLUZ+vDHyqCj/n58OzRRqaW+B8OZi8vg==}
     engines: {node: '>=18.12.0'}
 
-  unplugin-utils@0.3.0:
-    resolution: {integrity: sha512-JLoggz+PvLVMJo+jZt97hdIIIZ2yTzGgft9e9q8iMrC4ewufl62ekeW7mixBghonn2gVb/ICjyvlmOCUBnJLQg==}
+  unplugin-utils@0.3.1:
+    resolution: {integrity: sha512-5lWVjgi6vuHhJ526bI4nlCOmkCIF3nnfXkCMDeMJrtdvxTs6ZFCM8oNufGTsDbKv/tJ/xj8RpvXjRuPBZJuJog==}
     engines: {node: '>=20.19.0'}
 
   unplugin@1.16.1:
@@ -11153,8 +11176,8 @@ packages:
       terser:
         optional: true
 
-  vite@7.1.6:
-    resolution: {integrity: sha512-SRYIB8t/isTwNn8vMB3MR6E+EQZM/WG1aKmmIUCfDXfVvKfc20ZpamngWHKzAmmu9ppsgxsg4b2I7c90JZudIQ==}
+  vite@7.1.9:
+    resolution: {integrity: sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
@@ -11313,8 +11336,8 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
-  vue@3.5.21:
-    resolution: {integrity: sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==}
+  vue@3.5.22:
+    resolution: {integrity: sha512-toaZjQ3a/G/mYaLSbV+QsQhIdMo9x5rrqIpYRObsJ6T/J+RyCSFwN2LHNVH9v8uIcljDNa3QzPVdv3Y6b9hAJQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
@@ -11331,11 +11354,11 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
-  vxe-pc-ui@4.9.32:
-    resolution: {integrity: sha512-uME4iypceiIDHCN7PvuvRG19Ip37++mc1AtxqqzxreaSblXiniEARJY8b4YTpuHInFK1WT1XDf/tfWMISZVGeA==}
+  vxe-pc-ui@4.9.42:
+    resolution: {integrity: sha512-bNlkWZmeucWi3EvYsmqsajZshgRf3PMATntvWfvDCdNPQuPadMczn51V8jWAagkw7tgJ7uhNZycBBarwhIzR4w==}
 
-  vxe-table@4.16.14:
-    resolution: {integrity: sha512-ih226hjZW+pGLZ1PDrrts97nrEfmecuv+mI2+ftUD8tu4J2t2XCF4N2IfRWg1m9ows+ITP6xCjWRaEDoGT80VA==}
+  vxe-table@4.16.21:
+    resolution: {integrity: sha512-+oCMaFKOnuvz9t6Qxk9iXKXYJrXxzQ3adgsFgGJY72FGjRopjYJ7qDgq64izcF8XDUJvFIFfSD1JZdwSPNwHMw==}
 
   w3c-keyname@2.2.8:
     resolution: {integrity: sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==}
@@ -11349,6 +11372,10 @@ packages:
   watermark-js-plus@1.6.3:
     resolution: {integrity: sha512-iCLOGf70KacIwjGF9MDViYxQcRiVwOH7l42qDHLeE2HeUsQD1EQuUC9cKRG/4SErTUmdqV3yf5WnKk2dRARHPQ==}
 
+  web-streams-polyfill@3.3.3:
+    resolution: {integrity: sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==}
+    engines: {node: '>= 8'}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -11607,124 +11634,124 @@ packages:
   zwitch@2.0.4:
     resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
 
-  zx@8.8.1:
-    resolution: {integrity: sha512-qvsKBnvWHstHKCluKPlEgI/D3+mdiQyMoSSeFR8IX/aXzWIas5A297KxKgPJhuPXdrR6ma0Jzx43+GQ/8sqbrw==}
+  zx@8.8.4:
+    resolution: {integrity: sha512-44GcD+ZlM/v1OQtbwnSxLPcoE1ZEUICmR+RSbJZLAqfIixNLuMjLyh0DcS75OyfJ/sWYAwCWDmDvJ4hdnANAPQ==}
     engines: {node: '>= 12.17.0'}
     hasBin: true
 
 snapshots:
 
-  '@algolia/abtesting@1.3.0':
+  '@algolia/abtesting@1.6.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/autocomplete-core@1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)(search-insights@2.17.3)':
+  '@algolia/autocomplete-core@1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)(search-insights@2.17.3)':
     dependencies:
-      '@algolia/autocomplete-plugin-algolia-insights': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)(search-insights@2.17.3)
-      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)
+      '@algolia/autocomplete-plugin-algolia-insights': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)(search-insights@2.17.3)
+      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)
     transitivePeerDependencies:
       - '@algolia/client-search'
       - algoliasearch
       - search-insights
 
-  '@algolia/autocomplete-plugin-algolia-insights@1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)(search-insights@2.17.3)':
+  '@algolia/autocomplete-plugin-algolia-insights@1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)(search-insights@2.17.3)':
     dependencies:
-      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)
+      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)
       search-insights: 2.17.3
     transitivePeerDependencies:
       - '@algolia/client-search'
       - algoliasearch
 
-  '@algolia/autocomplete-preset-algolia@1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)':
+  '@algolia/autocomplete-preset-algolia@1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)':
     dependencies:
-      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)
-      '@algolia/client-search': 5.37.0
-      algoliasearch: 5.37.0
+      '@algolia/autocomplete-shared': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)
+      '@algolia/client-search': 5.40.0
+      algoliasearch: 5.40.0
 
-  '@algolia/autocomplete-shared@1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)':
+  '@algolia/autocomplete-shared@1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)':
     dependencies:
-      '@algolia/client-search': 5.37.0
-      algoliasearch: 5.37.0
+      '@algolia/client-search': 5.40.0
+      algoliasearch: 5.40.0
 
-  '@algolia/client-abtesting@5.37.0':
+  '@algolia/client-abtesting@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/client-analytics@5.37.0':
+  '@algolia/client-analytics@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/client-common@5.37.0': {}
+  '@algolia/client-common@5.40.0': {}
 
-  '@algolia/client-insights@5.37.0':
+  '@algolia/client-insights@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/client-personalization@5.37.0':
+  '@algolia/client-personalization@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/client-query-suggestions@5.37.0':
+  '@algolia/client-query-suggestions@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/client-search@5.37.0':
+  '@algolia/client-search@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/ingestion@1.37.0':
+  '@algolia/ingestion@1.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/monitoring@1.37.0':
+  '@algolia/monitoring@1.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/recommend@5.37.0':
+  '@algolia/recommend@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
-  '@algolia/requester-browser-xhr@5.37.0':
+  '@algolia/requester-browser-xhr@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
+      '@algolia/client-common': 5.40.0
 
-  '@algolia/requester-fetch@5.37.0':
+  '@algolia/requester-fetch@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
+      '@algolia/client-common': 5.40.0
 
-  '@algolia/requester-node-http@5.37.0':
+  '@algolia/requester-node-http@5.40.0':
     dependencies:
-      '@algolia/client-common': 5.37.0
+      '@algolia/client-common': 5.40.0
 
   '@alloc/quick-lru@5.2.0': {}
 
@@ -11734,20 +11761,20 @@ snapshots:
 
   '@ant-design/icons-svg@4.4.2': {}
 
-  '@ant-design/icons-vue@7.0.1(vue@3.5.21(typescript@5.9.2))':
+  '@ant-design/icons-vue@7.0.1(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@ant-design/colors': 6.0.0
       '@ant-design/icons-svg': 4.4.2
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   '@antfu/install-pkg@1.1.0':
     dependencies:
-      package-manager-detector: 1.3.0
+      package-manager-detector: 1.4.0
       tinyexec: 1.0.1
 
   '@antfu/utils@0.7.10': {}
 
-  '@antfu/utils@9.2.0': {}
+  '@antfu/utils@9.3.0': {}
 
   '@apideck/better-ajv-errors@0.3.6(ajv@8.17.1)':
     dependencies:
@@ -11839,7 +11866,7 @@ snapshots:
     dependencies:
       '@babel/compat-data': 7.28.4
       '@babel/helper-validator-option': 7.27.1
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       lru-cache: 5.1.1
       semver: 6.3.1
 
@@ -11860,7 +11887,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.4
       '@babel/helper-annotate-as-pure': 7.27.3
-      regexpu-core: 6.3.1
+      regexpu-core: 6.4.0
       semver: 6.3.1
 
   '@babel/helper-define-polyfill-provider@0.6.5(@babel/core@7.28.4)':
@@ -12452,7 +12479,7 @@ snapshots:
       babel-plugin-polyfill-corejs2: 0.4.14(@babel/core@7.28.4)
       babel-plugin-polyfill-corejs3: 0.13.0(@babel/core@7.28.4)
       babel-plugin-polyfill-regenerator: 0.6.5(@babel/core@7.28.4)
-      core-js-compat: 3.45.1
+      core-js-compat: 3.46.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
@@ -12477,7 +12504,7 @@ snapshots:
 
   '@babel/runtime-corejs3@7.28.4':
     dependencies:
-      core-js-pure: 3.45.1
+      core-js-pure: 3.46.0
 
   '@babel/runtime@7.28.4': {}
 
@@ -12507,7 +12534,7 @@ snapshots:
   '@bpmn-io/cm-theme@0.1.0-alpha.2':
     dependencies:
       '@codemirror/language': 6.11.3
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/highlight': 1.2.1
 
   '@bpmn-io/diagram-js-ui@0.2.3':
@@ -12524,19 +12551,19 @@ snapshots:
       '@bpmn-io/feel-lint': 2.1.0
       '@bpmn-io/lang-feel': 2.4.0
       '@camunda/feel-builtins': 0.2.0
-      '@codemirror/autocomplete': 6.18.7
-      '@codemirror/commands': 6.8.1
+      '@codemirror/autocomplete': 6.19.0
+      '@codemirror/commands': 6.9.0
       '@codemirror/language': 6.11.3
-      '@codemirror/lint': 6.8.5
+      '@codemirror/lint': 6.9.0
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/highlight': 1.2.1
       min-dom: 4.2.1
 
   '@bpmn-io/feel-lint@1.4.0':
     dependencies:
       '@codemirror/language': 6.11.3
-      lezer-feel: 1.8.1
+      lezer-feel: 1.9.0
 
   '@bpmn-io/feel-lint@2.1.0':
     dependencies:
@@ -12546,7 +12573,7 @@ snapshots:
   '@bpmn-io/lang-feel@2.4.0':
     dependencies:
       '@bpmn-io/lezer-feel': 1.9.0
-      '@codemirror/autocomplete': 6.18.7
+      '@codemirror/autocomplete': 6.19.0
       '@codemirror/language': 6.11.3
       '@lezer/common': 1.2.3
 
@@ -12559,26 +12586,28 @@ snapshots:
   '@bpmn-io/properties-panel@3.33.0':
     dependencies:
       '@bpmn-io/feel-editor': 1.12.0
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       classnames: 2.5.1
       feelers: 1.4.0
       focus-trap: 7.6.5
       min-dash: 4.2.3
       min-dom: 4.2.1
 
-  '@cacheable/memoize@2.0.1':
+  '@cacheable/memoize@2.0.3':
     dependencies:
-      '@cacheable/utils': 2.0.1
+      '@cacheable/utils': 2.1.0
 
-  '@cacheable/memory@2.0.1':
+  '@cacheable/memory@2.0.3':
     dependencies:
-      '@cacheable/memoize': 2.0.1
-      '@cacheable/utils': 2.0.1
-      '@keyv/bigmap': 1.0.1
-      hookified: 1.12.0
-      keyv: 5.5.2
+      '@cacheable/memoize': 2.0.3
+      '@cacheable/utils': 2.1.0
+      '@keyv/bigmap': 1.0.3
+      hookified: 1.12.1
+      keyv: 5.5.3
 
-  '@cacheable/utils@2.0.1': {}
+  '@cacheable/utils@2.1.0':
+    dependencies:
+      keyv: 5.5.3
 
   '@camunda/feel-builtins@0.2.0': {}
 
@@ -12596,7 +12625,7 @@ snapshots:
       outdent: 0.5.0
       prettier: 2.8.8
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/assemble-release-plan@6.0.9':
     dependencies:
@@ -12605,21 +12634,21 @@ snapshots:
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@changesets/changelog-git@0.2.1':
     dependencies:
       '@changesets/types': 6.1.0
 
-  '@changesets/changelog-github@0.5.1(encoding@0.1.13)':
+  '@changesets/changelog-github@0.5.1':
     dependencies:
-      '@changesets/get-github-info': 0.6.0(encoding@0.1.13)
+      '@changesets/get-github-info': 0.6.0
       '@changesets/types': 6.1.0
       dotenv: 8.6.0
     transitivePeerDependencies:
       - encoding
 
-  '@changesets/cli@2.29.7(@types/node@22.18.6)':
+  '@changesets/cli@2.29.7(@types/node@22.18.9)':
     dependencies:
       '@changesets/apply-release-plan': 7.0.13
       '@changesets/assemble-release-plan': 6.0.9
@@ -12635,7 +12664,7 @@ snapshots:
       '@changesets/should-skip-package': 0.1.2
       '@changesets/types': 6.1.0
       '@changesets/write': 0.4.0
-      '@inquirer/external-editor': 1.0.2(@types/node@22.18.6)
+      '@inquirer/external-editor': 1.0.2(@types/node@22.18.9)
       '@manypkg/get-packages': 1.1.3
       ansi-colors: 4.1.3
       ci-info: 3.9.0
@@ -12646,7 +12675,7 @@ snapshots:
       package-manager-detector: 0.2.11
       picocolors: 1.1.1
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       spawndamnit: 3.0.1
       term-size: 2.2.1
     transitivePeerDependencies:
@@ -12671,12 +12700,12 @@ snapshots:
       '@changesets/types': 6.1.0
       '@manypkg/get-packages': 1.1.3
       picocolors: 1.1.1
-      semver: 7.7.2
+      semver: 7.7.3
 
-  '@changesets/get-github-info@0.6.0(encoding@0.1.13)':
+  '@changesets/get-github-info@0.6.0':
     dependencies:
       dataloader: 1.4.0
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.7.0
     transitivePeerDependencies:
       - encoding
 
@@ -12738,7 +12767,7 @@ snapshots:
     dependencies:
       '@changesets/types': 6.1.0
       fs-extra: 7.0.1
-      human-id: 4.1.1
+      human-id: 4.1.2
       prettier: 2.8.8
 
   '@clack/core@0.4.2':
@@ -12756,51 +12785,51 @@ snapshots:
     dependencies:
       mime: 3.0.0
 
-  '@codemirror/autocomplete@6.18.7':
+  '@codemirror/autocomplete@6.19.0':
     dependencies:
       '@codemirror/language': 6.11.3
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/common': 1.2.3
 
-  '@codemirror/commands@6.8.1':
+  '@codemirror/commands@6.9.0':
     dependencies:
       '@codemirror/language': 6.11.3
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/common': 1.2.3
 
   '@codemirror/language@6.11.3':
     dependencies:
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/common': 1.2.3
       '@lezer/highlight': 1.2.1
       '@lezer/lr': 1.4.2
       style-mod: 4.1.2
 
-  '@codemirror/lint@6.8.5':
+  '@codemirror/lint@6.9.0':
     dependencies:
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       crelt: 1.0.6
 
   '@codemirror/state@6.5.2':
     dependencies:
       '@marijn/find-cluster-break': 1.0.2
 
-  '@codemirror/view@6.38.2':
+  '@codemirror/view@6.38.5':
     dependencies:
       '@codemirror/state': 6.5.2
       crelt: 1.0.6
       style-mod: 4.1.2
       w3c-keyname: 2.2.8
 
-  '@commitlint/cli@19.8.1(@types/node@24.5.2)(typescript@5.9.2)':
+  '@commitlint/cli@19.8.1(@types/node@24.7.1)(typescript@5.9.3)':
     dependencies:
       '@commitlint/format': 19.8.1
       '@commitlint/lint': 19.8.1
-      '@commitlint/load': 19.8.1(@types/node@24.5.2)(typescript@5.9.2)
+      '@commitlint/load': 19.8.1(@types/node@24.7.1)(typescript@5.9.3)
       '@commitlint/read': 19.8.1
       '@commitlint/types': 19.8.1
       tinyexec: 1.0.1
@@ -12838,7 +12867,7 @@ snapshots:
   '@commitlint/is-ignored@19.8.1':
     dependencies:
       '@commitlint/types': 19.8.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   '@commitlint/lint@19.8.1':
     dependencies:
@@ -12847,15 +12876,15 @@ snapshots:
       '@commitlint/rules': 19.8.1
       '@commitlint/types': 19.8.1
 
-  '@commitlint/load@19.8.1(@types/node@24.5.2)(typescript@5.9.2)':
+  '@commitlint/load@19.8.1(@types/node@24.7.1)(typescript@5.9.3)':
     dependencies:
       '@commitlint/config-validator': 19.8.1
       '@commitlint/execute-rule': 19.8.1
       '@commitlint/resolve-extends': 19.8.1
       '@commitlint/types': 19.8.1
       chalk: 5.6.2
-      cosmiconfig: 9.0.0(typescript@5.9.2)
-      cosmiconfig-typescript-loader: 6.1.0(@types/node@24.5.2)(cosmiconfig@9.0.0(typescript@5.9.2))(typescript@5.9.2)
+      cosmiconfig: 9.0.0(typescript@5.9.3)
+      cosmiconfig-typescript-loader: 6.2.0(@types/node@24.7.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -13121,9 +13150,9 @@ snapshots:
     dependencies:
       css-render: 0.15.14
 
-  '@css-render/vue3-ssr@0.15.14(vue@3.5.21(typescript@5.9.2))':
+  '@css-render/vue3-ssr@0.15.14(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   '@csstools/cascade-layer-name-parser@2.0.5(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)':
     dependencies:
@@ -13160,12 +13189,12 @@ snapshots:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
 
-  '@csstools/postcss-alpha-function@1.0.0(postcss@8.5.6)':
+  '@csstools/postcss-alpha-function@1.0.1(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
@@ -13175,47 +13204,56 @@ snapshots:
       postcss: 8.5.6
       postcss-selector-parser: 7.1.0
 
-  '@csstools/postcss-color-function-display-p3-linear@1.0.0(postcss@8.5.6)':
+  '@csstools/postcss-color-function-display-p3-linear@1.0.1(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-color-function@4.0.11(postcss@8.5.6)':
+  '@csstools/postcss-color-function@4.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-color-mix-function@3.0.11(postcss@8.5.6)':
+  '@csstools/postcss-color-mix-function@3.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-color-mix-variadic-function-arguments@1.0.1(postcss@8.5.6)':
+  '@csstools/postcss-color-mix-variadic-function-arguments@1.0.2(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-content-alt-text@2.0.7(postcss@8.5.6)':
+  '@csstools/postcss-content-alt-text@2.0.8(postcss@8.5.6)':
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
+      '@csstools/utilities': 2.0.0(postcss@8.5.6)
+      postcss: 8.5.6
+
+  '@csstools/postcss-contrast-color-function@2.0.12(postcss@8.5.6)':
+    dependencies:
+      '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
+      '@csstools/css-tokenizer': 3.0.4
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
@@ -13239,27 +13277,27 @@ snapshots:
       '@csstools/css-tokenizer': 3.0.4
       postcss: 8.5.6
 
-  '@csstools/postcss-gradients-interpolation-method@5.0.11(postcss@8.5.6)':
+  '@csstools/postcss-gradients-interpolation-method@5.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-hwb-function@4.0.11(postcss@8.5.6)':
+  '@csstools/postcss-hwb-function@4.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-ic-unit@4.0.3(postcss@8.5.6)':
+  '@csstools/postcss-ic-unit@4.0.4(postcss@8.5.6)':
     dependencies:
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
@@ -13274,11 +13312,11 @@ snapshots:
       postcss: 8.5.6
       postcss-selector-parser: 7.1.0
 
-  '@csstools/postcss-light-dark-function@2.0.10(postcss@8.5.6)':
+  '@csstools/postcss-light-dark-function@2.0.11(postcss@8.5.6)':
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
@@ -13331,16 +13369,16 @@ snapshots:
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
-  '@csstools/postcss-oklab-function@4.0.11(postcss@8.5.6)':
+  '@csstools/postcss-oklab-function@4.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  '@csstools/postcss-progressive-custom-properties@4.2.0(postcss@8.5.6)':
+  '@csstools/postcss-progressive-custom-properties@4.2.1(postcss@8.5.6)':
     dependencies:
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
@@ -13352,12 +13390,12 @@ snapshots:
       '@csstools/css-tokenizer': 3.0.4
       postcss: 8.5.6
 
-  '@csstools/postcss-relative-color-syntax@3.0.11(postcss@8.5.6)':
+  '@csstools/postcss-relative-color-syntax@3.0.12(postcss@8.5.6)':
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
@@ -13413,9 +13451,9 @@ snapshots:
 
   '@docsearch/css@3.8.2': {}
 
-  '@docsearch/js@3.8.2(@algolia/client-search@5.37.0)(search-insights@2.17.3)':
+  '@docsearch/js@3.8.2(@algolia/client-search@5.40.0)(search-insights@2.17.3)':
     dependencies:
-      '@docsearch/react': 3.8.2(@algolia/client-search@5.37.0)(search-insights@2.17.3)
+      '@docsearch/react': 3.8.2(@algolia/client-search@5.40.0)(search-insights@2.17.3)
       preact: 10.27.2
     transitivePeerDependencies:
       - '@algolia/client-search'
@@ -13424,12 +13462,12 @@ snapshots:
       - react-dom
       - search-insights
 
-  '@docsearch/react@3.8.2(@algolia/client-search@5.37.0)(search-insights@2.17.3)':
+  '@docsearch/react@3.8.2(@algolia/client-search@5.40.0)(search-insights@2.17.3)':
     dependencies:
-      '@algolia/autocomplete-core': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)(search-insights@2.17.3)
-      '@algolia/autocomplete-preset-algolia': 1.17.7(@algolia/client-search@5.37.0)(algoliasearch@5.37.0)
+      '@algolia/autocomplete-core': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)(search-insights@2.17.3)
+      '@algolia/autocomplete-preset-algolia': 1.17.7(@algolia/client-search@5.40.0)(algoliasearch@5.40.0)
       '@docsearch/css': 3.8.2
-      algoliasearch: 5.37.0
+      algoliasearch: 5.40.0
     optionalDependencies:
       search-insights: 2.17.3
     transitivePeerDependencies:
@@ -13437,9 +13475,9 @@ snapshots:
 
   '@dual-bundle/import-meta-resolve@4.2.1': {}
 
-  '@element-plus/icons-vue@2.3.2(vue@3.5.21(typescript@5.9.2))':
+  '@element-plus/icons-vue@2.3.2(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   '@emnapi/core@1.5.0':
     dependencies:
@@ -13466,7 +13504,7 @@ snapshots:
   '@es-joy/jsdoccomment@0.50.2':
     dependencies:
       '@types/estree': 1.0.8
-      '@typescript-eslint/types': 8.44.0
+      '@typescript-eslint/types': 8.46.0
       comment-parser: 1.4.1
       esquery: 1.6.0
       jsdoc-type-pratt-parser: 4.1.0
@@ -13546,9 +13584,9 @@ snapshots:
   '@esbuild/win32-x64@0.25.3':
     optional: true
 
-  '@eslint-community/eslint-utils@4.9.0(eslint@9.35.0(jiti@2.5.1))':
+  '@eslint-community/eslint-utils@4.9.0(eslint@9.37.0(jiti@2.6.1))':
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       eslint-visitor-keys: 3.4.3
 
   '@eslint-community/regexpp@4.12.1': {}
@@ -13561,13 +13599,15 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/config-helpers@0.3.1': {}
+  '@eslint/config-helpers@0.4.0':
+    dependencies:
+      '@eslint/core': 0.16.0
 
   '@eslint/core@0.13.0':
     dependencies:
       '@types/json-schema': 7.0.15
 
-  '@eslint/core@0.15.2':
+  '@eslint/core@0.16.0':
     dependencies:
       '@types/json-schema': 7.0.15
 
@@ -13585,7 +13625,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@eslint/js@9.35.0': {}
+  '@eslint/js@9.37.0': {}
 
   '@eslint/object-schema@2.1.6': {}
 
@@ -13594,9 +13634,9 @@ snapshots:
       '@eslint/core': 0.13.0
       levn: 0.4.1
 
-  '@eslint/plugin-kit@0.3.5':
+  '@eslint/plugin-kit@0.4.0':
     dependencies:
-      '@eslint/core': 0.15.2
+      '@eslint/core': 0.16.0
       levn: 0.4.1
 
   '@faker-js/faker@9.9.0': {}
@@ -13612,36 +13652,36 @@ snapshots:
 
   '@floating-ui/utils@0.2.10': {}
 
-  '@floating-ui/vue@1.1.9(vue@3.5.21(typescript@5.9.2))':
+  '@floating-ui/vue@1.1.9(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@floating-ui/dom': 1.7.4
       '@floating-ui/utils': 0.2.10
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@form-create/ant-design-vue@3.2.31(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/ant-design-vue@3.2.31(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@form-create/component-antdv-frame': 3.2.31
       '@form-create/component-antdv-group': 3.2.31
       '@form-create/component-antdv-upload': 3.2.31
       '@form-create/component-subform': 3.1.34
-      '@form-create/core': 3.2.31(vue@3.5.21(typescript@5.9.2))
+      '@form-create/core': 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/utils': 3.2.31
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@form-create/antd-designer@3.3.1(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/antd-designer@3.3.2(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@form-create/ant-design-vue': 3.2.31(vue@3.5.21(typescript@5.9.2))
+      '@form-create/ant-design-vue': 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/component-wangeditor': 3.2.14
       '@form-create/utils': 3.2.31
-      ant-design-vue: 4.2.6(vue@3.5.21(typescript@5.9.2))
+      ant-design-vue: 4.2.6(vue@3.5.22(typescript@5.9.3))
       codemirror: 6.65.7
       js-beautify: 1.15.4
       signature_pad: 5.1.1
-      vue: 3.5.21(typescript@5.9.2)
-      vuedraggable: 4.1.0(vue@3.5.21(typescript@5.9.2))
+      vue: 3.5.22(typescript@5.9.3)
+      vuedraggable: 4.1.0(vue@3.5.22(typescript@5.9.3))
 
   '@form-create/component-antdv-frame@3.2.31':
     dependencies:
@@ -13709,26 +13749,26 @@ snapshots:
     dependencies:
       wangeditor: 4.7.15
 
-  '@form-create/core@3.2.31(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/core@3.2.31(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@form-create/utils': 3.2.31
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@form-create/designer@3.3.1(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/designer@3.3.1(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@form-create/component-wangeditor': 3.2.14
-      '@form-create/element-ui': 3.2.31(vue@3.5.21(typescript@5.9.2))
+      '@form-create/element-ui': 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/utils': 3.2.31
       codemirror: 6.65.7
-      element-plus: 2.11.2(vue@3.5.21(typescript@5.9.2))
+      element-plus: 2.11.4(vue@3.5.22(typescript@5.9.3))
       js-beautify: 1.15.4
       signature_pad: 5.1.1
-      vue: 3.5.21(typescript@5.9.2)
-      vuedraggable: 4.1.0(vue@3.5.21(typescript@5.9.2))
+      vue: 3.5.22(typescript@5.9.3)
+      vuedraggable: 4.1.0(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@form-create/element-ui@3.2.31(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/element-ui@3.2.31(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@form-create/component-elm-checkbox': 3.2.31
       '@form-create/component-elm-frame': 3.2.31
@@ -13738,11 +13778,11 @@ snapshots:
       '@form-create/component-elm-tree': 3.2.31
       '@form-create/component-elm-upload': 3.2.31
       '@form-create/component-subform': 3.1.34
-      '@form-create/core': 3.2.31(vue@3.5.21(typescript@5.9.2))
+      '@form-create/core': 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/utils': 3.2.31
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@form-create/naive-ui@3.2.31(vue@3.5.21(typescript@5.9.2))':
+  '@form-create/naive-ui@3.2.31(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@form-create/component-naive-checkbox': 3.2.31
       '@form-create/component-naive-frame': 3.2.31
@@ -13750,9 +13790,9 @@ snapshots:
       '@form-create/component-naive-radio': 3.2.31
       '@form-create/component-naive-upload': 3.2.31
       '@form-create/component-subform': 3.1.34
-      '@form-create/core': 3.2.31(vue@3.5.21(typescript@5.9.2))
+      '@form-create/core': 3.2.31(vue@3.5.22(typescript@5.9.3))
       '@form-create/utils': 3.2.31
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   '@form-create/utils@3.2.31': {}
 
@@ -13775,22 +13815,22 @@ snapshots:
     dependencies:
       '@iconify/types': 2.0.0
 
-  '@iconify-json/octicon@1.2.14':
+  '@iconify-json/octicon@1.2.16':
     dependencies:
       '@iconify/types': 2.0.0
 
-  '@iconify-json/simple-icons@1.2.52':
+  '@iconify-json/simple-icons@1.2.54':
     dependencies:
       '@iconify/types': 2.0.0
 
-  '@iconify-json/vscode-icons@1.2.30':
+  '@iconify-json/vscode-icons@1.2.31':
     dependencies:
       '@iconify/types': 2.0.0
 
-  '@iconify/json@2.2.385':
+  '@iconify/json@2.2.394':
     dependencies:
       '@iconify/types': 2.0.0
-      pathe: 1.1.2
+      pathe: 2.0.3
 
   '@iconify/tailwind@1.2.0':
     dependencies:
@@ -13801,7 +13841,7 @@ snapshots:
   '@iconify/utils@3.0.2':
     dependencies:
       '@antfu/install-pkg': 1.1.0
-      '@antfu/utils': 9.2.0
+      '@antfu/utils': 9.3.0
       '@iconify/types': 2.0.0
       debug: 4.4.3
       globals: 15.15.0
@@ -13811,19 +13851,19 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@iconify/vue@5.0.0(vue@3.5.21(typescript@5.9.2))':
+  '@iconify/vue@5.0.0(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@iconify/types': 2.0.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@inquirer/external-editor@1.0.2(@types/node@22.18.6)':
+  '@inquirer/external-editor@1.0.2(@types/node@22.18.9)':
     dependencies:
       chardet: 2.1.0
       iconv-lite: 0.7.0
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 22.18.9
 
-  '@internationalized/date@3.9.0':
+  '@internationalized/date@3.10.0':
     dependencies:
       '@swc/helpers': 0.5.17
 
@@ -13831,19 +13871,19 @@ snapshots:
     dependencies:
       '@swc/helpers': 0.5.17
 
-  '@intlify/bundle-utils@10.0.1(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))':
+  '@intlify/bundle-utils@10.0.1(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))':
     dependencies:
       '@intlify/message-compiler': 11.1.12
       '@intlify/shared': 11.1.12
       acorn: 8.15.0
       escodegen: 2.1.0
       estree-walker: 2.0.2
-      jsonc-eslint-parser: 2.4.0
+      jsonc-eslint-parser: 2.4.1
       mlly: 1.8.0
       source-map-js: 1.2.1
       yaml-eslint-parser: 1.3.0
     optionalDependencies:
-      vue-i18n: 11.1.12(vue@3.5.21(typescript@5.9.2))
+      vue-i18n: 11.1.12(vue@3.5.22(typescript@5.9.3))
 
   '@intlify/core-base@11.1.12':
     dependencies:
@@ -13857,15 +13897,15 @@ snapshots:
 
   '@intlify/shared@11.1.12': {}
 
-  '@intlify/unplugin-vue-i18n@6.0.8(@vue/compiler-dom@3.5.21)(eslint@9.35.0(jiti@2.5.1))(rollup@4.50.2)(typescript@5.9.2)(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))':
+  '@intlify/unplugin-vue-i18n@6.0.8(@vue/compiler-dom@3.5.22)(eslint@9.37.0(jiti@2.6.1))(rollup@4.52.4)(typescript@5.9.3)(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
-      '@intlify/bundle-utils': 10.0.1(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
+      '@intlify/bundle-utils': 10.0.1(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))
       '@intlify/shared': 11.1.12
-      '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.12)(@vue/compiler-dom@3.5.21)(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
-      '@typescript-eslint/scope-manager': 8.44.0
-      '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2)
+      '@intlify/vue-i18n-extensions': 8.0.0(@intlify/shared@11.1.12)(@vue/compiler-dom@3.5.22)(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
       debug: 4.4.3
       fast-glob: 3.3.3
       js-yaml: 4.1.0
@@ -13874,9 +13914,9 @@ snapshots:
       picocolors: 1.1.1
       source-map-js: 1.2.1
       unplugin: 1.16.1
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
-      vue-i18n: 11.1.12(vue@3.5.21(typescript@5.9.2))
+      vue-i18n: 11.1.12(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/compiler-dom'
       - eslint
@@ -13884,14 +13924,14 @@ snapshots:
       - supports-color
       - typescript
 
-  '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.12)(@vue/compiler-dom@3.5.21)(vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)))(vue@3.5.21(typescript@5.9.2))':
+  '@intlify/vue-i18n-extensions@8.0.0(@intlify/shared@11.1.12)(@vue/compiler-dom@3.5.22)(vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@babel/parser': 7.28.4
     optionalDependencies:
       '@intlify/shared': 11.1.12
-      '@vue/compiler-dom': 3.5.21
-      vue: 3.5.21(typescript@5.9.2)
-      vue-i18n: 11.1.12(vue@3.5.21(typescript@5.9.2))
+      '@vue/compiler-dom': 3.5.22
+      vue: 3.5.22(typescript@5.9.3)
+      vue-i18n: 11.1.12(vue@3.5.22(typescript@5.9.3))
 
   '@ioredis/commands@1.4.0': {}
 
@@ -13938,19 +13978,20 @@ snapshots:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.5
 
-  '@jspm/generator@2.7.0':
+  '@jspm/generator@2.7.2':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-syntax-import-attributes': 7.27.1(@babel/core@7.28.4)
       '@babel/preset-typescript': 7.27.1(@babel/core@7.28.4)
       '@jspm/import-map': 1.2.1
       es-module-lexer: 1.7.0
-      make-fetch-happen: 15.0.1
       minimatch: 10.0.3
+      node-fetch-cache: 5.1.0
       pako: 2.1.0
       sver: 1.8.4
       tar-stream: 3.1.7
     transitivePeerDependencies:
+      - bare-abort-controller
       - react-native-b4a
       - supports-color
 
@@ -13958,9 +13999,9 @@ snapshots:
 
   '@juggle/resize-observer@3.4.0': {}
 
-  '@keyv/bigmap@1.0.1':
+  '@keyv/bigmap@1.0.3':
     dependencies:
-      hookified: 1.12.0
+      hookified: 1.12.1
 
   '@keyv/serialize@1.1.1': {}
 
@@ -14010,38 +14051,38 @@ snapshots:
       js-yaml: 4.1.0
       tinyglobby: 0.2.15
 
-  '@mapbox/node-pre-gyp@2.0.0(encoding@0.1.13)':
+  '@mapbox/node-pre-gyp@2.0.0':
     dependencies:
       consola: 3.4.2
-      detect-libc: 2.1.0
+      detect-libc: 2.1.2
       https-proxy-agent: 7.0.6
-      node-fetch: 2.7.0(encoding@0.1.13)
+      node-fetch: 2.7.0
       nopt: 8.1.0
-      semver: 7.7.2
-      tar: 7.4.3
+      semver: 7.7.3
+      tar: 7.5.1
     transitivePeerDependencies:
       - encoding
       - supports-color
 
   '@marijn/find-cluster-break@1.0.2': {}
 
-  '@microsoft/api-extractor-model@7.30.7(@types/node@24.5.2)':
+  '@microsoft/api-extractor-model@7.31.1(@types/node@24.7.1)':
     dependencies:
       '@microsoft/tsdoc': 0.15.1
       '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.5.2)
+      '@rushstack/node-core-library': 5.17.0(@types/node@24.7.1)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.52.13(@types/node@24.5.2)':
+  '@microsoft/api-extractor@7.53.1(@types/node@24.7.1)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.30.7(@types/node@24.5.2)
+      '@microsoft/api-extractor-model': 7.31.1(@types/node@24.7.1)
       '@microsoft/tsdoc': 0.15.1
       '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.5.2)
-      '@rushstack/rig-package': 0.5.3
-      '@rushstack/terminal': 0.16.0(@types/node@24.5.2)
-      '@rushstack/ts-command-line': 5.0.3(@types/node@24.5.2)
+      '@rushstack/node-core-library': 5.17.0(@types/node@24.7.1)
+      '@rushstack/rig-package': 0.6.0
+      '@rushstack/terminal': 0.19.1(@types/node@24.7.1)
+      '@rushstack/ts-command-line': 5.1.1(@types/node@24.7.1)
       lodash: 4.17.21
       minimatch: 10.0.3
       resolve: 1.22.10
@@ -14081,45 +14122,35 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.19.1
 
-  '@nolebase/ui@2.18.2(vitepress@1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))':
+  '@nolebase/ui@2.18.2(vitepress@1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@iconify-json/octicon': 1.2.14
-      less: 4.4.1
-      vitepress: 1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2)
-      vue: 3.5.21(typescript@5.9.2)
+      '@iconify-json/octicon': 1.2.16
+      less: 4.4.2
+      vitepress: 1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@nolebase/vitepress-plugin-git-changelog@2.18.2(vitepress@1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))':
+  '@nolebase/vitepress-plugin-git-changelog@2.18.2(vitepress@1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@iconify-json/octicon': 1.2.14
-      '@nolebase/ui': 2.18.2(vitepress@1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))
+      '@iconify-json/octicon': 1.2.16
+      '@nolebase/ui': 2.18.2(vitepress@1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))
       colorette: 2.0.20
       date-fns: 4.1.0
       defu: 6.1.4
-      es-toolkit: 1.39.10
+      es-toolkit: 1.40.0
       execa: 9.6.0
       globby: 14.1.0
       gray-matter: 4.0.3
-      less: 4.4.1
+      less: 4.4.2
       uncrypto: 0.1.3
-      vitepress: 1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2)
+      vitepress: 1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3)
     transitivePeerDependencies:
       - vue
 
-  '@npmcli/agent@3.0.0':
-    dependencies:
-      agent-base: 7.1.4
-      http-proxy-agent: 7.0.2
-      https-proxy-agent: 7.0.6
-      lru-cache: 10.4.3
-      socks-proxy-agent: 8.0.5
-    transitivePeerDependencies:
-      - supports-color
-
   '@npmcli/fs@4.0.0':
     dependencies:
-      semver: 7.7.2
+      semver: 7.7.3
 
-  '@nuxt/kit@3.19.2(magicast@0.3.5)':
+  '@nuxt/kit@3.19.3(magicast@0.3.5)':
     dependencies:
       c12: 3.3.0(magicast@0.3.5)
       consola: 3.4.2
@@ -14128,7 +14159,7 @@ snapshots:
       errx: 0.1.0
       exsolve: 1.0.7
       ignore: 7.0.5
-      jiti: 2.5.1
+      jiti: 2.6.1
       klona: 2.0.6
       knitwork: 1.2.0
       mlly: 1.8.0
@@ -14137,12 +14168,12 @@ snapshots:
       pkg-types: 2.3.0
       rc9: 2.1.2
       scule: 1.3.0
-      semver: 7.7.2
+      semver: 7.7.3
       std-env: 3.9.0
       tinyglobby: 0.2.15
       ufo: 1.6.1
       unctx: 2.4.1
-      unimport: 5.2.0
+      unimport: 5.4.1
       untyped: 2.0.0
     transitivePeerDependencies:
       - magicast
@@ -14220,9 +14251,9 @@ snapshots:
 
   '@pkgr/core@0.2.9': {}
 
-  '@playwright/test@1.55.0':
+  '@playwright/test@1.56.0':
     dependencies:
-      playwright: 1.55.0
+      playwright: 1.56.0
 
   '@pnpm/config.env-replace@1.1.0': {}
 
@@ -14271,11 +14302,11 @@ snapshots:
 
   '@rolldown/pluginutils@1.0.0-beta.29': {}
 
-  '@rolldown/pluginutils@1.0.0-beta.38': {}
+  '@rolldown/pluginutils@1.0.0-beta.42': {}
 
-  '@rollup/plugin-alias@5.1.1(rollup@4.50.2)':
+  '@rollup/plugin-alias@5.1.1(rollup@4.52.4)':
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   '@rollup/plugin-babel@5.3.1(@babel/core@7.28.4)(rollup@2.79.2)':
     dependencies:
@@ -14286,9 +14317,9 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@rollup/plugin-commonjs@28.0.6(rollup@4.50.2)':
+  '@rollup/plugin-commonjs@28.0.6(rollup@4.52.4)':
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       commondir: 1.0.1
       estree-walker: 2.0.2
       fdir: 6.5.0(picomatch@4.0.3)
@@ -14296,21 +14327,21 @@ snapshots:
       magic-string: 0.30.19
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
-  '@rollup/plugin-inject@5.0.5(rollup@4.50.2)':
+  '@rollup/plugin-inject@5.0.5(rollup@4.52.4)':
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       estree-walker: 2.0.2
       magic-string: 0.30.19
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
-  '@rollup/plugin-json@6.1.0(rollup@4.50.2)':
+  '@rollup/plugin-json@6.1.0(rollup@4.52.4)':
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   '@rollup/plugin-node-resolve@15.3.1(rollup@2.79.2)':
     dependencies:
@@ -14322,15 +14353,15 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.2
 
-  '@rollup/plugin-node-resolve@16.0.1(rollup@4.50.2)':
+  '@rollup/plugin-node-resolve@16.0.2(rollup@4.52.4)':
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       '@types/resolve': 1.20.2
       deepmerge: 4.3.1
       is-module: 1.0.0
       resolve: 1.22.10
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   '@rollup/plugin-replace@2.4.2(rollup@2.79.2)':
     dependencies:
@@ -14338,12 +14369,12 @@ snapshots:
       magic-string: 0.25.9
       rollup: 2.79.2
 
-  '@rollup/plugin-replace@6.0.2(rollup@4.50.2)':
+  '@rollup/plugin-replace@6.0.2(rollup@4.52.4)':
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       magic-string: 0.30.19
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   '@rollup/plugin-terser@0.4.4(rollup@2.79.2)':
     dependencies:
@@ -14353,13 +14384,13 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.2
 
-  '@rollup/plugin-terser@0.4.4(rollup@4.50.2)':
+  '@rollup/plugin-terser@0.4.4(rollup@4.52.4)':
     dependencies:
       serialize-javascript: 6.0.2
       smob: 1.5.0
       terser: 5.44.0
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   '@rollup/pluginutils@3.1.0(rollup@2.79.2)':
     dependencies:
@@ -14381,78 +14412,81 @@ snapshots:
     optionalDependencies:
       rollup: 2.79.2
 
-  '@rollup/pluginutils@5.3.0(rollup@4.50.2)':
+  '@rollup/pluginutils@5.3.0(rollup@4.52.4)':
     dependencies:
       '@types/estree': 1.0.8
       estree-walker: 2.0.2
       picomatch: 4.0.3
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
+
+  '@rollup/rollup-android-arm-eabi@4.52.4':
+    optional: true
 
-  '@rollup/rollup-android-arm-eabi@4.50.2':
+  '@rollup/rollup-android-arm64@4.52.4':
     optional: true
 
-  '@rollup/rollup-android-arm64@4.50.2':
+  '@rollup/rollup-darwin-arm64@4.52.4':
     optional: true
 
-  '@rollup/rollup-darwin-arm64@4.50.2':
+  '@rollup/rollup-darwin-x64@4.52.4':
     optional: true
 
-  '@rollup/rollup-darwin-x64@4.50.2':
+  '@rollup/rollup-freebsd-arm64@4.52.4':
     optional: true
 
-  '@rollup/rollup-freebsd-arm64@4.50.2':
+  '@rollup/rollup-freebsd-x64@4.52.4':
     optional: true
 
-  '@rollup/rollup-freebsd-x64@4.50.2':
+  '@rollup/rollup-linux-arm-gnueabihf@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-gnueabihf@4.50.2':
+  '@rollup/rollup-linux-arm-musleabihf@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-arm-musleabihf@4.50.2':
+  '@rollup/rollup-linux-arm64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-gnu@4.50.2':
+  '@rollup/rollup-linux-arm64-musl@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-arm64-musl@4.50.2':
+  '@rollup/rollup-linux-loong64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-loong64-gnu@4.50.2':
+  '@rollup/rollup-linux-ppc64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-ppc64-gnu@4.50.2':
+  '@rollup/rollup-linux-riscv64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-gnu@4.50.2':
+  '@rollup/rollup-linux-riscv64-musl@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-riscv64-musl@4.50.2':
+  '@rollup/rollup-linux-s390x-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-s390x-gnu@4.50.2':
+  '@rollup/rollup-linux-x64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-gnu@4.50.2':
+  '@rollup/rollup-linux-x64-musl@4.52.4':
     optional: true
 
-  '@rollup/rollup-linux-x64-musl@4.50.2':
+  '@rollup/rollup-openharmony-arm64@4.52.4':
     optional: true
 
-  '@rollup/rollup-openharmony-arm64@4.50.2':
+  '@rollup/rollup-win32-arm64-msvc@4.52.4':
     optional: true
 
-  '@rollup/rollup-win32-arm64-msvc@4.50.2':
+  '@rollup/rollup-win32-ia32-msvc@4.52.4':
     optional: true
 
-  '@rollup/rollup-win32-ia32-msvc@4.50.2':
+  '@rollup/rollup-win32-x64-gnu@4.52.4':
     optional: true
 
-  '@rollup/rollup-win32-x64-msvc@4.50.2':
+  '@rollup/rollup-win32-x64-msvc@4.52.4':
     optional: true
 
-  '@rushstack/node-core-library@5.14.0(@types/node@24.5.2)':
+  '@rushstack/node-core-library@5.17.0(@types/node@24.7.1)':
     dependencies:
       ajv: 8.13.0
       ajv-draft-04: 1.0.0(ajv@8.13.0)
@@ -14463,23 +14497,28 @@ snapshots:
       resolve: 1.22.10
       semver: 7.5.4
     optionalDependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
-  '@rushstack/rig-package@0.5.3':
+  '@rushstack/problem-matcher@0.1.1(@types/node@24.7.1)':
+    optionalDependencies:
+      '@types/node': 24.7.1
+
+  '@rushstack/rig-package@0.6.0':
     dependencies:
       resolve: 1.22.10
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.16.0(@types/node@24.5.2)':
+  '@rushstack/terminal@0.19.1(@types/node@24.7.1)':
     dependencies:
-      '@rushstack/node-core-library': 5.14.0(@types/node@24.5.2)
+      '@rushstack/node-core-library': 5.17.0(@types/node@24.7.1)
+      '@rushstack/problem-matcher': 0.1.1(@types/node@24.7.1)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
-  '@rushstack/ts-command-line@5.0.3(@types/node@24.5.2)':
+  '@rushstack/ts-command-line@5.1.1(@types/node@24.7.1)':
     dependencies:
-      '@rushstack/terminal': 0.16.0(@types/node@24.5.2)
+      '@rushstack/terminal': 0.19.1(@types/node@24.7.1)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
@@ -14530,7 +14569,7 @@ snapshots:
 
   '@simonwep/pickr@1.8.2':
     dependencies:
-      core-js: 3.45.1
+      core-js: 3.46.0
       nanopop: 2.4.2
 
   '@sindresorhus/is@7.1.0': {}
@@ -14541,7 +14580,7 @@ snapshots:
 
   '@speed-highlight/core@1.2.7': {}
 
-  '@stylistic/stylelint-plugin@3.1.3(stylelint@16.24.0(typescript@5.9.2))':
+  '@stylistic/stylelint-plugin@3.1.3(stylelint@16.25.0(typescript@5.9.3))':
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
@@ -14551,7 +14590,7 @@ snapshots:
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
       style-search: 0.1.0
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
   '@surma/rollup-plugin-off-main-thread@2.2.3':
     dependencies:
@@ -14560,11 +14599,11 @@ snapshots:
       magic-string: 0.25.9
       string.prototype.matchall: 4.0.12
 
-  '@svelte-put/shortcut@4.1.0(svelte@5.39.2)':
+  '@svelte-put/shortcut@4.1.0(svelte@5.39.11)':
     dependencies:
-      svelte: 5.39.2
+      svelte: 5.39.11
 
-  '@sveltejs/acorn-typescript@1.0.5(acorn@8.15.0)':
+  '@sveltejs/acorn-typescript@1.0.6(acorn@8.15.0)':
     dependencies:
       acorn: 8.15.0
 
@@ -14579,60 +14618,57 @@ snapshots:
       postcss: 8.5.6
       postcss-nested: 5.0.6(postcss@8.5.6)
 
-  '@tailwindcss/typography@0.5.16(tailwindcss@3.4.17)':
+  '@tailwindcss/typography@0.5.19(tailwindcss@3.4.18(yaml@2.8.1))':
     dependencies:
-      lodash.castarray: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.merge: 4.6.2
       postcss-selector-parser: 6.0.10
-      tailwindcss: 3.4.17
+      tailwindcss: 3.4.18(yaml@2.8.1)
 
   '@tanstack/match-sorter-utils@8.19.4':
     dependencies:
       remove-accents: 0.5.0
 
-  '@tanstack/query-core@5.89.0': {}
+  '@tanstack/query-core@5.90.2': {}
 
-  '@tanstack/store@0.7.5': {}
+  '@tanstack/store@0.7.7': {}
 
   '@tanstack/virtual-core@3.13.12': {}
 
-  '@tanstack/vue-query@5.89.0(vue@3.5.21(typescript@5.9.2))':
+  '@tanstack/vue-query@5.90.2(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@tanstack/match-sorter-utils': 8.19.4
-      '@tanstack/query-core': 5.89.0
+      '@tanstack/query-core': 5.90.2
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.21(typescript@5.9.2)
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue: 3.5.22(typescript@5.9.3)
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
 
-  '@tanstack/vue-store@0.7.5(vue@3.5.21(typescript@5.9.2))':
+  '@tanstack/vue-store@0.7.7(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@tanstack/store': 0.7.5
-      vue: 3.5.21(typescript@5.9.2)
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      '@tanstack/store': 0.7.7
+      vue: 3.5.22(typescript@5.9.3)
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
 
-  '@tanstack/vue-virtual@3.13.12(vue@3.5.21(typescript@5.9.2))':
+  '@tanstack/vue-virtual@3.13.12(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@tanstack/virtual-core': 3.13.12
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@tinyflow-ai/ui@1.1.3(svelte@5.39.2)':
+  '@tinyflow-ai/ui@1.1.5(svelte@5.39.11)':
     dependencies:
       '@floating-ui/dom': 1.7.4
-      '@xyflow/svelte': 1.3.0(svelte@5.39.2)
+      '@xyflow/svelte': 1.3.1(svelte@5.39.11)
     transitivePeerDependencies:
       - svelte
 
-  '@tinyflow-ai/vue@1.1.3(svelte@5.39.2)(vue@3.5.21(typescript@5.9.2))':
+  '@tinyflow-ai/vue@1.1.5(svelte@5.39.11)(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@tinyflow-ai/ui': 1.1.3(svelte@5.39.2)
-      vue: 3.5.21(typescript@5.9.2)
+      '@tinyflow-ai/ui': 1.1.5(svelte@5.39.11)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - svelte
 
-  '@tinymce/tinymce-vue@6.3.0(tinymce@7.9.1)(vue@3.5.21(typescript@5.9.2))':
+  '@tinymce/tinymce-vue@6.3.0(tinymce@7.9.1)(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
       tinymce: 7.9.1
 
@@ -14655,7 +14691,7 @@ snapshots:
 
   '@types/conventional-commits-parser@5.0.1':
     dependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
   '@types/crypto-js@4.2.2': {}
 
@@ -14802,7 +14838,7 @@ snapshots:
   '@types/jsonwebtoken@9.0.10':
     dependencies:
       '@types/ms': 2.1.0
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
   '@types/katex@0.16.7': {}
 
@@ -14847,13 +14883,13 @@ snapshots:
 
   '@types/node@12.20.55': {}
 
-  '@types/node@22.18.6':
+  '@types/node@22.18.9':
     dependencies:
       undici-types: 6.21.0
 
-  '@types/node@24.5.2':
+  '@types/node@24.7.1':
     dependencies:
-      undici-types: 7.12.0
+      undici-types: 7.14.0
 
   '@types/nprogress@0.2.3': {}
 
@@ -14865,13 +14901,13 @@ snapshots:
 
   '@types/qrcode@1.5.5':
     dependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
   '@types/qs@6.14.0': {}
 
   '@types/readdir-glob@1.1.5':
     dependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
 
   '@types/resolve@1.20.2': {}
 
@@ -14887,41 +14923,41 @@ snapshots:
 
   '@types/web-bluetooth@0.0.21': {}
 
-  '@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)':
+  '@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      '@typescript-eslint/scope-manager': 8.44.0
-      '@typescript-eslint/type-utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      '@typescript-eslint/visitor-keys': 8.44.0
-      eslint: 9.35.0(jiti@2.5.1)
+      '@typescript-eslint/parser': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/type-utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.46.0
+      eslint: 9.37.0(jiti@2.6.1)
       graphemer: 1.4.0
       ignore: 7.0.5
       natural-compare: 1.4.0
-      ts-api-utils: 2.1.0(typescript@5.9.2)
-      typescript: 5.9.2
+      ts-api-utils: 2.1.0(typescript@5.9.3)
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)':
+  '@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/scope-manager': 8.44.0
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2)
-      '@typescript-eslint/visitor-keys': 8.44.0
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/visitor-keys': 8.46.0
       debug: 4.4.3
-      eslint: 9.35.0(jiti@2.5.1)
-      typescript: 5.9.2
+      eslint: 9.37.0(jiti@2.6.1)
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/project-service@8.44.0(typescript@5.9.2)':
+  '@typescript-eslint/project-service@8.46.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.2)
-      '@typescript-eslint/types': 8.44.0
+      '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.0
       debug: 4.4.3
-      typescript: 5.9.2
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
@@ -14930,32 +14966,32 @@ snapshots:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
 
-  '@typescript-eslint/scope-manager@8.44.0':
+  '@typescript-eslint/scope-manager@8.46.0':
     dependencies:
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/visitor-keys': 8.44.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/visitor-keys': 8.46.0
 
-  '@typescript-eslint/tsconfig-utils@8.44.0(typescript@5.9.2)':
+  '@typescript-eslint/tsconfig-utils@8.46.0(typescript@5.9.3)':
     dependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  '@typescript-eslint/type-utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)':
+  '@typescript-eslint/type-utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2)
-      '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
       debug: 4.4.3
-      eslint: 9.35.0(jiti@2.5.1)
-      ts-api-utils: 2.1.0(typescript@5.9.2)
-      typescript: 5.9.2
+      eslint: 9.37.0(jiti@2.6.1)
+      ts-api-utils: 2.1.0(typescript@5.9.3)
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
   '@typescript-eslint/types@7.18.0': {}
 
-  '@typescript-eslint/types@8.44.0': {}
+  '@typescript-eslint/types@8.46.0': {}
 
-  '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.2)':
+  '@typescript-eslint/typescript-estree@7.18.0(typescript@5.9.3)':
     dependencies:
       '@typescript-eslint/types': 7.18.0
       '@typescript-eslint/visitor-keys': 7.18.0
@@ -14963,48 +14999,48 @@ snapshots:
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.2
-      ts-api-utils: 1.4.3(typescript@5.9.2)
+      semver: 7.7.3
+      ts-api-utils: 1.4.3(typescript@5.9.3)
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/typescript-estree@8.44.0(typescript@5.9.2)':
+  '@typescript-eslint/typescript-estree@8.46.0(typescript@5.9.3)':
     dependencies:
-      '@typescript-eslint/project-service': 8.44.0(typescript@5.9.2)
-      '@typescript-eslint/tsconfig-utils': 8.44.0(typescript@5.9.2)
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/visitor-keys': 8.44.0
+      '@typescript-eslint/project-service': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/tsconfig-utils': 8.46.0(typescript@5.9.3)
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/visitor-keys': 8.46.0
       debug: 4.4.3
       fast-glob: 3.3.3
       is-glob: 4.0.3
       minimatch: 9.0.5
-      semver: 7.7.2
-      ts-api-utils: 2.1.0(typescript@5.9.2)
-      typescript: 5.9.2
+      semver: 7.7.3
+      ts-api-utils: 2.1.0(typescript@5.9.3)
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
-  '@typescript-eslint/utils@7.18.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)':
+  '@typescript-eslint/utils@7.18.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@typescript-eslint/scope-manager': 7.18.0
       '@typescript-eslint/types': 7.18.0
-      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.2)
-      eslint: 9.35.0(jiti@2.5.1)
+      '@typescript-eslint/typescript-estree': 7.18.0(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  '@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)':
+  '@typescript-eslint/utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
-      '@typescript-eslint/scope-manager': 8.44.0
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/typescript-estree': 8.44.0(typescript@5.9.2)
-      eslint: 9.35.0(jiti@2.5.1)
-      typescript: 5.9.2
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
+      '@typescript-eslint/scope-manager': 8.46.0
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/typescript-estree': 8.46.0(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
+      typescript: 5.9.3
     transitivePeerDependencies:
       - supports-color
 
@@ -15013,9 +15049,9 @@ snapshots:
       '@typescript-eslint/types': 7.18.0
       eslint-visitor-keys: 3.4.3
 
-  '@typescript-eslint/visitor-keys@8.44.0':
+  '@typescript-eslint/visitor-keys@8.46.0':
     dependencies:
-      '@typescript-eslint/types': 8.44.0
+      '@typescript-eslint/types': 8.46.0
       eslint-visitor-keys: 4.2.1
 
   '@ungap/structured-clone@1.3.0': {}
@@ -15079,18 +15115,18 @@ snapshots:
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
     optional: true
 
-  '@vee-validate/zod@4.15.1(vue@3.5.21(typescript@5.9.2))(zod@3.25.76)':
+  '@vee-validate/zod@4.15.1(vue@3.5.22(typescript@5.9.3))(zod@3.25.76)':
     dependencies:
       type-fest: 4.41.0
-      vee-validate: 4.15.1(vue@3.5.21(typescript@5.9.2))
+      vee-validate: 4.15.1(vue@3.5.22(typescript@5.9.3))
       zod: 3.25.76
     transitivePeerDependencies:
       - vue
 
-  '@vercel/nft@0.30.1(encoding@0.1.13)(rollup@4.50.2)':
+  '@vercel/nft@0.30.2(rollup@4.52.4)':
     dependencies:
-      '@mapbox/node-pre-gyp': 2.0.0(encoding@0.1.13)
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@mapbox/node-pre-gyp': 2.0.0
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       acorn: 8.15.0
       acorn-import-attributes: 1.9.5(acorn@8.15.0)
       async-sema: 3.1.1
@@ -15106,50 +15142,50 @@ snapshots:
       - rollup
       - supports-color
 
-  '@vite-pwa/vitepress@1.0.0(vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0))':
+  '@vite-pwa/vitepress@1.0.0(vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0))':
     dependencies:
-      vite-plugin-pwa: 1.0.3(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+      vite-plugin-pwa: 1.0.3(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
 
-  '@vitejs/plugin-vue-jsx@5.1.1(vite@5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue-jsx@5.1.1(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4)
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
-      '@rolldown/pluginutils': 1.0.0-beta.38
+      '@rolldown/pluginutils': 1.0.0-beta.42
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
-      vite: 5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue-jsx@5.1.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue-jsx@5.1.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-syntax-typescript': 7.27.1(@babel/core@7.28.4)
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
-      '@rolldown/pluginutils': 1.0.0-beta.38
+      '@rolldown/pluginutils': 1.0.0-beta.42
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.4(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@5.2.4(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@vitejs/plugin-vue@6.0.1(vite@5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@6.0.1(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.29
-      vite: 5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@vitejs/plugin-vue@6.0.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vitejs/plugin-vue@6.0.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.29
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vue: 3.5.22(typescript@5.9.3)
 
   '@vitest/expect@3.2.4':
     dependencies:
@@ -15159,22 +15195,13 @@ snapshots:
       chai: 5.3.3
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1))':
-    dependencies:
-      '@vitest/spy': 3.2.4
-      estree-walker: 3.0.3
-      magic-string: 0.30.19
-    optionalDependencies:
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
-
-  '@vitest/mocker@3.2.4(vite@7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1))':
+  '@vitest/mocker@3.2.4(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.19
     optionalDependencies:
-      vite: 7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
-    optional: true
+      vite: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -15184,7 +15211,7 @@ snapshots:
     dependencies:
       '@vitest/utils': 3.2.4
       pathe: 2.0.3
-      strip-literal: 3.0.0
+      strip-literal: 3.1.0
 
   '@vitest/snapshot@3.2.4':
     dependencies:
@@ -15194,7 +15221,7 @@ snapshots:
 
   '@vitest/spy@3.2.4':
     dependencies:
-      tinyspy: 4.0.3
+      tinyspy: 4.0.4
 
   '@vitest/utils@3.2.4':
     dependencies:
@@ -15226,7 +15253,7 @@ snapshots:
       '@babel/types': 7.28.4
       '@vue/babel-helper-vue-transform-on': 1.5.0
       '@vue/babel-plugin-resolve-type': 1.5.0(@babel/core@7.28.4)
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
     optionalDependencies:
       '@babel/core': 7.28.4
     transitivePeerDependencies:
@@ -15239,39 +15266,39 @@ snapshots:
       '@babel/helper-module-imports': 7.27.1
       '@babel/helper-plugin-utils': 7.27.1
       '@babel/parser': 7.28.4
-      '@vue/compiler-sfc': 3.5.21
+      '@vue/compiler-sfc': 3.5.22
     transitivePeerDependencies:
       - supports-color
 
-  '@vue/compiler-core@3.5.21':
+  '@vue/compiler-core@3.5.22':
     dependencies:
       '@babel/parser': 7.28.4
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.21':
+  '@vue/compiler-dom@3.5.22':
     dependencies:
-      '@vue/compiler-core': 3.5.21
-      '@vue/shared': 3.5.21
+      '@vue/compiler-core': 3.5.22
+      '@vue/shared': 3.5.22
 
-  '@vue/compiler-sfc@3.5.21':
+  '@vue/compiler-sfc@3.5.22':
     dependencies:
       '@babel/parser': 7.28.4
-      '@vue/compiler-core': 3.5.21
-      '@vue/compiler-dom': 3.5.21
-      '@vue/compiler-ssr': 3.5.21
-      '@vue/shared': 3.5.21
+      '@vue/compiler-core': 3.5.22
+      '@vue/compiler-dom': 3.5.22
+      '@vue/compiler-ssr': 3.5.22
+      '@vue/shared': 3.5.22
       estree-walker: 2.0.2
       magic-string: 0.30.19
       postcss: 8.5.6
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.21':
+  '@vue/compiler-ssr@3.5.22':
     dependencies:
-      '@vue/compiler-dom': 3.5.21
-      '@vue/shared': 3.5.21
+      '@vue/compiler-dom': 3.5.22
+      '@vue/shared': 3.5.22
 
   '@vue/compiler-vue2@2.7.16':
     dependencies:
@@ -15284,22 +15311,22 @@ snapshots:
     dependencies:
       '@vue/devtools-kit': 7.7.7
 
-  '@vue/devtools-core@7.7.7(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))':
+  '@vue/devtools-core@7.7.7(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       mitt: 3.0.1
-      nanoid: 5.1.5
+      nanoid: 5.1.6
       pathe: 2.0.3
-      vite-hot-client: 2.1.0(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
-      vue: 3.5.21(typescript@5.9.2)
+      vite-hot-client: 2.1.0(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - vite
 
   '@vue/devtools-kit@7.7.7':
     dependencies:
       '@vue/devtools-shared': 7.7.7
-      birpc: 2.5.0
+      birpc: 2.6.1
       hookable: 5.5.3
       mitt: 3.0.1
       perfect-debounce: 1.0.0
@@ -15310,102 +15337,102 @@ snapshots:
     dependencies:
       rfdc: 1.4.1
 
-  '@vue/language-core@2.2.0(typescript@5.9.2)':
+  '@vue/language-core@2.2.0(typescript@5.9.3)':
     dependencies:
       '@volar/language-core': 2.4.23
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.22
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
       alien-signals: 0.4.14
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  '@vue/language-core@2.2.10(typescript@5.9.2)':
+  '@vue/language-core@2.2.10(typescript@5.9.3)':
     dependencies:
       '@volar/language-core': 2.4.23
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.22
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
       alien-signals: 1.0.13
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  '@vue/reactivity@3.5.21':
+  '@vue/reactivity@3.5.22':
     dependencies:
-      '@vue/shared': 3.5.21
+      '@vue/shared': 3.5.22
 
-  '@vue/runtime-core@3.5.21':
+  '@vue/runtime-core@3.5.22':
     dependencies:
-      '@vue/reactivity': 3.5.21
-      '@vue/shared': 3.5.21
+      '@vue/reactivity': 3.5.22
+      '@vue/shared': 3.5.22
 
-  '@vue/runtime-dom@3.5.21':
+  '@vue/runtime-dom@3.5.22':
     dependencies:
-      '@vue/reactivity': 3.5.21
-      '@vue/runtime-core': 3.5.21
-      '@vue/shared': 3.5.21
+      '@vue/reactivity': 3.5.22
+      '@vue/runtime-core': 3.5.22
+      '@vue/shared': 3.5.22
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.21(vue@3.5.21(typescript@5.9.2))':
+  '@vue/server-renderer@3.5.22(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@vue/compiler-ssr': 3.5.21
-      '@vue/shared': 3.5.21
-      vue: 3.5.21(typescript@5.9.2)
+      '@vue/compiler-ssr': 3.5.22
+      '@vue/shared': 3.5.22
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@vue/shared@3.5.21': {}
+  '@vue/shared@3.5.22': {}
 
   '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.15.4
       vue-component-type-helpers: 2.2.12
 
-  '@vueuse/core@10.11.1(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/core@10.11.1(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.1
-      '@vueuse/shared': 10.11.1(vue@3.5.21(typescript@5.9.2))
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/shared': 10.11.1(vue@3.5.22(typescript@5.9.3))
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/core@12.8.2(typescript@5.9.2)':
+  '@vueuse/core@12.8.2(typescript@5.9.3)':
     dependencies:
       '@types/web-bluetooth': 0.0.21
       '@vueuse/metadata': 12.8.2
-      '@vueuse/shared': 12.8.2(typescript@5.9.2)
-      vue: 3.5.21(typescript@5.9.2)
+      '@vueuse/shared': 12.8.2(typescript@5.9.3)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/core@13.9.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/core@13.9.0(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.21
       '@vueuse/metadata': 13.9.0
-      '@vueuse/shared': 13.9.0(vue@3.5.21(typescript@5.9.2))
-      vue: 3.5.21(typescript@5.9.2)
+      '@vueuse/shared': 13.9.0(vue@3.5.22(typescript@5.9.3))
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@vueuse/core@9.13.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/core@9.13.0(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
       '@vueuse/metadata': 9.13.0
-      '@vueuse/shared': 9.13.0(vue@3.5.21(typescript@5.9.2))
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/shared': 9.13.0(vue@3.5.22(typescript@5.9.3))
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/integrations@12.8.2(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(typescript@5.9.2)':
+  '@vueuse/integrations@12.8.2(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(typescript@5.9.3)':
     dependencies:
-      '@vueuse/core': 12.8.2(typescript@5.9.2)
-      '@vueuse/shared': 12.8.2(typescript@5.9.2)
-      vue: 3.5.21(typescript@5.9.2)
+      '@vueuse/core': 12.8.2(typescript@5.9.3)
+      '@vueuse/shared': 12.8.2(typescript@5.9.3)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
       async-validator: 4.2.5
       axios: 1.12.2
@@ -15416,11 +15443,11 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/integrations@13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/integrations@13.9.0(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@vueuse/core': 13.9.0(vue@3.5.21(typescript@5.9.2))
-      '@vueuse/shared': 13.9.0(vue@3.5.21(typescript@5.9.2))
-      vue: 3.5.21(typescript@5.9.2)
+      '@vueuse/core': 13.9.0(vue@3.5.22(typescript@5.9.3))
+      '@vueuse/shared': 13.9.0(vue@3.5.22(typescript@5.9.3))
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
       async-validator: 4.2.5
       axios: 1.12.2
@@ -15437,57 +15464,57 @@ snapshots:
 
   '@vueuse/metadata@9.13.0': {}
 
-  '@vueuse/motion@3.0.3(magicast@0.3.5)(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/motion@3.0.3(magicast@0.3.5)(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      '@vueuse/core': 13.9.0(vue@3.5.21(typescript@5.9.2))
-      '@vueuse/shared': 13.9.0(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/core': 13.9.0(vue@3.5.22(typescript@5.9.3))
+      '@vueuse/shared': 13.9.0(vue@3.5.22(typescript@5.9.3))
       defu: 6.1.4
       framesync: 6.1.2
       popmotion: 11.0.5
       style-value-types: 5.1.2
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
-      '@nuxt/kit': 3.19.2(magicast@0.3.5)
+      '@nuxt/kit': 3.19.3(magicast@0.3.5)
     transitivePeerDependencies:
       - magicast
 
-  '@vueuse/shared@10.11.1(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/shared@10.11.1(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vueuse/shared@12.8.2(typescript@5.9.2)':
+  '@vueuse/shared@12.8.2(typescript@5.9.3)':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/shared@13.9.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/shared@13.9.0(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  '@vueuse/shared@9.13.0(vue@3.5.21(typescript@5.9.2))':
+  '@vueuse/shared@9.13.0(vue@3.5.22(typescript@5.9.3))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.21(typescript@5.9.2))
+      vue-demi: 0.14.10(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  '@vxe-ui/core@4.2.12(vue@3.5.21(typescript@5.9.2))':
+  '@vxe-ui/core@4.2.12(vue@3.5.22(typescript@5.9.3))':
     dependencies:
       dom-zindex: 1.0.6
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
       xe-utils: 3.7.9
 
-  '@xyflow/svelte@1.3.0(svelte@5.39.2)':
+  '@xyflow/svelte@1.3.1(svelte@5.39.11)':
     dependencies:
-      '@svelte-put/shortcut': 4.1.0(svelte@5.39.2)
-      '@xyflow/system': 0.0.69
-      svelte: 5.39.2
+      '@svelte-put/shortcut': 4.1.0(svelte@5.39.11)
+      '@xyflow/system': 0.0.70
+      svelte: 5.39.11
 
-  '@xyflow/system@0.0.69':
+  '@xyflow/system@0.0.70':
     dependencies:
       '@types/d3-drag': 3.0.7
       '@types/d3-interpolate': 3.0.4
@@ -15560,22 +15587,22 @@ snapshots:
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
-  algoliasearch@5.37.0:
-    dependencies:
-      '@algolia/abtesting': 1.3.0
-      '@algolia/client-abtesting': 5.37.0
-      '@algolia/client-analytics': 5.37.0
-      '@algolia/client-common': 5.37.0
-      '@algolia/client-insights': 5.37.0
-      '@algolia/client-personalization': 5.37.0
-      '@algolia/client-query-suggestions': 5.37.0
-      '@algolia/client-search': 5.37.0
-      '@algolia/ingestion': 1.37.0
-      '@algolia/monitoring': 1.37.0
-      '@algolia/recommend': 5.37.0
-      '@algolia/requester-browser-xhr': 5.37.0
-      '@algolia/requester-fetch': 5.37.0
-      '@algolia/requester-node-http': 5.37.0
+  algoliasearch@5.40.0:
+    dependencies:
+      '@algolia/abtesting': 1.6.0
+      '@algolia/client-abtesting': 5.40.0
+      '@algolia/client-analytics': 5.40.0
+      '@algolia/client-common': 5.40.0
+      '@algolia/client-insights': 5.40.0
+      '@algolia/client-personalization': 5.40.0
+      '@algolia/client-query-suggestions': 5.40.0
+      '@algolia/client-search': 5.40.0
+      '@algolia/ingestion': 1.40.0
+      '@algolia/monitoring': 1.40.0
+      '@algolia/recommend': 5.40.0
+      '@algolia/requester-browser-xhr': 5.40.0
+      '@algolia/requester-fetch': 5.40.0
+      '@algolia/requester-node-http': 5.40.0
 
   alien-signals@0.4.14: {}
 
@@ -15587,7 +15614,7 @@ snapshots:
 
   ansi-colors@4.1.3: {}
 
-  ansi-escapes@7.1.0:
+  ansi-escapes@7.1.1:
     dependencies:
       environment: 1.1.0
 
@@ -15601,10 +15628,10 @@ snapshots:
 
   ansi-styles@6.2.3: {}
 
-  ant-design-vue@4.2.6(vue@3.5.21(typescript@5.9.2)):
+  ant-design-vue@4.2.6(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@ant-design/colors': 6.0.0
-      '@ant-design/icons-vue': 7.0.1(vue@3.5.21(typescript@5.9.2))
+      '@ant-design/icons-vue': 7.0.1(vue@3.5.22(typescript@5.9.3))
       '@babel/runtime': 7.28.4
       '@ctrl/tinycolor': 4.2.0
       '@emotion/hash': 0.9.2
@@ -15623,8 +15650,8 @@ snapshots:
       shallow-equal: 1.2.1
       stylis: 4.3.6
       throttle-debounce: 5.0.2
-      vue: 3.5.21(typescript@5.9.2)
-      vue-types: 3.0.2(vue@3.5.21(typescript@5.9.2))
+      vue: 3.5.22(typescript@5.9.3)
+      vue-types: 3.0.2(vue@3.5.22(typescript@5.9.3))
       warning: 4.0.3
 
   any-promise@1.3.0: {}
@@ -15654,6 +15681,7 @@ snapshots:
       tar-stream: 3.1.7
       zip-stream: 6.0.1
     transitivePeerDependencies:
+      - bare-abort-controller
       - react-native-b4a
 
   are-docs-informative@0.0.2: {}
@@ -15728,8 +15756,8 @@ snapshots:
 
   autoprefixer@10.4.21(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
-      caniuse-lite: 1.0.30001743
+      browserslist: 4.26.3
+      caniuse-lite: 1.0.30001749
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.1.1
@@ -15756,7 +15784,7 @@ snapshots:
 
   axobject-query@4.1.0: {}
 
-  b4a@1.7.1: {}
+  b4a@1.7.3: {}
 
   babel-plugin-polyfill-corejs2@0.4.14(@babel/core@7.28.4):
     dependencies:
@@ -15771,7 +15799,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.28.4
       '@babel/helper-define-polyfill-provider': 0.6.5(@babel/core@7.28.4)
-      core-js-compat: 3.45.1
+      core-js-compat: 3.46.0
     transitivePeerDependencies:
       - supports-color
 
@@ -15786,12 +15814,11 @@ snapshots:
 
   balanced-match@2.0.0: {}
 
-  bare-events@2.7.0:
-    optional: true
+  bare-events@2.8.0: {}
 
   base64-js@1.5.1: {}
 
-  baseline-browser-mapping@2.8.5: {}
+  baseline-browser-mapping@2.8.16: {}
 
   better-path-resolve@1.0.0:
     dependencies:
@@ -15807,7 +15834,7 @@ snapshots:
 
   bintrees@1.0.2: {}
 
-  birpc@2.5.0: {}
+  birpc@2.6.1: {}
 
   boolbase@1.0.0: {}
 
@@ -15871,13 +15898,13 @@ snapshots:
     dependencies:
       fill-range: 7.1.1
 
-  browserslist@4.26.2:
+  browserslist@4.26.3:
     dependencies:
-      baseline-browser-mapping: 2.8.5
-      caniuse-lite: 1.0.30001743
-      electron-to-chromium: 1.5.221
-      node-releases: 2.0.21
-      update-browserslist-db: 1.1.3(browserslist@4.26.2)
+      baseline-browser-mapping: 2.8.16
+      caniuse-lite: 1.0.30001749
+      electron-to-chromium: 1.5.234
+      node-releases: 2.0.23
+      update-browserslist-db: 1.1.3(browserslist@4.26.3)
 
   buffer-crc32@1.0.0: {}
 
@@ -15901,10 +15928,10 @@ snapshots:
       chokidar: 4.0.3
       confbox: 0.2.2
       defu: 6.1.4
-      dotenv: 17.2.2
+      dotenv: 17.2.3
       exsolve: 1.0.7
       giget: 2.0.0
-      jiti: 2.5.1
+      jiti: 2.6.1
       ohash: 2.0.11
       pathe: 2.0.3
       perfect-debounce: 2.0.0
@@ -15920,7 +15947,7 @@ snapshots:
       '@npmcli/fs': 4.0.0
       fs-minipass: 3.0.3
       glob: 11.0.3
-      lru-cache: 11.2.1
+      lru-cache: 11.2.2
       minipass: 7.1.2
       minipass-collect: 2.0.1
       minipass-flush: 1.0.5
@@ -15929,13 +15956,14 @@ snapshots:
       ssri: 12.0.0
       unique-filename: 4.0.0
 
-  cacheable@2.0.1:
+  cacheable@2.1.0:
     dependencies:
-      '@cacheable/memoize': 2.0.1
-      '@cacheable/memory': 2.0.1
-      '@cacheable/utils': 2.0.1
-      hookified: 1.12.0
-      keyv: 5.5.2
+      '@cacheable/memoize': 2.0.3
+      '@cacheable/memory': 2.0.3
+      '@cacheable/utils': 2.1.0
+      hookified: 1.12.1
+      keyv: 5.5.3
+      qified: 0.5.0
 
   call-bind-apply-helpers@1.0.2:
     dependencies:
@@ -15983,12 +16011,12 @@ snapshots:
 
   caniuse-api@3.0.0:
     dependencies:
-      browserslist: 4.26.2
-      caniuse-lite: 1.0.30001743
+      browserslist: 4.26.3
+      caniuse-lite: 1.0.30001749
       lodash.memoize: 4.1.2
       lodash.uniq: 4.5.0
 
-  caniuse-lite@1.0.30001743: {}
+  caniuse-lite@1.0.30001749: {}
 
   ccount@2.0.1: {}
 
@@ -16072,21 +16100,21 @@ snapshots:
 
   ci-info@3.9.0: {}
 
-  ci-info@4.3.0: {}
+  ci-info@4.3.1: {}
 
   circular-dependency-scanner@2.3.0:
     dependencies:
       '@ast-grep/napi': 0.37.0
-      '@vue/compiler-sfc': 3.5.21
+      '@vue/compiler-sfc': 3.5.22
       commander: 12.1.0
-      get-tsconfig: 4.10.1
+      get-tsconfig: 4.12.0
       graph-cycles: 3.0.0
       listr2: 8.3.3
       minimatch: 9.0.5
       node-cleanup: 2.1.2
-      typescript: 5.9.2
+      typescript: 5.9.3
       update-notifier: 7.3.1
-      zx: 8.8.1
+      zx: 8.8.4
 
   citty@0.1.6:
     dependencies:
@@ -16192,17 +16220,15 @@ snapshots:
 
   commander@8.3.0: {}
 
-  comment-json@4.2.5:
+  comment-json@4.4.1:
     dependencies:
       array-timsort: 1.0.3
       core-util-is: 1.0.3
       esprima: 4.0.1
-      has-own-prop: 2.0.0
-      repeat-string: 1.6.1
 
   comment-parser@1.4.1: {}
 
-  commitlint-plugin-function-rules@4.0.2(@commitlint/lint@19.8.1):
+  commitlint-plugin-function-rules@4.1.0(@commitlint/lint@19.8.1):
     dependencies:
       '@commitlint/lint': 19.8.1
 
@@ -16286,22 +16312,22 @@ snapshots:
     dependencies:
       is-what: 4.1.16
 
-  core-js-compat@3.45.1:
+  core-js-compat@3.46.0:
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
 
-  core-js-pure@3.45.1: {}
+  core-js-pure@3.46.0: {}
 
-  core-js@3.45.1: {}
+  core-js@3.46.0: {}
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig-typescript-loader@6.1.0(@types/node@24.5.2)(cosmiconfig@9.0.0(typescript@5.9.2))(typescript@5.9.2):
+  cosmiconfig-typescript-loader@6.2.0(@types/node@24.7.1)(cosmiconfig@9.0.0(typescript@5.9.3))(typescript@5.9.3):
     dependencies:
-      '@types/node': 24.5.2
-      cosmiconfig: 9.0.0(typescript@5.9.2)
-      jiti: 2.5.1
-      typescript: 5.9.2
+      '@types/node': 24.7.1
+      cosmiconfig: 9.0.0(typescript@5.9.3)
+      jiti: 2.6.1
+      typescript: 5.9.3
 
   cosmiconfig@7.1.0:
     dependencies:
@@ -16311,14 +16337,14 @@ snapshots:
       path-type: 4.0.0
       yaml: 1.10.2
 
-  cosmiconfig@9.0.0(typescript@5.9.2):
+  cosmiconfig@9.0.0(typescript@5.9.3):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.1
       js-yaml: 4.1.0
       parse-json: 5.2.0
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
   crc-32@1.2.2: {}
 
@@ -16354,7 +16380,7 @@ snapshots:
   cspell-config-lib@8.19.4:
     dependencies:
       '@cspell/cspell-types': 8.19.4
-      comment-json: 4.2.5
+      comment-json: 4.4.1
       yaml: 2.8.1
 
   cspell-dictionary@8.19.4:
@@ -16362,7 +16388,7 @@ snapshots:
       '@cspell/cspell-pipe': 8.19.4
       '@cspell/cspell-types': 8.19.4
       cspell-trie-lib: 8.19.4
-      fast-equals: 5.2.2
+      fast-equals: 5.3.2
 
   cspell-gitignore@8.19.4:
     dependencies:
@@ -16396,7 +16422,7 @@ snapshots:
       '@cspell/strong-weak-map': 8.19.4
       '@cspell/url': 8.19.4
       clear-module: 4.1.2
-      comment-json: 4.2.5
+      comment-json: 4.4.1
       cspell-config-lib: 8.19.4
       cspell-dictionary: 8.19.4
       cspell-glob: 8.19.4
@@ -16404,7 +16430,7 @@ snapshots:
       cspell-io: 8.19.4
       cspell-trie-lib: 8.19.4
       env-paths: 3.0.0
-      fast-equals: 5.2.2
+      fast-equals: 5.3.2
       gensequence: 7.0.0
       import-fresh: 3.3.1
       resolve-from: 5.0.0
@@ -16435,7 +16461,7 @@ snapshots:
       cspell-lib: 8.19.4
       fast-json-stable-stringify: 2.1.0
       file-entry-cache: 9.1.0
-      semver: 7.7.2
+      semver: 7.7.3
       tinyglobby: 0.2.15
 
   css-blank-pseudo@7.0.1(postcss@8.5.6):
@@ -16443,7 +16469,7 @@ snapshots:
       postcss: 8.5.6
       postcss-selector-parser: 7.1.0
 
-  css-declaration-sorter@7.2.0(postcss@8.5.6):
+  css-declaration-sorter@7.3.0(postcss@8.5.6):
     dependencies:
       postcss: 8.5.6
 
@@ -16493,14 +16519,14 @@ snapshots:
 
   css-what@6.2.2: {}
 
-  cssdb@8.4.0: {}
+  cssdb@8.4.2: {}
 
   cssesc@3.0.0: {}
 
   cssnano-preset-default@7.0.9(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
-      css-declaration-sorter: 7.2.0(postcss@8.5.6)
+      browserslist: 4.26.3
+      css-declaration-sorter: 7.3.0(postcss@8.5.6)
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
       postcss-calc: 10.1.1(postcss@8.5.6)
@@ -16713,6 +16739,8 @@ snapshots:
 
   dargs@8.1.0: {}
 
+  data-uri-to-buffer@4.0.1: {}
+
   data-view-buffer@1.0.2:
     dependencies:
       call-bound: 1.0.4
@@ -16743,7 +16771,7 @@ snapshots:
 
   dayjs@1.11.18: {}
 
-  db0@0.3.2: {}
+  db0@0.3.4: {}
 
   de-indent@1.0.2: {}
 
@@ -16804,7 +16832,7 @@ snapshots:
     dependencies:
       '@babel/parser': 7.28.4
       '@babel/traverse': 7.28.4
-      '@vue/compiler-sfc': 3.5.21
+      '@vue/compiler-sfc': 3.5.22
       callsite: 1.0.0
       camelcase: 6.3.0
       cosmiconfig: 7.1.0
@@ -16823,7 +16851,7 @@ snapshots:
       require-package-name: 2.0.1
       resolve: 1.22.10
       resolve-from: 5.0.0
-      semver: 7.7.2
+      semver: 7.7.3
       yargs: 16.2.0
     transitivePeerDependencies:
       - supports-color
@@ -16842,7 +16870,7 @@ snapshots:
 
   detect-libc@1.0.3: {}
 
-  detect-libc@2.1.0: {}
+  detect-libc@2.1.2: {}
 
   devlop@1.1.0:
     dependencies:
@@ -16885,6 +16913,8 @@ snapshots:
 
   didyoumean@1.2.2: {}
 
+  diff-sequences@27.5.1: {}
+
   dijkstrajs@1.0.3: {}
 
   dir-glob@3.0.1:
@@ -16946,6 +16976,10 @@ snapshots:
       no-case: 3.0.4
       tslib: 2.8.1
 
+  dot-prop@10.1.0:
+    dependencies:
+      type-fest: 5.0.1
+
   dot-prop@5.3.0:
     dependencies:
       is-obj: 2.0.0
@@ -16960,7 +16994,7 @@ snapshots:
 
   dotenv@16.6.1: {}
 
-  dotenv@17.2.2: {}
+  dotenv@17.2.3: {}
 
   dotenv@8.6.0: {}
 
@@ -16988,7 +17022,7 @@ snapshots:
       '@one-ini/wasm': 0.1.1
       commander: 10.0.1
       minimatch: 9.0.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   ee-first@1.1.1: {}
 
@@ -16996,17 +17030,17 @@ snapshots:
     dependencies:
       jake: 10.9.4
 
-  electron-to-chromium@1.5.221: {}
+  electron-to-chromium@1.5.234: {}
 
-  element-plus@2.11.2(vue@3.5.21(typescript@5.9.2)):
+  element-plus@2.11.4(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@ctrl/tinycolor': 4.2.0
-      '@element-plus/icons-vue': 2.3.2(vue@3.5.21(typescript@5.9.2))
+      '@element-plus/icons-vue': 2.3.2(vue@3.5.22(typescript@5.9.3))
       '@floating-ui/dom': 1.7.4
       '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
       '@types/lodash': 4.17.20
       '@types/lodash-es': 4.17.12
-      '@vueuse/core': 9.13.0(vue@3.5.21(typescript@5.9.2))
+      '@vueuse/core': 9.13.0(vue@3.5.22(typescript@5.9.3))
       async-validator: 4.2.5
       dayjs: 1.11.18
       escape-html: 1.0.3
@@ -17015,7 +17049,7 @@ snapshots:
       lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21)
       memoize-one: 6.0.0
       normalize-wheel-es: 1.2.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -17034,15 +17068,10 @@ snapshots:
       iconv-lite: 0.6.3
       whatwg-encoding: 3.1.1
 
-  encoding@0.1.13:
-    dependencies:
-      iconv-lite: 0.6.3
-    optional: true
-
   enhanced-resolve@5.18.3:
     dependencies:
       graceful-fs: 4.2.11
-      tapable: 2.2.3
+      tapable: 2.3.0
 
   enquirer@2.4.1:
     dependencies:
@@ -17061,8 +17090,6 @@ snapshots:
 
   environment@1.1.0: {}
 
-  err-code@2.0.3: {}
-
   errno@0.1.8:
     dependencies:
       prr: 1.0.1
@@ -17159,7 +17186,7 @@ snapshots:
       is-date-object: 1.1.0
       is-symbol: 1.1.1
 
-  es-toolkit@1.39.10: {}
+  es-toolkit@1.40.0: {}
 
   esbuild@0.25.3:
     optionalDependencies:
@@ -17209,162 +17236,163 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-compat-utils@0.5.1(eslint@9.35.0(jiti@2.5.1)):
+  eslint-compat-utils@0.5.1(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
-      semver: 7.7.2
+      eslint: 9.37.0(jiti@2.6.1)
+      semver: 7.7.3
 
-  eslint-compat-utils@0.6.5(eslint@9.35.0(jiti@2.5.1)):
+  eslint-compat-utils@0.6.5(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
-      semver: 7.7.2
+      eslint: 9.37.0(jiti@2.6.1)
+      semver: 7.7.3
 
-  eslint-config-turbo@2.5.6(eslint@9.35.0(jiti@2.5.1))(turbo@2.5.6):
+  eslint-config-turbo@2.5.8(eslint@9.37.0(jiti@2.6.1))(turbo@2.5.8):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
-      eslint-plugin-turbo: 2.5.6(eslint@9.35.0(jiti@2.5.1))(turbo@2.5.6)
-      turbo: 2.5.6
+      eslint: 9.37.0(jiti@2.6.1)
+      eslint-plugin-turbo: 2.5.8(eslint@9.37.0(jiti@2.6.1))(turbo@2.5.8)
+      turbo: 2.5.8
 
   eslint-import-context@0.1.9(unrs-resolver@1.11.1):
     dependencies:
-      get-tsconfig: 4.10.1
+      get-tsconfig: 4.12.0
       stable-hash-x: 0.2.0
     optionalDependencies:
       unrs-resolver: 1.11.1
 
-  eslint-json-compat-utils@0.2.1(eslint@9.35.0(jiti@2.5.1))(jsonc-eslint-parser@2.4.0):
+  eslint-json-compat-utils@0.2.1(eslint@9.37.0(jiti@2.6.1))(jsonc-eslint-parser@2.4.1):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       esquery: 1.6.0
-      jsonc-eslint-parser: 2.4.0
+      jsonc-eslint-parser: 2.4.1
 
-  eslint-plugin-command@3.3.1(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-command@3.3.1(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
       '@es-joy/jsdoccomment': 0.50.2
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
 
-  eslint-plugin-es-x@7.8.0(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-es-x@7.8.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.1
-      eslint: 9.35.0(jiti@2.5.1)
-      eslint-compat-utils: 0.5.1(eslint@9.35.0(jiti@2.5.1))
+      eslint: 9.37.0(jiti@2.6.1)
+      eslint-compat-utils: 0.5.1(eslint@9.37.0(jiti@2.6.1))
 
-  eslint-plugin-eslint-comments@3.2.0(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-eslint-comments@3.2.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
       escape-string-regexp: 1.0.5
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       ignore: 5.3.2
 
-  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-import-x@4.16.1(@typescript-eslint/utils@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      '@typescript-eslint/types': 8.44.0
+      '@typescript-eslint/types': 8.46.0
       comment-parser: 1.4.1
       debug: 4.4.3
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       eslint-import-context: 0.1.9(unrs-resolver@1.11.1)
       is-glob: 4.0.3
       minimatch: 10.0.3
-      semver: 7.7.2
+      semver: 7.7.3
       stable-hash-x: 0.2.0
       unrs-resolver: 1.11.1
     optionalDependencies:
-      '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jsdoc@50.8.0(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-jsdoc@50.8.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
       '@es-joy/jsdoccomment': 0.50.2
       are-docs-informative: 0.0.2
       comment-parser: 1.4.1
       debug: 4.4.3
       escape-string-regexp: 4.0.0
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       espree: 10.4.0
       esquery: 1.6.0
       parse-imports-exports: 0.2.4
-      semver: 7.7.2
+      semver: 7.7.3
       spdx-expression-parse: 4.0.0
     transitivePeerDependencies:
       - supports-color
 
-  eslint-plugin-jsonc@2.20.1(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-jsonc@2.21.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
-      eslint: 9.35.0(jiti@2.5.1)
-      eslint-compat-utils: 0.6.5(eslint@9.35.0(jiti@2.5.1))
-      eslint-json-compat-utils: 0.2.1(eslint@9.35.0(jiti@2.5.1))(jsonc-eslint-parser@2.4.0)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
+      diff-sequences: 27.5.1
+      eslint: 9.37.0(jiti@2.6.1)
+      eslint-compat-utils: 0.6.5(eslint@9.37.0(jiti@2.6.1))
+      eslint-json-compat-utils: 0.2.1(eslint@9.37.0(jiti@2.6.1))(jsonc-eslint-parser@2.4.1)
       espree: 10.4.0
       graphemer: 1.4.0
-      jsonc-eslint-parser: 2.4.0
+      jsonc-eslint-parser: 2.4.1
       natural-compare: 1.4.0
       synckit: 0.11.11
     transitivePeerDependencies:
       - '@eslint/json'
 
-  eslint-plugin-n@17.23.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2):
+  eslint-plugin-n@17.23.1(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       enhanced-resolve: 5.18.3
-      eslint: 9.35.0(jiti@2.5.1)
-      eslint-plugin-es-x: 7.8.0(eslint@9.35.0(jiti@2.5.1))
-      get-tsconfig: 4.10.1
+      eslint: 9.37.0(jiti@2.6.1)
+      eslint-plugin-es-x: 7.8.0(eslint@9.37.0(jiti@2.6.1))
+      get-tsconfig: 4.12.0
       globals: 15.15.0
       globrex: 0.1.2
       ignore: 5.3.2
-      semver: 7.7.2
-      ts-declaration-location: 1.0.7(typescript@5.9.2)
+      semver: 7.7.3
+      ts-declaration-location: 1.0.7(typescript@5.9.3)
     transitivePeerDependencies:
       - typescript
 
   eslint-plugin-no-only-tests@3.3.0: {}
 
-  eslint-plugin-perfectionist@4.15.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2):
+  eslint-plugin-perfectionist@4.15.1(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3):
     dependencies:
-      '@typescript-eslint/types': 8.44.0
-      '@typescript-eslint/utils': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      eslint: 9.35.0(jiti@2.5.1)
+      '@typescript-eslint/types': 8.46.0
+      '@typescript-eslint/utils': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
       natural-orderby: 5.0.0
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-prettier@5.5.4(@types/eslint@9.6.1)(eslint@9.35.0(jiti@2.5.1))(prettier@3.6.2):
+  eslint-plugin-prettier@5.5.4(@types/eslint@9.6.1)(eslint@9.37.0(jiti@2.6.1))(prettier@3.6.2):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       prettier: 3.6.2
       prettier-linter-helpers: 1.0.0
       synckit: 0.11.11
     optionalDependencies:
       '@types/eslint': 9.6.1
 
-  eslint-plugin-regexp@2.10.0(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-regexp@2.10.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.1
       comment-parser: 1.4.1
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       jsdoc-type-pratt-parser: 4.8.0
       refa: 0.12.1
       regexp-ast-analysis: 0.7.1
       scslre: 0.3.0
 
-  eslint-plugin-turbo@2.5.6(eslint@9.35.0(jiti@2.5.1))(turbo@2.5.6):
+  eslint-plugin-turbo@2.5.8(eslint@9.37.0(jiti@2.6.1))(turbo@2.5.8):
     dependencies:
       dotenv: 16.0.3
-      eslint: 9.35.0(jiti@2.5.1)
-      turbo: 2.5.6
+      eslint: 9.37.0(jiti@2.6.1)
+      turbo: 2.5.8
 
-  eslint-plugin-unicorn@59.0.1(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-unicorn@59.0.1(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
       '@babel/helper-validator-identifier': 7.27.1
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint/plugin-kit': 0.2.8
-      ci-info: 4.3.0
+      ci-info: 4.3.1
       clean-regexp: 1.0.0
-      core-js-compat: 3.45.1
-      eslint: 9.35.0(jiti@2.5.1)
+      core-js-compat: 3.46.0
+      eslint: 9.37.0(jiti@2.6.1)
       esquery: 1.6.0
       find-up-simple: 1.0.1
       globals: 16.4.0
@@ -17374,38 +17402,38 @@ snapshots:
       pluralize: 8.0.0
       regexp-tree: 0.1.27
       regjsparser: 0.12.0
-      semver: 7.7.2
+      semver: 7.7.3
       strip-indent: 4.1.0
 
-  eslint-plugin-unused-imports@4.2.0(@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1)):
+  eslint-plugin-unused-imports@4.2.0(@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+      '@typescript-eslint/eslint-plugin': 8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
 
-  eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)(vitest@3.2.4(@types/node@24.5.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)):
+  eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)(vitest@3.2.4(@types/node@24.7.1)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
-      '@typescript-eslint/utils': 7.18.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      eslint: 9.35.0(jiti@2.5.1)
+      '@typescript-eslint/utils': 7.18.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      eslint: 9.37.0(jiti@2.6.1)
     optionalDependencies:
-      '@typescript-eslint/eslint-plugin': 8.44.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
-      vitest: 3.2.4(@types/node@24.5.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+      '@typescript-eslint/eslint-plugin': 8.46.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
+      vitest: 3.2.4(@types/node@24.7.1)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
       - typescript
 
-  eslint-plugin-vue@10.4.0(@typescript-eslint/parser@8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2))(eslint@9.35.0(jiti@2.5.1))(vue-eslint-parser@10.2.0(eslint@9.35.0(jiti@2.5.1))):
+  eslint-plugin-vue@10.5.0(@typescript-eslint/parser@8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3))(eslint@9.37.0(jiti@2.6.1))(vue-eslint-parser@10.2.0(eslint@9.37.0(jiti@2.6.1))):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
-      eslint: 9.35.0(jiti@2.5.1)
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
+      eslint: 9.37.0(jiti@2.6.1)
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.1.2
-      semver: 7.7.2
-      vue-eslint-parser: 10.2.0(eslint@9.35.0(jiti@2.5.1))
+      semver: 7.7.3
+      vue-eslint-parser: 10.2.0(eslint@9.37.0(jiti@2.6.1))
       xml-name-validator: 4.0.0
     optionalDependencies:
-      '@typescript-eslint/parser': 8.44.0(eslint@9.35.0(jiti@2.5.1))(typescript@5.9.2)
+      '@typescript-eslint/parser': 8.46.0(eslint@9.37.0(jiti@2.6.1))(typescript@5.9.3)
 
   eslint-scope@8.4.0:
     dependencies:
@@ -17416,16 +17444,16 @@ snapshots:
 
   eslint-visitor-keys@4.2.1: {}
 
-  eslint@9.35.0(jiti@2.5.1):
+  eslint@9.37.0(jiti@2.6.1):
     dependencies:
-      '@eslint-community/eslint-utils': 4.9.0(eslint@9.35.0(jiti@2.5.1))
+      '@eslint-community/eslint-utils': 4.9.0(eslint@9.37.0(jiti@2.6.1))
       '@eslint-community/regexpp': 4.12.1
       '@eslint/config-array': 0.21.0
-      '@eslint/config-helpers': 0.3.1
-      '@eslint/core': 0.15.2
+      '@eslint/config-helpers': 0.4.0
+      '@eslint/core': 0.16.0
       '@eslint/eslintrc': 3.3.1
-      '@eslint/js': 9.35.0
-      '@eslint/plugin-kit': 0.3.5
+      '@eslint/js': 9.37.0
+      '@eslint/plugin-kit': 0.4.0
       '@humanfs/node': 0.16.7
       '@humanwhocodes/module-importer': 1.0.1
       '@humanwhocodes/retry': 0.4.3
@@ -17454,7 +17482,7 @@ snapshots:
       natural-compare: 1.4.0
       optionator: 0.9.4
     optionalDependencies:
-      jiti: 2.5.1
+      jiti: 2.6.1
     transitivePeerDependencies:
       - supports-color
 
@@ -17504,6 +17532,12 @@ snapshots:
 
   eventemitter3@5.0.1: {}
 
+  events-universal@1.0.1:
+    dependencies:
+      bare-events: 2.8.0
+    transitivePeerDependencies:
+      - bare-abort-controller
+
   events@3.3.0: {}
 
   evtd@0.2.4: {}
@@ -17553,7 +17587,7 @@ snapshots:
 
   fast-diff@1.3.0: {}
 
-  fast-equals@5.2.2: {}
+  fast-equals@5.3.2: {}
 
   fast-fifo@1.3.2: {}
 
@@ -17591,33 +17625,38 @@ snapshots:
     dependencies:
       '@bpmn-io/cm-theme': 0.1.0-alpha.2
       '@bpmn-io/feel-lint': 1.4.0
-      '@codemirror/autocomplete': 6.18.7
-      '@codemirror/commands': 6.8.1
+      '@codemirror/autocomplete': 6.19.0
+      '@codemirror/commands': 6.9.0
       '@codemirror/language': 6.11.3
-      '@codemirror/lint': 6.8.5
+      '@codemirror/lint': 6.9.0
       '@codemirror/state': 6.5.2
-      '@codemirror/view': 6.38.2
+      '@codemirror/view': 6.38.5
       '@lezer/common': 1.2.3
       '@lezer/highlight': 1.2.1
       '@lezer/lr': 1.4.2
       '@lezer/markdown': 1.4.3
       feelin: 3.2.0
-      lezer-feel: 1.8.1
+      lezer-feel: 1.9.0
       min-dom: 5.1.1
 
   feelin@3.2.0:
     dependencies:
       '@lezer/lr': 1.4.2
-      lezer-feel: 1.8.1
+      lezer-feel: 1.9.0
       luxon: 3.7.2
 
+  fetch-blob@3.2.0:
+    dependencies:
+      node-domexception: 1.0.0
+      web-streams-polyfill: 3.3.3
+
   figures@6.1.0:
     dependencies:
       is-unicode-supported: 2.1.0
 
   file-entry-cache@10.1.4:
     dependencies:
-      flat-cache: 6.1.14
+      flat-cache: 6.1.17
 
   file-entry-cache@8.0.0:
     dependencies:
@@ -17666,7 +17705,7 @@ snapshots:
     dependencies:
       magic-string: 0.30.19
       mlly: 1.8.0
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   flat-cache@4.0.1:
     dependencies:
@@ -17678,11 +17717,11 @@ snapshots:
       flatted: 3.3.3
       keyv: 4.5.4
 
-  flat-cache@6.1.14:
+  flat-cache@6.1.17:
     dependencies:
-      cacheable: 2.0.1
+      cacheable: 2.1.0
       flatted: 3.3.3
-      hookified: 1.12.0
+      hookified: 1.12.1
 
   flatted@3.3.3: {}
 
@@ -17709,6 +17748,12 @@ snapshots:
       hasown: 2.0.2
       mime-types: 2.1.35
 
+  formdata-node@6.0.3: {}
+
+  formdata-polyfill@4.0.10:
+    dependencies:
+      fetch-blob: 3.2.0
+
   fraction.js@4.3.7: {}
 
   framesync@6.1.2:
@@ -17773,6 +17818,8 @@ snapshots:
 
   functions-have-names@1.2.3: {}
 
+  generator-function@2.0.1: {}
+
   gensequence@7.0.0: {}
 
   gensync@1.0.0-beta.2: {}
@@ -17818,7 +17865,7 @@ snapshots:
       es-errors: 1.3.0
       get-intrinsic: 1.3.0
 
-  get-tsconfig@4.10.1:
+  get-tsconfig@4.12.0:
     dependencies:
       resolve-pkg-maps: 1.0.0
 
@@ -17929,6 +17976,15 @@ snapshots:
       slash: 5.1.0
       unicorn-magic: 0.3.0
 
+  globby@15.0.0:
+    dependencies:
+      '@sindresorhus/merge-streams': 4.0.0
+      fast-glob: 3.3.3
+      ignore: 7.0.5
+      path-type: 6.0.0
+      slash: 5.1.0
+      unicorn-magic: 0.3.0
+
   globjoin@0.1.4: {}
 
   globrex@0.1.2: {}
@@ -17985,8 +18041,6 @@ snapshots:
 
   has-flag@4.0.0: {}
 
-  has-own-prop@2.0.0: {}
-
   has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.1
@@ -18035,7 +18089,7 @@ snapshots:
 
   hookable@5.5.3: {}
 
-  hookified@1.12.0: {}
+  hookified@1.12.1: {}
 
   htm@3.1.1: {}
 
@@ -18077,8 +18131,6 @@ snapshots:
       domutils: 3.2.2
       entities: 4.5.0
 
-  http-cache-semantics@4.2.0: {}
-
   http-errors@2.0.0:
     dependencies:
       depd: 2.0.0
@@ -18087,13 +18139,6 @@ snapshots:
       statuses: 2.0.1
       toidentifier: 1.0.1
 
-  http-proxy-agent@7.0.2:
-    dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
-    transitivePeerDependencies:
-      - supports-color
-
   http-shutdown@1.2.2: {}
 
   https-proxy-agent@7.0.6:
@@ -18105,7 +18150,7 @@ snapshots:
 
   httpxy@0.1.7: {}
 
-  human-id@4.1.1: {}
+  human-id@4.1.2: {}
 
   human-signals@5.0.0: {}
 
@@ -18168,7 +18213,7 @@ snapshots:
 
   internmap@2.0.3: {}
 
-  ioredis@5.7.0:
+  ioredis@5.8.1:
     dependencies:
       '@ioredis/commands': 1.4.0
       cluster-key-slot: 1.1.2
@@ -18182,8 +18227,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  ip-address@10.0.1: {}
-
   iron-webcrypto@1.2.1: {}
 
   is-array-buffer@3.0.5:
@@ -18225,7 +18268,7 @@ snapshots:
 
   is-ci@4.1.0:
     dependencies:
-      ci-info: 4.3.0
+      ci-info: 4.3.1
 
   is-core-module@2.16.1:
     dependencies:
@@ -18262,9 +18305,10 @@ snapshots:
     dependencies:
       get-east-asian-width: 1.4.0
 
-  is-generator-function@1.1.0:
+  is-generator-function@1.1.2:
     dependencies:
       call-bound: 1.0.4
+      generator-function: 2.0.1
       get-proto: 1.0.1
       has-tostringtag: 1.0.2
       safe-regex-test: 1.1.0
@@ -18422,7 +18466,7 @@ snapshots:
 
   jiti@1.21.7: {}
 
-  jiti@2.5.1: {}
+  jiti@2.6.1: {}
 
   jju@1.4.0: {}
 
@@ -18477,12 +18521,12 @@ snapshots:
 
   json5@2.2.3: {}
 
-  jsonc-eslint-parser@2.4.0:
+  jsonc-eslint-parser@2.4.1:
     dependencies:
       acorn: 8.15.0
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   jsonfile@4.0.0:
     optionalDependencies:
@@ -18509,7 +18553,7 @@ snapshots:
       lodash.isstring: 4.0.1
       lodash.once: 4.1.1
       ms: 2.1.3
-      semver: 7.7.2
+      semver: 7.7.3
 
   jwa@1.4.2:
     dependencies:
@@ -18522,7 +18566,7 @@ snapshots:
       jwa: 1.4.2
       safe-buffer: 5.2.1
 
-  katex@0.16.22:
+  katex@0.16.23:
     dependencies:
       commander: 8.3.0
 
@@ -18530,7 +18574,7 @@ snapshots:
     dependencies:
       json-buffer: 3.0.1
 
-  keyv@5.5.2:
+  keyv@5.5.3:
     dependencies:
       '@keyv/serialize': 1.1.1
 
@@ -18548,7 +18592,7 @@ snapshots:
 
   kolorist@1.8.0: {}
 
-  ky@1.10.0: {}
+  ky@1.11.0: {}
 
   latest-version@9.0.0:
     dependencies:
@@ -18558,50 +18602,50 @@ snapshots:
     dependencies:
       readable-stream: 2.3.8
 
-  lefthook-darwin-arm64@1.13.1:
+  lefthook-darwin-arm64@1.13.6:
     optional: true
 
-  lefthook-darwin-x64@1.13.1:
+  lefthook-darwin-x64@1.13.6:
     optional: true
 
-  lefthook-freebsd-arm64@1.13.1:
+  lefthook-freebsd-arm64@1.13.6:
     optional: true
 
-  lefthook-freebsd-x64@1.13.1:
+  lefthook-freebsd-x64@1.13.6:
     optional: true
 
-  lefthook-linux-arm64@1.13.1:
+  lefthook-linux-arm64@1.13.6:
     optional: true
 
-  lefthook-linux-x64@1.13.1:
+  lefthook-linux-x64@1.13.6:
     optional: true
 
-  lefthook-openbsd-arm64@1.13.1:
+  lefthook-openbsd-arm64@1.13.6:
     optional: true
 
-  lefthook-openbsd-x64@1.13.1:
+  lefthook-openbsd-x64@1.13.6:
     optional: true
 
-  lefthook-windows-arm64@1.13.1:
+  lefthook-windows-arm64@1.13.6:
     optional: true
 
-  lefthook-windows-x64@1.13.1:
+  lefthook-windows-x64@1.13.6:
     optional: true
 
-  lefthook@1.13.1:
+  lefthook@1.13.6:
     optionalDependencies:
-      lefthook-darwin-arm64: 1.13.1
-      lefthook-darwin-x64: 1.13.1
-      lefthook-freebsd-arm64: 1.13.1
-      lefthook-freebsd-x64: 1.13.1
-      lefthook-linux-arm64: 1.13.1
-      lefthook-linux-x64: 1.13.1
-      lefthook-openbsd-arm64: 1.13.1
-      lefthook-openbsd-x64: 1.13.1
-      lefthook-windows-arm64: 1.13.1
-      lefthook-windows-x64: 1.13.1
-
-  less@4.4.1:
+      lefthook-darwin-arm64: 1.13.6
+      lefthook-darwin-x64: 1.13.6
+      lefthook-freebsd-arm64: 1.13.6
+      lefthook-freebsd-x64: 1.13.6
+      lefthook-linux-arm64: 1.13.6
+      lefthook-linux-x64: 1.13.6
+      lefthook-openbsd-arm64: 1.13.6
+      lefthook-openbsd-x64: 1.13.6
+      lefthook-windows-arm64: 1.13.6
+      lefthook-windows-x64: 1.13.6
+
+  less@4.4.2:
     dependencies:
       copy-anything: 2.0.6
       parse-node-version: 1.0.1
@@ -18622,7 +18666,7 @@ snapshots:
       prelude-ls: 1.2.1
       type-check: 0.4.0
 
-  lezer-feel@1.8.1:
+  lezer-feel@1.9.0:
     dependencies:
       '@lezer/highlight': 1.2.1
       '@lezer/lr': 1.4.2
@@ -18648,7 +18692,7 @@ snapshots:
       get-port-please: 3.2.0
       h3: 1.15.4
       http-shutdown: 1.2.2
-      jiti: 2.5.1
+      jiti: 2.6.1
       mlly: 1.8.0
       node-forge: 1.3.1
       pathe: 1.1.2
@@ -18686,6 +18730,8 @@ snapshots:
     dependencies:
       p-locate: 6.0.0
 
+  locko@1.1.0: {}
+
   lodash-es@4.17.21: {}
 
   lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
@@ -18696,8 +18742,6 @@ snapshots:
 
   lodash.camelcase@4.3.0: {}
 
-  lodash.castarray@4.4.0: {}
-
   lodash.clonedeep@4.5.0: {}
 
   lodash.debounce@4.0.8: {}
@@ -18755,7 +18799,7 @@ snapshots:
 
   log-update@6.1.0:
     dependencies:
-      ansi-escapes: 7.1.0
+      ansi-escapes: 7.1.1
       cli-cursor: 5.0.0
       slice-ansi: 7.1.2
       strip-ansi: 7.1.2
@@ -18773,7 +18817,7 @@ snapshots:
 
   lru-cache@10.4.3: {}
 
-  lru-cache@11.2.1: {}
+  lru-cache@11.2.2: {}
 
   lru-cache@5.1.1:
     dependencies:
@@ -18783,9 +18827,9 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  lucide-vue-next@0.507.0(vue@3.5.21(typescript@5.9.2)):
+  lucide-vue-next@0.507.0(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   luxon@3.7.2: {}
 
@@ -18811,22 +18855,6 @@ snapshots:
       semver: 5.7.2
     optional: true
 
-  make-fetch-happen@15.0.1:
-    dependencies:
-      '@npmcli/agent': 3.0.0
-      cacache: 20.0.1
-      http-cache-semantics: 4.2.0
-      minipass: 7.1.2
-      minipass-fetch: 4.0.1
-      minipass-flush: 1.0.5
-      minipass-pipeline: 1.2.4
-      negotiator: 1.0.0
-      proc-log: 5.0.0
-      promise-retry: 2.0.1
-      ssri: 12.0.0
-    transitivePeerDependencies:
-      - supports-color
-
   mark.js@8.11.1: {}
 
   markdown-it@14.1.0:
@@ -18855,7 +18883,7 @@ snapshots:
       '@babel/runtime': 7.28.4
       highlight.js: 11.11.1
       js-yaml: 4.1.0
-      katex: 0.16.22
+      katex: 0.16.23
       markmap-common: 0.16.0
       markmap-html-parser: 0.16.1(markmap-common@0.16.0)
       markmap-view: 0.16.0(markmap-common@0.16.0)
@@ -19002,14 +19030,6 @@ snapshots:
     dependencies:
       minipass: 7.1.2
 
-  minipass-fetch@4.0.1:
-    dependencies:
-      minipass: 7.1.2
-      minipass-sized: 1.0.3
-      minizlib: 3.0.2
-    optionalDependencies:
-      encoding: 0.1.13
-
   minipass-flush@1.0.5:
     dependencies:
       minipass: 3.3.6
@@ -19018,10 +19038,6 @@ snapshots:
     dependencies:
       minipass: 3.3.6
 
-  minipass-sized@1.0.3:
-    dependencies:
-      minipass: 3.3.6
-
   minipass@3.3.6:
     dependencies:
       yallist: 4.0.0
@@ -19030,15 +19046,13 @@ snapshots:
 
   minisearch@7.2.0: {}
 
-  minizlib@3.0.2:
+  minizlib@3.1.0:
     dependencies:
       minipass: 7.1.2
 
   mitt@3.0.1: {}
 
-  mkdirp@3.0.1: {}
-
-  mkdist@2.4.1(sass@1.92.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2)):
+  mkdist@2.4.1(sass@1.93.2)(typescript@5.9.3)(vue-tsc@2.2.10(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       autoprefixer: 10.4.21(postcss@8.5.6)
       citty: 0.1.6
@@ -19051,13 +19065,13 @@ snapshots:
       pkg-types: 2.3.0
       postcss: 8.5.6
       postcss-nested: 7.0.2(postcss@8.5.6)
-      semver: 7.7.2
+      semver: 7.7.3
       tinyglobby: 0.2.15
     optionalDependencies:
-      sass: 1.92.1
-      typescript: 5.9.2
-      vue: 3.5.21(typescript@5.9.2)
-      vue-tsc: 2.2.10(typescript@5.9.2)
+      sass: 1.93.2
+      typescript: 5.9.3
+      vue: 3.5.22(typescript@5.9.3)
+      vue-tsc: 2.2.10(typescript@5.9.3)
 
   mlly@1.8.0:
     dependencies:
@@ -19098,10 +19112,10 @@ snapshots:
       object-assign: 4.1.1
       thenify-all: 1.6.0
 
-  naive-ui@2.43.1(vue@3.5.21(typescript@5.9.2)):
+  naive-ui@2.43.1(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@css-render/plugin-bem': 0.15.14(css-render@0.15.14)
-      '@css-render/vue3-ssr': 0.15.14(vue@3.5.21(typescript@5.9.2))
+      '@css-render/vue3-ssr': 0.15.14(vue@3.5.22(typescript@5.9.3))
       '@types/katex': 0.16.7
       '@types/lodash': 4.17.20
       '@types/lodash-es': 4.17.12
@@ -19116,18 +19130,18 @@ snapshots:
       lodash-es: 4.17.21
       seemly: 0.3.10
       treemate: 0.3.11
-      vdirs: 0.1.8(vue@3.5.21(typescript@5.9.2))
-      vooks: 0.2.12(vue@3.5.21(typescript@5.9.2))
-      vue: 3.5.21(typescript@5.9.2)
-      vueuc: 0.4.65(vue@3.5.21(typescript@5.9.2))
+      vdirs: 0.1.8(vue@3.5.22(typescript@5.9.3))
+      vooks: 0.2.12(vue@3.5.22(typescript@5.9.3))
+      vue: 3.5.22(typescript@5.9.3)
+      vueuc: 0.4.65(vue@3.5.22(typescript@5.9.3))
 
   nanoid@3.3.11: {}
 
-  nanoid@5.1.5: {}
+  nanoid@5.1.6: {}
 
   nanopop@2.4.2: {}
 
-  napi-postinstall@0.3.3: {}
+  napi-postinstall@0.3.4: {}
 
   natural-compare@1.4.0: {}
 
@@ -19139,19 +19153,17 @@ snapshots:
       sax: 1.4.1
     optional: true
 
-  negotiator@1.0.0: {}
-
-  nitropack@2.12.6(encoding@0.1.13):
+  nitropack@2.12.7:
     dependencies:
       '@cloudflare/kv-asset-handler': 0.4.0
-      '@rollup/plugin-alias': 5.1.1(rollup@4.50.2)
-      '@rollup/plugin-commonjs': 28.0.6(rollup@4.50.2)
-      '@rollup/plugin-inject': 5.0.5(rollup@4.50.2)
-      '@rollup/plugin-json': 6.1.0(rollup@4.50.2)
-      '@rollup/plugin-node-resolve': 16.0.1(rollup@4.50.2)
-      '@rollup/plugin-replace': 6.0.2(rollup@4.50.2)
-      '@rollup/plugin-terser': 0.4.4(rollup@4.50.2)
-      '@vercel/nft': 0.30.1(encoding@0.1.13)(rollup@4.50.2)
+      '@rollup/plugin-alias': 5.1.1(rollup@4.52.4)
+      '@rollup/plugin-commonjs': 28.0.6(rollup@4.52.4)
+      '@rollup/plugin-inject': 5.0.5(rollup@4.52.4)
+      '@rollup/plugin-json': 6.1.0(rollup@4.52.4)
+      '@rollup/plugin-node-resolve': 16.0.2(rollup@4.52.4)
+      '@rollup/plugin-replace': 6.0.2(rollup@4.52.4)
+      '@rollup/plugin-terser': 0.4.4(rollup@4.52.4)
+      '@vercel/nft': 0.30.2(rollup@4.52.4)
       archiver: 7.0.1
       c12: 3.3.0(magicast@0.3.5)
       chokidar: 4.0.3
@@ -19162,21 +19174,21 @@ snapshots:
       cookie-es: 2.0.0
       croner: 9.1.0
       crossws: 0.3.5
-      db0: 0.3.2
+      db0: 0.3.4
       defu: 6.1.4
       destr: 2.0.5
-      dot-prop: 9.0.0
+      dot-prop: 10.1.0
       esbuild: 0.25.3
       escape-string-regexp: 5.0.0
       etag: 1.8.1
       exsolve: 1.0.7
-      globby: 14.1.0
+      globby: 15.0.0
       gzip-size: 7.0.0
       h3: 1.15.4
       hookable: 5.5.3
       httpxy: 0.1.7
-      ioredis: 5.7.0
-      jiti: 2.5.1
+      ioredis: 5.8.1
+      jiti: 2.6.1
       klona: 2.0.6
       knitwork: 1.2.0
       listhen: 1.9.0
@@ -19191,12 +19203,12 @@ snapshots:
       pathe: 2.0.3
       perfect-debounce: 2.0.0
       pkg-types: 2.3.0
-      pretty-bytes: 7.0.1
+      pretty-bytes: 7.1.0
       radix3: 1.1.2
-      rollup: 4.50.2
-      rollup-plugin-visualizer: 6.0.3(rollup@4.50.2)
+      rollup: 4.52.4
+      rollup-plugin-visualizer: 6.0.4(rollup@4.52.4)
       scule: 1.3.0
-      semver: 7.7.2
+      semver: 7.7.3
       serve-placeholder: 2.0.2
       serve-static: 2.2.0
       source-map: 0.7.6
@@ -19206,9 +19218,9 @@ snapshots:
       uncrypto: 0.1.3
       unctx: 2.4.1
       unenv: 2.0.0-rc.21
-      unimport: 5.2.0
-      unplugin-utils: 0.3.0
-      unstorage: 1.17.1(db0@0.3.2)(ioredis@5.7.0)
+      unimport: 5.4.1
+      unplugin-utils: 0.3.1
+      unstorage: 1.17.1(db0@0.3.4)(ioredis@5.8.1)
       untyped: 2.0.0
       unwasm: 0.3.11
       youch: 4.1.0-beta.11
@@ -19231,6 +19243,7 @@ snapshots:
       - '@vercel/functions'
       - '@vercel/kv'
       - aws4fetch
+      - bare-abort-controller
       - better-sqlite3
       - drizzle-orm
       - encoding
@@ -19251,13 +19264,26 @@ snapshots:
 
   node-cleanup@2.1.2: {}
 
+  node-domexception@1.0.0: {}
+
+  node-fetch-cache@5.1.0:
+    dependencies:
+      cacache: 20.0.1
+      formdata-node: 6.0.3
+      locko: 1.1.0
+      node-fetch: 3.3.2
+
   node-fetch-native@1.6.7: {}
 
-  node-fetch@2.7.0(encoding@0.1.13):
+  node-fetch@2.7.0:
     dependencies:
       whatwg-url: 5.0.0
-    optionalDependencies:
-      encoding: 0.1.13
+
+  node-fetch@3.3.2:
+    dependencies:
+      data-uri-to-buffer: 4.0.1
+      fetch-blob: 3.2.0
+      formdata-polyfill: 4.0.10
 
   node-forge@1.3.1: {}
 
@@ -19270,7 +19296,7 @@ snapshots:
 
   node-mock-http@1.0.3: {}
 
-  node-releases@2.0.21: {}
+  node-releases@2.0.23: {}
 
   nopt@7.2.1:
     dependencies:
@@ -19442,16 +19468,16 @@ snapshots:
 
   package-json@10.0.1:
     dependencies:
-      ky: 1.10.0
+      ky: 1.11.0
       registry-auth-token: 5.1.0
       registry-url: 6.0.1
-      semver: 7.7.2
+      semver: 7.7.3
 
   package-manager-detector@0.2.11:
     dependencies:
       quansync: 0.2.11
 
-  package-manager-detector@1.3.0: {}
+  package-manager-detector@1.4.0: {}
 
   pako@2.1.0: {}
 
@@ -19532,7 +19558,7 @@ snapshots:
 
   path-scurry@2.0.0:
     dependencies:
-      lru-cache: 11.2.1
+      lru-cache: 11.2.2
       minipass: 7.1.2
 
   path-type@4.0.0: {}
@@ -19561,21 +19587,21 @@ snapshots:
 
   pify@4.0.1: {}
 
-  pinia-plugin-persistedstate@4.5.0(@nuxt/kit@3.19.2(magicast@0.3.5))(pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))):
+  pinia-plugin-persistedstate@4.5.0(@nuxt/kit@3.19.3(magicast@0.3.5))(pinia@3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))):
     dependencies:
       deep-pick-omit: 1.2.1
       defu: 6.1.4
       destr: 2.0.5
     optionalDependencies:
-      '@nuxt/kit': 3.19.2(magicast@0.3.5)
-      pinia: 3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2))
+      '@nuxt/kit': 3.19.3(magicast@0.3.5)
+      pinia: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3))
 
-  pinia@3.0.3(typescript@5.9.2)(vue@3.5.21(typescript@5.9.2)):
+  pinia@3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@vue/devtools-api': 7.7.7
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
   pirates@4.0.7: {}
 
@@ -19591,11 +19617,11 @@ snapshots:
       exsolve: 1.0.7
       pathe: 2.0.3
 
-  playwright-core@1.55.0: {}
+  playwright-core@1.56.0: {}
 
-  playwright@1.55.0:
+  playwright@1.56.0:
     dependencies:
-      playwright-core: 1.55.0
+      playwright-core: 1.56.0
     optionalDependencies:
       fsevents: 2.3.2
 
@@ -19636,12 +19662,12 @@ snapshots:
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
-  postcss-color-functional-notation@7.0.11(postcss@8.5.6):
+  postcss-color-functional-notation@7.0.12(postcss@8.5.6):
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
@@ -19659,7 +19685,7 @@ snapshots:
 
   postcss-colormin@7.0.4(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       caniuse-api: 3.0.0
       colord: 2.9.3
       postcss: 8.5.6
@@ -19667,7 +19693,7 @@ snapshots:
 
   postcss-convert-values@7.0.7(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
@@ -19718,9 +19744,9 @@ snapshots:
     dependencies:
       postcss: 8.5.6
 
-  postcss-double-position-gradients@6.0.3(postcss@8.5.6):
+  postcss-double-position-gradients@6.0.4(postcss@8.5.6):
     dependencies:
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
@@ -19775,21 +19801,22 @@ snapshots:
       camelcase-css: 2.0.1
       postcss: 8.5.6
 
-  postcss-lab-function@7.0.11(postcss@8.5.6):
+  postcss-lab-function@7.0.12(postcss@8.5.6):
     dependencies:
       '@csstools/css-color-parser': 3.1.0(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/utilities': 2.0.0(postcss@8.5.6)
       postcss: 8.5.6
 
-  postcss-load-config@4.0.2(postcss@8.5.6):
+  postcss-load-config@6.0.1(jiti@1.21.7)(postcss@8.5.6)(yaml@2.8.1):
     dependencies:
       lilconfig: 3.1.3
-      yaml: 2.8.1
     optionalDependencies:
+      jiti: 1.21.7
       postcss: 8.5.6
+      yaml: 2.8.1
 
   postcss-logical@8.1.0(postcss@8.5.6):
     dependencies:
@@ -19806,7 +19833,7 @@ snapshots:
 
   postcss-merge-rules@7.0.6(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       caniuse-api: 3.0.0
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
@@ -19826,7 +19853,7 @@ snapshots:
 
   postcss-minify-params@7.0.4(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       cssnano-utils: 5.0.1(postcss@8.5.6)
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
@@ -19890,7 +19917,7 @@ snapshots:
 
   postcss-normalize-unicode@7.0.4(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
@@ -19928,24 +19955,25 @@ snapshots:
       postcss: 8.5.6
       postcss-value-parser: 4.2.0
 
-  postcss-preset-env@10.3.1(postcss@8.5.6):
+  postcss-preset-env@10.4.0(postcss@8.5.6):
     dependencies:
-      '@csstools/postcss-alpha-function': 1.0.0(postcss@8.5.6)
+      '@csstools/postcss-alpha-function': 1.0.1(postcss@8.5.6)
       '@csstools/postcss-cascade-layers': 5.0.2(postcss@8.5.6)
-      '@csstools/postcss-color-function': 4.0.11(postcss@8.5.6)
-      '@csstools/postcss-color-function-display-p3-linear': 1.0.0(postcss@8.5.6)
-      '@csstools/postcss-color-mix-function': 3.0.11(postcss@8.5.6)
-      '@csstools/postcss-color-mix-variadic-function-arguments': 1.0.1(postcss@8.5.6)
-      '@csstools/postcss-content-alt-text': 2.0.7(postcss@8.5.6)
+      '@csstools/postcss-color-function': 4.0.12(postcss@8.5.6)
+      '@csstools/postcss-color-function-display-p3-linear': 1.0.1(postcss@8.5.6)
+      '@csstools/postcss-color-mix-function': 3.0.12(postcss@8.5.6)
+      '@csstools/postcss-color-mix-variadic-function-arguments': 1.0.2(postcss@8.5.6)
+      '@csstools/postcss-content-alt-text': 2.0.8(postcss@8.5.6)
+      '@csstools/postcss-contrast-color-function': 2.0.12(postcss@8.5.6)
       '@csstools/postcss-exponential-functions': 2.0.9(postcss@8.5.6)
       '@csstools/postcss-font-format-keywords': 4.0.0(postcss@8.5.6)
       '@csstools/postcss-gamut-mapping': 2.0.11(postcss@8.5.6)
-      '@csstools/postcss-gradients-interpolation-method': 5.0.11(postcss@8.5.6)
-      '@csstools/postcss-hwb-function': 4.0.11(postcss@8.5.6)
-      '@csstools/postcss-ic-unit': 4.0.3(postcss@8.5.6)
+      '@csstools/postcss-gradients-interpolation-method': 5.0.12(postcss@8.5.6)
+      '@csstools/postcss-hwb-function': 4.0.12(postcss@8.5.6)
+      '@csstools/postcss-ic-unit': 4.0.4(postcss@8.5.6)
       '@csstools/postcss-initial': 2.0.1(postcss@8.5.6)
       '@csstools/postcss-is-pseudo-class': 5.0.3(postcss@8.5.6)
-      '@csstools/postcss-light-dark-function': 2.0.10(postcss@8.5.6)
+      '@csstools/postcss-light-dark-function': 2.0.11(postcss@8.5.6)
       '@csstools/postcss-logical-float-and-clear': 3.0.0(postcss@8.5.6)
       '@csstools/postcss-logical-overflow': 2.0.0(postcss@8.5.6)
       '@csstools/postcss-logical-overscroll-behavior': 2.0.0(postcss@8.5.6)
@@ -19955,10 +19983,10 @@ snapshots:
       '@csstools/postcss-media-queries-aspect-ratio-number-values': 3.0.5(postcss@8.5.6)
       '@csstools/postcss-nested-calc': 4.0.0(postcss@8.5.6)
       '@csstools/postcss-normalize-display-values': 4.0.0(postcss@8.5.6)
-      '@csstools/postcss-oklab-function': 4.0.11(postcss@8.5.6)
-      '@csstools/postcss-progressive-custom-properties': 4.2.0(postcss@8.5.6)
+      '@csstools/postcss-oklab-function': 4.0.12(postcss@8.5.6)
+      '@csstools/postcss-progressive-custom-properties': 4.2.1(postcss@8.5.6)
       '@csstools/postcss-random-function': 2.0.1(postcss@8.5.6)
-      '@csstools/postcss-relative-color-syntax': 3.0.11(postcss@8.5.6)
+      '@csstools/postcss-relative-color-syntax': 3.0.12(postcss@8.5.6)
       '@csstools/postcss-scope-pseudo-class': 4.0.1(postcss@8.5.6)
       '@csstools/postcss-sign-functions': 1.1.4(postcss@8.5.6)
       '@csstools/postcss-stepped-value-functions': 4.0.9(postcss@8.5.6)
@@ -19966,28 +19994,28 @@ snapshots:
       '@csstools/postcss-trigonometric-functions': 4.0.9(postcss@8.5.6)
       '@csstools/postcss-unset-value': 4.0.0(postcss@8.5.6)
       autoprefixer: 10.4.21(postcss@8.5.6)
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       css-blank-pseudo: 7.0.1(postcss@8.5.6)
       css-has-pseudo: 7.0.3(postcss@8.5.6)
       css-prefers-color-scheme: 10.0.0(postcss@8.5.6)
-      cssdb: 8.4.0
+      cssdb: 8.4.2
       postcss: 8.5.6
       postcss-attribute-case-insensitive: 7.0.1(postcss@8.5.6)
       postcss-clamp: 4.1.0(postcss@8.5.6)
-      postcss-color-functional-notation: 7.0.11(postcss@8.5.6)
+      postcss-color-functional-notation: 7.0.12(postcss@8.5.6)
       postcss-color-hex-alpha: 10.0.0(postcss@8.5.6)
       postcss-color-rebeccapurple: 10.0.0(postcss@8.5.6)
       postcss-custom-media: 11.0.6(postcss@8.5.6)
       postcss-custom-properties: 14.0.6(postcss@8.5.6)
       postcss-custom-selectors: 8.0.5(postcss@8.5.6)
       postcss-dir-pseudo-class: 9.0.1(postcss@8.5.6)
-      postcss-double-position-gradients: 6.0.3(postcss@8.5.6)
+      postcss-double-position-gradients: 6.0.4(postcss@8.5.6)
       postcss-focus-visible: 10.0.1(postcss@8.5.6)
       postcss-focus-within: 9.0.1(postcss@8.5.6)
       postcss-font-variant: 5.0.0(postcss@8.5.6)
       postcss-gap-properties: 6.0.0(postcss@8.5.6)
       postcss-image-set-function: 7.0.0(postcss@8.5.6)
-      postcss-lab-function: 7.0.11(postcss@8.5.6)
+      postcss-lab-function: 7.0.12(postcss@8.5.6)
       postcss-logical: 8.1.0(postcss@8.5.6)
       postcss-nesting: 13.0.2(postcss@8.5.6)
       postcss-opacity-percentage: 3.0.0(postcss@8.5.6)
@@ -20005,7 +20033,7 @@ snapshots:
 
   postcss-reduce-initial@7.0.4(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       caniuse-api: 3.0.0
       postcss: 8.5.6
 
@@ -20099,7 +20127,7 @@ snapshots:
 
   pretty-bytes@6.1.1: {}
 
-  pretty-bytes@7.0.1: {}
+  pretty-bytes@7.1.0: {}
 
   pretty-ms@9.3.0:
     dependencies:
@@ -20107,17 +20135,10 @@ snapshots:
 
   prismjs@1.30.0: {}
 
-  proc-log@5.0.0: {}
-
   process-nextick-args@2.0.1: {}
 
   process@0.11.10: {}
 
-  promise-retry@2.0.1:
-    dependencies:
-      err-code: 2.0.3
-      retry: 0.12.0
-
   property-information@7.1.0: {}
 
   proto-list@1.2.4: {}
@@ -20127,10 +20148,10 @@ snapshots:
   prr@1.0.1:
     optional: true
 
-  publint@0.3.13:
+  publint@0.3.14:
     dependencies:
       '@publint/pack': 0.1.2
-      package-manager-detector: 1.3.0
+      package-manager-detector: 1.4.0
       picocolors: 1.1.1
       sade: 1.8.1
 
@@ -20142,6 +20163,10 @@ snapshots:
     dependencies:
       escape-goat: 4.0.0
 
+  qified@0.5.0:
+    dependencies:
+      hookified: 1.12.1
+
   qrcode@1.5.4:
     dependencies:
       dijkstrajs: 1.0.3
@@ -20156,20 +20181,20 @@ snapshots:
 
   queue-microtask@1.2.3: {}
 
-  radix-vue@1.9.17(vue@3.5.21(typescript@5.9.2)):
+  radix-vue@1.9.17(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@floating-ui/dom': 1.7.4
-      '@floating-ui/vue': 1.1.9(vue@3.5.21(typescript@5.9.2))
-      '@internationalized/date': 3.9.0
+      '@floating-ui/vue': 1.1.9(vue@3.5.22(typescript@5.9.3))
+      '@internationalized/date': 3.10.0
       '@internationalized/number': 3.6.5
-      '@tanstack/vue-virtual': 3.13.12(vue@3.5.21(typescript@5.9.2))
-      '@vueuse/core': 10.11.1(vue@3.5.21(typescript@5.9.2))
-      '@vueuse/shared': 10.11.1(vue@3.5.21(typescript@5.9.2))
+      '@tanstack/vue-virtual': 3.13.12(vue@3.5.22(typescript@5.9.3))
+      '@vueuse/core': 10.11.1(vue@3.5.22(typescript@5.9.3))
+      '@vueuse/shared': 10.11.1(vue@3.5.22(typescript@5.9.3))
       aria-hidden: 1.2.6
       defu: 6.1.4
       fast-deep-equal: 3.1.3
-      nanoid: 5.1.5
-      vue: 3.5.21(typescript@5.9.2)
+      nanoid: 5.1.6
+      vue: 3.5.22(typescript@5.9.3)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -20292,12 +20317,12 @@ snapshots:
       gopd: 1.2.0
       set-function-name: 2.0.2
 
-  regexpu-core@6.3.1:
+  regexpu-core@6.4.0:
     dependencies:
       regenerate: 1.4.2
       regenerate-unicode-properties: 10.2.2
       regjsgen: 0.8.0
-      regjsparser: 0.12.0
+      regjsparser: 0.13.0
       unicode-match-property-ecmascript: 2.0.0
       unicode-match-property-value-ecmascript: 2.2.1
 
@@ -20315,6 +20340,10 @@ snapshots:
     dependencies:
       jsesc: 3.0.2
 
+  regjsparser@0.13.0:
+    dependencies:
+      jsesc: 3.1.0
+
   relateurl@0.2.7: {}
 
   remarkable-katex@1.2.1: {}
@@ -20326,8 +20355,6 @@ snapshots:
 
   remove-accents@0.5.0: {}
 
-  repeat-string@1.6.1: {}
-
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -20362,8 +20389,6 @@ snapshots:
       onetime: 7.0.0
       signal-exit: 4.1.0
 
-  retry@0.12.0: {}
-
   reusify@1.1.0: {}
 
   rfdc@1.4.1: {}
@@ -20375,61 +20400,62 @@ snapshots:
 
   robust-predicates@3.0.2: {}
 
-  rollup-plugin-dts@6.2.3(rollup@4.50.2)(typescript@5.9.2):
+  rollup-plugin-dts@6.2.3(rollup@4.52.4)(typescript@5.9.3):
     dependencies:
       magic-string: 0.30.19
-      rollup: 4.50.2
-      typescript: 5.9.2
+      rollup: 4.52.4
+      typescript: 5.9.3
     optionalDependencies:
       '@babel/code-frame': 7.27.1
 
-  rollup-plugin-visualizer@5.14.0(rollup@4.50.2):
+  rollup-plugin-visualizer@5.14.0(rollup@4.52.4):
     dependencies:
       open: 8.4.2
       picomatch: 4.0.3
       source-map: 0.7.6
       yargs: 17.7.2
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
-  rollup-plugin-visualizer@6.0.3(rollup@4.50.2):
+  rollup-plugin-visualizer@6.0.4(rollup@4.52.4):
     dependencies:
       open: 8.4.2
       picomatch: 4.0.3
       source-map: 0.7.6
       yargs: 17.7.2
     optionalDependencies:
-      rollup: 4.50.2
+      rollup: 4.52.4
 
   rollup@2.79.2:
     optionalDependencies:
       fsevents: 2.3.3
 
-  rollup@4.50.2:
+  rollup@4.52.4:
     dependencies:
       '@types/estree': 1.0.8
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.50.2
-      '@rollup/rollup-android-arm64': 4.50.2
-      '@rollup/rollup-darwin-arm64': 4.50.2
-      '@rollup/rollup-darwin-x64': 4.50.2
-      '@rollup/rollup-freebsd-arm64': 4.50.2
-      '@rollup/rollup-freebsd-x64': 4.50.2
-      '@rollup/rollup-linux-arm-gnueabihf': 4.50.2
-      '@rollup/rollup-linux-arm-musleabihf': 4.50.2
-      '@rollup/rollup-linux-arm64-gnu': 4.50.2
-      '@rollup/rollup-linux-arm64-musl': 4.50.2
-      '@rollup/rollup-linux-loong64-gnu': 4.50.2
-      '@rollup/rollup-linux-ppc64-gnu': 4.50.2
-      '@rollup/rollup-linux-riscv64-gnu': 4.50.2
-      '@rollup/rollup-linux-riscv64-musl': 4.50.2
-      '@rollup/rollup-linux-s390x-gnu': 4.50.2
-      '@rollup/rollup-linux-x64-gnu': 4.50.2
-      '@rollup/rollup-linux-x64-musl': 4.50.2
-      '@rollup/rollup-openharmony-arm64': 4.50.2
-      '@rollup/rollup-win32-arm64-msvc': 4.50.2
-      '@rollup/rollup-win32-ia32-msvc': 4.50.2
-      '@rollup/rollup-win32-x64-msvc': 4.50.2
+      '@rollup/rollup-android-arm-eabi': 4.52.4
+      '@rollup/rollup-android-arm64': 4.52.4
+      '@rollup/rollup-darwin-arm64': 4.52.4
+      '@rollup/rollup-darwin-x64': 4.52.4
+      '@rollup/rollup-freebsd-arm64': 4.52.4
+      '@rollup/rollup-freebsd-x64': 4.52.4
+      '@rollup/rollup-linux-arm-gnueabihf': 4.52.4
+      '@rollup/rollup-linux-arm-musleabihf': 4.52.4
+      '@rollup/rollup-linux-arm64-gnu': 4.52.4
+      '@rollup/rollup-linux-arm64-musl': 4.52.4
+      '@rollup/rollup-linux-loong64-gnu': 4.52.4
+      '@rollup/rollup-linux-ppc64-gnu': 4.52.4
+      '@rollup/rollup-linux-riscv64-gnu': 4.52.4
+      '@rollup/rollup-linux-riscv64-musl': 4.52.4
+      '@rollup/rollup-linux-s390x-gnu': 4.52.4
+      '@rollup/rollup-linux-x64-gnu': 4.52.4
+      '@rollup/rollup-linux-x64-musl': 4.52.4
+      '@rollup/rollup-openharmony-arm64': 4.52.4
+      '@rollup/rollup-win32-arm64-msvc': 4.52.4
+      '@rollup/rollup-win32-ia32-msvc': 4.52.4
+      '@rollup/rollup-win32-x64-gnu': 4.52.4
+      '@rollup/rollup-win32-x64-msvc': 4.52.4
       fsevents: 2.3.3
 
   rotated-array-set@3.0.0: {}
@@ -20471,7 +20497,7 @@ snapshots:
 
   safer-buffer@2.1.2: {}
 
-  sass@1.92.1:
+  sass@1.93.2:
     dependencies:
       chokidar: 4.0.3
       immutable: 5.1.3
@@ -20522,7 +20548,7 @@ snapshots:
     dependencies:
       lru-cache: 6.0.0
 
-  semver@7.7.2: {}
+  semver@7.7.3: {}
 
   send@1.2.0:
     dependencies:
@@ -20671,23 +20697,8 @@ snapshots:
       ansi-styles: 6.2.3
       is-fullwidth-code-point: 5.1.0
 
-  smart-buffer@4.2.0: {}
-
   smob@1.5.0: {}
 
-  socks-proxy-agent@8.0.5:
-    dependencies:
-      agent-base: 7.1.4
-      debug: 4.4.3
-      socks: 2.8.7
-    transitivePeerDependencies:
-      - supports-color
-
-  socks@2.8.7:
-    dependencies:
-      ip-address: 10.0.1
-      smart-buffer: 4.2.0
-
   sortablejs@1.14.0: {}
 
   sortablejs@1.15.6: {}
@@ -20756,13 +20767,13 @@ snapshots:
       es-errors: 1.3.0
       internal-slot: 1.1.0
 
-  streamx@2.22.1:
+  streamx@2.23.0:
     dependencies:
+      events-universal: 1.0.1
       fast-fifo: 1.3.2
       text-decoder: 1.2.3
-    optionalDependencies:
-      bare-events: 2.7.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - react-native-b4a
 
   string-argv@0.3.2: {}
@@ -20869,7 +20880,7 @@ snapshots:
 
   strip-json-comments@3.1.1: {}
 
-  strip-literal@3.0.0:
+  strip-literal@3.1.0:
     dependencies:
       js-tokens: 9.0.1
 
@@ -20888,69 +20899,69 @@ snapshots:
 
   stylehacks@7.0.6(postcss@8.5.6):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       postcss: 8.5.6
       postcss-selector-parser: 7.1.0
 
-  stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-html@1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       postcss-html: 1.8.0
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-config-recess-order@6.1.0(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-recess-order@6.1.0(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
-      stylelint: 16.24.0(typescript@5.9.2)
-      stylelint-order: 6.0.4(stylelint@16.24.0(typescript@5.9.2))
+      stylelint: 16.25.0(typescript@5.9.3)
+      stylelint-order: 6.0.4(stylelint@16.25.0(typescript@5.9.3))
 
-  stylelint-config-recommended-scss@14.1.0(postcss@8.5.6)(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-recommended-scss@14.1.0(postcss@8.5.6)(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       postcss-scss: 4.0.9(postcss@8.5.6)
-      stylelint: 16.24.0(typescript@5.9.2)
-      stylelint-config-recommended: 14.0.1(stylelint@16.24.0(typescript@5.9.2))
-      stylelint-scss: 6.12.1(stylelint@16.24.0(typescript@5.9.2))
+      stylelint: 16.25.0(typescript@5.9.3)
+      stylelint-config-recommended: 14.0.1(stylelint@16.25.0(typescript@5.9.3))
+      stylelint-scss: 6.12.1(stylelint@16.25.0(typescript@5.9.3))
     optionalDependencies:
       postcss: 8.5.6
 
-  stylelint-config-recommended-vue@1.6.1(postcss-html@1.8.0)(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-recommended-vue@1.6.1(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       postcss-html: 1.8.0
-      semver: 7.7.2
-      stylelint: 16.24.0(typescript@5.9.2)
-      stylelint-config-html: 1.1.0(postcss-html@1.8.0)(stylelint@16.24.0(typescript@5.9.2))
-      stylelint-config-recommended: 16.0.0(stylelint@16.24.0(typescript@5.9.2))
+      semver: 7.7.3
+      stylelint: 16.25.0(typescript@5.9.3)
+      stylelint-config-html: 1.1.0(postcss-html@1.8.0)(stylelint@16.25.0(typescript@5.9.3))
+      stylelint-config-recommended: 16.0.0(stylelint@16.25.0(typescript@5.9.3))
 
-  stylelint-config-recommended@14.0.1(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-recommended@14.0.1(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-config-recommended@16.0.0(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-recommended@16.0.0(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-config-standard@38.0.0(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-config-standard@38.0.0(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
-      stylelint: 16.24.0(typescript@5.9.2)
-      stylelint-config-recommended: 16.0.0(stylelint@16.24.0(typescript@5.9.2))
+      stylelint: 16.25.0(typescript@5.9.3)
+      stylelint-config-recommended: 16.0.0(stylelint@16.25.0(typescript@5.9.3))
 
-  stylelint-order@6.0.4(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-order@6.0.4(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       postcss: 8.5.6
       postcss-sorting: 8.0.2(postcss@8.5.6)
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-order@7.0.0(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-order@7.0.0(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       postcss: 8.5.6
       postcss-sorting: 9.1.0(postcss@8.5.6)
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-prettier@5.0.3(prettier@3.6.2)(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-prettier@5.0.3(prettier@3.6.2)(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       prettier: 3.6.2
       prettier-linter-helpers: 1.0.0
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint-scss@6.12.1(stylelint@16.24.0(typescript@5.9.2)):
+  stylelint-scss@6.12.1(stylelint@16.25.0(typescript@5.9.3)):
     dependencies:
       css-tree: 3.1.0
       is-plain-object: 5.0.0
@@ -20960,9 +20971,9 @@ snapshots:
       postcss-resolve-nested-selector: 0.1.6
       postcss-selector-parser: 7.1.0
       postcss-value-parser: 4.2.0
-      stylelint: 16.24.0(typescript@5.9.2)
+      stylelint: 16.25.0(typescript@5.9.3)
 
-  stylelint@16.24.0(typescript@5.9.2):
+  stylelint@16.25.0(typescript@5.9.3):
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.5(@csstools/css-tokenizer@3.0.4)
       '@csstools/css-tokenizer': 3.0.4
@@ -20971,7 +20982,7 @@ snapshots:
       '@dual-bundle/import-meta-resolve': 4.2.1
       balanced-match: 2.0.0
       colord: 2.9.3
-      cosmiconfig: 9.0.0(typescript@5.9.2)
+      cosmiconfig: 9.0.0(typescript@5.9.3)
       css-functions-list: 3.2.3
       css-tree: 3.1.0
       debug: 4.4.3
@@ -21039,11 +21050,11 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
-  svelte@5.39.2:
+  svelte@5.39.11:
     dependencies:
       '@jridgewell/remapping': 2.3.5
       '@jridgewell/sourcemap-codec': 1.5.5
-      '@sveltejs/acorn-typescript': 1.0.5(acorn@8.15.0)
+      '@sveltejs/acorn-typescript': 1.0.6(acorn@8.15.0)
       '@types/estree': 1.0.8
       acorn: 8.15.0
       aria-query: 5.3.2
@@ -21088,13 +21099,15 @@ snapshots:
       string-width: 4.2.3
       strip-ansi: 6.0.1
 
+  tagged-tag@1.0.0: {}
+
   tailwind-merge@2.6.0: {}
 
-  tailwindcss-animate@1.0.7(tailwindcss@3.4.17):
+  tailwindcss-animate@1.0.7(tailwindcss@3.4.18(yaml@2.8.1)):
     dependencies:
-      tailwindcss: 3.4.17
+      tailwindcss: 3.4.18(yaml@2.8.1)
 
-  tailwindcss@3.4.17:
+  tailwindcss@3.4.18(yaml@2.8.1):
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
@@ -21113,31 +21126,32 @@ snapshots:
       postcss: 8.5.6
       postcss-import: 15.1.0(postcss@8.5.6)
       postcss-js: 4.1.0(postcss@8.5.6)
-      postcss-load-config: 4.0.2(postcss@8.5.6)
+      postcss-load-config: 6.0.1(jiti@1.21.7)(postcss@8.5.6)(yaml@2.8.1)
       postcss-nested: 6.2.0(postcss@8.5.6)
       postcss-selector-parser: 6.1.2
       resolve: 1.22.10
       sucrase: 3.35.0
     transitivePeerDependencies:
-      - ts-node
+      - tsx
+      - yaml
 
-  tapable@2.2.3: {}
+  tapable@2.3.0: {}
 
   tar-stream@3.1.7:
     dependencies:
-      b4a: 1.7.1
+      b4a: 1.7.3
       fast-fifo: 1.3.2
-      streamx: 2.22.1
+      streamx: 2.23.0
     transitivePeerDependencies:
+      - bare-abort-controller
       - react-native-b4a
 
-  tar@7.4.3:
+  tar@7.5.1:
     dependencies:
       '@isaacs/fs-minipass': 4.0.1
       chownr: 3.0.0
       minipass: 7.1.2
-      minizlib: 3.0.2
-      mkdirp: 3.0.1
+      minizlib: 3.1.0
       yallist: 5.0.0
 
   temp-dir@2.0.0: {}
@@ -21160,7 +21174,7 @@ snapshots:
 
   text-decoder@1.2.3:
     dependencies:
-      b4a: 1.7.1
+      b4a: 1.7.3
     transitivePeerDependencies:
       - react-native-b4a
 
@@ -21201,7 +21215,7 @@ snapshots:
 
   tinyrainbow@2.0.0: {}
 
-  tinyspy@4.0.3: {}
+  tinyspy@4.0.4: {}
 
   tippy.js@6.3.7:
     dependencies:
@@ -21225,18 +21239,18 @@ snapshots:
 
   trim-lines@3.0.1: {}
 
-  ts-api-utils@1.4.3(typescript@5.9.2):
+  ts-api-utils@1.4.3(typescript@5.9.3):
     dependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  ts-api-utils@2.1.0(typescript@5.9.2):
+  ts-api-utils@2.1.0(typescript@5.9.3):
     dependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  ts-declaration-location@1.0.7(typescript@5.9.2):
+  ts-declaration-location@1.0.7(typescript@5.9.3):
     dependencies:
       picomatch: 4.0.3
-      typescript: 5.9.2
+      typescript: 5.9.3
 
   ts-interface-checker@0.1.13: {}
 
@@ -21246,32 +21260,32 @@ snapshots:
 
   tslib@2.8.1: {}
 
-  turbo-darwin-64@2.5.6:
+  turbo-darwin-64@2.5.8:
     optional: true
 
-  turbo-darwin-arm64@2.5.6:
+  turbo-darwin-arm64@2.5.8:
     optional: true
 
-  turbo-linux-64@2.5.6:
+  turbo-linux-64@2.5.8:
     optional: true
 
-  turbo-linux-arm64@2.5.6:
+  turbo-linux-arm64@2.5.8:
     optional: true
 
-  turbo-windows-64@2.5.6:
+  turbo-windows-64@2.5.8:
     optional: true
 
-  turbo-windows-arm64@2.5.6:
+  turbo-windows-arm64@2.5.8:
     optional: true
 
-  turbo@2.5.6:
+  turbo@2.5.8:
     optionalDependencies:
-      turbo-darwin-64: 2.5.6
-      turbo-darwin-arm64: 2.5.6
-      turbo-linux-64: 2.5.6
-      turbo-linux-arm64: 2.5.6
-      turbo-windows-64: 2.5.6
-      turbo-windows-arm64: 2.5.6
+      turbo-darwin-64: 2.5.8
+      turbo-darwin-arm64: 2.5.8
+      turbo-linux-64: 2.5.8
+      turbo-linux-arm64: 2.5.8
+      turbo-windows-64: 2.5.8
+      turbo-windows-arm64: 2.5.8
 
   type-check@0.4.0:
     dependencies:
@@ -21281,6 +21295,10 @@ snapshots:
 
   type-fest@4.41.0: {}
 
+  type-fest@5.0.1:
+    dependencies:
+      tagged-tag: 1.0.0
+
   typed-array-buffer@1.0.3:
     dependencies:
       call-bound: 1.0.4
@@ -21316,7 +21334,7 @@ snapshots:
 
   typescript@5.8.2: {}
 
-  typescript@5.9.2: {}
+  typescript@5.9.3: {}
 
   uc.micro@2.1.0: {}
 
@@ -21331,34 +21349,34 @@ snapshots:
       has-symbols: 1.1.0
       which-boxed-primitive: 1.1.1
 
-  unbuild@3.6.1(sass@1.92.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2)):
+  unbuild@3.6.1(sass@1.93.2)(typescript@5.9.3)(vue-tsc@2.2.10(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      '@rollup/plugin-alias': 5.1.1(rollup@4.50.2)
-      '@rollup/plugin-commonjs': 28.0.6(rollup@4.50.2)
-      '@rollup/plugin-json': 6.1.0(rollup@4.50.2)
-      '@rollup/plugin-node-resolve': 16.0.1(rollup@4.50.2)
-      '@rollup/plugin-replace': 6.0.2(rollup@4.50.2)
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/plugin-alias': 5.1.1(rollup@4.52.4)
+      '@rollup/plugin-commonjs': 28.0.6(rollup@4.52.4)
+      '@rollup/plugin-json': 6.1.0(rollup@4.52.4)
+      '@rollup/plugin-node-resolve': 16.0.2(rollup@4.52.4)
+      '@rollup/plugin-replace': 6.0.2(rollup@4.52.4)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       citty: 0.1.6
       consola: 3.4.2
       defu: 6.1.4
       esbuild: 0.25.3
       fix-dts-default-cjs-exports: 1.0.1
       hookable: 5.5.3
-      jiti: 2.5.1
+      jiti: 2.6.1
       magic-string: 0.30.19
-      mkdist: 2.4.1(sass@1.92.1)(typescript@5.9.2)(vue-tsc@2.2.10(typescript@5.9.2))(vue@3.5.21(typescript@5.9.2))
+      mkdist: 2.4.1(sass@1.93.2)(typescript@5.9.3)(vue-tsc@2.2.10(typescript@5.9.3))(vue@3.5.22(typescript@5.9.3))
       mlly: 1.8.0
       pathe: 2.0.3
       pkg-types: 2.3.0
-      pretty-bytes: 7.0.1
-      rollup: 4.50.2
-      rollup-plugin-dts: 6.2.3(rollup@4.50.2)(typescript@5.9.2)
+      pretty-bytes: 7.1.0
+      rollup: 4.52.4
+      rollup-plugin-dts: 6.2.3(rollup@4.52.4)(typescript@5.9.3)
       scule: 1.3.0
       tinyglobby: 0.2.15
       untyped: 2.0.0
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
     transitivePeerDependencies:
       - sass
       - vue
@@ -21376,7 +21394,7 @@ snapshots:
 
   undici-types@6.21.0: {}
 
-  undici-types@7.12.0: {}
+  undici-types@7.14.0: {}
 
   undici@7.16.0: {}
 
@@ -21403,7 +21421,7 @@ snapshots:
 
   unicorn-magic@0.3.0: {}
 
-  unimport@5.2.0:
+  unimport@5.4.1:
     dependencies:
       acorn: 8.15.0
       escape-string-regexp: 5.0.0
@@ -21415,10 +21433,10 @@ snapshots:
       picomatch: 4.0.3
       pkg-types: 2.3.0
       scule: 1.3.0
-      strip-literal: 3.0.0
+      strip-literal: 3.1.0
       tinyglobby: 0.2.15
       unplugin: 2.3.10
-      unplugin-utils: 0.2.5
+      unplugin-utils: 0.3.1
 
   unique-filename@4.0.0:
     dependencies:
@@ -21471,7 +21489,7 @@ snapshots:
       pathe: 2.0.3
       picomatch: 4.0.3
 
-  unplugin-utils@0.3.0:
+  unplugin-utils@0.3.1:
     dependencies:
       pathe: 2.0.3
       picomatch: 4.0.3
@@ -21490,7 +21508,7 @@ snapshots:
 
   unrs-resolver@1.11.1:
     dependencies:
-      napi-postinstall: 0.3.3
+      napi-postinstall: 0.3.4
     optionalDependencies:
       '@unrs/resolver-binding-android-arm-eabi': 1.11.1
       '@unrs/resolver-binding-android-arm64': 1.11.1
@@ -21512,7 +21530,7 @@ snapshots:
       '@unrs/resolver-binding-win32-ia32-msvc': 1.11.1
       '@unrs/resolver-binding-win32-x64-msvc': 1.11.1
 
-  unstorage@1.17.1(db0@0.3.2)(ioredis@5.7.0):
+  unstorage@1.17.1(db0@0.3.4)(ioredis@5.8.1):
     dependencies:
       anymatch: 3.1.3
       chokidar: 4.0.3
@@ -21523,8 +21541,8 @@ snapshots:
       ofetch: 1.4.1
       ufo: 1.6.1
     optionalDependencies:
-      db0: 0.3.2
-      ioredis: 5.7.0
+      db0: 0.3.4
+      ioredis: 5.8.1
 
   untun@0.1.3:
     dependencies:
@@ -21536,7 +21554,7 @@ snapshots:
     dependencies:
       citty: 0.1.6
       defu: 6.1.4
-      jiti: 2.5.1
+      jiti: 2.6.1
       knitwork: 1.2.0
       scule: 1.3.0
 
@@ -21551,9 +21569,9 @@ snapshots:
 
   upath@1.2.0: {}
 
-  update-browserslist-db@1.1.3(browserslist@4.26.2):
+  update-browserslist-db@1.1.3(browserslist@4.26.3):
     dependencies:
-      browserslist: 4.26.2
+      browserslist: 4.26.3
       escalade: 3.2.0
       picocolors: 1.1.1
 
@@ -21567,7 +21585,7 @@ snapshots:
       is-npm: 6.1.0
       latest-version: 9.0.0
       pupa: 3.3.0
-      semver: 7.7.2
+      semver: 7.7.3
       xdg-basedir: 5.1.0
 
   uqr@0.1.2: {}
@@ -21578,16 +21596,16 @@ snapshots:
 
   util-deprecate@1.0.2: {}
 
-  vdirs@0.1.8(vue@3.5.21(typescript@5.9.2)):
+  vdirs@0.1.8(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       evtd: 0.2.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vee-validate@4.15.1(vue@3.5.21(typescript@5.9.2)):
+  vee-validate@4.15.1(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@vue/devtools-api': 7.7.7
       type-fest: 4.41.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   vfile-message@4.0.3:
     dependencies:
@@ -21599,17 +21617,17 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-hot-client@2.1.0(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-hot-client@2.1.0(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
 
-  vite-node@3.2.4(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -21624,13 +21642,13 @@ snapshots:
       - tsx
       - yaml
 
-  vite-node@3.2.4(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vite-node@3.2.4(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       cac: 6.7.14
       debug: 4.4.3
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -21646,35 +21664,35 @@ snapshots:
       - yaml
     optional: true
 
-  vite-plugin-compression@0.5.1(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-plugin-compression@0.5.1(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
       chalk: 4.1.2
       debug: 4.4.3
       fs-extra: 10.1.0
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-dts@4.5.4(@types/node@24.5.2)(rollup@4.50.2)(typescript@5.9.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-plugin-dts@4.5.4(@types/node@24.7.1)(rollup@4.52.4)(typescript@5.9.3)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
-      '@microsoft/api-extractor': 7.52.13(@types/node@24.5.2)
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@microsoft/api-extractor': 7.53.1(@types/node@24.7.1)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       '@volar/typescript': 2.4.23
-      '@vue/language-core': 2.2.0(typescript@5.9.2)
+      '@vue/language-core': 2.2.0(typescript@5.9.3)
       compare-versions: 6.1.1
       debug: 4.4.3
       kolorist: 1.8.0
       local-pkg: 1.1.2
       magic-string: 0.30.19
-      typescript: 5.9.2
+      typescript: 5.9.3
     optionalDependencies:
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite-plugin-html@3.2.2(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-plugin-html@3.2.2(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -21688,12 +21706,12 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
 
-  vite-plugin-inspect@0.8.9(rollup@4.50.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-plugin-inspect@0.8.9(rollup@4.52.4)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       debug: 4.4.3
       error-stack-parser-es: 0.1.5
       fs-extra: 11.3.2
@@ -21701,46 +21719,57 @@ snapshots:
       perfect-debounce: 1.0.0
       picocolors: 1.1.1
       sirv: 3.0.2
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - rollup
       - supports-color
 
   vite-plugin-lazy-import@1.0.7:
     dependencies:
-      '@rollup/pluginutils': 5.3.0(rollup@4.50.2)
+      '@rollup/pluginutils': 5.3.0(rollup@4.52.4)
       es-module-lexer: 1.7.0
-      rollup: 4.50.2
+      rollup: 4.52.4
       xe-utils: 3.7.9
 
-  vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+  vite-plugin-pwa@1.0.3(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+    dependencies:
+      debug: 4.4.3
+      pretty-bytes: 6.1.1
+      tinyglobby: 0.2.15
+      vite: 5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)
+      workbox-build: 7.3.0
+      workbox-window: 7.3.0
+    transitivePeerDependencies:
+      - supports-color
+
+  vite-plugin-pwa@1.0.3(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(workbox-build@7.3.0)(workbox-window@7.3.0):
     dependencies:
       debug: 4.4.3
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.15
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       workbox-build: 7.3.0
       workbox-window: 7.3.0
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.7.7(rollup@4.50.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2)):
+  vite-plugin-vue-devtools@7.7.7(rollup@4.52.4)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      '@vue/devtools-core': 7.7.7(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+      '@vue/devtools-core': 7.7.7(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))(vue@3.5.22(typescript@5.9.3))
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       execa: 9.6.0
       sirv: 3.0.2
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vite-plugin-inspect: 0.8.9(rollup@4.50.2)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
-      vite-plugin-vue-inspector: 5.3.2(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-plugin-inspect: 0.8.9(rollup@4.52.4)(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
+      vite-plugin-vue-inspector: 5.3.2(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - rollup
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.2(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vite-plugin-vue-inspector@5.3.2(vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)):
     dependencies:
       '@babel/core': 7.28.4
       '@babel/plugin-proposal-decorators': 7.28.0(@babel/core@7.28.4)
@@ -21748,102 +21777,89 @@ snapshots:
       '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.28.4)
       '@babel/plugin-transform-typescript': 7.28.0(@babel/core@7.28.4)
       '@vue/babel-plugin-jsx': 1.5.0(@babel/core@7.28.4)
-      '@vue/compiler-dom': 3.5.21
+      '@vue/compiler-dom': 3.5.22
       kolorist: 1.8.0
       magic-string: 0.30.19
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
     transitivePeerDependencies:
       - supports-color
 
-  vite@5.4.20(@types/node@22.18.6)(less@4.4.1)(sass@1.92.1)(terser@5.44.0):
+  vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0):
     dependencies:
       esbuild: 0.25.3
       postcss: 8.5.6
-      rollup: 4.50.2
+      rollup: 4.52.4
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 24.7.1
       fsevents: 2.3.3
-      less: 4.4.1
-      sass: 1.92.1
+      less: 4.4.2
+      sass: 1.93.2
       terser: 5.44.0
 
-  vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0):
-    dependencies:
-      esbuild: 0.25.3
-      postcss: 8.5.6
-      rollup: 4.50.2
-    optionalDependencies:
-      '@types/node': 24.5.2
-      fsevents: 2.3.3
-      less: 4.4.1
-      sass: 1.92.1
-      terser: 5.44.0
-
-  vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.3
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.50.2
+      rollup: 4.52.4
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 22.18.9
       fsevents: 2.3.3
-      jiti: 2.5.1
-      less: 4.4.1
-      sass: 1.92.1
+      jiti: 2.6.1
+      less: 4.4.2
+      sass: 1.93.2
       terser: 5.44.0
       yaml: 2.8.1
 
-  vite@7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vite@7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       esbuild: 0.25.3
       fdir: 6.5.0(picomatch@4.0.3)
       picomatch: 4.0.3
       postcss: 8.5.6
-      rollup: 4.50.2
+      rollup: 4.52.4
       tinyglobby: 0.2.15
     optionalDependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
       fsevents: 2.3.3
-      jiti: 2.5.1
-      less: 4.4.1
-      sass: 1.92.1
+      jiti: 2.6.1
+      less: 4.4.2
+      sass: 1.93.2
       terser: 5.44.0
       yaml: 2.8.1
-    optional: true
 
-  vitepress-plugin-group-icons@1.6.3(markdown-it@14.1.0)(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)):
+  vitepress-plugin-group-icons@1.6.3(markdown-it@14.1.0)(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)):
     dependencies:
       '@iconify-json/logos': 1.2.9
-      '@iconify-json/vscode-icons': 1.2.30
+      '@iconify-json/vscode-icons': 1.2.31
       '@iconify/utils': 3.0.2
       markdown-it: 14.1.0
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
+      vite: 5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)
     transitivePeerDependencies:
       - supports-color
 
-  vitepress@1.6.4(@algolia/client-search@5.37.0)(@types/node@24.5.2)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.1)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.92.1)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.2):
+  vitepress@1.6.4(@algolia/client-search@5.40.0)(@types/node@24.7.1)(async-validator@4.2.5)(axios@1.12.2)(less@4.4.2)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.93.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.44.0)(typescript@5.9.3):
     dependencies:
       '@docsearch/css': 3.8.2
-      '@docsearch/js': 3.8.2(@algolia/client-search@5.37.0)(search-insights@2.17.3)
-      '@iconify-json/simple-icons': 1.2.52
+      '@docsearch/js': 3.8.2(@algolia/client-search@5.40.0)(search-insights@2.17.3)
+      '@iconify-json/simple-icons': 1.2.54
       '@shikijs/core': 2.5.0
       '@shikijs/transformers': 2.5.0
       '@shikijs/types': 2.5.0
       '@types/markdown-it': 14.1.2
-      '@vitejs/plugin-vue': 5.2.4(vite@5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0))(vue@3.5.21(typescript@5.9.2))
+      '@vitejs/plugin-vue': 5.2.4(vite@5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0))(vue@3.5.22(typescript@5.9.3))
       '@vue/devtools-api': 7.7.7
-      '@vue/shared': 3.5.21
-      '@vueuse/core': 12.8.2(typescript@5.9.2)
-      '@vueuse/integrations': 12.8.2(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(typescript@5.9.2)
+      '@vue/shared': 3.5.22
+      '@vueuse/core': 12.8.2(typescript@5.9.3)
+      '@vueuse/integrations': 12.8.2(async-validator@4.2.5)(axios@1.12.2)(focus-trap@7.6.5)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(typescript@5.9.3)
       focus-trap: 7.6.5
       mark.js: 8.11.1
       minisearch: 7.2.0
       shiki: 2.5.0
-      vite: 5.4.20(@types/node@24.5.2)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)
-      vue: 3.5.21(typescript@5.9.2)
+      vite: 5.4.20(@types/node@24.7.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)
+      vue: 3.5.22(typescript@5.9.3)
     optionalDependencies:
       postcss: 8.5.6
     transitivePeerDependencies:
@@ -21873,11 +21889,11 @@ snapshots:
       - typescript
       - universal-cookie
 
-  vitest@3.2.4(@types/node@22.18.6)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/node@22.18.9)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -21895,11 +21911,11 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.6(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@22.18.6)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 22.18.6
+      '@types/node': 22.18.9
       happy-dom: 17.6.3
     transitivePeerDependencies:
       - jiti
@@ -21915,11 +21931,11 @@ snapshots:
       - tsx
       - yaml
 
-  vitest@3.2.4(@types/node@24.5.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1):
+  vitest@3.2.4(@types/node@24.7.1)(happy-dom@17.6.3)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1))
+      '@vitest/mocker': 3.2.4(vite@7.1.9(@types/node@22.18.9)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -21937,11 +21953,11 @@ snapshots:
       tinyglobby: 0.2.15
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.6(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
-      vite-node: 3.2.4(@types/node@24.5.2)(jiti@2.5.1)(less@4.4.1)(sass@1.92.1)(terser@5.44.0)(yaml@2.8.1)
+      vite: 7.1.9(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
+      vite-node: 3.2.4(@types/node@24.7.1)(jiti@2.6.1)(less@4.4.2)(sass@1.93.2)(terser@5.44.0)(yaml@2.8.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 24.5.2
+      '@types/node': 24.7.1
       happy-dom: 17.6.3
     transitivePeerDependencies:
       - jiti
@@ -21958,10 +21974,10 @@ snapshots:
       - yaml
     optional: true
 
-  vooks@0.2.12(vue@3.5.21(typescript@5.9.2)):
+  vooks@0.2.12(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       evtd: 0.2.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
   vscode-languageserver-textdocument@1.0.12: {}
 
@@ -21969,101 +21985,101 @@ snapshots:
 
   vue-component-type-helpers@2.2.12: {}
 
-  vue-demi@0.14.10(vue@3.5.21(typescript@5.9.2)):
+  vue-demi@0.14.10(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-dompurify-html@5.3.0(vue@3.5.21(typescript@5.9.2)):
+  vue-dompurify-html@5.3.0(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       dompurify: 3.2.7
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-eslint-parser@10.2.0(eslint@9.35.0(jiti@2.5.1)):
+  vue-eslint-parser@10.2.0(eslint@9.37.0(jiti@2.6.1)):
     dependencies:
       debug: 4.4.3
-      eslint: 9.35.0(jiti@2.5.1)
+      eslint: 9.37.0(jiti@2.6.1)
       eslint-scope: 8.4.0
       eslint-visitor-keys: 4.2.1
       espree: 10.4.0
       esquery: 1.6.0
-      semver: 7.7.2
+      semver: 7.7.3
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@11.1.12(vue@3.5.21(typescript@5.9.2)):
+  vue-i18n@11.1.12(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@intlify/core-base': 11.1.12
       '@intlify/shared': 11.1.12
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-json-viewer@3.0.4(vue@3.5.21(typescript@5.9.2)):
+  vue-json-viewer@3.0.4(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       clipboard: 2.0.11
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-router@4.5.1(vue@3.5.21(typescript@5.9.2)):
+  vue-router@4.5.1(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-tippy@6.7.1(vue@3.5.21(typescript@5.9.2)):
+  vue-tippy@6.7.1(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       tippy.js: 6.3.7
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue-tsc@2.2.10(typescript@5.9.2):
+  vue-tsc@2.2.10(typescript@5.9.3):
     dependencies:
       '@volar/typescript': 2.4.23
-      '@vue/language-core': 2.2.10(typescript@5.9.2)
-      typescript: 5.9.2
+      '@vue/language-core': 2.2.10(typescript@5.9.3)
+      typescript: 5.9.3
 
-  vue-types@3.0.2(vue@3.5.21(typescript@5.9.2)):
+  vue-types@3.0.2(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       is-plain-object: 3.0.1
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue3-signature@0.2.4(vue@3.5.21(typescript@5.9.2)):
+  vue3-signature@0.2.4(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       default-passive-events: 2.0.0
       signature_pad: 3.0.0-beta.4
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vue@3.5.21(typescript@5.9.2):
+  vue@3.5.22(typescript@5.9.3):
     dependencies:
-      '@vue/compiler-dom': 3.5.21
-      '@vue/compiler-sfc': 3.5.21
-      '@vue/runtime-dom': 3.5.21
-      '@vue/server-renderer': 3.5.21(vue@3.5.21(typescript@5.9.2))
-      '@vue/shared': 3.5.21
+      '@vue/compiler-dom': 3.5.22
+      '@vue/compiler-sfc': 3.5.22
+      '@vue/runtime-dom': 3.5.22
+      '@vue/server-renderer': 3.5.22(vue@3.5.22(typescript@5.9.3))
+      '@vue/shared': 3.5.22
     optionalDependencies:
-      typescript: 5.9.2
+      typescript: 5.9.3
 
-  vuedraggable@4.1.0(vue@3.5.21(typescript@5.9.2)):
+  vuedraggable@4.1.0(vue@3.5.22(typescript@5.9.3)):
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.5.21(typescript@5.9.2)
+      vue: 3.5.22(typescript@5.9.3)
 
-  vueuc@0.4.65(vue@3.5.21(typescript@5.9.2)):
+  vueuc@0.4.65(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      '@css-render/vue3-ssr': 0.15.14(vue@3.5.21(typescript@5.9.2))
+      '@css-render/vue3-ssr': 0.15.14(vue@3.5.22(typescript@5.9.3))
       '@juggle/resize-observer': 3.4.0
       css-render: 0.15.14
       evtd: 0.2.4
       seemly: 0.3.10
-      vdirs: 0.1.8(vue@3.5.21(typescript@5.9.2))
-      vooks: 0.2.12(vue@3.5.21(typescript@5.9.2))
-      vue: 3.5.21(typescript@5.9.2)
+      vdirs: 0.1.8(vue@3.5.22(typescript@5.9.3))
+      vooks: 0.2.12(vue@3.5.22(typescript@5.9.3))
+      vue: 3.5.22(typescript@5.9.3)
 
-  vxe-pc-ui@4.9.32(vue@3.5.21(typescript@5.9.2)):
+  vxe-pc-ui@4.9.42(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      '@vxe-ui/core': 4.2.12(vue@3.5.21(typescript@5.9.2))
+      '@vxe-ui/core': 4.2.12(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - vue
 
-  vxe-table@4.16.14(vue@3.5.21(typescript@5.9.2)):
+  vxe-table@4.16.21(vue@3.5.22(typescript@5.9.3)):
     dependencies:
-      vxe-pc-ui: 4.9.32(vue@3.5.21(typescript@5.9.2))
+      vxe-pc-ui: 4.9.42(vue@3.5.22(typescript@5.9.3))
     transitivePeerDependencies:
       - vue
 
@@ -22081,6 +22097,8 @@ snapshots:
 
   watermark-js-plus@1.6.3: {}
 
+  web-streams-polyfill@3.3.3: {}
+
   webidl-conversions@3.0.1: {}
 
   webidl-conversions@4.0.2: {}
@@ -22126,7 +22144,7 @@ snapshots:
       is-async-function: 2.1.1
       is-date-object: 1.1.0
       is-finalizationregistry: 1.1.1
-      is-generator-function: 1.1.0
+      is-generator-function: 1.1.2
       is-regex: 1.2.1
       is-weakref: 1.1.1
       isarray: 2.0.5
@@ -22429,4 +22447,4 @@ snapshots:
 
   zwitch@2.0.4: {}
 
-  zx@8.8.1: {}
+  zx@8.8.4: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 66110d70a7105d760238ca9cfadf52cbb6280eb0..ca8204c8ff393871b72f457c9294763ba807b117 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -197,7 +197,7 @@ catalog:
   unbuild: ^3.6.1
   unplugin-element-plus: ^0.10.0
   vee-validate: ^4.15.1
-  vite: ^5.4.10
+  vite: ^7.1.2
   vite-plugin-compression: ^0.5.1
   vite-plugin-dts: ^4.5.4
   vite-plugin-html: ^3.2.2