From 9bc5794db889687490d5dc3228e4be4ad86e7f75 Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@gmail.com>
Date: Tue, 30 Jan 2024 11:21:19 +0800
Subject: [PATCH] fix bug #418

---
 .../FluentUI/Controls/FluTableView.qml        | 35 ++++++++-----------
 .../FluentUI/Controls/FluTableView.qml        | 35 ++++++++-----------
 2 files changed, 30 insertions(+), 40 deletions(-)

diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
index a14cc0c2..01093275 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@@ -59,24 +59,16 @@ Rectangle {
     }
     onDataSourceChanged: {
         table_model.clear()
+        var rows = []
         for(var i =0;i<dataSource.length;i++){
             var row = dataSource[i]
             row.__index= i
-            table_model.appendRow(row)
+            rows.push(row)
         }
+        table_model.rows = rows
     }
     TableModel {
         id:table_model
-        onRowCountChanged: {
-            timer_table_force_layout.restart()
-        }
-    }
-    Timer{
-        id:timer_table_force_layout
-        interval: 50
-        onTriggered: {
-            table_view.flick(0,1)
-        }
     }
     Component{
         id:com_edit
@@ -271,7 +263,8 @@ Rectangle {
                         id:item_table
                         anchors.fill: parent
                         property point position: Qt.point(column,row)
-                        property bool isRowSelected: d.currentIndex === table_model.getRow(row).__index
+                        property var rowObject : table_model.getRow(row)
+                        property bool isRowSelected: d.currentIndex === rowObject.__index
                         color:{
                             if(d.rowHoverIndex === row || item_table.isRowSelected){
                                 return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
@@ -540,10 +533,11 @@ Rectangle {
         clip: true
         model: TableModel{
             TableModelColumn {}
-            rows: {
-                if(dataSource)
-                    return dataSource
-                return []
+        }
+        Connections{
+            target: table_model
+            function onRowCountChanged(){
+                header_vertical.model.rows = table_model.rows
             }
         }
         onContentYChanged:{
@@ -619,15 +613,16 @@ Rectangle {
             }
             MouseArea{
                 property point clickPos: "0,0"
+                property bool isResize: {
+                    var obj = table_model.getRow(row)
+                    return !(obj.height === obj.minimumHeight && obj.height === obj.maximumHeight && obj.height)
+                }
                 height: 6
                 width: parent.width
                 anchors.bottom: parent.bottom
                 acceptedButtons: Qt.LeftButton
                 cursorShape: Qt.SplitVCursor
-                visible: {
-                    var obj = table_model.getRow(row)
-                    return !(obj.height === obj.minimumHeight && obj.height === obj.maximumHeight && obj.height)
-                }
+                visible: isResize
                 onPressed :
                     (mouse)=>{
                         header_vertical.interactive = false
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
index 8327d81c..be3c85a9 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@@ -60,24 +60,16 @@ Rectangle {
     }
     onDataSourceChanged: {
         table_model.clear()
+        var rows = []
         for(var i =0;i<dataSource.length;i++){
             var row = dataSource[i]
             row.__index= i
-            table_model.appendRow(row)
+            rows.push(row)
         }
+        table_model.rows = rows
     }
     TableModel {
         id:table_model
-        onRowCountChanged: {
-            timer_table_force_layout.restart()
-        }
-    }
-    Timer{
-        id:timer_table_force_layout
-        interval: 50
-        onTriggered: {
-            table_view.flick(0,1)
-        }
     }
     Component{
         id:com_edit
@@ -272,7 +264,8 @@ Rectangle {
                         id:item_table
                         anchors.fill: parent
                         property point position: Qt.point(column,row)
-                        property bool isRowSelected: d.currentIndex === table_model.getRow(row).__index
+                        property var rowObject : table_model.getRow(row)
+                        property bool isRowSelected: d.currentIndex === rowObject.__index
                         color:{
                             if(d.rowHoverIndex === row || item_table.isRowSelected){
                                 return FluTheme.dark ? Qt.rgba(1,1,1,0.06) : Qt.rgba(0,0,0,0.06)
@@ -541,10 +534,11 @@ Rectangle {
         clip: true
         model: TableModel{
             TableModelColumn {}
-            rows: {
-                if(dataSource)
-                    return dataSource
-                return []
+        }
+        Connections{
+            target: table_model
+            function onRowCountChanged(){
+                header_vertical.model.rows = table_model.rows
             }
         }
         onContentYChanged:{
@@ -620,15 +614,16 @@ Rectangle {
             }
             MouseArea{
                 property point clickPos: "0,0"
+                property bool isResize: {
+                    var obj = table_model.getRow(row)
+                    return !(obj.height === obj.minimumHeight && obj.height === obj.maximumHeight && obj.height)
+                }
                 height: 6
                 width: parent.width
                 anchors.bottom: parent.bottom
                 acceptedButtons: Qt.LeftButton
                 cursorShape: Qt.SplitVCursor
-                visible: {
-                    var obj = table_model.getRow(row)
-                    return !(obj.height === obj.minimumHeight && obj.height === obj.maximumHeight && obj.height)
-                }
+                visible: isResize
                 onPressed :
                     (mouse)=>{
                         header_vertical.interactive = false