From 52c806eeffa381d5c9b426411fab4217d80e5bd3 Mon Sep 17 00:00:00 2001
From: zhuzichu <zhuzichu520@gmail.com>
Date: Thu, 28 Sep 2023 12:31:20 +0800
Subject: [PATCH] update

---
 example/qml-Qt6/page/T_TableView.qml          | 34 ++++++++++++++++---
 example/qml/page/T_TableView.qml              | 34 ++++++++++++++++---
 .../FluentUI/Controls/FluTableView.qml        | 20 +++++++++--
 .../FluentUI/Controls/FluTableView.qml        | 20 +++++++++--
 4 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/example/qml-Qt6/page/T_TableView.qml b/example/qml-Qt6/page/T_TableView.qml
index ffd6f174..6fa63aae 100644
--- a/example/qml-Qt6/page/T_TableView.qml
+++ b/example/qml-Qt6/page/T_TableView.qml
@@ -13,6 +13,23 @@ FluContentPage{
         loadData(1,1000)
     }
 
+    Component{
+        id:com_checbox
+
+        Item{
+            FluCheckBox{
+                anchors.centerIn: parent
+                checked: true === options.checked
+                enableAnimation: false
+                clickListener: function(){
+                    modelData.checkbox = table_view.customItem(com_checbox,{checked:!options.checked})
+                    tableModel.setRow(row,modelData)
+                }
+            }
+        }
+
+    }
+
     Component{
         id:com_action
         Item{
@@ -28,6 +45,9 @@ FluContentPage{
                 FluFilledButton{
                     text:"编辑"
                     onClicked: {
+                        var obj = tableModel.getRow(row)
+                        obj.name = "12345"
+                        tableModel.setRow(row,obj)
                         showSuccess(JSON.stringify(tableModel.getRow(row)))
                     }
                 }
@@ -59,12 +79,14 @@ FluContentPage{
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push({
+                                checkbox: table_view.customItem(com_checbox,{checked:true}),
+                                checked:true,
                                 name: getRandomName(),
                                 age:getRandomAge(),
                                 address: getRandomAddresses(),
                                 nickname: getRandomNickname(),
                                 longstring:"你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好",
-                                action:com_action
+                                action: table_view.customItem(com_action)
                             })
         }
         table_view.dataSource = dataSource
@@ -104,6 +126,13 @@ FluContentPage{
         }
         anchors.topMargin: 20
         columnSource:[
+            {
+                title: '选取',
+                dataIndex: 'checkbox',
+                width:80,
+                minimumWidth:80,
+                maximumWidth:80
+            },
             {
                 title: '姓名',
                 dataIndex: 'name',
@@ -165,7 +194,4 @@ FluContentPage{
                 table_view.resetPosition()
             }
     }
-
-
-
 }
diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml
index da48606d..3c4fa21b 100644
--- a/example/qml/page/T_TableView.qml
+++ b/example/qml/page/T_TableView.qml
@@ -14,6 +14,23 @@ FluContentPage{
         loadData(1,1000)
     }
 
+    Component{
+        id:com_checbox
+
+        Item{
+            FluCheckBox{
+                anchors.centerIn: parent
+                checked: true === options.checked
+                enableAnimation: false
+                clickListener: function(){
+                    modelData.checkbox = table_view.customItem(com_checbox,{checked:!options.checked})
+                    tableModel.setRow(row,modelData)
+                }
+            }
+        }
+
+    }
+
     Component{
         id:com_action
         Item{
@@ -29,6 +46,9 @@ FluContentPage{
                 FluFilledButton{
                     text:"编辑"
                     onClicked: {
+                        var obj = tableModel.getRow(row)
+                        obj.name = "12345"
+                        tableModel.setRow(row,obj)
                         showSuccess(JSON.stringify(tableModel.getRow(row)))
                     }
                 }
@@ -60,12 +80,14 @@ FluContentPage{
         const dataSource = []
         for(var i=0;i<count;i++){
             dataSource.push({
+                                checkbox: table_view.customItem(com_checbox,{checked:true}),
+                                checked:true,
                                 name: getRandomName(),
                                 age:getRandomAge(),
                                 address: getRandomAddresses(),
                                 nickname: getRandomNickname(),
                                 longstring:"你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好",
-                                action:com_action
+                                action: table_view.customItem(com_action)
                             })
         }
         table_view.dataSource = dataSource
@@ -105,6 +127,13 @@ FluContentPage{
         }
         anchors.topMargin: 20
         columnSource:[
+            {
+                title: '选取',
+                dataIndex: 'checkbox',
+                width:80,
+                minimumWidth:80,
+                maximumWidth:80
+            },
             {
                 title: '姓名',
                 dataIndex: 'name',
@@ -166,7 +195,4 @@ FluContentPage{
                 table_view.resetPosition()
             }
     }
-
-
-
 }
diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
index f4398f07..e2584043 100644
--- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml
@@ -275,11 +275,18 @@ Rectangle {
                     property var tableModel: table_model
                     property var position: item_table.position
                     property int row: position.y
+                    property var modelData: table_model.getRow(row)
                     property int column: position.x
+                    property var options: {
+                        if(typeof(itemData) == "object"){
+                            return itemData.options
+                        }
+                        return {}
+                    }
                     anchors.fill: parent
                     sourceComponent: {
-                        if(itemData instanceof Component){
-                            return itemData
+                        if(typeof(itemData) == "object"){
+                            return itemData.comId
                         }
                         return com_text
                     }
@@ -530,4 +537,13 @@ Rectangle {
         scroll_bar_h.position = 0
         scroll_bar_v.position = 0
     }
+    function customItem(comId,options={}){
+        var o = {}
+        o.comId = comId
+        o.options = options
+        return o
+    }
+    function updateRow(row,obj){
+        table_model.setRow(row,obj)
+    }
 }
diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
index 7497d96a..df649490 100644
--- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
+++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml
@@ -290,11 +290,18 @@ Rectangle {
                     property var tableModel: table_model
                     property point position: item_table.position
                     property int row: position.y
+                    property var modelData: table_model.getRow(row)
                     property int column: position.x
+                    property var options: {
+                        if(typeof(itemData) == "object"){
+                            return itemData.options
+                        }
+                        return {}
+                    }
                     anchors.fill: parent
                     sourceComponent: {
-                        if(itemData instanceof Component){
-                            return itemData
+                        if(typeof(itemData) == "object"){
+                            return itemData.comId
                         }
                         return com_text
                     }
@@ -573,4 +580,13 @@ Rectangle {
     function resetPosition(){
         table_view.positionViewAtCell(Qt.point(0, 0),Qt.AlignTop|Qt.AlignLeft)
     }
+    function customItem(comId,options={}){
+        var o = {}
+        o.comId = comId
+        o.options = options
+        return o
+    }
+    function updateRow(row,obj){
+        table_model.setRow(row,obj)
+    }
 }