From 0e3ebbd2b8b314057a01c6d9b30682d2c07d0fb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E6=B5=A9=E6=B5=A9?= <1036606149@qq.com>
Date: Tue, 24 Sep 2024 23:18:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E3=80=91=20IOT=20=E4=BA=A7=E5=93=81=E7=AE=A1=E7=90=86=EF=BC=8C?=
 =?UTF-8?q?Topic=20=E7=B1=BB=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/product/detail/ProductTopic.vue | 413 +++++++++---------
 src/views/iot/product/detail/index.vue        |   3 +-
 2 files changed, 215 insertions(+), 201 deletions(-)

diff --git a/src/views/iot/product/detail/ProductTopic.vue b/src/views/iot/product/detail/ProductTopic.vue
index 071a5236..79ca2808 100644
--- a/src/views/iot/product/detail/ProductTopic.vue
+++ b/src/views/iot/product/detail/ProductTopic.vue
@@ -2,10 +2,24 @@
   <ContentWrap>
     <el-tabs>
       <el-tab-pane label="基础通信 Topic">
-        <Table :columns="columns1" :data="data1" :span-method="objectSpanMethod" />
+        <Table
+          :columns="columns1"
+          :data="data1"
+          :span-method="createSpanMethod(data1)"
+          align="left"
+          headerAlign="left"
+          border="true"
+        />
       </el-tab-pane>
       <el-tab-pane label="物模型通信 Topic">
-        <Table :columns="columns2" :data="data2" :span-method="objectSpanMethod" />
+        <Table
+          :columns="columns2"
+          :data="data2"
+          :span-method="createSpanMethod(data2)"
+          align="left"
+          headerAlign="left"
+          border="true"
+        />
       </el-tab-pane>
     </el-tabs>
   </ContentWrap>
@@ -13,215 +27,214 @@
 <script setup lang="ts">
 import { ProductVO } from '@/api/iot/product'
 
-const { product } = defineProps<{ product: ProductVO }>()
+const props = defineProps<{ product: ProductVO }>()
+
 // 定义列
 const columns1 = reactive([
-  {
-    label: '功能',
-    field: 'function',
-    width: 150
-  },
-  {
-    label: 'Topic 类',
-    field: 'topicClass',
-    width: 500
-  },
-  {
-    label: '操作权限',
-    field: 'operationPermission',
-    width: 100
-  },
-  {
-    label: '描述',
-    field: 'description'
-  }
+  { label: '功能', field: 'function', width: 150 },
+  { label: 'Topic 类', field: 'topicClass', width: 800 },
+  { label: '操作权限', field: 'operationPermission', width: 100 },
+  { label: '描述', field: 'description' }
 ])
 
 const columns2 = reactive([
-  {
-    label: '功能',
-    field: 'function',
-    width: 150
-  },
-  {
-    label: 'Topic 类',
-    field: 'topicClass',
-    width: 500
-  },
-  {
-    label: '操作权限',
-    field: 'operationPermission',
-    width: 150
-  },
-  {
-    label: '描述',
-    field: 'description'
-  }
+  { label: '功能', field: 'function', width: 150 },
+  { label: 'Topic 类', field: 'topicClass', width: 800 },
+  { label: '操作权限', field: 'operationPermission', width: 100 },
+  { label: '描述', field: 'description' }
 ])
 
