This commit is contained in:
@@ -209,15 +209,14 @@ function extractTakesPlace(sheet) {
|
|||||||
const nextCell = sheet.getCell(`B${i}`);
|
const nextCell = sheet.getCell(`B${i}`);
|
||||||
|
|
||||||
if (nextCell.isMerged) {
|
if (nextCell.isMerged) {
|
||||||
const cell = nextCell.master
|
str += `\n${cell.master?.value?.trim() || ""}`
|
||||||
|
|
||||||
str += `\n${cell.value.trim()}`
|
|
||||||
i++;
|
i++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
const tryCells = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K"];
|
const tryCells = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K"];
|
||||||
const threshold = 20;
|
const threshold = 20;
|
||||||
|
let con = false;
|
||||||
|
|
||||||
for (const cellTest of tryCells) {
|
for (const cellTest of tryCells) {
|
||||||
const cellTry = sheet.getCell(`${cellTest}${i}`)
|
const cellTry = sheet.getCell(`${cellTest}${i}`)
|
||||||
@@ -226,11 +225,16 @@ function extractTakesPlace(sheet) {
|
|||||||
if (cellValue.length >= threshold) {
|
if (cellValue.length >= threshold) {
|
||||||
str += `\n${cellValue}`;
|
str += `\n${cellValue}`;
|
||||||
i++;
|
i++;
|
||||||
continue;
|
con = true;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
if (con) {
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return str.trim();
|
return str.trim();
|
||||||
@@ -318,4 +322,4 @@ function formatNowTime() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
parseV3("db/current.xlsx")
|
//parseV3("db/current.xlsx")
|
||||||
|
|||||||
Reference in New Issue
Block a user