修改解析结果数据格式处理

src/views/comment-excel/components/ExcelOperate/ExcelOperate.vue

@@ -607,11 +607,11 @@ const setSheetAreaMark = (sheet: any) => {
         })
       }
       // 设置数据说明区
-      item.dataTitles.forEach((itm) => {
+      item.dataTitles?.forEach((itm) => {
         setRangeBackground(itm, areaMarksColor['caption'], false)
       })
       // 设置排除区
-      item.excludeTitles.forEach((itm) => {
+      item.excludeTitles?.forEach((itm) => {
         setRangeBackground(itm, areaMarksColor['exclude'], false)
       })
     })
@@ -639,22 +639,13 @@ const toRun = async () => {
 
     if (!data.result.length) return
 
-    data.result.forEach((item) => {
-      for (const key in item) {
-        if (typeof item[key] == 'object' && key != 'expendData') {
-          if (!Reflect.has(item, 'expendData')) {
-            item.expendData = {}
-          }
-          item.expendData[key] = item[key]
-          delete item[key]
-        }
-      }
+    const tableData: any[] = []
+    data.result.forEach((item: any) => {
+      tableData.push(filterTableData(item))
     })
 
-    console.log('data.result', data.result)
-
-    runResultData.value = data.result
-    runResultTitle.value = filterRunDataTitle(data.result).filter((field) => {
+    runResultData.value = tableData
+    runResultTitle.value = filterRunDataTitle(tableData).filter((field) => {
       return field != 'sortNum' && field != '数据区' && field != 'expendData'
     })
     // const idx = runResultTitle.value.findIndex((v) => v == 'sortNum')
@@ -668,6 +659,26 @@ const toRun = async () => {
     })
   }
 }
+
+const filterTableData = (row: any) => {
+  const res: Recordable = {}
+  row.order.forEach((itm) => {
+    res[itm.title] = itm.value
+  })
+  // 是否有附加信息
+  if (row?.groups?.length) {
+    res['expendData'] = {}
+    row.groups.forEach((itm) => {
+      res['expendData'][itm.title] = {}
+      itm.item.forEach((v) => {
+        res['expendData'][itm.title][v.title] = v.value
+      })
+    })
+  }
+
+  return res
+}
+
 const filterRunDataTitle = (data: any) => {
   const titles = []
   for (const row of data) {