update

examlple: Make the items in searchbox more readable.

CMakeLists.txt

@@ -4,6 +4,13 @@ project(FluentUI VERSION 0.1 LANGUAGES CXX)
 
 option(FLUENTUI_BUILD_EXAMPLES "Build FluentUI demo applications." ON)
 option(FLUENTUI_BUILD_FRAMELESSHEPLER "Build FramelessHelper." ON)
+option(FLUENTUI_BUILD_STATIC_LIB "Build static library." OFF)
+
+#设置QML插件输出目录，可以通过外部设置，如果外部没有设置就默认到<QT_SDK_DIR_PATH>\qml\FluentUI目录下
+set(FLUENTUI_QML_PLUGIN_DIRECTORY "" CACHE PATH "Path to FluentUI plugin")
+if(NOT FLUENTUI_QML_PLUGIN_DIRECTORY)
+    set(FLUENTUI_QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
+endif()
 
 add_subdirectory(src)
 
@@ -12,6 +19,10 @@ if (FLUENTUI_BUILD_EXAMPLES)
 endif ()
 
 if (FLUENTUI_BUILD_FRAMELESSHEPLER)
+    set(FRAMELESSHELPER_BUILD_STATIC ON)
+    set(FRAMELESSHELPER_NO_SUMMARY OFF)
+    set(FRAMELESSHELPER_NO_DEBUG_OUTPUT OFF)
+    set(FRAMELESSHELPER_BUILD_WIDGETS OFF)
     add_definitions(-DFRAMELESSHELPER_CORE_NO_DEBUG_OUTPUT)
     add_definitions(-DFRAMELESSHELPER_QUICK_NO_DEBUG_OUTPUT)
     add_subdirectory(framelesshelper)
@@ -20,3 +31,5 @@ endif ()
 message("------------------------ FluentUI ------------------------")
 message("Build FluentUI demo applications.: ${FLUENTUI_BUILD_EXAMPLES}")
 message("Build FramelessHelper.: ${FLUENTUI_BUILD_FRAMELESSHEPLER}")
+message("Build static library.: ${FLUENTUI_BUILD_STATIC_LIB}")
+message("Path to FluentUI plugin.: ${FLUENTUI_QML_PLUGIN_DIRECTORY}")

example/CMakeLists.txt

@@ -3,12 +3,19 @@ cmake_minimum_required(VERSION 3.20)
 project(example VERSION 0.1 LANGUAGES CXX)
 
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 endif()
 
+#导入exmaple的QML位置，不然import example有时候会爆红
+set(QML_IMPORT_PATH ${CMAKE_BINARY_DIR}/example CACHE STRING "Qt Creator extra QML import paths" FORCE)
+
+#判断FluentUI库类型
+if(FLUENTUI_BUILD_STATIC_LIB)
+    add_definitions(-DFLUENTUI_BUILD_STATIC_LIB)
+endif()
+
 #设置可执行文件输出目录
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin/debug)
@@ -20,10 +27,17 @@ endif()
 file(TO_CMAKE_PATH "/" PATH_SEPARATOR)
 
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,4,0,0)
 
-find_package(Qt6 REQUIRED COMPONENTS Quick)
+find_package(Qt6 REQUIRED COMPONENTS Quick Svg Network)
-qt_standard_project_setup()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
+    qt_standard_project_setup()
+else()
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+endif()
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
@@ -76,12 +90,17 @@ endif()
 
 #添加qml模块
 qt_add_qml_module(example
-    URI example
+    URI "example"
     VERSION 1.0
     QML_FILES ${qml_files}
     RESOURCES ${resource_files}
 )
 
+#导入component头文件,不然通过QML_NAMED_ELEMENT生成的c++类会找不到头文件报错
+target_include_directories(example PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/component
+)
+
 #设置属性
 set_target_properties(example PROPERTIES
     MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com
@@ -92,12 +111,26 @@ set_target_properties(example PROPERTIES
 )
 
 #链接库
-target_link_libraries(example PRIVATE
+if (FLUENTUI_BUILD_STATIC_LIB)
-    Qt6::Quick
+    target_link_libraries(example PRIVATE
-    fluentuiplugin
+        Qt6::Quick
-    FramelessHelper::Core
+        Qt6::Svg
-    FramelessHelper::Quick
+        Qt6::Network
-)
+        fluentui
+        fluentuiplugin
+        FramelessHelper::Core
+        FramelessHelper::Quick
+    )
+else()
+    target_link_libraries(example PRIVATE
+        Qt6::Quick
+        Qt6::Svg
+        Qt6::Network
+        fluentuiplugin
+        FramelessHelper::Core
+        FramelessHelper::Quick
+    )
+endif()
 
 #安装
 install(TARGETS example
@@ -105,10 +138,3 @@ install(TARGETS example
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
-
-qt_generate_deploy_app_script(
-    TARGET example
-    OUTPUT_SCRIPT deploy_script
-    NO_UNSUPPORTED_PLATFORM_ERROR
-)
-install(SCRIPT ${deploy_script})

example/qml/App.qml

@@ -5,19 +5,40 @@ import QtQuick.Layouts
 import FluentUI
 
 Window {
-    id:app
+    id: app
+    flags: Qt.SplashScreen
+
+    FluHttpInterceptor{
+        id:interceptor
+        function onIntercept(request){
+            if(request.method === "get"){
+                request.params["method"] = "get"
+            }
+            if(request.method === "post"){
+                request.params["method"] = "post"
+            }
+            request.headers["token"] ="yyds"
+            request.headers["os"] ="pc"
+            console.debug(JSON.stringify(request))
+            return request
+        }
+    }
+
     Component.onCompleted: {
         FluApp.init(app)
-        FluTheme.darkMode = FluDarkMode.System
+        FluTheme.darkMode = FluThemeType.System
+        FluTheme.enableAnimation = true
         FluApp.routes = {
             "/":"qrc:/example/qml/window/MainWindow.qml",
             "/about":"qrc:/example/qml/window/AboutWindow.qml",
             "/login":"qrc:/example/qml/window/LoginWindow.qml",
+            "/hotload":"qrc:/example/qml/window/HotloadWindow.qml",
             "/singleTaskWindow":"qrc:/example/qml/window/SingleTaskWindow.qml",
             "/standardWindow":"qrc:/example/qml/window/StandardWindow.qml",
             "/singleInstanceWindow":"qrc:/example/qml/window/SingleInstanceWindow.qml"
         }
         FluApp.initialRoute = "/"
+        FluApp.httpInterceptor = interceptor
         FluApp.run()
     }
 }

example/qml/component/CodeExpander.qml

@@ -37,11 +37,6 @@ FluExpander{
             rightMargin: 5
             topMargin: 5
         }
-        onActiveFocusChanged: {
-            if(activeFocus){
-                control.expand = true
-            }
-        }
         onClicked:{
             FluTools.clipText(content.text)
             showSuccess("复制成功")
@@ -133,13 +128,14 @@ FluExpander{
                     "FluRemoteLoader",
                     "FluMenuBar",
                     "FluPagination",
-                    "FluRadioButtons"
+                    "FluRadioButtons",
+                    "FluImage",
+                    "FluSpinBox",
+                    "FluHttp",
+                    "FluWatermark"
                 ];
         code = code.replace(/\n/g, "<br>");
         code = code.replace(/ /g, "&nbsp;");
         return code.replace(RegExp("\\b(" + qmlKeywords.join("|") + ")\\b", "g"), "<span style='color: #c23a80'>$1</span>");
     }
-
-
-
 }

example/qml/component/CustomWindow.qml

@@ -4,14 +4,11 @@ import FluentUI
 import org.wangwenx190.FramelessHelper
 
 FluWindow {
-
     id:window
-
     property bool fixSize
     property alias titleVisible: title_bar.titleVisible
     property bool appBarVisible: true
     default property alias content: container.data
-
     FluAppBar {
         id: title_bar
         title: window.title
@@ -23,7 +20,6 @@ FluWindow {
         }
         darkText: lang.dark_mode
     }
-
     Item{
         id:container
         anchors{
@@ -34,7 +30,6 @@ FluWindow {
         }
         clip: true
     }
-
     FramelessHelper{
         id:framless_helper
         onReady: {
@@ -59,13 +54,10 @@ FluWindow {
                 FramelessUtils.systemTheme = FramelessHelperConstants.Light
         }
     }
-
     function setHitTestVisible(com){
         framless_helper.setHitTestVisible(com)
     }
-
     function setTitleBarItem(com){
         framless_helper.setTitleBarItem(com)
     }
-
 }

example/qml/global/ItemsOriginal.qml

@@ -54,6 +54,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_Text.qml")
             }
         }
+        FluPaneItem{
+            title:"Image"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Image.qml")
+            }
+        }
         FluPaneItem{
             title:"Slider"
             image:"qrc:/example/res/image/control/Slider.png"
@@ -175,6 +181,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_Expander.qml")
             }
         }
