From 3744069aa22a108607ae9bb6ff41022578a3ef53 Mon Sep 17 00:00:00 2001
From: haohao <1036606149@qq.com>
Date: Mon, 15 Dec 2025 22:48:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=E3=80=90antd=E3=80=91=E3=80=90iot?=
 =?UTF-8?q?=E3=80=91=E4=BA=A7=E5=93=81=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=88=B0=20detail?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web-antd/src/router/routes/modules/iot.ts |  2 +-
 .../src/views/iot/product/product/data.ts     | 40 ++++------
 .../product/{modules => }/detail/index.vue    |  2 +-
 .../{modules => }/detail/modules/header.vue   |  2 +-
 .../{modules => }/detail/modules/info.vue     |  0
 .../iot/product/product/modules/form.vue      | 78 +++++++++----------
 6 files changed, 55 insertions(+), 69 deletions(-)
 rename apps/web-antd/src/views/iot/product/product/{modules => }/detail/index.vue (93%)
 rename apps/web-antd/src/views/iot/product/product/{modules => }/detail/modules/header.vue (98%)
 rename apps/web-antd/src/views/iot/product/product/{modules => }/detail/modules/info.vue (100%)

diff --git a/apps/web-antd/src/router/routes/modules/iot.ts b/apps/web-antd/src/router/routes/modules/iot.ts
index 3e7f87caf..1c885a4c6 100644
--- a/apps/web-antd/src/router/routes/modules/iot.ts
+++ b/apps/web-antd/src/router/routes/modules/iot.ts
@@ -19,7 +19,7 @@ const routes: RouteRecordRaw[] = [
           activePath: '/iot/device/product',
         },
         component: () =>