-// 定义数据
-const data1 = reactive([
-  {
-    function: 'OTA 升级',
-    topicClass: '/ota/device/inform/' + product.productKey + '/${deviceName}',
-    operationPermission: '发布',
-    description: '设备上报固件升级信息'
-  },
-  {
-    function: 'OTA 升级',
-    topicClass: '/ota/device/upgrade/' + product.productKey + '/${deviceName}',
-    operationPermission: '订阅',
-    description: '固件升级信息下行'
-  },
-  {
-    function: 'OTA 升级',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/ota/firmware/get',
-    operationPermission: '发布',
-    description: '设备上报固件升级进度'
-  },
-  {
-    function: 'OTA 升级',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/ota/firmware/get',
-    operationPermission: '发布',
-    description: '设备主动拉取固件升级信息'
-  },
-  {
-    function: '设备标签',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/deviceinfo/update',
-    operationPermission: '发布',
-    description: '设备上报标签数据'
-  },
-  {
-    function: '设备标签',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/deviceinfo/update_reply',
-    operationPermission: '订阅',
-    description: '云端响应标签上报'
-  },
-  {
-    function: '设备标签',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/deviceinfo/delete',
-    operationPermission: '订阅',
-    description: '设备删除标签信息'
-  },
-  {
-    function: '设备标签',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/deviceinfo/delete_reply',
-    operationPermission: '订阅',
-    description: '云端响应标签删除'
-  },
-  {
-    function: '时钟同步',
-    topicClass: '/ext/ntp/' + product.productKey + '/${deviceName}/request',
-    operationPermission: '发布',
-    description: 'NTP 时钟同步请求'
-  },
-  {
-    function: '时钟同步',
-    topicClass: '/ext/ntp/' + product.productKey + '/${deviceName}/response',
-    operationPermission: '订阅',
-    description: 'NTP 时钟同步响应'
-  },
-  {
-    function: '设备影子',
-    topicClass: '/shadow/update/' + product.productKey + '/${deviceName}',
-    operationPermission: '发布',
-    description: '设备影子发布'
-  },
-  {
-    function: '设备影子',
-    topicClass: '/shadow/get/' + product.productKey + '/${deviceName}',
-    operationPermission: '订阅',
-    description: '设备接收影子变更'
-  },
-  {
-    function: '配置更新',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/config/push',
-    operationPermission: '订阅',
-    description: '云端主动下推配置信息'
-  },
-  {
-    function: '配置更新',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/config/get',
-    operationPermission: '发布',
-    description: '设备端查询配置信息'
-  },
-  {
-    function: '配置更新',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/config/get_reply',
-    operationPermission: '订阅',
-    description: '云端响应配置信息'
-  },
-  {
-    function: '广播',
-    topicClass: '/broadcast/' + product.productKey + '/${identifier}',
-    operationPermission: '订阅',
-    description: '广播 Topic，identifier 为用户自定义字符串'
-  }
-])
+const data1 = computed(() => {
+  if (!props.product || !props.product.productKey) return []
+  return [
+    {
+      function: 'OTA 升级',
+      topicClass: `/ota/device/inform/${props.product.productKey}/\${deviceName}`,
+      operationPermission: '发布',
+      description: '设备上报固件升级信息'
+    },
+    {
+      function: 'OTA 升级',
+      topicClass: `/ota/device/upgrade/${props.product.productKey}/\${deviceName}`,
+      operationPermission: '订阅',
+      description: '固件升级信息下行'
+    },
+    {
+      function: 'OTA 升级',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/ota/firmware/get`,
+      operationPermission: '发布',
+      description: '设备上报固件升级进度'
+    },
+    {
+      function: 'OTA 升级',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/ota/firmware/get`,
+      operationPermission: '发布',
+      description: '设备主动拉取固件升级信息'
+    },
+    {
+      function: '设备标签',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/deviceinfo/update`,
+      operationPermission: '发布',
+      description: '设备上报标签数据'
+    },
+    {
+      function: '设备标签',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/deviceinfo/update_reply`,
+      operationPermission: '订阅',
+      description: '云端响应标签上报'
+    },
+    {
+      function: '设备标签',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/deviceinfo/delete`,
+      operationPermission: '订阅',
+      description: '设备删除标签信息'
+    },
+    {
+      function: '设备标签',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/deviceinfo/delete_reply`,
+      operationPermission: '订阅',
+      description: '云端响应标签删除'
+    },
+    {
+      function: '时钟同步',
+      topicClass: `/ext/ntp/${props.product.productKey}/\${deviceName}/request`,
+      operationPermission: '发布',
+      description: 'NTP 时钟同步请求'
+    },
+    {
+      function: '时钟同步',
+      topicClass: `/ext/ntp/${props.product.productKey}/\${deviceName}/response`,
+      operationPermission: '订阅',
+      description: 'NTP 时钟同步响应'
+    },
+    {
+      function: '设备影子',
+      topicClass: `/shadow/update/${props.product.productKey}/\${deviceName}`,
+      operationPermission: '发布',
+      description: '设备影子发布'
+    },
+    {
+      function: '设备影子',
+      topicClass: `/shadow/get/${props.product.productKey}/\${deviceName}`,
+      operationPermission: '订阅',
+      description: '设备接收影子变更'
+    },
+    {
+      function: '配置更新',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/config/push`,
+      operationPermission: '订阅',
+      description: '云端主动下推配置信息'
+    },
+    {
+      function: '配置更新',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/config/get`,
+      operationPermission: '发布',
+      description: '设备端查询配置信息'
+    },
+    {
+      function: '配置更新',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/config/get_reply`,
+      operationPermission: '订阅',
+      description: '云端响应配置信息'
+    },
+    {
+      function: '广播',
+      topicClass: `/broadcast/${props.product.productKey}/\${identifier}`,
+      operationPermission: '订阅',
+      description: '广播 Topic，identifier 为用户自定义字符串'
+    }
+  ]
+})
 
-const data2 = reactive([
-  {
-    function: '属性上报',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/event/property/post',
-    operationPermission: '发布',
-    description: '设备属性上报'
-  },
-  {
-    function: '属性上报',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/event/property/post_reply',
-    operationPermission: '订阅',
-    description: '云端响应属性上报'
-  },
-  {
-    function: '属性设置',
-    topicClass: '/sys/' + product.productKey + '/${deviceName}/thing/service/property/set',
-    operationPermission: '订阅',
-    description: '设备属性设置'
-  },
-  {
-    function: '事件上报',
-    topicClass:
-      '/sys/' + product.productKey + '/${deviceName}/thing/event/${tsl.event.identifier}/post',
-    operationPermission: '发布',
-    description: '设备事件上报'
-  },
-  {
-    function: '事件上报',
-    topicClass:
-      '/sys/' +
-      product.productKey +
-      '/${deviceName}/thing/event/${tsl.event.identifier}/post_reply',
-    operationPermission: '订阅',
-    description: '云端响应事件上报'
-  },
-  {
-    function: '服务调用',
-    topicClass:
-      '/sys/' + product.productKey + '/${deviceName}/thing/service/${tsl.service.identifier}',
-    operationPermission: '订阅',
-    description: '设备服务调用'
-  },
-  {
-    function: '服务调用',
-    topicClass:
-      '/sys/' + product.productKey + '/${deviceName}/thing/service/${tsl.service.identifier}_reply',
-    operationPermission: '发布',
-    description: '设备端响应服务调用'
-  }
-])
+const data2 = computed(() => {
+  if (!props.product || !props.product.productKey) return []
+  return [
+    {
+      function: '属性上报',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/event/property/post`,
+      operationPermission: '发布',
+      description: '设备属性上报'
+    },
+    {
+      function: '属性上报',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/event/property/post_reply`,
+      operationPermission: '订阅',
+      description: '云端响应属性上报'
+    },
+    {
+      function: '属性设置',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/service/property/set`,
+      operationPermission: '订阅',
+      description: '设备属性设置'
+    },
+    {
+      function: '事件上报',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/event/\${tsl.event.identifier}/post`,
+      operationPermission: '发布',
+      description: '设备事件上报'
+    },
+    {
+      function: '事件上报',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/event/\${tsl.event.identifier}/post_reply`,
+      operationPermission: '订阅',
+      description: '云端响应事件上报'
+    },
+    {
+      function: '服务调用',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/service/\${tsl.service.identifier}`,
+      operationPermission: '订阅',
+      description: '设备服务调用'
+    },
+    {
+      function: '服务调用',
+      topicClass: `/sys/${props.product.productKey}/\${deviceName}/thing/service/\${tsl.service.identifier}_reply`,
+      operationPermission: '发布',
+      description: '设备端响应服务调用'
+    }
+  ]
+})
 
-// 合并单元格
-const objectSpanMethod = ({ row, column, rowIndex, columnIndex }: SpanMethodProps) => {
-  if (columnIndex === 0 || columnIndex === 2) {
-    if (rowIndex % 2 === 0) {
-      return {
-        rowspan: 2,
-        colspan: 1
+// 通用的单元格合并方法生成器
+const createSpanMethod = (data: any[]) => {
+  // 预处理，计算每个功能的合并行数
+  const rowspanMap: Record<number, number> = {}
+  let currentFunction = ''
+  let startIndex = 0
+  let count = 0
+
+  data.forEach((item, index) => {
+    if (item.function !== currentFunction) {
+      if (count > 0) {
+        rowspanMap[startIndex] = count
       }
+      currentFunction = item.function
+      startIndex = index
+      count = 1
     } else {
-      return {
-        rowspan: 0,
-        colspan: 0
+      count++
+    }
+  })
+
+  // 处理最后一组
+  if (count > 0) {
+    rowspanMap[startIndex] = count
+  }
+
+  // 返回 span 方法
+  return ({ row, column, rowIndex, columnIndex }: SpanMethodProps) => {
+    if (columnIndex === 0) {
+      // 仅对“功能”列进行合并
+      const rowspan = rowspanMap[rowIndex] || 0
+      if (rowspan > 0) {
+        return {
+          rowspan,
+          colspan: 1
+        }
+      } else {
+        return {
+          rowspan: 0,
+          colspan: 0
+        }
       }
     }
   }
diff --git a/src/views/iot/product/detail/index.vue b/src/views/iot/product/detail/index.vue
index 6510ff3f..6ff97bb8 100644
--- a/src/views/iot/product/detail/index.vue
+++ b/src/views/iot/product/detail/index.vue
@@ -18,9 +18,10 @@
 </template>
 <script lang="ts" setup>
 import { ProductApi, ProductVO } from '@/api/iot/product'
+import { DeviceApi } from '@/api/iot/device'
 import ProductDetailsHeader from '@/views/iot/product/detail/ProductDetailsHeader.vue'
 import ProductDetailsInfo from '@/views/iot/product/detail/ProductDetailsInfo.vue'
-import { DeviceApi } from '@/api/iot/device'
+import ProductTopic from '@/views/iot/product/detail/ProductTopic.vue'
 
 defineOptions({ name: 'IoTProductDetail' })