feat: merge remote dev branch changes

Merge IoT-related updates and improvements from remote dev branch

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

apps/web-antd/src/api/iot/ota/task/record/index.ts

@@ -95,7 +95,7 @@ export function getOtaTaskRecordStatusStatistics(
   taskId?: number,
 ) {
   return requestClient.get<Record<string, number>>(
-    '/iot/ota/task/record/status-statistics',
+    '/iot/ota/task/record/get-status-statistics',
     { params: { firmwareId, taskId } },
   );
 }

apps/web-antd/src/router/routes/modules/iot.ts

@@ -18,8 +18,7 @@ const routes: RouteRecordRaw[] = [
           title: '产品详情',
           activePath: '/iot/device/product',
         },
-        component: () =>
+        component: () => import('#/views/iot/product/product/modules/detail/index.vue'),
-          import('#/views/iot/product/product/modules/detail/index.vue'),
       },
       {
         path: 'device/detail/:id',
@@ -28,11 +27,20 @@ const routes: RouteRecordRaw[] = [
           title: '设备详情',
           activePath: '/iot/device/device',
         },
-        component: () =>
+        component: () => import('#/views/iot/device/device/modules/detail/index.vue'),
-          import('#/views/iot/device/device/modules/detail/index.vue'),
+      },
+      {
+        path: 'ota/firmware/detail/:id',
+        name: 'IoTOtaFirmwareDetail',
+        meta: {
+          title: '固件详情',
+          activePath: '/iot/ota',
+        },
+        component: () => import('#/views/iot/ota/modules/firmware-detail/index.vue'),
       },
     ],
   },
 ];
 
 export default routes;
+

apps/web-antd/src/views/iot/alert/config/data.ts

@@ -76,7 +76,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '接收的用户',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleUserList,
+        api: () => getSimpleUserList(),
         labelField: 'nickname',
         valueField: 'id',
         mode: 'multiple',

apps/web-antd/src/views/iot/alert/record/data.ts

@@ -17,7 +17,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '告警配置',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleAlertConfigList,
+        api: () => getSimpleAlertConfigList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择告警配置',
@@ -40,7 +40,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',
@@ -53,7 +53,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '设备',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleDeviceList,
+        api: () => getSimpleDeviceList(),
         labelField: 'deviceName',
         valueField: 'id',
         placeholder: '请选择设备',

apps/web-antd/src/views/iot/device/device/data.ts

@@ -28,7 +28,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',
@@ -89,7 +89,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '设备分组',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleDeviceGroupList,
+        api: () => getSimpleDeviceGroupList(),
         labelField: 'name',
         valueField: 'id',
         mode: 'multiple',
