Merge branch 'main' of https://github.com/zhuzichu520/FluentUI

example/T_Carousel.qml

@@ -9,13 +9,11 @@ FluScrollablePage{
 
     title:"Carousel"
 
-
     FluArea{
         width: parent.width
         height: 370
         paddings: 10
         Layout.topMargin: 20
-
         Column{
             spacing: 15
             anchors{
@@ -23,7 +21,6 @@ FluScrollablePage{
                 left:parent.left
             }
             FluText{
-
                 text:"轮播图，支持无限轮播，无限滑动，用ListView实现的组件"
             }
             FluCarousel{
@@ -33,12 +30,7 @@ FluScrollablePage{
                 Component.onCompleted: {
                     carousel.setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
                 }
-
             }
         }
     }
-
-
-
-
 }

example/page/AboutPage.qml

@@ -34,7 +34,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.0.8"
+                text:"v1.0.9"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }

example/page/MainPage.qml

@@ -58,13 +58,6 @@ FluWindow {
             }
         }
 
-        FluPaneItem{
-            title:"Menu"
-            onTap:{
-                nav_view.push("qrc:/T_Menu.qml")
-            }
-        }
-
         FluPaneItem{
             title:"TimePicker"
             onTap:{
@@ -123,7 +116,6 @@ FluWindow {
             title:"Popus"
         }
 
-
         FluPaneItem{
             title:"Dialog"
             onTap:{
@@ -131,6 +123,13 @@ FluWindow {
             }
         }
 
+        FluPaneItem{
+            title:"Menu"
+            onTap:{
+                nav_view.push("qrc:/T_Menu.qml")
+            }
+        }
+
         FluPaneItemHeader{
             title:"Navigation"
         }