Commit fef2bbad authored by 何远江's avatar 何远江

修改纵向标题bug

parent b6e296d7
...@@ -57,17 +57,13 @@ export function handleRangeTitle(range: any, dataArea: Recordable) { ...@@ -57,17 +57,13 @@ export function handleRangeTitle(range: any, dataArea: Recordable) {
const titles: Recordable[] = [] const titles: Recordable[] = []
let isVertical = false let isVertical = false
console.log('handleRangeTitle', range, dataArea)
// 只有一行,只能横向 // 只有一行,只能横向
if (rowLen == 1) { if (rowLen == 1) {
isVertical = false isVertical = false
} else if (rowLen - 1 === endRow - beginRow && columnLen - 1 !== endColum - beginColum) { } else if (rowLen - 1 === endRow - beginRow && (columnLen - 1 !== endColum - beginColum || columnLen == 1)) {
isVertical = true isVertical = true
} }
console.log('isVertical', isVertical, rowLen, columnLen, dataArea)
/** /**
* 取最后一个单元格的坐标,值为最后一个单元格,如果当前单元格没有值,继承前一个单元格值 * 取最后一个单元格的坐标,值为最后一个单元格,如果当前单元格没有值,继承前一个单元格值
* *
...@@ -84,7 +80,6 @@ export function handleRangeTitle(range: any, dataArea: Recordable) { ...@@ -84,7 +80,6 @@ export function handleRangeTitle(range: any, dataArea: Recordable) {
} }
for (let r = 0; r < (isVertical ? columnLen : rowLen); r++) { for (let r = 0; r < (isVertical ? columnLen : rowLen); r++) {
const cell = isVertical ? range[c][r] : range[r][c] const cell = isVertical ? range[c][r] : range[r][c]
console.log('cell', cell, r,c)
let v = '' let v = ''
// 如果获取值报错,那么断定单元格值为空,直接取上一个单元格的值 // 如果获取值报错,那么断定单元格值为空,直接取上一个单元格的值
try { try {
...@@ -96,13 +91,11 @@ export function handleRangeTitle(range: any, dataArea: Recordable) { ...@@ -96,13 +91,11 @@ export function handleRangeTitle(range: any, dataArea: Recordable) {
if (cell?.mc) { if (cell?.mc) {
r += isVertical ? cell.mc.cs - 1 : cell.mc.rs - 1 r += isVertical ? cell.mc.cs - 1 : cell.mc.rs - 1
c += isVertical ? cell.mc.rs - 1 : cell.mc.cs - 1 c += isVertical ? cell.mc.rs - 1 : cell.mc.cs - 1
} }
title.title = v.replaceAll(' ', '') title.title = v.replaceAll(/(\s+)/g, '')
title.colum = +beginColum + (isVertical ? r : c) title.colum = +beginColum + (isVertical ? r : c)
title.row = +beginRow + (isVertical ? c : r) title.row = +beginRow + (isVertical ? c : r)
} }
console.log('title', title)
titles.push(title) titles.push(title)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment