update

Optimize workflow

.github/workflows/macos.yml

@@ -16,26 +16,25 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-11.0]
+        os: [macos-12]
         qt_ver: [6.4.3]
         qt_arch: [clang_64]
     env:
       targetName: example
     steps:
-      # macos 11.0 默认环境变了,要指定
+      - name: '⚙️ Cache Qt'
-      - name: prepare env
+        id: cache-qt
-        if: ${{ matrix.os == 'macos-11.0' }}
+        uses: actions/cache@v3
-        run: |
+        with:
-          softwareupdate --all --install --force
+          path: ${{ runner.workspace }}/Qt
-          sudo xcode-select --print-path
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
-          sudo xcode-select --switch /Library/Developer/CommandLineTools       
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
-          modules: 'qt5compat qtmultimedia qtshadertools'
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - uses: actions/checkout@v2
         with:
           fetch-depth: 1
@@ -60,6 +59,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: bin/release/${{ env.targetName }}.dmg
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.dmg
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.dmg
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/ubuntu.yml

@@ -24,13 +24,19 @@ jobs:
     env:
       targetName: example
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}/Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_ver }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
           arch: ${{ matrix.qt_arch }}
-          modules: 'qt5compat qtmultimedia qtshadertools'
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       - name: ubuntu install GL library
         run: sudo apt-get install -y libglew-dev libglfw3-dev qml-module-qtquick-controls qml-module-qtquick-controls2
       - uses: actions/checkout@v2
@@ -44,6 +50,8 @@ jobs:
         uses: miurahr/install-linuxdeploy-action@v1
         with:
           plugins: qt appimage
+      - name: Check if svg file exists
+        run: if [ ! -f "${targetName}.svg" ]; then echo "File not found, creating..."; touch ${targetName}.svg; fi
       # 打包
       - name: package
         run: |
@@ -64,6 +72,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ env.targetName }}.AppImage
-          asset_name: ${{ env.targetName }}_${{ matrix.os }}_${{ matrix.qt_ver }}.AppImage
+          asset_name: ${{ env.targetName }}_${{  github.ref_name }}_${{ matrix.os }}_Qt${{ matrix.qt_ver }}.AppImage
           tag: ${{ github.ref }}
           overwrite: true

.github/workflows/windows-mingw.yml

@@ -0,0 +1,76 @@
+name: Windows MinGW
+on: 
+  push:
+    paths:
+      - '*.pro'
+      - 'src/**'
+      - '.github/workflows/windows-mingw.yml'
+  pull_request:
+    paths:
+      - '*.pro'
+      - 'src/**'
+      - '.github/workflows/windows-mingw.yml' 
+jobs:
+  build:
+    name: Build
+    runs-on: windows-2022
+    strategy:
+      matrix:
+        include:
+          - qt_arch: win64_mingw
+            qt_ver: 6.4.3
+            qt_tools: "tools_mingw,9.0.0-1-202203221220,qt.tools.win64_mingw900"
+            qt_tools_mingw_install: mingw900_64
+    env:
+      targetName: example.exe
+      fileName: example
+    steps:
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_ver }}
+          arch: ${{ matrix.qt_arch }}
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Qt6 environment configuration
+        if: ${{ startsWith( matrix.qt_ver, 6 ) }}
+        shell: pwsh
+        run: |
+          Write-Output "${{ env.Qt6_DIR }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          Write-Output "${{ env.Qt6_DIR }}/../../Tools/${{ matrix.qt_tools_mingw_install }}/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: where is qmake & where is mingw32-make
+        shell: pwsh
+        run: |
+          Get-Command -Name 'qmake' | Format-List
+          Get-Command -Name 'mingw32-make' | Format-List
+      - name: mingw-build
+        id: build
+        shell: cmd
+        run: |
+          qmake
+          mingw32-make
+      - name: package
+        id: package      
+        env:
+          archiveName: ${{ env.fileName }}-${{ matrix.qt_arch }}-${{ matrix.qt_ver }}
+        shell: pwsh
+        run: |
+          & scripts\windows-mingw-publish.ps1 ${env:archiveName} ${env:targetName}
+           $name = ${env:archiveName}
+           echo "::set-output name=packageName::$name"       
+      - uses: actions/upload-artifact@v2
+        with:
+          name: ${{ steps.package.outputs.packageName }}
+          path: ${{ steps.package.outputs.packageName }}
+      - name: uploadRelease
+        if: startsWith(github.event.ref, 'refs/tags/')
+        uses: svenstaro/upload-release-action@v2
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          file: ${{ steps.package.outputs.packageName }}.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

@@ -16,10 +16,11 @@ jobs:
     name: Build
     # 运行平台， windows-latest目前是windows server 2019 
     # 参考文档 https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
-    runs-on: windows-2019
+    runs-on: ${{ matrix.os }}
     strategy:
       # 矩阵配置
       matrix:
+        os: [windows-2019]
         include:
           - qt_ver: 6.4.3          
             qt_arch: win64_msvc2019_64
@@ -30,6 +31,12 @@ jobs:
       fileName: example
     # 步骤
     steps:
+      - name: '⚙️ Cache Qt'
+        id: cache-qt
+        uses: actions/cache@v3
+        with:
+          path: ${{ runner.workspace }}\Qt
+          key: ${{runner.os}}-qtcachedir-${{ matrix.qt_ver }}
       # 安装Qt
       - name: Install Qt
         # 使用外部action。这个action专门用来安装Qt
@@ -37,8 +44,8 @@ jobs:
         with:
           version: ${{ matrix.qt_ver }}
           arch: ${{ matrix.qt_arch }}
-          cached: 'false'
+          cache: ${{steps.cache-qt.outputs.cache-hit}}
-          modules: 'qt5compat qtmultimedia qtshadertools'
+          modules: 'qt5compat qtmultimedia qtshadertools qtimageformats'
       # 拉取代码
       - uses: actions/checkout@v2
         with:
@@ -80,6 +87,6 @@ jobs:
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ steps.package.outputs.packageName }}.zip
-          asset_name: ${{ steps.package.outputs.packageName }}.zip
+          asset_name: ${{ env.fileName }}_${{  github.ref_name }}_${{  matrix.qt_arch }}_Qt${{ matrix.qt_ver }}.zip
           tag: ${{ github.ref }}
           overwrite: true 

.gitignore

@@ -33,3 +33,4 @@ CMakeLists.txt.user*
 
 src/build-preset/plugins.qmltypes
 bin
+.DS_Store

CMakeLists.txt

@@ -0,0 +1,5 @@
+cmake_minimum_required(VERSION 3.16)
+project(FluentUI VERSION 0.1 LANGUAGES CXX)
+
+add_subdirectory(src)
+add_subdirectory(example)

License

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 zhuzichu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

example/App.qml

@@ -2,11 +2,14 @@
 import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
+import QtMultimedia
 import FluentUI
 
 Window {
     id:app
     color: "#00000000"
+    //初始化一个MediaPlayer，解决macos切换到T_MediaPalyer页面崩溃问题
+    MediaPlayer{}
     Component.onCompleted: {
         FluApp.init(app,properties)
         FluTheme.frameless = ("windows" === Qt.platform.os)
@@ -16,6 +19,7 @@ Window {
             "/about":"qrc:/page/AboutPage.qml",
             "/login":"qrc:/page/LoginPage.qml",
             "/chat":"qrc:/page/ChatPage.qml",
+            "/media":"qrc:/page/MediaPage.qml",
         }
         FluApp.initialRoute = "/"
         FluApp.run()

example/CMakeLists.txt

@@ -0,0 +1,86 @@
+cmake_minimum_required(VERSION 3.16)
+project(example)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+set(CMAKE_CXX_STANDARD 17)
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(platform 64)
+else()
+  set(platform 32)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/debug)
+else()
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin/release)
+endif()
+
+find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent Network Multimedia REQUIRED)
+
+set(SOURCES
+    ChatController.cpp
+    main.cpp
+)
+
+set(HEADERS
+    ChatController.h
+)
+
+set(RESOURCES
+    qml.qrc
+)
+
+set(RC_ICONS
+    favicon.ico
+)
+
+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)
+        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)
+        add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+            COMMAND ${CMAKE_COMMAND} -E copy
+            ${DLL_FILES}
+            ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+        )
+    endif()
+endif()
+
+target_compile_definitions(${PROJECT_NAME} PRIVATE
+    QT_DEPRECATED_WARNINGS
+    QT_NO_WARNING_OUTPUT
+)
+
+target_link_libraries(${PROJECT_NAME} PRIVATE
+    Qt6::Core
+    Qt6::Quick
+    Qt6::QuickControls2
+    Qt6::Concurrent
+    Qt6::Network
+    Qt6::Multimedia
+)
+
+if(WIN32)
+    target_compile_definitions(${PROJECT_NAME} PRIVATE UNICODE WIN32 _WINDOWS)
+    target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
+endif()
+
+if(APPLE)
+    set_target_properties(${PROJECT_NAME} PROPERTIES
+        MACOSX_BUNDLE_INFO_PLIST Info.plist
+    )
+endif()

example/T_Awesome.qml

@@ -67,7 +67,6 @@ FluContentPage {
                 width:parent.width
                 wrapMode: Text.WrapAnywhere
                 text: modelData.name
-
                 horizontalAlignment: Text.AlignHCenter
             }
         }

example/T_Badge.qml

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

example/T_FlipView.qml

