bug 修改

src/utils/excel.ts

@@ -21,8 +21,8 @@ export function chatatABC(n: number) {
 }
 
 export function getRangetxt(row0: number, row1: number, column0: number, column1: number) {
-  if (row0 == '' && row1 == '' && column0 == '' && column1 == '') {
-    return ''
+  if (row0 == 0 && row1 == 0 && column0 == 0 && column1 == 0) {
+    return 'A1'
   }
   if (row0 == null && row1 == null) {
     return chatatABC(column0) + ':' + chatatABC(column1)
@@ -92,7 +92,10 @@ export function handleRangeTitle(range: any) {
       isVertical ? (title.row = +beginRow + c) : (title.colum = +beginColum + c)
       // 如果获取值报错，那么断定单元格值为空，直接取上一个单元格的值
       try {
-        title.title = (cell.v || cell?.ct?.s.map((itm) => itm.v).join('')).replaceAll(/(\s+)/g, '')
+        title.title = (cell.m || cell.v || cell?.ct?.s.map((itm) => itm.v).join('')).replaceAll(
+          /(\s+)/g,
+          ''
+        )
         // 如果有值那么直接进入下一列或者下一行
         if (title.title) {
           // 如果有合并单元格，直接跳过合并的单元格
@@ -112,7 +115,7 @@ export function handleRangeTitle(range: any) {
 }
 
 export function handleRangeCell(range: any) {
-  // console.log(luckysheet.getRangeValue(), 'range-----')
+  console.log(luckysheet.getRangeValue(), 'range-----')
   // return
   const { beginRow, beginColum, endRow, sheetNum, endColum, columnLen, rowLen } =
     getRangeState(range)
@@ -132,7 +135,10 @@ export function handleRangeCell(range: any) {
       const cell = range[r][c]
 
       try {
-        t.title = (cell.v || cell?.ct?.s?.map((itm) => itm.v).join('')).replaceAll(/(\s+)/g, '')
+        t.title = (cell.m || cell.v || cell?.ct?.s?.map((itm) => itm.v)?.join('')).replaceAll(
+          /(\s+)/g,
+          ''
+        )
         // 如果有合并单元格，直接跳过合并的单元格
         if (cell?.mc?.rs > 1) {
           Array.from({ length: cell.mc.rs - 1 }, (_, i) => {
@@ -146,10 +152,11 @@ export function handleRangeCell(range: any) {
         }
         titles.push(t)
       } catch (e) {
-        console.log(r, c, t, e, 'error')
+        console.log(r, c, t, e, cell, 'error')
       }
     }
   }
+  console.log('----titles', titles)
   return titles
 }
 /**