Merge pull request #593 from Polaris-Night/main

修复FluTreeModel::setDataSource内存泄漏问题
Merge pull request #592 from add-uos/main
2025-05-09 22:41:08 +08:00 · 2025-03-08 14:49:26 +08:00 · 2025-03-08 14:48:48 +08:00 · 2025-03-03 21:24:56 +08:00 · 2025-03-03 15:23:57 +08:00
6 changed files with 36 additions and 22 deletions
--- a/example/example_en_US.ts
+++ b/example/example_en_US.ts
@ -969,10 +969,16 @@ Updated content:
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="qml/page/T_Buttons.qml" line="222"/>
        <location filename="qml/page/T_Buttons.qml" line="238"/>
        <source>Loading</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <location filename="qml/page/T_Buttons.qml" line="238"/>
+        <source>Normal</source>
+        <translation type="unfinished"></translation>
+    </message>
    <message>
        <location filename="qml/page/T_Buttons.qml" line="270"/>
        <source>Click IconButton</source>
@ -2291,39 +2297,39 @@ Some contents...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="45"/>
-        <location filename="qml/page/T_TabView.qml" line="47"/>
+        <location filename="qml/page/T_TabView.qml" line="44"/>
+        <location filename="qml/page/T_TabView.qml" line="46"/>
        <source>Equal</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="54"/>
+        <location filename="qml/page/T_TabView.qml" line="53"/>
        <source>SizeToContent</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="61"/>
+        <location filename="qml/page/T_TabView.qml" line="60"/>
        <source>Compact</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="69"/>
+        <location filename="qml/page/T_TabView.qml" line="68"/>
        <source>Tab Close Button Visibility:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="74"/>
-        <location filename="qml/page/T_TabView.qml" line="84"/>
+        <location filename="qml/page/T_TabView.qml" line="72"/>
+        <location filename="qml/page/T_TabView.qml" line="82"/>
        <source>Always</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="77"/>
+        <location filename="qml/page/T_TabView.qml" line="75"/>
        <source>Never</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="91"/>
+        <location filename="qml/page/T_TabView.qml" line="89"/>
        <source>OnHover</source>
        <translation type="unfinished"></translation>
    </message>
--- a/example/example_zh_CN.ts
+++ b/example/example_zh_CN.ts
@ -995,10 +995,16 @@ Updated content:
        <translation type="unfinished">加载按钮</translation>
    </message>
    <message>
+        <location filename="qml/page/T_Buttons.qml" line="222"/>
        <location filename="qml/page/T_Buttons.qml" line="238"/>
        <source>Loading</source>
        <translation type="unfinished">正在加载</translation>
    </message>
+    <message>
+        <location filename="qml/page/T_Buttons.qml" line="238"/>
+        <source>Normal</source>
+        <translation type="unfinished">开启加载</translation>
+    </message>
    <message>
        <location filename="qml/page/T_Buttons.qml" line="270"/>
        <source>Click IconButton</source>
@ -2480,39 +2486,39 @@ Some contents...</source>
        <translation type="unfinished">选项卡宽度：</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="45"/>
-        <location filename="qml/page/T_TabView.qml" line="47"/>
+        <location filename="qml/page/T_TabView.qml" line="44"/>
+        <location filename="qml/page/T_TabView.qml" line="46"/>
        <source>Equal</source>
        <translation type="unfinished">相同宽度</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="54"/>
+        <location filename="qml/page/T_TabView.qml" line="53"/>
        <source>SizeToContent</source>
        <translation type="unfinished">由内容</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="61"/>
+        <location filename="qml/page/T_TabView.qml" line="60"/>
        <source>Compact</source>
        <translation type="unfinished">紧凑</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="69"/>
+        <location filename="qml/page/T_TabView.qml" line="68"/>
        <source>Tab Close Button Visibility:</source>
        <translation type="unfinished">选项卡关闭按钮可见性：</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="74"/>
-        <location filename="qml/page/T_TabView.qml" line="84"/>
+        <location filename="qml/page/T_TabView.qml" line="72"/>
+        <location filename="qml/page/T_TabView.qml" line="82"/>
        <source>Always</source>
        <translation type="unfinished">可见</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="77"/>
+        <location filename="qml/page/T_TabView.qml" line="75"/>
        <source>Never</source>
        <translation type="unfinished">不可见</translation>
    </message>
    <message>
-        <location filename="qml/page/T_TabView.qml" line="91"/>
+        <location filename="qml/page/T_TabView.qml" line="89"/>
        <source>OnHover</source>
        <translation type="unfinished">鼠标悬浮显示</translation>
    </message>
--- a/example/qml/page/T_Buttons.qml
+++ b/example/qml/page/T_Buttons.qml
@ -219,7 +219,7 @@ FluScrollablePage{
        FluLoadingButton{
            id: btn_loading
            loading: loading_button_switch.checked
-            text: qsTr("Loading Button")
+            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Loading Button")
            anchors{
                verticalCenter: parent.verticalCenter
                left: parent.left
@ -235,7 +235,7 @@ FluScrollablePage{
                right: parent.right
                verticalCenter: parent.verticalCenter
            }
-            text: qsTr("Loading")
+            text: loading_button_switch.checked ? qsTr("Loading") : qsTr("Normal")
        }
    }
    CodeExpander{
--- a/src/FluTreeModel.cpp
+++ b/src/FluTreeModel.cpp
@ -107,7 +107,7 @@ 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);
@ -115,7 +115,7 @@ void FluTreeModel::setDataSource(QList<QMap<QString, QVariant>> data) {
    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;
--- 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
--- 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
Author	SHA1	Message	Date
zhuzichu	1990203f3b	Merge pull request #593 from Polaris-Night/main 修复FluTreeModel::setDataSource内存泄漏问题	2025-03-08 14:49:26 +08:00
zhuzichu	df7cd94eec	Merge pull request #592 from add-uos/main fix: 优化示例中加载按钮交互效果	2025-03-08 14:48:48 +08:00
Polaris-Night	2cc17e9db3	修复FluTreeModel::setDataSource内存泄漏问题	2025-03-03 21:24:56 +08:00
zhanghongyuan	aa8fcb304f	fix: 优化示例中加载按钮交互效果优化 example 中加载按钮页面交互效果	2025-03-03 15:23:57 +08:00