update

Optimize workflow

.github/workflows/windows-mingw.yml

@@ -71,6 +71,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{  matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip
           tag: ${{ github.ref }}
           overwrite: true 

.github/workflows/windows.yml

@@ -87,6 +87,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{  matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip
           tag: ${{ github.ref }}
           overwrite: true 

example/CMakeLists.txt

@@ -43,15 +43,15 @@ qt_add_resources(QT_RESOURCES ${RESOURCES})
 add_executable(${PROJECT_NAME} ${SOURCES} ${HEADERS} ${QT_RESOURCES} ${RC_ICONS})
 
 if(WIN32)
-    if(platform EQUAL 32)
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x86/*.dll)
+    if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/msvc/*.dll)
         add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy
             ${DLL_FILES}
             ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         )
     else()
-        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/Win_x64/*.dll)
+        file(GLOB DLL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../third/mingw/*.dll)
         add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy
             ${DLL_FILES}

example/T_Badge.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -11,6 +12,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -99,5 +101,19 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'Rectangle{
+    width: 40
+    height: 40
+    radius: 8
+    color: Qt.rgba(191/255,191/255,191/255,1)
+    FluBadge{
+        count: 100
+        isDot: false
+        color: Qt.rgba(82/255,196/255,26/255,1)
+    }
+}'
+    }
 
 }

example/T_Buttons.qml

@@ -3,15 +3,15 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
     title:"Buttons"
 
-    spacing: 20
-
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluText{
         Layout.topMargin: 20
@@ -22,6 +22,7 @@ FluScrollablePage{
         Layout.fillWidth: true
         height: 68
         paddings: 10
+        Layout.topMargin: 20
 
         FluTextButton{
             disabled:text_button_switch.selected
@@ -48,11 +49,21 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTextButton{
+    text:"Text Button"
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
         height: 68
         paddings: 10
+        Layout.topMargin: 20
 
         FluButton{
             disabled:button_switch.selected
@@ -79,10 +90,20 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluButton{
+    text:"Standard Button"
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
         height: 68
+        Layout.topMargin: 20
         paddings: 10
 
         FluFilledButton{
@@ -110,13 +131,63 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluFilledButton{
+    text:"Filled Button"
+    onClicked: {
+
+    }
+}'
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        Layout.topMargin: 20
+        paddings: 10
+
+        FluToggleButton{
+            disabled:toggle_button_switch.selected
+            text:"Toggle Button"
+            onClicked: {
+               selected = !selected
+            }
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:toggle_button_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluToggleButton{
+    text:"Toggle Button"
+    onClicked: {
+        selected = !selected
+    }
+}'
+    }
 
 
     FluArea{
         Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluIconButton{
             iconSource:FluentIcons.ChromeCloseContrast
             disabled:icon_button_switch.selected
@@ -143,12 +214,21 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluIconButton{
+    iconSource:FluentIcons.ChromeCloseContrast
+    onClicked: {
+
+    }
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluDropDownButton{
             disabled:drop_down_button_switch.selected
             text:"DropDownButton"
@@ -184,12 +264,32 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluDropDownButton{
+    text:"DropDownButton"
+    items:[
+        FluMenuItem{
+            text:"Menu_1"
+        },
+        FluMenuItem{
+            text:"Menu_2"
+        },
+        FluMenuItem{
+            text:"Menu_3"
+        },
+        FluMenuItem{
+            text:"Menu_4"
+        }
+    ]
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
         height: 100
         paddings: 10
-
+        Layout.topMargin: 20
         ColumnLayout{
             spacing: 8
             anchors{
@@ -225,13 +325,23 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluRadioButton{
+    selected:true
+    text:"Text Button"
+    onClicked: {
+
+    }
+}'
+    }
 
 
     FluArea{
         Layout.fillWidth: true
         height: 68
         paddings: 10
-
+        Layout.topMargin: 20
         FluCheckBox{
             disabled:check_box_switch.selected
             text:"Check Box"
@@ -240,8 +350,6 @@ FluScrollablePage{
                 left: parent.left
             }
         }
-
-
         Row{
             spacing: 5
             anchors{
@@ -255,4 +363,10 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluCheckBox{
+    text:"Check Box"
+}'
+    }
 }

example/T_CalendarPicker.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -19,6 +21,12 @@ FluScrollablePage{
         FluCalendarView{
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluCalendarView{
+
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -34,5 +42,11 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluCalendarPicker{
+
+}'
+    }
 
 }

example/T_Carousel.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -35,4 +37,14 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluCarousel{
+    width: 400
+    height: 300
+    Component.onCompleted: {
+        setData([{url:"qrc:/res/image/banner_1.jpg"},{url:"qrc:/res/image/banner_2.jpg"},{url:"qrc:/res/image/banner_3.jpg"}])
+    }
+}'
+    }
 }

example/T_CheckBox.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,14 +11,28 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluCheckBox{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluCheckBox{
+            }
+            FluCheckBox{
+                text:"Text"
+            }
+        }
     }
-
-    FluCheckBox{
-        Layout.topMargin: 20
-        text:"Text"
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluCheckBox{
+    text:"Text"
+}'
     }
 
 }

example/T_ColorPicker.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -37,6 +39,12 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluColorView{
+
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -54,6 +62,12 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluColorPicker{
+
+}'
+    }
 
 }
 

example/T_DatePicker.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,44 +11,42 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
-
         ColumnLayout{
-
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-
             FluText{
                 text:"showYear=true"
             }
-
             FluDatePicker{
             }
-
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluDatePicker{
 
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
-
         ColumnLayout{
-
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
-
             FluText{
                 text:"showYear=false"
             }
@@ -56,8 +55,13 @@ FluScrollablePage{
                 showYear:false
 
             }
-
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluDatePicker{
+    showYear:false
+}'
+    }
 
 }

example/T_Dialog.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,40 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+            FluButton{
+                anchors.verticalCenter: parent.verticalCenter
+                Layout.topMargin: 20
+                text:"Show Dialog"
+                onClicked: {
+                    dialog.open()
+                }
+            }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluContentDialog{
+    id:dialog
+    title:"友情提示"
+    message:"确定要退出程序么？"
+    negativeText:"取消"
+    onNegativeClicked:{
+        showSuccess("点击取消按钮")
+    }
+    positiveText:"确定"
+    onPositiveClicked:{
+        showSuccess("点击确定按钮")
+    }
+}
+dialog.open()
+'
+    }
 
     FluContentDialog{
         id:dialog
@@ -25,11 +60,5 @@ FluScrollablePage{
         }
     }
 
-    FluButton{
-        Layout.topMargin: 20
-        text:"Show Dialog"
-        onClicked: {
-            dialog.open()
-        }
-    }
+
 }

example/T_Expander.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,56 +11,99 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluExpander{
-        headerText:"打开一个单选框"
+    FluArea{
+        Layout.fillWidth: true
+        height: layout_column.height+40
+        paddings: 10
         Layout.topMargin: 20
-        Item{
-            anchors.fill: parent
-            ColumnLayout{
-                spacing: 8
-                anchors{
-                    top: parent.top
-                    left: parent.left
-                    topMargin: 15
-                    leftMargin: 15
-                }
-                Repeater{
-                    id:repeater
-                    property int selecIndex : 0
-                    model: 3
-                    delegate:  FluRadioButton{
-                        selected : repeater.selecIndex===index
-                        text:"Radio Button_"+index
-                        onClicked:{
-                            repeater.selecIndex = index
+        Column{
+            id:layout_column
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+
+            FluExpander{
+                headerText:"打开一个单选框"
+                Layout.topMargin: 20
+                Item{
+                    anchors.fill: parent
+                    ColumnLayout{
+                        spacing: 8
+                        anchors{
+                            top: parent.top
+                            left: parent.left
+                            topMargin: 15
+                            leftMargin: 15
+                        }
+                        Repeater{
+                            id:repeater
+                            property int selecIndex : 0
+                            model: 3
+                            delegate:  FluRadioButton{
+                                selected : repeater.selecIndex===index
+                                text:"Radio Button_"+index
+                                onClicked:{
+                                    repeater.selecIndex = index
+                                }
+                            }
                         }
                     }
                 }
             }
+
+            FluExpander{
+                Layout.topMargin: 20
+                headerText:"打开一个滑动文本框"
+                Item{
+                    anchors.fill: parent
+                    Flickable{
+                        id:scrollview
+                        width: parent.width
+                        height: parent.height
+                        contentWidth: width
+                        contentHeight: text_info.height
+                        ScrollBar.vertical: FluScrollBar {}
+                        FluText{
+                            id:text_info
+                            width: scrollview.width
+                            wrapMode: Text.WrapAnywhere
+                            padding: 14
+                            text:"先帝创业未半而中道崩殂，今天下三分，益州疲弊，此诚危急存亡之秋也。然侍卫之臣不懈于内，忠志之士忘身于外者，盖追先帝之殊遇，欲报之于陛下也。诚宜开张圣听，以光先帝遗德，恢弘志士之气，不宜妄自菲薄，引喻失义，以塞忠谏之路也。宫中府中，俱为一体；陟罚臧否，不宜异同。若有作奸犯科及为忠善者，宜付有司论其刑赏，以昭陛下平明之理，不宜偏私，使内外异法也。侍中、侍郎郭攸之、费祎、董允等，此皆良实，志虑忠纯，是以先帝简拔以遗陛下。愚以为宫中之事，事无大小，悉以咨之，然后施行，必能裨补阙漏，有所广益。将军向宠，性行淑均，晓畅军事，试用于昔日，先帝称之曰能，是以众议举宠为督。愚以为营中之事，悉以咨之，必能使行阵和睦，优劣得所。亲贤臣，远小人，此先汉所以兴隆也；亲小人，远贤臣，此后汉所以倾颓也。先帝在时，每与臣论此事，未尝不叹息痛恨于桓、灵也。侍中、尚书、长史、参军，此悉贞良死节之臣，愿陛下亲之信之，则汉室之隆，可计日而待也。臣本布衣，躬耕于南阳，苟全性命于乱世，不求闻达于诸侯。先帝不以臣卑鄙，猥自枉屈，三顾臣于草庐之中，咨臣以当世之事，由是感激，遂许先帝以驱驰。后值倾覆，受任于败军之际，奉命于危难之间，尔来二十有一年矣。先帝知臣谨慎，故临崩寄臣以大事也。受命以来，夙夜忧叹，恐托付不效，以伤先帝之明；故五月渡泸，深入不毛。今南方已定，兵甲已足，当奖率三军，北定中原，庶竭驽钝，攘除奸凶，兴复汉室，还于旧都。此臣所以报先帝而忠陛下之职分也。至于斟酌损益，进尽忠言，则攸之、祎、允之任也。愿陛下托臣以讨贼兴复之效，不效，则治臣之罪，以告先帝之灵。若无兴德之言，则责攸之、祎、允等之慢，以彰其咎；陛下亦宜自谋，以咨诹善道，察纳雅言，深追先帝遗诏。臣不胜受恩感激。今当远离，临表涕零，不知所言。"
+                        }
+                    }
+                }
+            }
+
         }
     }
 
-    FluExpander{
-        Layout.topMargin: 20
-        headerText:"打开一个滑动文本框"
-        Item{
-            anchors.fill: parent
-            Flickable{
-                id:scrollview
-                width: parent.width
-                height: parent.height
-                contentWidth: width
-                contentHeight: text_info.height
-                ScrollBar.vertical: FluScrollBar {}
-                FluText{
-                    id:text_info
-                    width: scrollview.width
-                    wrapMode: Text.WrapAnywhere
-                    padding: 14
-                    text:"先帝创业未半而中道崩殂，今天下三分，益州疲弊，此诚危急存亡之秋也。然侍卫之臣不懈于内，忠志之士忘身于外者，盖追先帝之殊遇，欲报之于陛下也。诚宜开张圣听，以光先帝遗德，恢弘志士之气，不宜妄自菲薄，引喻失义，以塞忠谏之路也。宫中府中，俱为一体；陟罚臧否，不宜异同。若有作奸犯科及为忠善者，宜付有司论其刑赏，以昭陛下平明之理，不宜偏私，使内外异法也。侍中、侍郎郭攸之、费祎、董允等，此皆良实，志虑忠纯，是以先帝简拔以遗陛下。愚以为宫中之事，事无大小，悉以咨之，然后施行，必能裨补阙漏，有所广益。将军向宠，性行淑均，晓畅军事，试用于昔日，先帝称之曰能，是以众议举宠为督。愚以为营中之事，悉以咨之，必能使行阵和睦，优劣得所。亲贤臣，远小人，此先汉所以兴隆也；亲小人，远贤臣，此后汉所以倾颓也。先帝在时，每与臣论此事，未尝不叹息痛恨于桓、灵也。侍中、尚书、长史、参军，此悉贞良死节之臣，愿陛下亲之信之，则汉室之隆，可计日而待也。臣本布衣，躬耕于南阳，苟全性命于乱世，不求闻达于诸侯。先帝不以臣卑鄙，猥自枉屈，三顾臣于草庐之中，咨臣以当世之事，由是感激，遂许先帝以驱驰。后值倾覆，受任于败军之际，奉命于危难之间，尔来二十有一年矣。先帝知臣谨慎，故临崩寄臣以大事也。受命以来，夙夜忧叹，恐托付不效，以伤先帝之明；故五月渡泸，深入不毛。今南方已定，兵甲已足，当奖率三军，北定中原，庶竭驽钝，攘除奸凶，兴复汉室，还于旧都。此臣所以报先帝而忠陛下之职分也。至于斟酌损益，进尽忠言，则攸之、祎、允之任也。愿陛下托臣以讨贼兴复之效，不效，则治臣之罪，以告先帝之灵。若无兴德之言，则责攸之、祎、允等之慢，以彰其咎；陛下亦宜自谋，以咨诹善道，察纳雅言，深追先帝遗诏。臣不胜受恩感激。今当远离，临表涕零，不知所言。"
-                }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluExpander{
+    headerText:"打开一个单选框"
+    Item{
+        anchors.fill: parent
+        Flickable{
+            width: parent.width
+            height: parent.height
+            contentWidth: width
+            contentHeight: text_info.height
+            ScrollBar.vertical: FluScrollBar {}
+            FluText{
+                id:text_info
+                width: scrollview.width
+                wrapMode: Text.WrapAnywhere
+                padding: 14
+                text:"先帝创业未半而中道崩殂，今天下三分......""
             }
         }
     }
+}'
+    }
+
+
 }

example/T_FlipView.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,7 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
-
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -26,7 +27,6 @@ FluScrollablePage{
                 Image{
                     source: "qrc:/res/image/banner_1.jpg"
                     asynchronous: true
-                    sourceSize: Qt.size(400,300)
                     fillMode:Image.PreserveAspectCrop
                 }
                 Image{
@@ -42,6 +42,27 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluFlipView{
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+}
+'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -74,5 +95,26 @@ FluScrollablePage{
             }
         }
     }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluFlipView{
+    vertical:true
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+    Image{
+        source: "qrc:/res/image/banner_1.jpg"
+        asynchronous: true
+        fillMode:Image.PreserveAspectCrop
+    }
+}
+'
+    }
 }

example/T_InfoBar.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,33 +11,53 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluButton{
-        text:"Info"
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        onClicked: {
-            showInfo("这是一个Info样式的InfoBar")
+        height: 200
+        paddings: 10
+        ColumnLayout{
+            spacing: 14
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluButton{
+                text:"Info"
+                onClicked: {
+                    showInfo("这是一个Info样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Warning"
+                onClicked: {
+                    showWarning("这是一个Warning样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Error"
+                onClicked: {
+                    showError("这是一个Error样式的InfoBar")
+                }
+            }
+            FluButton{
+                text:"Success"
+                onClicked: {
+                    showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
+                }
+            }
         }
     }
-    FluButton{
-        text:"Warning"
-        Layout.topMargin: 20
-        onClicked: {
-            showWarning("这是一个Warning样式的InfoBar")
-        }
-    }
-    FluButton{
-        text:"Error"
-        Layout.topMargin: 20
-        onClicked: {
-            showError("这是一个Error样式的InfoBar")
-        }
-    }
-    FluButton{
-        text:"Success"
-        Layout.topMargin: 20
-        onClicked: {
-            showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
-        }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'  showInfo("这是一个Info样式的InfoBar")
+
+    showWarning("这是一个Warning样式的InfoBar")
+
+    showError("这是一个Error样式的InfoBar")
+
+    showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")'
     }
 }

example/T_MediaPlayer.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     onVisibleChanged: {
         if(visible){
@@ -18,7 +20,6 @@ FluScrollablePage{
             player.pause()
         }
     }
-
     FluArea{
         Layout.fillWidth: true
         height: 320
@@ -35,13 +36,19 @@ FluScrollablePage{
             }
         }
     }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluMediaPlayer{
+    id:player
+    source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
+}
+'
+    }
     FluArea{
         Layout.fillWidth: true
         height: 68
         Layout.topMargin: 20
         paddings: 10
-
         FluButton{
             text:"跳转到视频播放器窗口"
             anchors.verticalCenter: parent.verticalCenter
@@ -49,8 +56,10 @@ FluScrollablePage{
                 FluApp.navigate("/media",{source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"})
             }
         }
-
     }
 
+
+
+
 }
 

example/T_Menu.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,30 +11,66 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluButton{
-        text:"左击菜单"
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
         Layout.topMargin: 20
-        onClicked:{
-            menu.popup()
+        Column{
+            id:layout_column
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+
+            FluButton{
+                text:"左击菜单"
+                Layout.topMargin: 20
+                onClicked:{
+                    menu.popup()
+                }
+            }
+
+            FluButton{
+                text:"右击菜单"
+                Layout.topMargin: 20
+                onClicked: {
+                    showSuccess("请按鼠标右击")
+                }
+                MouseArea{
+                    anchors.fill: parent
+                    acceptedButtons: Qt.RightButton
+                    onClicked: {
+                        menu.popup()
+                    }
+                }
+            }
         }
     }
 
-
-    FluButton{
-        text:"右击菜单"
-        Layout.topMargin: 20
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluMenu{
+    id:menu
+    FluMenuItem:{
+        text:"删除"
         onClicked: {
-            showSuccess("请按鼠标右击")
+            showError("删除")
         }
-        MouseArea{
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: {
-                menu.popup()
-            }
+    }
+    FluMenuItem:{
+        text:"修改"
+        onClicked: {
+            showInfo"修改")
         }
     }
+}
+menu.popup()
+'
+    }
 
     FluMenu{
         id:menu
@@ -46,7 +83,7 @@ FluScrollablePage{
         FluMenuItem{
             text:"修改"
             onClicked: {
-                showError("修改")
+                showInfo("修改")
             }
         }
     }

example/T_MultiWindow.qml

@@ -3,17 +3,18 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
+    property string password: ""
+    property var loginPageRegister: registerForPageResult("/login")
+
     title:"MultiWindow"
     leftPadding:10
     rightPadding:10
     bottomPadding:20
-
-    property string password: ""
-
-    property var loginPageRegister: registerForPageResult("/login")
+    spacing: 0
 
     Connections{
         target: loginPageRegister
@@ -28,7 +29,6 @@ FluScrollablePage{
         height: 100
         paddings: 10
         Layout.topMargin: 20
-
         Column{
             spacing: 15
             anchors{
@@ -46,6 +46,16 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluButton{
+    text:"点击跳转"
+    onClicked: {
+        FluApp.navigate("/about")
+    }
+}
+'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -68,11 +78,30 @@ FluScrollablePage{
                     loginPageRegister.launch({username:"zhuzichu"})
                 }
             }
-
             FluText{
                 text:"登录窗口返回过来的密码->"+password
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'property var loginPageRegister: registerForPageResult("/login")
+
+Connections{
+    target: loginPageRegister
+    function onResult(data)
+    {
+        password = data.password
+    }
+}
+
+FluButton{
+    text:"点击跳转"
+    onClicked: {
+        loginPageRegister.launch({username:"zhuzichu"})
+    }
+}
+'
+    }
 
 }

example/T_Pivot.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,7 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
-
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -46,6 +47,36 @@ FluScrollablePage{
             }
         }
     }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluPivot{
+    anchors.fill: parent
+    FluPivotItem:{
+        text:"All"
+        contentItem: FluText{
+            text:"All emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Unread"
+        contentItem: FluText{
+            text:"Unread emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Flagged"
+        contentItem: FluText{
+            text:"Flagged emails go here."
+        }
+    }
+    FluPivotItem:{
+        text:"Urgent"
+        contentItem: FluText{
+            text:"Urgent emails go here."
+        }
+    }
+}
+'
+    }
 
 }

example/T_Progress.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,30 +11,59 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluProgressBar{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-    }
-    FluProgressRing{
-        Layout.topMargin: 10
-    }
-    FluProgressBar{
-        id:progress_bar
-        Layout.topMargin: 20
-        indeterminate: false
-    }
-    FluProgressRing{
-        id:progress_ring
-        Layout.topMargin: 10
-        indeterminate: false
-    }
-    FluSlider{
-        Layout.topMargin: 30
-        value:50
-        onValueChanged:{
-            progress_bar.progress = value/100
-            progress_ring.progress = value/100
+        height: 260
+        paddings: 10
+        ColumnLayout{
+            spacing: 20
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluProgressBar{
+            }
+            FluProgressRing{
+            }
+            FluProgressBar{
+                id:progress_bar
+                indeterminate: false
+            }
+            FluProgressRing{
+                id:progress_ring
+                indeterminate: false
+            }
+            FluSlider{
+                value:50
+                onValueChanged:{
+                    progress_bar.progress = value/100
+                    progress_ring.progress = value/100
+                }
+            }
         }
-        Layout.bottomMargin: 30
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluProgressBar{
+
+}
+
+FluProgressRing{
+
+}
+
+FluProgressBar{
+    indeterminate: false
+}
+
+FluProgressRing{
+    indeterminate: false
+}'
+    }
+
+
+
 }

example/T_Rectangle.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,108 +11,141 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    RowLayout{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#0078d4"
-            radius:[0,0,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#744da9"
-            radius:[15,15,15,15]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#ffeb3b"
-            radius:[15,0,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#f7630c"
-            radius:[0,15,0,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#e71123"
-            radius:[0,0,15,0]
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            color:"#b4009e"
-            radius:[0,0,0,15]
+        height: 480
+        paddings: 10
+
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+
+            RowLayout{
+                Layout.topMargin: 20
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#0078d4"
+                    radius:[0,0,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#744da9"
+                    radius:[15,15,15,15]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#ffeb3b"
+                    radius:[15,0,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#f7630c"
+                    radius:[0,15,0,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#e71123"
+                    radius:[0,0,15,0]
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    color:"#b4009e"
+                    radius:[0,0,0,15]
+                }
+            }
+            FluText{
+                text:"配合图片使用"
+                fontStyle: FluText.SubTitle
+                Layout.topMargin: 20
+            }
+            RowLayout{
+                spacing: 14
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[25,0,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        source: "qrc:/res/svg/avatar_1.svg"
+                        sourceSize: Qt.size(width,height)
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[10,10,10,10]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_2.svg"
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[25,25,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_3.svg"
+                    }
+                }
+                FluRectangle{
+                    width: 50
+                    height: 50
+                    radius:[0,25,25,25]
+                    Image {
+                        asynchronous: true
+                        anchors.fill: parent
+                        sourceSize: Qt.size(width,height)
+                        source: "qrc:/res/svg/avatar_4.svg"
+                    }
+                }
+            }
+            FluRectangle{
+                width: 1080/5
+                height: 1439/5
+                radius:[25,25,25,25]
+                Image {
+                    asynchronous: true
+                    source: "qrc:/res/image/image_huoyin.webp"
+                    anchors.fill: parent
+                    sourceSize: Qt.size(width,height)
+                }
+                Layout.topMargin: 10
+            }
+
         }
     }
-    FluText{
-        text:"配合图片使用"
-        fontStyle: FluText.SubTitle
-        Layout.topMargin: 20
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluRectangle{
+    radius: [25,25,25,25]
+    width: 50
+    height: 50
+    Image{
+        asynchronous: true
+        anchors.fill: parent
+        source: "qrc:/res/svg/avatar_4.svg"
+        sourceSize: Qt.size(width,height)
     }
-    RowLayout{
-        spacing: 14
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[25,0,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                source: "qrc:/res/svg/avatar_1.svg"
-                sourceSize: Qt.size(width,height)
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[10,10,10,10]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_2.svg"
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[25,25,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_3.svg"
-            }
-        }
-        FluRectangle{
-            width: 50
-            height: 50
-            radius:[0,25,25,25]
-            Image {
-                asynchronous: true
-                anchors.fill: parent
-                sourceSize: Qt.size(width,height)
-                source: "qrc:/res/svg/avatar_4.svg"
-            }
-        }
-    }
-    FluRectangle{
-        width: 1080/5
-        height: 1439/5
-        radius:[25,25,25,25]
-        Image {
-            asynchronous: true
-            source: "qrc:/res/image/image_huoyin.webp"
-            anchors.fill: parent
-            sourceSize: Qt.size(width,height)
-        }
-        Layout.topMargin: 10
+}'
     }
+
+
 }

example/T_Slider.qml

@@ -2,6 +2,7 @@
 import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
+import "./component"
 import FluentUI
 
 FluScrollablePage{
@@ -10,17 +11,46 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluSlider{
+    FluArea{
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
         Layout.topMargin: 20
-        value: 50
-        Layout.leftMargin: 10
+        FluSlider{
+            value: 50
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
-    FluSlider{
-        vertical:true
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluSlider{
+    value:50
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 200
+        paddings: 10
         Layout.topMargin: 20
-        Layout.leftMargin: 10
-        Layout.bottomMargin: 20
-        value: 50
+        FluSlider{
+            value: 50
+            vertical:true
+            anchors.left: parent.left
+            anchors.leftMargin: 20
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluSlider{
+    vertical:true
+    value:50
+}'
+    }
+
+
 }

example/T_TabView.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     property var colors : [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
 
@@ -99,7 +101,7 @@ FluScrollablePage{
 
     FluArea{
         Layout.fillWidth: true
-        Layout.topMargin: 5
+        Layout.topMargin: 15
         height: 400
         paddings: 10
         FluTabView{
@@ -109,5 +111,27 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTabView{
+    anchors.fill: parent
+    Component.onCompleted: {
+        newTab()
+        newTab()
+        newTab()
+    }
+    Component{
+        id:com_page
+        Rectangle{
+            anchors.fill: parent
+            color: argument
+        }
+    }
+    function newTab(){
+        tab_view.appendTab("qrc:/res/image/favicon.ico","Document 1",com_page,argument)
+    }
+}
+'
+    }
 
 }

example/T_TableView.qml

@@ -0,0 +1,110 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"TableView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    Component.onCompleted: {
+        const columns = [
+                          {
+                              title: '姓名',
+                              dataIndex: 'name',
+                              width:100
+                          },
+                          {
+                              title: '年龄',
+                              dataIndex: 'age',
+                              width:100
+                          },
+                          {
+                              title: '住址',
+                              dataIndex: 'address',
+                              width:200
+                          },
+                          {
+                              title: '别名',
+                              dataIndex: 'nickname',
+                              width:100
+                          },
+                          {
+                              title: '操作',
+                              dataIndex: 'action',
+                              width:100
+                          },
+                      ];
+        table_view.columns = columns
+        loadData(1,10)
+    }
+
+
+    FluTableView{
+        id:table_view
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        width:parent.width
+        pageCurrent:1
+        pageCount:10
+        itemCount: 1000
+        onRequestPage:
+            (page,count)=> {
+                loadData(page,count)
+            }
+    }
+
+    Component{
+        id:com_action
+        Item{
+            Row{
+                anchors.centerIn: parent
+                spacing: 10
+                FluFilledButton{
+                    text:"编辑"
+                    topPadding:3
+                    bottomPadding:3
+                    leftPadding:3
+                    rightPadding:3
+                    onClicked:{
+                        console.debug(dataModel.index)
+                        showSuccess(JSON.stringify(dataObject))
+                    }
+                }
+                FluFilledButton{
+                    text:"删除"
+                    topPadding:3
+                    bottomPadding:3
+                    leftPadding:3
+                    rightPadding:3
+                    onClicked:{
+                        showError(JSON.stringify(dataObject))
+                    }
+                }
+            }
+        }
+    }
+
+    function loadData(page,count){
+        const dataSource = []
+        for(var i=0;i<count;i++){
+            dataSource.push({
+                                name: "孙悟空%1".arg(((page-1)*count+i)),
+                                age: 500,
+                                address: "钟灵毓秀的花果山,如神仙仙境的水帘洞",
+                                nickname: "齐天大圣",
+                                action:com_action
+                            })
+        }
+
+        table_view.dataSource = dataSource
+    }
+
+
+}

example/T_TextBox.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,32 +11,122 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluTextBox{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
-        placeholderText: "单行输入框"
-        Layout.preferredWidth: 300
-        disabled:toggle_switch.selected
+
+        FluTextBox{
+            Layout.topMargin: 20
+            placeholderText: "单行输入框"
+            Layout.preferredWidth: 300
+            disabled:text_box_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
     }
-    FluMultilineTextBox{
-        Layout.topMargin: 20
-        Layout.preferredWidth: 300
-        placeholderText: "多行输入框"
-        disabled:toggle_switch.selected
-    }
-    FluAutoSuggestBox{
-        Layout.topMargin: 20
-        items:generateRandomNames(100)
-        placeholderText: "AutoSuggestBox"
-        Layout.preferredWidth: 300
-        disabled:toggle_switch.selected
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTextBox{
+    placeholderText:"单行输入框"
+}'
     }
 
-    FluToggleSwitch{
-        id:toggle_switch
-        text:"Disabled"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
+
+        FluMultilineTextBox{
+            Layout.topMargin: 20
+            placeholderText: "多行输入框"
+            Layout.preferredWidth: 300
+            disabled:text_box_multi_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_multi_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluMultilineTextBox{
+    placeholderText:"多行输入框"
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+
+        FluAutoSuggestBox{
+            Layout.topMargin: 20
+            placeholderText: "AutoSuggestBox"
+            Layout.preferredWidth: 300
+            items:generateRandomNames(100)
+            disabled:text_box_suggest_switch.selected
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+
+        Row{
+            spacing: 5
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            FluToggleSwitch{
+                id:text_box_suggest_switch
+                Layout.alignment: Qt.AlignRight
+                text:"Disabled"
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluAutoSuggestBox{
+    placeholderText:"AutoSuggestBox"
+}'
+    }
+
 
     function generateRandomNames(numNames) {
         const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';

example/T_Theme.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,52 +11,78 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    RowLayout{
+    FluArea{
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        Repeater{
-            model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
-            delegate:  FluRectangle{
-                width: 42
-                height: 42
-                radius: [4,4,4,4]
-                color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
-                FluIcon {
-                    anchors.centerIn: parent
-                    iconSource: FluentIcons.AcceptMedium
-                    iconSize: 15
-                    visible: modelData === FluTheme.primaryColor
-                    color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
-                }
-                MouseArea{
-                    id:mouse_item
-                    anchors.fill: parent
-                    hoverEnabled: true
-                    onClicked: {
-                        FluTheme.primaryColor = modelData
+        height: 210
+        paddings: 10
+        ColumnLayout{
+            spacing:0
+            anchors{
+                left: parent.left
+            }
+            RowLayout{
+                Layout.topMargin: 10
+                Repeater{
+                    model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
+                    delegate:  FluRectangle{
+                        width: 42
+                        height: 42
+                        radius: [4,4,4,4]
+                        color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
+                        FluIcon {
+                            anchors.centerIn: parent
+                            iconSource: FluentIcons.AcceptMedium
+                            iconSize: 15
+                            visible: modelData === FluTheme.primaryColor
+                            color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
+                        }
+                        MouseArea{
+                            id:mouse_item
+                            anchors.fill: parent
+                            hoverEnabled: true
+                            onClicked: {
+                                FluTheme.primaryColor = modelData
+                            }
+                        }
                     }
                 }
             }
+            FluText{
+                text:"夜间模式"
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                Layout.topMargin: 5
+                selected: FluTheme.dark
+                clickFunc:function(){
+                    FluTheme.dark = !FluTheme.dark
+                }
+            }
+            FluText{
+                text:"native文本渲染"
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                Layout.topMargin: 5
+                selected: FluTheme.nativeText
+                clickFunc:function(){
+                    FluTheme.nativeText = !FluTheme.nativeText
+                }
+            }
         }
     }
-    FluText{
-        text:"夜间模式"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.dark
-        clickFunc:function(){
-            FluTheme.dark = !FluTheme.dark
-        }
-    }
-    FluText{
-        text:"native文本渲染"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.nativeText
-        clickFunc:function(){
-            FluTheme.nativeText = !FluTheme.nativeText
-        }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTheme.primaryColor = FluColors.Orange
+
+FluTheme.dark = true
+
+FluTheme.nativeText = true
+'
     }
+
+
 }

example/T_TimePicker.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,6 +11,7 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
         Layout.fillWidth: true
@@ -33,7 +35,12 @@ FluScrollablePage{
 
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTimePicker{
 
+}'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -49,15 +56,20 @@ FluScrollablePage{
             }
 
             FluText{
-                text:"hourFormat=FluTimePicker.HH"
+                text:"hourFormat=FluTimePicker.H"
             }
 
             FluTimePicker{
-                hourFormat:FluTimePicker.HH
+                 hourFormat:FluTimePicker.HH
             }
 
         }
     }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTimePicker{
+    hourFormat:FluTimePicker.HH
+}'
+    }
 
 }

example/T_ToggleSwitch.qml

@@ -3,6 +3,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,12 +11,29 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
-    FluToggleSwitch{
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
         Layout.topMargin: 20
+        Row{
+            spacing: 30
+            anchors.verticalCenter: parent.verticalCenter
+            FluToggleSwitch{
+            }
+            FluToggleSwitch{
+                text:"Text"
+            }
+        }
     }
-    FluToggleSwitch{
-        Layout.topMargin: 20
-        text:"Text"
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluToggleSwitch{
+    text:"Text"
+}'
     }
+
+
 }

example/T_Tooltip.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,13 +11,13 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluText{
         Layout.topMargin: 20
         text:"鼠标悬停不动，弹出Tooltip"
     }
 
-
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
@@ -42,6 +43,18 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluIconButton{
+    iconSource:FluentIcons.ChromeCloseContrast
+    iconSize: 15
+    text:"删除"
+    onClicked:{
+        showSuccess("点击IconButton")
+    }
+}
+'
+    }
 
     FluArea{
         Layout.fillWidth: true
@@ -72,6 +85,22 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluButton{
+    id:button_1
+    text:"删除"
+    FluTooltip{
+        visible: button_1.hovered
+        text:button_1.text
+        delay: 1000
+    }
+    onClicked:{
+        showSuccess("点击一个Button")
+    }
+}
+'
+    }
 
 
 }

example/T_TreeView.qml

@@ -3,13 +3,15 @@ import QtQuick.Layouts
 import QtQuick.Window
 import QtQuick.Controls
 import FluentUI
+import "./component"
 
-FluContentPage {
+FluScrollablePage {
 
     title:"TreeView"
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     function randomName() {
         var names = ["张三", "李四", "王五", "赵六", "钱七", "孙八", "周九", "吴十"]
@@ -50,95 +52,110 @@ FluContentPage {
         return [tree_view.createItem(randomCompany(), true, subtrees)].concat(createOrg(numLevels - 1, numSubtrees, numEmployees))
     }
 
-
-    FluTreeView{
-        id:tree_view
-        width:240
-        anchors{
-            top:parent.top
-            left:parent.left
-            bottom:parent.bottom
-        }
-        onItemClicked:
-            (model)=>{
-                showSuccess(model.text)
+    FluArea{
+        id:layout_actions
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 50
+        paddings: 10
+        RowLayout{
+            spacing: 14
+            FluDropDownButton{
+                id:btn_selection_model
+                Layout.preferredWidth: 140
+                text:"None"
+                items:[
+                    FluMenuItem{
+                        text:"None"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.Equal
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Single"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.SizeToContent
+                        }
+                    },
+                    FluMenuItem{
+                        text:"Muiltple"
+                        onClicked: {
+                            btn_selection_model.text = text
+                            tree_view.selectionMode = FluTabView.Compact
+                        }
+                    }
+                ]
+            }
+            FluFilledButton{
+                text:"获取选中的数据"
+                onClicked: {
+                    if(tree_view.selectionMode === FluTreeView.None){
+                        showError("当前非选择模式,没有选中的数据")
+                    }
+                    if(tree_view.selectionMode === FluTreeView.Single){
+                        if(!tree_view.signleData()){
+                            showError("没有选中数据")
+                            return
+                        }
+                        showSuccess(tree_view.signleData().text)
+                    }
+                    if(tree_view.selectionMode === FluTreeView.Multiple){
+                        if(tree_view.multipData().length===0){
+                            showError("没有选中数据")
+                            return
+                        }
+                        var info = []
+                        tree_view.multipData().map((value)=>info.push(value.text))
+                        showSuccess(info.join(","))
+                    }
+                }
             }
-
-        Component.onCompleted: {
-            var org = createOrg(3, 3, 3)
-            updateData(org)
-
         }
+    }
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 10
+        paddings: 10
+        height: 400
+        FluTreeView{
+            id:tree_view
+            width:240
+            anchors{
+                top:parent.top
+                left:parent.left
+                bottom:parent.bottom
+            }
+            onItemClicked:
+                (model)=>{
+                    showSuccess(model.text)
+                }
 
+            Component.onCompleted: {
+                var org = createOrg(3, 3, 3)
+                createItem()
+                updateData(org)
+            }
+        }
     }
 
-
-    ColumnLayout{
-        anchors{
-            left: tree_view.right
-            right: parent.right
-            top: parent.top
-        }
-
-        FluText{
-            text:{
-                if(tree_view.selectionMode === FluTreeView.None){
-                    return "selectionMode->FluTreeView.None"
-                }
-                if(tree_view.selectionMode === FluTreeView.Single){
-                    return "selectionMode->FluTreeView.Single"
-                }
-                if(tree_view.selectionMode === FluTreeView.Multiple){
-                    return "selectionMode->FluTreeView.Multiple"
-                }
-            }
-        }
-
-        FluButton{
-            text:"None"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.None
-            }
-        }
-
-        FluButton{
-            text:"Single"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.Single
-            }
-        }
-
-        FluButton{
-            text:"Multiple"
-            onClicked: {
-                tree_view.selectionMode = FluTreeView.Multiple
-            }
-        }
-
-        FluFilledButton{
-            text:"获取选中的数据"
-            onClicked: {
-                if(tree_view.selectionMode === FluTreeView.None){
-                    showError("当前非选择模式,没有选中的数据")
-                }
-                if(tree_view.selectionMode === FluTreeView.Single){
-                    if(!tree_view.signleData()){
-                        showError("没有选中数据")
-                        return
-                    }
-                    showSuccess(tree_view.signleData().text)
-                }
-                if(tree_view.selectionMode === FluTreeView.Multiple){
-                    if(tree_view.multipData().length===0){
-                        showError("没有选中数据")
-                        return
-                    }
-                    var info = []
-                    tree_view.multipData().map((value)=>info.push(value.text))
-                    showSuccess(info.join(","))
-                }
-            }
-        }
-
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTreeView{
+    id:tree_view
+    width:240
+    height:600
+    Component.onCompleted: {
+        var datas = []
+        datas.push(createItem("Node1",false))
+        datas.push(createItem("Node2",false))
+        datas.push(createItem("Node2",true,[createItem("Node2-1",false),createItem("Node2-2",false)]))
+        updateData(datas)
     }
 }
+'
+    }
+
+
+}

example/T_Typography.qml

@@ -15,15 +15,19 @@ FluContentPage {
         slider.seek(0)
     }
 
-    ScrollView{
-        clip: true
-        width: parent.width
-        contentWidth: parent.width
+    FluArea{
+        anchors{
+            top:parent.top
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            topMargin: 20
+        }
+        paddings: 10
         ColumnLayout{
             spacing: 0
             FluText{
                 text:"Display"
-                Layout.topMargin: 20
                 padding: 0
                 pixelSize: textSize
                 fontStyle: FluText.Display
@@ -65,21 +69,26 @@ FluContentPage {
                 fontStyle: FluText.Caption
             }
         }
+
+        FluSlider{
+            id:slider
+            vertical:true
+            anchors{
+                right: parent.right
+                rightMargin: 45
+                top: parent.top
+                topMargin: 30
+            }
+            onValueChanged:{
+                textSize = value/100*6+FluTheme.textSize
+            }
+        }
+
     }
 
 
-    FluSlider{
-        id:slider
-        vertical:true
-        anchors{
-            right: parent.right
-            rightMargin: 45
-            top: parent.top
-            topMargin: 30
-        }
-        onValueChanged:{
-            textSize = value/100*6+FluTheme.textSize
-        }
-    }
+
+
+
 
 }

example/component/CodeExpander.qml

@@ -0,0 +1,125 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+
+FluExpander{
+
+    property string code: ""
+
+    headerText: "Source"
+    contentHeight:content.height
+
+    FluMultilineTextBox{
+        id:content
+        width:parent.width
+        readOnly:true
+        text:highlightQmlCode(code)
+        focus:false
+        textFormat: FluMultilineTextBox.RichText
+        KeyNavigation.priority: KeyNavigation.BeforeItem
+        background:Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+            border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            border.width: 1
+        }
+    }
+
+    FluIconButton{
+        iconSource:FluentIcons.Copy
+        anchors{
+            right: parent.right
+            top: parent.top
+            rightMargin: 5
+            topMargin: 5
+        }
+        onClicked:{
+            FluApp.clipText(content.text)
+            showSuccess("复制成功")
+        }
+    }
+
+    function htmlEncode(e){
+      var i,s;
+      for(i in s={
+        "&":/&/g,//""//":/"/g,"'":/'/g,
+        "<":/</g,">":/>/g,"<br/>":/\n/g,
+        " ":/ /g,"  ":/\t/g
+      })e=e.replace(s[i],i);
+      return e;
+    }
+
+    function highlightQmlCode(code) {
+      // 定义 QML 关键字列表
+      var qmlKeywords = [
+        "FluTextButton",
+        "FluAppBar",
+          "FluAutoSuggestBox",
+          "FluBadge",
+          "FluButton",
+          "FluCalendarPicker",
+          "FluCalendarView",
+          "FluCarousel",
+          "FluCheckBox",
+          "FluColorPicker",
+          "FluColorView",
+          "FluComboBox",
+          "FluContentDialog",
+          "FluContentPage",
+          "FluControl",
+          "FluDatePicker",
+          "FluDivider",
+          "FluDropDownButton",
+          "FluExpander",
+          "FluFilledButton",
+          "FluFlipView",
+          "FluFocusRectangle",
+          "FluIcon",
+          "FluIconButton",
+          "FluInfoBar",
+          "FluItem",
+          "FluMediaPlayer",
+          "FluMenu",
+          "FluMenuItem",
+          "FluMultilineTextBox",
+          "FluNavigationView",
+          "FluObject",
+          "FluPaneItem",
+          "FluPaneItemExpander",
+          "FluPaneItemHeader",
+          "FluPaneItemSeparator",
+          "FluPivot",
+          "FluPivotItem",
+          "FluProgressBar",
+          "FluProgressRing",
+          "FluRadioButton",
+          "FluRectangle",
+          "FluScrollablePage",
+          "FluScrollBar",
+          "FluShadow",
+          "FluSlider",
+          "FluTabView",
+          "FluText",
+          "FluTextArea",
+          "FluTextBox",
+          "FluTextBoxBackground",
+          "FluTextBoxMenu",
+          "FluTextButton",
+          "FluTextFiled",
+          "FluTimePicker",
+          "FluToggleSwitch",
+          "FluTooltip",
+          "FluTreeView",
+          "FluWindow",
+          "FluWindowResize"
+      ];
+      code = code.replace(/\n/g, "<br>");
+      code = code.replace(/ /g, "&nbsp;");
+      return code.replace(RegExp("\\b(" + qmlKeywords.join("|") + ")\\b", "g"), "<span style='color: #c23a80'>$1</span>");
+    }
+
+
+
+}

example/example.pro

@@ -23,13 +23,15 @@ CONFIG(debug,debug|release) {
 }
 
 win32 {
-contains(QT_ARCH, i386) {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
+
+contains(QMAKE_CC, cl) {
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/msvc/*.dll) $$DESTDIR
     QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
 } else {
-    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
+    COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/mingw/*.dll) $$DESTDIR
     QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
 }
+
 }
 
 qnx: target.path = /tmp/$${TARGET}/bin

example/global/ItemsOriginal.qml

@@ -3,7 +3,6 @@
 import QtQuick
 import FluentUI
 
-
 FluObject{
 
     property var navigationView
@@ -19,7 +18,6 @@ FluObject{
     FluPaneItemExpander{
         title:"Basic input"
         icon:FluentIcons.CheckboxComposite
-
         FluPaneItem{
             title:"Buttons"
             image:"qrc:/res/image/control/Button.png"
@@ -38,7 +36,6 @@ FluObject{
                 navigationView.push("qrc:/T_Slider.qml")
             }
         }
-
         FluPaneItem{
             title:"CheckBox"
             image:"qrc:/res/image/control/Checkbox.png"
@@ -48,7 +45,6 @@ FluObject{
                 navigationView.push("qrc:/T_CheckBox.qml")
             }
         }
-
         FluPaneItem{
             title:"ToggleSwitch"
             onTap:{
@@ -92,11 +88,9 @@ FluObject{
         }
     }
 
-
     FluPaneItemExpander{
         title:"Surface"
         icon:FluentIcons.SurfaceHub
-
         FluPaneItem{
             title:"InfoBar"
             image:"qrc:/res/image/control/InfoBar.png"
@@ -106,42 +100,36 @@ FluObject{
                 navigationView.push("qrc:/T_InfoBar.qml")
             }
         }
-
         FluPaneItem{
             title:"Progress"
             onTap:{
                 navigationView.push("qrc:/T_Progress.qml")
             }
         }
-
         FluPaneItem{
             title:"Badge"
             onTap:{
                 navigationView.push("qrc:/T_Badge.qml")
             }
         }
-
         FluPaneItem{
             title:"Rectangle"
             onTap:{
                 navigationView.push("qrc:/T_Rectangle.qml")
             }
         }
-
         FluPaneItem{
             title:"Carousel"
             onTap:{
                 navigationView.push("qrc:/T_Carousel.qml")
             }
         }
-
         FluPaneItem{
             title:"Expander"
             onTap:{
                 navigationView.push("qrc:/T_Expander.qml")
             }
         }
-
     }
 
     FluPaneItemExpander{
@@ -153,14 +141,12 @@ FluObject{
                 navigationView.push("qrc:/T_Dialog.qml")
             }
         }
-
         FluPaneItem{
             title:"Tooltip"
             onTap:{
                 navigationView.push("qrc:/T_Tooltip.qml")
             }
         }
-
         FluPaneItem{
             title:"Menu"
             onTap:{
@@ -172,7 +158,6 @@ FluObject{
     FluPaneItemExpander{
         title:"Navigation"
         icon:FluentIcons.AllApps
-
         FluPaneItem{
             title:"Pivot"
             image:"qrc:/res/image/control/Pivot.png"
@@ -199,6 +184,16 @@ FluObject{
                 navigationView.push("qrc:/T_TreeView.qml")
             }
         }
+        FluPaneItem{
+            title:"TableView"
+            image:"qrc:/res/image/control/DataGrid.png"
+            recentlyAdded:true
+            order:4
+            desc:"The TableView control provides a flexible way to display a collection of data in rows and columns"
+            onTap:{
+                navigationView.push("qrc:/T_TableView.qml")
+            }
+        }
         FluPaneItem{
             title:"MultiWindow"
             onTap:{
@@ -226,19 +221,18 @@ FluObject{
                 navigationView.push("qrc:/T_Theme.qml")
             }
         }
-
-        FluPaneItem{
-            title:"Awesome"
-            onTap:{
-                navigationView.push("qrc:/T_Awesome.qml")
-            }
-        }
         FluPaneItem{
             title:"Typography"
             onTap:{
                 navigationView.push("qrc:/T_Typography.qml")
             }
         }
+        FluPaneItem{
+            title:"Awesome"
+            onTap:{
+                navigationView.push("qrc:/T_Awesome.qml")
+            }
+        }
     }
 
     FluPaneItemExpander{

example/page/AboutPage.qml

@@ -36,7 +36,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.1.9"
+                text:"v1.2.1"
                 fontStyle: FluText.Body
                 Layout.alignment: Qt.AlignBottom
             }

example/page/ChatPage.qml

@@ -183,7 +183,7 @@ FluWindow {
                 rightMargin: 10
             }
             height: Math.min(textbox.implicitHeight,64)
-            FluMultiLineTextBox{
+            FluMultilineTextBox{
                 id:textbox
                 focus:true
                 placeholderText: "请输入消息"

example/qml.qrc

@@ -155,5 +155,7 @@
         <file>page/MediaPage.qml</file>
         <file>T_FlipView.qml</file>
         <file>T_Pivot.qml</file>
+        <file>component/CodeExpander.qml</file>
+        <file>T_TableView.qml</file>
     </qresource>
 </RCC>

src/Fluent.cpp

@@ -33,6 +33,8 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
 
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluToggleButton.qml"),uri,major,minor,"FluToggleButton");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTableView.qml"),uri,major,minor,"FluTableView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivotItem.qml"),uri,major,minor,"FluPivotItem");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPivot.qml"),uri,major,minor,"FluPivot");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluFlipView.qml"),uri,major,minor,"FluFlipView");

src/controls/FluButton.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls
 import FluentUI
 
-Button {
+FluControl {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
@@ -43,11 +43,17 @@ Button {
                 if(disabled){
                     return Qt.rgba(131/255,131/255,131/255,1)
                 }
+                if(pressed){
+                    return Qt.rgba(162/255,162/255,162/255,1)
+                }
                 return Qt.rgba(1,1,1,1)
             }else{
                 if(disabled){
                     return Qt.rgba(160/255,160/255,160/255,1)
                 }
+                if(pressed){
+                    return Qt.rgba(96/255,96/255,96/255,1)
+                }
                 return Qt.rgba(0,0,0,1)
             }
         }

src/controls/FluCheckBox.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
 
-Button {
+FluControl {
 
     property bool selected: false
     property var clickFunc
@@ -12,10 +12,13 @@ Button {
     property color borderSelectedColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
     property color borderHoverColor: FluTheme.dark ? Qt.rgba(167/255,167/255,167/255,1) : Qt.rgba(135/255,135/255,135/255,1)
     property color borderDisableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
+    property color borderPressedColor: FluTheme.dark ? Qt.rgba(90/255,90/255,90/255,1) : Qt.rgba(191/255,191/255,191/255,1)
+
     property color normalColor: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(247/255,247/255,247/255,1)
     property color selectedColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
-    property color hoverColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(244/255,244/255,244/255,1)
-    property color selectedHoverColor: FluTheme.dark ? Qt.darker(selectedColor,1.1) : Qt.lighter(selectedColor,1.1)
+    property color hoverColor: FluTheme.dark ? Qt.rgba(72/255,72/255,72/255,1) : Qt.rgba(236/255,236/255,236/255,1)
+    property color selectedHoverColor: FluTheme.dark ? Qt.darker(selectedColor,1.15) : Qt.lighter(selectedColor,1.15)
+    property color selectedPreesedColor: FluTheme.dark ? Qt.darker(selectedColor,1.3) : Qt.lighter(selectedColor,1.3)
     property color selectedDisableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
     property color disableColor: FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(253/255,253/255,253/255,1)
 
@@ -52,6 +55,9 @@ Button {
                 if(selected){
                     return borderSelectedColor
                 }
+                if(pressed){
+                    return borderPressedColor
+                }
                 if(hovered){
                     return borderHoverColor
                 }
@@ -63,6 +69,9 @@ Button {
                     if(disabled){
                         return selectedDisableColor
                     }
+                    if(pressed){
+                        return selectedPreesedColor
+                    }
                     if(hovered){
                         return selectedHoverColor
                     }

src/controls/FluColorPicker.qml

@@ -4,8 +4,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
 
-
-Button{
+FluControl{
     id:control
     width: 36
     height: 36

src/controls/FluControl.qml

@@ -0,0 +1,13 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+import FluentUI
+
+T.Button {
+    id: control
+    implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+                            implicitContentWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             implicitContentHeight + topPadding + bottomPadding)
+}

src/controls/FluDropDownButton.qml

@@ -3,7 +3,7 @@ import QtQuick.Controls
 import QtQuick.Window
 import FluentUI
 
-Button {
+FluControl {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
@@ -58,11 +58,17 @@ Button {
                 if(disabled){
                     return Qt.rgba(131/255,131/255,131/255,1)
                 }
+                if(pressed){
+                    return Qt.rgba(162/255,162/255,162/255,1)
+                }
                 return Qt.rgba(1,1,1,1)
             }else{
                 if(disabled){
                     return Qt.rgba(160/255,160/255,160/255,1)
                 }
+                if(pressed){
+                    return Qt.rgba(96/255,96/255,96/255,1)
+                }
                 return Qt.rgba(0,0,0,1)
             }
         }

src/controls/FluFilledButton.qml

@@ -2,12 +2,13 @@
 import QtQuick.Controls
 import FluentUI
 
-Button {
+FluControl {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
     property color hoverColor: FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
     property color disableColor: FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
+    property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2)
 
     id: control
     enabled: !disabled
@@ -27,6 +28,9 @@ Button {
             if(disabled){
                 return disableColor
             }
+            if(pressed){
+                return pressedColor
+            }
             return hovered ? hoverColor :normalColor
         }
     }

src/controls/FluFlipView.qml

@@ -52,7 +52,7 @@ Item{
         anchors.fill: parent
     }
 
-    Button{
+    FluControl{
         id:btn_start
         height: vertical ? 20 : 40
         width: vertical ? 40 : 20
@@ -82,7 +82,7 @@ Item{
         }
     }
 
-    Button{
+    FluControl{
         id:btn_end
         height: vertical ? 20 : 40
         width: vertical ? 40 : 20

src/controls/FluIconButton.qml

@@ -2,19 +2,23 @@
 import QtQuick.Controls
 import FluentUI
 
-Button {
+FluControl {
 
     property int iconSize: 20
     property int iconSource
     property bool disabled: false
     property int radius:4
     property color hoverColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(0,0,0,0.03)
+    property color pressedColor: FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(0,0,0,0.06)
     property color normalColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
     property color disableColor: FluTheme.dark ? Qt.rgba(0,0,0,0) : Qt.rgba(0,0,0,0)
     property color color: {
         if(disabled){
             return disableColor
         }
+        if(pressed){
+            return pressedColor
+        }
         return hovered ? hoverColor : normalColor
     }
     property color iconColor: {

src/controls/FluMultilineTextBox.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls
 import FluentUI
 
-TextArea{
+FluTextArea{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize

src/controls/FluNavigationView.qml

@@ -150,20 +150,20 @@ Item {
                 }
                 color: {
                     if(FluTheme.dark){
-                        if(item_mouse.containsMouse){
-                            return Qt.rgba(1,1,1,0.03)
-                        }
                         if((nav_list.currentIndex === position)&&type===0){
                             return Qt.rgba(1,1,1,0.06)
                         }
+                        if(item_mouse.containsMouse){
+                            return Qt.rgba(1,1,1,0.03)
+                        }
                         return Qt.rgba(0,0,0,0)
                     }else{
-                        if(item_mouse.containsMouse){
-                            return Qt.rgba(0,0,0,0.03)
-                        }
                         if(nav_list.currentIndex === position&&type===0){
                             return Qt.rgba(0,0,0,0.06)
                         }
+                        if(item_mouse.containsMouse){
+                            return Qt.rgba(0,0,0,0.03)
+                        }
                         return Qt.rgba(0,0,0,0)
                     }
                 }
@@ -193,6 +193,12 @@ Item {
                         verticalCenter: parent.verticalCenter
                         left:item_icon.right
                     }
+                    color:{
+                        if(item_mouse.pressed){
+                            return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
+                        }
+                        return FluTheme.dark ? FluColors.White : FluColors.Grey220
+                    }
                 }
             }
         }
@@ -233,7 +239,10 @@ Item {
                     anchors.fill: parent
                     onClicked: {
                         if(type===0){
-                            model.repTap()
+                            if(model.tapFunc){
+                                model.tapFunc()
+                                return
+                            }
                             if(nav_list.currentIndex !== position){
                                 nav_list.currentIndex = position
                                 model.tap()
@@ -246,20 +255,20 @@ Item {
                 }
                 color: {
                     if(FluTheme.dark){
-                        if(item_mouse.containsMouse){
-                            return Qt.rgba(1,1,1,0.03)
-                        }
                         if((nav_list.currentIndex === position)&&type===0){
                             return Qt.rgba(1,1,1,0.06)
                         }
+                        if(item_mouse.containsMouse){
+                            return Qt.rgba(1,1,1,0.03)
+                        }
                         return Qt.rgba(0,0,0,0)
                     }else{
-                        if(item_mouse.containsMouse){
-                            return Qt.rgba(0,0,0,0.03)
-                        }
                         if(nav_list.currentIndex === position&&type===0){
                             return Qt.rgba(0,0,0,0.06)
                         }
+                        if(item_mouse.containsMouse){
+                            return Qt.rgba(0,0,0,0.03)
+                        }
                         return Qt.rgba(0,0,0,0)
                     }
                 }
@@ -285,6 +294,12 @@ Item {
                 FluText{
                     id:item_title
                     text:model.title
+                    color:{
+                        if(item_mouse.pressed){
+                            return FluTheme.dark ? FluColors.Grey80 : FluColors.Grey120
+                        }
+                        return FluTheme.dark ? FluColors.White : FluColors.Grey220
+                    }
                     anchors{
                         verticalCenter: parent.verticalCenter
                         left:item_icon.right

src/controls/FluPagination.qml

@@ -0,0 +1,110 @@
+import QtQuick
+import FluentUI
+import QtQuick.Layouts
+
+Item {
+    id: control
+
+
+    signal requestPage(int page,int count)
+    property int pageCurrent: 0
+    property int itemCount: 0
+    property int pageCount: itemCount>0?Math.ceil(itemCount/__itemPerPage):0
+    property int __itemPerPage: 10
+    property int pageButtonCount: 5
+    property int __pageButtonHalf: Math.floor(pageButtonCount/2)+1
+
+
+    implicitHeight: 40
+    implicitWidth: content.width
+
+    Row{
+        id: content
+        height: control.height
+        spacing: 25
+        padding: 10
+
+
+        FluToggleButton{
+            visible: control.pageCount>1
+            disabled: control.pageCurrent<=1
+            text:"<上一页"
+            onClicked: {
+                control.calcNewPage(control.pageCurrent-1);
+            }
+        }
+
+        Row{
+            spacing: 5
+            FluToggleButton{
+                property int pageNumber:1
+                visible: control.pageCount>0
+                enabled: control.pageCurrent>1
+                selected: pageNumber === control.pageCurrent
+                text:String(pageNumber)
+                onClicked: {
+                    control.calcNewPage(pageNumber);
+                }
+            }
+            FluText{
+                visible: (control.pageCount>control.pageButtonCount&&
+                          control.pageCurrent>control.__pageButtonHalf)
+                text: "..."
+            }
+            Repeater{
+                id: button_repeator
+                model: (control.pageCount<2)?0:(control.pageCount>=control.pageButtonCount)?(control.pageButtonCount-2):(control.pageCount-2)
+                delegate:FluToggleButton{
+                    property int  pageNumber: {
+                        return (control.pageCurrent<=control.__pageButtonHalf)
+                                ?(2+index)
+                                :(control.pageCount-control.pageCurrent<=control.pageButtonCount-control.__pageButtonHalf)
+                                  ?(control.pageCount-button_repeator.count+index)
+                                  :(control.pageCurrent+2+index-control.__pageButtonHalf)
+                    }
+                    text:String(pageNumber)
+                    selected: pageNumber === control.pageCurrent
+                    onClicked: {
+                        control.calcNewPage(pageNumber);
+                    }
+                }
+            }
+            FluText{
+                visible: (control.pageCount>control.pageButtonCount&&
+                          control.pageCount-control.pageCurrent>control.pageButtonCount-control.__pageButtonHalf)
+                text: "..."
+            }
+            FluToggleButton{
+                property int pageNumber:control.pageCount
+                visible: control.pageCount>0
+                enabled: control.pageCurrent>1
+                selected: pageNumber === control.pageCurrent
+                text:String(pageNumber)
+                onClicked: {
+                    control.calcNewPage(pageNumber);
+                }
+            }
+        }
+        FluToggleButton{
+            visible: control.pageCount>1
+            disabled: control.pageCurrent>=control.pageCount
+            text:"下一页>"
+            onClicked: {
+                control.calcNewPage(control.pageCurrent+1);
+            }
+        }
+    }
+
+    function calcNewPage(page)
+    {
+        if(!page)
+            return
+        let page_num=Number(page)
+        if(page_num<1||page_num>control.pageCount||page_num===control.pageCurrent)
+            return
+        control.pageCurrent=page_num
+        control.requestPage(page_num,control.__itemPerPage)
+    }
+
+
+}

src/controls/FluPaneItem.qml

@@ -14,5 +14,5 @@ QtObject {
     property var parent
     property int idx
     signal tap
-    signal repTap
+    property var tapFunc
 }

src/controls/FluPaneItemExpander.qml

@@ -10,5 +10,4 @@ FluObject {
     property var parent
     property int idx
     signal tap
-    signal repTap
 }

src/controls/FluRadioButton.qml

@@ -3,8 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import FluentUI
 
-
-Button {
+FluControl {
 
     property bool selected: false
     property bool disabled: false

src/controls/FluScrollBar.qml

@@ -114,11 +114,9 @@ ScrollBar {
             anchors.fill: parent
             onEntered: {
                 timer.restart()
-                console.debug("onEntered")
             }
             onExited: {
                 timer.restart()
-                console.debug("onExited")
             }
         }
     }

src/controls/FluTableView.qml

@@ -0,0 +1,193 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+Item {
+
+    id:control
+    property var columns : []
+    property var dataSource : []
+    property int pageCurrent: 1
+    property int itemCount: 1000
+    property int pageCount: 10
+    property int itemHeight: 56
+    signal requestPage(int page,int count)
+
+    implicitHeight: layout_coumns.height + layout_table.height
+
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+    }
+
+    ListModel{
+        id:model_coumns
+    }
+
+    ListModel{
+        id:model_data_source
+    }
+
+    onColumnsChanged: {
+        model_coumns.clear()
+        model_coumns.append(columns)
+    }
+
+    onDataSourceChanged: {
+        model_data_source.clear()
+        model_data_source.append(dataSource)
+    }
+
+    FluRectangle{
+        id:layout_coumns
+        height: control.itemHeight
+        width: parent.width
+        color:FluTheme.dark ? Qt.rgba(50/255,50/255,50/255,1) : Qt.rgba(247/255,247/255,247/255,1)
+        radius: [12,12,0,0]
+
+        Row{
+            id:list_coumns
+            spacing: 0
+            anchors.fill: parent
+            Repeater{
+                model: model_coumns
+                delegate: Item{
+                    height: list_coumns.height
+                    width: model.width
+                    FluText{
+                        text:model.title
+                        anchors{
+                            verticalCenter: parent.verticalCenter
+                            left: parent.left
+                            leftMargin: 14
+                        }
+                        fontStyle: FluText.BodyStrong
+                    }
+                    FluDivider{
+                        width: 1
+                        height: 40
+                        anchors.right: parent.right
+                        anchors.verticalCenter: parent.verticalCenter
+                        visible: index !== list_coumns.count-1
+                    }
+                }
+            }
+        }
+    }
+
+    Rectangle{
+        anchors.fill: layout_table
+        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+    }
+
+    ListView{
+        id:layout_table
+        anchors{
+            top: layout_coumns.bottom
+            left: parent.left
+            right: parent.right
+        }
+        height: contentHeight
+        clip:true
+        footer: Item{
+            height: 50
+            width:  layout_table.width
+            FluPagination{
+                id:pagination
+                height: 40
+                pageCurrent: control.pageCurrent
+                itemCount: control.itemCount
+                pageCount: control.pageCount
+                onRequestPage:
+                    (page,count)=> {
+                        control.requestPage(page,count)
+                    }
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    right: parent.right
+                }
+            }
+        }
+        model:model_data_source
+        delegate: Item{
+            height: list_coumns.height
+            width: layout_table.width
+            property var model_values : getObjectValues(index)
+            property var itemObject: getObject(index)
+            property var listModel: model
+            Row{
+                spacing: 0
+                anchors.fill: parent
+                Repeater{
+                    model: model_values
+                    delegate:Item{
+                        height: list_coumns.height
+                        width: modelData.width
+                        Loader{
+                            property var model : modelData
+                            property var dataModel : listModel
+                            property var dataObject : itemObject
+                            anchors.fill: parent
+                            sourceComponent: {
+                                if(model.itemData instanceof Component){
+                                    return model.itemData
+                                }
+                                return com_text
+                            }
+                        }
+                    }
+                }
+            }
+            FluDivider{
+                width: parent.width
+                height: 1
+                anchors.right: parent.right
+                anchors.bottom: parent.bottom
+            }
+        }
+    }
+
+    Component{
+        id:com_text
+        Item{
+            MouseArea{
+                id:item_mouse
+                hoverEnabled: true
+                anchors.fill: parent
+            }
+            FluText{
+                text:String(model.itemData)
+                width: parent.width - 14
+                elide: Text.ElideRight
+                anchors{
+                    verticalCenter: parent.verticalCenter
+                    left: parent.left
+                    leftMargin: 14
+                }
+                FluTooltip{
+                    visible: item_mouse.containsMouse
+                    text:parent.text
+                    delay: 1000
+                }
+            }
+        }
+    }
+
+    function getObject(index){
+        return model_data_source.get(index)
+    }
+
+    function getObjectValues(index) {
+        var obj = model_data_source.get(index)
+        if(!obj)
+            return
+        var data = []
+        for(var i=0;i<model_coumns.count;i++){
+            var item = model_coumns.get(i)
+            data.push({itemData:obj[item.dataIndex],width:item.width})
+        }
+        return data;
+    }
+
+}

src/controls/FluText.qml

@@ -4,7 +4,7 @@ import FluentUI
 Text {
 
     property int fontStyle: FluText.Body
-    property color textColor: FluTheme.dark ? "#FFFFFF" : "#1A1A1A"
+    property color textColor: FluTheme.dark ? FluColors.White : FluColors.Grey220
     property int pixelSize : FluTheme.textSize
 
     enum FontStyle {

src/controls/FluTextArea.qml

@@ -0,0 +1,38 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+T.TextArea {
+    id: control
+
+    implicitWidth: Math.max(contentWidth + leftPadding + rightPadding,
+                            implicitBackgroundWidth + leftInset + rightInset,
+                            placeholder.implicitWidth + leftPadding + rightPadding)
+    implicitHeight: Math.max(contentHeight + topPadding + bottomPadding,
+                             implicitBackgroundHeight + topInset + bottomInset,
+                             placeholder.implicitHeight + topPadding + bottomPadding)
+
+    padding: 6
+    leftPadding: padding + 4
+
+    color: control.palette.text
+    placeholderTextColor: control.palette.placeholderText
+    selectionColor: control.palette.highlight
+    selectedTextColor: control.palette.highlightedText
+
+    PlaceholderText {
+        id: placeholder
+        x: control.leftPadding
+        y: control.topPadding
+        width: control.width - (control.leftPadding + control.rightPadding)
+        height: control.height - (control.topPadding + control.bottomPadding)
+
+        text: control.placeholderText
+        font: control.font
+        color: control.placeholderTextColor
+        verticalAlignment: control.verticalAlignment
+        visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
+        elide: Text.ElideRight
+        renderType: control.renderType
+    }
+}

src/controls/FluTextBox.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls
 import FluentUI
 
-TextField{
+FluTextFiled{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize

src/controls/FluTextBoxMenu.qml

@@ -11,7 +11,7 @@ FluMenu{
     focus: false
     FluMenuItem{
         text: cutText
-        visible: inputItem.text !== ""
+        visible: inputItem.text !== "" && !inputItem.readOnly
         onClicked: {
             inputItem.cut()
         }

src/controls/FluTextButton.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls
 import FluentUI
 
-Button {
+FluControl {
 
     property bool disabled: false
     property color normalColor: FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark

src/controls/FluTextFiled.qml

@@ -0,0 +1,46 @@
+import QtQuick
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+T.TextField {
+    id: control
+
+    implicitWidth: implicitBackgroundWidth + leftInset + rightInset
+                   || Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding
+    implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+                             contentHeight + topPadding + bottomPadding,
+                             placeholder.implicitHeight + topPadding + bottomPadding)
+
+    padding: 6
+    leftPadding: padding + 4
+
+    color: control.palette.text
+    selectionColor: control.palette.highlight
+    selectedTextColor: control.palette.highlightedText
+    placeholderTextColor: control.palette.placeholderText
+    verticalAlignment: TextInput.AlignVCenter
+
+    PlaceholderText {
+        id: placeholder
+        x: control.leftPadding
+        y: control.topPadding
+        width: control.width - (control.leftPadding + control.rightPadding)
+        height: control.height - (control.topPadding + control.bottomPadding)
+
+        text: control.placeholderText
+        font: control.font
+        color: control.placeholderTextColor
+        verticalAlignment: control.verticalAlignment
+        visible: !control.length && !control.preeditText && (!control.activeFocus || control.horizontalAlignment !== Qt.AlignHCenter)
+        elide: Text.ElideRight
+        renderType: control.renderType
+    }
+
+    background: Rectangle {
+        implicitWidth: 200
+        implicitHeight: 40
+        border.width: control.activeFocus ? 2 : 1
+        color: control.palette.base
+        border.color: control.activeFocus ? control.palette.highlight : control.palette.mid
+    }
+}

src/controls/FluToggleButton.qml

@@ -0,0 +1,101 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+FluControl {
+
+    property bool disabled: false
+    property bool selected: false
+    property color normalColor: {
+        if(selected){
+           return FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
+        }else{
+           return FluTheme.dark ? Qt.rgba(62/255,62/255,62/255,1) : Qt.rgba(254/255,254/255,254/255,1)
+        }
+    }
+    property color hoverColor: {
+        if(selected){
+            return FluTheme.dark ? Qt.darker(normalColor,1.1) : Qt.lighter(normalColor,1.1)
+        }else{
+            return FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
+        }
+    }
+    property color disableColor: {
+        if(selected){
+            return FluTheme.dark ? Qt.rgba(82/255,82/255,82/255,1) : Qt.rgba(199/255,199/255,199/255,1)
+        }else{
+            return FluTheme.dark ? Qt.rgba(59/255,59/255,59/255,1) : Qt.rgba(252/255,252/255,252/255,1)
+        }
+    }
+
+    property color pressedColor: FluTheme.dark ? Qt.darker(normalColor,1.2) : Qt.lighter(normalColor,1.2)
+
+    id: control
+    enabled: !disabled
+    topPadding:5
+    bottomPadding:5
+    leftPadding:15
+    rightPadding:15
+    Keys.onSpacePressed: control.visualFocus&&clicked()
+    focusPolicy:Qt.TabFocus
+    background: Rectangle{
+        radius: 4
+        border.color: FluTheme.dark ? "#505050" : "#DFDFDF"
+        border.width: selected ? 0 : 1
+        FluFocusRectangle{
+            visible: control.visualFocus
+            radius:8
+        }
+        color:{
+            if(disabled){
+                return disableColor
+            }
+            if(selected){
+                if(pressed){
+                    return pressedColor
+                }
+            }
+            return hovered ? hoverColor :normalColor
+        }
+    }
+    contentItem: FluText {
+        text: control.text
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+        color: {
+            if(selected){
+                if(FluTheme.dark){
+                    if(disabled){
+                        return Qt.rgba(173/255,173/255,173/255,1)
+                    }
+                    return Qt.rgba(0,0,0,1)
+                }else{
+                    return Qt.rgba(1,1,1,1)
+                }
+            }else{
+                if(FluTheme.dark){
+                    if(disabled){
+                        return Qt.rgba(131/255,131/255,131/255,1)
+                    }
+                    if(!selected){
+                        if(pressed){
+                            return Qt.rgba(162/255,162/255,162/255,1)
+                        }
+                    }
+                    return Qt.rgba(1,1,1,1)
+                }else{
+                    if(disabled){
+                        return Qt.rgba(160/255,160/255,160/255,1)
+                    }
+                    if(!selected){
+                        if(pressed){
+                            return Qt.rgba(96/255,96/255,96/255,1)
+                        }
+                    }
+                    return Qt.rgba(0,0,0,1)
+                }
+            }
+        }
+        font.pixelSize: 14
+    }
+}

src/controls/FluToggleSwitch.qml

@@ -1,9 +1,9 @@
-import QtQuick 2.0
-import QtQuick.Controls 2.0
+import QtQuick
+import QtQuick.Controls
 import FluentUI
 import QtQuick.Layouts
 
-Button {
+FluControl {
 
     property bool selected: false
     property var clickFunc

src/res.qrc

@@ -64,5 +64,11 @@
         <file>controls/FluFlipView.qml</file>
         <file>controls/FluPivot.qml</file>
         <file>controls/FluPivotItem.qml</file>
+        <file>controls/FluControl.qml</file>
+        <file>controls/FluTextFiled.qml</file>
+        <file>controls/FluTextArea.qml</file>
+        <file>controls/FluTableView.qml</file>
+        <file>controls/FluPagination.qml</file>
+        <file>controls/FluToggleButton.qml</file>
     </qresource>
 </RCC>