-          import('#/views/iot/product/product/modules/detail/index.vue'),
+          import('#/views/iot/product/product/detail/index.vue'),
       },
       {
         path: 'device/detail/:id',
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 e9e7809bf..6d21d05b2 100644
--- a/apps/web-antd/src/views/iot/product/product/data.ts
+++ b/apps/web-antd/src/views/iot/product/product/data.ts
@@ -14,18 +14,13 @@ import { getSimpleProductCategoryList } from '#/api/iot/product/category';
 
 /** 产品分类列表缓存 */
 let categoryList: IotProductCategoryApi.ProductCategory[] = [];
-
-/** 加载产品分类数据 */
-async function loadCategoryData() {
-  categoryList = await getSimpleProductCategoryList();
-}
-
-// 初始化加载分类数据
-// TODO @haohao：可以参考 /Users/yunai/Java/yudao-ui-admin-vben-v5/apps/web-antd/src/views/system/tenant/data.ts 简洁一点。
-loadCategoryData();
+getSimpleProductCategoryList().then((data) => (categoryList = data));
 
 /** 新增/修改产品的表单 */
-export function useFormSchema(formApi?: any): VbenFormSchema[] {
+export function useFormSchema(
+  formApi?: any,
+  generateProductKey?: () => string,
+): VbenFormSchema[] {
   return [
     {
       component: 'Input',
@@ -59,7 +54,9 @@ export function useFormSchema(formApi?: any): VbenFormSchema[] {
           {
             type: 'default',
             onClick: () => {
-              formApi?.setFieldValue('productKey', generateProductKey());
+              if (generateProductKey) {
+                formApi?.setFieldValue('productKey', generateProductKey());
+              }
             },
           },
           { default: () => '重新生成' },
@@ -175,7 +172,10 @@ export function useFormSchema(formApi?: any): VbenFormSchema[] {
 }
 
 /** 基础表单字段（不含图标、图片、描述） */
-export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
+export function useBasicFormSchema(
+  formApi?: any,
+  generateProductKey?: () => string,
+): VbenFormSchema[] {
   return [
     {
       component: 'Input',
@@ -208,7 +208,9 @@ export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
           {
             type: 'default',
             onClick: () => {
-              formApi?.setFieldValue('productKey', generateProductKey());
+              if (generateProductKey) {
+                formApi?.setFieldValue('productKey', generateProductKey());
+              }
             },
           },
           { default: () => '重新生成' },
@@ -299,6 +301,7 @@ export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
         buttonStyle: 'solid',
         optionType: 'button',
       },
+      defaultValue: 0,
       rules: 'required',
     },
     {
@@ -339,7 +342,6 @@ export function useAdvancedFormSchema(): VbenFormSchema[] {
         placeholder: '请输入产品描述',
         rows: 3,
       },
-      formItemClass: 'col-span-2', // 让描述占满两列
     },
   ];
 }
@@ -404,13 +406,3 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
   ];
 }
 
-/** 生成 ProductKey（包含大小写字母和数字） */
-export function generateProductKey(): string {
-  const chars =
-    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-  let result = '';
-  for (let i = 0; i < 16; i++) {
-    result += chars.charAt(Math.floor(Math.random() * chars.length));
-  }
-  return result;
-}
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue b/apps/web-antd/src/views/iot/product/product/detail/index.vue
similarity index 93%
rename from apps/web-antd/src/views/iot/product/product/modules/detail/index.vue
rename to apps/web-antd/src/views/iot/product/product/detail/index.vue
index 1769c8017..3ca0daee1 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/index.vue
+++ b/apps/web-antd/src/views/iot/product/product/detail/index.vue
@@ -28,7 +28,6 @@ const activeTab = ref('info');
 provide('product', product); // 提供产品信息给子组件
 
 /** 获取产品详情 */
-// TODO @haohao：因为 detail 是独立界面，所以不放在 modules 里，应该放在 web-antd/src/views/iot/product/product/detail/index.vue 里，更合理一些哈。
 async function getProductData(productId: number) {
   loading.value = true;
   try {
@@ -91,3 +90,4 @@ onMounted(async () => {
     </Tabs>
   </Page>
 </template>
+
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue b/apps/web-antd/src/views/iot/product/product/detail/modules/header.vue
similarity index 98%
rename from apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue
rename to apps/web-antd/src/views/iot/product/product/detail/modules/header.vue
index e298afe1d..52ae5ee85 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/detail/modules/header.vue
+++ b/apps/web-antd/src/views/iot/product/product/detail/modules/header.vue
@@ -10,7 +10,7 @@ import { Button, Card, Descriptions, message, Modal } from 'ant-design-vue';
 
 import { updateProductStatus } from '#/api/iot/product/product';
 
-import Form from '../../form.vue';
+import Form from '../../modules/form.vue';
 
 interface Props {
   product: IotProductApi.Product;
diff --git a/apps/web-antd/src/views/iot/product/product/modules/detail/modules/info.vue b/apps/web-antd/src/views/iot/product/product/detail/modules/info.vue
similarity index 100%
rename from apps/web-antd/src/views/iot/product/product/modules/detail/modules/info.vue
rename to apps/web-antd/src/views/iot/product/product/detail/modules/info.vue
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
index 1ead43b64..6f7fdb26f 100644
--- a/apps/web-antd/src/views/iot/product/product/modules/form.vue
+++ b/apps/web-antd/src/views/iot/product/product/modules/form.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { IotProductApi } from '#/api/iot/product/product';
 
-import { computed, ref } from 'vue';
+import { computed, nextTick, ref } from 'vue';
 
 import { useVbenModal } from '@vben/common-ui';
 
@@ -15,11 +15,18 @@ import {
 } from '#/api/iot/product/product';
 import { $t } from '#/locales';
 
-import {
-  generateProductKey,
-  useAdvancedFormSchema,
-  useBasicFormSchema,
-} from '../data';
+import { useAdvancedFormSchema, useBasicFormSchema } from '../data';
+
+/** 生成 ProductKey（包含大小写字母和数字） */
+function generateProductKey(): string {
+  const chars =
+    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+  let result = '';
+  for (let i = 0; i < 16; i++) {
+    result += chars.charAt(Math.floor(Math.random() * chars.length));
+  }
+  return result;
+}
 
 const emit = defineEmits(['success']);
 const formData = ref<IotProductApi.Product>();
@@ -37,10 +44,9 @@ const [Form, formApi] = useVbenForm({
   layout: 'horizontal',
   schema: [],
   showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
+  wrapperClass: 'grid-cols-1',
 });
 
-// TODO @haohao：这个要不还是一行一个？这样样式好看点哈。
 const [AdvancedForm, advancedFormApi] = useVbenForm({
   commonConfig: {
     componentProps: { class: 'w-full' },
@@ -48,12 +54,24 @@ const [AdvancedForm, advancedFormApi] = useVbenForm({
   layout: 'horizontal',
   schema: useAdvancedFormSchema(),
   showDefaultActions: false,
-  wrapperClass: 'grid-cols-2',
+  wrapperClass: 'grid-cols-1',
 });
 
 /** 基础表单需要 formApi 引用，所以通过 setState 设置 schema */
-// TODO haohao：@haohao：要不要把 generateProductKey 拿到这个 vue 里，作为参数传递到 useBasicFormSchema 里？
-formApi.setState({ schema: useBasicFormSchema(formApi) });
+formApi.setState({ schema: useBasicFormSchema(formApi, generateProductKey) });
+
+/** 获取高级表单的值（如果表单未挂载，则从 formData 中获取） */
+async function getAdvancedFormValues() {
+  if (advancedFormApi.isMounted) {
+    return await advancedFormApi.getValues();
+  }
+  // 表单未挂载（折叠状态），从 formData 中获取
+  return {
+    icon: formData.value?.icon,
+    picUrl: formData.value?.picUrl,
+    description: formData.value?.description,
+  };
+}
 
 const [Modal, modalApi] = useVbenModal({
   async onConfirm() {
@@ -62,18 +80,9 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
-    // 合并两个表单的值
+    // 合并两个表单的值（字段不冲突，可直接合并）
     const basicValues = await formApi.getValues();
-    // TODO @haohao：有 linter 修复下；“formData.value?.id”；另外，这里直接两个表单合并，是不是就可以了呀？因为 2 个 schema 本身不同，字段就不同，不会冲突。
-    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 advancedValues = await getAdvancedFormValues();
     const data = {
       ...basicValues,
       ...advancedValues,
@@ -96,12 +105,9 @@ const [Modal, modalApi] = useVbenModal({
     // 加载数据
     const data = modalApi.getData<IotProductApi.Product>();
     if (!data || !data.id) {
-      // 新增：设置默认值
-      // TODO @AI：
+      // 新增：设置默认值（status 通过 schema 中的 defaultValue 自动设置为 0）
       await formApi.setValues({
-        // TODO @haohao：要不要把 generateProductKey 拿到这个 vue 里，作为参数传递到 useBasicFormSchema 里？
         productKey: generateProductKey(),
-        status: 0, // TODO @haohao：通过 defaultValue 即可；
       });
       return;
     }
@@ -110,22 +116,10 @@ const [Modal, modalApi] = useVbenModal({
     try {
       formData.value = await getProduct(data.id);
       await formApi.setValues(formData.value);
-      // 设置高级表单（不等待）
-      // TODO @haohao：直接把 formData 传过去？没关系的哈。因为会 filter 掉不存在的值，可以试试哈。
-      // TODO @haohao：这里是不是要 await 下呀？有黄色的告警；
-      advancedFormApi.setValues({
-        icon: formData.value.icon,
-        picUrl: formData.value.picUrl,
-        description: formData.value.description,
-      });
-      // 有高级字段时自动展开
-      // TODO @haohao：默认不用展开哈。
-      if (
-        formData.value.icon ||
-        formData.value.picUrl ||
-        formData.value.description
-      ) {
-        activeKey.value = ['advanced'];
+      // 设置高级表单（如果已挂载）
+      await nextTick();
+      if (advancedFormApi.isMounted) {
+        await advancedFormApi.setValues(formData.value);
       }
     } finally {
       modalApi.unlock();