diff --git a/example/qml/window/AboutWindow.qml b/example/qml/window/AboutWindow.qml index 2147054..878ec06 100644 --- a/example/qml/window/AboutWindow.qml +++ b/example/qml/window/AboutWindow.qml @@ -124,15 +124,15 @@ FluWindow { Layout.preferredHeight: 252 Row{ anchors.horizontalCenter: parent.horizontalCenter - spacing: 60 + spacing: 30 Image{ - width: 164.55 - height: 224.25 + width: 250 + height: 250 source: "qrc:/example/res/image/qrcode_wx.jpg" } Image{ - width: 162 - height: 252 + width: 250 + height: 250 source: "qrc:/example/res/image/qrcode_zfb.jpg" } } diff --git a/example/res/image/qrcode_wx.jpg b/example/res/image/qrcode_wx.jpg index 893eaff..3728974 100644 Binary files a/example/res/image/qrcode_wx.jpg and b/example/res/image/qrcode_wx.jpg differ diff --git a/example/res/image/qrcode_zfb.jpg b/example/res/image/qrcode_zfb.jpg index e7626f2..598ad93 100644 Binary files a/example/res/image/qrcode_zfb.jpg and b/example/res/image/qrcode_zfb.jpg differ diff --git a/src/imports/FluentUI/Controls/FluTableView.qml b/src/imports/FluentUI/Controls/FluTableView.qml index 82174b2..2ca199f 100644 --- a/src/imports/FluentUI/Controls/FluTableView.qml +++ b/src/imports/FluentUI/Controls/FluTableView.qml @@ -11,6 +11,7 @@ Item { property int itemCount: 1000 property int pageCount: 10 property int itemHeight: 56 + property bool pageVisible: true signal requestPage(int page,int count) id:control @@ -59,6 +60,7 @@ Item { right: parent.right } contentWidth: layout_table.width + clip:true ScrollBar.horizontal: FluScrollBar { } Rectangle{ @@ -104,7 +106,7 @@ Item { height: 40 anchors.right: parent.right anchors.verticalCenter: parent.verticalCenter - visible: index !== list_coumns.count-1 + visible: index !== model_coumns.count-1 } } } @@ -112,8 +114,9 @@ Item { } footer: Item{ - height: 50 - width: layout_table.width + height: pageVisible ? 50 : 0 + clip: true + width: layout_table.width FluPagination{ id:pagination height: 40 @@ -176,8 +179,6 @@ Item { } } } - - } diff --git a/src/imports/FluentUI/Controls/FluTreeView.qml b/src/imports/FluentUI/Controls/FluTreeView.qml index 4542566..906381b 100644 --- a/src/imports/FluentUI/Controls/FluTreeView.qml +++ b/src/imports/FluentUI/Controls/FluTreeView.qml @@ -141,6 +141,7 @@ Item { currentParentElement = item_layout.parent.itemModel } } + itemClicked(model) } if(selectionMode === FluTreeView.Multiple){ @@ -300,8 +301,8 @@ Item { return result } - function createItem(text="Title",expanded=true,items=[]){ - return {text:text,expanded:expanded,items:items,key:uniqueRandom(),multipSelected:false,multipIndex:0,multipParentKey:""}; + function createItem(text="",expanded=true,items=[],data={}){ + return {text:text,expanded:expanded,items:items,key:uniqueRandom(),multipSelected:false,multipIndex:0,multipParentKey:"",data:data}; } function uniqueRandom() {