feat(worksheet): 加载数据时解析有效区域和选中一个单元格按Ctrl-A的效果大体相同

(Resolve valid regions when loading data Similar to selecting a cell The effect of pressing Ctrl-A is roughly the same)
QtExcel · May 13, 2024 · 8795189 · 8795189
1 parent 79da3e7
commit 8795189
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/QXlsx/header/xlsxworksheet.h b/QXlsx/header/xlsxworksheet.h
@@ -192,6 +192,9 @@ class QXLSX_EXPORT Worksheet : public AbstractSheet
 private:
     void saveToXmlFile(QIODevice *device) const override;
     bool loadFromXmlFile(QIODevice *device) override;
+
+public:
+    const QList<CellRange> &editRegion() const;
 };
 
 QT_END_NAMESPACE_XLSX

diff --git a/QXlsx/header/xlsxworksheet_p.h b/QXlsx/header/xlsxworksheet_p.h
@@ -243,6 +243,9 @@ class WorksheetPrivate : public AbstractSheetPrivate
 
 private:
     static double calculateColWidth(int characters);
+
+private:
+    QList<CellRange> editRegions;
 };
 
 QT_END_NAMESPACE_XLSX

diff --git a/QXlsx/source/xlsxworksheet.cpp b/QXlsx/source/xlsxworksheet.cpp
@@ -2321,8 +2321,7 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
                 QXmlStreamAttributes attributes = reader.attributes();
                 QString r                       = attributes.value(QLatin1String("r")).toString();
                 CellReference pos(r);
-                if (r.isEmpty())
-                {
+                if (r.isEmpty()) {
                     pos.setRow(row_num);
                     pos.setColumn(++col_num);
                 }
@@ -2444,6 +2443,23 @@ void WorksheetPrivate::loadXmlSheetData(QXmlStreamReader &reader)
                 }
 
                 cellTable[pos.row()][pos.column()] = cell;
+
+                if (cell->value().isNull()) {
+                    continue;
+                }
+
+                if (editRegions.empty()) {
+                    editRegions << CellRange{pos, pos};
+                } else {
+                    auto &cellRange = editRegions.last();
+                    if (cellRange.lastRow() == pos.row() && cellRange.lastColumn() < pos.column()) {
+                        cellRange.setLastColumn(pos.column());
+                    }
+
+                    if (pos.row() - cellRange.lastRow() == 1) {
+                        cellRange.setLastRow(pos.row());
+                    }
+                }
             }
         }
     }
@@ -2910,4 +2926,10 @@ QVector<CellLocation> Worksheet::getFullCells(int *maxRow, int *maxCol)
     return ret;
 }
 
+const QList<CellRange> &Worksheet::editRegion() const
+{
+    Q_D(const Worksheet);
+    return d->editRegions;
+}
+
 QT_END_NAMESPACE_XLSX