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 28b2f7b2e..bf5682d2d 100644
--- a/apps/web-antd/src/api/iot/product/product/index.ts
+++ b/apps/web-antd/src/api/iot/product/product/index.ts
@@ -48,6 +48,12 @@ export enum CodecTypeEnum {
   ALINK = 'Alink', // 阿里云 Alink 协议
 }
 
+/** IOT 产品状态枚举类 */
+export enum ProductStatusEnum {
+  UNPUBLISHED = 0, // 开发中
+  PUBLISHED = 1, // 已发布
+}
+
 /** 查询产品分页 */
 export function getProductPage(params: PageParam) {
   return requestClient.get<PageResult<IotProductApi.Product>>(
diff --git a/apps/web-antd/src/views/iot/device/group/index.vue b/apps/web-antd/src/views/iot/device/group/index.vue
index d72341a6b..0d3f7b6ab 100644
--- a/apps/web-antd/src/views/iot/device/group/index.vue
+++ b/apps/web-antd/src/views/iot/device/group/index.vue
@@ -11,12 +11,12 @@ import { deleteDeviceGroup, getDeviceGroupPage } from '#/api/iot/device/group';
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import DeviceGroupForm from './modules/device-group-form.vue';
+import Form from './modules/form.vue';
 
 defineOptions({ name: 'IoTDeviceGroup' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: DeviceGroupForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
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/form.vue
similarity index 64%
rename from apps/web-antd/src/views/iot/device/group/modules/device-group-form.vue
rename to apps/web-antd/src/views/iot/device/group/modules/form.vue
index 90529de77..3e1a2d521 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/form.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import type { IotDeviceGroupApi } from '#/api/iot/device/group';
 
 import { computed, ref } from 'vue';
@@ -17,17 +17,9 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-defineOptions({ name: 'IoTDeviceGroupForm' });
-
-// TODO @haohao：web-antd/src/views/iot/product/category/modules/product-category-form.vue 类似问题
-
-const emit = defineEmits<{
-  success: [];
-}>();
-
+const emit = defineEmits(['success']);
 const formData = ref<IotDeviceGroupApi.DeviceGroup>();
-
-const modalTitle = computed(() => {
+const getTitle = computed(() => {
   return formData.value?.id
     ? $t('ui.actionTitle.edit', ['设备分组'])
     : $t('ui.actionTitle.create', ['设备分组']);
@@ -40,11 +32,9 @@ const [Form, formApi] = useVbenForm({
     },
   },
   schema: useFormSchema(),
-  showCollapseButton: false,
   showDefaultActions: false,
 });
 
-// TODO @haohao：参考别的 form；1）文件的命名可以简化；2）代码可以在简化下；
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -52,17 +42,13 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
-
+    // 提交表单
+    const data = (await formApi.getValues()) as IotDeviceGroupApi.DeviceGroup;
     try {
-      const values = await formApi.getValues();
-
       await (formData.value?.id
-        ? updateDeviceGroup({
-            ...values,
-            id: formData.value.id,
-          } as IotDeviceGroupApi.DeviceGroup)
-        : createDeviceGroup(values as IotDeviceGroupApi.DeviceGroup));
-
+        ? updateDeviceGroup(data)
+        : createDeviceGroup(data));
+      // 关闭并提示
       await modalApi.close();
       emit('success');
       message.success($t('ui.actionMessage.operationSuccess'));
@@ -70,28 +56,20 @@ const [Modal, modalApi] = useVbenModal({
       modalApi.unlock();
     }
   },
-
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
-      await formApi.resetForm();
       return;
     }
-
-    // 重置表单
-    await formApi.resetForm();
-
+    // 加载数据
     const data = modalApi.getData<IotDeviceGroupApi.DeviceGroup>();
-    // 如果没有数据或没有 id，表示是新增
     if (!data || !data.id) {
-      formData.value = undefined;
       return;
     }
-
-    // 编辑模式：加载数据
     modalApi.lock();
     try {
       formData.value = await getDeviceGroup(data.id);
+      // 设置到 values
       await formApi.setValues(formData.value);
     } finally {
       modalApi.unlock();
@@ -101,7 +79,7 @@ const [Modal, modalApi] = useVbenModal({
 </script>
 
 <template>
-  <Modal :title="modalTitle" class="w-2/5">
+  <Modal :title="getTitle">
     <Form class="mx-4" />
   </Modal>
 </template>
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 05a56ee6d..3dc7201b7 100644
--- a/apps/web-antd/src/views/iot/product/category/index.vue
+++ b/apps/web-antd/src/views/iot/product/category/index.vue
@@ -14,12 +14,12 @@ import {
 import { $t } from '#/locales';
 
 import { useGridColumns, useGridFormSchema } from './data';
-import ProductCategoryForm from './modules/product-category-form.vue';
+import Form from './modules/form.vue';
 
 defineOptions({ name: 'IoTProductCategory' });
 
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: ProductCategoryForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
diff --git a/apps/web-antd/src/views/iot/product/category/modules/product-category-form.vue b/apps/web-antd/src/views/iot/product/category/modules/form.vue
similarity index 88%
rename from apps/web-antd/src/views/iot/product/category/modules/product-category-form.vue
rename to apps/web-antd/src/views/iot/product/category/modules/form.vue
index 792c7ddac..df2290639 100644
--- a/apps/web-antd/src/views/iot/product/category/modules/product-category-form.vue
+++ b/apps/web-antd/src/views/iot/product/category/modules/form.vue
@@ -17,8 +17,6 @@ import { $t } from '#/locales';
 
 import { useFormSchema } from '../data';
 
-// TODO @haohao：应该是 form.vue，不用前缀；
-
 const emit = defineEmits(['success']);
 const formData = ref<IotProductCategoryApi.ProductCategory>();
 const getTitle = computed(() => {
@@ -40,7 +38,6 @@ const [Form, formApi] = useVbenForm({
   showDefaultActions: false,
 });
 
-// TODO @haohao：参考 apps/web-antd/src/views/system/dept/modules/form.vue 简化 useVbenModal 里的代码；
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
     const { valid } = await formApi.validate();
@@ -66,25 +63,19 @@ const [Modal, modalApi] = useVbenModal({
   async onOpenChange(isOpen: boolean) {
     if (!isOpen) {
       formData.value = undefined;
-      formApi.resetForm();
       return;
     }
-
-    // 重置表单
-    await formApi.resetForm();
-
+    // 加载数据
     const data = modalApi.getData<IotProductCategoryApi.ProductCategory>();
-    // 如果没有数据或没有 id，表示是新增
     if (!data || !data.id) {
-      formData.value = undefined;
       // 新增模式：设置默认值
+      formData.value = undefined;
       await formApi.setValues({
         sort: 0,
         status: 1,
       });
       return;
     }
-
     // 编辑模式：加载数据
     modalApi.lock();
     try {
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 066cc1330..57d2c3818 100644
--- a/apps/web-antd/src/views/iot/product/product/data.ts
+++ b/apps/web-antd/src/views/iot/product/product/data.ts
@@ -1,7 +1,8 @@
 import type { VbenFormSchema } from '#/adapter/form';
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { IotProductCategoryApi } from '#/api/iot/product/category';
 
-import { h, ref } from 'vue';
+import { h } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
 import { getDictOptions } from '@vben/hooks';
@@ -10,7 +11,17 @@ import { Button } from 'ant-design-vue';
 
 import { z } from '#/adapter/form';
 import { getSimpleProductCategoryList } from '#/api/iot/product/category';
-import { getProductPage } from '#/api/iot/product/product';
+
+/** 产品分类列表缓存 */
+let categoryList: IotProductCategoryApi.ProductCategory[] = [];
+
+/** 加载产品分类数据 */
+async function loadCategoryData() {
+  categoryList = await getSimpleProductCategoryList();
+}
+
+// 初始化加载分类数据
+loadCategoryData();
 
 /** 新增/修改产品的表单 */
 export function useFormSchema(formApi?: any): VbenFormSchema[] {
@@ -134,7 +145,7 @@ export function useFormSchema(formApi?: any): VbenFormSchema[] {
       label: '产品状态',
       component: 'RadioGroup',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        options: getDictOptions(DICT_TYPE.IOT_PRODUCT_STATUS, 'number'),
         buttonStyle: 'solid',
         optionType: 'button',
       },
@@ -283,7 +294,7 @@ export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
       label: '产品状态',
       component: 'RadioGroup',
       componentProps: {
-        options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
+        options: getDictOptions(DICT_TYPE.IOT_PRODUCT_STATUS, 'number'),
         buttonStyle: 'solid',
         optionType: 'button',
       },
@@ -308,11 +319,10 @@ export function useAdvancedFormSchema(): VbenFormSchema[] {
     {
       fieldName: 'icon',
       label: '产品图标',
-      component: 'IconPicker', // 用这个组件 产品卡片列表 可以根据这个显示 否则就显示默认的
+      component: 'IconPicker',
       componentProps: {
         placeholder: '请选择产品图标',
         prefix: 'carbon',
-        autoFetchApi: false,
       },
     },
     {
@@ -333,31 +343,6 @@ export function useAdvancedFormSchema(): VbenFormSchema[] {
   ];
 }
 
-/** 列表的搜索表单 */
-// TODO @haohao：貌似用不上？
-export function useGridFormSchema(): VbenFormSchema[] {
-  return [
-    {
-      fieldName: 'name',
-      label: '产品名称',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入产品名称',
-        allowClear: true,
-      },
-    },
-    {
-      fieldName: 'productKey',
-      label: 'ProductKey',
-      component: 'Input',
-      componentProps: {
-        placeholder: '请输入产品标识',
-        allowClear: true,
-      },
-    },
-  ];
-}
-
 /** 列表的字段 */
 export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
@@ -375,7 +360,8 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'categoryId',
       title: '品类',
       minWidth: 120,
-      slots: { default: 'category' },
+      formatter: ({ cellValue }) =>
+        categoryList.find((c) => c.id === cellValue)?.name || '未分类',
     },
     {
       field: 'deviceType',
@@ -390,13 +376,17 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
       field: 'icon',
       title: '产品图标',
       width: 100,
-      slots: { default: 'icon' },
+      cellRender: {
+        name: 'CellImage',
+      },
     },
     {
       field: 'picUrl',
       title: '产品图片',
       width: 100,
-      slots: { default: 'picUrl' },
+      cellRender: {
+        name: 'CellImage',
+      },
     },
     {
       field: 'createTime',
@@ -413,35 +403,6 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 查询产品列表 */
-// TODO @haohao：貌似可以删除？
-export async function queryProductList({ page }: any, searchParams: any) {
-  return await getProductPage({
-    pageNo: page.currentPage,
-    pageSize: page.pageSize,
-    ...searchParams,
-  });
-}
-
-/** 创建图片预览状态 */
-// TODO @haohao：可能不一定用的上；
-export function useImagePreview() {
-  const previewVisible = ref(false);
-  const previewImage = ref('');
-
-  function handlePreviewImage(url: string) {
-    previewImage.value = url;
-    previewVisible.value = true;
-  }
-
-  return {
-    previewVisible,
-    previewImage,
-    handlePreviewImage,
-  };
-}
-
-// TODO @haohao：放到对应的 form 里
 /** 生成 ProductKey（包含大小写字母和数字） */
 export function generateProductKey(): string {
   const chars =
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 0e5dcef8c..3aa14191d 100644
--- a/apps/web-antd/src/views/iot/product/product/index.vue
+++ b/apps/web-antd/src/views/iot/product/product/index.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import type { VxeTableGridOptions } from '#/adapter/vxe-table';
+import type { IotProductCategoryApi } from '#/api/iot/product/category';
+import type { IotProductApi } from '#/api/iot/product/product';
 
 import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
@@ -8,7 +10,7 @@ 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 { Button, Card, Input, message, Space } from 'ant-design-vue';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getSimpleProductCategoryList } from '#/api/iot/product/category';
@@ -19,14 +21,14 @@ import {
 } from '#/api/iot/product/product';
 import { $t } from '#/locales';
 
-import { useGridColumns, useImagePreview } from './data';
-import ProductCardView from './modules/product-card-view.vue';
-import ProductForm from './modules/product-form.vue';
+import { useGridColumns } from './data';
+import ProductCardView from './modules/card-view.vue';
+import Form from './modules/form.vue';
 
 defineOptions({ name: 'IoTProduct' });
 
 const router = useRouter();
-const categoryList = ref<any[]>([]); // TODO @haohao：category 类型
+const categoryList = ref<IotProductCategoryApi.ProductCategory[]>([]);
 const viewMode = ref<'card' | 'list'>('card');
 const cardViewRef = ref();
 const searchParams = ref({
@@ -34,10 +36,8 @@ const searchParams = ref({
   productKey: '',
 }); // 搜索参数
 
-const { previewVisible, previewImage, handlePreviewImage } = useImagePreview();
-
 const [FormModal, formModalApi] = useVbenModal({
-  connectedComponent: ProductForm,
+  connectedComponent: Form,
   destroyOnClose: true,
 });
 
@@ -46,13 +46,6 @@ async function loadCategories() {
   categoryList.value = await getSimpleProductCategoryList();
 }
 
-/** 获取分类名称 */
-function getCategoryNameByValue(categoryId: number) {
-  const category = categoryList.value.find((c: any) => c.id === categoryId);
-  return category?.name || '未分类';
-}
-
-// TODO @haohao：要不要改成 handleRefresh，注释改成“刷新表格”，更加统一。
 /** 搜索产品 */
 function handleSearch() {
   if (viewMode.value === 'list') {
@@ -128,10 +121,6 @@ async function handleDelete(row: any) {
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
-  // TODO @haohao：这个不用，可以删除掉的
-  formOptions: {
-    schema: [],
-  },
   gridOptions: {
     columns: useGridColumns(),
     height: 'auto',
@@ -155,7 +144,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       refresh: true,
       search: true,
     },
-  } as VxeTableGridOptions, // TODO @haohao：这里有个 <> 泛型
+  } as VxeTableGridOptions<IotProductApi.Product>,
 });
 
 /** 初始化 */
@@ -172,24 +161,22 @@ onMounted(() => {
     <Card :body-style="{ padding: '16px' }" class="mb-4">
       <!-- 搜索表单 -->
       <div class="mb-3 flex items-center gap-3">
-        <!-- TODO @haohao：tindwind -->
         <Input
           v-model:value="searchParams.name"
           placeholder="请输入产品名称"
           allow-clear
-          style="width: 220px"
+          class="w-[220px]"
           @press-enter="handleSearch"
         >
           <template #prefix>
             <span class="text-gray-400">产品名称</span>
           </template>
         </Input>
-        <!-- TODO @haohao：tindwind -->
         <Input
           v-model:value="searchParams.productKey"
           placeholder="请输入产品标识"
           allow-clear
-          style="width: 220px"
+          class="w-[220px]"
           @press-enter="handleSearch"
         >
           <template #prefix>
@@ -207,18 +194,22 @@ onMounted(() => {
       </div>
       <!-- 操作按钮 -->
       <div class="flex items-center justify-between">
-        <Space :size="12">
-          <Button type="primary" @click="handleCreate">
-            <!-- TODO @haohao：按钮使用中立的，ACTION_ICON.ADD -->
-            <IconifyIcon icon="ant-design:plus-outlined" class="mr-1" />
-            新增产品
-          </Button>
-          <Button type="primary" @click="handleExport">
-            <!-- TODO @haohao：按钮使用中立的，ACTION_ICON.EXPORT -->
-            <IconifyIcon icon="ant-design:download-outlined" class="mr-1" />
-            导出
-          </Button>
-        </Space>
+        <TableAction
+          :actions="[
+            {
+              label: '新增产品',
+              type: 'primary',
+              icon: ACTION_ICON.ADD,
+              onClick: handleCreate,
+            },
+            {
+              label: '导出',
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              onClick: handleExport,
+            },
+          ]"
+        />
         <!-- 视图切换 -->
         <Space :size="4">
           <Button
@@ -238,53 +229,18 @@ onMounted(() => {
     </Card>
 
     <Grid v-show="viewMode === 'list'">
-      <!-- TODO @haohao：这里貌似可以删除掉 -->
-      <template #toolbar-tools>
-        <div></div>
-      </template>
-      <!-- 产品分类列 -->
-      <!-- TODO @haohao：这里应该可以拿到 data.ts，参考别的模块；类似 apps/web-antd/src/views/ai/image/manager/data.ts 里，里面查询 category ，和自己渲染-->
-      <template #category="{ row }">
-        <span>{{ getCategoryNameByValue(row.categoryId) }}</span>
-      </template>
-      <!-- 产品图标列 -->
-      <!-- TODO @haohao：直接用 Image 组件，就 ok 了呀。在 data.ts 里 -->
-      <template #icon="{ row }">
-        <Button
-          v-if="row.icon"
-          type="link"
-          size="small"
-          @click="handlePreviewImage(row.icon)"
-        >
-          <IconifyIcon icon="ant-design:eye-outlined" class="text-lg" />
-        </Button>
-        <span v-else class="text-gray-400">-</span>
-      </template>
-      <!-- TODO @haohao：直接用 Image 组件，就 ok 了呀。在 data.ts 里 -->
-      <!-- 产品图片列 -->
-      <template #picUrl="{ row }">
-        <Button
-          v-if="row.picUrl"
-          type="link"
-          size="small"
-          @click="handlePreviewImage(row.picUrl)"
-        >
-          <IconifyIcon icon="ant-design:eye-outlined" class="text-lg" />
-        </Button>
-        <span v-else class="text-gray-400">-</span>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[
             {
               label: '详情',
               type: 'link',
-              onClick: openProductDetail.bind(null, row.id),
+              onClick: openProductDetail.bind(null, row.id!),
             },
             {
               label: '物模型',
               type: 'link',
-              onClick: openThingModel.bind(null, row.id),
+              onClick: openThingModel.bind(null, row.id!),
             },
             {
               label: $t('common.edit'),
@@ -320,42 +276,11 @@ onMounted(() => {
       @thing-model="openThingModel"
     />
 
-    <!-- 图片预览 -->
-    <!-- TODO @haohao：tindwind -->
-    <div style="display: none">
-      <!-- TODO @haohao：是不是通过 Image 直接实现预览 -->
-      <Image.PreviewGroup
-        :preview="{
-          visible: previewVisible,
-          onVisibleChange: (visible) => (previewVisible = visible),
-        }"
-      >
-        <Image :src="previewImage" />
-      </Image.PreviewGroup>
-    </div>
   </Page>
 </template>
 <style scoped>
-/** TODO @haohao：貌似这 2 个 css 没啥用？ */
-:deep(.vxe-toolbar div) {
-  z-index: 1;
-}
-
 /* 隐藏 VxeGrid 自带的搜索表单区域 */
 :deep(.vxe-grid--form-wrapper) {
   display: none !important;
 }
 </style>
-
-<style>
-/* 控制图片预览的大小 */
-.ant-image-preview-img {
-  max-width: 80% !important;
-  max-height: 80% !important;
-  object-fit: contain !important;
-}
-
-.ant-image-preview-operations {
-  background: rgb(0 0 0 / 70%) !important;
-}
-</style>
diff --git a/apps/web-antd/src/views/iot/product/product/modules/product-card-view.vue b/apps/web-antd/src/views/iot/product/product/modules/card-view.vue
similarity index 76%
rename from apps/web-antd/src/views/iot/product/product/modules/product-card-view.vue
rename to apps/web-antd/src/views/iot/product/product/modules/card-view.vue
index a1d3eea2c..300042b89 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/product-card-view.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/card-view.vue
@@ -1,4 +1,4 @@
-<script setup lang="ts">
+<script lang="ts" setup>
 import { onMounted, ref } from 'vue';
 
 import { DICT_TYPE } from '@vben/constants';
@@ -10,6 +10,7 @@ import {
   Card,
   Col,
   Empty,
+  Image,
   Pagination,
   Popconfirm,
   Row,
@@ -19,10 +20,13 @@ import {
 
 import { getProductPage } from '#/api/iot/product/product';
 
-// TODO @haohao：应该是 card-view.vue；
-
-// TODO @haohao：命名不太对；可以简化下；
-defineOptions({ name: 'ProductCardView' });
+interface Props {
+  categoryList: any[];
+  searchParams?: {
+    name: string;
+    productKey: string;
+  };
+}
 
 const props = defineProps<Props>();
 
@@ -34,14 +38,6 @@ const emit = defineEmits<{
   thingModel: [productId: number];
 }>();
 
-interface Props {
-  categoryList: any[];
-  searchParams?: {
-    name: string;
-    productKey: string;
-  };
-}
-
 const loading = ref(false);
 const list = ref<any[]>([]);
 const total = ref(0);
@@ -50,14 +46,13 @@ const queryParams = ref({
   pageSize: 12,
 });
 
-// TODO @haohao：注释的优化；
-// 获取分类名称
+/** 获取分类名称 */
 function getCategoryName(categoryId: number) {
   const category = props.categoryList.find((c: any) => c.id === categoryId);
   return category?.name || '未分类';
 }
 
-// 获取产品列表
+/** 获取产品列表 */
 async function getList() {
   loading.value = true;
   try {
@@ -72,14 +67,14 @@ async function getList() {
   }
 }
 
-// 处理页码变化
+/** 处理页码变化 */
 function handlePageChange(page: number, pageSize: number) {
   queryParams.value.pageNo = page;
   queryParams.value.pageSize = pageSize;
   getList();
 }
 
-// 获取设备类型颜色
+/** 获取设备类型颜色 */
 function getDeviceTypeColor(deviceType: number) {
   const colors: Record<number, string> = {
     0: 'blue',
@@ -114,17 +109,17 @@ onMounted(() => {
           :sm="12"
           :md="12"
           :lg="6"
-          class="mb-4"
         >
-          <!-- TODO @haohao：卡片之间的上下距离，太宽了。 -->
-          <Card :body-style="{ padding: '20px' }" class="product-card h-full">
+          <Card
+            :body-style="{ padding: '16px' }"
+            class="product-card h-full rounded-lg transition-all duration-300 hover:-translate-y-0.5 hover:shadow-lg"
+          >
             <!-- 顶部标题区域 -->
-            <div class="mb-4 flex items-start">
-              <!-- TODO @haohao：图标太大了；看看是不是参考 vue3 + element-plus 搞小点；然后标题居中。 -->
+            <div class="mb-3 flex items-center">
               <div class="product-icon">
                 <IconifyIcon
-                  :icon="item.icon || 'ant-design:inbox-outlined'"
-                  class="text-3xl"
+                  :icon="item.icon || 'lucide:box'"
+                  class="text-xl"
                 />
               </div>
               <div class="ml-3 min-w-0 flex-1">
@@ -132,7 +127,7 @@ onMounted(() => {
               </div>
             </div>
             <!-- 内容区域 -->
-            <div class="mb-4 flex items-start">
+            <div class="mb-3 flex items-start">
               <div class="info-list flex-1">
                 <div class="info-item">
                   <span class="info-label">产品分类</span>
@@ -156,20 +151,25 @@ onMounted(() => {
                 </div>
                 <div class="info-item">
                   <span class="info-label">产品标识</span>
-                  <!-- TODO @haohao：展示 ？有点奇怪，要不小手？ -->
                   <Tooltip :title="item.productKey || item.id" placement="top">
-                    <span class="info-value product-key">
+                    <span class="info-value product-key cursor-pointer">
                       {{ item.productKey || item.id }}
                     </span>
                   </Tooltip>
                 </div>
               </div>
-              <!-- TODO @haohao：这里是不是有 image？然后默认 icon -->
-              <!-- TODO @haohao：高度太高了。建议和左侧（产品分类 + 产品类型 + 产品标识）高度保持一致 -->
-              <div class="product-3d-icon">
+              <!-- 产品图片 -->
+              <div class="product-image">
+                <Image
+                  v-if="item.picUrl"
+                  :src="item.picUrl"
+                  :preview="true"
+                  class="size-full rounded object-cover"
+                />
                 <IconifyIcon
-                  icon="ant-design:box-plot-outlined"
-                  class="text-2xl"
+                  v-else
+                  icon="lucide:image"
+                  class="text-2xl opacity-50"
                 />
               </div>
             </div>
@@ -180,8 +180,7 @@ onMounted(() => {
                 class="action-btn action-btn-edit"
                 @click="emit('edit', item)"
               >
-                <!-- TODO @haohao：按钮尽量用中立的按钮，方便迁移 ele；  -->
-                <IconifyIcon icon="ant-design:edit-outlined" class="mr-1" />
+                <IconifyIcon icon="lucide:edit" class="mr-1" />
                 编辑
               </Button>
               <Button
@@ -189,7 +188,7 @@ onMounted(() => {
                 class="action-btn action-btn-detail"
                 @click="emit('detail', item.id)"
               >
-                <IconifyIcon icon="ant-design:eye-outlined" class="mr-1" />
+                <IconifyIcon icon="lucide:eye" class="mr-1" />
                 详情
               </Button>
               <Button
@@ -197,23 +196,17 @@ onMounted(() => {
                 class="action-btn action-btn-model"
                 @click="emit('thingModel', item.id)"
               >
-                <IconifyIcon
-                  icon="ant-design:apartment-outlined"
-                  class="mr-1"
-                />
+                <IconifyIcon icon="lucide:git-branch" class="mr-1" />
                 物模型
               </Button>
-              <Tooltip v-if="item.status === 1" title="启用状态的产品不能删除">
+              <Tooltip v-if="item.status === 1" title="已发布的产品不能删除">
                 <Button
                   size="small"
                   danger
                   disabled
                   class="action-btn action-btn-delete !w-8"
                 >
-                  <IconifyIcon
-                    icon="ant-design:delete-outlined"
-                    class="text-sm"
-                  />
+                  <IconifyIcon icon="lucide:trash-2" class="text-sm" />
                 </Button>
               </Tooltip>
               <Popconfirm
@@ -226,10 +219,7 @@ onMounted(() => {
                   danger
                   class="action-btn action-btn-delete !w-8"
                 >
-                  <IconifyIcon
-                    icon="ant-design:delete-outlined"
-                    class="text-sm"
-                  />
+                  <IconifyIcon icon="lucide:trash-2" class="text-sm" />
                 </Button>
               </Popconfirm>
             </div>
@@ -241,8 +231,7 @@ onMounted(() => {
     </div>
 
     <!-- 分页 -->
-    <!-- TODO @haohao：放到最右侧好点 -->
-    <div v-if="list.length > 0" class="flex justify-center">
+    <div v-if="list.length > 0" class="flex justify-end">
       <Pagination
         v-model:current="queryParams.pageNo"
         v-model:page-size="queryParams.pageSize"
@@ -258,18 +247,9 @@ onMounted(() => {
 </template>
 
 <style scoped lang="scss">
-/** TODO @haohao：看看哪些可以 tindwind 掉 */
 .product-card-view {
   .product-card {
-    height: 100%;
     overflow: hidden;
-    border-radius: 8px;
-    transition: all 0.3s ease;
-
-    &:hover {
-      box-shadow: 0 4px 16px rgb(0 0 0 / 8%);
-      transform: translateY(-2px);
-    }
 
     :deep(.ant-card-body) {
       display: flex;
@@ -283,8 +263,8 @@ onMounted(() => {
       flex-shrink: 0;
       align-items: center;
       justify-content: center;
-      width: 48px;
-      height: 48px;
+      width: 36px;
+      height: 36px;
       color: white;
       background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
       border-radius: 8px;
@@ -294,9 +274,9 @@ onMounted(() => {
     .product-title {
       overflow: hidden;
       text-overflow: ellipsis;
-      font-size: 16px;
+      font-size: 15px;
       font-weight: 600;
-      line-height: 1.5;
+      line-height: 36px;
       white-space: nowrap;
     }
 
@@ -305,7 +285,7 @@ onMounted(() => {
       .info-item {
         display: flex;
         align-items: center;
-        margin-bottom: 10px;
+        margin-bottom: 8px;
         font-size: 13px;
 
         &:last-child {
@@ -338,7 +318,6 @@ onMounted(() => {
           font-size: 12px;
           vertical-align: middle;
           white-space: nowrap;
-          cursor: help;
           opacity: 0.85;
         }
 
@@ -348,18 +327,17 @@ onMounted(() => {
       }
     }
 
-    // 3D 图标
-    .product-3d-icon {
+    // 产品图片
+    .product-image {
       display: flex;
       flex-shrink: 0;
       align-items: center;
       justify-content: center;
-      width: 100px;
-      height: 100px;
+      width: 80px;
+      height: 80px;
       color: #667eea;
       background: linear-gradient(135deg, #667eea15 0%, #764ba215 100%);
       border-radius: 8px;
-      opacity: 0.8;
     }
 
     // 按钮组
@@ -420,10 +398,6 @@ onMounted(() => {
 html.dark {
   .product-card-view {
     .product-card {
-      &:hover {
-        box-shadow: 0 4px 16px rgb(0 0 0 / 30%);
-      }
-
       .product-title {
         color: rgb(255 255 255 / 85%);
       }
@@ -442,7 +416,7 @@ html.dark {
         }
       }
 
-      .product-3d-icon {
+      .product-image {
         color: #8b9cff;
         background: linear-gradient(135deg, #667eea25 0%, #764ba225 100%);
       }
diff --git a/apps/web-antd/src/views/iot/product/product/modules/components/product-table-select.vue b/apps/web-antd/src/views/iot/product/product/modules/components/product-table-select.vue
deleted file mode 100644
index db475df9b..000000000
--- a/apps/web-antd/src/views/iot/product/product/modules/components/product-table-select.vue
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- IoT 产品选择器，使用弹窗展示 -->
-<script setup lang="ts">
-// TODO @haohao：这个貌似暂时没看到，在哪里用？
-import type { IotProductApi } from '#/api/iot/product/product';
-
-import { reactive, ref } from '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';
-
-defineOptions({ name: 'IoTProductTableSelect' });
-
-const props = withDefaults(defineProps<Props>(), {
-  multiple: false,
-});
-
-const emit = defineEmits<{
-  success: [product: IotProductApi.Product | IotProductApi.Product[]];
-}>();
-
-interface Props {
-  multiple?: boolean;
-}
-
-const [Modal, modalApi] = useVbenModal({
-  title: '产品选择器',
-  // TODO @haohao：handleConfirm 直接放到这里，不用单独声明
-  onConfirm: handleConfirm,
-});
-
-const selectedProducts = ref<IotProductApi.Product[]>([]);
-const selectedRowKeys = ref<number[]>([]);
-
-// 搜索参数
-const queryParams = reactive({
-  name: '',
-  productKey: '',
-});
-// TODO @haohao：是不是 form 应该也在 Grid 里；
-
-// 配置表格
-const [Grid, gridApi] = useVbenVxeGrid({
-  gridOptions: {
-    columns: [
-      {
-        type: props.multiple ? 'checkbox' : 'radio',
-        width: 50,
-      },
-      {
-        field: 'name',
-        title: '产品名称',
-        minWidth: 150,
-      },
-      {
-        field: 'productKey',
-        title: 'ProductKey',
-        minWidth: 150,
-      },
-      {
-        field: 'categoryName',
-        title: '品类',
-        minWidth: 120,
-      },
-      {
-        field: 'deviceType',
-        title: '设备类型',
-        minWidth: 100,
-        cellRender: {
-          name: 'CellDict',
-          props: { type: 'iot_product_device_type' },
-        },
-      },
-      {
-        field: 'createTime',
-        title: '创建时间',
-        minWidth: 180,
-        formatter: 'formatDateTime',
-      },
-    ],
-    checkboxConfig: {
-      reserve: true,
-      highlight: true,
-    },
-    radioConfig: {
-      reserve: true,
-      highlight: true,
-    },
-    proxyConfig: {
-      ajax: {
-        query: async ({ page }: any) => {
-          return await getProductPage({
-            pageNo: page.currentPage,
-            pageSize: page.pageSize,
-            ...queryParams,
-          });
-        },
-      },
-    },
-  },
-});
-
-// 打开选择器
-async function open() {
-  selectedProducts.value = [];
-  selectedRowKeys.value = [];
-  modalApi.open();
-  gridApi.reload();
-}
-
-// 搜索
-function handleSearch() {
-  gridApi.reload();
-}
-
-// 重置搜索
-function handleReset() {
-  queryParams.name = '';
-  queryParams.productKey = '';
-  gridApi.reload();
-}
-
-// 确认选择
-async function handleConfirm() {
-  const grid = gridApi.grid;
-  if (!grid) {
-    return false;
-  }
-
-  if (props.multiple) {
-    const checkboxRecords = grid.getCheckboxRecords();
-    if (checkboxRecords.length === 0) {
-      message.warning('请至少选择一个产品');
-      return false;
-    }
-    emit('success', checkboxRecords);
-  } else {
-    const radioRecord = grid.getRadioRecord();
-    if (!radioRecord) {
-      message.warning('请选择一个产品');
-      return false;
-    }
-    emit('success', radioRecord);
-  }
-  return true;
-}
-
-defineExpose({ open });
-</script>
-
-<template>
-  <Modal class="!w-[900px]">
-    <div class="mb-4">
-      <Form layout="inline" :model="queryParams">
-        <Form.Item label="产品名称">
-          <Input
-            v-model:value="queryParams.name"
-            placeholder="请输入产品名称"
-            allow-clear
-            class="!w-[200px]"
-            @press-enter="handleSearch"
-          />
-        </Form.Item>
-        <Form.Item label="ProductKey">
-          <Input
-            v-model:value="queryParams.productKey"
-            placeholder="请输入产品标识"
-            allow-clear
-            class="!w-[200px]"
-            @press-enter="handleSearch"
-          />
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" @click="handleSearch">
-            <template #icon>
-              <IconifyIcon icon="ant-design:search-outlined" />
-            </template>
-            搜索
-          </Button>
-          <Button class="ml-2" @click="handleReset">
-            <template #icon>
-              <IconifyIcon icon="ant-design:reload-outlined" />
-            </template>
-            重置
-          </Button>
-        </Form.Item>
-      </Form>
-    </div>
-
-    <Grid />
-  </Modal>
-</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 f63389860..5fc1fc7bd 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,7 +1,6 @@
 <script setup lang="ts">
 import type { IotProductApi } from '#/api/iot/product/product';
 
-// TODO @haohao：detail 挪到 yudao-ui-admin-vben-v5/apps/web-antd/src/views/iot/product/product/detail 下。独立一个，不放在 modules 里。
 import { onMounted, provide, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
@@ -13,8 +12,8 @@ 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 './product-details-header.vue';
-import ProductDetailsInfo from './product-details-info.vue';
+import ProductDetailsHeader from './modules/header.vue';
+import ProductDetailsInfo from './modules/info.vue';
 
 defineOptions({ name: 'IoTProductDetail' });
 
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/product-details-header.vue b/apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue
similarity index 55%
rename from apps/web-antd/src/views/iot/product/product/modules/detail/product-details-header.vue
rename to apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue
index 2aab6af18..ef31b79de 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/product-details-header.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue
@@ -1,15 +1,18 @@
-<script setup lang="ts">
-// TODO @haohao：放到 detail/modules 里。然后名字就是 header.vue
+<script lang="ts" setup>
 import type { IotProductApi } from '#/api/iot/product/product';
 
-import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 
-import { Button, Card, Descriptions, message } from 'ant-design-vue';
+import { useVbenModal } from '@vben/common-ui';
 
-import { updateProductStatus } from '#/api/iot/product/product';
+import { Button, Card, Descriptions, message, Modal } from 'ant-design-vue';
 
-import ProductForm from '../product-form.vue';
+import {
+  ProductStatusEnum,
+  updateProductStatus,
+} from '#/api/iot/product/product';
+
+import Form from '../../form.vue';
 
 interface Props {
   product: IotProductApi.Product;
@@ -25,7 +28,11 @@ const emit = defineEmits<{
 }>();
 
 const router = useRouter();
-const formRef = ref();
+
+const [FormModal, formModalApi] = useVbenModal({
+  connectedComponent: Form,
+  destroyOnClose: true,
+});
 
 /** 复制到剪贴板 */
 async function copyToClipboard(text: string) {
@@ -46,59 +53,63 @@ function goToDeviceList(productId: number) {
 }
 
 /** 打开编辑表单 */
-function openForm(type: string, id?: number) {
-  formRef.value?.open(type, id);
+function openEditForm(row: IotProductApi.Product) {
+  formModalApi.setData(row).open();
 }
 
 /** 发布产品 */
-async function confirmPublish(id: number) {
-  // TODO @haohao：最好类似；async function handleDeleteBatch() { 的做法：1）有个 confirm；2）有个 loading
-  try {
-    await updateProductStatus(id, 1); // TODO @好好】：1 和 0，最好用枚举；
-    message.success('发布成功');
-    emit('refresh');
-  } catch {
-    message.error('发布失败');
-  }
+function handlePublish(product: IotProductApi.Product) {
+  Modal.confirm({
+    title: '确认发布',
+    content: `确认要发布产品「${product.name}」吗？`,
+    async onOk() {
+      await updateProductStatus(product.id!, ProductStatusEnum.PUBLISHED);
+      message.success('发布成功');
+      emit('refresh');
+    },
+  });
 }
 
 /** 撤销发布 */
-async function confirmUnpublish(id: number) {
-  // TODO @haohao：最好类似；async function handleDeleteBatch() { 的做法：1）有个 confirm；2）有个 loading
-  try {
-    await updateProductStatus(id, 0);
-    message.success('撤销发布成功');
-    emit('refresh');
-  } catch {
-    message.error('撤销发布失败');
-  }
+function handleUnpublish(product: IotProductApi.Product) {
+  Modal.confirm({
+    title: '确认撤销发布',
+    content: `确认要撤销发布产品「${product.name}」吗？`,
+    async onOk() {
+      await updateProductStatus(product.id!, ProductStatusEnum.UNPUBLISHED);
+      message.success('撤销发布成功');
+      emit('refresh');
+    },
+  });
 }
 </script>
 
 <template>
   <div class="mb-4">
+    <FormModal @success="emit('refresh')" />
+
     <div class="flex items-start justify-between">
       <div>
         <h2 class="text-xl font-bold">{{ product.name }}</h2>
       </div>
       <div class="space-x-2">
         <Button
-          :disabled="product.status === 1"
-          @click="openForm('update', product.id)"
+          :disabled="product.status === ProductStatusEnum.PUBLISHED"
+          @click="openEditForm(product)"
         >
           编辑
         </Button>
         <Button
-          v-if="product.status === 0"
+          v-if="product.status === ProductStatusEnum.UNPUBLISHED"
           type="primary"
-          @click="confirmPublish(product.id!)"
+          @click="handlePublish(product)"
         >
           发布
         </Button>
         <Button
-          v-if="product.status === 1"
+          v-if="product.status === ProductStatusEnum.PUBLISHED"
           danger
-          @click="confirmUnpublish(product.id!)"
+          @click="handleUnpublish(product)"
         >
           撤销发布
         </Button>
@@ -127,9 +138,5 @@ async function confirmUnpublish(id: number) {
         </Descriptions.Item>
       </Descriptions>
     </Card>
-
-    <!-- 表单弹窗 -->
-    <!-- TODO @haohao：弹不出来；另外，应该用 index.vue 里，Form 的声明方式哈。 -->
-    <ProductForm ref="formRef" @success="emit('refresh')" />
   </div>
 </template>
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/product-details-info.vue b/apps/web-antd/src/views/iot/product/product/modules/detail/modules/info.vue
similarity index 88%
rename from apps/web-antd/src/views/iot/product/product/modules/detail/product-details-info.vue
rename to apps/web-antd/src/views/iot/product/product/modules/detail/modules/info.vue
index fbbd07246..2693fff49 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/product-details-info.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/detail/modules/info.vue
@@ -1,5 +1,4 @@
-<script setup lang="ts">
-// TODO @haohao：放到 detail/modules 里。然后名字就是 info.vue
+<script lang="ts" setup>
 import type { IotProductApi } from '#/api/iot/product/product';
 
 import { DICT_TYPE } from '@vben/constants';
@@ -24,7 +23,6 @@ function formatDate(date?: Date | string) {
 
 <template>
   <Card title="产品信息">
-    <!-- TODO @haohao：看看是不是用 description 组件 -->
     <Descriptions bordered :column="3" size="small">
       <Descriptions.Item label="产品名称">
         {{ product.name }}
@@ -48,7 +46,7 @@ function formatDate(date?: Date | string) {
         {{ product.codecType || '-' }}
       </Descriptions.Item>
       <Descriptions.Item label="产品状态">
-        <DictTag :type="DICT_TYPE.COMMON_STATUS" :value="product.status" />
+        <DictTag :type="DICT_TYPE.IOT_PRODUCT_STATUS" :value="product.status" />
       </Descriptions.Item>
       <Descriptions.Item
         v-if="
diff --git a/apps/web-antd/src/views/iot/product/product/modules/form.vue b/apps/web-antd/src/views/iot/product/product/modules/form.vue
new file mode 100644
index 000000000..ca59e864b
--- /dev/null
+++ b/apps/web-antd/src/views/iot/product/product/modules/form.vue
@@ -0,0 +1,142 @@
+<script lang="ts" setup>
+import type { IotProductApi } from '#/api/iot/product/product';
+
+import { computed, ref } from 'vue';
+
+import { useVbenModal } from '@vben/common-ui';
+
+import { Collapse, message } from 'ant-design-vue';
+
+import { useVbenForm } from '#/adapter/form';
+import {
+  createProduct,
+  getProduct,
+  updateProduct,
+} from '#/api/iot/product/product';
+import { $t } from '#/locales';
+
+import {
+  generateProductKey,
+  useAdvancedFormSchema,
+  useBasicFormSchema,
+} from '../data';
+
+const emit = defineEmits(['success']);
+const formData = ref<IotProductApi.Product>();
+const activeKey = ref<string[]>([]);
+const getTitle = computed(() => {
+  return formData.value?.id
+    ? $t('ui.actionTitle.edit', ['产品'])
+    : $t('ui.actionTitle.create', ['产品']);
+});
+
+const [Form, formApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+  },
+  layout: 'horizontal',
+  schema: [],
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+const [AdvancedForm, advancedFormApi] = useVbenForm({
+  commonConfig: {
+    componentProps: { class: 'w-full' },
+  },
+  layout: 'horizontal',
+  schema: useAdvancedFormSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+/** 基础表单需要 formApi 引用，所以通过 setState 设置 schema */
+formApi.setState({ schema: useBasicFormSchema(formApi) });
+
+const [Modal, modalApi] = useVbenModal({
+  /** 提交表单 */
+  async onConfirm() {
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    modalApi.lock();
+    // 合并两个表单的值
+    const basicValues = await formApi.getValues();
+    const advancedValues = activeKey.value.includes('advanced')
+      ? await advancedFormApi.getValues()
+      : formData.value?.id
+        ? {
+            icon: formData.value.icon,
+            picUrl: formData.value.picUrl,
+            description: formData.value.description,
+          }
+        : {};
+    const data = {
+      ...basicValues,
+      ...advancedValues,
+    } as IotProductApi.Product;
+    try {
+      await (formData.value?.id ? updateProduct(data) : createProduct(data));
+      await modalApi.close();
+      emit('success');
+      message.success($t('ui.actionMessage.operationSuccess'));
+    } finally {
+      modalApi.unlock();
+    }
+  },
+  /** 弹窗打开/关闭 */
+  async onOpenChange(isOpen: boolean) {
+    if (!isOpen) {
+      formData.value = undefined;
+      activeKey.value = [];
+      return;
+    }
+    // 加载数据
+    const data = modalApi.getData<IotProductApi.Product>();
+    if (!data || !data.id) {
+      // 新增：设置默认值
+      await formApi.setValues({
+        productKey: generateProductKey(),
+        status: 0,
+      });
+      return;
+    }
+    // 编辑：加载数据
+    modalApi.lock();
+    try {
+      formData.value = await getProduct(data.id);
+      await formApi.setValues(formData.value);
+      // 设置高级表单（不等待）
+      advancedFormApi.setValues({
+        icon: formData.value.icon,
+        picUrl: formData.value.picUrl,
+        description: formData.value.description,
+      });
+      // 有高级字段时自动展开
+      if (
+        formData.value.icon ||
+        formData.value.picUrl ||
+        formData.value.description
+      ) {
+        activeKey.value = ['advanced'];
+      }
+    } finally {
+      modalApi.unlock();
+    }
+  },
+});
+</script>
+
+<template>
+  <Modal :title="getTitle" class="w-2/5">
+    <div class="mx-4">
+      <Form />
+      <Collapse v-model:active-key="activeKey" class="mt-4">
+        <Collapse.Panel key="advanced" header="更多设置">
+          <AdvancedForm />
+        </Collapse.Panel>
+      </Collapse>
+    </div>
+  </Modal>
+</template>
diff --git a/apps/web-antd/src/views/iot/product/product/modules/product-form.vue b/apps/web-antd/src/views/iot/product/product/modules/product-form.vue
deleted file mode 100644
index 48222bc93..000000000
--- a/apps/web-antd/src/views/iot/product/product/modules/product-form.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<script setup lang="ts">
-import type { IotProductApi } from '#/api/iot/product/product';
-
-import { computed, ref } from 'vue';
-
-import { useVbenForm, useVbenModal } from '@vben/common-ui';
-
-import { Collapse, message } from 'ant-design-vue';
-
-import {
-  createProduct,
-  getProduct,
-  updateProduct,
-} from '#/api/iot/product/product';
-import { $t } from '#/locales';
-
-import {
-  generateProductKey,
-  useAdvancedFormSchema,
-  useBasicFormSchema,
-} from '../data';
-
-// TODO @haohao：应该是 form.vue；
-
-defineOptions({ name: 'IoTProductForm' });
-
-const emit = defineEmits(['success']);
-
-const CollapsePanel = Collapse.Panel;
-
-const formData = ref<any>();
-const getTitle = computed(() => {
-  return formData.value?.id ? '编辑产品' : '新增产品';
-});
-const activeKey = ref<string[]>([]); // 折叠面板的激活 key，默认不展开
-
-// TODO @haohao：每一行一个；
-const [Form, formApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: 'w-full',
-    },
-  },
-  wrapperClass: 'grid-cols-2',
-  layout: 'horizontal',
-  schema: [],
-  showDefaultActions: false,
-});
-
-// TODO @haohao：每一行一个；
-const [AdvancedForm, advancedFormApi] = useVbenForm({
-  commonConfig: {
-    componentProps: {
-      class: 'w-full',
-    },
-  },
-  wrapperClass: 'grid-cols-2',
-  layout: 'horizontal',
-  schema: [],
-  showDefaultActions: false,
-});
-
-// TODO @haohao：看看是不是可以参考别的 form 模块，优化表单这块的逻辑；从 61 到 156 行。体感有点冗余、以及代码风格，不够统一；
-formApi.setState({ schema: useBasicFormSchema(formApi) });
-advancedFormApi.setState({ schema: useAdvancedFormSchema() });
-
-const [Modal, modalApi] = useVbenModal({
-  async onConfirm() {
-    // 只验证基础表单
-    const { valid: basicValid } = await formApi.validate();
-    if (!basicValid) {
-      return;
-    }
-
-    modalApi.lock();
-    try {
-      // 提交表单 - 合并两个表单的值
-      const basicValues = await formApi.getValues();
-
-      // 如果折叠面板展开，则获取高级表单的值，否则保留原有值（编辑时）或使用空值（新增时）
-      let advancedValues: any = {};
-      if (activeKey.value.includes('advanced')) {
-        advancedValues = await advancedFormApi.getValues();
-      } else if (formData.value?.id) {
-        // 编辑时保留原有的高级字段值
-        advancedValues = {
-          icon: formData.value.icon,
-          picUrl: formData.value.picUrl,
-          description: formData.value.description,
-        };
-      }
-
-      const values = {
-        ...basicValues,
-        ...advancedValues,
-      } as IotProductApi.Product;
-      const data = formData.value?.id
-        ? { ...values, id: formData.value.id }
-        : values;
-
-      await (formData.value?.id ? updateProduct(data) : createProduct(data));
-      // 关闭并提示
-      await modalApi.close();
-      emit('success');
-      message.success($t('ui.actionMessage.operationSuccess'));
-    } finally {
-      modalApi.unlock();
-    }
-  },
-  async onOpenChange(isOpen: boolean) {
-    if (!isOpen) {
-      formData.value = undefined;
-      // 重置折叠面板状态
-      activeKey.value = [];
-      return;
-    }
-    // 加载数据
-    const data = modalApi.getData<any>();
-    if (!data || !data.id) {
-      // 设置默认值
-      await formApi.setValues({
-        productKey: generateProductKey(), // 自动生成 ProductKey
-        // deviceType: 0, // 默认直连设备
-        // codecType: 'Alink', // 默认 Alink
-        // dataFormat: 1, // 默认 JSON
-        // validateType: 1, // 默认设备密钥
-        status: 0, // 默认启用
-      });
-      return;
-    }
-    try {
-      formData.value = await getProduct(data.id);
-      // 设置基础表单
-      await formApi.setValues(formData.value);
-
-      // 先设置高级表单的值（不等待）
-      advancedFormApi.setValues({
-        icon: formData.value.icon,
-        picUrl: formData.value.picUrl,
-        description: formData.value.description,
-      });
-
-      // 如果有图标、图片或描述，自动展开折叠面板以便显示
-      if (
-        formData.value.icon ||
-        formData.value.picUrl ||
-        formData.value.description
-      ) {
-        activeKey.value = ['advanced'];
-      }
-    } catch (error) {
-      console.error('加载产品数据失败:', error);
-      message.error('加载产品数据失败，请重试');
-    } finally {
-      modalApi.unlock();
-    }
-  },
-});
-</script>
-
-<template>
-  <Modal :title="getTitle" class="w-2/5">
-    <div class="mx-4">
-      <Form />
-      <Collapse v-model:active-key="activeKey" class="mt-4">
-        <CollapsePanel key="advanced" header="更多设置">
-          <AdvancedForm />
-        </CollapsePanel>
-      </Collapse>
-    </div>
-  </Modal>
-</template>