@@ -0,0 +1,120 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"FlipView"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"水平方向的FlipView"
+            }
+            FluFlipView{
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+    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
+        height: 340
+        paddings: 10
+        Layout.topMargin: 20
+        ColumnLayout{
+            anchors.verticalCenter: parent.verticalCenter
+            FluText{
+                text:"垂直方向的FlipView"
+            }
+            FluFlipView{
+                vertical:true
+                Image{
+                    source: "qrc:/res/image/banner_1.jpg"
+                    asynchronous: true
+                    sourceSize: Qt.size(400,300)
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_2.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+                Image{
+                    source: "qrc:/res/image/banner_3.jpg"
+                    asynchronous: true
+                    fillMode:Image.PreserveAspectCrop
+                }
+            }
+        }
+    }
+    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_Home.qml

@@ -129,7 +129,7 @@ FluScrollablePage{
                         id:item_mouse
                         anchors.fill: parent
                         hoverEnabled: true
-                        onWheel: {
+                        onWheel: (wheel)=>{
                             if (wheel.angleDelta.y > 0) scrollbar_header.decrease()
                             else scrollbar_header.increase()
                         }
@@ -142,20 +142,6 @@ FluScrollablePage{
         }
     }
 
-    ListModel{
-        id:model_added
-        Component.onCompleted: {
-            append(ItemsOriginal.getRecentlyAddedData())
-        }
-    }
-
-    ListModel{
-        id:model_update
-        Component.onCompleted: {
-            append(ItemsOriginal.getRecentlyUpdatedData())
-        }
-    }
-
     Component{
         id:com_item
         Item{
@@ -187,7 +173,7 @@ FluScrollablePage{
                     id:item_icon
                     height: 40
                     width: 40
-                    source: model.image
+                    source: modelData.image
                     anchors{
                         left: parent.left
                         leftMargin: 20
@@ -197,7 +183,7 @@ FluScrollablePage{
 
                 FluText{
                     id:item_title
-                    text:model.title
+                    text:modelData.title
                     fontStyle: FluText.BodyStrong
                     anchors{
                         left: item_icon.right
@@ -208,7 +194,7 @@ FluScrollablePage{
 
                 FluText{
                     id:item_desc
-                    text:model.desc
+                    text:modelData.desc
                     color:FluColors.Grey120
                     wrapMode: Text.WrapAnywhere
                     elide: Text.ElideRight
@@ -241,7 +227,7 @@ FluScrollablePage{
                     anchors.fill: parent
                     hoverEnabled: true
                     onClicked: {
-                        ItemsOriginal.startPageByItem(model)
+                        ItemsOriginal.startPageByItem(modelData)
                     }
                 }
             }
@@ -260,7 +246,7 @@ FluScrollablePage{
         implicitHeight: contentHeight
         cellHeight: 120
         cellWidth: 320
-        model:model_added
+        model:ItemsOriginal.getRecentlyAddedData()
         interactive: false
         delegate: com_item
     }
@@ -278,7 +264,7 @@ FluScrollablePage{
         cellHeight: 120
         cellWidth: 320
         interactive: false
-        model: model_update
+        model: ItemsOriginal.getRecentlyUpdatedData()
         delegate: com_item
     }
 

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{
+    FluArea{
-        text:"Info"
+        Layout.fillWidth: true
         Layout.topMargin: 20
-        onClicked: {
+        height: 200
-            showInfo("这是一个Info样式的InfoBar")
+        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{
+    CodeExpander{
-        text:"Warning"
+        Layout.fillWidth: true
-        Layout.topMargin: 20
+        code:'  showInfo("这是一个Info样式的InfoBar")
-        onClicked: {
+
-            showWarning("这是一个Warning样式的InfoBar")
+    showWarning("这是一个Warning样式的InfoBar")
-        }
+
-    }
+    showError("这是一个Error样式的InfoBar")
-    FluButton{
+
-        text:"Error"
+    showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")'
-        Layout.topMargin: 20
-        onClicked: {
-            showError("这是一个Error样式的InfoBar")
-        }
-    }
-    FluButton{
-        text:"Success"
-        Layout.topMargin: 20
-        onClicked: {
-            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,9 +20,8 @@ FluScrollablePage{
             player.pause()
         }
     }
-
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 320
         Layout.topMargin: 20
         paddings: 10
@@ -31,11 +32,34 @@ FluScrollablePage{
             }
             FluMediaPlayer{
                 id:player
-//                source:"http://mirror.aarnet.edu.au/pub/TED-talks/911Mothers_2010W-480p.mp4"
                 source:"http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4"
-//                source:"http://video.chinanews.com/flv/2019/04/23/400/111773_web.mp4"
             }
         }
     }
+    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
+            onClicked:{
+                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{
+    FluArea{
-        text:"左击菜单"
+        Layout.fillWidth: true
+        height: 100
+        paddings: 10
         Layout.topMargin: 20
-        onClicked:{
+        Column{
-            menu.popup()
+            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()
+                    }
+                }
+            }
         }
     }
 
-
+    CodeExpander{
-    FluButton{
+        Layout.fillWidth: true
-        text:"右击菜单"
+        code:'FluMenu{
-        Layout.topMargin: 20
+    id:menu
+    FluMenuItem:{
+        text:"删除"
         onClicked: {
-            showSuccess("请按鼠标右击")
+            showError("删除")
         }
-        MouseArea{
+    }
-            anchors.fill: parent
+    FluMenuItem:{
-            acceptedButtons: Qt.RightButton
+        text:"修改"
-            onClicked: {
+        onClicked: {
-                menu.popup()
+            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
-
+    spacing: 0
-    property string password: ""
-
-    property var loginPageRegister: registerForPageResult("/login")
 
     Connections{
         target: loginPageRegister
@@ -24,11 +25,10 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 100
         paddings: 10
         Layout.topMargin: 20
-
         Column{
             spacing: 15
             anchors{
@@ -46,9 +46,19 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluButton{
+    text:"点击跳转"
+    onClicked: {
+        FluApp.navigate("/about")
+    }
+}
+'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         height: 130
         paddings: 10
         Layout.topMargin: 20
@@ -68,13 +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

@@ -0,0 +1,82 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "./component"
+
+FluScrollablePage{
+
+    title:"Pivot"
+    leftPadding:10
+    rightPadding:10
+    bottomPadding:20
+    spacing: 0
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 400
+        paddings: 10
+
+        FluPivot{
+            anchors.fill: parent
+            FluPivotItem{
+                title:"All"
+                contentItem:FluText{
+                    text:"All emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Unread"
+                contentItem:FluText{
+                    text:"Unread emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Flagged"
+                contentItem:FluText{
+                    text:"Flagged emails go here."
+                }
+            }
+            FluPivotItem{
+                title:"Urgent"
+                contentItem:FluText{
+                    text:"Urgent emails go here."
+                }
+            }
+        }
+    }
+    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
-    }
+        height: 260
-    FluProgressRing{
+        paddings: 10
-        Layout.topMargin: 10
+        ColumnLayout{
-    }
+            spacing: 20
-    FluProgressBar{
+            anchors{
-        id:progress_bar
+                verticalCenter: parent.verticalCenter
-        Layout.topMargin: 20
+                left: parent.left
-        indeterminate: false
+            }
-    }
+            FluProgressBar{
-    FluProgressRing{
+            }
-        id:progress_ring
+            FluProgressRing{
-        Layout.topMargin: 10
+            }
-        indeterminate: false
+            FluProgressBar{
-    }
+                id:progress_bar
-    FluSlider{
+                indeterminate: false
-        Layout.topMargin: 30
+            }
-        value:50
+            FluProgressRing{
-        onValueChanged:{
+                id:progress_ring
-            progress_bar.progress = value/100
+                indeterminate: false
-            progress_ring.progress = value/100
+            }
+            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{
+        height: 480
-            width: 50
+        paddings: 10
-            height: 50
+
-            color:"#0078d4"
+        Column{
-            radius:[0,0,0,0]
+            spacing: 15
-        }
+            anchors{
-        FluRectangle{
+                verticalCenter: parent.verticalCenter
-            width: 50
+                left: parent.left
-            height: 50
+            }
-            color:"#744da9"
+
-            radius:[15,15,15,15]
+            RowLayout{
-        }
+                Layout.topMargin: 20
-        FluRectangle{
+                FluRectangle{
-            width: 50
+                    width: 50
-            height: 50
+                    height: 50
-            color:"#ffeb3b"
+                    color:"#0078d4"
-            radius:[15,0,0,0]
+                    radius:[0,0,0,0]
-        }
+                }
-        FluRectangle{
+                FluRectangle{
-            width: 50
+                    width: 50
-            height: 50
+                    height: 50
-            color:"#f7630c"
+                    color:"#744da9"
-            radius:[0,15,0,0]
+                    radius:[15,15,15,15]
-        }
+                }
-        FluRectangle{
+                FluRectangle{
-            width: 50
+                    width: 50
-            height: 50
+                    height: 50
-            color:"#e71123"
+                    color:"#ffeb3b"
-            radius:[0,0,15,0]
+                    radius:[15,0,0,0]
-        }
+                }
-        FluRectangle{
+                FluRectangle{
-            width: 50
+                    width: 50
-            height: 50
+                    height: 50
-            color:"#b4009e"
+                    color:"#f7630c"
-            radius:[0,0,0,15]
+                    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{
+    CodeExpander{
-        text:"配合图片使用"
+        Layout.fillWidth: true
-        fontStyle: FluText.SubTitle
+        code:'FluRectangle{
-        Layout.topMargin: 20
+    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
+        FluSlider{
-        Layout.leftMargin: 10
+            value: 50
+            anchors.verticalCenter: parent.verticalCenter
+        }
     }
-    FluSlider{
+    CodeExpander{
-        vertical:true
+        Layout.fillWidth: true
+        code:'FluSlider{
+    value:50
+}'
+    }
+
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 200
+        paddings: 10
         Layout.topMargin: 20
-        Layout.leftMargin: 10
+        FluSlider{
-        Layout.bottomMargin: 20
+            value: 50
-        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]
 
@@ -32,7 +34,7 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 50
         paddings: 10
@@ -69,7 +71,7 @@ FluScrollablePage{
             FluDropDownButton{
                 id:btn_close_button_visibility
                 text:"Always"
-                 Layout.preferredWidth: 120
+                Layout.preferredWidth: 120
                 items:[
                     FluMenuItem{
                         text:"Nerver"
@@ -98,8 +100,8 @@ FluScrollablePage{
     }
 
     FluArea{
-        width: parent.width
+        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_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
+        FluTextBox{
-        disabled:toggle_switch.selected
+            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{
+    CodeExpander{
-        Layout.topMargin: 20
+        Layout.fillWidth: true
-        Layout.preferredWidth: 300
+        code:'FluTextBox{
-        placeholderText: "多行输入框"
+    placeholderText:"单行输入框"
-        disabled:toggle_switch.selected
+}'
-    }
-    FluAutoSuggestBox{
-        Layout.topMargin: 20
-        items:generateRandomNames(100)
-        placeholderText: "AutoSuggestBox"
-        Layout.preferredWidth: 300
-        disabled:toggle_switch.selected
     }
 
-    FluToggleSwitch{
+
-        id:toggle_switch
+    FluArea{
-        text:"Disabled"
+        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{
+        height: 210
-            model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
+        paddings: 10
-            delegate:  FluRectangle{
+        ColumnLayout{
-                width: 42
+            spacing:0
-                height: 42
+            anchors{
-                radius: [4,4,4,4]
+                left: parent.left
-                color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
+            }
-                FluIcon {
+            RowLayout{
-                    anchors.centerIn: parent
+                Layout.topMargin: 10
-                    iconSource: FluentIcons.AcceptMedium
+                Repeater{
-                    iconSize: 15
+                    model: [FluColors.Yellow,FluColors.Orange,FluColors.Red,FluColors.Magenta,FluColors.Purple,FluColors.Blue,FluColors.Teal,FluColors.Green]
-                    visible: modelData === FluTheme.primaryColor
+                    delegate:  FluRectangle{
-                    color: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
+                        width: 42
-                }
+                        height: 42
-                MouseArea{
+                        radius: [4,4,4,4]
-                    id:mouse_item
+                        color: mouse_item.containsMouse ? Qt.lighter(modelData.normal,1.1) : modelData.normal
-                    anchors.fill: parent
+                        FluIcon {
-                    hoverEnabled: true
+                            anchors.centerIn: parent
-                    onClicked: {
+                            iconSource: FluentIcons.AcceptMedium
-                        FluTheme.primaryColor = modelData
+                            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{
+    CodeExpander{
-        text:"夜间模式"
+        Layout.fillWidth: true
-        Layout.topMargin: 20
+        code:'FluTheme.primaryColor = FluColors.Orange
-    }
+
-    FluToggleSwitch{
+FluTheme.dark = true
-        selected: FluTheme.dark
+
-        clickFunc:function(){
+FluTheme.nativeText = true
-            FluTheme.dark = !FluTheme.dark
+'
-        }
-    }
-    FluText{
-        text:"native文本渲染"
-        Layout.topMargin: 20
-    }
-    FluToggleSwitch{
-        selected: FluTheme.nativeText
-        clickFunc:function(){
-            FluTheme.nativeText = !FluTheme.nativeText
-        }
     }
+
+
 }

example/T_TimePicker.qml

@@ -3,6 +3,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
+import "./component"
 
 FluScrollablePage{
 
@@ -10,9 +11,10 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -33,10 +35,15 @@ FluScrollablePage{
 
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluTimePicker{
 
+}'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 80
         paddings: 10
@@ -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{
+    CodeExpander{
-        Layout.topMargin: 20
+        Layout.fillWidth: true
-        text:"Text"
+        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,15 +11,15 @@ FluScrollablePage{
     leftPadding:10
     rightPadding:10
     bottomPadding:20
+    spacing: 0
 
     FluText{
         Layout.topMargin: 20
         text:"鼠标悬停不动，弹出Tooltip"
     }
 
-
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10
@@ -42,9 +43,21 @@ FluScrollablePage{
             }
         }
     }
+    CodeExpander{
+        Layout.fillWidth: true
+        code:'FluIconButton{
+    iconSource:FluentIcons.ChromeCloseContrast
+    iconSize: 15
+    text:"删除"
+    onClicked:{
+        showSuccess("点击IconButton")
+    }
+}
+'
+    }
 
     FluArea{
-        width: parent.width
+        Layout.fillWidth: true
         Layout.topMargin: 20
         height: 68
         paddings: 10
@@ -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))
     }
 
-
+    FluArea{
-    FluTreeView{
+        id:layout_actions
-        id:tree_view
+        Layout.fillWidth: true
-        width:240
+        Layout.topMargin: 20
-        anchors{
+        height: 50
-            top:parent.top
+        paddings: 10
-            left:parent.left
+        RowLayout{
-            bottom:parent.bottom
+            spacing: 14
-        }
+            FluDropDownButton{
-        onItemClicked:
+                id:btn_selection_model
-            (model)=>{
+                Layout.preferredWidth: 140
-                showSuccess(model.text)
+                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)
+            }
+        }
     }
 
-
+    CodeExpander{
-    ColumnLayout{
+        Layout.fillWidth: true
-        anchors{
+        code:'FluTreeView{
-            left: tree_view.right
+    id:tree_view
-            right: parent.right
+    width:240
-            top: parent.top
+    height:600
-        }
+    Component.onCompleted: {
-
+        var datas = []
-        FluText{
+        datas.push(createItem("Node1",false))
-            text:{
+        datas.push(createItem("Node2",false))
-                if(tree_view.selectionMode === FluTreeView.None){
+        datas.push(createItem("Node2",true,[createItem("Node2-1",false),createItem("Node2-2",false)]))
-                    return "selectionMode->FluTreeView.None"
+        updateData(datas)
-                }
-                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(","))
-                }
-            }
-        }
-
     }
 }
+'
+    }
+
+
+}

example/T_Typography.qml

@@ -15,15 +15,19 @@ FluContentPage {
         slider.seek(0)
     }
 
-    ScrollView{
+    FluArea{
-        clip: true
+        anchors{
-        width: parent.width
+            top:parent.top
-        contentWidth: parent.width
+            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,43 @@
+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:code
+        focus:false
+        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("复制成功")
+        }
+    }
+
+}

example/example.pro

@@ -1,5 +1,5 @@
-QT += quick quickcontrols2  concurrent network multimedia
+QT += quick quickcontrols2 concurrent network multimedia
-CONFIG += c++11
+CONFIG += c++17
 DEFINES += QT_DEPRECATED_WARNINGS QT_NO_WARNING_OUTPUT
 
 HEADERS += \
@@ -25,18 +25,10 @@ CONFIG(debug,debug|release) {
 win32 {
 contains(QT_ARCH, i386) {
     COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x86/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
 } else {
     COPYDLL = $$absolute_path($${_PRO_FILE_PWD_}/../third/Win_x64/*.dll) $$DESTDIR
-    contains(QMAKE_CC, cl) {
+    QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, $$QMAKE_DIR_SEP)
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$replace(COPYDLL, /, \\)
-    } else {
-        QMAKE_PRE_LINK += $$QMAKE_COPY $$COPYDLL
-    }
 }
 }
 

example/global/ItemsOriginal.qml

@@ -3,7 +3,6 @@
 import QtQuick
 import FluentUI
 
-
 FluObject{
 
     property var navigationView
@@ -16,224 +15,228 @@ FluObject{
         }
     }
 
-    FluPaneItemHeader{
+    FluPaneItemExpander{
-        title:"Inputs"
+        title:"Basic input"
-    }
+        icon:FluentIcons.CheckboxComposite
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"Buttons"
-        title:"Buttons"
+            image:"qrc:/res/image/control/Button.png"
-        image:"qrc:/res/image/control/Button.png"
+            recentlyUpdated:true
-        recentlyUpdated:true
+            desc:"A control that responds to user input and raisesa Click event."
-        desc:"A control that responds to user input and raisesa Click event."
+            onTap:{
-        onTap:{
+                navigationView.push("qrc:/T_Buttons.qml")
-            navigationView.push("qrc:/T_Buttons.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Slider"
+            image:"qrc:/res/image/control/Slider.png"
+            recentlyUpdated:true
+            desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
+            onTap:{
+                navigationView.push("qrc:/T_Slider.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CheckBox"
+            image:"qrc:/res/image/control/Checkbox.png"
+            recentlyUpdated:true
+            desc:"A control that a user can select or clear."
+            onTap:{
+                navigationView.push("qrc:/T_CheckBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ToggleSwitch"
+            onTap:{
+                navigationView.push("qrc:/T_ToggleSwitch.qml")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        title:"Slider"
-        image:"qrc:/res/image/control/Slider.png"
-        recentlyUpdated:true
-        desc:"A control that lets the user select from a rangeof values by moving a Thumb control along atrack."
-        onTap:{
-            navigationView.push("qrc:/T_Slider.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"CheckBox"
-        image:"qrc:/res/image/control/Checkbox.png"
-        recentlyUpdated:true
-        desc:"A control that a user can select or clear."
-        onTap:{
-            navigationView.push("qrc:/T_CheckBox.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"ToggleSwitch"
-        onTap:{
-            navigationView.push("qrc:/T_ToggleSwitch.qml")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Form"
-    }
+        icon:FluentIcons.GridView
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"TextBox"
-        title:"TextBox"
+            onTap:{
-        onTap:{
+                navigationView.push("qrc:/T_TextBox.qml")
-            navigationView.push("qrc:/T_TextBox.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TimePicker"
+            onTap:{
+                navigationView.push("qrc:/T_TimePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"DatePicker"
+            onTap:{
+                navigationView.push("qrc:/T_DatePicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"CalendarPicker"
+            onTap:{
+                navigationView.push("qrc:/T_CalendarPicker.qml")
+            }
+        }
+        FluPaneItem{
+            title:"ColorPicker"
+            onTap:{
+                navigationView.push("qrc:/T_ColorPicker.qml")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        title:"TimePicker"
-        onTap:{
-            navigationView.push("qrc:/T_TimePicker.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"DatePicker"
-        onTap:{
-            navigationView.push("qrc:/T_DatePicker.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"CalendarPicker"
-        onTap:{
-            navigationView.push("qrc:/T_CalendarPicker.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"ColorPicker"
-        onTap:{
-            navigationView.push("qrc:/T_ColorPicker.qml")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Surface"
-    }
+        icon:FluentIcons.SurfaceHub
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"InfoBar"
-        title:"InfoBar"
+            image:"qrc:/res/image/control/InfoBar.png"
-        image:"qrc:/res/image/control/InfoBar.png"
+            recentlyUpdated:true
-        recentlyUpdated:true
+            desc:"An inline message to display app-wide statuschange information."
-        desc:"An inline message to display app-wide statuschange information."
+            onTap:{
-        onTap:{
+                navigationView.push("qrc:/T_InfoBar.qml")
-            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")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        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")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Popus"
-    }
+        icon:FluentIcons.ButtonMenu
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"Dialog"
-        title:"Dialog"
+            onTap:{
-        onTap:{
+                navigationView.push("qrc:/T_Dialog.qml")
-            navigationView.push("qrc:/T_Dialog.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Tooltip"
+            onTap:{
+                navigationView.push("qrc:/T_Tooltip.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Menu"
+            onTap:{
+                navigationView.push("qrc:/T_Menu.qml")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        title:"Tooltip"
-        onTap:{
-            navigationView.push("qrc:/T_Tooltip.qml")
-        }
-    }
-
-    FluPaneItem{
-        title:"Menu"
-        onTap:{
-            navigationView.push("qrc:/T_Menu.qml")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Navigation"
-    }
+        icon:FluentIcons.AllApps
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"Pivot"
-        title:"TabView"
+            image:"qrc:/res/image/control/Pivot.png"
-        image:"qrc:/res/image/control/TabView.png"
+            recentlyAdded:true
-        recentlyAdded:true
+            order:3
-        desc:"A control that displays a collection of tabs thatcan be used to display several documents."
+            desc:"Presents information from different sources in atabbed view."
-        onTap:{
+            onTap:{
-            navigationView.push("qrc:/T_TabView.qml")
+                navigationView.push("qrc:/T_Pivot.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TabView"
+            image:"qrc:/res/image/control/TabView.png"
+            recentlyAdded:true
+            order:1
+            desc:"A control that displays a collection of tabs thatcan be used to display several documents."
+            onTap:{
+                navigationView.push("qrc:/T_TabView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"TreeView"
+            onTap:{
+                navigationView.push("qrc:/T_TreeView.qml")
+            }
+        }
+        FluPaneItem{
+            title:"MultiWindow"
+            onTap:{
+                navigationView.push("qrc:/T_MultiWindow.qml")
+            }
+        }
+        FluPaneItem{
+            title:"FlipView"
+            image:"qrc:/res/image/control/FlipView.png"
+            recentlyAdded:true
+            order:2
+            desc:"Presents a collection of items that the user canflip through, one item at a time."
+            onTap:{
+                navigationView.push("qrc:/T_FlipView.qml")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        title:"TreeView"
-        onTap:{
-            navigationView.push("qrc:/T_TreeView.qml")
-        }
-    }
-
-
-    FluPaneItem{
-        title:"MultiWindow"
-        onTap:{
-            navigationView.push("qrc:/T_MultiWindow.qml")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Theming"
-    }
+        icon:FluentIcons.Brightness
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"Theme"
-        title:"Theme"
+            onTap:{
-        onTap:{
+                navigationView.push("qrc:/T_Theme.qml")
-            navigationView.push("qrc:/T_Theme.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Typography"
+            onTap:{
+                navigationView.push("qrc:/T_Typography.qml")
+            }
+        }
+        FluPaneItem{
+            title:"Awesome"
+            onTap:{
+                navigationView.push("qrc:/T_Awesome.qml")
+            }
         }
     }
 
-    FluPaneItem{
+    FluPaneItemExpander{
-        title:"Awesome"
-        onTap:{
-            navigationView.push("qrc:/T_Awesome.qml")
-        }
-    }
-    FluPaneItem{
-        title:"Typography"
-        onTap:{
-            navigationView.push("qrc:/T_Typography.qml")
-        }
-    }
-
-    FluPaneItemHeader{
         title:"Media"
-    }
+        icon:FluentIcons.Media
-
+        FluPaneItem{
-    FluPaneItem{
+            title:"MediaPlayer"
-        title:"MediaPlayer"
+            image:"qrc:/res/image/control/MediaPlayerElement.png"
-        image:"qrc:/res/image/control/MediaPlayerElement.png"
+            recentlyAdded:true
-        recentlyAdded:true
+            order:0
-        desc:"A control to display video and image content."
+            desc:"A control to display video and image content."
-        onTap:{
+            onTap:{
-            navigationView.push("qrc:/T_MediaPlayer.qml")
+                navigationView.push("qrc:/T_MediaPlayer.qml")
+            }
         }
     }
 
@@ -244,14 +247,24 @@ FluObject{
             if(item instanceof FluPaneItem && item.recentlyAdded){
                 arr.push(item)
             }
+            if(item instanceof FluPaneItemExpander){
+                for(var j=0;j<item.children.length;j++){
+                    var itemChild = item.children[j]
+                    if(itemChild instanceof FluPaneItem && itemChild.recentlyAdded){
+                        arr.push(itemChild)
+                    }
+                }
+            }
         }
+        arr.sort(function(o1,o2){ return o2.order-o1.order })
         return arr
     }
 
     function getRecentlyUpdatedData(){
         var arr = []
-        for(var i=0;i<children.length;i++){
+        var items = navigationView.getItems();
-            var item = children[i]
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
             if(item instanceof FluPaneItem && item.recentlyUpdated){
                 arr.push(item)
             }
@@ -261,8 +274,9 @@ FluObject{
 
     function getSearchData(){
         var arr = []
-        for(var i=0;i<children.length;i++){
+        var items = navigationView.getItems();
-            var item = children[i]
+        for(var i=0;i<items.length;i++){
+            var item = items[i]
             if(item instanceof FluPaneItem){
                 arr.push({title:item.title,key:item.key})
             }
@@ -270,14 +284,19 @@ FluObject{
         return arr
     }
 
-    function startPageByItem(item){
+    function startPageByItem(data){
-        for(var i=0;i<children.length;i++){
+        var items = navigationView.getItems();
-            if(children[i].key === item.key){
+        for(var i=0;i<items.length;i++){
+            var item =  items[i]
+            if(item.key === data.key){
                 if(navigationView.getCurrentIndex() === i){
                     return
                 }
-                children[i].tap()
+                item.tap()
                 navigationView.setCurrentIndex(i)
+                if(item.parent){
+                    item.parent.isExpand = true
+                }
                 return
             }
         }

example/main.cpp

@@ -18,7 +18,6 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationName("ZhuZiChu");
     QCoreApplication::setOrganizationDomain("https://zhuzichu520.github.io");
     QCoreApplication::setApplicationName("FluentUI");
-    //    QQuickWindow::setSceneGraphBackend(QSGRendererInterface::Software);
     QQuickStyle::setStyle("Basic");
     QGuiApplication app(argc, argv);
     QQmlApplicationEngine engine;

example/page/AboutPage.qml

@@ -36,7 +36,7 @@ FluWindow {
                 fontStyle: FluText.Title
             }
             FluText{
-                text:"v1.1.6"
+                text:"v1.2.0"
                 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/page/LoginPage.qml

@@ -1,5 +1,6 @@
 import QtQuick
 import QtQuick.Layouts
+import QtQuick.Controls
 import FluentUI
 
 FluWindow {

example/page/MainPage.qml

@@ -20,7 +20,6 @@ FluWindow {
         width:parent.width
     }
 
-
     FluNavigationView{
         id:nav_view
         anchors.fill: parent

example/page/MediaPage.qml

@@ -0,0 +1,37 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+
+FluWindow {
+
+    width: 640
+    height: 480
+    minimumWidth: 640
+    minimumHeight: 480
+
+    title:"视频播放器"
+
+    onInitArgument:
+        (argument)=>{
+            player.source = argument.source
+        }
+
+    FluAppBar{
+        id:appbar
+        title:"视频播放器"
+        width:parent.width
+    }
+
+
+    FluMediaPlayer{
+        id:player
+        anchors{
+            left: parent.left
+            right: parent.right
+            top: appbar.bottom
+            bottom: parent.bottom
+        }
+    }
+
+}

example/qml.qrc

@@ -152,5 +152,9 @@
         <file>global/ItemsOriginal.qml</file>
         <file>global/qmldir</file>
         <file>global/ItemsFooter.qml</file>
+        <file>page/MediaPage.qml</file>
+        <file>T_FlipView.qml</file>
+        <file>T_Pivot.qml</file>
+        <file>component/CodeExpander.qml</file>
     </qresource>
 </RCC>

scripts/windows-mingw-publish.ps1

@@ -0,0 +1,34 @@
+[CmdletBinding()]
+param (
+    [string] $archiveName, [string] $targetName
+)
+# 外部环境变量包括:
+# archiveName: ${{ matrix.qt_ver }}-${{ matrix.qt_arch }}
+
+
+# archiveName: 5.15.2-win64_mingw81
+
+$scriptDir = $PSScriptRoot
+$currentDir = Get-Location
+Write-Host "currentDir" $currentDir
+Write-Host "scriptDir" $scriptDir
+
+function Main() {
+
+    New-Item -ItemType Directory $archiveName
+    # 拷贝exe
+    Copy-Item bin\release\* $archiveName\
+    # 拷贝依赖
+    windeployqt --qmldir . --plugindir $archiveName\plugins --no-translations --compiler-runtime $archiveName\$targetName
+    # 删除不必要的文件
+    $excludeList = @("*.qmlc", "*.ilk", "*.exp", "*.lib", "*.pdb")
+    Remove-Item -Path $archiveName -Include $excludeList -Recurse -Force
+    # 打包zip
+    Compress-Archive -Path $archiveName $archiveName'.zip'
+}
+
+if ($null -eq $archiveName || $null -eq $targetName) {
+    Write-Host "args missing, archiveName is" $archiveName ", targetName is" $targetName
+    return
+}
+Main

src/CMakeLists.txt

@@ -0,0 +1,68 @@
+cmake_minimum_required(VERSION 3.16)
+project(FluentUI)
+
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+set(CMAKE_AUTOUIC ON)
+
+find_package(Qt6 COMPONENTS Core Quick Svg REQUIRED)
+set(QT_INSTALL_QML ${Qt6Core_DIR}/../../../qml)
+set(TARGET_TYPE SHARED)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
+
+set(TARGET_RESOURCES res.qrc)
+set(TARGET_SOURCES
+    Def.cpp
+    FluApp.cpp
+    FluColorSet.cpp
+    FluColors.cpp
+    FluRegister.cpp
+    FluTheme.cpp
+    Fluent.cpp
+    FluentUI.cpp
+    WindowHelper.cpp
+    qml_plugin.cpp
+)
+
+set(TARGET_HEADERS
+    Def.h
+    FluApp.h
+    FluColorSet.h
+    FluColors.h
+    FluRegister.h
+    FluTheme.h
+    Fluent.h
+    FluentUI.h
+    FramelessView.h
+    WindowHelper.h
+    qml_plugin.h
+    stdafx.h
+)
+
+if(WIN32)
+    set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_win.cpp)
+else()
+    set(TARGET_SOURCES ${TARGET_SOURCES} FramelessView_unix.cpp)
+endif()
+
+add_definitions(-DVERSION_IN="1.0.0")
+add_definitions(-DVURI_STR="FluentUI")
+
+add_library(${PROJECT_NAME} ${TARGET_TYPE} ${TARGET_SOURCES} ${TARGET_HEADERS} ${TARGET_RESOURCES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/FluentUI)
+
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} PRIVATE dwmapi user32)
+else()
+endif()
+
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(${PROJECT_NAME} PRIVATE Qt6::Core Qt6::Quick Qt6::Svg)
+
+if(WIN32)
+    include(build_windows.cmake)
+else()
+    include(build_macos.cmake)
+endif()

src/Fluent.cpp

@@ -32,6 +32,11 @@ void Fluent::registerTypes(const char *uri){
 
     qmlRegisterType<WindowHelper>(uri,major,minor,"WindowHelper");
     qmlRegisterType<FluColorSet>(uri,major,minor,"FluColorSet");
+
+    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");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluPaneItemExpander.qml"),uri,major,minor,"FluPaneItemExpander");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTabView.qml"),uri,major,minor,"FluTabView");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluArea.qml"),uri,major,minor,"FluArea");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluBadge.qml"),uri,major,minor,"FluBadge");
@@ -57,7 +62,7 @@ void Fluent::registerTypes(const char *uri){
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMenu.qml"),uri,major,minor,"FluMenu");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluScrollBar.qml"),uri,major,minor,"FluScrollBar");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTextButton.qml"),uri,major,minor,"FluTextButton");
-    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMultiLineTextBox.qml"),uri,major,minor,"FluMultiLineTextBox");
+    qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluMultilineTextBox.qml"),uri,major,minor,"FluMultilineTextBox");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluTooltip.qml"),uri,major,minor,"FluTooltip");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluDivider.qml"),uri,major,minor,"FluDivider");
     qmlRegisterType(QUrl("qrc:/com.zhuzichu/controls/FluIcon.qml"),uri,major,minor,"FluIcon");

src/FluentUI.pro

@@ -1,5 +1,5 @@
 QT          += qml quick svg
-CONFIG      += plugin c++11
+CONFIG      += plugin c++17
 TEMPLATE    = lib
 TARGET      = FluentUI
 TARGET      = $$qtLibraryTarget($$TARGET)

src/build_macos.cmake

@@ -0,0 +1,32 @@
+set(OUTP ${CMAKE_BINARY_DIR}/bin/FluentUI/)
+
+add_definitions(-DMACOS)
+
+set(CMAKE_INSTALL_PREFIX ${OUTP})
+set(CMAKE_INSTALL_DESTDIR ${OUTP})
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(QMAKE_MOC_OPTIONS -Muri=${uri})
+
+add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND chmod -R 777 ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh
+)
+
+add_custom_command(
+    TARGET ${PROJECT_NAME} POST_BUILD
+    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh PRESET ${CMAKE_CURRENT_SOURCE_DIR}/ ${OUTP}
+)
+
+
+
+if(${TARGET_TYPE} STREQUAL "SHARED")
+
+    set(INST_QMLPATH ${QT_INSTALL_QML}/FluentUI)
+    add_custom_command(
+        TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/macos_install.sh INSTALL ${CMAKE_CURRENT_SOURCE_DIR}/ ${OUTP} ${INST_QMLPATH}
+    )
+
+endif()

src/build_windows.cmake

@@ -0,0 +1,27 @@
+set(OUTP "${CMAKE_BINARY_DIR}/bin/FluentUI")
+set(BUILDBIN_PATH "${OUTP}")
+set(QTQMLFLUENT_PATH "${QT_INSTALL_QML}/FluentUI")
+set(PRESET_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build-preset")
+set(SOLIBFILE_PATH "${CMAKE_BINARY_DIR}/libFluentUI.so")
+set(ANDROID NO)
+if (ANDROID)
+    set(ANDROID YES)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${OUTP})
+else()
+    set(CMAKE_INSTALL_PREFIX "${OUTP}")
+endif()
+set(SHAREDSCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/win_install.bat SHARED ${CMAKE_CURRENT_SOURCE_DIR} ${PRESET_PATH} ${BUILDBIN_PATH} ${QTQMLFLUENT_PATH} ${ANDROID} ${SOLIBFILE_PATH})
+set(STATICSCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/win_install.bat STATIC ${CMAKE_CURRENT_SOURCE_DIR} ${PRESET_PATH} ${BUILDBIN_PATH} ${QTQMLFLUENT_PATH} ${ANDROID} ${SOLIBFILE_PATH})
+string(REPLACE "/" "\\" SHAREDSCRIPT "${SHAREDSCRIPT}")
+string(REPLACE "/" "\\" STATICSCRIPT "${STATICSCRIPT}")
+if (${TARGET_TYPE} STREQUAL "SHARED")
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${SHAREDSCRIPT}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+else()
+    add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
+        COMMAND ${STATICSCRIPT}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    )
+endif()

src/build_windows.pri

@@ -4,17 +4,14 @@ QTQMLFLUENT_PATH = $$[QT_INSTALL_QML]/FluentUI
 PRESET_PATH = $$PWD/build-preset
 SOLIBFILE_PATH = $$OUT_PWD/libFluentUI.so
 ANDROID = NO
-
 android{
     ANDROID=YES
     QMAKE_PRE_LINK *= md $$replace(OUTP, /, \\)
 }else{
     DESTDIR += $$OUTP
 }
-
 SHAREDSCRIPT = "$$PWD\win_install.bat" SHARED "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
 STATICSCRIPT = "$$PWD\win_install.bat" STATIC "$$PWD" "$$PRESET_PATH" "$$BUILDBIN_PATH" "$$QTQMLFLUENT_PATH" $$ANDROID "$$SOLIBFILE_PATH"
-
 CONFIG(sharedlib){
     QMAKE_POST_LINK *= $$replace(SHAREDSCRIPT, /, \\)
 }

src/colorpicker/content/ColorSlider.qml

@@ -30,10 +30,10 @@ Item {
                 pickerCursor.y = Math.max(0, Math.min(height, mouse.y)-cursorHeight)
             }
         }
-        onPositionChanged: {
+        onPositionChanged:(mouse)=> {
             handleMouse(mouse)
         }
-        onPressed: handleMouse(mouse)
+        onPressed:(mouse)=> handleMouse(mouse)
     }
 
     function setValue(val) {

src/controls/FluAppBar.qml

@@ -7,23 +7,35 @@ import FluentUI
 Rectangle{
 
     property string title: ""
+    property string darkText : "夜间模式"
+    property string minimizeText : "最小化"
+    property string restoreText : "向下还原"
+    property string maximizeText : "最大化"
+    property string closeText : "关闭"
     property color textColor: FluTheme.dark ? "#FFFFFF" : "#000000"
+    property color minimizeNormalColor: Qt.rgba(0,0,0,0)
+    property color minimizeHoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.1) : Qt.rgba(0,0,0,0.06)
+    property color maximizeNormalColor: Qt.rgba(0,0,0,0)
+    property color maximizeHoverColor: FluTheme.dark ? Qt.rgba(1,1,1,0.1) : Qt.rgba(0,0,0,0.06)
+    property color closeNormalColor: Qt.rgba(0,0,0,0)
+    property color closeHoverColor:  Qt.rgba(251/255,115/255,115/255,1)
+
+
     property bool showDark: false
-    property bool showFps: false
-    property var window: Window.window
     property color borerlessColor : FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
-    property bool resizable: {
+
-        if(window == null){
+    Item{
-            return false
+        id:d
-        }
+        property var win: Window.window
-        return !(window.minimumHeight === window.maximumHeight && window.maximumWidth === window.minimumWidth)
+        property bool isRestore: win && Window.Maximized === win.visibility
+        property bool resizable: win && !(win.minimumHeight === win.maximumHeight && win.maximumWidth === win.minimumWidth)
     }
 
     id:root
     color: Qt.rgba(0,0,0,0)
     visible: FluTheme.frameless
     height: visible ? 30 : 0
-    clip: true
+    opacity: visible
     z: 65535
 
     TapHandler {
@@ -34,7 +46,7 @@ Rectangle{
     DragHandler {
         target: null
         grabPermissions: TapHandler.CanTakeOverFromAnything
-        onActiveChanged: if (active) { window.startSystemMove(); }
+        onActiveChanged: if (active) { d.win.startSystemMove(); }
     }
 
     FluText {
@@ -55,13 +67,6 @@ Rectangle{
         height: root.height
         spacing: 0
 
-        TFpsMonitor{
-            Layout.alignment: Qt.AlignVCenter
-            Layout.rightMargin: 20
-            Layout.topMargin: 5
-            color:root.textColor
-            visible: showFps
-        }
 
         RowLayout{
             Layout.alignment: Qt.AlignVCenter
@@ -69,7 +74,7 @@ Rectangle{
             visible: showDark
             spacing: 5
             FluText{
-                text:"夜间模式"
+                text:darkText
                 color:root.textColor
             }
             FluToggleSwitch{
@@ -86,53 +91,24 @@ Rectangle{
             iconSource : FluentIcons.ChromeMinimize
             Layout.alignment: Qt.AlignVCenter
             iconSize: 11
-            text:"最小化"
+            text:minimizeText
             radius: 0
-            textColor: root.textColor
+            iconColor: root.textColor
-            color:{
+            color: hovered ? minimizeHoverColor : minimizeNormalColor
-                if(FluTheme.dark){
-                    if(hovered){
-                        return Qt.rgba(1,1,1,0.06)
-                    }
-                    return Qt.rgba(0,0,0,0)
-                }else{
-                    if(hovered){
-                        return Qt.rgba(0,0,0,0.06)
-                    }
-                    return Qt.rgba(0,0,0,0)
-                }
-            }
             onClicked: {
-                window.showMinimized()
+                d.win.showMinimized()
             }
         }
         FluIconButton{
             width: 40
             height: 30
-            property bool isRestore:{
+            iconSource : d.isRestore  ? FluentIcons.ChromeRestore : FluentIcons.ChromeMaximize
-                if(window == null)
+            color: hovered ? maximizeHoverColor : maximizeNormalColor
-                    return false
-                return Window.Maximized === window.visibility
-            }
-            iconSource : isRestore  ? FluentIcons.ChromeRestore : FluentIcons.ChromeMaximize
-            color:{
-                if(FluTheme.dark){
-                    if(hovered){
-                        return Qt.rgba(1,1,1,0.06)
-                    }
-                    return Qt.rgba(0,0,0,0)
-                }else{
-                    if(hovered){
-                        return Qt.rgba(0,0,0,0.06)
-                    }
-                    return Qt.rgba(0,0,0,0)
-                }
-            }
             Layout.alignment: Qt.AlignVCenter
-            visible: resizable
+            visible: d.resizable
             radius: 0
-            textColor: root.textColor
+            iconColor: root.textColor
-            text:isRestore?"向下还原":"最大化"
+            text:d.isRestore?restoreText:maximizeText
             iconSize: 11
             onClicked: {
                 toggleMaximized()
@@ -141,26 +117,26 @@ Rectangle{
         FluIconButton{
             iconSource : FluentIcons.ChromeClose
             Layout.alignment: Qt.AlignVCenter
-            text:"关闭"
+            text:closeText
             width: 40
             height: 30
             radius: 0
             iconSize: 10
-            textColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor
+            iconColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor
-            color:hovered ? Qt.rgba(251/255,115/255,115/255,1) : "#00000000"
+            color:hovered ? closeHoverColor : closeNormalColor
             onClicked: {
-                Window.window.close()
+                d.win.close()
             }
         }
     }
 
     function toggleMaximized() {
-        if(!resizable)
+        if(!d.resizable)
             return
-        if (window.visibility === Window.Maximized) {
+        if (d.win.visibility === Window.Maximized) {
-            window.showNormal();
+            d.win.showNormal();
         } else {
-            window.showMaximized();
+            d.win.showMaximized();
         }
     }
 

src/controls/FluAutoSuggestBox.qml

@@ -2,138 +2,29 @@
 import QtQuick.Controls
 import FluentUI
 
-TextField{
+FluTextBox{
-
     property var items:[]
-    property int fontStyle: FluText.Body
+    property string emptyText: "没有找到结果"
-    property int pixelSize : FluTheme.textSize
-    property int iconSource: 0
-    property bool disabled: false
     signal itemClicked(var data)
     signal handleClicked
     QtObject{
         id:d
         property bool flagVisible: true
     }
-    id:input
+    id:control
     width: 300
-    enabled: !disabled
-    color: {
-        if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
-        }
-        return FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
-    }
-    selectionColor: FluTheme.primaryColor.lightest
-    renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-    placeholderTextColor: {
-        if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
-        }
-        if(focus){
-            return FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
-        }
-        return FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
-    }
-    rightPadding: icon_right.visible ? 50 : 30
-    selectByMouse: true
-    Keys.onUpPressed: {
-        list_view.currentIndex = Math.max(list_view.currentIndex-1,0)
-    }
-    Keys.onDownPressed: {
-        list_view.currentIndex = Math.min(list_view.currentIndex+1,list_view.count-1)
-    }
-    Keys.onEnterPressed:handleClicked()
-    Keys.onReturnPressed:handleClicked()
-    font.bold: {
-        switch (fontStyle) {
-        case FluText.Display:
-            return true
-        case FluText.TitleLarge:
-            return true
-        case FluText.Title:
-            return true
-        case FluText.SubTitle:
-            return true
-        case FluText.BodyStrong:
-            return true
-        case FluText.Body:
-            return false
-        case FluText.Caption:
-            return false
-        default:
-            return false
-        }
-    }
-    font.pixelSize: {
-        switch (fontStyle) {
-        case FluText.Display:
-            return text.pixelSize * 4.857
-        case FluText.TitleLarge:
-            return text.pixelSize * 2.857
-        case FluText.Title:
-            return text.pixelSize * 2
-        case FluText.SubTitle:
-            return text.pixelSize * 1.428
-        case FluText.Body:
-            return text.pixelSize * 1.0
-        case FluText.BodyStrong:
-            return text.pixelSize * 1.0
-        case FluText.Caption:
-            return text.pixelSize * 0.857
-        default:
-            return text.pixelSize * 1.0
-        }
-    }
-
-    FluIconButton{
-        iconSource:FluentIcons.ChromeClose
-        iconSize: 10
-        width: 20
-        height: 20
-        opacity: 0.5
-        visible: input.text !== ""
-        anchors{
-            verticalCenter: parent.verticalCenter
-            right: parent.right
-            rightMargin: icon_right.visible ? 25 : 5
-        }
-        onClicked:{
-            input.text = ""
-        }
-    }
-
-    background: FluTextBoxBackground{
-        inputItem: input
-
-
-        FluIcon{
-            id:icon_right
-            iconSource: input.iconSource
-            iconSize: 15
-            opacity: 0.5
-            visible: input.iconSource != 0
-            anchors{
-                verticalCenter: parent.verticalCenter
-                right: parent.right
-                rightMargin: 5
-            }
-        }
-    }
-
     Component.onCompleted: {
-        searchData()
+        loadData()
     }
-
     Popup{
-        id:input_popup
+        id:control_popup
-        y:input.height
+        y:control.height
         focus: false
         enter: Transition {
             NumberAnimation {
                 property: "y"
                 from:0
-                to:input_popup.y
+                to:control_popup.y
                 duration: 150
             }
             NumberAnimation {
@@ -149,7 +40,7 @@ TextField{
             }
         }
         background: Rectangle{
-            width: input.width
+            width: control.width
             radius: 4
             FluShadow{
                 radius: 4
@@ -163,11 +54,11 @@ TextField{
                 currentIndex: -1
                 ScrollBar.vertical: FluScrollBar {}
                 header: Item{
-                    width: input.width
+                    width: control.width
                     height: visible ? 38 : 0
                     visible: list_view.count === 0
                     FluText{
-                        text:"没有找到结果"
+                        text:emptyText
                         anchors{
                             verticalCenter: parent.verticalCenter
                             left: parent.left
@@ -176,7 +67,7 @@ TextField{
                     }
                 }
                 delegate:Control{
-                    width: input.width
+                    width: control.width
                     padding:10
                     background: Rectangle{
                         color:  {
@@ -192,7 +83,7 @@ TextField{
                             id:mouse_area
                             anchors.fill: parent
                             Connections{
-                                target: input
+                                target: control
                                 function onHandleClicked(){
                                     if((list_view.currentIndex === index)){
                                         handleClick(modelData)
@@ -223,72 +114,41 @@ TextField{
             }
         }
     }
+    onTextChanged: {
+        loadData()
+        if(d.flagVisible){
+            control_popup.visible = true
+        }
+    }
+    TapHandler {
+        acceptedButtons: Qt.RightButton
+        onTapped: control.echoMode !== TextInput.Password && menu.popup()
+    }
+    FluTextBoxMenu{
+        id:menu
+        inputItem: control
+    }
 
     function handleClick(modelData){
-        input_popup.visible = false
+        control_popup.visible = false
-        input.itemClicked(modelData)
+        control.itemClicked(modelData)
         updateText(modelData.title)
     }
 
     function updateText(text){
         d.flagVisible = false
-        input.text = text
+        control.text = text
         d.flagVisible = true
     }
 
-    onTextChanged: {
+    function loadData(){
-        searchData()
-        if(d.flagVisible){
-            input_popup.visible = true
-        }
-    }
-
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: input.echoMode !== TextInput.Password && menu.popup()
-    }
-
-    FluMenu{
-        id:menu
-        focus: false
-        FluMenuItem{
-            text: "剪切"
-            visible: input.text !== ""
-            onClicked: {
-                input.cut()
-            }
-        }
-        FluMenuItem{
-            text: "复制"
-            visible: input.selectedText !== ""
-            onClicked: {
-                input.copy()
-            }
-        }
-        FluMenuItem{
-            text: "粘贴"
-            visible: input.canPaste
-            onClicked: {
-                input.paste()
-            }
-        }
-        FluMenuItem{
-            text: "全选"
-            visible: input.text !== ""
-            onClicked: {
-                input.selectAll()
-            }
-        }
-    }
-
-    function searchData(){
         var result = []
         if(items==null){
             list_view.model = result
             return
         }
         items.map(function(item){
-            if(item.title.indexOf(input.text)!==-1){
+            if(item.title.indexOf(control.text)!==-1){
                 result.push(item)
             }
         })
@@ -296,4 +156,3 @@ TextField{
     }
 
 }
-

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)

src/controls/FluCalendarPicker.qml

@@ -9,9 +9,10 @@ Rectangle {
     property color dividerColor: FluTheme.dark ? Qt.rgba(77/255,77/255,77/255,1) : Qt.rgba(239/255,239/255,239/255,1)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
     property color normalColor: FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(254/255,254/255,254/255,1)
+    property string text: "请选择日期"
     property var window : Window.window
 
-    id:root
+    id:control
     color: {
         if(mouse_area.containsMouse){
             return hoverColor
@@ -44,7 +45,7 @@ Rectangle {
         }
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
-        text:"请选择日期"
+        text:control.text
     }
 
     FluIcon{
@@ -95,15 +96,15 @@ Rectangle {
         }
         background: Item{}
         function showPopup() {
-            var pos = root.mapToItem(null, 0, 0)
+            var pos = control.mapToItem(null, 0, 0)
-            if(window.height>pos.y+root.height+popup.height){
+            if(window.height>pos.y+control.height+popup.height){
-                popup.y = root.height
+                popup.y = control.height
             } else if(pos.y>popup.height){
                 popup.y = -popup.height
             } else {
                 popup.y = window.height-(pos.y+popup.height)
             }
-            popup.x = -(popup.width-root.width)/2
+            popup.x = -(popup.width-control.width)/2
             popup.open()
         }
     }

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

src/controls/FluColorPicker.qml

@@ -4,8 +4,7 @@ import QtQuick.Layouts
 import QtQuick.Window
 import FluentUI
 
-
+FluControl{
-Button{
     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)

src/controls/FluFilledButton.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/FluFlipView.qml

@@ -0,0 +1,116 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Item{
+
+    property bool vertical: false
+    default property alias content : swipe.contentData
+    property alias currentIndex: swipe.currentIndex
+
+    id:control
+    width: 400
+    height: 300
+    implicitWidth: width
+    implicitHeight: height
+
+    QtObject{
+        id:d
+        property bool flag: true
+    }
+
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+        onWheel:
+            (wheel)=>{
+                if(!d.flag)
+                return
+                if (wheel.angleDelta.y > 0){
+                    btn_start.clicked()
+                }else{
+                    btn_end.clicked()
+                }
+                d.flag = false
+                timer.restart()
+            }
+    }
+
+    Timer{
+        id:timer
+        interval: 250
+        onTriggered: {
+            d.flag = true
+        }
+    }
+
+    SwipeView {
+        id:swipe
+        clip: true
+        interactive: false
+        orientation:control.vertical ? Qt.Vertical : Qt.Horizontal
+        anchors.fill: parent
+    }
+
+    FluControl{
+        id:btn_start
+        height: vertical ? 20 : 40
+        width: vertical ? 40 : 20
+        anchors{
+            left: vertical ? undefined : parent.left
+            leftMargin: vertical ? undefined : 2
+            verticalCenter: vertical ? undefined : parent.verticalCenter
+            horizontalCenter: !vertical ? undefined : parent.horizontalCenter
+            top: !vertical ? undefined :parent.top
+            topMargin: !vertical ? undefined :2
+        }
+        background: Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+        }
+        contentItem:FluIcon{
+            iconSource: vertical ? FluentIcons.CaretUpSolid8 : FluentIcons.CaretLeftSolid8
+            width: 10
+            height: 10
+            iconSize: 10
+            iconColor: btn_start.hovered ? FluColors.Grey220  :  FluColors.Grey120
+            anchors.centerIn: parent
+        }
+        visible: swipe.currentIndex !==0
+        onClicked: {
+            swipe.currentIndex = Math.max(swipe.currentIndex - 1, 0)
+        }
+    }
+
+    FluControl{
+        id:btn_end
+        height: vertical ? 20 : 40
+        width: vertical ? 40 : 20
+        anchors{
+            right: vertical ? undefined : parent.right
+            rightMargin: vertical ? undefined : 2
+            verticalCenter: vertical ? undefined : parent.verticalCenter
+            horizontalCenter: !vertical ? undefined : parent.horizontalCenter
+            bottom: !vertical ? undefined :parent.bottom
+            bottomMargin: !vertical ? undefined :2
+        }
+        background: Rectangle{
+            radius: 4
+            color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
+        }
+        visible: swipe.currentIndex !== swipe.count - 1
+        contentItem:FluIcon{
+            iconSource: vertical ? FluentIcons.CaretDownSolid8 : FluentIcons.CaretRightSolid8
+            width: 10
+            height: 10
+            iconSize: 10
+            iconColor: btn_end.hovered ? FluColors.Grey220  :  FluColors.Grey120
+            anchors.centerIn: parent
+        }
+        onClicked: {
+            swipe.currentIndex = Math.min(swipe.currentIndex + 1,swipe.count-1)
+        }
+    }
+
+}
+

src/controls/FluIconButton.qml

@@ -2,7 +2,7 @@
 import QtQuick.Controls
 import FluentUI
 
-Button {
+FluControl {
 
     property int iconSize: 20
     property int iconSource
@@ -17,7 +17,7 @@ Button {
         }
         return hovered ? hoverColor : normalColor
     }
-    property color textColor: {
+    property color iconColor: {
         if(FluTheme.dark){
             if(disabled){
                 return Qt.rgba(130/255,130/255,130/255,1)
@@ -57,7 +57,7 @@ Button {
             horizontalAlignment: Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
             anchors.centerIn: parent
-            color:control.textColor
+            color:control.iconColor
             text: (String.fromCharCode(iconSource).toString(16));
         }
         FluTooltip{

src/controls/FluMediaPlayer.qml

@@ -28,7 +28,9 @@ Rectangle {
         property bool autoSeek:true
         source: control.source
         videoOutput: video_output
-        audioOutput:audio_output
+        audioOutput: AudioOutput{
+            id:audio_output
+        }
         onErrorChanged:
             (error)=> {
                 console.debug(error)
@@ -41,10 +43,9 @@ Rectangle {
         onMediaStatusChanged:
             (status)=> {
                 if(status===2){
-                    mediaplayer.play()
-                }else if(status===5){
                     slider.maxValue = mediaplayer.duration
                     showControl = true
+                    mediaplayer.play()
                 }
             }
     }
@@ -53,10 +54,6 @@ Rectangle {
         slider.seek(0)
     }
 
-    AudioOutput{
-        id:audio_output
-    }
-
     VideoOutput {
         id:video_output
         anchors.fill: parent
@@ -66,21 +63,23 @@ Rectangle {
         height: 100
         y:showControl ? control.height - 110 : control.height
         anchors{
-            left: parent.left
+            horizontalCenter: parent.horizontalCenter
-            right: parent.right
-            leftMargin: 10
-            rightMargin: 10
         }
+        width: 460
+        opacity: showControl
         MouseArea{
             anchors.fill: parent
         }
-
+        Behavior on opacity{
+            NumberAnimation{
+                duration: 150
+            }
+        }
         Behavior on y{
             NumberAnimation{
                 duration: 150
             }
         }
-
         Rectangle{
             anchors.fill: parent
             color:FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,0.97) : Qt.rgba(237/255,237/255,237/255,0.97)
@@ -102,13 +101,11 @@ Rectangle {
                 mediaplayer.autoSeek = true
                 mediaplayer.play()
             }
-
             onValueChanged: {
                 if(mediaplayer.autoSeek == false){
                     mediaplayer.position = value*mediaplayer.duration/slider.maxValue
                 }
             }
-
             onLineClickFunc:function(val){
                 mediaplayer.position = val*mediaplayer.duration/slider.maxValue
             }
@@ -124,7 +121,6 @@ Rectangle {
             text: formatDuration(slider.value*mediaplayer.duration/slider.maxValue)
         }
 
-
         FluText{
             id:end_time
             anchors{
@@ -135,7 +131,6 @@ Rectangle {
             text: formatDuration(mediaplayer.duration)
         }
 
-
         Row{
             spacing: 10
             anchors{
@@ -170,11 +165,10 @@ Rectangle {
             }
         }
 
-
         FluIconButton{
             id:btn_volume
             iconSize: 17
-            iconSource:  audio_output.volume ?  FluentIcons.Volume :  FluentIcons.Mute
+            iconSource:  audio_output.muted ? FluentIcons.Mute  :  FluentIcons.Volume
             anchors{
                 left: parent.left
                 leftMargin: 5
@@ -182,7 +176,7 @@ Rectangle {
                 bottomMargin: 10
             }
             onClicked: {
-                audio_output.volume = !audio_output.volume
+                audio_output.muted = !audio_output.muted
             }
         }
 
@@ -200,7 +194,6 @@ Rectangle {
                 audio_output.volume = value/100
             }
         }
-
     }
 
     function formatDuration(duration) {

src/controls/FluMultilineTextBox.qml

@@ -2,36 +2,37 @@
 import QtQuick.Controls
 import FluentUI
 
-TextArea{
+FluTextArea{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
     property bool disabled: false
+    property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+    property color disableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+    property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
+    property color placeholderFocusColor: FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
+    property color placeholderDisableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
 
-    id:input
+    id:control
     width: 300
+    enabled: !disabled
     color: {
         if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+            return disableColor
         }
-        return FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+        return normalColor
     }
-    enabled: !disabled
     wrapMode: Text.WrapAnywhere
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-    selectByMouse: true
     selectionColor: FluTheme.primaryColor.lightest
-    background: FluTextBoxBackground{
-        inputItem: input
-    }
     placeholderTextColor: {
         if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+            return placeholderDisableColor
         }
         if(focus){
-            return FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
+            return placeholderFocusColor
         }
-        return FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
+        return placeholderNormalColor
     }
     font.bold: {
         switch (fontStyle) {
@@ -73,40 +74,15 @@ TextArea{
             return text.pixelSize * 1.0
         }
     }
+    selectByMouse: true
+    background: FluTextBoxBackground{ inputItem: control }
     TapHandler {
         acceptedButtons: Qt.RightButton
-       onTapped: input.echoMode !== TextInput.Password && menu.popup()
+        onTapped: control.echoMode !== TextInput.Password && menu.popup()
     }
-    FluMenu{
+    FluTextBoxMenu{
         id:menu
-        focus: false
+        inputItem: control
-        FluMenuItem{
-            text: "剪切"
-            visible: input.text !== ""
-            onClicked: {
-                input.cut()
-            }
-        }
-        FluMenuItem{
-            text: "复制"
-            visible: input.selectedText !== ""
-            onClicked: {
-                input.copy()
-            }
-        }
-        FluMenuItem{
-            text: "粘贴"
-            visible: input.canPaste
-            onClicked: {
-                input.paste()
-            }
-        }
-        FluMenuItem{
-            text: "全选"
-            visible: input.text !== ""
-            onClicked: {
-                input.selectAll()
-            }
-        }
     }
+
 }

src/controls/FluNavigationView.qml

@@ -48,14 +48,34 @@ Item {
         id:com_panel_item_separatorr
         FluDivider{
             width: nav_list.width
-            height: 1
+            height: {
+                if(model.parent){
+                    return model.parent.isExpand ? 1 : 0
+                }
+                return 1
+            }
+            Behavior on height {
+                NumberAnimation{
+                    duration: 150
+                }
+            }
         }
     }
 
     Component{
         id:com_panel_item_header
         Item{
-            height: 30
+            height: {
+                if(model.parent){
+                    return model.parent.isExpand ? 30 : 0
+                }
+                return 30
+            }
+            Behavior on height {
+                NumberAnimation{
+                    duration: 150
+                }
+            }
             width: nav_list.width
             FluText{
                 text:model.title
@@ -70,7 +90,7 @@ Item {
     }
 
     Component{
-        id:com_panel_item
+        id:com_panel_item_expander
         Item{
             height: 38
             width: nav_list.width
@@ -92,18 +112,131 @@ Item {
                     height: 18
                     radius: 1.5
                     color: FluTheme.primaryColor.dark
-                    visible: nav_list.currentIndex === position && type===0
+                    visible: {
+                        for(var i=0;i<model.children.length;i++){
+                            var item = model.children[i]
+                            if(item.idx === nav_list.currentIndex && !model.isExpand){
+                                return true
+                            }
+                        }
+                        return false
+                    }
                     anchors{
                         verticalCenter: parent.verticalCenter
                     }
                 }
+                FluIcon{
+                    rotation: model.isExpand?0:180
+                    iconSource:FluentIcons.ChevronUp
+                    iconSize: 15
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        right: parent.right
+                        rightMargin: 12
+                    }
+                    Behavior on rotation {
+                        NumberAnimation{
+                            duration: 150
+                        }
+                    }
+                }
+                MouseArea{
+                    id:item_mouse
+                    hoverEnabled: true
+                    anchors.fill: parent
+                    onClicked: {
+                        model.isExpand = !model.isExpand
+                    }
+                }
+                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)
+                        }
+                        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)
+                        }
+                        return Qt.rgba(0,0,0,0)
+                    }
+                }
+
+                FluIcon{
+                    id:item_icon
+                    iconSource: {
+                        if(model.icon){
+                            return model.icon
+                        }
+                        return 0
+                    }
+                    width: 30
+                    height: 30
+                    iconSize: 15
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left:parent.left
+                        leftMargin: 3
+                    }
+                }
+
+                FluText{
+                    id:item_title
+                    text:model.title
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left:item_icon.right
+                    }
+                }
+            }
+        }
+    }
+
+    Component{
+        id:com_panel_item
+        Item{
+            Behavior on height {
+                NumberAnimation{
+                    duration: 150
+                }
+            }
+            clip: true
+            height: {
+                if(model.parent){
+                    return model.parent.isExpand ? 38 : 0
+                }
+                return 38
+            }
+            width: nav_list.width
+
+            Rectangle{
+                radius: 4
+                anchors{
+                    top: parent.top
+                    bottom: parent.bottom
+                    left: parent.left
+                    right: parent.right
+                    topMargin: 2
+                    bottomMargin: 2
+                    leftMargin: 6
+                    rightMargin: 6
+                }
                 MouseArea{
                     id:item_mouse
                     hoverEnabled: true
                     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()
@@ -328,13 +461,22 @@ Item {
                     stackIndex.push(currentIndex)
                 }
             }
-            ScrollBar.vertical: FluScrollBar {}
+            highlight: Item{
-
+                clip: true
-            model:{
+                Rectangle{
-                if(items){
+                    height: 18
-                    return items.children
+                    radius: 1.5
+                    color: FluTheme.primaryColor.dark
+                    width: 3
+                    anchors{
+                        verticalCenter: parent.verticalCenter
+                        left: parent.left
+                        leftMargin: 6
+                    }
                 }
             }
+            ScrollBar.vertical: FluScrollBar {}
+            model:handleItems()
             delegate: Loader{
                 property var model: modelData
                 property var position: index
@@ -349,6 +491,9 @@ Item {
                     if(modelData instanceof FluPaneItemSeparator){
                         return com_panel_item_separatorr
                     }
+                    if(modelData instanceof FluPaneItemExpander){
+                        return com_panel_item_expander
+                    }
                 }
             }
         }
@@ -383,6 +528,33 @@ Item {
         }
     }
 
+    function handleItems(){
+        var idx = 0
+        var data = []
+        if(items){
+            for(var i=0;i<items.children.length;i++){
+                var item = items.children[i]
+                item.idx = idx
+                data.push(item)
+                idx++
+                if(item instanceof FluPaneItemExpander){
+                    for(var j=0;j<item.children.length;j++){
+                        var itemChild = item.children[j]
+                        itemChild.parent = item
+                        itemChild.idx = idx
+                        data.push(itemChild)
+                        idx++
+                    }
+                }
+            }
+        }
+        return data
+    }
+
+    function getItems(){
+        return nav_list.model
+    }
+
     function push(url){
         nav_swipe.push(url)
     }

src/controls/FluPaneItem.qml

@@ -3,12 +3,16 @@ import FluentUI
 
 QtObject {
     readonly property string key : FluApp.uuid()
+    readonly property int flag : 0
     property string title
+    property int order : 0
     property int icon
     property bool recentlyAdded: false
     property bool recentlyUpdated: false
     property string desc
     property var image
+    property var parent
+    property int idx
     signal tap
-    signal repTap
+    property var tapFunc
 }

src/controls/FluPaneItemExpander.qml

@@ -0,0 +1,13 @@
+import QtQuick
+import FluentUI
+
+FluObject {
+    readonly property int flag : 3
+    readonly property string key : FluApp.uuid()
+    property string title
+    property int icon
+    property bool isExpand: false
+    property var parent
+    property int idx
+    signal tap
+}

src/controls/FluPaneItemHeader.qml

@@ -1,6 +1,9 @@
 import QtQuick
 
 QtObject {
+    readonly property int flag : 1
     readonly property string key : FluApp.uuid()
     property string title
+    property var parent
+    property int idx
 }

src/controls/FluPaneItemSeparator.qml

@@ -1,5 +1,8 @@
 import QtQuick
 
 QtObject {
+    readonly property int flag : 2
     readonly property string key : FluApp.uuid()
+    property var parent
+    property int idx
 }

src/controls/FluPivot.qml

@@ -0,0 +1,104 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Item {
+
+
+    id:control
+    default property alias content: d.children
+    property color normalColor: FluTheme.dark ? FluColors.Grey120 : FluColors.Grey120
+    property color hoverColor: FluTheme.dark ? FluColors.Grey10 : FluColors.Black
+
+    width: 400
+    height: 300
+    implicitHeight: height
+    implicitWidth: width
+
+    MouseArea{
+        anchors.fill: parent
+        preventStealing: true
+    }
+
+    FluObject{
+        id:d
+    }
+
+    ListView{
+        id:nav_list
+        height: 40
+        width: control.width
+        model:d.children
+        clip: true
+        spacing: 20
+        interactive: false
+        orientation:ListView.Horizontal
+        highlight: Item{
+            clip: true
+            Rectangle{
+                height: 3
+                radius: 1.5
+                color: FluTheme.primaryColor.dark
+                width: nav_list.currentItem ? nav_list.currentItem.width : 0
+                y:37
+                Behavior on width {
+                    NumberAnimation{
+                        duration: 150
+                    }
+                }
+            }
+        }
+        delegate: Button{
+            id:item_button
+            width: item_title.width
+            height: nav_list.height
+            background:Item{
+            }
+            contentItem: Item{
+                FluText {
+                    id:item_title
+                    fontStyle: FluText.Title
+                    font.bold: false
+                    text: modelData.title
+                    anchors.centerIn: parent
+                    color: {
+                        if(item_button.hovered)
+                            return hoverColor
+                        return normalColor
+                    }
+                }
+                transitions: Transition {
+                    NumberAnimation{
+                        duration: 400;
+                    }
+                }
+            }
+            onClicked: {
+                nav_list.currentIndex = index
+            }
+        }
+    }
+
+    Item{
+        id:container
+        anchors{
+            top: nav_list.bottom
+            topMargin: 10
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+        }
+
+        Repeater{
+            model:d.children
+            Loader{
+                property var argument: modelData.argument
+                anchors.fill: parent
+                sourceComponent: modelData.contentItem
+                visible: nav_list.currentIndex === index
+            }
+        }
+    }
+
+
+}

src/controls/FluPivotItem.qml

@@ -0,0 +1,8 @@
+import QtQuick
+import FluentUI
+
+QtObject {
+    property string title
+    property Component contentItem
+    property var argument
+}

src/controls/FluRadioButton.qml

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

src/controls/FluScrollBar.qml

@@ -1,34 +1,131 @@
 import QtQuick
 import QtQuick.Controls
-import QtQuick.Controls.impl 2.15
-import QtQuick.Templates 2.15 as T
 import FluentUI
 
-T.ScrollBar {
+ScrollBar {
     id: control
 
     property color handleNormalColor: Qt.rgba(134/255,134/255,134/255,1)
     property color handleHoverColor: Qt.lighter(handleNormalColor)
     property color handlePressColor: Qt.darker(handleNormalColor)
+    property bool expand: false
+
 
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             implicitContentWidth + leftPadding + rightPadding)
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding)
 
-    padding: 4
+    visible: control.policy !== ScrollBar.AlwaysOff
-    visible: control.policy !== T.ScrollBar.AlwaysOff
     minimumSize: 0.3
-
+    topPadding:{
+        if(vertical){
+            if(expand)
+                return 15
+            return 2
+        }else{
+            if(expand){
+                return 2
+            }
+            return 4
+        }
+    }
+    bottomPadding:{
+        if(vertical){
+            if(expand)
+                return 15
+            return 2
+        }else{
+            if(expand){
+                return 2
+            }
+            return 4
+        }
+    }
+    leftPadding:{
+        if(vertical){
+            if(expand){
+                return 2
+            }
+            return 4
+        }else{
+            if(expand)
+                return 15
+            return 2
+        }
+    }
+    rightPadding:{
+        if(vertical){
+            if(expand){
+                return 2
+            }
+            return 4
+        }else{
+            if(expand)
+                return 15
+            return 2
+        }
+    }
+    Behavior on topPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on bottomPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on leftPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
+    Behavior on rightPadding {
+        NumberAnimation{
+            duration: 150
+        }
+    }
     contentItem: Rectangle {
-        implicitWidth: hovered || pressed ? 6 : 2
+        id:item_react
-        implicitHeight:  hovered || pressed ? 6 : 2
+        implicitWidth: expand ? 8 : 2
+        implicitHeight:  expand ? 8 : 2
         radius: width / 2
         layer.samples: 4
         layer.enabled: true
         layer.smooth: true
         color: control.pressed?handlePressColor:control.hovered?handleHoverColor:handleNormalColor
-        opacity:(control.policy === T.ScrollBar.AlwaysOn || control.size < 1.0)?1.0:0.0
+        opacity:(control.policy === ScrollBar.AlwaysOn || control.size < 1.0)?1.0:0.0
+    }
+    background:  Rectangle{
+        radius: 5
+        color: {
+            if(expand && item_react.opacity){
+                if(FluTheme.dark){
+                    return Qt.rgba(0,0,0,1)
+                }
+                return Qt.rgba(1,1,1,1)
+            }
+            return Qt.rgba(0,0,0,0)
+        }
+        MouseArea{
+            id:mouse_item
+            hoverEnabled: true
+            anchors.fill: parent
+            onEntered: {
+                timer.restart()
+            }
+            onExited: {
+                timer.restart()
+            }
+        }
+    }
+    Timer{
+        id:timer
+        interval: 800
+        onTriggered: {
+            expand = mouse_item.containsMouse || btn_top.hovered || btn_bottom.hovered || btn_left.hovered || btn_right.hovered
+        }
     }
     Behavior on implicitWidth {
         NumberAnimation{
@@ -36,4 +133,66 @@ T.ScrollBar {
         }
     }
 
+    FluIconButton{
+        id:btn_top
+        iconSource: FluentIcons.CaretSolidUp
+        anchors.horizontalCenter: parent.horizontalCenter
+        width:10
+        height:10
+        z:100
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        iconSize: 8
+        anchors.top: parent.top
+        anchors.topMargin: 4
+        visible:vertical && expand
+        onClicked:{
+            decrease()
+        }
+    }
+    FluIconButton{
+        id:btn_bottom
+        iconSource: FluentIcons.CaretSolidDown
+        visible:vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.bottom: parent.bottom
+        anchors.bottomMargin: 4
+        onClicked:{
+            increase()
+        }
+    }
+    FluIconButton{
+        id:btn_left
+        iconSource: FluentIcons.CaretSolidLeft
+        visible:!vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.leftMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.left: parent.left
+        onClicked:{
+            decrease()
+        }
+    }
+    FluIconButton{
+        id:btn_right
+        iconSource: FluentIcons.CaretSolidRight
+        visible:!vertical && expand
+        width:10
+        height:10
+        iconSize: 8
+        iconColor: hovered ? FluColors.Black : FluColors.Grey120
+        anchors.rightMargin: 4
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.right: parent.right
+        onClicked:{
+            increase()
+        }
+    }
+
 }

src/controls/FluTabView.qml

@@ -131,7 +131,7 @@ Item {
                         drag.target: item_container
                         drag.axis: Drag.XAxis
 
-                        onWheel: {
+                        onWheel: (wheel)=>{
                             if (wheel.angleDelta.y > 0) scroll_nav.decrease()
                             else scroll_nav.increase()
                         }
@@ -198,7 +198,7 @@ Item {
                             }
                         }
                         function updatePosition(pos){
-                            var idx = tab_nav.indexAt(pos.x+tab_nav.contentX, pos.y)
+                            var idx = tab_nav.indexAt(pos.x+tab_nav.contentX+1, pos.y)
                             var firstIdx = tab_nav.indexAt(tab_nav.contentX+1, pos.y)
                             var lastIdx = tab_nav.indexAt(tab_nav.width+tab_nav.contentX-1, pos.y)
                             if(lastIdx === -1){

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,31 +2,37 @@
 import QtQuick.Controls
 import FluentUI
 
-TextField{
+FluTextFiled{
 
     property int fontStyle: FluText.Body
     property int pixelSize : FluTheme.textSize
     property bool disabled: false
+    property int iconSource: 0
+    property color normalColor: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+    property color disableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+    property color placeholderNormalColor: FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
+    property color placeholderFocusColor: FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
+    property color placeholderDisableColor: FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
 
-    id:input
+    id:control
     width: 300
     enabled: !disabled
     color: {
         if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+            return disableColor
         }
-        return FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
+        return normalColor
     }
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
     selectionColor: FluTheme.primaryColor.lightest
     placeholderTextColor: {
         if(disabled){
-            return FluTheme.dark ? Qt.rgba(131/255,131/255,131/255,1) : Qt.rgba(160/255,160/255,160/255,1)
+            return placeholderDisableColor
         }
         if(focus){
-            return FluTheme.dark ? Qt.rgba(152/255,152/255,152/255,1) : Qt.rgba(141/255,141/255,141/255,1)
+            return placeholderFocusColor
         }
-        return FluTheme.dark ? Qt.rgba(210/255,210/255,210/255,1) : Qt.rgba(96/255,96/255,96/255,1)
+        return placeholderNormalColor
     }
     font.bold: {
         switch (fontStyle) {
@@ -69,44 +75,45 @@ TextField{
         }
     }
     selectByMouse: true
+    rightPadding: icon_end.visible ? 50 : 30
     background: FluTextBoxBackground{
-        inputItem: input
+        inputItem: control
+        FluIcon{
+            id:icon_end
+            iconSource: control.iconSource
+            iconSize: 15
+            opacity: 0.5
+            visible: control.iconSource != 0
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+                rightMargin: 5
+            }
+        }
+    }
+    FluIconButton{
+        iconSource:FluentIcons.ChromeClose
+        iconSize: 10
+        width: 20
+        height: 20
+        opacity: 0.5
+        visible: control.text !== ""
+        anchors{
+            verticalCenter: parent.verticalCenter
+            right: parent.right
+            rightMargin: icon_end.visible ? 25 : 5
+        }
+        onClicked:{
+            control.text = ""
+        }
     }
     TapHandler {
         acceptedButtons: Qt.RightButton
-        onTapped: input.echoMode !== TextInput.Password && menu.popup()
+        onTapped: control.echoMode !== TextInput.Password && menu.popup()
     }
-    FluMenu{
+    FluTextBoxMenu{
         id:menu
-        focus: false
+        inputItem: control
-        FluMenuItem{
-            text: "剪切"
-            visible: input.text !== ""
-            onClicked: {
-                input.cut()
-            }
-        }
-        FluMenuItem{
-            text: "复制"
-            visible: input.selectedText !== ""
-            onClicked: {
-                input.copy()
-            }
-        }
-        FluMenuItem{
-            text: "粘贴"
-            visible: input.canPaste
-            onClicked: {
-                input.paste()
-            }
-        }
-        FluMenuItem{
-            text: "全选"
-            visible: input.text !== ""
-            onClicked: {
-                input.selectAll()
-            }
-        }
     }
 
 }

src/controls/FluTextBoxMenu.qml

@@ -0,0 +1,40 @@
+import QtQuick
+import FluentUI
+
+FluMenu{
+    property string cutText : "剪切"
+    property string copyText : "复制"
+    property string pasteText : "粘贴"
+    property string selectAllText : "全选"
+    property var inputItem
+    id:menu
+    focus: false
+    FluMenuItem{
+        text: cutText
+        visible: inputItem.text !== "" && !inputItem.readOnly
+        onClicked: {
+            inputItem.cut()
+        }
+    }
+    FluMenuItem{
+        text: copyText
+        visible: inputItem.selectedText !== ""
+        onClicked: {
+            inputItem.copy()
+        }
+    }
+    FluMenuItem{
+        text: pasteText
+        visible: inputItem.canPaste
+        onClicked: {
+            inputItem.paste()
+        }
+    }
+    FluMenuItem{
+        text: selectAllText
+        visible: inputItem.text !== ""
+        onClicked: {
+            inputItem.selectAll()
+        }
+    }
+}

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/FluToggleSwitch.qml

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

src/controls/TFpsMonitor.qml

@@ -1,71 +0,0 @@
-import QtQuick
-import FluentUI
-
-Item {
-
-    readonly property alias fps: _private.fps;
-    readonly property alias fpsAvg: _private.fpsAvg;
-    property color color: "#C0C0C0"
-    property Component contentItem: contentComponent;
-
-    id: control
-    width: contentItemLoader.width + 5;
-    height: contentItemLoader.height + 5;
-
-
-
-    Component{
-        id:contentComponent
-        FluText{
-            color:control.color
-            text: " Avg " + fpsAvg + " | " + fps + " Fps";
-        }
-    }
-
-    FluObject{
-        id:_private;
-        property int frameCounter: 0
-        property int frameCounterAvg: 0
-        property int counter: 0
-        property int fps: 0
-        property int fpsAvg: 0
-    }
-
-    Rectangle {
-        id: monitor
-        radius: 3
-        width: 6
-        height: width
-        opacity: 0;
-
-        NumberAnimation on rotation {
-            from:0
-            to: 360
-            duration: 800
-            loops: Animation.Infinite
-        }
-        onRotationChanged: _private.frameCounter++;
-    }
-
-    Loader{
-        id:contentItemLoader
-        sourceComponent: contentItem
-    }
-
-    Timer {
-        interval: 2000
-        repeat: true
-        running: visible
-        onTriggered: {
-            _private.frameCounterAvg += _private.frameCounter;
-            _private.fps = _private.frameCounter/2;
-            _private.counter++;
-            _private.frameCounter = 0;
-            if (_private.counter >= 3) {
-                _private.fpsAvg = _private.frameCounterAvg/(2 * _private.counter)
-                _private.frameCounterAvg = 0;
-                _private.counter = 0;
-            }
-        }
-    }
-}

src/res.qrc

@@ -1,4 +1,4 @@
-<RCC>
+<RCC>
     <qresource prefix="/com.zhuzichu">
         <file>controls/FluButton.qml</file>
         <file>controls/FluFilledButton.qml</file>
@@ -22,9 +22,7 @@
         <file>controls/FluIcon.qml</file>
         <file>controls/FluDivider.qml</file>
         <file>controls/FluTooltip.qml</file>
-        <file>controls/TFpsMonitor.qml</file>
         <file>controls/FluTextBoxBackground.qml</file>
-        <file>controls/FluMultiLineTextBox.qml</file>
         <file>controls/FluWindowResize.qml</file>
         <file>controls/FluScrollBar.qml</file>
         <file>controls/FluMenu.qml</file>
@@ -60,5 +58,14 @@
         <file>controls/FluMediaPlayer.qml</file>
         <file>controls/FluTabView.qml</file>
         <file>controls/FluItem.qml</file>
+        <file>controls/FluPaneItemExpander.qml</file>
+        <file>controls/FluTextBoxMenu.qml</file>
+        <file>controls/FluMultilineTextBox.qml</file>
+        <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>
     </qresource>
 </RCC>