@@ -156,7 +156,7 @@ export function useGroupFormSchema(): VbenFormSchema[] {
       label: '设备分组',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleDeviceGroupList,
+        api: () => getSimpleDeviceGroupList(),
         labelField: 'name',
         valueField: 'id',
         mode: 'multiple',
@@ -199,7 +199,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',
@@ -249,7 +249,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '设备分组',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleDeviceGroupList,
+        api: () => getSimpleDeviceGroupList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择设备分组',

apps/web-antd/src/views/iot/device/device/index.vue

@@ -481,6 +481,10 @@ onMounted(async () => {
 </template>
 
 <style scoped>
+:deep(.vxe-toolbar div) {
+  z-index: 1;
+}
+
 /* 隐藏 VxeGrid 自带的搜索表单区域 */
 :deep(.vxe-grid--form-wrapper) {
   display: none !important;

apps/web-antd/src/views/iot/device/device/modules/DeviceImportForm.vue

@@ -7,7 +7,6 @@ import { downloadFileFromBlobPart } from '@vben/utils';
 import { message } from 'ant-design-vue';
 
 import { importDeviceTemplate } from '#/api/iot/device/device';
-import { $t } from '#/locales';
 
 import { useImportFormSchema } from '../data';
 
@@ -65,7 +64,7 @@ const [Modal, modalApi] = useVbenModal({
       const result = await response.json();
 
       if (result.code !== 0) {
-        message.error(result.msg || $t('ui.actionMessage.operationFailed'));
+        message.error(result.msg || '导入失败');
         return;
       }
 
@@ -95,7 +94,7 @@ const [Modal, modalApi] = useVbenModal({
       await modalApi.close();
       emit('success');
     } catch (error: any) {
-      message.error(error.message || $t('ui.actionMessage.operationFailed'));
+      message.error(error.message || '导入失败');
     } finally {
       modalApi.unlock();
     }

apps/web-antd/src/views/iot/device/group/data.ts

@@ -34,7 +34,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '父级分组',
       component: 'ApiTreeSelect',
       componentProps: {
-        api: getSimpleDeviceGroupList,
+        api: () => getSimpleDeviceGroupList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择父级分组',

apps/web-antd/src/views/iot/ota/data.ts

@@ -29,7 +29,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '所属产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',
@@ -85,7 +85,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',

apps/web-antd/src/views/iot/ota/firmware/data.ts

@@ -29,7 +29,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '所属产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',
@@ -86,7 +86,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',

apps/web-antd/src/views/iot/ota/firmware/index.vue

@@ -4,6 +4,7 @@ import type { IoTOtaFirmwareApi } from '#/api/iot/ota/firmware';
 
 import { Page, useVbenModal } from '@vben/common-ui';
 import { IconifyIcon } from '@vben/icons';
+import { useRouter } from 'vue-router';
 
 import { message } from 'ant-design-vue';
 
@@ -16,6 +17,8 @@ import { useGridColumns, useGridFormSchema } from './data';
 
 defineOptions({ name: 'IoTOtaFirmware' });
 
+const { push } = useRouter();
+
 const [FormModal, formModalApi] = useVbenModal({
   connectedComponent: Form,
   destroyOnClose: true,
@@ -36,10 +39,6 @@ function handleEdit(row: IoTOtaFirmwareApi.Firmware) {
   formModalApi.setData({ type: 'update', id: row.id }).open();
 }
 
-/** 查看固件详情 */
-function handleDetail(row: IoTOtaFirmwareApi.Firmware) {
-  formModalApi.setData({ type: 'view', id: row.id }).open();
-}
 
 /** 删除固件 */
 async function handleDelete(row: IoTOtaFirmwareApi.Firmware) {
@@ -58,6 +57,11 @@ async function handleDelete(row: IoTOtaFirmwareApi.Firmware) {
   }
 }
 
+/** 查看固件详情 */
+function handleDetail(row: IoTOtaFirmwareApi.Firmware) {
+  push({ name: 'IoTOtaFirmwareDetail', params: { id: row.id } });
+}
+
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
@@ -113,18 +117,19 @@ const [Grid, gridApi] = useVbenVxeGrid({
 
       <!-- 固件文件列 -->
       <template #fileUrl="{ row }">
-        <a
+  <div v-if="row.fileUrl" class="inline-flex items-center gap-1.5 align-middle leading-none">
-          v-if="row.fileUrl"
+    <IconifyIcon icon="ant-design:download-outlined" class="shrink-0 text-base align-middle text-primary" />
-          :href="row.fileUrl"
+    <a
-          target="_blank"
+      :href="row.fileUrl"
-          download
+      target="_blank"
-          class="text-primary cursor-pointer hover:underline"
+      download
-        >
+      class="text-primary cursor-pointer hover:underline align-middle"
-          <IconifyIcon icon="ant-design:download-outlined" class="mr-1" />
+    >
-          下载固件
+      下载固件
-        </a>
+    </a>
-        <span v-else class="text-gray-400">无文件</span>
+  </div>
-      </template>
+  <span v-else class="text-gray-400">无文件</span>
+</template>
 
       <!-- 操作列 -->
       <template #actions="{ row }">

apps/web-antd/src/views/iot/ota/modules/detail/index.vue

@@ -59,8 +59,8 @@ onMounted(() => {
 <template>
   <div class="p-4">
     <!-- 固件信息 -->
-    <Card title="固件信息" class="mb-5" :loading="firmwareLoading">
+    <Card title="固件信息" class="mb-3" :loading="firmwareLoading">
-      <Descriptions :column="3" bordered>
+      <Descriptions :column="3" bordered size="small">
         <Descriptions.Item label="固件名称">
           {{ firmware?.name }}
         </Descriptions.Item>
@@ -86,15 +86,15 @@ onMounted(() => {
     <!-- 升级设备统计 -->
     <Card
       title="升级设备统计"
-      class="mb-5"
+      class="mb-3"
       :loading="firmwareStatisticsLoading"
     >
-      <Row :gutter="20" class="py-5">
+      <Row :gutter="20" class="py-3">
         <Col :span="6">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-blue-500">
+            <div class="mb-1 text-3xl font-bold text-blue-500">
               {{
                 Object.values(firmwareStatistics).reduce(
                   (sum: number, count) => sum + (count || 0),
@@ -107,9 +107,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-gray-400">
+            <div class="mb-1 text-3xl font-bold text-gray-400">
               {{
                 firmwareStatistics[IoTOtaTaskRecordStatusEnum.PENDING.value] ||
                 0
@@ -120,9 +120,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-blue-400">
+            <div class="mb-1 text-3xl font-bold text-blue-400">
               {{
                 firmwareStatistics[IoTOtaTaskRecordStatusEnum.PUSHED.value] || 0
               }}
@@ -132,9 +132,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-yellow-500">
+            <div class="mb-1 text-3xl font-bold text-yellow-500">
               {{
                 firmwareStatistics[
                   IoTOtaTaskRecordStatusEnum.UPGRADING.value
@@ -146,9 +146,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-green-500">
+            <div class="mb-1 text-3xl font-bold text-green-500">
               {{
                 firmwareStatistics[IoTOtaTaskRecordStatusEnum.SUCCESS.value] ||
                 0
@@ -159,9 +159,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-red-500">
+            <div class="mb-1 text-3xl font-bold text-red-500">
               {{
                 firmwareStatistics[IoTOtaTaskRecordStatusEnum.FAILURE.value] ||
                 0
@@ -172,9 +172,9 @@ onMounted(() => {
         </Col>
         <Col :span="3">
           <div
-            class="rounded border border-solid border-gray-200 bg-gray-50 p-5 text-center"
+            class="rounded border border-solid border-gray-200 bg-gray-50 p-3 text-center"
           >
-            <div class="mb-2 text-3xl font-bold text-gray-400">
+            <div class="mb-1 text-3xl font-bold text-gray-400">
               {{
                 firmwareStatistics[IoTOtaTaskRecordStatusEnum.CANCELED.value] ||
                 0

apps/web-antd/src/views/iot/product/category/data.ts

@@ -34,7 +34,7 @@ export function useFormSchema(): VbenFormSchema[] {
       label: '父级分类',
       component: 'ApiTreeSelect',
       componentProps: {
-        api: getSimpleProductCategoryList,
+        api: () => getSimpleProductCategoryList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择父级分类',

apps/web-antd/src/views/iot/product/product/data.ts

@@ -93,7 +93,7 @@ export function useFormSchema(formApi?: any): VbenFormSchema[] {
       label: '产品分类',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductCategoryList,
+        api: () => getSimpleProductCategoryList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品分类',
@@ -246,7 +246,7 @@ export function useBasicFormSchema(formApi?: any): VbenFormSchema[] {
       label: '产品分类',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductCategoryList,
+        api: () => getSimpleProductCategoryList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品分类',

apps/web-antd/src/views/iot/product/product/index.vue

@@ -333,6 +333,10 @@ onMounted(() => {
   </Page>
 </template>
 <style scoped>
+:deep(.vxe-toolbar div) {
+  z-index: 1;
+}
+
 /* 隐藏 VxeGrid 自带的搜索表单区域 */
 :deep(.vxe-grid--form-wrapper) {
   display: none !important;

apps/web-antd/src/views/iot/rule/data/data.ts

@@ -24,7 +24,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
       label: '产品',
       component: 'ApiSelect',
       componentProps: {
-        api: getSimpleProductList,
+        api: () => getSimpleProductList(),
         labelField: 'name',
         valueField: 'id',
         placeholder: '请选择产品',