+        FluPaneItem{
+            title:"Watermark"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Watermark.qml")
+            }
+        }
     }
 
     FluPaneItemExpander{
@@ -314,6 +326,12 @@ FluObject{
     FluPaneItemExpander{
         title:lang.other
         icon:FluentIcons.Shop
+        FluPaneItem{
+            title:"Http"
+            onTap:{
+                navigationView.push("qrc:/example/qml/page/T_Http.qml")
+            }
+        }
         FluPaneItem{
             id:item_other
             title:"RemoteLoader"
@@ -327,6 +345,12 @@ FluObject{
                 navigationView.push("qrc:/example/qml/page/T_RemoteLoader.qml")
             }
         }
+        FluPaneItem{
+            title:"HotLoader"
+            tapFunc:function(){
+                 FluApp.navigate("/hotload")
+            }
+        }
     }
 
     function getRecentlyAddedData(){
@@ -367,7 +391,12 @@ FluObject{
         for(var i=0;i<items.length;i++){
             var item = items[i]
             if(item instanceof FluPaneItem){
-                arr.push({title:item.title,key:item.key})
+                if (item.parent instanceof FluPaneItemExpander)
+                {
+                    arr.push({title:`${item.parent.title} -> ${item.title}`,key:item.key})
+                }
+                else
+                    arr.push({title:item.title,key:item.key})
             }
         }
         return arr

example/qml/global/MainEvent.qml

@@ -5,5 +5,5 @@ import QtQuick.Controls
 import FluentUI
 
 QtObject {
-    property int displayMode : FluNavigationView.Auto
+    property int displayMode : FluNavigationViewType.Auto
 }

example/qml/page/T_Acrylic.qml

@@ -9,35 +9,84 @@ FluScrollablePage{
 
     title:"Acrylic"
 
+    RowLayout{
+        spacing: 10
+        Layout.topMargin: 20
+        FluText{
+            text:"tintColor:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluColorPicker{
+            id:color_picker
+        }
+    }
+    RowLayout{
+        spacing: 10
+        FluText{
+            text:"tintOpacity:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluSlider{
+            id:slider_tint_opacity
+            value: 65
+        }
+    }
+    RowLayout{
+        spacing: 10
+        FluText{
+            text:"blurRadius:"
+            Layout.alignment: Qt.AlignVCenter
+        }
+        FluSlider{
+            id:slider_blur_radius
+            value: 32
+        }
+    }
     FluArea{
         Layout.fillWidth: true
-        Layout.topMargin: 20
+        height: 1200/4+20
-        height: 1200/5+20
         paddings: 10
-
+        Layout.topMargin: 10
         FluRectangle{
-            width: 1920/5
+            width: 1920/4
-            height: 1200/5
+            height: 1200/4
             radius:[15,15,15,15]
             Image {
                 id:image
                 asynchronous: true
-                source: "qrc:/example/res/image/banner_3.jpg"
+                source: "qrc:/example/res/image/bg_scenic.png"
                 anchors.fill: parent
                 sourceSize: Qt.size(2*width,2*height)
             }
             FluAcrylic {
-                sourceItem:image
+                id:acrylic
-                anchors.bottom: parent.bottom
+                target: image
-                anchors.right: parent.right
+                width: 200
-                width: 100
+                height: 200
-                height: 100
+                tintOpacity: slider_tint_opacity.value/100
+                tintColor: color_picker.colorValue
+                blurRadius: slider_blur_radius.value
+                x:(image.width-width)/2
+                y:(image.height-height)/2
                 FluText {
                     anchors.centerIn: parent
                     text: "Acrylic"
                     color: "#FFFFFF"
                     font.bold: true
                 }
+                MouseArea {
+                    property point clickPos: Qt.point(0,0)
+                    id:drag_area
+                    anchors.fill: parent
+                    onPressed: (mouse)=>{
+                                   clickPos = Qt.point(mouse.x, mouse.y)
+                               }
+                    onPositionChanged: (mouse)=>{
+                                           var delta = Qt.point(mouse.x - clickPos.x,mouse.y - clickPos.y)
+                                           acrylic.x = acrylic.x + delta.x
+                                           acrylic.y = acrylic.y + delta.y
+                                       }
+                }
             }
             Layout.topMargin: 20
         }
@@ -54,7 +103,7 @@ FluScrollablePage{
     radius: 8
     }
     FluAcrylic{
-        sourceItem:image
+        target:image
         width: 100
         height: 100
         anchors.centerIn: parent

example/qml/page/T_Awesome.qml

@@ -33,6 +33,7 @@ FluContentPage {
         cellWidth: 80
         cellHeight: 80
         clip: true
+        boundsBehavior: GridView.StopAtBounds
         model:FluApp.awesomelist()
         ScrollBar.vertical: FluScrollBar {}
         anchors{

example/qml/page/T_Buttons.qml

@@ -24,6 +24,7 @@ FluScrollablePage{
         FluTextButton{
             disabled:text_button_switch.checked
             text:"Text Button"
+            contentDescription: "文本按钮"
             onClicked: {
                 showInfo("点击Text Button")
             }
@@ -222,7 +223,7 @@ FluScrollablePage{
             FluMenuItem{
                 text:"Menu_4"
                 onClicked: {
-                    console.debug(parent.height)
+
                 }
             }
         }
@@ -240,20 +241,18 @@ FluScrollablePage{
         Layout.topMargin: -1
         code:'FluDropDownButton{
     text:"DropDownButton"
-    items:[
+    FluMenuItem{
-        FluMenuItem{
+        text:"Menu_1"
-            text:"Menu_1"
+    },
-        },
+    FluMenuItem{
-        FluMenuItem{
+        text:"Menu_2"
-            text:"Menu_2"
+    },
-        },
+    FluMenuItem{
-        FluMenuItem{
+        text:"Menu_3"
-            text:"Menu_3"
+    },
-        },
+    FluMenuItem{
-        FluMenuItem{
+        text:"Menu_4"
-            text:"Menu_4"
+    }
-        }
-    ]
 }'
     }
 

example/qml/page/T_ColorPicker.qml

@@ -23,8 +23,6 @@ FluScrollablePage{
                 text:"此颜色组件是Github上的开源项目"
             }
             FluTextButton{
-                leftPadding: 0
-                rightPadding: 0
                 text:"https://github.com/rshest/qml-colorpicker"
                 onClicked: {
                     Qt.openUrlExternally(text)

example/qml/page/T_ComboBox.qml

@@ -46,6 +46,7 @@ FluScrollablePage{
             }
             FluComboBox {
                 editable: true
+                font:FluTextStyle.BodyStrong
                 model: ListModel {
                     id: model_2
                     ListElement { text: "Banana" }

example/qml/page/T_DatePicker.qml

@@ -23,6 +23,9 @@ FluScrollablePage{
                 text:"showYear=true"
             }
             FluDatePicker{
+                onCurrentChanged: {
+                    showSuccess(current.toLocaleDateString())
+                }
             }
         }
     }
@@ -50,7 +53,9 @@ FluScrollablePage{
 
             FluDatePicker{
                 showYear:false
-
+                onCurrentChanged: {
+                    showSuccess(current.toLocaleDateString())
+                }
             }
         }
     }

example/qml/page/T_Dialog.qml

@@ -31,7 +31,7 @@ FluScrollablePage{
     title:"友情提示"
     message:"确定要退出程序么？"
     negativeText:"取消"
-    buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+    buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
     onNegativeClicked:{
         showSuccess("点击取消按钮")
     }
@@ -47,7 +47,7 @@ FluScrollablePage{
         id:double_btn_dialog
         title:"友情提示"
         message:"确定要退出程序么？"
-        buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
         negativeText:"取消"
         onNegativeClicked:{
             showSuccess("点击取消按钮")
@@ -80,7 +80,7 @@ FluScrollablePage{
     title:"友情提示"
     message:"确定要退出程序么？"
     negativeText:"取消"
-    buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+    buttonFlags: FluContentDialogType.NeutralButton | FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
     negativeText:"取消"
     onNegativeClicked:{
         showSuccess("点击取消按钮")
@@ -101,7 +101,7 @@ FluScrollablePage{
         id:triple_btn_dialog
         title:"友情提示"
         message:"确定要退出程序么？"
-        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        buttonFlags: FluContentDialogType.NeutralButton | FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
         negativeText:"取消"
         onNegativeClicked:{
             showSuccess("点击取消按钮")

example/qml/page/T_FlipView.qml

@@ -76,7 +76,6 @@ FluScrollablePage{
                 Image{
                     source: "qrc:/example/res/image/banner_1.jpg"
                     asynchronous: true
-                    sourceSize: Qt.size(400,300)
                     fillMode:Image.PreserveAspectCrop
                 }
                 Image{

example/qml/page/T_Home.qml

@@ -7,7 +7,8 @@ import FluentUI
 
 FluScrollablePage{
 
-    pageMode: FluNavigationView.SingleTask
+    launchMode: FluPageType.SingleTask
+    animDisabled: true
 
     ListModel{
         id:model_header
@@ -67,19 +68,16 @@ FluScrollablePage{
                 id: control
                 width: 220
                 height: 240
-                FluArea{
+                FluItem{
-                    radius: 8
+                    radius: [8,8,8,8]
                     width: 200
                     height: 220
                     anchors.centerIn: parent
-                    color: 'transparent'
+                    FluAcrylic{
-                    FluAcrylic {
-                        sourceItem:bg
                         anchors.fill: parent
-                        color: FluTheme.dark ? Window.active ?  Qt.rgba(38/255,44/255,54/255,1) : Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+                        tintColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
-                        rectX: list.x-list.contentX+10+(control.width)*index
+                        target: bg
-                        rectY: list.y+10
+                        targetRect: Qt.rect(list.x-list.contentX+10+(control.width)*index,list.y+10,width,height)
-                        acrylicOpacity:0.8
                     }
                     Rectangle{
                         anchors.fill: parent
@@ -98,7 +96,6 @@ FluScrollablePage{
                             }
                         }
                     }
-
                     ColumnLayout{
                         Image {
                             Layout.topMargin: 20

example/qml/page/T_Http.qml

@@ -0,0 +1,214 @@
+import QtQuick
+import Qt.labs.platform
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import QtQuick.Dialogs
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluContentPage{
+
+    title:"Http"
+
+    FluHttp{
+        id:http
+    }
+
+    Flickable{
+        id:layout_flick
+        width: 160
+        clip: true
+        anchors{
+            top: parent.top
+            topMargin: 20
+            bottom: parent.bottom
+            left: parent.left
+        }
+        ScrollBar.vertical: FluScrollBar {}
+        contentHeight:layout_column.height
+        Column{
+            spacing: 2
+            id:layout_column
+            width: parent.width
+            FluButton{
+                implicitWidth: parent.width
+                implicitHeight: 36
+                text: "Get请求"
+                onClicked: {
+                    var callable = {}
+                    callable.onStart = function(){
+                        showLoading()
+                    }
+                    callable.onFinish = function(){
+                        hideLoading()
+                    }
+                    callable.onSuccess = function(result){
+                        text_info.text = result
+                        console.debug(result)
+                    }
+                    callable.onError = function(status,errorString){
+                        console.debug(status+";"+errorString)
+                    }
+                    http.get("https://httpbingo.org/get",callable)
+                }
+            }
+            FluButton{
+                implicitWidth: parent.width
+                implicitHeight: 36
+                text: "Post表单请求"
+                onClicked: {
+                    var callable = {}
+                    callable.onStart = function(){
+                        showLoading()
+                    }
+                    callable.onFinish = function(){
+                        hideLoading()
+                    }
+                    callable.onSuccess = function(result){
+                        text_info.text = result
+                        console.debug(result)
+                    }
+                    callable.onError = function(status,errorString){
+                        console.debug(status+";"+errorString)
+                    }
+                    var param = {}
+                    param.custname = "朱子楚"
+                    param.custtel = "1234567890"
+                    param.custemail = "zhuzichu520@gmail.com"
+                    http.post("https://httpbingo.org/post",callable,param)
+                }
+            }
+            FluButton{
+                implicitWidth: parent.width
+                implicitHeight: 36
+                text: "Post Json请求"
+                onClicked: {
+                    var callable = {}
+                    callable.onStart = function(){
+                        showLoading()
+                    }
+                    callable.onFinish = function(){
+                        hideLoading()
+                    }
+                    callable.onSuccess = function(result){
+                        text_info.text = result
+                        console.debug(result)
+                    }
+                    callable.onError = function(status,errorString){
+                        console.debug(status+";"+errorString)
+                    }
+                    var param = {}
+                    param.custname = "朱子楚"
+                    param.custtel = "1234567890"
+                    param.custemail = "zhuzichu520@gmail.com"
+                    http.postJson("https://httpbingo.org/post",callable,param)
+                }
+            }
+            FluButton{
+                implicitWidth: parent.width
+                implicitHeight: 36
+                text: "Post String请求"
+                onClicked: {
+                    var callable = {}
+                    callable.onStart = function(){
+                        showLoading()
+                    }
+                    callable.onFinish = function(){
+                        hideLoading()
+                    }
+                    callable.onSuccess = function(result){
+                        text_info.text = result
+                        console.debug(result)
+                    }
+                    callable.onError = function(status,errorString){
+                        console.debug(status+";"+errorString)
+                    }
+                    var param = "我命由我不由天"
+                    http.postString("https://httpbingo.org/post",callable,param)
+                }
+            }
+            FluButton{
+                id:btn_download
+                implicitWidth: parent.width
+                implicitHeight: 36
+                text: "下载文件"
+                onClicked: {
+                    file_dialog.open()
+                }
+            }
+        }
+    }
+
+    FolderDialog {
+        id: file_dialog
+        currentFolder: StandardPaths.standardLocations(StandardPaths.DownloadLocation)[0]
+        onAccepted: {
+            var callable = {}
+            callable.onStart = function(){
+                btn_download.disabled = true
+            }
+            callable.onFinish = function(){
+                btn_download.disabled = false
+                btn_download.text = "下载文件"
+                layout_file_size.visible = false
+                text_file_size.text = ""
+            }
+            callable.onSuccess = function(result){
+                showSuccess(result)
+            }
+            callable.onError = function(status,errorString){
+                showError(errorString)
+            }
+            callable.onDownloadProgress = function(recv,total){
+                var locale = Qt.locale()
+                var precent = (recv/total * 100).toFixed(0) + "%"
+                btn_download.text = "下载中..."+precent
+                text_file_size.text =  "%1/%2".arg(locale.formattedDataSize(recv)).arg(locale.formattedDataSize(total))
+                layout_file_size.visible = true
+            }
+            var path = FluTools.toLocalPath(currentFolder)+ "/big_buck_bunny.mp4"
+            http.download("http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4",callable,path)
+        }
+    }
+
+    FluArea{
+        anchors{
+            top: layout_flick.top
+            bottom: layout_flick.bottom
+            left: layout_flick.right
+            right: parent.right
+            leftMargin: 8
+        }
+        Flickable{
+            clip: true
+            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
+            }
+        }
+    }
+
+    FluRectangle{
+        id:layout_file_size
+        radius: [4,4,4,4]
+        height: 36
+        width: 160
+        visible: false
+        x:layout_flick.width
+        y: 173 - layout_flick.contentY
+        FluText{
+            id:text_file_size
+            anchors.centerIn: parent
+        }
+    }
+
+}

example/qml/page/T_Image.qml

@@ -0,0 +1,48 @@
+import QtQuick
+import QtQuick.Layouts
+import QtQuick.Window
+import QtQuick.Controls
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluScrollablePage{
+
+    title:"Image"
+
+    FluArea{
+        Layout.fillWidth: true
+        height: 260
+        paddings: 10
+        Layout.topMargin: 20
+        Column{
+            spacing: 15
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left:parent.left
+            }
+            FluImage{
+                width: 384
+                height: 240
+                source: "https://gitee.com/zhu-zichu/zhu-zichu/raw/74f075efe2f8d3c3bb7ba3c2259e403450e4050b/image/banner_4.jpg"
+                onStatusChanged:{
+                    if(status === Image.Error){
+                        showError("图片加载失败，请重新加载")
+                    }
+                }
+                clickErrorListener: function(){
+                    source = "https://gitee.com/zhu-zichu/zhu-zichu/raw/74f075efe2f8d3c3bb7ba3c2259e403450e4050b/image/banner_1.jpg"
+                }
+            }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluImage{
+    width: 400
+    height: 300
+    source: "https://gitee.com/zhu-zichu/zhu-zichu/raw/74f075efe2f8d3c3bb7ba3c2259e403450e4050b/image/banner_1.jpg"
+}'
+    }
+
+}

example/qml/page/T_InfoBar.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 200
+        height: 240
         paddings: 10
         ColumnLayout{
             spacing: 14
@@ -44,6 +44,12 @@ FluScrollablePage{
                     showSuccess("这是一个Success样式的InfoBar这是一个Success样式的InfoBar")
                 }
             }
+            FluButton{
+                text:"Loading"
+                onClicked: {
+                    showLoading()
+                }
+            }
         }
     }
     CodeExpander{

example/qml/page/T_MultiWindow.qml

@@ -93,9 +93,9 @@ FluScrollablePage{
         Layout.fillWidth: true
         Layout.topMargin: -1
         code:'FluWindow{
-  //launchMode: FluWindow.Standard
+  //launchMode: FluWindowType.Standard
-  //launchMode: FluWindow.SingleTask
+  //launchMode: FluWindowType.SingleTask
-     launchMode: FluWindow.SingleInstance
+     launchMode: FluWindowType.SingleInstance
 }
 '
     }

example/qml/page/T_Pivot.qml

@@ -76,5 +76,4 @@ FluScrollablePage{
 }
 '
     }
-
 }

example/qml/page/T_Progress.qml

@@ -12,32 +12,74 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 260
+        height: 130
         paddings: 10
+
         ColumnLayout{
-            spacing: 20
+            spacing: 10
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
+            FluText{
+                text: "indeterminate = true"
+            }
             FluProgressBar{
             }
             FluProgressRing{
             }
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluProgressBar{
+
+}
+FluProgressRing{
+
+}
+'
+    }
+
+    FluArea{
+        Layout.fillWidth: true
+        Layout.topMargin: 20
+        height: 286
+        paddings: 10
+
+        ColumnLayout{
+            spacing: 10
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+            FluText{
+                text: "indeterminate = false"
+            }
             FluProgressBar{
-                id:progress_bar
                 indeterminate: false
+                value:slider.value/100
+                Layout.topMargin: 10
+            }
+            FluProgressBar{
+                indeterminate: false
+                value:slider.value/100
+                progressVisible: true
+                Layout.topMargin: 10
             }
             FluProgressRing{
-                id:progress_ring
                 indeterminate: false
+                value: slider.value/100
+                Layout.topMargin: 10
+            }
+            FluProgressRing{
+                progressVisible: true
+                indeterminate: false
+                value: slider.value/100
             }
             FluSlider{
-                onValueChanged:{
+                id:slider
-                    var progress = value/100
-                    progress_bar.progress = progress
-                    progress_ring.progress = progress
-                }
                 Component.onCompleted: {
                     value = 50
                 }
@@ -48,22 +90,14 @@ FluScrollablePage{
         Layout.fillWidth: true
         Layout.topMargin: -1
         code:'FluProgressBar{
-
-}
-
-FluProgressRing{
-
-}
-
-FluProgressBar{
     indeterminate: false
 }
-
 FluProgressRing{
     indeterminate: false
-}'
+    progressVisible: true
+}
+'
     }
 
 
-
 }

example/qml/page/T_Rectangle.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 480
+        height: 460
         paddings: 10
 
         Column{

example/qml/page/T_RemoteLoader.qml

@@ -5,8 +5,10 @@ import QtQuick.Controls
 import FluentUI
 import "qrc:///example/qml/component"
 
-FluRemoteLoader{
+FluPage{
-    property int pageMode: FluNavigationView.SingleTop
+    launchMode: FluPageType.SingleTop
-    property string url: ''
+    FluRemoteLoader{
-    source: "https://zhu-zichu.gitee.io/T_RemoteLoader.qml"
+        anchors.fill: parent
+        source: "https://zhu-zichu.gitee.io/T_RemoteLoader.qml"
+    }
 }

example/qml/page/T_Settings.qml

@@ -28,7 +28,7 @@ FluScrollablePage{
                 Layout.bottomMargin: 4
             }
             Repeater{
-                model: [{title:"System",mode:FluDarkMode.System},{title:"Light",mode:FluDarkMode.Light},{title:"Dark",mode:FluDarkMode.Dark}]
+                model: [{title:"System",mode:FluThemeType.System},{title:"Light",mode:FluThemeType.Light},{title:"Dark",mode:FluThemeType.Dark}]
                 delegate:  FluRadioButton{
                     checked : FluTheme.darkMode === modelData.mode
                     text:modelData.title
@@ -58,7 +58,7 @@ FluScrollablePage{
                 Layout.bottomMargin: 4
             }
             Repeater{
-                model: [{title:"Open",mode:FluNavigationView.Open},{title:"Compact",mode:FluNavigationView.Compact},{title:"Minimal",mode:FluNavigationView.Minimal},{title:"Auto",mode:FluNavigationView.Auto}]
+                model: [{title:"Open",mode:FluNavigationViewType.Open},{title:"Compact",mode:FluNavigationViewType.Compact},{title:"Minimal",mode:FluNavigationViewType.Minimal},{title:"Auto",mode:FluNavigationViewType.Auto}]
                 delegate: FluRadioButton{
                     checked : MainEvent.displayMode===modelData.mode
                     text:modelData.title

example/qml/page/T_StatusView.qml

@@ -25,28 +25,28 @@ FluScrollablePage{
                     text:"Loading"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusView.Loading
+                        status_view.statusMode = FluStatusViewType.Loading
                     }
                 }
                 FluMenuItem{
                     text:"Empty"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusView.Empty
+                        status_view.statusMode = FluStatusViewType.Empty
                     }
                 }
                 FluMenuItem{
                     text:"Error"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusView.Error
+                        status_view.statusMode = FluStatusViewType.Error
                     }
                 }
                 FluMenuItem{
                     text:"Success"
                     onClicked: {
                         btn_status_mode.text = text
-                        status_view.statusMode = FluStatusView.Success
+                        status_view.statusMode = FluStatusViewType.Success
                     }
                 }
             }
@@ -75,7 +75,7 @@ FluScrollablePage{
         Layout.topMargin: -1
         code:'FluStatusView{
     anchors.fill: parent
-    statusMode: FluStatusView.Loading
+    statusMode: FluStatusViewType.Loading
     Rectangle{
         anchors.fill: parent
         color:FluTheme.primaryColor.dark

example/qml/page/T_TabView.qml

@@ -44,21 +44,21 @@ FluScrollablePage{
                     text:"Equal"
                     onClicked: {
                         btn_tab_width_behavior.text = text
-                        tab_view.tabWidthBehavior = FluTabView.Equal
+                        tab_view.tabWidthBehavior = FluTabViewType.Equal
                     }
                 }
                 FluMenuItem{
                     text:"SizeToContent"
                     onClicked: {
                         btn_tab_width_behavior.text = text
-                        tab_view.tabWidthBehavior = FluTabView.SizeToContent
+                        tab_view.tabWidthBehavior = FluTabViewType.SizeToContent
                     }
                 }
                 FluMenuItem{
                     text:"Compact"
                     onClicked: {
                         btn_tab_width_behavior.text = text
-                        tab_view.tabWidthBehavior = FluTabView.Compact
+                        tab_view.tabWidthBehavior = FluTabViewType.Compact
                     }
                 }
             }
@@ -70,21 +70,21 @@ FluScrollablePage{
                     text:"Nerver"
                     onClicked: {
                         btn_close_button_visibility.text = text
-                        tab_view.closeButtonVisibility = FluTabView.Nerver
+                        tab_view.closeButtonVisibility = FluTabViewType.Nerver
                     }
                 }
                 FluMenuItem{
                     text:"Always"
                     onClicked: {
                         btn_close_button_visibility.text = text
-                        tab_view.closeButtonVisibility = FluTabView.Always
+                        tab_view.closeButtonVisibility = FluTabViewType.Always
                     }
                 }
                 FluMenuItem{
                     text:"OnHover"
                     onClicked: {
                         btn_close_button_visibility.text = text
-                        tab_view.closeButtonVisibility = FluTabView.OnHover
+                        tab_view.closeButtonVisibility = FluTabViewType.OnHover
                     }
                 }
             }

example/qml/page/T_TableView.qml

@@ -10,7 +10,29 @@ FluContentPage{
     title:"TableView"
 
     Component.onCompleted: {
-        loadData(1,2000)
+        loadData(1,1000)
+    }
+
+    Component{
+        id:com_action
+        Item{
+            RowLayout{
+                anchors.centerIn: parent
+                FluButton{
+                    text:"删除"
+                    onClicked: {
+                        table_view.closeEditor()
+                        tableModel.removeRow(row)
+                    }
+                }
+                FluFilledButton{
+                    text:"编辑"
+                    onClicked: {
+                        showSuccess(JSON.stringify(tableModel.getRow(row)))
+                    }
+                }
+            }
+        }
     }
 
     function loadData(page,count){
@@ -40,7 +62,12 @@ FluContentPage{
                                 name: getRandomName(),
                                 age:getRandomAge(),
                                 address: getRandomAddresses(),
-                                nickname: getRandomNickname()
+                                nickname: getRandomNickname(),
+                                longstring:"你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好",
+                                height:42,
+                                minimumHeight:42,
+                                maximumHeight:300,
+                                action:com_action
                             })
         }
         table_view.dataSource = dataSource
@@ -48,9 +75,9 @@ FluContentPage{
 
     Component{
         id:com_combobox
-
         FluComboBox {
             anchors.fill: parent
+            focus: true
             currentIndex: display
             editable: true
             model: ListModel {
@@ -63,23 +90,30 @@ FluContentPage{
                 currentIndex=[100,300,500,1000].findIndex((element) => element === Number(display))
                 selectAll()
             }
-            TableView.onCommit: {
+            onCommit: {
                 display = editText
+                tableView.closeEditor()
             }
         }
     }
 
     FluTableView{
         id:table_view
-        anchors.fill: parent
+        anchors{
+            left: parent.left
+            right: parent.right
+            top: parent.top
+            bottom: gagination.top
+        }
         anchors.topMargin: 20
         columnSource:[
             {
                 title: '姓名',
                 dataIndex: 'name',
                 width:100,
-                minimumWidth:50
+                minimumWidth:80,
-
+                maximumWidth:200,
+                readOnly:true
             },
             {
                 title: '年龄',
@@ -87,19 +121,57 @@ FluContentPage{
                 editDelegate:com_combobox,
                 width:100,
                 minimumWidth:100,
-                maximumWidth: 100
+                maximumWidth:100
             },
             {
                 title: '住址',
                 dataIndex: 'address',
-                width:200
+                width:200,
+                minimumWidth:100,
+                maximumWidth:250
             },
             {
                 title: '别名',
                 dataIndex: 'nickname',
                 width:100,
-
+                minimumWidth:80,
+                maximumWidth:200
+            },
+            {
+                title: '长字符串',
+                dataIndex: 'longstring',
+                width:200,
+                minimumWidth:100,
+                maximumWidth:300
+            },
+            {
+                title: '操作',
+                dataIndex: 'action',
+                width:160,
+                minimumWidth:160,
+                maximumWidth:160
             }
         ]
     }
+
+    FluPagination{
+        id:gagination
+        anchors{
+            bottom: parent.bottom
+            left: parent.left
+        }
+        pageCurrent: 1
+        itemCount: 100000
+        pageButtonCount: 7
+        __itemPerPage: 1000
+        onRequestPage:
+            (page,count)=> {
+                table_view.closeEditor()
+                loadData(page,count)
+                table_view.resetPosition()
+            }
+    }
+
+
+
 }

example/qml/page/T_TextBox.qml

@@ -7,7 +7,7 @@ import "qrc:///example/qml/component"
 
 FluScrollablePage{
 
-    pageMode: FluNavigationView.SingleInstance
+    launchMode: FluPageType.SingleInstance
 
     title:"TextBox"
     FluArea{
@@ -17,27 +17,22 @@ FluScrollablePage{
         Layout.topMargin: 20
 
         FluTextBox{
-            Layout.topMargin: 20
             placeholderText: "单行输入框"
-            Layout.preferredWidth: 300
             disabled:text_box_switch.checked
+            cleanEnabled: true
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
         }
 
-        Row{
+        FluToggleSwitch{
-            spacing: 5
+            id:text_box_switch
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
             }
-            FluToggleSwitch{
+            text:"Disabled"
-                id:text_box_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
         }
     }
     CodeExpander{
@@ -55,27 +50,20 @@ FluScrollablePage{
         Layout.topMargin: 20
 
         FluPasswordBox{
-            Layout.topMargin: 20
             placeholderText: "请输入密码"
-            Layout.preferredWidth: 300
             disabled:password_box_switch.checked
             anchors{
                 verticalCenter: parent.verticalCenter
                 left: parent.left
             }
         }
-
+        FluToggleSwitch{
-        Row{
+            id:password_box_switch
-            spacing: 5
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
             }
-            FluToggleSwitch{
+            text:"Disabled"
-                id:password_box_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
         }
     }
     CodeExpander{
@@ -95,9 +83,7 @@ FluScrollablePage{
 
         FluMultilineTextBox{
             id:multiine_textbox
-            Layout.topMargin: 20
             placeholderText: "多行输入框"
-            Layout.preferredWidth: 300
             disabled:text_box_multi_switch.checked
             anchors{
                 verticalCenter: parent.verticalCenter
@@ -105,17 +91,13 @@ FluScrollablePage{
             }
         }
 
-        Row{
+        FluToggleSwitch{
-            spacing: 5
+            id:text_box_multi_switch
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
             }
-            FluToggleSwitch{
+            text:"Disabled"
-                id:text_box_multi_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
         }
     }
     CodeExpander{
@@ -126,17 +108,13 @@ FluScrollablePage{
 }'
     }
 
-
     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.checked
             anchors{
@@ -144,18 +122,13 @@ FluScrollablePage{
                 left: parent.left
             }
         }
-
+        FluToggleSwitch{
-        Row{
+            id:text_box_suggest_switch
-            spacing: 5
             anchors{
                 verticalCenter: parent.verticalCenter
                 right: parent.right
             }
-            FluToggleSwitch{
+            text:"Disabled"
-                id:text_box_suggest_switch
-                Layout.alignment: Qt.AlignRight
-                text:"Disabled"
-            }
         }
     }
     CodeExpander{
@@ -166,6 +139,34 @@ FluScrollablePage{
 }'
     }
 
+    FluArea{
+        Layout.fillWidth: true
+        height: 68
+        paddings: 10
+        Layout.topMargin: 20
+        FluSpinBox{
+            disabled: spin_box_switch.checked
+            anchors{
+                verticalCenter: parent.verticalCenter
+                left: parent.left
+            }
+        }
+        FluToggleSwitch{
+            id:spin_box_switch
+            anchors{
+                verticalCenter: parent.verticalCenter
+                right: parent.right
+            }
+            text:"Disabled"
+        }
+    }
+    CodeExpander{
+        Layout.fillWidth: true
+        Layout.topMargin: -1
+        code:'FluSpinBox{
+
+}'
+    }
 
     function generateRandomNames(numNames) {
         const alphabet = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';

example/qml/page/T_Theme.qml

@@ -12,7 +12,7 @@ FluScrollablePage{
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
-        height: 210
+        height: 270
         paddings: 10
         ColumnLayout{
             spacing:0
@@ -55,9 +55,9 @@ FluScrollablePage{
                 checked: FluTheme.dark
                 onClicked: {
                     if(FluTheme.dark){
-                        FluTheme.darkMode = FluDarkMode.Light
+                        FluTheme.darkMode = FluThemeType.Light
                     }else{
-                        FluTheme.darkMode = FluDarkMode.Dark
+                        FluTheme.darkMode = FluThemeType.Dark
                     }
                 }
             }
@@ -72,6 +72,17 @@ FluScrollablePage{
                     FluTheme.nativeText = !FluTheme.nativeText
                 }
             }
+            FluText{
+                text:"开启动画效果"
+                Layout.topMargin: 20
+            }
+            FluToggleSwitch{
+                Layout.topMargin: 5
+                checked: FluTheme.enableAnimation
+                onClicked: {
+                    FluTheme.enableAnimation = !FluTheme.enableAnimation
+                }
+            }
         }
     }
     CodeExpander{

example/qml/page/T_TimePicker.qml

@@ -8,7 +8,7 @@ import "qrc:///example/qml/component"
 FluScrollablePage{
 
     title:"TimePicker"
-
+    launchMode: FluPageType.SingleInstance
     FluArea{
         Layout.fillWidth: true
         Layout.topMargin: 20
@@ -23,10 +23,13 @@ FluScrollablePage{
             }
 
             FluText{
-                text:"hourFormat=FluTimePicker.H"
+                text:"hourFormat=FluTimePickerType.H"
             }
 
             FluTimePicker{
+                onCurrentChanged: {
+                    showSuccess(current.toLocaleTimeString(Qt.locale("de_DE")))
+                }
             }
 
         }
@@ -53,11 +56,14 @@ FluScrollablePage{
             }
 
             FluText{
-                text:"hourFormat=FluTimePicker.H"
+                text:"hourFormat=FluTimePickerType.HH"
             }
 
             FluTimePicker{
-                 hourFormat:FluTimePicker.HH
+                hourFormat:FluTimePickerType.HH
+                onCurrentChanged: {
+                    showSuccess(current.toLocaleTimeString(Qt.locale("de_DE")))
+                }
             }
 
         }
@@ -66,7 +72,7 @@ FluScrollablePage{
         Layout.fillWidth: true
         Layout.topMargin: -1
         code:'FluTimePicker{
-    hourFormat:FluTimePicker.HH
+    hourFormat:FluTimePickerType.HH
 }'
     }
 

example/qml/page/T_TreeView.qml

@@ -64,38 +64,38 @@ FluScrollablePage {
                     text:"None"
                     onClicked: {
                         btn_selection_model.text = text
-                        tree_view.selectionMode = FluTabView.Equal
+                        tree_view.selectionMode = FluTabViewType.Equal
                     }
                 }
                 FluMenuItem{
                     text:"Single"
                     onClicked: {
                         btn_selection_model.text = text
-                        tree_view.selectionMode = FluTabView.SizeToContent
+                        tree_view.selectionMode = FluTabViewType.SizeToContent
                     }
                 }
                 FluMenuItem{
                     text:"Muiltple"
                     onClicked: {
                         btn_selection_model.text = text
-                        tree_view.selectionMode = FluTabView.Compact
+                        tree_view.selectionMode = FluTabViewType.Compact
                     }
                 }
             }
             FluFilledButton{
                 text:"获取选中的数据"
                 onClicked: {
-                    if(tree_view.selectionMode === FluTreeView.None){
+                    if(tree_view.selectionMode === FluTreeViewType.None){
                         showError("当前非选择模式,没有选中的数据")
                     }
-                    if(tree_view.selectionMode === FluTreeView.Single){
+                    if(tree_view.selectionMode === FluTreeViewType.Single){
                         if(!tree_view.signleData()){
                             showError("没有选中数据")
                             return
                         }
                         showSuccess(tree_view.signleData().text)
                     }
-                    if(tree_view.selectionMode === FluTreeView.Multiple){
+                    if(tree_view.selectionMode === FluTreeViewType.Multiple){
                         if(tree_view.multipData().length===0){
                             showError("没有选中数据")
                             return

example/qml/page/T_Watermark.qml

@@ -0,0 +1,132 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import QtQuick.Window
+import FluentUI
+import "qrc:///example/qml/component"
+
+FluContentPage{
+
+    title:"Watermark"
+
+    FluArea{
+        anchors.fill: parent
+        anchors.topMargin: 20
+
+        ColumnLayout{
+            anchors{
+                left: parent.left
+                leftMargin: 14
+            }
+
+            RowLayout{
+                spacing: 10
+                Layout.topMargin: 14
+                FluText{
+                    text:"text:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluTextBox{
+                    id:text_box
+                    text:"会磨刀的小猪"
+                }
+            }
+
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"textSize:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_text_size
+                    value: 20
+                    from: 13
+                    to:50
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"gapX:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_gap_x
+                    value: 100
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"gapY:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_gap_y
+                    value: 100
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"offsetX:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_offset_x
+                    value: 50
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"offsetY:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_offset_y
+                    value: 50
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"rotate:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluSlider{
+                    id:slider_rotate
+                    value: 22
+                    from: 0
+                    to:360
+                }
+            }
+            RowLayout{
+                spacing: 10
+                FluText{
+                    text:"textColor:"
+                    Layout.alignment: Qt.AlignVCenter
+                }
+                FluColorPicker{
+                    id:color_picker
+                    Component.onCompleted: {
+                        setColor(Qt.rgba(0,0,0,0.1))
+                    }
+                }
+            }
+        }
+
+        FluWatermark{
+            id:water_mark
+            anchors.fill: parent
+            text:text_box.text
+            textColor: color_picker.colorValue
+            textSize: slider_text_size.value
+            rotate: slider_rotate.value
+            gap:Qt.point(slider_gap_x.value,slider_gap_y.value)
+            offset: Qt.point(slider_offset_x.value,slider_offset_y.value)
+        }
+    }
+
+}

example/qml/window/AboutWindow.qml

@@ -11,7 +11,7 @@ CustomWindow {
     width: 600
     height: 600
     fixSize: true
-    launchMode: FluWindow.SingleTask
+    launchMode: FluWindowType.SingleTask
 
     ColumnLayout{
         anchors{

example/qml/window/HotloadWindow.qml

@@ -0,0 +1,85 @@
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Layouts
+import FluentUI
+import example
+import "qrc:///example/qml/component"
+
+CustomWindow {
+
+    id:window
+    title:"热加载"
+    width: 800
+    height: 600
+    minimumWidth: 520
+    minimumHeight: 200
+    launchMode: FluWindowType.SingleTask
+    FileWatcher{
+        id:watcher
+        onFileChanged: {
+            loader.reload()
+        }
+    }
+    FluArea{
+        anchors.fill: parent
+        FluRemoteLoader{
+            id:loader
+            anchors.fill: parent
+            statusMode: FluStatusViewType.Success
+            lazy: true
+            errorItem: Item{
+                FluText{
+                    text:loader.itemLodaer().sourceComponent.errorString()
+                    color:"red"
+                    anchors.fill: parent
+                    wrapMode: Text.WrapAnywhere
+                    padding: 20
+                    verticalAlignment: Qt.AlignVCenter
+                    horizontalAlignment: Qt.AlignHCenter
+                }
+            }
+        }
+        FluText{
+            text:"拖入qml文件"
+            font.pixelSize: 26
+            anchors.centerIn: parent
+            visible: !loader.itemLodaer().item && loader.statusMode === FluStatusViewType.Success
+        }
+        Rectangle{
+            radius: 4
+            anchors.fill: parent
+            color: "#33333333"
+            visible: drop_area.containsDrag
+        }
+        DropArea{
+            id:drop_area
+            anchors.fill: parent
+            onEntered:
+                (event)=>{
+                    if(!event.hasUrls){
+                        event.accepted = false
+                        return
+                    }
+                    if (event.urls.length !== 1) {
+                        event.accepted = false
+                        return
+                    }
+                    var url = event.urls[0].toString()
+                    var fileExtension = url.substring(url.lastIndexOf(".") + 1)
+                    if (fileExtension !== "qml") {
+                        event.accepted = false
+                        return
+                    }
+                    return true
+                }
+            onDropped:
+                (event)=>{
+                    var path = event.urls[0].toString()
+                    loader.source = path
+                    watcher.path = path
+                    loader.reload()
+                }
+        }
+    }
+
+}

example/qml/window/MainWindow.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls
 import QtQuick.Layouts
 import Qt.labs.platform
 import FluentUI
+import example
 import "qrc:///example/qml/component"
 import "qrc:///example/qml/global"
 
@@ -15,22 +16,17 @@ CustomWindow {
     height: 640
     closeDestory:false
     minimumWidth: 520
-    minimumHeight: 460
+    minimumHeight: 200
     appBarVisible: false
-    launchMode: FluWindow.SingleTask
+    launchMode: FluWindowType.SingleTask
 
     closeFunc:function(event){
-        close_app.open()
+        dialog_close.open()
         event.accepted = false
     }
 
-    Connections{
+    Component.onCompleted: {
-        target: appInfo
+        FluTools.setQuitOnLastWindowClosed(false)
-        function onActiveWindow(){
-            window.show()
-            window.raise()
-            window.requestActivate()
-        }
     }
 
     SystemTrayIcon {
@@ -58,18 +54,17 @@ CustomWindow {
     }
 
     FluContentDialog{
-        id:close_app
+        id:dialog_close
         title:"退出"
         message:"确定要退出程序吗？"
         negativeText:"最小化"
-        buttonFlags: FluContentDialog.NeutralButton | FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
+        buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.NeutralButton | FluContentDialogType.PositiveButton
         onNegativeClicked:{
             window.hide()
             system_tray.showMessage("友情提示","FluentUI已隐藏至托盘,点击托盘可再次激活窗口");
         }
         positiveText:"退出"
         neutralText:"取消"
-        blurSource: nav_view
         onPositiveClicked:{
             window.deleteWindow()
             FluApp.closeApp()
@@ -94,7 +89,7 @@ CustomWindow {
             when: flipable.flipped
         }
         transitions: Transition {
-            NumberAnimation { target: flipable; property: "flipAngle"; duration: 1000 ; easing.type: Easing.OutQuad}
+            NumberAnimation { target: flipable; property: "flipAngle"; duration: 1000 ; easing.type: Easing.OutCubic}
         }
         back: Item{
             anchors.fill: flipable
@@ -112,6 +107,12 @@ CustomWindow {
             }
             Row{
                 z:8
+                anchors{
+                    top: parent.top
+                    left: parent.left
+                    topMargin: FluTools.isMacos() ? 20 : 5
+                    leftMargin: 5
+                }
                 FluIconButton{
                     iconSource: FluentIcons.ChromeBack
                     width: 30
@@ -134,6 +135,7 @@ CustomWindow {
 
             FluRemoteLoader{
                 id:loader
+                lazy: true
                 anchors.fill: parent
                 //                source: "http://localhost:9000/RemoteComponent.qml"
                 source: "https://zhu-zichu.gitee.io/RemoteComponent.qml"
@@ -160,19 +162,17 @@ CustomWindow {
                 width: parent.width
                 height: parent.height
                 z:999
+                //Stack模式，每次切换都会将页面压入栈中，随着栈的页面增多，消耗的内存也越多，内存消耗多就会卡顿，这时候就需要按返回将页面pop掉，释放内存。该模式可以配合FluPage中的launchMode属性，设置页面的启动模式
+                pageMode: FluNavigationViewType.Stack
+                //NoStack模式，每次切换都会销毁之前的页面然后创建一个新的页面，只需消耗少量内存（推荐）
+                //                pageMode: FluNavigationViewType.NoStack
                 items: ItemsOriginal
                 footerItems:ItemsFooter
                 topPadding:FluTools.isMacos() ? 20 : 5
                 displayMode:MainEvent.displayMode
                 logo: "qrc:/example/res/image/favicon.ico"
                 title:"FluentUI"
-                Behavior on rotation {
+                onLogoClicked:{
-                    NumberAnimation{
-                        duration: 167
-                    }
-                }
-                transformOrigin: Item.Center
-                onLoginClicked:{
                     clickCount += 1
                     if(clickCount === 1){
                         loader.reload()
@@ -200,55 +200,25 @@ CustomWindow {
         }
     }
 
-    Image{
+    Component{
-        id:img_cache
+        id:com_reveal
-        visible: false
+        CircularReveal{
-        anchors.fill: parent
+            id:reveal
+            target:window.contentItem
+            anchors.fill: parent
+            onAnimationFinished:{
+                //动画结束后释放资源
+                loader_reveal.sourceComponent = undefined
+            }
+            onImageChanged: {
+                changeDark()
+            }
+        }
     }
 
-    Canvas{
+    Loader{
-        id:canvas
+        id:loader_reveal
         anchors.fill: parent
-        property int centerX: canvas.width / 2
-        property int centerY: canvas.height / 2
-        property real radius: 0
-        property int maxRadius: 0
-        property url imageUrl
-        Behavior on radius{
-            id:anim_radius
-            NumberAnimation {
-                target: canvas
-                property: "radius"
-                duration: 333
-                easing.type: Easing.OutCubic
-            }
-        }
-        onRadiusChanged: {
-            canvas.requestPaint()
-        }
-        onPaint: {
-            var ctx = canvas.getContext("2d");
-            ctx.setTransform(1, 0, 0, 1, 0, 0);
-            ctx.clearRect(0, 0, canvasSize.width, canvasSize.height);
-            ctx.save()
-            if(img_cache.source.toString().length!==0){
-                try{
-                    ctx.drawImage(img_cache, 0, 0,  canvasSize.width, canvasSize.height, 0, 0,  canvasSize.width, canvasSize.height)
-                }catch(e){
-                    img_cache.source = ""
-                }
-            }
-            clearArc(ctx, centerX, centerY, radius)
-            ctx.restore()
-        }
-        function clearArc(ctx,x, y, radius, startAngle, endAngle) {
-            ctx.beginPath()
-            ctx.globalCompositeOperation = 'destination-out'
-            ctx.fillStyle = 'black'
-            ctx.arc(x, y, radius, 0, 2*Math.PI);
-            ctx.fill();
-            ctx.closePath();
-        }
     }
 
     function distance(x1,y1,x2,y2){
@@ -256,32 +226,25 @@ CustomWindow {
     }
 
     function handleDarkChanged(button){
-        var changeDark = function(){
+        if(FluTools.isMacos() || !FluTheme.enableAnimation){
-            if(FluTheme.dark){
+            changeDark()
-                FluTheme.darkMode = FluDarkMode.Light
+        }else{
-            }else{
+            loader_reveal.sourceComponent = com_reveal
-                FluTheme.darkMode = FluDarkMode.Dark
-            }
-        }
-        if(FluTools.isWin()){
             var target = window.contentItem
             var pos = button.mapToItem(target,0,0)
             var mouseX = pos.x
             var mouseY = pos.y
-            canvas.maxRadius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
+            var radius = Math.max(distance(mouseX,mouseY,0,0),distance(mouseX,mouseY,target.width,0),distance(mouseX,mouseY,0,target.height),distance(mouseX,mouseY,target.width,target.height))
-            target.grabToImage(function(result) {
+            var reveal = loader_reveal.item
-                img_cache.source = result.url
+            reveal.start(reveal.width*Screen.devicePixelRatio,reveal.height*Screen.devicePixelRatio,Qt.point(mouseX,mouseY),radius)
-                canvas.requestPaint()
+        }
-                changeDark()
+    }
-                canvas.centerX = mouseX
+
-                canvas.centerY = mouseY
+    function changeDark(){
-                anim_radius.enabled = false
+        if(FluTheme.dark){
-                canvas.radius = 0
+            FluTheme.darkMode = FluThemeType.Light
-                anim_radius.enabled = true
-                canvas.radius = canvas.maxRadius
-            },canvas.canvasSize)
         }else{
-            changeDark()
+            FluTheme.darkMode = FluThemeType.Dark
         }
     }
 
@@ -295,5 +258,4 @@ CustomWindow {
         }
     }
 
-
 }

example/qml/window/SingleInstanceWindow.qml

@@ -11,7 +11,7 @@ CustomWindow {
     width: 500
     height: 600
     fixSize: true
-    launchMode: FluWindow.SingleInstance
+    launchMode: FluWindowType.SingleInstance
 
     FluTextBox{
         anchors{

example/qml/window/SingleTaskWindow.qml

@@ -11,7 +11,7 @@ CustomWindow {
     width: 500
     height: 600
     fixSize: true
-    launchMode: FluWindow.SingleTask
+    launchMode: FluWindowType.SingleTask
 
     FluText{
         anchors.centerIn: parent

example/qml/window/StandardWindow.qml

@@ -11,7 +11,7 @@ CustomWindow {
     width: 500
     height: 600
     fixSize: true
-    launchMode: FluWindow.Standard
+    launchMode: FluWindowType.Standard
 
     FluMenuBar {
         FluMenu {

example/src/AppInfo.cpp

@@ -39,18 +39,3 @@ void AppInfo::changeLang(const QString& locale){
         lang(new En());
     }
 }
-
-bool AppInfo::isOwnerProcess(IPC *ipc){
-    QString activeWindowEvent = "activeWindow";
-    if(!ipc->isCurrentOwner()){
-        ipc->postEvent(activeWindowEvent,QString().toUtf8(),0);
-        return false;
-    }
-    if(ipc->isAttached()){
-        ipc->registerEventHandler(activeWindowEvent,[=](const QByteArray&){
-            Q_EMIT this->activeWindow();
-            return true;
-        });
-    }
-    return true;
-}

example/src/AppInfo.h

@@ -3,7 +3,6 @@
 
 #include <QObject>
 #include <QQmlApplicationEngine>
-#include "tool/IPC.h"
 #include "lang/Lang.h"
 #include "stdafx.h"
 
@@ -15,9 +14,7 @@ class AppInfo : public QObject
 public:
     explicit AppInfo(QObject *parent = nullptr);
     void init(QQmlApplicationEngine *engine);
-    bool isOwnerProcess(IPC *ipc);
     Q_INVOKABLE void changeLang(const QString& locale);
-    Q_SIGNAL void activeWindow();
 };
 
 #endif // APPINFO_H

example/src/component/CircularReveal.cpp

@@ -0,0 +1,48 @@
+#include "CircularReveal.h"
+#include <QGuiApplication>
+#include <QQuickItemGrabResult>
+#include <QPainterPath>
+
+CircularReveal::CircularReveal(QQuickItem* parent) : QQuickPaintedItem(parent)
+{
+    setVisible(false);
+    _anim.setDuration(333);
+    _anim.setEasingCurve(QEasingCurve::OutCubic);
+    connect(&_anim, &QPropertyAnimation::finished,this,[=](){
+        update();
+        setVisible(false);
+        Q_EMIT animationFinished();
+    });
+    connect(this,&CircularReveal::radiusChanged,this,[=](){
+        update();
+    });
+}
+
+void CircularReveal::paint(QPainter* painter)
+{
+    painter->save();
+    painter->eraseRect(boundingRect());
+    painter->drawImage(QRect(0, 0, static_cast<int>(width()), static_cast<int>(height())), _source);
+    QPainterPath path;
+    path.moveTo(_center.x(),_center.y());
+    path.addEllipse(QPointF(_center.x(),_center.y()), _radius, _radius);
+    painter->setCompositionMode(QPainter::CompositionMode_Clear);
+    painter->fillPath(path, Qt::black);
+    painter->restore();
+}
+
+void CircularReveal::start(int w,int h,const QPoint& center,int radius){
+    _anim.setStartValue(0);
+    _anim.setEndValue(radius);
+    _center = center;
+    _grabResult = _target->grabToImage(QSize(w,h));
+    connect(_grabResult.data(), &QQuickItemGrabResult::ready, this, &CircularReveal::handleGrabResult);
+}
+
+void CircularReveal::handleGrabResult(){
+    _grabResult.data()->image().swap(_source);
+    update();
+    setVisible(true);
+    Q_EMIT imageChanged();
+    _anim.start();
+}

example/src/component/CircularReveal.h

@@ -0,0 +1,30 @@
+#ifndef CIRCULARREVEAL_H
+#define CIRCULARREVEAL_H
+
+#include <QQuickItem>
+#include <QQuickPaintedItem>
+#include <QPainter>
+#include <QPropertyAnimation>
+#include "src/stdafx.h"
+
+class CircularReveal : public QQuickPaintedItem
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QQuickItem*,target)
+    Q_PROPERTY_AUTO(int,radius)
+    QML_NAMED_ELEMENT(CircularReveal)
+public:
+    CircularReveal(QQuickItem* parent = nullptr);
+    void paint(QPainter* painter) override;
+    Q_INVOKABLE void start(int w,int h,const QPoint& center,int radius);
+    Q_SIGNAL void imageChanged();
+    Q_SIGNAL void animationFinished();
+    Q_SLOT void handleGrabResult();
+private:
+    QImage _source;
+    QPropertyAnimation _anim = QPropertyAnimation(this, "radius", this);
+    QPoint _center;
+    QSharedPointer<QQuickItemGrabResult>  _grabResult;
+};
+
+#endif // CIRCULARREVEAL_H

example/src/component/FileWatcher.cpp

@@ -0,0 +1,24 @@
+#include "FileWatcher.h"
+
+FileWatcher::FileWatcher(QObject *parent)
+    : QObject{parent}
+{
+    connect(&_watcher, &QFileSystemWatcher::fileChanged, this, [=](const QString &path){
+        Q_EMIT fileChanged();
+        clean();
+        _watcher.addPath(_path);
+    });
+    connect(this,&FileWatcher::pathChanged,this,[=](){
+        clean();
+        _watcher.addPath(_path.replace("file:///",""));
+    });
+    if(!_path.isEmpty()){
+        _watcher.addPath(_path);
+    }
+}
+
+void FileWatcher::clean(){
+    foreach (const QString &item,  _watcher.files()) {
+        _watcher.removePath(item);
+    }
+}

example/src/component/FileWatcher.h

@@ -0,0 +1,23 @@
+#ifndef FILEWATCHER_H
+#define FILEWATCHER_H
+
+#include <QObject>
+#include <QFileSystemWatcher>
+#include <QtQml/qqml.h>
+#include "src/stdafx.h"
+
+class FileWatcher : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,path);
+    QML_NAMED_ELEMENT(FileWatcher)
+public:
+    explicit FileWatcher(QObject *parent = nullptr);
+    Q_SIGNAL void fileChanged();
+private:
+    void clean();
+private:
+    QFileSystemWatcher _watcher;
+};
+
+#endif // FILEWATCHER_H

example/src/main.cpp

@@ -3,6 +3,8 @@
 #include <QQmlContext>
 #include <QDir>
 #include <QQuickWindow>
+#include <QNetworkProxy>
+#include <QSslConfiguration>
 #include <QProcess>
 #include <FramelessHelper/Quick/framelessquickmodule.h>
 #include <FramelessHelper/Core/private/framelessconfig_p.h>
@@ -10,7 +12,7 @@
 
 FRAMELESSHELPER_USE_NAMESPACE
 
-int main(int argc, char *argv[])
+    int main(int argc, char *argv[])
 {
     //将样式设置为Basic，不然会导致组件显示异常
     qputenv("QT_QUICK_CONTROLS_STYLE","Basic");
@@ -30,13 +32,11 @@ int main(int argc, char *argv[])
     FramelessConfig::instance()->set(Global::Option::ForceNonNativeBackgroundBlur,false);
 #endif
     AppInfo* appInfo = new AppInfo();
-    IPC ipc(0);
-    if(!appInfo->isOwnerProcess(&ipc)){
-        return 0;
-    }
-    app.setQuitOnLastWindowClosed(false);
     QQmlApplicationEngine engine;
     FramelessHelper::Quick::registerTypes(&engine);
+#ifdef FLUENTUI_BUILD_STATIC_LIB
+    engine.addImportPath("qrc:/"); // 让静态资源可以被QML引擎搜索到
+#endif
     appInfo->init(&engine);
     const QUrl url(QStringLiteral("qrc:/example/qml/App.qml"));
     QObject::connect(&engine, &QQmlApplicationEngine::objectCreated,

example/src/tool/IPC.cpp

@@ -1,250 +0,0 @@
-#include "IPC.h"
-
-#include <QCoreApplication>
-#include <QDebug>
-#include <QThread>
-#include <ctime>
-#include <random>
-
-
-IPC::IPC(uint32_t profileId)
-    : profileId{profileId}
-    , globalMemory{"ipc-" IPC_PROTOCOL_VERSION}
-{
-    qRegisterMetaType<IPCEventHandler>("IPCEventHandler");
-    timer.setInterval(EVENT_TIMER_MS);
-    timer.setSingleShot(true);
-    connect(&timer, &QTimer::timeout, this, &IPC::processEvents);
-    std::default_random_engine randEngine((std::random_device())());
-    std::uniform_int_distribution<uint64_t> distribution;
-    globalId = distribution(randEngine);
-    qDebug() << "Our global IPC ID is " << globalId;
-    if (globalMemory.create(sizeof(IPCMemory))) {
-        if (globalMemory.lock()) {
-            IPCMemory* mem = global();
-            memset(mem, 0, sizeof(IPCMemory));
-            mem->globalId = globalId;
-            mem->lastProcessed = time(nullptr);
-            globalMemory.unlock();
-        } else {
-            qWarning() << "Couldn't lock to take ownership";
-        }
-    } else if (globalMemory.attach()) {
-        qDebug() << "Attaching to the global shared memory";
-    } else {
-        qDebug() << "Failed to attach to the global shared memory, giving up. Error:"
-                 << globalMemory.error();
-        return;
-    }
-
-    processEvents();
-}
-
-IPC::~IPC()
-{
-    if (!globalMemory.lock()) {
-        qWarning() << "Failed to lock in ~IPC";
-        return;
-    }
-
-    if (isCurrentOwnerNoLock()) {
-        global()->globalId = 0;
-    }
-    globalMemory.unlock();
-}
-
-time_t IPC::postEvent(const QString& name, const QByteArray& data, uint32_t dest)
-{
-    QByteArray binName = name.toUtf8();
-    if (binName.length() > (int32_t)sizeof(IPCEvent::name)) {
-        return 0;
-    }
-
-    if (data.length() > (int32_t)sizeof(IPCEvent::data)) {
-        return 0;
-    }
-
-    if (!globalMemory.lock()) {
-        qDebug() << "Failed to lock in postEvent()";
-        return 0;
-    }
-
-    IPCEvent* evt = nullptr;
-    IPCMemory* mem = global();
-    time_t result = 0;
-
-    for (uint32_t i = 0; !evt && i < EVENT_QUEUE_SIZE; ++i) {
-        if (mem->events[i].posted == 0) {
-            evt = &mem->events[i];
-        }
-    }
-
-    if (evt) {
-        memset(evt, 0, sizeof(IPCEvent));
-        memcpy(evt->name, binName.constData(), binName.length());
-        memcpy(evt->data, data.constData(), data.length());
-        mem->lastEvent = evt->posted = result = qMax(mem->lastEvent + 1, time(nullptr));
-        evt->dest = dest;
-        evt->sender = qApp->applicationPid();
-        qDebug() << "postEvent " << name << "to" << dest;
-    }
-    globalMemory.unlock();
-    return result;
-}
-
-bool IPC::isCurrentOwner()
-{
-    if (globalMemory.lock()) {
-        const bool isOwner = isCurrentOwnerNoLock();
-        globalMemory.unlock();
-        return isOwner;
-    } else {
-        qWarning() << "isCurrentOwner failed to lock, returning false";
-        return false;
-    }
-}
-
-void IPC::registerEventHandler(const QString& name, IPCEventHandler handler)
-{
-    eventHandlers[name] = handler;
-}
-
-bool IPC::isEventAccepted(time_t time)
-{
-    bool result = false;
-    if (!globalMemory.lock()) {
-        return result;
-    }
-
-    if (difftime(global()->lastProcessed, time) > 0) {
-        IPCMemory* mem = global();
-        for (uint32_t i = 0; i < EVENT_QUEUE_SIZE; ++i) {
-            if (mem->events[i].posted == time && mem->events[i].processed) {
-                result = mem->events[i].accepted;
-                break;
-            }
-        }
-    }
-    globalMemory.unlock();
-
-    return result;
-}
-
-bool IPC::waitUntilAccepted(time_t postTime, int32_t timeout /*=-1*/)
-{
-    bool result = false;
-    time_t start = time(nullptr);
-    forever
-    {
-        result = isEventAccepted(postTime);
-        if (result || (timeout > 0 && difftime(time(nullptr), start) >= timeout)) {
-            break;
-        }
-
-        qApp->processEvents();
-        QThread::msleep(0);
-    }
-    return result;
-}
-
-bool IPC::isAttached() const
-{
-    return globalMemory.isAttached();
-}
-
-void IPC::setProfileId(uint32_t profileId)
-{
-    this->profileId = profileId;
-}
-
-IPC::IPCEvent* IPC::fetchEvent()
-{
-    IPCMemory* mem = global();
-    for (uint32_t i = 0; i < EVENT_QUEUE_SIZE; ++i) {
-        IPCEvent* evt = &mem->events[i];
-        if ((evt->processed && difftime(time(nullptr), evt->processed) > EVENT_GC_TIMEOUT)
-            || (!evt->processed && difftime(time(nullptr), evt->posted) > EVENT_GC_TIMEOUT)) {
-            memset(evt, 0, sizeof(IPCEvent));
-        }
-
-        if (evt->posted && !evt->processed && evt->sender != qApp->applicationPid()
-            && (evt->dest == profileId || (evt->dest == 0 && isCurrentOwnerNoLock()))) {
-            return evt;
-        }
-    }
-
-    return nullptr;
-}
-
-bool IPC::runEventHandler(IPCEventHandler handler, const QByteArray& arg)
-{
-    bool result = false;
-    if (QThread::currentThread() == qApp->thread()) {
-        result = handler(arg);
-    } else {
-        QMetaObject::invokeMethod(this, "runEventHandler", Qt::BlockingQueuedConnection,
-                                  Q_RETURN_ARG(bool, result), Q_ARG(IPCEventHandler, handler),
-                                  Q_ARG(const QByteArray&, arg));
-    }
-    return result;
-}
-
-void IPC::processEvents()
-{
-    if (!globalMemory.lock()) {
-        timer.start();
-        return;
-    }
-
-    IPCMemory* mem = global();
-
-    if (mem->globalId == globalId) {
-        mem->lastProcessed = time(nullptr);
-    } else {
-        if (difftime(time(nullptr), mem->lastProcessed) >= OWNERSHIP_TIMEOUT_S) {
-            qDebug() << "Previous owner timed out, taking ownership" << mem->globalId << "->"
-                     << globalId;
-            memset(mem, 0, sizeof(IPCMemory));
-            mem->globalId = globalId;
-            mem->lastProcessed = time(nullptr);
-        }
-    }
-
-    while (IPCEvent* evt = fetchEvent()) {
-        QString name = QString::fromUtf8(evt->name);
-        auto it = eventHandlers.find(name);
-        if (it != eventHandlers.end()) {
-            evt->accepted = runEventHandler(it.value(), evt->data);
-            qDebug() << "Processed event:" << name << "posted:" << evt->posted
-                     << "accepted:" << evt->accepted;
-            if (evt->dest == 0) {
-                if (evt->accepted) {
-                    evt->processed = time(nullptr);
-                }
-            } else {
-                evt->processed = time(nullptr);
-            }
-        } else {
-            qDebug() << "Received event:" << name << "without handler";
-            qDebug() << "Available handlers:" << eventHandlers.keys();
-        }
-    }
-
-    globalMemory.unlock();
-    timer.start();
-}
-
-bool IPC::isCurrentOwnerNoLock()
-{
-    const void* const data = globalMemory.data();
-    if (!data) {
-        qWarning() << "isCurrentOwnerNoLock failed to access the memory, returning false";
-        return false;
-    }
-    return (*static_cast<const uint64_t*>(data) == globalId);
-}
-
-IPC::IPCMemory* IPC::global()
-{
-    return static_cast<IPCMemory*>(globalMemory.data());
-}

example/src/tool/IPC.h

@@ -1,75 +0,0 @@
-#ifndef IPC_H
-#define IPC_H
-
-#include <QMap>
-#include <QObject>
-#include <QSharedMemory>
-#include <QTimer>
-#include <ctime>
-#include <functional>
-
-using IPCEventHandler = std::function<bool(const QByteArray&)>;
-
-#define IPC_PROTOCOL_VERSION "1"
-
-class IPC : public QObject
-{
-    Q_OBJECT
-
-protected:
-    static const int EVENT_TIMER_MS = 1000;
-    static const int EVENT_GC_TIMEOUT = 5;
-    static const int EVENT_QUEUE_SIZE = 32;
-    static const int OWNERSHIP_TIMEOUT_S = 5;
-
-public:
-    IPC(uint32_t profileId);
-    ~IPC();
-
-    struct IPCEvent
-    {
-        uint32_t dest;
-        int32_t sender;
-        char name[16];
-        char data[128];
-        time_t posted;
-        time_t processed;
-        uint32_t flags;
-        bool accepted;
-        bool global;
-    };
-
-    struct IPCMemory
-    {
-        uint64_t globalId;
-        time_t lastEvent;
-        time_t lastProcessed;
-        IPCEvent events[IPC::EVENT_QUEUE_SIZE];
-    };
-
-    time_t postEvent(const QString& name, const QByteArray& data = QByteArray(), uint32_t dest = 0);
-    bool isCurrentOwner();
-    void registerEventHandler(const QString& name, IPCEventHandler handler);
-    bool isEventAccepted(time_t time);
-    bool waitUntilAccepted(time_t time, int32_t timeout = -1);
-    bool isAttached() const;
-
-public slots:
-    void setProfileId(uint32_t profileId);
-
-private:
-    IPCMemory* global();
-    bool runEventHandler(IPCEventHandler handler, const QByteArray& arg);
-    IPCEvent* fetchEvent();
-    void processEvents();
-    bool isCurrentOwnerNoLock();
-
-private:
-    QTimer timer;
-    uint64_t globalId;
-    uint32_t profileId;
-    QSharedMemory globalMemory;
-    QMap<QString, IPCEventHandler> eventHandlers;
-};
-
-#endif // IPC_H

src/CMakeLists.txt

@@ -1,22 +1,28 @@
 cmake_minimum_required(VERSION 3.20)
 
-project(fluentuiplugin LANGUAGES CXX)
+if (FLUENTUI_BUILD_STATIC_LIB)
-
+    project(fluentui LANGUAGES CXX)
+else()
+    project(fluentuiplugin LANGUAGES CXX)
+endif()
 #配置通用编译
-set(CMAKE_AUTOMOC ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 endif()
 
-#设置QML插件输出目录->D:\Qt\6.4.3\msvc2019_64\qml\FluentUI
-set(QML_PLUGIN_DIRECTORY ${CMAKE_PREFIX_PATH}/qml/FluentUI)
-
 #设置版本号
-add_definitions(-DVERSION=1,3,6,0)
+add_definitions(-DVERSION=1,4,0,0)
 
 find_package(Qt6 REQUIRED COMPONENTS Core Quick Qml)
-qt_standard_project_setup()
+
+if(QT_VERSION VERSION_GREATER_EQUAL "6.3")
+    qt_standard_project_setup()
+else()
+    set(CMAKE_AUTOMOC ON)
+    set(CMAKE_AUTORCC ON)
+    set(CMAKE_AUTOUIC ON)
+endif()
 
 #遍历所有Cpp文件
 file(GLOB_RECURSE CPP_FILES *.cpp *.h)
@@ -33,7 +39,7 @@ foreach(filepath ${QML_PATHS})
 endforeach(filepath)
 
 #遍历所有资源文件
-file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp)
+file(GLOB_RECURSE RES_PATHS *.png *.jpg *.svg *.ico *.ttf *.webp qmldir)
 foreach(filepath ${RES_PATHS})
     string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" filename ${filepath})
     list(APPEND resource_files ${filename})
@@ -46,11 +52,23 @@ foreach(filepath IN LISTS qml_files resource_files)
 endforeach()
 
 #添加qml模块
-qt_add_library(fluentuiplugin SHARED)
+if (FLUENTUI_BUILD_STATIC_LIB)
-qt_add_qml_module(fluentuiplugin
+    set(LIB_TYPE "STATIC")
-    #没有下面这行代码就会生成fluentuiplugin.dll与fluentuipluginplugin.dll两个动态库
+else()
-    PLUGIN_TARGET fluentuiplugin
+    set(LIB_TYPE "SHARED")
-    OUTPUT_DIRECTORY ${QML_PLUGIN_DIRECTORY}
+endif()
+qt_add_library(${PROJECT_NAME} ${LIB_TYPE})
+
+if (FLUENTUI_BUILD_STATIC_LIB)
+    set(PLUGIN_TARGET_NAME "")
+else()
+    #如果是动态库，则使用插件目标作为其自己的支持目标来定义 QML 模块，在这种情况下，模块必须在运行时动态加载，并且不能由其他目标直接链接到
+    set(PLUGIN_TARGET_NAME ${PROJECT_NAME})
+endif()
+
+qt_add_qml_module(${PROJECT_NAME}
+    PLUGIN_TARGET ${PLUGIN_TARGET_NAME}
+    OUTPUT_DIRECTORY ${FLUENTUI_QML_PLUGIN_DIRECTORY}
     VERSION 1.0
     URI "FluentUI"
     #修改qmltypes文件名称。默认fluentuiplugin.qmltypes，使用默认名称有时候import FluentUI会爆红，所以修改成plugins.qmltypes
@@ -61,11 +79,11 @@ qt_add_qml_module(fluentuiplugin
 )
 
 #链接库
-target_link_libraries(fluentuiplugin PUBLIC
+target_link_libraries(${PROJECT_NAME} PUBLIC
-    Qt::Core
+    Qt::CorePrivate
-    Qt::Quick
+    Qt::QuickPrivate
-    Qt::Qml
+    Qt::QmlPrivate
 )
 
 #安装
-install(DIRECTORY ${QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)
+install(DIRECTORY ${FLUENTUI_QML_PLUGIN_DIRECTORY} DESTINATION ${CMAKE_INSTALL_PREFIX}/imports)

src/Def.h

@@ -4,15 +4,127 @@
 #include <QObject>
 #include <QtQml/qqml.h>
 
-namespace Fluent_DarkMode {
+namespace FluThemeType {
 Q_NAMESPACE
-enum Fluent_DarkModeType {
+enum DarkMode {
-    System      = 0x0,
+    System = 0x0000,
-    Light    = 0x1,
+    Light = 0x0001,
-    Dark     = 0x2,
+    Dark = 0x0002,
 };
-Q_ENUM_NS(Fluent_DarkModeType)
+Q_ENUM_NS(DarkMode)
-QML_NAMED_ELEMENT(FluDarkMode)
+QML_NAMED_ELEMENT(FluThemeType)
+}
+
+namespace FluPageType {
+Q_NAMESPACE
+enum LaunchMode {
+    Standard = 0x0000,
+    SingleTask = 0x0001,
+    SingleTop = 0x0002,
+    SingleInstance = 0x0004
+};
+Q_ENUM_NS(LaunchMode)
+QML_NAMED_ELEMENT(FluPageType)
+}
+
+namespace FluWindowType {
+Q_NAMESPACE
+enum LaunchMode {
+    Standard = 0x0000,
+    SingleTask = 0x0001,
+    SingleInstance = 0x0002
+};
+Q_ENUM_NS(LaunchMode)
+QML_NAMED_ELEMENT(FluWindowType)
+}
+
+namespace FluTreeViewType {
+Q_NAMESPACE
+enum SelectionMode {
+    None = 0x0000,
+    Single = 0x0001,
+    Multiple = 0x0002
+};
+Q_ENUM_NS(SelectionMode)
+QML_NAMED_ELEMENT(FluTreeViewType)
+}
+
+namespace FluStatusViewType {
+Q_NAMESPACE
+enum StatusMode {
+    Loading = 0x0000,
+    Empty = 0x0001,
+    Error = 0x0002,
+    Success = 0x0004
+};
+Q_ENUM_NS(StatusMode)
+QML_NAMED_ELEMENT(FluStatusViewType)
+}
+
+namespace FluContentDialogType {
+Q_NAMESPACE
+enum ButtonFlag {
+    NeutralButton = 0x0001,
+    NegativeButton = 0x0002,
+    PositiveButton = 0x0004
+};
+Q_ENUM_NS(ButtonFlag)
+QML_NAMED_ELEMENT(FluContentDialogType)
+}
+
+namespace FluTimePickerType {
+Q_NAMESPACE
+enum HourFormat {
+    H = 0x0000,
+    HH = 0x0001
+};
+Q_ENUM_NS(HourFormat)
+QML_NAMED_ELEMENT(FluTimePickerType)
+}
+
+namespace FluCalendarViewType {
+Q_NAMESPACE
+enum DisplayMode {
+    Month = 0x0000,
+    Year = 0x0001,
+    Decade = 0x0002
+};
+Q_ENUM_NS(DisplayMode)
+QML_NAMED_ELEMENT(FluCalendarViewType)
+}
+
+namespace FluTabViewType {
+Q_NAMESPACE
+enum TabWidthBehavior {
+    Equal = 0x0000,
+    SizeToContent = 0x0001,
+    Compact = 0x0002
+};
+Q_ENUM_NS(TabWidthBehavior)
+enum CloseButtonVisibility {
+    Nerver = 0x0000,
+    Always = 0x0001,
+    OnHover = 0x0002
+};
+Q_ENUM_NS(CloseButtonVisibility)
+QML_NAMED_ELEMENT(FluTabViewType)
+}
+
+namespace FluNavigationViewType {
+Q_NAMESPACE
+enum DisplayMode {
+    Open = 0x0000,
+    Compact = 0x0001,
+    Minimal = 0x0002,
+    Auto = 0x0004
+};
+Q_ENUM_NS(DisplayMode)
+enum PageMode {
+    Stack = 0x0000,
+    NoStack = 0x0001
+};
+Q_ENUM_NS(PageMode)
+QML_NAMED_ELEMENT(FluNavigationViewType)
 }
 
 namespace Fluent_Awesome {

src/FluApp.cpp

@@ -23,6 +23,7 @@ FluApp *FluApp::getInstance()
 FluApp::FluApp(QObject *parent)
     : QObject{parent}
 {
+    httpInterceptor(nullptr);
 }
 
 FluApp::~FluApp(){
@@ -38,13 +39,13 @@ void FluApp::run(){
 
 void FluApp::navigate(const QString& route,const QJsonObject& argument,FluRegister* fluRegister){
     if(!routes().contains(route)){
-        qErrnoWarning("没有找到当前路由");
+        qCritical()<<"No route found "<<route;
         return;
     }
     QQmlEngine *engine = qmlEngine(appWindow);
     QQmlComponent component(engine, routes().value(route).toString());
     if (component.isError()) {
-        qWarning() << component.errors();
+        qCritical() << component.errors();
         return;
     }
     QVariantMap properties;
@@ -109,3 +110,11 @@ QJsonArray FluApp::awesomelist(const QString& keyword)
 void FluApp::closeApp(){
     qApp->exit(0);
 }
+
+void FluApp::deleteWindow(QQuickWindow* window){
+    if(window){
+        wnds.remove(window->winId());
+        window->deleteLater();
+        window = nullptr;
+    }
+}

src/FluApp.h

@@ -9,6 +9,7 @@
 #include <QJsonObject>
 #include <QQmlEngine>
 #include "FluRegister.h"
+#include "FluHttpInterceptor.h"
 #include "stdafx.h"
 
 /**
@@ -27,6 +28,11 @@ class FluApp : public QObject
      */
     Q_PROPERTY_AUTO(QJsonObject,routes);
 
+    /**
+     * @brief http拦截器
+     */
+    Q_PROPERTY_AUTO(FluHttpInterceptor*,httpInterceptor);
+
     QML_NAMED_ELEMENT(FluApp)
     QML_SINGLETON
 private:
@@ -73,6 +79,8 @@ public:
      */
     Q_INVOKABLE void closeApp();
 
+    Q_INVOKABLE void deleteWindow(QQuickWindow* window);
+
 public:
     /**
      * @brief wnds

src/FluHttp.cpp

@@ -0,0 +1,305 @@
+#include "FluHttp.h"
+
+#include <QThreadPool>
+#include <QEventLoop>
+#include <QNetworkReply>
+#include <QUrlQuery>
+#include <QHttpMultiPart>
+#include <QJsonDocument>
+#include "MainThread.h"
+#include "FluApp.h"
+
+FluHttp::FluHttp(QObject *parent)
+    : QObject{parent}
+{
+    retry(3);
+    timeout(15000);
+}
+
+FluHttp::~FluHttp(){
+    cancel();
+}
+
+void FluHttp::cancel(){
+    foreach (QPointer<QNetworkReply> item, _cache) {
+        if(item){
+            item->abort();
+        }
+    }
+}
+
+void FluHttp::handleReply(QNetworkReply* reply){
+    _cache.append(reply);
+}
+
+void FluHttp::post(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
+    QVariantMap data = invokeIntercept(params,headers,"post").toMap();
+    QThreadPool::globalInstance()->start([=](){
+        onStart(callable);
+        for (int i = 0; i < retry(); ++i) {
+            QNetworkAccessManager manager;
+            manager.setTransferTimeout(timeout());
+            QUrl _url(url);
+            QNetworkRequest request(_url);
+            addHeaders(&request,data["headers"].toMap());
+            QHttpMultiPart multiPart(QHttpMultiPart::FormDataType);
+            QString contentType = QString("multipart/form-data;boundary=%1").arg(multiPart.boundary());
+            request.setHeader(QNetworkRequest::ContentTypeHeader, contentType);
+            for (const auto& each : data["params"].toMap().toStdMap())
+            {
+                const QString& key = each.first;
+                const QString& value = each.second.toString();
+                QString dispositionHeader = QString("form-data; name=\"%1\"").arg(key);
+                QHttpPart part;
+                part.setHeader(QNetworkRequest::ContentDispositionHeader, dispositionHeader);
+                part.setBody(value.toUtf8());
+                multiPart.append(part);
+            }
+            QEventLoop loop;
+            QNetworkReply* reply = manager.post(request,&multiPart);
+            _cache.append(reply);
+            connect(&manager,&QNetworkAccessManager::finished,this,[&loop](QNetworkReply *reply){
+                loop.quit();
+            });
+            loop.exec();
+            QString result = QString::fromUtf8(reply->readAll());
+            int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            QString errorString = reply->errorString();
+            bool isSuccess = reply->error() == QNetworkReply::NoError;
+            _cache.removeOne(reply);
+            reply->deleteLater();
+            reply = nullptr;
+            if (isSuccess) {
+                onSuccess(callable,result);
+                break;
+            }else{
+                if(i == retry()-1){
+                    onError(callable,status,errorString);
+                }
+            }
+        }
+        onFinish(callable);
+    });
+}
+
+void FluHttp::postString(QString url,QJSValue callable,QString params,QVariantMap headers){
+    QVariantMap data = invokeIntercept(params,headers,"postString").toMap();
+    QThreadPool::globalInstance()->start([=](){
+        onStart(callable);
+        for (int i = 0; i < retry(); ++i) {
+            QNetworkAccessManager manager;
+            manager.setTransferTimeout(timeout());
+            QUrl _url(url);
+            QNetworkRequest request(_url);
+            addHeaders(&request,data["headers"].toMap());
+            QString contentType = QString("text/plain;charset=utf-8");
+            request.setHeader(QNetworkRequest::ContentTypeHeader, contentType);
+            QEventLoop loop;
+            QNetworkReply* reply = manager.post(request,params.toUtf8());
+            _cache.append(reply);
+            connect(&manager,&QNetworkAccessManager::finished,this,[&loop](QNetworkReply *reply){
+                loop.quit();
+            });
+            loop.exec();
+            QString result = QString::fromUtf8(reply->readAll());
+            int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            QString errorString = reply->errorString();
+            bool isSuccess = reply->error() == QNetworkReply::NoError;
+            _cache.removeOne(reply);
+            reply->deleteLater();
+            reply = nullptr;
+            if (isSuccess) {
+                onSuccess(callable,result);
+                break;
+            }else{
+                if(i == retry()-1){
+                    onError(callable,status,errorString);
+                }
+            }
+        }
+        onFinish(callable);
+    });
+}
+
+void FluHttp::postJson(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
+    QVariantMap data = invokeIntercept(params,headers,"postJson").toMap();
+    QThreadPool::globalInstance()->start([=](){
+        onStart(callable);
+        for (int i = 0; i < retry(); ++i) {
+            QNetworkAccessManager manager;
+            manager.setTransferTimeout(timeout());
+            QUrl _url(url);
+            QNetworkRequest request(_url);
+            addHeaders(&request,data["headers"].toMap());
+            QString contentType = QString("application/json;charset=utf-8");
+            request.setHeader(QNetworkRequest::ContentTypeHeader, contentType);
+            QEventLoop loop;
+            QNetworkReply* reply = manager.post(request,QJsonDocument::fromVariant(data["params"]).toJson());
+            _cache.append(reply);
+            connect(&manager,&QNetworkAccessManager::finished,this,[&loop](QNetworkReply *reply){
+                loop.quit();
+            });
+            loop.exec();
+            QString result = QString::fromUtf8(reply->readAll());
+            int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            QString errorString = reply->errorString();
+            bool isSuccess = reply->error() == QNetworkReply::NoError;
+            _cache.removeOne(reply);
+            reply->deleteLater();
+            reply = nullptr;
+            if (isSuccess) {
+                onSuccess(callable,result);
+                break;
+            }else{
+                if(i == retry()-1){
+                    onError(callable,status,errorString);
+                }
+            }
+        }
+        onFinish(callable);
+    });
+}
+
+void FluHttp::get(QString url,QJSValue callable,QVariantMap params,QVariantMap headers){
+    QVariantMap data = invokeIntercept(params,headers,"get").toMap();
+    QThreadPool::globalInstance()->start([=](){
+        for (int i = 0; i < retry(); ++i) {
+            onStart(callable);
+            QNetworkAccessManager manager;
+            manager.setTransferTimeout(timeout());
+            QUrl _url(url);
+            addQueryParam(&_url,data["params"].toMap());
+            QNetworkRequest request(_url);
+            addHeaders(&request,data["headers"].toMap());
+            QEventLoop loop;
+            QNetworkReply* reply = manager.get(request);
+            _cache.append(reply);
+            connect(&manager,&QNetworkAccessManager::finished,this,[&loop](QNetworkReply *reply){
+                loop.quit();
+            });
+            loop.exec();
+            QString result = QString::fromUtf8(reply->readAll());
+            int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+            QString errorString = reply->errorString();
+            bool isSuccess = reply->error() == QNetworkReply::NoError;
+            _cache.removeOne(reply);
+            reply->deleteLater();
+            reply = nullptr;
+            if (isSuccess) {
+                onSuccess(callable,result);
+                break;
+            }else{
+                if(i == retry()-1){
+                    onError(callable,status,errorString);
+                }
+            }
+        }
+        onFinish(callable);
+    });
+}
+
+void FluHttp::download(QString url,QJSValue callable,QString filePath,QVariantMap params,QVariantMap headers){
+    QVariantMap data = invokeIntercept(params,headers,"download").toMap();
+    QThreadPool::globalInstance()->start([=](){
+        onStart(callable);
+        QNetworkAccessManager manager;
+        QUrl _url(url);
+        addQueryParam(&_url,data["params"].toMap());
+        QNetworkRequest request(_url);
+        addHeaders(&request,data["headers"].toMap());
+        QSharedPointer<QFile> file(new QFile(filePath));
+        QIODevice::OpenMode mode = QIODevice::WriteOnly|QIODevice::Truncate;
+        if (!file->open(mode))
+        {
+            onError(callable,-1,QString("Url: %1 %2 Non-Writable").arg(request.url().toString(),file->fileName()));
+            onFinish(callable);
+            return;
+        }
+        QEventLoop loop;
+        connect(&manager,&QNetworkAccessManager::finished,this,[&loop](QNetworkReply *reply){
+            loop.quit();
+        });
+        QPointer<QNetworkReply> reply =  manager.get(request);
+        _cache.append(reply);
+        connect(reply,&QNetworkReply::downloadProgress,this,[=](qint64 bytesReceived, qint64 bytesTotal){
+            onDownloadProgress(callable,bytesReceived,bytesTotal);
+        });
+        loop.exec();
+        if (reply->error() == QNetworkReply::NoError) {
+            file->write(reply->readAll());
+            onSuccess(callable,filePath);
+        }else{
+            onError(callable,reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(),reply->errorString());
+        }
+        _cache.removeOne(reply);
+        reply->deleteLater();
+        reply = nullptr;
+        onFinish(callable);
+    });
+}
+
+QVariant FluHttp::invokeIntercept(const QVariant& params,const QVariant& headers,const QString& method){
+    QVariantMap requet = {
+        {"params",params},
+        {"headers",headers},
+        {"method",method}
+    };
+    if(!FluApp::getInstance()->httpInterceptor()){
+        return requet;
+    }
+    QVariant target;
+    QMetaObject::invokeMethod(FluApp::getInstance()->httpInterceptor(), "onIntercept",Q_RETURN_ARG(QVariant,target),Q_ARG(QVariant, requet));
+    return target;
+}
+
+void FluHttp::addQueryParam(QUrl* url,const QMap<QString, QVariant>& params){
+    QMapIterator<QString, QVariant> iter(params);
+    QUrlQuery urlQuery(*url);
+    while (iter.hasNext())
+    {
+        iter.next();
+        urlQuery.addQueryItem(iter.key(), iter.value().toString());
+    }
+    url->setQuery(urlQuery);
+}
+
+void FluHttp::addHeaders(QNetworkRequest* request,const QMap<QString, QVariant>& headers){
+    QMapIterator<QString, QVariant> iter(headers);
+    while (iter.hasNext())
+    {
+        iter.next();
+        request->setRawHeader(iter.key().toUtf8(), iter.value().toString().toUtf8());
+    }
+}
+
+void FluHttp::onStart(const QJSValue& callable){
+    QJSValue onStart = callable.property("onStart");
+    MainThread::post([=](){onStart.call();});
+}
+
+void FluHttp::onFinish(const QJSValue& callable){
+    QJSValue onFinish = callable.property("onFinish");
+    MainThread::post([=](){onFinish.call();});
+}
+
+void FluHttp::onError(const QJSValue& callable,int status,QString errorString){
+    QJSValue onError = callable.property("onError");
+    QJSValueList args;
+    args<<status<<errorString;
+    MainThread::post([=](){onError.call(args);});
+}
+
+void FluHttp::onSuccess(const QJSValue& callable,QString result){
+    QJSValueList args;
+    args<<result;
+    QJSValue onSuccess = callable.property("onSuccess");
+    MainThread::post([=](){onSuccess.call(args);});
+}
+
+void FluHttp::onDownloadProgress(const QJSValue& callable,qint64 recv, qint64 total){
+    QJSValueList args;
+    args<<static_cast<double>(recv);
+    args<<static_cast<double>(total);
+    QJSValue onDownloadProgress = callable.property("onDownloadProgress");
+    MainThread::post([=](){onDownloadProgress.call(args);});
+}

src/FluHttp.h

@@ -0,0 +1,39 @@
+#ifndef FLUHTTP_H
+#define FLUHTTP_H
+
+#include <QObject>
+#include <QtQml/qqml.h>
+#include <QFile>
+#include <QNetworkAccessManager>
+#include "stdafx.h"
+
+class FluHttp : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(int,retry);
+    Q_PROPERTY_AUTO(int,timeout)
+    QML_NAMED_ELEMENT(FluHttp)
+private:
+    QVariant invokeIntercept(const QVariant& params,const QVariant& headers,const QString& method);
+    void handleReply(QNetworkReply* reply);
+    void addQueryParam(QUrl* url,const QMap<QString, QVariant>& params);
+    void addHeaders(QNetworkRequest* request,const QMap<QString, QVariant>& params);
+    void onStart(const QJSValue& callable);
+    void onFinish(const QJSValue& callable);
+    void onError(const QJSValue& callable,int status,QString errorString);
+    void onSuccess(const QJSValue& callable,QString result);
+    void onDownloadProgress(const QJSValue& callable,qint64 recv, qint64 total);
+public:
+    explicit FluHttp(QObject *parent = nullptr);
+    ~FluHttp();
+    Q_INVOKABLE void get(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
+    Q_INVOKABLE void post(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
+    Q_INVOKABLE void postString(QString url,QJSValue callable,QString params = "",QVariantMap headers = {});
+    Q_INVOKABLE void postJson(QString url,QJSValue callable,QVariantMap params = {},QVariantMap headers = {});
+    Q_INVOKABLE void download(QString url,QJSValue callable,QString filePath,QVariantMap params = {},QVariantMap headers = {});
+    Q_INVOKABLE void cancel();
+private:
+    QList<QPointer<QNetworkReply>> _cache;
+};
+
+#endif // FLUHTTP_H

src/FluHttpInterceptor.cpp

@@ -0,0 +1,7 @@
+#include "FluHttpInterceptor.h"
+
+FluHttpInterceptor::FluHttpInterceptor(QObject *parent)
+    : QObject{parent}
+{
+
+}

src/FluHttpInterceptor.h

@@ -0,0 +1,18 @@
+#ifndef FLUHTTPINTERCEPTOR_H
+#define FLUHTTPINTERCEPTOR_H
+
+#include <QObject>
+#include <QtQml/qqml.h>
+
+class FluHttpInterceptor : public QObject
+{
+    Q_OBJECT
+    QML_NAMED_ELEMENT(FluHttpInterceptor)
+public:
+    explicit FluHttpInterceptor(QObject *parent = nullptr);
+
+signals:
+
+};
+
+#endif // FLUHTTPINTERCEPTOR_H

src/FluTextStyle.cpp

@@ -12,7 +12,7 @@ FluTextStyle::FluTextStyle(QObject *parent)
     Body(body);
 
     QFont bodyStrong;
-    bodyStrong.setPixelSize(14);
+    bodyStrong.setPixelSize(13);
     bodyStrong.setBold(true);
     BodyStrong(bodyStrong);
 

src/FluTheme.cpp

@@ -31,7 +31,8 @@ FluTheme::FluTheme(QObject *parent)
     });
     primaryColor(FluColors::getInstance()->Blue());
     nativeText(false);
-    darkMode(Fluent_DarkMode::Fluent_DarkModeType::Light);
+    enableAnimation(false);
+    darkMode(FluThemeType::DarkMode::Light);
     _systemDark = systemDark();
     qApp->installEventFilter(this);
 }
@@ -66,11 +67,11 @@ bool FluTheme::systemDark()
 }
 
 bool FluTheme::dark(){
-    if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Dark){
+    if(_darkMode == FluThemeType::DarkMode::Dark){
         return true;
-    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::Light){
+    }else if(_darkMode == FluThemeType::DarkMode::Light){
         return false;
-    }else if(_darkMode == Fluent_DarkMode::Fluent_DarkModeType::System){
+    }else if(_darkMode == FluThemeType::DarkMode::System){
         return _systemDark;
     }else{
         return false;

src/FluTheme.h

@@ -32,6 +32,11 @@ class FluTheme : public QObject
      */
     Q_PROPERTY_AUTO(bool,nativeText);
 
+    /**
+     * @brief 是否开启动画效果
+     */
+    Q_PROPERTY_AUTO(bool,enableAnimation);
+
     QML_NAMED_ELEMENT(FluTheme)
     QML_SINGLETON
 private:

src/FluTools.cpp

@@ -2,6 +2,7 @@
 #include <QGuiApplication>
 #include <QClipboard>
 #include <QUuid>
+#include <QCursor>
 
 FluTools* FluTools::m_instance = nullptr;
 
@@ -63,6 +64,37 @@ bool FluTools::isWin(){
 #endif
 }
 
+int FluTools::qtMajor(){
+    const QString qtVersion = QString::fromLatin1(qVersion());
+    const QStringList versionParts = qtVersion.split('.');
+    return versionParts[0].toInt();
+}
+
+int FluTools::qtMinor(){
+    const QString qtVersion = QString::fromLatin1(qVersion());
+    const QStringList versionParts = qtVersion.split('.');
+    return versionParts[1].toInt();
+}
+
 void FluTools::setQuitOnLastWindowClosed(bool val){
     qApp->setQuitOnLastWindowClosed(val);
 }
+
+void FluTools::setOverrideCursor(Qt::CursorShape shape){
+    qApp->setOverrideCursor(QCursor(shape));
+}
+
+void FluTools::restoreOverrideCursor(){
+    qApp->restoreOverrideCursor();
+}
+
+void FluTools::deleteItem(QObject *p){
+    if(p){
+        delete p;
+        p = nullptr;
+    }
+}
+
+QString FluTools::toLocalPath(const QUrl& url){
+    return url.toLocalFile();
+}

src/FluTools.h

@@ -23,6 +23,37 @@ public:
         return getInstance();
     }
     static FluTools *getInstance();
+
+    /**
+     * @brief qtMajor Qt Major版本
+     * @return
+     */
+    Q_INVOKABLE int qtMajor();
+
+    /**
+     * @brief qtMajor Qt Minor版本
+     * @return
+     */
+    Q_INVOKABLE int qtMinor();
+
+    /**
+     * @brief isMacos 是否是Macos系统
+     * @return
+     */
+    Q_INVOKABLE bool isMacos();
+
+    /**
+     * @brief isLinux 是否是Linux系统
+     * @return
+     */
+    Q_INVOKABLE bool isLinux();
+
+    /**
+     * @brief isWin 是否是Windows系统
+     * @return
+     */
+    Q_INVOKABLE bool isWin();
+
     /**
      * @brief clipText 将字符串添加到剪切板
      * @param text
@@ -40,16 +71,39 @@ public:
      * @param fileName
      * @return
      */
-    Q_INVOKABLE QString readFile(const QString &fileName);
+    Q_INVOKABLE QString readFile(const QString& fileName);
-
-    Q_INVOKABLE bool isMacos();
-
-    Q_INVOKABLE bool isLinux();
-
-    Q_INVOKABLE bool isWin();
 
+    /**
+     * @brief setQuitOnLastWindowClosed 设置关闭最后一个窗口是否退出程序
+     * @param val
+     */
     Q_INVOKABLE void setQuitOnLastWindowClosed(bool val);
 
+    /**
+     * @brief setOverrideCursor 设置全局鼠标样式
+     * @param shape
+     */
+    Q_INVOKABLE void setOverrideCursor(Qt::CursorShape shape);
+
+    /**
+     * @brief restoreOverrideCursor 还原全局鼠标样式
+     */
+    Q_INVOKABLE void restoreOverrideCursor();
+
+    /**
+     * @brief toLocalPath 获取文件路径，可以去掉windows系统下的file:///，macos下的file://
+     * @param url
+     * @return 返回文件路径
+     */
+    Q_INVOKABLE QString toLocalPath(const QUrl& url);
+
+    /**
+     * @brief deleteItem 销毁Item对象
+     * @param p
+     */
+    Q_INVOKABLE void deleteItem(QObject *p);
+
+
 };
 
 #endif // FLUTOOLS_H

src/FluWatermark.cpp

@@ -0,0 +1,45 @@
+#include "FluWatermark.h"
+
+FluWatermark::FluWatermark(QQuickItem* parent) : QQuickPaintedItem(parent)
+{
+    gap(QPoint(100,100));
+    offset(QPoint(_gap.x()/2,_gap.y()/2));
+    rotate(22);
+    setZ(9999);
+    textColor(QColor(222,222,222,222));
+    textSize(16);
+    connect(this,&FluWatermark::textColorChanged,this,[=]{update();});
+    connect(this,&FluWatermark::gapChanged,this,[=]{update();});
+    connect(this,&FluWatermark::offsetChanged,this,[=]{update();});
+    connect(this,&FluWatermark::textChanged,this,[=]{update();});
+    connect(this,&FluWatermark::rotateChanged,this,[=]{update();});
+    connect(this,&FluWatermark::textSizeChanged,this,[=]{update();});
+}
+
+void FluWatermark::paint(QPainter* painter)
+{
+    QFont font;
+    font.setPixelSize(_textSize);
+    painter->setFont(font);
+    painter->setPen(_textColor);
+    QFontMetricsF fontMetrics(font);
+    qreal fontWidth = fontMetrics.horizontalAdvance(_text);
+    qreal fontHeight = fontMetrics.height();
+    int stepX =  fontWidth + _gap.x();
+    int stepY =  fontHeight + _gap.y();
+    int rowCount = width() / stepX+1;
+    int colCount = height() / stepY+1;
+    for (int r = 0; r < rowCount; r++)
+    {
+        for (int c = 0; c < colCount; c++)
+        {
+            qreal centerX = stepX * r + _offset.x() + fontWidth / 2.0;
+            qreal centerY = stepY * c + _offset.y() + fontHeight / 2.0;
+            painter->save();
+            painter->translate(centerX, centerY);
+            painter->rotate(_rotate);
+            painter->drawText(QRectF(-fontWidth / 2.0, -fontHeight / 2.0, fontWidth, fontHeight), _text);
+            painter->restore();
+        }
+    }
+}

src/FluWatermark.h

@@ -0,0 +1,25 @@
+#ifndef FLUWATERMARK_H
+#define FLUWATERMARK_H
+
+#include <QQuickItem>
+#include <QQuickPaintedItem>
+#include <QPainter>
+#include "stdafx.h"
+
+class FluWatermark : public QQuickPaintedItem
+{
+    Q_OBJECT
+    Q_PROPERTY_AUTO(QString,text)
+    Q_PROPERTY_AUTO(QPoint,gap)
+    Q_PROPERTY_AUTO(QPoint,offset);
+    Q_PROPERTY_AUTO(QColor,textColor);
+    Q_PROPERTY_AUTO(int,rotate);
+    Q_PROPERTY_AUTO(int,textSize);
+    QML_NAMED_ELEMENT(FluWatermark)
+public:
+    explicit FluWatermark(QQuickItem *parent = nullptr);
+    void paint(QPainter* painter) override;
+
+};
+
+#endif // FLUWATERMARK_H

src/MainThread.cpp

@@ -0,0 +1,39 @@
+#include "MainThread.h"
+#include <QGuiApplication>
+#include <QMetaMethod>
+
+std::shared_ptr<MainThread> MainThread::createShared(QObject* bindObject)
+{
+    return std::shared_ptr<MainThread>(new MainThread(bindObject), [=](QObject* mainThread) {
+        mainThread->deleteLater();
+    });
+}
+
+MainThread::MainThread(QObject* bindObject)
+    : mBindObject(bindObject)
+    , mIgnoreNullObject(bindObject == nullptr)
+{
+    qRegisterMetaType<std::function<void()>>("std::function<void()>");
+    auto mainUIThread = qApp->thread();
+    if (this->thread() != mainUIThread)
+    {
+        this->moveToThread(mainUIThread);
+    }
+}
+
+MainThread::~MainThread()
+{
+}
+
+void MainThread::post(std::function<void()> func)
+{
+    QMetaObject::invokeMethod(createShared().get(), "mainThreadSlot", Q_ARG(std::function<void()>, func));
+}
+
+void MainThread::mainThreadSlot(std::function<void()> func)
+{
+    if ((mIgnoreNullObject || mBindObject) && func)
+    {
+        func();
+    }
+}

src/MainThread.h

@@ -0,0 +1,24 @@
+#ifndef MAINTHREAD_H
+#define MAINTHREAD_H
+
+#include <QObject>
+#include <QPointer>
+#include <QDebug>
+
+class MainThread : public QObject
+{
+    Q_OBJECT
+public:
+
+    static void post(std::function<void()> func);
+    ~MainThread();
+private:
+    static std::shared_ptr<MainThread> createShared(QObject* bindObject = nullptr);
+private slots:
+    void mainThreadSlot(std::function<void()> func);
+private:
+    MainThread(QObject* bindObject = nullptr);
+    QPointer<QObject> mBindObject;
+    bool mIgnoreNullObject{ false };
+};
+#endif // MAINTHREAD_H

src/WindowHelper.cpp

@@ -1,7 +1,6 @@
 #include "WindowHelper.h"
 
 #include "FluRegister.h"
-#include "FluApp.h"
 
 WindowHelper::WindowHelper(QObject *parent)
     : QObject{parent}
@@ -19,10 +18,3 @@ QVariant WindowHelper::createRegister(QQuickWindow* window,const QString& path){
     p->path(path);
     return  QVariant::fromValue(p);
 }
-
-void WindowHelper::deleteWindow(){
-    if(this->window){
-        FluApp::getInstance()->wnds.remove(this->window->winId());
-        this->window->deleteLater();
-    }
-}

src/WindowHelper.h

@@ -24,11 +24,6 @@ public:
      */
     Q_INVOKABLE void initWindow(QQuickWindow* window);
 
-    /**
-     * @brief deleteWindow 销毁窗口，释放资源，QML中的Window close并不会销毁窗口，只是把窗口隐藏了
-     */
-    Q_INVOKABLE void deleteWindow();
-
     /**
      * @brief createRegister 创建一个FluRegsiter对象，在FluWindow中registerForWindowResult方法调用
      * @param window

src/imports/FluentUI/Controls/FluAcrylic.qml

@@ -2,36 +2,39 @@ import QtQuick
 import Qt5Compat.GraphicalEffects
 import FluentUI
 
-Item {
+FluItem {
     id: control
-    property alias color: rect.color
+    property color tintColor: Qt.rgba(1,1,1,1)
-    property alias acrylicOpacity: rect.opacity
+    property real tintOpacity: 0.65
-    property alias radius:bg.radius
+    property real luminosity: 0.01
-    property alias blurRadius: blur.radius
+    property real noiseOpacity : 0.066
-    property int rectX: control.x
+    property alias target : effect_source.sourceItem
-    property int rectY: control.y
+    property int blurRadius: 32
-    property var sourceItem: control.parent
+    property rect targetRect : Qt.rect(control.x, control.y, control.width, control.height)
-    FluRectangle{
+    ShaderEffectSource {
-        id:bg
+        id: effect_source
         anchors.fill: parent
-        radius: [8,8,8,8]
+        visible: false
-        ShaderEffectSource {
+        sourceRect: control.targetRect
-            id: effect_source
+    }
-            anchors.fill: parent
+    FastBlur {
-            sourceItem: control.sourceItem
+        id:fast_blur
-            sourceRect: Qt.rect(rectX, rectY, control.width, control.height)
+        anchors.fill: parent
-            Rectangle {
+        source: effect_source
-                id: rect
+        radius: control.blurRadius
-                anchors.fill: parent
+    }
-                color: "white"
+    Rectangle{
-                opacity: 0.5
+        anchors.fill: parent
-            }
+        color: Qt.rgba(255, 255, 255, luminosity)
-        }
+    }
-        FastBlur {
+    Rectangle{
-            id:blur
+        anchors.fill: parent
-            radius: 50
+        color: Qt.rgba(tintColor.r, tintColor.g, tintColor.b, tintOpacity)
-            anchors.fill: effect_source
+    }
-            source: effect_source
+    Image{
-        }
+        anchors.fill: parent
+        source: "../Image/noise.png"
+        fillMode: Image.Tile
+        opacity: control.noiseOpacity
     }
 }

src/imports/FluentUI/Controls/FluAppBar.qml

@@ -19,6 +19,9 @@ Rectangle{
     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 showClose: true
+    property bool showMinimize: true
+    property bool showMaximize: true
     property bool titleVisible: true
     property bool isMac: FluTools.isMacos()
     property color borerlessColor : FluTheme.dark ? FluTheme.primaryColor.lighter : FluTheme.primaryColor.dark
@@ -36,9 +39,9 @@ Rectangle{
     }
     property var darkClickListener: function(){
         if(FluTheme.dark){
-            FluTheme.darkMode = FluDarkMode.Light
+            FluTheme.darkMode = FluThemeType.Light
         }else{
-            FluTheme.darkMode = FluDarkMode.Dark
+            FluTheme.darkMode = FluThemeType.Dark
         }
     }
     id:root
@@ -96,7 +99,7 @@ Rectangle{
             iconSize: 11
             text:minimizeText
             radius: 0
-            visible: !isMac
+            visible: !isMac && showMinimize
             iconColor: root.textColor
             color: hovered ? minimizeHoverColor : minimizeNormalColor
             onClicked: minClickListener()
@@ -108,7 +111,7 @@ Rectangle{
             iconSource : d.isRestore  ? FluentIcons.ChromeRestore : FluentIcons.ChromeMaximize
             color: hovered ? maximizeHoverColor : maximizeNormalColor
             Layout.alignment: Qt.AlignVCenter
-            visible: d.resizable && !isMac
+            visible: d.resizable && !isMac && showMaximize
             radius: 0
             iconColor: root.textColor
             text:d.isRestore?restoreText:maximizeText
@@ -122,7 +125,7 @@ Rectangle{
             text:closeText
             width: 40
             height: 30
-            visible: !isMac
+            visible: !isMac && showClose
             radius: 0
             iconSize: 10
             iconColor: hovered ? Qt.rgba(1,1,1,1) : root.textColor

src/imports/FluentUI/Controls/FluAutoSuggestBox.qml

@@ -10,7 +10,6 @@ FluTextBox{
     signal itemClicked(var data)
     signal handleClicked
     id:control
-    width: 300
     Component.onCompleted: {
         loadData()
     }
@@ -22,33 +21,29 @@ FluTextBox{
         id:control_popup
         y:control.height
         focus: false
+//        modal: true
+//        Overlay.modal: Item{}
+
+        padding: 0
         enter: Transition {
             NumberAnimation {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
-        onVisibleChanged: {
+        contentItem: FluRectangle{
-            if(visible){
+            radius: [4,4,4,4]
-                list_view.currentIndex = -1
-            }
-        }
-        background: Rectangle{
-            id:container
-            width: control.width
-            radius: 4
             FluShadow{
                 radius: 4
             }
             color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
-            height: 38*Math.min(Math.max(list_view.count,1),8)
             ListView{
                 id:list_view
                 anchors.fill: parent
                 clip: true
-                currentIndex: -1
+                boundsBehavior: ListView.StopAtBounds
                 ScrollBar.vertical: FluScrollBar {}
                 header: Item{
                     width: control.width
@@ -63,53 +58,39 @@ FluTextBox{
                         }
                     }
                 }
-                delegate:Control{
+                delegate:FluControl{
+                    id:item_control
+                    height: 38
                     width: control.width
-                    padding:10
+                    onClicked:{
+                        handleClick(modelData)
+                    }
                     background: Rectangle{
+                        FluFocusRectangle{
+                            visible: item_control.activeFocus
+                            radius:4
+                        }
                         color:  {
-                            if(list_view.currentIndex === index){
-                                return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
-                            }
                             if(hovered){
                                 return FluTheme.dark ? Qt.rgba(63/255,60/255,61/255,1) : Qt.rgba(237/255,237/255,242/255,1)
                             }
                             return FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(0,0,0,0)
                         }
-                        MouseArea{
-                            id:mouse_area
-                            anchors.fill: parent
-                            Connections{
-                                target: control
-                                function onHandleClicked(){
-                                    if((list_view.currentIndex === index)){
-                                        handleClick(modelData)
-                                    }
-                                }
-                            }
-                            onClicked: handleClick(modelData)
-                        }
-                        Rectangle{
-                            width: 3
-                            color:FluTheme.primaryColor.dark
-                            visible: list_view.currentIndex === index
-                            radius: 3
-                            height: 20
-                            anchors{
-                                left: parent.left
-                                verticalCenter: parent.verticalCenter
-                            }
-                        }
                     }
                     contentItem: FluText{
                         text:modelData.title
-                        anchors{
+                        leftPadding: 10
-                            verticalCenter: parent.verticalCenter
+                        rightPadding: 10
-                        }
+                        verticalAlignment : Qt.AlignVCenter
                     }
                 }
             }
         }
+        background: Item{
+            id:container
+            implicitWidth: control.width
+            implicitHeight: 38*Math.min(Math.max(list_view.count,1),8)
+        }
     }
     onTextChanged: {
         loadData()

src/imports/FluentUI/Controls/FluBreadcrumbBar.qml

@@ -33,7 +33,7 @@ Item {
                 properties: "opacity"
                 from: 1
                 to: 0
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         add: Transition {
@@ -41,7 +41,7 @@ Item {
                 properties: "opacity"
                 from: 0
                 to: 1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         delegate: Item{

src/imports/FluentUI/Controls/FluCalendarPicker.qml

@@ -65,7 +65,7 @@ Rectangle {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         exit:Transition {
@@ -73,7 +73,7 @@ Rectangle {
                 property: "opacity"
                 from:1
                 to:0
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         contentItem: Item{

src/imports/FluentUI/Controls/FluCalendarView.qml

@@ -3,12 +3,7 @@ import QtQuick.Controls
 import FluentUI
 
 Item {
-    enum DisplayMode {
+    property int displayMode: FluCalendarViewType.Month
-        Month,
-        Year,
-        Decade
-    }
-    property int displayMode: FluCalendarView.Month
     property var date: new Date()
     property var currentDate : new Date()
     property var toDay: new Date()
@@ -39,7 +34,7 @@ Item {
             width: 70
             onClicked:{
                 control.date = date
-                displayMode = FluCalendarView.Year
+                displayMode = FluCalendarViewType.Year
                 updateYear(date)
             }
             background: Item{
@@ -98,7 +93,7 @@ Item {
             width: 70
             onClicked:{
                 control.date = date
-                displayMode = FluCalendarView.Month
+                displayMode = FluCalendarViewType.Month
                 updateMouth(date)
             }
             background: Item{
@@ -243,20 +238,18 @@ Item {
             }
             FluTextButton{
                 id:title
-                leftPadding: 0
-                rightPadding: 0
                 anchors{
                     verticalCenter: parent.verticalCenter
                     left: parent.left
                     leftMargin: 14
                 }
-                disabled: displayMode === FluCalendarView.Decade
+                disabled: displayMode === FluCalendarViewType.Decade
                 onClicked:{
-                    if(displayMode === FluCalendarView.Month){
+                    if(displayMode === FluCalendarViewType.Month){
-                        displayMode = FluCalendarView.Year
+                        displayMode = FluCalendarViewType.Year
                         updateYear(date)
-                    }else if(displayMode === FluCalendarView.Year){
+                    }else if(displayMode === FluCalendarViewType.Year){
-                        displayMode = FluCalendarView.Decade
+                        displayMode = FluCalendarViewType.Decade
                         updateDecade(date)
                     }
                 }
@@ -273,7 +266,7 @@ Item {
                 onClicked: {
                     var year = date.getFullYear()
                     var month = date.getMonth()
-                    if(displayMode === FluCalendarView.Month){
+                    if(displayMode === FluCalendarViewType.Month){
                         var lastMonthYear = year;
                         var lastMonthMonth = month - 1
                         if (month === 0) {
@@ -282,10 +275,10 @@ Item {
                         }
                         date = new Date(lastMonthYear,lastMonthMonth,1)
                         updateMouth(date)
-                    }else if(displayMode === FluCalendarView.Year){
+                    }else if(displayMode === FluCalendarViewType.Year){
                         date = new Date(year-1,month,1)
                         updateYear(date)
-                    }else if(displayMode === FluCalendarView.Decade){
+                    }else if(displayMode === FluCalendarViewType.Decade){
                         date = new Date(Math.floor(year / 10) * 10-10,month,1)
                         updateDecade(date)
                     }
@@ -303,7 +296,7 @@ Item {
                 onClicked: {
                     var year = date.getFullYear()
                     var month = date.getMonth()
-                    if(displayMode === FluCalendarView.Month){
+                    if(displayMode === FluCalendarViewType.Month){
                         var nextMonthYear = year
                         var nextMonth = month + 1
                         if (month === 11) {
@@ -312,10 +305,10 @@ Item {
                         }
                         date = new Date(nextMonthYear,nextMonth,1)
                         updateMouth(date)
-                    }else if(displayMode === FluCalendarView.Year){
+                    }else if(displayMode === FluCalendarViewType.Year){
                         date = new Date(year+1,month,1)
                         updateYear(date)
-                    }else if(displayMode === FluCalendarView.Decade){
+                    }else if(displayMode === FluCalendarViewType.Decade){
                         date = new Date(Math.floor(year / 10) * 10+10,month,1)
                         updateDecade(date)
                     }
@@ -336,8 +329,8 @@ Item {
             GridView{
                 model: list_model
                 anchors.fill: parent
-                cellHeight: displayMode === FluCalendarView.Month ? 40 : 70
+                cellHeight: displayMode === FluCalendarViewType.Month ? 40 : 70
-                cellWidth: displayMode === FluCalendarView.Month ? 40 : 70
+                cellWidth: displayMode === FluCalendarViewType.Month ? 40 : 70
                 clip: true
                 boundsBehavior:Flickable.StopAtBounds
                 delegate: Loader{

src/imports/FluentUI/Controls/FluCheckBox.qml

@@ -87,6 +87,7 @@ Button {
                 return normalColor
             }
             Behavior on color {
+                enabled: FluTheme.enableAnimation
                 ColorAnimation{
                     duration: 83
                 }
@@ -98,6 +99,7 @@ Button {
                 visible: checked
                 iconColor: FluTheme.dark ? Qt.rgba(0,0,0,1) : Qt.rgba(1,1,1,1)
                 Behavior on visible {
+                    enabled: FluTheme.enableAnimation
                     NumberAnimation{
                         duration: 83
                     }

src/imports/FluentUI/Controls/FluColorPicker.qml

@@ -11,6 +11,7 @@ Button{
     height: 36
     implicitWidth: width
     implicitHeight: height
+    property alias colorValue: container.colorValue
     background:
         Rectangle{
         id:layout_color
@@ -50,7 +51,7 @@ Button{
                 property: "opacity"
                 from:0
                 to:1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
 
@@ -59,7 +60,7 @@ Button{
                 property: "opacity"
                 from:1
                 to:0
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         function showPopup() {
@@ -75,4 +76,7 @@ Button{
             popup.open()
         }
     }
+    function setColor(color){
+        container.setColor(color)
+    }
 }

src/imports/FluentUI/Controls/FluComboBox.qml

@@ -6,6 +6,7 @@ import QtQuick.Templates as T
 
 ComboBox {
     id: control
+    signal commit
     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)
     property color hoverColor: FluTheme.dark ? Qt.rgba(68/255,68/255,68/255,1) : Qt.rgba(251/255,251/255,251/255,1)
@@ -15,7 +16,7 @@ ComboBox {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              implicitContentHeight + topPadding + bottomPadding,
                              implicitIndicatorHeight + topPadding + bottomPadding)
-
+    font: FluTextStyle.Body
     leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
     rightPadding: padding + (control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing)
     enabled: !disabled
@@ -23,6 +24,7 @@ ComboBox {
         width: ListView.view.width
         text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
         palette.text: control.palette.text
+        font: control.font
         palette.highlightedText: control.palette.highlightedText
         highlighted: control.highlightedIndex === index
         hoverEnabled: control.hoverEnabled
@@ -38,16 +40,17 @@ ComboBox {
     }
     contentItem: T.TextField {
         property bool disabled: !control.editable
-        leftPadding: !control.mirrored ? 12 : control.editable && activeFocus ? 3 : 1
+        leftPadding: !control.mirrored ? 10 : control.editable && activeFocus ? 3 : 1
-        rightPadding: control.mirrored ? 12 : control.editable && activeFocus ? 3 : 1
+        rightPadding: control.mirrored ? 10 : control.editable && activeFocus ? 3 : 1
         topPadding: 6 - control.padding
         bottomPadding: 6 - control.padding
         renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-        selectionColor: FluTheme.primaryColor.lightest
+        selectionColor: Qt.alpha(FluTheme.primaryColor.lightest,0.6)
+        selectedTextColor: color
         text: control.editable ? control.editText : control.displayText
         enabled: control.editable
         autoScroll: control.editable
-        font:FluTextStyle.Body
+        font:control.font
         readOnly: control.down
         color: FluTheme.dark ?  Qt.rgba(255/255,255/255,255/255,1) : Qt.rgba(27/255,27/255,27/255,1)
         inputMethodHints: control.inputMethodHints
@@ -57,17 +60,24 @@ ComboBox {
         leftInset:1
         topInset:1
         bottomInset:1
-        focus: true
         rightInset:1
         background: FluTextBoxBackground{
             border.width: 0
             inputItem: contentItem
         }
+        Component.onCompleted: {
+            forceActiveFocus()
+        }
+        Keys.onEnterPressed: (event)=> handleCommit(event)
+        Keys.onReturnPressed:(event)=> handleCommit(event)
+        function handleCommit(event){
+            control.commit()
+        }
     }
 
     background: Rectangle {
         implicitWidth: 140
-        implicitHeight: 28
+        implicitHeight: 32
         border.color: FluTheme.dark ? "#505050" : "#DFDFDF"
         border.width: 1
         visible: !control.flat || control.down
@@ -104,7 +114,7 @@ ComboBox {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         exit:Transition {
@@ -112,7 +122,7 @@ ComboBox {
                 property: "opacity"
                 from:1
                 to:0
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         background:Rectangle{

src/imports/FluentUI/Controls/FluContentDialog.qml

@@ -11,26 +11,17 @@ FluPopup {
     property string neutralText: "Neutral"
     property string negativeText: "Negative"
     property string positiveText: "Positive"
+    property int delayTime: 100
     signal neutralClicked
     signal negativeClicked
     signal positiveClicked
-    enum ButtonFlag{
+    property int buttonFlags: FluContentDialogType.NegativeButton | FluContentDialogType.PositiveButton
-        NegativeButton=1
-        ,NeutralButton=2
-        ,PositiveButton=4
-    }
-    property int buttonFlags: FluContentDialog.NegativeButton | FluContentDialog.PositiveButton
-    property var minWidth: {
-        if(Window.window==null)
-            return 400
-        return  Math.min(Window.window.width,400)
-    }
     focus: true
+    implicitWidth: 400
+    implicitHeight: text_title.height + text_message.height + layout_actions.height
     Rectangle {
         id:layout_content
         anchors.fill: parent
-        implicitWidth:minWidth
-        implicitHeight: text_title.height + text_message.height + layout_actions.height
         color: 'transparent'
         radius:5
         FluText{
@@ -66,7 +57,7 @@ FluPopup {
             id:layout_actions
             height: 68
             radius: 5
-            color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255, blurBackground ? blurOpacity - 0.4 : 1) : Qt.rgba(243/255,243/255,243/255,blurBackground ? blurOpacity - 0.4 : 1)
+            color: FluTheme.dark ? Qt.rgba(32/255,32/255,32/255,1) : Qt.rgba(243/255,243/255,243/255,1)
             anchors{
                 top:text_message.bottom
                 left: parent.left
@@ -84,36 +75,55 @@ FluPopup {
                     id:neutral_btn
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    visible: popup.buttonFlags&FluContentDialog.NeutralButton
+                    visible: popup.buttonFlags&FluContentDialogType.NeutralButton
                     text: neutralText
                     onClicked: {
                         popup.close()
-                        neutralClicked()
+                        timer_delay.targetFlags = FluContentDialogType.NeutralButton
+                        timer_delay.restart()
                     }
                 }
                 FluButton{
                     id:negative_btn
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    visible: popup.buttonFlags&FluContentDialog.NegativeButton
+                    visible: popup.buttonFlags&FluContentDialogType.NegativeButton
                     text: negativeText
                     onClicked: {
                         popup.close()
-                        negativeClicked()
+                        timer_delay.targetFlags = FluContentDialogType.NegativeButton
+                        timer_delay.restart()
                     }
                 }
                 FluFilledButton{
                     id:positive_btn
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    visible: popup.buttonFlags&FluContentDialog.PositiveButton
+                    visible: popup.buttonFlags&FluContentDialogType.PositiveButton
                     text: positiveText
                     onClicked: {
                         popup.close()
-                        positiveClicked()
+                        timer_delay.targetFlags = FluContentDialogType.PositiveButton
+                        timer_delay.restart()
                     }
                 }
             }
         }
     }
+    Timer{
+        property int targetFlags
+        id:timer_delay
+        interval: popup.delayTime
+        onTriggered: {
+            if(targetFlags === FluContentDialogType.NegativeButton){
+                negativeClicked()
+            }
+            if(targetFlags === FluContentDialogType.NeutralButton){
+                neutralClicked()
+            }
+            if(targetFlags === FluContentDialogType.PositiveButton){
+                positiveClicked()
+            }
+        }
+    }
 }

src/imports/FluentUI/Controls/FluContentPage.qml

@@ -11,6 +11,17 @@ FluPage {
     property int topPadding: 0
     property int rightPadding: 10
     property int bottomPadding: 10
+    property alias color: status_view.color
+    property alias statusMode: status_view.statusMode
+    property alias loadingText: status_view.loadingText
+    property alias emptyText:status_view.emptyText
+    property alias errorText:status_view.errorText
+    property alias errorButtonText:status_view.errorButtonText
+    property alias loadingItem :status_view.loadingItem
+    property alias emptyItem : status_view.emptyItem
+    property alias errorItem :status_view.errorItem
+    signal errorClicked
+
     id:control
     FluText{
         id:text_title
@@ -26,9 +37,11 @@ FluPage {
             rightMargin: control.rightPadding
         }
     }
-    Item{
+    FluStatusView{
-        clip: true
+        id:status_view
-        id:container
+        color: "#00000000"
+        statusMode: FluStatusViewType.Success
+        onErrorClicked: control.errorClicked()
         anchors{
             left: parent.left
             right: parent.right
@@ -38,5 +51,10 @@ FluPage {
             rightMargin: control.rightPadding
             bottomMargin: control.bottomPadding
         }
+        Item{
+            clip: true
+            id:container
+            anchors.fill: parent
+        }
     }
 }

src/imports/FluentUI/Controls/FluCopyableText.qml

@@ -14,15 +14,19 @@ TextEdit {
     leftPadding: 0
     rightPadding: 0
     topPadding: 0
+    selectByMouse: true
+    selectedTextColor: color
     bottomPadding: 0
-    selectionColor: FluTheme.primaryColor.lightest
+    selectionColor: Qt.alpha(FluTheme.primaryColor.lightest,0.6)
     font:FluTextStyle.Body
     onSelectedTextChanged: {
         control.forceActiveFocus()
     }
-    TapHandler {
+    MouseArea{
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
     }
     FluTextBoxMenu{
         id:menu

src/imports/FluentUI/Controls/FluDatePicker.qml

@@ -8,11 +8,9 @@ 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 var window : Window.window
     property bool showYear: true
-    property bool changeFlag: true
+    property var current
-    readonly property var rowData: ["","",""]
+    id:control
-    id:root
     color: {
         if(mouse_area.containsMouse){
             return hoverColor
@@ -24,6 +22,13 @@ Rectangle {
     radius: 4
     border.width: 1
     border.color: dividerColor
+    Item{
+        id:d
+        property var window: Window.window
+        property bool changeFlag: true
+        property var rowData: ["","",""]
+        visible: false
+    }
     MouseArea{
         id:mouse_area
         hoverEnabled: true
@@ -96,7 +101,7 @@ Rectangle {
                 property: "opacity"
                 from:0
                 to:1
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         exit:Transition {
@@ -104,7 +109,7 @@ Rectangle {
                 property: "opacity"
                 from:1
                 to:0
-                duration: 83
+                duration: FluTheme.enableAnimation ? 83 : 0
             }
         }
         background:Item{
@@ -317,8 +322,19 @@ Rectangle {
                         }
                         text: "确定"
                         onClicked: {
-                            changeFlag = false
+                            d.changeFlag = false
                             popup.close()
+                            const year = text_year.text
+                            const month = text_month.text
+                            const day = text_day.text
+                            const date = new Date()
+                            date.setFullYear(parseInt(year));
+                            date.setMonth(parseInt(month) - 1);
+                            date.setDate(parseInt(day));
+                            date.setHours(0);
+                            date.setMinutes(0);
+                            date.setSeconds(0);
+                            current = date
                         }
                     }
                 }
@@ -326,10 +342,10 @@ Rectangle {
         }
         y:35
         function showPopup() {
-            changeFlag = true
+            d.changeFlag = true
-            rowData[0] = text_year.text
+            d.rowData[0] = text_year.text
-            rowData[1] = text_month.text
+            d.rowData[1] = text_month.text
-            rowData[2] = text_day.text
+            d.rowData[2] = text_day.text
             const now = new Date();
             var year = text_year.text === "年"? now.getFullYear() : Number(text_year.text);
             var month = text_month.text === "月"? now.getMonth() + 1 : Number(text_month.text);
@@ -342,21 +358,21 @@ Rectangle {
             list_view_3.model = generateMonthDaysArray(year,month)
             list_view_3.currentIndex = list_view_3.model.indexOf(day)
             text_day.text = day
-            var pos = root.mapToItem(null, 0, 0)
+            var pos = control.mapToItem(null, 0, 0)
-            if(window.height>pos.y+root.height+container.height){
+            if(d.window.height>pos.y+control.height+container.height){
-                popup.y = root.height
+                popup.y = control.height
             } else if(pos.y>container.height){
                 popup.y = -container.height
             } else {
-                popup.y = window.height-(pos.y+container.height)
+                popup.y = d.window.height-(pos.y+container.height)
             }
             popup.open()
         }
         onClosed: {
-            if(changeFlag){
+            if(d.changeFlag){
-                text_year.text = rowData[0]
+                text_year.text = d.rowData[0]
-                text_month.text = rowData[1]
+                text_month.text = d.rowData[1]
-                text_day.text = rowData[2]
+                text_day.text = d.rowData[2]
             }
         }
     }

src/imports/FluentUI/Controls/FluDivider.qml

@@ -3,5 +3,5 @@ import QtQuick.Window
 import FluentUI
 
 Rectangle {
-   color: FluTheme.dark ? Qt.rgba(60/255,60/255,60/255,1) : Qt.rgba(210/255,210/255,210/255,1)
+   color: FluTheme.dark ? Qt.rgba(80/255,80/255,80/255,1) : Qt.rgba(210/255,210/255,210/255,1)
 }

src/imports/FluentUI/Controls/FluDropDownButton.qml

@@ -75,7 +75,7 @@ Button {
         color: control.textColor
     }
     onClicked: {
-        if(items && menu.count !==0){
+        if(menu.count !==0){
             var pos = control.mapToItem(null, 0, 0)
             var containerHeight = menu.count*36
             if(window.height>pos.y+control.height+containerHeight){

src/imports/FluentUI/Controls/FluExpander.qml

@@ -9,10 +9,8 @@ Item {
     property int contentHeight : 300
     default property alias content: container.data
     id:control
-    height: layout_header.height + container.height
+    implicitHeight: Math.max((layout_header.height + container.height),layout_header.height)
-    width: 400
+    implicitWidth: 400
-    implicitWidth: width
-    implicitHeight: height
     Rectangle{
         id:layout_header
         width: parent.width
@@ -56,31 +54,69 @@ Item {
                 iconSource:FluentIcons.ChevronUp
                 iconSize: 15
                 Behavior on rotation {
+                    enabled: FluTheme.enableAnimation
                     NumberAnimation{
                         duration: 167
+                        easing.type: Easing.OutCubic
                     }
                 }
             }
         }
     }
-    Rectangle{
+    Item{
-        id:container
-        width: parent.width
-        clip: true
         anchors{
             top: layout_header.bottom
             topMargin: -1
             left: layout_header.left
         }
-        radius: 4
+        width: parent.width
-        color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+        clip: true
-        border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+        visible: contentHeight+container.y !== 0
-        height: expand ? contentHeight : 0
+        height: contentHeight+container.y
-        Behavior on height {
+        Rectangle{
-            NumberAnimation{
+            id:container
-                duration: 167
+            width: parent.width
-                easing.type: Easing.InCubic
+            height: parent.height
-            }
+            radius: 4
+            color: FluTheme.dark ? Qt.rgba(39/255,39/255,39/255,1) : Qt.rgba(251/255,251/255,253/255,1)
+            border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,229/255,234/255,1)
+            y: -contentHeight
+            states: [
+                State{
+                    name:"expand"
+                    when: control.expand
+                    PropertyChanges {
+                        target: container
+                        y:0
+                    }
+                },
+                State{
+                    name:"collapsed"
+                    when: !control.expand
+                    PropertyChanges {
+                        target: container
+                        y:-contentHeight
+                    }
+                }
+            ]
+            transitions: [
+                Transition {
+                    to:"expand"
+                    NumberAnimation {
+                        properties: "y"
+                        duration: FluTheme.enableAnimation ? 167 : 0
+                        easing.type: Easing.OutCubic
+                    }
+                },
+                Transition {
+                    to:"collapsed"
+                    NumberAnimation {
+                        properties: "y"
+                        duration: FluTheme.enableAnimation ? 167 : 0
+                        easing.type: Easing.OutCubic
+                    }
+                }
+            ]
         }
     }
 }

src/imports/FluentUI/Controls/FluHorizontalHeaderView.qml

@@ -1,27 +0,0 @@
-import QtQuick
-import QtQuick.Templates as T
-import FluentUI
-
-T.HorizontalHeaderView {
-    id: control
-    implicitWidth: syncView ? syncView.width : 0
-    implicitHeight: Math.max(1, contentHeight)
-    delegate: Rectangle {
-        readonly property real cellPadding: 8
-        implicitWidth: text.implicitWidth + (cellPadding * 2)
-        implicitHeight: Math.max(control.height, text.implicitHeight + (cellPadding * 2))
-        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 ? "#252525" : "#e4e4e4"
-        FluText {
-            id: text
-            text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole]
-                                        : model[control.textRole])
-                                   : modelData
-            width: parent.width
-            height: parent.height
-            font.bold: true
-            horizontalAlignment: Text.AlignHCenter
-            verticalAlignment: Text.AlignVCenter
-        }
-    }
-}

src/imports/FluentUI/Controls/FluImage.qml

@@ -0,0 +1,48 @@
+import QtQuick
+import QtQuick.Controls
+import FluentUI
+
+Image {
+    property string errorButtonText: "重新加载"
+    property var clickErrorListener : function(){
+        image.source = ""
+        image.source = control.source
+    }
+    property Component errorItem : com_error
+    property Component loadingItem: com_loading
+    id: control
+    Loader{
+        anchors.fill: parent
+        sourceComponent: {
+            if(control.status === Image.Loading){
+                return com_loading
+            }else if(control.status == Image.Error){
+                return com_error
+            }else{
+                return undefined
+            }
+        }
+    }
+    Component{
+        id:com_loading
+        Rectangle{
+            color: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
+            FluProgressRing{
+                anchors.centerIn: parent
+                visible: control.status === Image.Loading
+            }
+        }
+    }
+    Component{
+        id:com_error
+        Rectangle{
+            color: FluTheme.dark ? Qt.rgba(1,1,1,0.03) : Qt.rgba(0,0,0,0.03)
+            FluFilledButton{
+                text: control.errorButtonText
+                anchors.centerIn: parent
+                visible: control.status === Image.Error
+                onClicked: clickErrorListener()
+            }
+        }
+    }
+}

src/imports/FluentUI/Controls/FluInfoBar.qml

@@ -49,7 +49,11 @@ FluObject {
                 spacing: 20
                 width: parent.width
                 move: Transition {
-                    NumberAnimation { properties: "y"; easing.type: Easing.OutBack; duration: 300 }
+                    NumberAnimation {
+                        properties: "y"
+                        easing.type: Easing.OutCubic
+                        duration: FluTheme.enableAnimation ? 333 : 0
+                    }
                 }
                 onChildrenChanged: if(children.length === 0)  destroy();
                 function getLastloader(){
@@ -89,9 +93,10 @@ FluObject {
                     scale: item ? 1 : 0;
                     asynchronous: true
                     Behavior on scale {
+                        enabled: FluTheme.enableAnimation
                         NumberAnimation {
-                            easing.type: Easing.OutBack;
+                            easing.type: Easing.OutCubic
-                            duration: 100
+                            duration: 167
                         }
                     }
                     sourceComponent:itemcomponent ? itemcomponent : mcontrol.fluent_sytle;

src/imports/FluentUI/Controls/FluItem.qml

@@ -31,7 +31,6 @@ Item{
             var y = 0;
             var w = control.width;
             var h = control.height;
-            ctx.setTransform(1, 0, 0, 1, 0, 0);
             ctx.clearRect(0, 0, canvas.width, canvas.height);
             ctx.save();
             ctx.beginPath();

src/imports/FluentUI/Controls/FluMenu.qml

@@ -5,7 +5,7 @@ import QtQuick.Templates as T
 import FluentUI
 
 T.Menu {
-    property bool animEnabled: true
+    property bool enableAnimation: true
     id: control
     implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
                             contentWidth + leftPadding + rightPadding)
@@ -20,7 +20,7 @@ T.Menu {
             property: "opacity"
             from:0
             to:1
-            duration: animEnabled ? 83 : 0
+            duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
         }
     }
     exit:Transition {
@@ -28,7 +28,7 @@ T.Menu {
             property: "opacity"
             from:1
             to:0
-            duration: animEnabled ? 83 : 0
+            duration: FluTheme.enableAnimation && control.enableAnimation ? 83 : 0
         }
     }
     contentItem: ListView {

src/imports/FluentUI/Controls/FluMultilineTextBox.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Basic
 import FluentUI
 
 TextArea{
+    signal commit
     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)
@@ -11,7 +12,6 @@ TextArea{
     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:control
-    width: 300
     enabled: !disabled
     color: {
         if(!enabled){
@@ -21,8 +21,11 @@ TextArea{
     }
     font:FluTextStyle.Body
     wrapMode: Text.WrapAnywhere
+    padding: 8
+    leftPadding: padding+2
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-    selectionColor: FluTheme.primaryColor.lightest
+    selectedTextColor: color
+    selectionColor: Qt.alpha(FluTheme.primaryColor.lightest,0.6)
     placeholderTextColor: {
         if(!enabled){
             return placeholderDisableColor
@@ -33,10 +36,27 @@ TextArea{
         return placeholderNormalColor
     }
     selectByMouse: true
-    background: FluTextBoxBackground{ inputItem: control }
+    background: FluTextBoxBackground{
-    TapHandler {
+        inputItem: control
+        implicitWidth: 240
+    }
+    Keys.onEnterPressed: (event)=> d.handleCommit(event)
+    Keys.onReturnPressed:(event)=> d.handleCommit(event)
+    QtObject{
+        id:d
+        function handleCommit(event){
+            if(event.modifiers & Qt.ControlModifier){
+                insert(control.cursorPosition, "\n")
+                return
+            }
+            control.commit()
+        }
+    }
+    MouseArea{
+        anchors.fill: parent
+        cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
     }
     FluTextBoxMenu{
         id:menu

src/imports/FluentUI/Controls/FluNavigationView.qml

@@ -6,59 +6,48 @@ import QtQuick.Layouts
 import FluentUI
 
 Item {
-    enum DisplayMode {
-        Open = 0,
-        Compact = 1,
-        Minimal = 2,
-        Auto = 3
-    }
-    enum PageModeFlag{
-        Standard = 0,
-        SingleTask = 1,
-        SingleTop = 2,
-        SingleInstance = 3
-    }
     property url logo
     property string title: ""
     property FluObject items
     property FluObject footerItems
-    property bool dontPageAnimation: false
+    property int displayMode: FluNavigationViewType.Auto
-    property int displayMode: FluNavigationView.Auto
     property Component autoSuggestBox
     property Component actionItem
     property int topPadding: 0
-    signal loginClicked
+    property int navWidth: 300
+    property int pageMode: FluNavigationViewType.Stack
+    signal logoClicked
     id:control
     QtObject{
         id:d
-        property var pageMap: ({})
+        property bool animDisabled:false
         property var stackItems: []
-        property int displayMode: FluNavigationView.Open
+        property int displayMode: control.displayMode
         property bool enableNavigationPanel: false
-        property bool isCompact: d.displayMode === FluNavigationView.Compact
+        property bool isCompact: d.displayMode === FluNavigationViewType.Compact
-        property bool isMinimal: d.displayMode === FluNavigationView.Minimal
+        property bool isMinimal: d.displayMode === FluNavigationViewType.Minimal
-        property bool isCompactAndPanel: d.displayMode === FluNavigationView.Compact && d.enableNavigationPanel
+        property bool isCompactAndPanel: d.displayMode === FluNavigationViewType.Compact && d.enableNavigationPanel
-        property bool isCompactAndNotPanel:d.displayMode === FluNavigationView.Compact && !d.enableNavigationPanel
+        property bool isCompactAndNotPanel:d.displayMode === FluNavigationViewType.Compact && !d.enableNavigationPanel
-        property bool isMinimalAndPanel: d.displayMode === FluNavigationView.Minimal && d.enableNavigationPanel
+        property bool isMinimalAndPanel: d.displayMode === FluNavigationViewType.Minimal && d.enableNavigationPanel
         onIsCompactAndNotPanelChanged: {
             collapseAll()
         }
         function handleItems(){
-            var idx = 0
+            var _idx = 0
             var data = []
             if(items){
                 for(var i=0;i<items.children.length;i++){
                     var item = items.children[i]
-                    item.idx = idx
+                    item._idx = _idx
                     data.push(item)
-                    idx++
+                    _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
+                            itemChild._idx = _idx
                             data.push(itemChild)
-                            idx++
+                            _idx++
                         }
                     }
                 }
@@ -67,10 +56,10 @@ Item {
                     for(var k=0;k<footerItems.children.length;k++){
                         var itemFooter = footerItems.children[k]
                         if (comEmpty.status === Component.Ready) {
-                            var objEmpty = comEmpty.createObject(items,{idx:idx});
+                            var objEmpty = comEmpty.createObject(items,{_idx:_idx});
-                            itemFooter.idx = idx;
+                            itemFooter._idx = _idx;
                             data.push(objEmpty)
-                            idx++
+                            _idx++
                         }
                     }
                 }
@@ -80,25 +69,33 @@ Item {
     }
     Component.onCompleted: {
         d.displayMode = Qt.binding(function(){
-            if(control.displayMode !==FluNavigationView.Auto){
+            if(control.displayMode !==FluNavigationViewType.Auto){
                 return control.displayMode
             }
             if(control.width<=700){
-                return FluNavigationView.Minimal
+                return FluNavigationViewType.Minimal
             }else if(control.width<=900){
-                return FluNavigationView.Compact
+                return FluNavigationViewType.Compact
             }else{
-                return FluNavigationView.Open
+                return FluNavigationViewType.Open
             }
         })
+        timer_anim_delay.restart()
+    }
+    Timer{
+        id:timer_anim_delay
+        interval: 200
+        onTriggered: {
+            d.animDisabled = true
+        }
     }
     Connections{
         target: d
         function onDisplayModeChanged(){
-            if(d.displayMode === FluNavigationView.Compact){
+            if(d.displayMode === FluNavigationViewType.Compact){
                 collapseAll()
             }
-            if(d.displayMode === FluNavigationView.Minimal){
+            if(d.displayMode === FluNavigationViewType.Minimal){
                 d.enableNavigationPanel = false
             }
         }
@@ -119,12 +116,6 @@ Item {
                 }
                 return 1
             }
-            Behavior on height {
-                NumberAnimation{
-                    duration: 167
-                    easing.type: Easing.InCubic
-                }
-            }
         }
     }
     Component{
@@ -137,9 +128,9 @@ Item {
                 return 30
             }
             Behavior on height {
+                enabled: FluTheme.enableAnimation && d.animDisabled
                 NumberAnimation{
-                    duration: 167
+                    duration: 83
-                    easing.type: Easing.InCubic
                 }
             }
             width: layout_list.width
@@ -204,7 +195,6 @@ Item {
                         return false
                     }
                 }
-
                 Rectangle{
                     radius: 4
                     anchors.fill: parent
@@ -216,7 +206,7 @@ Item {
                         visible: {
                             for(var i=0;i<model.children.length;i++){
                                 var item = model.children[i]
-                                if(item.idx === nav_list.currentIndex && !model.isExpand){
+                                if(item._idx === nav_list.currentIndex && !model.isExpand){
                                     return true
                                 }
                             }
@@ -226,7 +216,6 @@ Item {
                             verticalCenter: parent.verticalCenter
                         }
                     }
-
                     FluIcon{
                         id:item_icon_expand
                         rotation: model.isExpand?0:180
@@ -244,14 +233,16 @@ Item {
                             return true
                         }
                         Behavior on rotation {
+                            enabled: FluTheme.enableAnimation && d.animDisabled
                             NumberAnimation{
-                                duration: 83
+                                duration: 167
+                                easing.type: Easing.OutCubic
                             }
                         }
                     }
                     color: {
                         if(FluTheme.dark){
-                            if((nav_list.currentIndex === idx)&&type===0){
+                            if((nav_list.currentIndex === _idx)&&type===0){
                                 return Qt.rgba(1,1,1,0.06)
                             }
                             if(item_control.hovered){
@@ -259,7 +250,7 @@ Item {
                             }
                             return Qt.rgba(0,0,0,0)
                         }else{
-                            if(nav_list.currentIndex === idx&&type===0){
+                            if(nav_list.currentIndex === _idx&&type===0){
                                 return Qt.rgba(0,0,0,0.06)
                             }
                             if(item_control.hovered){
@@ -329,9 +320,9 @@ Item {
         id:com_panel_item
         Item{
             Behavior on height {
+                enabled: FluTheme.enableAnimation && d.animDisabled
                 NumberAnimation{
-                    duration: 167
+                    duration: 83
-                    easing.type: Easing.InCubic
                 }
             }
             clip: true
@@ -365,7 +356,7 @@ Item {
                         if(model.tapFunc){
                             model.tapFunc()
                         }else{
-                            nav_list.currentIndex = idx
+                            nav_list.currentIndex = _idx
                             layout_footer.currentIndex = -1
                             model.tap()
                             if(d.isMinimal || d.isCompact){
@@ -376,8 +367,8 @@ Item {
                         if(model.tapFunc){
                             model.tapFunc()
                         }else{
-                            nav_list.currentIndex = nav_list.count-layout_footer.count+idx
+                            nav_list.currentIndex = nav_list.count-layout_footer.count+_idx
-                            layout_footer.currentIndex = idx
+                            layout_footer.currentIndex = _idx
                             model.tap()
                             if(d.isMinimal || d.isCompact){
                                 d.enableNavigationPanel = false
@@ -391,11 +382,11 @@ Item {
                     color: {
                         if(FluTheme.dark){
                             if(type===0){
-                                if(nav_list.currentIndex === idx){
+                                if(nav_list.currentIndex === _idx){
                                     return Qt.rgba(1,1,1,0.06)
                                 }
                             }else{
-                                if(nav_list.currentIndex === (nav_list.count-layout_footer.count+idx)){
+                                if(nav_list.currentIndex === (nav_list.count-layout_footer.count+_idx)){
                                     return Qt.rgba(1,1,1,0.06)
                                 }
                             }
@@ -405,11 +396,11 @@ Item {
                             return Qt.rgba(0,0,0,0)
                         }else{
                             if(type===0){
-                                if(nav_list.currentIndex === idx){
+                                if(nav_list.currentIndex === _idx){
                                     return Qt.rgba(0,0,0,0.06)
                                 }
                             }else{
-                                if(nav_list.currentIndex === (nav_list.count-layout_footer.count+idx)){
+                                if(nav_list.currentIndex === (nav_list.count-layout_footer.count+_idx)){
                                     return Qt.rgba(0,0,0,0.06)
                                 }
                             }
@@ -519,31 +510,39 @@ Item {
                 Layout.preferredWidth: 30
                 Layout.preferredHeight: 30
                 Layout.alignment: Qt.AlignVCenter
-                disabled:  nav_swipe.depth <= 1
+                disabled:  {
+                    return d.stackItems.length <= 1
+                }
                 iconSize: 13
                 onClicked: {
-                    nav_swipe.pop()
+                    d.stackItems = d.stackItems.slice(0, -1)
-                    d.stackItems.pop()
                     var item = d.stackItems[d.stackItems.length-1]
-                    if(item.idx<(nav_list.count - layout_footer.count)){
+                    if(item._idx<(nav_list.count - layout_footer.count)){
                         layout_footer.currentIndex = -1
                     }else{
-                        layout_footer.currentIndex = item.idx-(nav_list.count-layout_footer.count)
+                        layout_footer.currentIndex = item._idx-(nav_list.count-layout_footer.count)
                     }
-                    nav_list.currentIndex = item.idx
+                    nav_list.currentIndex = item._idx
-                    if(nav_swipe.currentItem.pageMode === FluNavigationView.SingleInstance){
+                    if(pageMode === FluNavigationViewType.Stack){
-                        var url = nav_swipe.currentItem.url
+                        var nav_stack = loader_content.item.navStack()
-                        var pageIndex = -1
+                        var nav_stack2 = loader_content.item.navStack2()
-                        for(var i=0;i<nav_swipe2.children.length;i++){
+                        nav_stack.pop()
-                            var obj =  nav_swipe2.children[i]
+                        if(nav_stack.currentItem.launchMode === FluPageType.SingleInstance){
-                            if(obj.url === url){
+                            var url = nav_stack.currentItem.url
-                                pageIndex = i
+                            var pageIndex = -1
-                                break
+                            for(var i=0;i<nav_stack2.children.length;i++){
+                                var obj =  nav_stack2.children[i]
+                                if(obj.url === url){
+                                    pageIndex = i
+                                    break
+                                }
+                            }
+                            if(pageIndex !== -1){
+                                nav_stack2.currentIndex = pageIndex
                             }
                         }
-                        if(pageIndex !== -1){
+                    }else if(pageMode === FluNavigationViewType.NoStack){
-                            nav_swipe2.currentIndex = pageIndex
+                        loader_content.setSource(item._ext.url,item._ext.argument)
-                        }
                     }
                 }
             }
@@ -561,14 +560,16 @@ Item {
                 visible: opacity
                 opacity: d.isMinimal
                 Behavior on opacity{
+                    enabled: FluTheme.enableAnimation && d.animDisabled
                     NumberAnimation{
                         duration: 83
                     }
                 }
                 Behavior on Layout.preferredWidth {
+                    enabled: FluTheme.enableAnimation && d.animDisabled
                     NumberAnimation{
                         duration: 167
-                        easing.type: Easing.InCubic
+                        easing.type: Easing.OutCubic
                     }
                 }
             }
@@ -588,7 +589,7 @@ Item {
                 MouseArea{
                     anchors.fill: parent
                     onClicked: {
-                        loginClicked()
+                        logoClicked()
                     }
                 }
             }
@@ -615,7 +616,39 @@ Item {
             }
         }
     }
-    Item{
+
+    Component{
+        id:com_stack_content
+        Item{
+            StackView{
+                id:nav_stack
+                anchors.fill: parent
+                clip: true
+                visible: !nav_stack2.visible
+                popEnter : Transition{}
+                popExit : Transition {}
+                pushEnter: Transition {}
+                pushExit : Transition{}
+                replaceEnter : Transition{}
+                replaceExit : Transition{}
+            }
+            StackLayout{
+                id:nav_stack2
+                anchors.fill: nav_stack
+                clip: true
+                visible: nav_stack.currentItem?.launchMode === FluPageType.SingleInstance
+            }
+            function navStack(){
+                return nav_stack
+            }
+            function navStack2(){
+                return nav_stack2
+            }
+        }
+    }
+
+    Loader{
+        id:loader_content
         anchors{
             left: parent.left
             top: nav_app_bar.bottom
@@ -628,33 +661,17 @@ Item {
                 if(d.isCompact){
                     return 50
                 }
-                return 300
+                return control.navWidth
             }
         }
         Behavior on anchors.leftMargin {
+            enabled: FluTheme.enableAnimation && d.animDisabled
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.InCubic
+                easing.type: Easing.OutCubic
             }
         }
-        StackView{
+        sourceComponent: com_stack_content
-            id:nav_swipe
-            anchors.fill: parent
-            clip: true
-            visible: !nav_swipe2.visible
-            popEnter : Transition{}
-            popExit : Transition {}
-            pushEnter: Transition {}
-            pushExit : Transition{}
-            replaceEnter : Transition{}
-            replaceExit : Transition{}
-        }
-        StackLayout{
-            id:nav_swipe2
-            anchors.fill: nav_swipe
-            clip: true
-            visible: nav_swipe.currentItem.pageMode === FluNavigationView.SingleInstance
-        }
     }
     MouseArea{
         anchors.fill: parent
@@ -671,7 +688,7 @@ Item {
             if(d.isCompactAndNotPanel){
                 return 50
             }
-            return 300
+            return control.navWidth
         }
         anchors{
             top: parent.top
@@ -680,44 +697,31 @@ Item {
         border.color: FluTheme.dark ? Qt.rgba(45/255,45/255,45/255,1) : Qt.rgba(226/255,230/255,234/255,1)
         border.width:  d.isMinimal || d.isCompactAndPanel ? 1 : 0
         color: {
-            if(d.isMinimal){
+            if(d.isMinimal || d.enableNavigationPanel){
                 return FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(243/255,243/255,243/255,1)
             }
             return "transparent"
         }
-        clip: true
         x: visible ? 0 : -width
         Behavior on width {
+            enabled: FluTheme.enableAnimation && d.animDisabled
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.InCubic
+                easing.type: Easing.OutCubic
             }
         }
         Behavior on x {
+            enabled: FluTheme.enableAnimation && d.animDisabled
             NumberAnimation{
                 duration: 167
-                easing.type: Easing.InCubic
+                easing.type: Easing.OutCubic
             }
         }
         visible: {
-            if(d.displayMode !== FluNavigationView.Minimal)
+            if(d.displayMode !== FluNavigationViewType.Minimal)
                 return true
             return d.isMinimalAndPanel  ? true : false
         }
-        FluAcrylic {
-            sourceItem:nav_swipe
-            anchors.fill: layout_list
-            color: {
-                if(d.isMinimalAndPanel || d.isCompactAndPanel){
-                    return FluTheme.dark ? Qt.rgba(61/255,61/255,61/255,1) : Qt.rgba(243/255,243/255,243/255,1)
-                }
-                return "transparent"
-            }
-            visible: d.isMinimalAndPanel || d.isCompactAndPanel
-            rectX: d.isCompactAndPanel ? (layout_list.x - 50) : layout_list.x
-            rectY: layout_list.y - 60
-            acrylicOpacity:0.9
-        }
         Item{
             id:layout_header
             width: layout_list.width
@@ -756,27 +760,8 @@ Item {
                 }
             }
         }
-        ListView{
+        Flickable{
-            id:nav_list
+            id:layout_flickable
-            clip: true
-            ScrollBar.vertical: FluScrollBar {}
-            model:d.handleItems()
-            highlightMoveDuration: 167
-            highlight: Item{
-                clip: true
-                Rectangle{
-                    height: 18
-                    radius: 1.5
-                    color: FluTheme.primaryColor.dark
-                    width: 3
-                    anchors{
-                        verticalCenter: parent.verticalCenter
-                        left: parent.left
-                        leftMargin: 6
-                    }
-                }
-            }
-            currentIndex: -1
             anchors{
                 top: layout_header.bottom
                 topMargin: 6
@@ -784,29 +769,58 @@ Item {
                 right: parent.right
                 bottom: layout_footer.top
             }
-            delegate: Loader{
+            boundsBehavior: ListView.StopAtBounds
-                property var model: modelData
+            clip: true
-                property var idx: index
+            contentHeight: nav_list.contentHeight
-                property int type: 0
+            ScrollBar.vertical: FluScrollBar {}
-                sourceComponent: {
+            ListView{
-                    if(modelData instanceof FluPaneItem){
+                id:nav_list
-                        return com_panel_item
+                clip: true
+                anchors.fill: parent
+                model:d.handleItems()
+                boundsBehavior: ListView.StopAtBounds
+                highlightMoveDuration: FluTheme.enableAnimation && d.animDisabled ? 167 : 0
+                highlight: Item{
+                    clip: true
+                    Rectangle{
+                        height: 18
+                        radius: 1.5
+                        color: FluTheme.primaryColor.dark
+                        width: 3
+                        anchors{
+                            verticalCenter: parent.verticalCenter
+                            left: parent.left
+                            leftMargin: 6
+                        }
                     }
-                    if(modelData instanceof FluPaneItemHeader){
+                }
-                        return com_panel_item_header
+                currentIndex: -1
-                    }
+
-                    if(modelData instanceof FluPaneItemSeparator){
+                delegate: Loader{
-                        return com_panel_item_separatorr
+                    property var model: modelData
-                    }
+                    property var _idx: index
-                    if(modelData instanceof FluPaneItemExpander){
+                    property int type: 0
-                        return com_panel_item_expander
+                    sourceComponent: {
-                    }
+                        if(modelData instanceof FluPaneItem){
-                    if(modelData instanceof FluPaneItemEmpty){
+                            return com_panel_item
-                        return com_panel_item_empty
+                        }
+                        if(modelData instanceof FluPaneItemHeader){
+                            return com_panel_item_header
+                        }
+                        if(modelData instanceof FluPaneItemSeparator){
+                            return com_panel_item_separatorr
+                        }
+                        if(modelData instanceof FluPaneItemExpander){
+                            return com_panel_item_expander
+                        }
+                        if(modelData instanceof FluPaneItemEmpty){
+                            return com_panel_item_empty
+                        }
                     }
                 }
             }
         }
+
         ListView{
             id:layout_footer
             clip: true
@@ -814,6 +828,7 @@ Item {
             height: childrenRect.height
             anchors.bottom: parent.bottom
             interactive: false
+            boundsBehavior: ListView.StopAtBounds
             currentIndex: -1
             model: {
                 if(footerItems){
@@ -837,7 +852,7 @@ Item {
             }
             delegate: Loader{
                 property var model: modelData
-                property var idx: index
+                property var _idx: index
                 property int type: 1
                 sourceComponent: {
                     if(modelData instanceof FluPaneItem){
@@ -936,7 +951,7 @@ Item {
                             modelData.tapFunc()
                         }else{
                             modelData.tap()
-                            nav_list.currentIndex = idx
+                            nav_list.currentIndex = _idx
                             layout_footer.currentIndex = -1
                             if(d.isMinimal || d.isCompact){
                                 d.enableNavigationPanel = false
@@ -955,7 +970,6 @@ Item {
                 radius: 4
             }
             color: FluTheme.dark ? Qt.rgba(51/255,48/255,48/255,1) : Qt.rgba(248/255,250/255,253/255,1)
-
         }
         function showPopup(pos,model){
             control_popup.x = pos.x
@@ -964,6 +978,13 @@ Item {
             control_popup.open()
         }
     }
+    Component{
+        id:com_placeholder
+        Item{
+            property int launchMode: FluPageType.SingleInstance
+            property string url
+        }
+    }
     function collapseAll(){
         for(var i=0;i<nav_list.model.length;i++){
             var item = nav_list.model[i]
@@ -982,45 +1003,49 @@ Item {
     function getItems(){
         return nav_list.model
     }
-
+    function getCurrentIndex(){
-
+        return nav_list.currentIndex
-    Component{
-        id:com_placeholder
-        Item{
-            property int pageMode: FluNavigationView.SingleInstance
-            property string url
-        }
     }
-
+    function getCurrentUrl(){
-    function push(url,argument={}){
+        if(pageMode === FluNavigationViewType.Stack){
-        let page = nav_swipe.find(function(item) {
+            var nav_stack = loader_content.item.navStack()
-            return item.url === url;
+            if(nav_stack.currentItem){
-        })
+                return nav_stack.currentItem.url
-        if(page){
-            switch(page.pageMode)
-            {
-            case FluNavigationView.SingleTask:
-                while(nav_swipe.currentItem !== page)
-                {
-                    nav_swipe.pop()
-                    d.stackItems.pop()
-                }
-                return
-            case FluNavigationView.SingleTop:
-                if (nav_swipe.currentItem.url === url){
-                    return
-                }
-                break
-            case FluNavigationView.Standard:
-            default:
             }
+        }else if(pageMode === FluNavigationViewType.NoStack){
+            return loader_content.source.toString()
         }
-        var comp = Qt.createComponent(url)
+        return undefined
-        if (comp.status === Component.Ready) {
+    }
-            //先判断nav_swipe2中是否有当前url数据
+    function push(url,argument={}){
+        function stackPush(){
+            var nav_stack = loader_content.item.navStack()
+            var nav_stack2 = loader_content.item.navStack2()
+            var page = nav_stack.find(function(item) {
+                return item.url === url;
+            })
+            if(page){
+                switch(page.launchMode)
+                {
+                case FluPageType.SingleTask:
+                    while(nav_stack.currentItem !== page)
+                    {
+                        nav_stack.pop()
+                        d.stackItems = d.stackItems.slice(0, -1)
+                    }
+                    return
+                case FluPageType.SingleTop:
+                    if (nav_stack.currentItem.url === url){
+                        return
+                    }
+                    break
+                case FluPageType.Standard:
+                default:
+                }
+            }
             var pageIndex = -1
-            for(var i=0;i<nav_swipe2.children.length;i++){
+            for(var i=0;i<nav_stack2.children.length;i++){
-                var item =  nav_swipe2.children[i]
+                var item =  nav_stack2.children[i]
                 if(item.url === url){
                     pageIndex = i
                     break
@@ -1028,31 +1053,39 @@ Item {
             }
             var options = Object.assign(argument,{url:url})
             if(pageIndex!==-1){
-                nav_swipe2.currentIndex = pageIndex
+                nav_stack2.currentIndex = pageIndex
-                nav_swipe.push(com_placeholder,options)
+                nav_stack.push(com_placeholder,options)
             }else{
-                var obj  = comp.createObject(nav_swipe,options)
+                var comp = Qt.createComponent(url)
-                if(obj.pageMode === FluNavigationView.SingleInstance){
+                if (comp.status === Component.Ready) {
-                    nav_swipe.push(com_placeholder,options)
+                    var obj  = comp.createObject(nav_stack,options)
-                    nav_swipe2.children.push(obj)
+                    if(obj.launchMode === FluPageType.SingleInstance){
-                    nav_swipe2.currentIndex = nav_swipe2.count - 1
+                        nav_stack.push(com_placeholder,options)
+                        nav_stack2.children.push(obj)
+                        nav_stack2.currentIndex = nav_stack2.count - 1
+                    }else{
+                        nav_stack.push(obj)
+                    }
                 }else{
-                    nav_swipe.push(obj)
+                    console.error(comp.errorString())
                 }
             }
-            d.stackItems.push(nav_list.model[nav_list.currentIndex])
+            d.stackItems = d.stackItems.concat(nav_list.model[nav_list.currentIndex])
-        }else{
-            console.error(comp.errorString())
         }
-    }
+        function noStackPush(){
-    function getCurrentIndex(){
+            if(loader_content.source.toString() === url){
-        return nav_list.currentIndex
+                return
-    }
+            }
-    function getCurrentUrl(){
+            loader_content.setSource(url,argument)
-        if(nav_swipe.currentItem){
+            var obj = nav_list.model[nav_list.currentIndex]
-            return nav_swipe.currentItem.url
+            obj._ext = {url:url,argument:argument}
+            d.stackItems = d.stackItems.concat(obj)
+        }
+        if(pageMode === FluNavigationViewType.Stack){
+            stackPush()
+        }else if(pageMode === FluNavigationViewType.NoStack){
+            noStackPush()
         }
-        return undefined
     }
     function startPageByItem(data){
         var items = getItems()

src/imports/FluentUI/Controls/FluPage.qml

@@ -5,18 +5,30 @@ import QtQuick.Window
 import FluentUI
 
 Item {
-    property int pageMode: FluNavigationView.SingleTop
+    property int launchMode: FluPageType.SingleTop
+    property bool animDisabled: false
     property string url : ""
     id: control
     opacity: visible
     visible: false
+    StackView.onRemoved: destroy()
     Behavior on opacity{
+        enabled: !animDisabled && FluTheme.enableAnimation
         NumberAnimation{
-            duration: 83
+            duration: 167
+        }
+    }
+    transform: Translate {
+        y: control.visible ? 0 : 80
+        Behavior on y{
+            enabled: !animDisabled && FluTheme.enableAnimation
+            NumberAnimation{
+                duration: 167
+                easing.type: Easing.OutCubic
+            }
         }
     }
     Component.onCompleted: {
         visible = true
     }
-
 }

src/imports/FluentUI/Controls/FluPaneItem.qml

@@ -4,7 +4,8 @@ import FluentUI
 
 QtObject {
     readonly property string key : FluTools.uuid()
-    readonly property int flag : 0
+    property int _idx
+    property var _ext
     property string title
     property int order : 0
     property int icon
@@ -15,7 +16,6 @@ QtObject {
     property string desc
     property var image
     property var parent
-    property int idx
     property int count: 0
     signal tap
     property var tapFunc

src/imports/FluentUI/Controls/FluPaneItemEmpty.qml

@@ -4,6 +4,7 @@ import FluentUI
 
 QtObject {
     readonly property string key : FluTools.uuid()
+    property int _idx
+    property var _ext
     property var parent
-    property int idx
 }

src/imports/FluentUI/Controls/FluPaneItemExpander.qml

@@ -4,10 +4,10 @@ import FluentUI
 
 FluObject {
     readonly property string key : FluTools.uuid()
+    property int _idx
     property string title
     property var icon
     property Component cusIcon
     property bool isExpand: false
     property var parent
-    property int idx
 }

src/imports/FluentUI/Controls/FluPaneItemHeader.qml

@@ -4,7 +4,7 @@ import FluentUI
 
 QtObject {
     readonly property string key : FluTools.uuid()
+    property int _idx
     property string title
     property var parent
-    property int idx
 }

src/imports/FluentUI/Controls/FluPaneItemSeparator.qml

@@ -4,6 +4,6 @@ import FluentUI
 
 QtObject {
     readonly property string key : FluTools.uuid()
+    property int _idx
     property var parent
-    property int idx
 }

src/imports/FluentUI/Controls/FluPasswordBox.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls.Basic
 import FluentUI
 
 TextField{
+    signal commit
     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)
@@ -12,7 +13,6 @@ TextField{
     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:control
-    width: 300
     enabled: !disabled
     color: {
         if(!enabled){
@@ -21,9 +21,12 @@ TextField{
         return normalColor
     }
     font:FluTextStyle.Body
+    padding: 8
+    leftPadding: padding+2
     echoMode:btn_reveal.pressed ? TextField.Normal : TextField.Password
     renderType: FluTheme.nativeText ? Text.NativeRendering : Text.QtRendering
-    selectionColor: FluTheme.primaryColor.lightest
+    selectionColor: Qt.alpha(FluTheme.primaryColor.lightest,0.6)
+    selectedTextColor: color
     placeholderTextColor: {
         if(!enabled){
             return placeholderDisableColor
@@ -37,6 +40,7 @@ TextField{
     rightPadding: icon_end.visible ? 50 : 30
     background: FluTextBoxBackground{
         inputItem: control
+        implicitWidth: 240
         FluIcon{
             id:icon_end
             iconSource: control.iconSource
@@ -50,6 +54,14 @@ TextField{
             }
         }
     }
+    Keys.onEnterPressed: (event)=> d.handleCommit(event)
+    Keys.onReturnPressed:(event)=> d.handleCommit(event)
+    QtObject{
+        id:d
+        function handleCommit(event){
+            control.commit()
+        }
+    }
     FluIconButton{
         id:btn_reveal
         iconSource:FluentIcons.RevealPasswordMedium
@@ -64,10 +76,6 @@ TextField{
             rightMargin: icon_end.visible ? 25 : 5
         }
     }
-    TapHandler {
-        acceptedButtons: Qt.RightButton
-        onTapped: control.echoMode !== TextInput.Password && menu.popup()
-    }
     FluTextBoxMenu{
         id:menu
         inputItem: control

src/imports/FluentUI/Controls/FluPivot.qml

@@ -28,7 +28,7 @@ Item {
         spacing: 20
         interactive: false
         orientation: ListView.Horizontal
-        highlightMoveDuration: 167
+        highlightMoveDuration: FluTheme.enableAnimation ? 167 : 0
         highlight: Item{
             clip: true
             Rectangle{
@@ -38,9 +38,10 @@ Item {
                 width: nav_list.currentItem ? nav_list.currentItem.width : 0
                 y:37
                 Behavior on width {
+                    enabled: FluTheme.enableAnimation
                     NumberAnimation{
                         duration: 167
-                        easing.type: Easing.InCubic
+                        easing.type: Easing.OutCubic
                     }
                 }
             }