修复FluTree::setDataSource内存泄漏问题

zhuzichu520 · Mar 3, 2025 · aa2334e · aa2334e
1 parent 882cc89
commit aa2334e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/FluTreeModel.cpp b/src/FluTreeModel.cpp
@@ -107,15 +107,15 @@ void FluTreeModel::checkRow(int row, bool checked) {
 void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
     _dataSource.clear();
     if (_root) {
-        delete _root;
+        _root->deleteLater();
         _root = nullptr;
     }
     _root = new FluTreeNode(this);
     std::reverse(data.begin(), data.end());
     while (data.count() > 0) {
         auto item = data.at(data.count() - 1);
         data.pop_back();
-        auto *node = new FluTreeNode(this);
+        auto *node = new FluTreeNode(_root);
         node->_depth = item.value("__depth").toInt();
         node->_parent = item.value("__parent").value<FluTreeNode *>();
         node->_data = item;

diff --git a/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt5/imports/FluentUI/Controls/FluTreeView.qml
@@ -474,6 +474,7 @@ Rectangle {
                     }
                     return {}
                 }
+                active: rowModel !== undefined && rowModel !== null
                 sourceComponent: {
                     if(column === 0)
                         return com_column

diff --git a/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml b/src/Qt6/imports/FluentUI/Controls/FluTreeView.qml
@@ -474,6 +474,7 @@ Rectangle {
                     }
                     return {}
                 }
+                active: rowModel !== undefined && rowModel !== null
                 sourceComponent: {
                     if(column === 0)
                         return com_column