From 68127a73034d699935078a72211eba8878f93fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=AD=90=E6=A5=9A=5Czhuzi?= Date: Sun, 1 Oct 2023 15:27:38 +0800 Subject: [PATCH] update --- example/qml-Qt6/page/T_TableView.qml | 5 +++-- example/qml/page/T_TableView.qml | 5 +++-- src/Qt5/imports/FluentUI/Controls/FluTableView.qml | 14 +++++++------- src/Qt6/imports/FluentUI/Controls/FluTableView.qml | 14 +++++++------- 4 files changed, 20 insertions(+), 18 deletions(-) diff --git a/example/qml-Qt6/page/T_TableView.qml b/example/qml-Qt6/page/T_TableView.qml index 2c46b3b9..833304b7 100644 --- a/example/qml-Qt6/page/T_TableView.qml +++ b/example/qml-Qt6/page/T_TableView.qml @@ -37,8 +37,9 @@ FluContentPage{ checked: true === options.checked enableAnimation: false clickListener: function(){ - modelData.checkbox = table_view.customItem(com_checbox,{checked:!options.checked}) - tableModel.setRow(row,modelData) + var obj = tableModel.getRow(row) + obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked}) + tableModel.setRow(row,obj) checkBoxChanged() } } diff --git a/example/qml/page/T_TableView.qml b/example/qml/page/T_TableView.qml index 18edf8a9..8d79f58f 100644 --- a/example/qml/page/T_TableView.qml +++ b/example/qml/page/T_TableView.qml @@ -38,8 +38,9 @@ FluContentPage{ checked: true === options.checked enableAnimation: false clickListener: function(){ - modelData.checkbox = table_view.customItem(com_checbox,{checked:!options.checked}) - tableModel.setRow(row,modelData) + var obj = tableModel.getRow(row) + obj.checkbox = table_view.customItem(com_checbox,{checked:!options.checked}) + tableModel.setRow(row,obj) checkBoxChanged() } } diff --git a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml index 1341c118..eb993dde 100644 --- a/src/Qt5/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt5/imports/FluentUI/Controls/FluTableView.qml @@ -142,7 +142,7 @@ Rectangle { id:com_text FluText { id:item_text - text: itemData + text: modelData elide: Text.ElideRight wrapMode: Text.WrapAnywhere anchors{ @@ -272,23 +272,23 @@ Rectangle { } } Loader{ - property var itemData: display + property var itemModel: model + property var modelData: display property var tableView: table_view 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 + if(typeof(modelData) == "object"){ + return modelData.options } return {} } anchors.fill: parent sourceComponent: { - if(typeof(itemData) == "object"){ - return itemData.comId + if(typeof(modelData) == "object"){ + return modelData.comId } return com_text } diff --git a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml index 773a5227..7247bdb0 100644 --- a/src/Qt6/imports/FluentUI/Controls/FluTableView.qml +++ b/src/Qt6/imports/FluentUI/Controls/FluTableView.qml @@ -144,7 +144,7 @@ Rectangle { id:com_text FluText { id:item_text - text: itemData + text: modelData elide: Text.ElideRight wrapMode: Text.WrapAnywhere anchors{ @@ -287,23 +287,23 @@ Rectangle { } } Loader{ - property var itemData: display + property var itemModel: model + property var modelData: display property var tableView: table_view 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 + if(typeof(modelData) == "object"){ + return modelData.options } return {} } anchors.fill: parent sourceComponent: { - if(typeof(itemData) == "object"){ - return itemData.comId + if(typeof(modelData) == "object"){ + return modelData.comId } return com_text }